diff --git a/.arcignore b/.arcignore
deleted file mode 100644
index cd917b06fb7..00000000000
--- a/.arcignore
+++ /dev/null
@@ -1,12 +0,0 @@
-# .arcignore is the same as .gitignore but for Arc VCS.
-# Arc VCS is a proprietary VCS in Yandex that is very similar to Git
-# from the user perspective but with the following differences:
-# 1. Data is stored in distributed object storage.
-# 2. Local copy works via FUSE without downloading all the objects.
-# For this reason, it is better suited for huge monorepositories that can be found in large companies (e.g. Yandex, Google).
-# As ClickHouse developers, we don't use Arc as a VCS (we use Git).
-# But the ClickHouse source code is also mirrored into internal monorepository and our collegues are using Arc.
-# You can read more about Arc here: https://habr.com/en/company/yandex/blog/482926/
-
-# Repository is synchronized without 3rd-party submodules.
-contrib
diff --git a/.clang-tidy b/.clang-tidy
index b0971418e0e..ecb8ac6dcbf 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -203,3 +203,5 @@ CheckOptions:
     value: CamelCase
   - key: readability-identifier-naming.UsingCase
     value: CamelCase
+  - key: modernize-loop-convert.UseCxx20ReverseRanges
+    value: false
diff --git a/.gitignore b/.gitignore
index a469ff7bca1..0bf31508419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,9 @@
 /docs/ja/single.md
 /docs/fa/single.md
 /docs/en/development/cmake-in-clickhouse.md
+/docs/ja/development/cmake-in-clickhouse.md
+/docs/zh/development/cmake-in-clickhouse.md
+/docs/ru/development/cmake-in-clickhouse.md
 
 # callgrind files
 callgrind.out.*
diff --git a/.gitmodules b/.gitmodules
index 37b22527eb4..74d1049ce01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -246,3 +246,6 @@
 [submodule "contrib/bzip2"]
 	path = contrib/bzip2
 	url = https://github.com/ClickHouse-Extras/bzip2.git
+[submodule "contrib/magic_enum"]
+	path = contrib/magic_enum
+	url = https://github.com/Neargye/magic_enum
diff --git a/AUTHORS b/AUTHORS
index 12838d7fa14..1d2e5adc523 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-To see the list of authors who created the source code of ClickHouse, published and distributed by YANDEX LLC as the owner,
+To see the list of authors who created the source code of ClickHouse, published and distributed by ClickHouse, Inc. as the owner,
 run "SELECT * FROM system.contributors;" query on any ClickHouse server.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71cdac17825..6e209293e67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,213 @@
+### ClickHouse release v21.9, 2021-09-09
+
+#### Backward Incompatible Change
+
+* Do not output trailing zeros in text representation of `Decimal` types. Example: `1.23` will be printed instead of `1.230000` for decimal with scale 6. This closes [#15794](https://github.com/ClickHouse/ClickHouse/issues/15794). It may introduce slight incompatibility if your applications somehow relied on the trailing zeros. Serialization in output formats can be controlled with the setting `output_format_decimal_trailing_zeros`. Implementation of `toString` and casting to String is changed unconditionally. [#27680](https://github.com/ClickHouse/ClickHouse/pull/27680) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Do not allow to apply parametric aggregate function with `-Merge` combinator to aggregate function state if state was produced by aggregate function with different parameters. For example, state of `fooState(42)(x)` cannot be finalized with `fooMerge(s)` or `fooMerge(123)(s)`, parameters must be specified explicitly like `fooMerge(42)(s)` and must be equal. It does not affect some special aggregate functions like `quantile` and `sequence*` that use parameters for finalization only. [#26847](https://github.com/ClickHouse/ClickHouse/pull/26847) ([tavplubix](https://github.com/tavplubix)).
+* Under clickhouse-local, always treat local addresses with a port as remote. [#26736](https://github.com/ClickHouse/ClickHouse/pull/26736) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix the issue that in case of some sophisticated query with column aliases identical to the names of expressions, bad cast may happen. This fixes [#25447](https://github.com/ClickHouse/ClickHouse/issues/25447). This fixes [#26914](https://github.com/ClickHouse/ClickHouse/issues/26914). This fix may introduce backward incompatibility: if there are different expressions with identical names, exception will be thrown. It may break some rare cases when `enable_optimize_predicate_expression` is set. [#26639](https://github.com/ClickHouse/ClickHouse/pull/26639) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now, scalar subquery always returns `Nullable` result if it's type can be `Nullable`. It is needed because in case of empty subquery it's result should be `Null`. Previously, it was possible to get error about incompatible types (type deduction does not execute scalar subquery, and it could use not-nullable type). Scalar subquery with empty result which can't be converted to `Nullable` (like `Array` or `Tuple`) now throws error. Fixes [#25411](https://github.com/ClickHouse/ClickHouse/issues/25411). [#26423](https://github.com/ClickHouse/ClickHouse/pull/26423) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
+#### New Feature
+
+* Implementation of short circuit function evaluation, closes [#12587](https://github.com/ClickHouse/ClickHouse/issues/12587). Add settings `short_circuit_function_evaluation` to configure short circuit function evaluation. [#23367](https://github.com/ClickHouse/ClickHouse/pull/23367) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support for INTERSECT, EXCEPT, ANY, ALL operators. [#24757](https://github.com/ClickHouse/ClickHouse/pull/24757) ([Kirill Ershov](https://github.com/zdikov)). ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add support for encryption at the virtual file system level (data encryption at rest) using AES-CTR algorithm. [#24206](https://github.com/ClickHouse/ClickHouse/pull/24206) ([Latysheva Alexandra](https://github.com/alexelex)). ([Vitaly Baranov](https://github.com/vitlibar)) [#26733](https://github.com/ClickHouse/ClickHouse/pull/26733) [#26377](https://github.com/ClickHouse/ClickHouse/pull/26377) [#26465](https://github.com/ClickHouse/ClickHouse/pull/26465).
+* Added natural language processing (NLP) functions for tokenization, stemming, lemmatizing and search in synonyms extensions. [#24997](https://github.com/ClickHouse/ClickHouse/pull/24997) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Added integration with S2 geometry library. [#24980](https://github.com/ClickHouse/ClickHouse/pull/24980) ([Andr0901](https://github.com/Andr0901)). ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add SQLite table engine, table function, database engine. [#24194](https://github.com/ClickHouse/ClickHouse/pull/24194) ([Arslan Gumerov](https://github.com/g-arslan)). ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Added support for custom query for `MySQL`, `PostgreSQL`, `ClickHouse`, `JDBC`, `Cassandra` dictionary source. Closes [#1270](https://github.com/ClickHouse/ClickHouse/issues/1270). [#26995](https://github.com/ClickHouse/ClickHouse/pull/26995) ([Maksim Kita](https://github.com/kitaisreal)).
+* Introduce syntax for here documents. Example `SELECT $doc$ VALUE $doc$`. [#26671](https://github.com/ClickHouse/ClickHouse/pull/26671) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add shared (replicated) storage of user, roles, row policies, quotas and settings profiles through ZooKeeper. [#27426](https://github.com/ClickHouse/ClickHouse/pull/27426) ([Kevin Michel](https://github.com/kmichel-aiven)).
+* Add compression for `INTO OUTFILE` that automatically choose compression algorithm. Closes [#3473](https://github.com/ClickHouse/ClickHouse/issues/3473). [#27134](https://github.com/ClickHouse/ClickHouse/pull/27134) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Add `INSERT ... FROM INFILE` similarly to `SELECT ... INTO OUTFILE`. [#27655](https://github.com/ClickHouse/ClickHouse/pull/27655) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Added `complex_key_range_hashed` dictionary. Closes [#22029](https://github.com/ClickHouse/ClickHouse/issues/22029). [#27629](https://github.com/ClickHouse/ClickHouse/pull/27629) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support expressions in JOIN ON section. Close [#21868](https://github.com/ClickHouse/ClickHouse/issues/21868). [#24420](https://github.com/ClickHouse/ClickHouse/pull/24420) ([Vladimir C](https://github.com/vdimir)).
+* When client connects to server, it receives information about all warnings that are already were collected by server. (It can be disabled by using option `--no-warnings`). Add `system.warnings` table to collect warnings about server configuration. [#26246](https://github.com/ClickHouse/ClickHouse/pull/26246) ([Filatenkov Artur](https://github.com/FArthur-cmd)). [#26282](https://github.com/ClickHouse/ClickHouse/pull/26282) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Allow using constant expressions from with and select in aggregate function parameters. Close [#10945](https://github.com/ClickHouse/ClickHouse/issues/10945). [#27531](https://github.com/ClickHouse/ClickHouse/pull/27531) ([abel-cheng](https://github.com/abel-cheng)).
+* Add `tupleToNameValuePairs`, a function that turns a named tuple into an array of pairs. [#27505](https://github.com/ClickHouse/ClickHouse/pull/27505) ([Braulio Valdivielso Martínez](https://github.com/BraulioVM)).
+* Add support for `bzip2` compression method for import/export. Closes [#22428](https://github.com/ClickHouse/ClickHouse/issues/22428). [#27377](https://github.com/ClickHouse/ClickHouse/pull/27377) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Added `bitmapSubsetOffsetLimit(bitmap, offset, cardinality_limit)` function. It creates a subset of bitmap limit the results to `cardinality_limit` with offset of `offset`. [#27234](https://github.com/ClickHouse/ClickHouse/pull/27234) ([DHBin](https://github.com/DHBin)).
+* Add column `default_database` to `system.users`. [#27054](https://github.com/ClickHouse/ClickHouse/pull/27054) ([kevin wan](https://github.com/MaxWk)).
+* Supported `cluster` macros inside table functions 'cluster' and 'clusterAllReplicas'. [#26913](https://github.com/ClickHouse/ClickHouse/pull/26913) ([polyprogrammist](https://github.com/PolyProgrammist)).
+* Add new functions `currentRoles()`, `enabledRoles()`, `defaultRoles()`. [#26780](https://github.com/ClickHouse/ClickHouse/pull/26780) ([Vitaly Baranov](https://github.com/vitlibar)).
+* New functions `currentProfiles()`, `enabledProfiles()`, `defaultProfiles()`. [#26714](https://github.com/ClickHouse/ClickHouse/pull/26714) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add functions that return (initial_)query_id of the current query. This closes [#23682](https://github.com/ClickHouse/ClickHouse/issues/23682). [#26410](https://github.com/ClickHouse/ClickHouse/pull/26410) ([Alexey Boykov](https://github.com/mathalex)).
+* Add `REPLACE GRANT` feature. [#26384](https://github.com/ClickHouse/ClickHouse/pull/26384) ([Caspian](https://github.com/Cas-pian)).
+* `EXPLAIN` query now has `EXPLAIN ESTIMATE ...` mode that will show information about read rows, marks and parts from MergeTree tables. Closes [#23941](https://github.com/ClickHouse/ClickHouse/issues/23941). [#26131](https://github.com/ClickHouse/ClickHouse/pull/26131) ([fastio](https://github.com/fastio)).
+* Added `system.zookeeper_log` table. All actions of ZooKeeper client are logged into this table. Implements [#25449](https://github.com/ClickHouse/ClickHouse/issues/25449). [#26129](https://github.com/ClickHouse/ClickHouse/pull/26129) ([tavplubix](https://github.com/tavplubix)).
+* Zero-copy replication for `ReplicatedMergeTree` over `HDFS` storage. [#25918](https://github.com/ClickHouse/ClickHouse/pull/25918) ([Zhichang Yu](https://github.com/yuzhichang)).
+* Allow to insert Nested type as array of structs in `Arrow`, `ORC` and `Parquet` input format. [#25902](https://github.com/ClickHouse/ClickHouse/pull/25902) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add a new datatype `Date32` (store data as Int32), support date range same with `DateTime64` support load parquet date32 to ClickHouse `Date32` Add new function `toDate32` like `toDate`. [#25774](https://github.com/ClickHouse/ClickHouse/pull/25774) ([LiuNeng](https://github.com/liuneng1994)).
+* Allow setting default database for users. [#25268](https://github.com/ClickHouse/ClickHouse/issues/25268). [#25687](https://github.com/ClickHouse/ClickHouse/pull/25687) ([kevin wan](https://github.com/MaxWk)).
+* Add an optional parameter to `MongoDB` engine to accept connection string options and support SSL connection. Closes [#21189](https://github.com/ClickHouse/ClickHouse/issues/21189). Closes [#21041](https://github.com/ClickHouse/ClickHouse/issues/21041). [#22045](https://github.com/ClickHouse/ClickHouse/pull/22045) ([Omar Bazaraa](https://github.com/OmarBazaraa)).
+
+#### Experimental Feature
+
+* Added a compression codec `AES_128_GCM_SIV` which encrypts columns instead of compressing them. [#19896](https://github.com/ClickHouse/ClickHouse/pull/19896) ([PHO](https://github.com/depressed-pho)). Will be rewritten, do not use.
+* Rename `MaterializeMySQL` to `MaterializedMySQL`. [#26822](https://github.com/ClickHouse/ClickHouse/pull/26822) ([tavplubix](https://github.com/tavplubix)).
+
+#### Performance Improvement
+
+* Improve the performance of fast queries when `max_execution_time = 0` by reducing the number of `clock_gettime` system calls. [#27325](https://github.com/ClickHouse/ClickHouse/pull/27325) ([filimonov](https://github.com/filimonov)).
+* Specialize date time related comparison to achieve better performance. This fixes [#27083](https://github.com/ClickHouse/ClickHouse/issues/27083) . [#27122](https://github.com/ClickHouse/ClickHouse/pull/27122) ([Amos Bird](https://github.com/amosbird)).
+* Share file descriptors in concurrent reads of the same files. There is no noticeable performance difference on Linux. But the number of opened files will be significantly (10..100 times) lower on typical servers and it makes operations easier. See [#26214](https://github.com/ClickHouse/ClickHouse/issues/26214). [#26768](https://github.com/ClickHouse/ClickHouse/pull/26768) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve latency of short queries, that require reading from tables with large number of columns. [#26371](https://github.com/ClickHouse/ClickHouse/pull/26371) ([Anton Popov](https://github.com/CurtizJ)).
+* Don't build sets for indices when analyzing a query. [#26365](https://github.com/ClickHouse/ClickHouse/pull/26365) ([Raúl Marín](https://github.com/Algunenano)).
+* Vectorize the SUM of Nullable integer types with native representation ([David Manzanares](https://github.com/davidmanzanares), [Raúl Marín](https://github.com/Algunenano)). [#26248](https://github.com/ClickHouse/ClickHouse/pull/26248) ([Raúl Marín](https://github.com/Algunenano)).
+* Compile expressions involving columns with `Enum` types. [#26237](https://github.com/ClickHouse/ClickHouse/pull/26237) ([Maksim Kita](https://github.com/kitaisreal)).
+* Compile aggregate functions `groupBitOr`, `groupBitAnd`, `groupBitXor`. [#26161](https://github.com/ClickHouse/ClickHouse/pull/26161) ([Maksim Kita](https://github.com/kitaisreal)).
+* Improved memory usage with better block size prediction when reading empty DEFAULT columns. Closes [#17317](https://github.com/ClickHouse/ClickHouse/issues/17317). [#25917](https://github.com/ClickHouse/ClickHouse/pull/25917) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Reduce memory usage and number of read rows in queries with `ORDER BY primary_key`. [#25721](https://github.com/ClickHouse/ClickHouse/pull/25721) ([Anton Popov](https://github.com/CurtizJ)).
+* Enable `distributed_push_down_limit` by default. [#27104](https://github.com/ClickHouse/ClickHouse/pull/27104) ([Azat Khuzhin](https://github.com/azat)).
+* Make `toTimeZone` monotonicity when timeZone is a constant value to support partition puring when use sql like:. [#26261](https://github.com/ClickHouse/ClickHouse/pull/26261) ([huangzhaowei](https://github.com/SaintBacchus)).
+
+#### Improvement
+
+* Mark window functions as ready for general use. Remove the `allow_experimental_window_functions` setting. [#27184](https://github.com/ClickHouse/ClickHouse/pull/27184) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Improve compatibility with non-whole-minute timezone offsets. [#27080](https://github.com/ClickHouse/ClickHouse/pull/27080) ([Raúl Marín](https://github.com/Algunenano)).
+* If file descriptor in `File` table is regular file - allow to read multiple times from it. It allows `clickhouse-local` to read multiple times from stdin (with multiple SELECT queries or subqueries) if stdin is a regular file like `clickhouse-local --query "SELECT * FROM table UNION ALL SELECT * FROM table" ... < file`. This closes [#11124](https://github.com/ClickHouse/ClickHouse/issues/11124). Co-authored with ([alexey-milovidov](https://github.com/alexey-milovidov)). [#25960](https://github.com/ClickHouse/ClickHouse/pull/25960) ([BoloniniD](https://github.com/BoloniniD)).
+* Remove duplicate index analysis and avoid possible invalid limit checks during projection analysis. [#27742](https://github.com/ClickHouse/ClickHouse/pull/27742) ([Amos Bird](https://github.com/amosbird)).
+* Enable query parameters to be passed in the body of HTTP requests. [#27706](https://github.com/ClickHouse/ClickHouse/pull/27706) ([Hermano Lustosa](https://github.com/hllustosa)).
+* Disallow `arrayJoin` on partition expressions. [#27648](https://github.com/ClickHouse/ClickHouse/pull/27648) ([Raúl Marín](https://github.com/Algunenano)).
+* Log client IP address if authentication fails. [#27514](https://github.com/ClickHouse/ClickHouse/pull/27514) ([Misko Lee](https://github.com/imiskolee)).
+* Use bytes instead of strings for binary data in the GRPC protocol. [#27431](https://github.com/ClickHouse/ClickHouse/pull/27431) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Send response with error message if HTTP port is not set and user tries to send HTTP request to TCP port. [#27385](https://github.com/ClickHouse/ClickHouse/pull/27385) ([Braulio Valdivielso Martínez](https://github.com/BraulioVM)).
+* Add `_CAST` function for internal usage, which will not preserve type nullability, but non-internal cast will preserve according to setting `cast_keep_nullable`. Closes [#12636](https://github.com/ClickHouse/ClickHouse/issues/12636). [#27382](https://github.com/ClickHouse/ClickHouse/pull/27382) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add setting `log_formatted_queries` to log additional formatted query into `system.query_log`. It's useful for normalized query analysis because functions like `normalizeQuery` and `normalizeQueryKeepNames` don't parse/format queries in order to achieve better performance. [#27380](https://github.com/ClickHouse/ClickHouse/pull/27380) ([Amos Bird](https://github.com/amosbird)).
+* Add two settings `max_hyperscan_regexp_length` and `max_hyperscan_regexp_total_length` to prevent huge regexp being used in hyperscan related functions, such as `multiMatchAny`. [#27378](https://github.com/ClickHouse/ClickHouse/pull/27378) ([Amos Bird](https://github.com/amosbird)).
+* Memory consumed by bitmap aggregate functions now is taken into account for memory limits. This closes [#26555](https://github.com/ClickHouse/ClickHouse/issues/26555). [#27252](https://github.com/ClickHouse/ClickHouse/pull/27252) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add new index data skipping minmax index format for proper Nullable support. [#27250](https://github.com/ClickHouse/ClickHouse/pull/27250) ([Azat Khuzhin](https://github.com/azat)).
+* Add 10 seconds cache for S3 proxy resolver. [#27216](https://github.com/ClickHouse/ClickHouse/pull/27216) ([ianton-ru](https://github.com/ianton-ru)).
+* Split global mutex into individual regexp construction. This helps avoid huge regexp construction blocking other related threads. [#27211](https://github.com/ClickHouse/ClickHouse/pull/27211) ([Amos Bird](https://github.com/amosbird)).
+* Support schema for PostgreSQL database engine. Closes [#27166](https://github.com/ClickHouse/ClickHouse/issues/27166). [#27198](https://github.com/ClickHouse/ClickHouse/pull/27198) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Track memory usage in clickhouse-client. [#27191](https://github.com/ClickHouse/ClickHouse/pull/27191) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Try recording `query_kind` in `system.query_log` even when query fails to start. [#27182](https://github.com/ClickHouse/ClickHouse/pull/27182) ([Amos Bird](https://github.com/amosbird)).
+* Added columns `replica_is_active` that maps replica name to is replica active status to table `system.replicas`. Closes [#27138](https://github.com/ClickHouse/ClickHouse/issues/27138). [#27180](https://github.com/ClickHouse/ClickHouse/pull/27180) ([Maksim Kita](https://github.com/kitaisreal)).
+* Allow to pass query settings via server URI in Web UI. [#27177](https://github.com/ClickHouse/ClickHouse/pull/27177) ([kolsys](https://github.com/kolsys)).
+* Add a new metric called `MaxPushedDDLEntryID` which is the maximum ddl entry id that current node push to zookeeper. [#27174](https://github.com/ClickHouse/ClickHouse/pull/27174) ([Fuwang Hu](https://github.com/fuwhu)).
+* Improved the existence condition judgment and empty string node judgment when `clickhouse-keeper` creates znode. [#27125](https://github.com/ClickHouse/ClickHouse/pull/27125) ([小路](https://github.com/nicelulu)).
+* Merge JOIN correctly handles empty set in the right. [#27078](https://github.com/ClickHouse/ClickHouse/pull/27078) ([Vladimir C](https://github.com/vdimir)).
+* Now functions can be shard-level constants, which means if it's executed in the context of some distributed table, it generates a normal column, otherwise it produces a constant value. Notable functions are: `hostName()`, `tcpPort()`, `version()`, `buildId()`, `uptime()`, etc. [#27020](https://github.com/ClickHouse/ClickHouse/pull/27020) ([Amos Bird](https://github.com/amosbird)).
+* Updated `extractAllGroupsHorizontal` - upper limit on the number of matches per row can be set via optional third argument. [#26961](https://github.com/ClickHouse/ClickHouse/pull/26961) ([Vasily Nemkov](https://github.com/Enmk)).
+* Expose `RocksDB` statistics via system.rocksdb table. Read rocksdb options from ClickHouse config (`rocksdb...` keys). NOTE: ClickHouse does not rely on RocksDB, it is just one of the additional integration storage engines. [#26821](https://github.com/ClickHouse/ClickHouse/pull/26821) ([Azat Khuzhin](https://github.com/azat)).
+* Less verbose internal RocksDB logs. NOTE: ClickHouse does not rely on RocksDB, it is just one of the additional integration storage engines. This closes [#26252](https://github.com/ClickHouse/ClickHouse/issues/26252). [#26789](https://github.com/ClickHouse/ClickHouse/pull/26789) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Changing default roles affects new sessions only. [#26759](https://github.com/ClickHouse/ClickHouse/pull/26759) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Watchdog is disabled in docker by default. Fix for not handling ctrl+c. [#26757](https://github.com/ClickHouse/ClickHouse/pull/26757) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* `SET PROFILE` now applies constraints too if they're set for a passed profile. [#26730](https://github.com/ClickHouse/ClickHouse/pull/26730) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Improve handling of `KILL QUERY` requests. [#26675](https://github.com/ClickHouse/ClickHouse/pull/26675) ([Raúl Marín](https://github.com/Algunenano)).
+* `mapPopulatesSeries` function supports `Map` type. [#26663](https://github.com/ClickHouse/ClickHouse/pull/26663) ([Ildus Kurbangaliev](https://github.com/ildus)).
+* Fix excessive (x2) connect attempts with `skip_unavailable_shards`. [#26658](https://github.com/ClickHouse/ClickHouse/pull/26658) ([Azat Khuzhin](https://github.com/azat)).
+* Avoid hanging `clickhouse-benchmark` if connection fails (i.e. on EMFILE). [#26656](https://github.com/ClickHouse/ClickHouse/pull/26656) ([Azat Khuzhin](https://github.com/azat)).
+* Allow more threads to be used by the Kafka engine. [#26642](https://github.com/ClickHouse/ClickHouse/pull/26642) ([feihengye](https://github.com/feihengye)).
+* Add round-robin support for `clickhouse-benchmark` (it does not differ from the regular multi host/port run except for statistics report). [#26607](https://github.com/ClickHouse/ClickHouse/pull/26607) ([Azat Khuzhin](https://github.com/azat)).
+* Executable dictionaries (`executable`, `executable_pool`) enable creation with DDL query using `clickhouse-local`. Closes [#22355](https://github.com/ClickHouse/ClickHouse/issues/22355). [#26510](https://github.com/ClickHouse/ClickHouse/pull/26510) ([Maksim Kita](https://github.com/kitaisreal)).
+* Set client query kind for `mysql` and `postgresql` compatibility protocol handlers. [#26498](https://github.com/ClickHouse/ClickHouse/pull/26498) ([anneji-dev](https://github.com/anneji-dev)).
+* Apply `LIMIT` on the shards for queries like `SELECT * FROM dist ORDER BY key LIMIT 10` w/ `distributed_push_down_limit=1`. Avoid running `Distinct`/`LIMIT BY` steps for queries like `SELECT DISTINCT shading_key FROM dist ORDER BY key`. Now `distributed_push_down_limit` is respected by `optimize_distributed_group_by_sharding_key` optimization. [#26466](https://github.com/ClickHouse/ClickHouse/pull/26466) ([Azat Khuzhin](https://github.com/azat)).
+* Updated protobuf to 3.17.3. Changelogs are available on https://github.com/protocolbuffers/protobuf/releases. [#26424](https://github.com/ClickHouse/ClickHouse/pull/26424) ([Ilya Yatsishin](https://github.com/qoega)).
+* Enable `use_hedged_requests` setting that allows to mitigate tail latencies on large clusters. [#26380](https://github.com/ClickHouse/ClickHouse/pull/26380) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve behaviour with non-existing host in user allowed host list. [#26368](https://github.com/ClickHouse/ClickHouse/pull/26368) ([ianton-ru](https://github.com/ianton-ru)).
+* Add ability to set `Distributed` directory monitor settings via CREATE TABLE (i.e. `CREATE TABLE dist (key Int) Engine=Distributed(cluster, db, table) SETTINGS monitor_batch_inserts=1` and similar). [#26336](https://github.com/ClickHouse/ClickHouse/pull/26336) ([Azat Khuzhin](https://github.com/azat)).
+* Save server address in history URLs in web UI if it differs from the origin of web UI. This closes [#26044](https://github.com/ClickHouse/ClickHouse/issues/26044). [#26322](https://github.com/ClickHouse/ClickHouse/pull/26322) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add events to profile calls to `sleep` / `sleepEachRow`. [#26320](https://github.com/ClickHouse/ClickHouse/pull/26320) ([Raúl Marín](https://github.com/Algunenano)).
+* Allow to reuse connections of shards among different clusters. It also avoids creating new connections when using `cluster` table function. [#26318](https://github.com/ClickHouse/ClickHouse/pull/26318) ([Amos Bird](https://github.com/amosbird)).
+* Control the execution period of clear old temporary directories by parameter with default value. [#26212](https://github.com/ClickHouse/ClickHouse/issues/26212). [#26313](https://github.com/ClickHouse/ClickHouse/pull/26313) ([fastio](https://github.com/fastio)).
+* Add a setting `function_range_max_elements_in_block` to tune the safety threshold for data volume generated by function `range`. This closes [#26303](https://github.com/ClickHouse/ClickHouse/issues/26303). [#26305](https://github.com/ClickHouse/ClickHouse/pull/26305) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Check hash function at table creation, not at sampling. Add settings for MergeTree, if someone create a table with incorrect sampling column but sampling never be used, disable this settings for starting the server without exception. [#26256](https://github.com/ClickHouse/ClickHouse/pull/26256) ([zhaoyu](https://github.com/zxc111)).
+* Added `output_format_avro_string_column_pattern` setting to put specified String columns to Avro as string instead of default bytes. Implements [#22414](https://github.com/ClickHouse/ClickHouse/issues/22414). [#26245](https://github.com/ClickHouse/ClickHouse/pull/26245) ([Ilya Golshtein](https://github.com/ilejn)).
+* Add information about column sizes in `system.columns` table for `Log` and `TinyLog` tables. This closes [#9001](https://github.com/ClickHouse/ClickHouse/issues/9001). [#26241](https://github.com/ClickHouse/ClickHouse/pull/26241) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Don't throw exception when querying `system.detached_parts` table if there is custom disk configuration and `detached` directory does not exist on some disks. This closes [#26078](https://github.com/ClickHouse/ClickHouse/issues/26078). [#26236](https://github.com/ClickHouse/ClickHouse/pull/26236) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Check for non-deterministic functions in keys, including constant expressions like `now()`, `today()`. This closes [#25875](https://github.com/ClickHouse/ClickHouse/issues/25875). This closes [#11333](https://github.com/ClickHouse/ClickHouse/issues/11333). [#26235](https://github.com/ClickHouse/ClickHouse/pull/26235) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* convert timestamp and timestamptz data types to `DateTime64` in PostgreSQL table engine. [#26234](https://github.com/ClickHouse/ClickHouse/pull/26234) ([jasine](https://github.com/jasine)).
+* Apply aggressive IN index analysis for projections so that better projection candidate can be selected. [#26218](https://github.com/ClickHouse/ClickHouse/pull/26218) ([Amos Bird](https://github.com/amosbird)).
+* Remove GLOBAL keyword for IN when scalar function is passed. In previous versions, if user specified `GLOBAL IN f(x)` exception was thrown. [#26217](https://github.com/ClickHouse/ClickHouse/pull/26217) ([Amos Bird](https://github.com/amosbird)).
+* Add error id (like `BAD_ARGUMENTS`) to exception messages. This closes [#25862](https://github.com/ClickHouse/ClickHouse/issues/25862). [#26172](https://github.com/ClickHouse/ClickHouse/pull/26172) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix incorrect output with --progress option for clickhouse-local. Progress bar will be cleared once it gets to 100% - same as it is done for clickhouse-client. Closes [#17484](https://github.com/ClickHouse/ClickHouse/issues/17484). [#26128](https://github.com/ClickHouse/ClickHouse/pull/26128) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add `merge_selecting_sleep_ms` setting. [#26120](https://github.com/ClickHouse/ClickHouse/pull/26120) ([lthaooo](https://github.com/lthaooo)).
+* Remove complicated usage of Linux AIO with one block readahead and replace it with plain simple synchronous IO with O_DIRECT. In previous versions, the setting `min_bytes_to_use_direct_io` may not work correctly if `max_threads` is greater than one. Reading with direct IO (that is disabled by default for queries and enabled by default for large merges) will work in less efficient way. This closes [#25997](https://github.com/ClickHouse/ClickHouse/issues/25997). [#26003](https://github.com/ClickHouse/ClickHouse/pull/26003) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Flush `Distributed` table on `REPLACE TABLE` query. Resolves [#24566](https://github.com/ClickHouse/ClickHouse/issues/24566) - Do not replace (or create) table on `[CREATE OR] REPLACE TABLE ... AS SELECT` query if insertion into new table fails. Resolves [#23175](https://github.com/ClickHouse/ClickHouse/issues/23175). [#25895](https://github.com/ClickHouse/ClickHouse/pull/25895) ([tavplubix](https://github.com/tavplubix)).
+* Add `views` column to system.query_log containing the names of the (materialized or live) views executed by the query. Adds a new log table (`system.query_views_log`) that contains information about each view executed during a query. Modifies view execution: When an exception is thrown while executing a view, any view that has already startedwill continue running until it finishes. This used to be the behaviour under parallel_view_processing=true and now it's always the same behaviour. - Dependent views now report reading progress to the context. [#25714](https://github.com/ClickHouse/ClickHouse/pull/25714) ([Raúl Marín](https://github.com/Algunenano)).
+* Do connection draining asynchonously upon finishing executing distributed queries. A new server setting is added `max_threads_for_connection_collector` which specifies the number of workers to recycle connections in background. If the pool is full, connection will be drained synchronously but a bit different than before: It's drained after we send EOS to client, query will succeed immediately after receiving enough data, and any exception will be logged instead of throwing to the client. Added setting `drain_timeout` (3 seconds by default). Connection draining will disconnect upon timeout. [#25674](https://github.com/ClickHouse/ClickHouse/pull/25674) ([Amos Bird](https://github.com/amosbird)).
+* Support for multiple includes in configuration. It is possible to include users configuration, remote servers configuration from multiple sources. Simply place `<include />` element with `from_zk`, `from_env` or `incl` attribute and it will be replaced with the substitution. [#24404](https://github.com/ClickHouse/ClickHouse/pull/24404) ([nvartolomei](https://github.com/nvartolomei)).
+* Fix multiple block insertion into distributed table with `insert_distributed_one_random_shard = 1`. This is a marginal feature. Mark as improvement. [#23140](https://github.com/ClickHouse/ClickHouse/pull/23140) ([Amos Bird](https://github.com/amosbird)).
+* Support `LowCardinality` and `FixedString` keys/values for `Map` type. [#21543](https://github.com/ClickHouse/ClickHouse/pull/21543) ([hexiaoting](https://github.com/hexiaoting)).
+* Enable reloading of local disk config. [#19526](https://github.com/ClickHouse/ClickHouse/pull/19526) ([taiyang-li](https://github.com/taiyang-li)).
+* Now KeyConditions can correctly skip nullable keys, including `isNull` and `isNotNull`. https://github.com/ClickHouse/ClickHouse/pull/12433. [#12455](https://github.com/ClickHouse/ClickHouse/pull/12455) ([Amos Bird](https://github.com/amosbird)).
+
+#### Bug Fix
+
+* Fix a couple of bugs that may cause replicas to diverge. [#27808](https://github.com/ClickHouse/ClickHouse/pull/27808) ([tavplubix](https://github.com/tavplubix)).
+* Fix a rare bug in `DROP PART` which can lead to the error `Unexpected merged part intersects drop range`. [#27807](https://github.com/ClickHouse/ClickHouse/pull/27807) ([alesapin](https://github.com/alesapin)).
+* Prevent crashes for some formats when NULL (tombstone) message was coming from Kafka. Closes [#19255](https://github.com/ClickHouse/ClickHouse/issues/19255). [#27794](https://github.com/ClickHouse/ClickHouse/pull/27794) ([filimonov](https://github.com/filimonov)).
+* Fix column filtering with union distinct in subquery. Closes [#27578](https://github.com/ClickHouse/ClickHouse/issues/27578). [#27689](https://github.com/ClickHouse/ClickHouse/pull/27689) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bad type cast when functions like `arrayHas` are applied to arrays of LowCardinality of Nullable of different non-numeric types like `DateTime` and `DateTime64`. In previous versions bad cast occurs. In new version it will lead to exception. This closes [#26330](https://github.com/ClickHouse/ClickHouse/issues/26330). [#27682](https://github.com/ClickHouse/ClickHouse/pull/27682) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix postgresql table function resulting in non-closing connections. Closes [#26088](https://github.com/ClickHouse/ClickHouse/issues/26088). [#27662](https://github.com/ClickHouse/ClickHouse/pull/27662) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fixed another case of `Unexpected merged part ... intersecting drop range ...` error. [#27656](https://github.com/ClickHouse/ClickHouse/pull/27656) ([tavplubix](https://github.com/tavplubix)).
+* Fix an error with aliased column in `Distributed` table. [#27652](https://github.com/ClickHouse/ClickHouse/pull/27652) ([Vladimir C](https://github.com/vdimir)).
+* After setting `max_memory_usage*` to non-zero value it was not possible to reset it back to 0 (unlimited). It's fixed. [#27638](https://github.com/ClickHouse/ClickHouse/pull/27638) ([tavplubix](https://github.com/tavplubix)).
+* Fixed underflow of the time value when constructing it from components. Closes [#27193](https://github.com/ClickHouse/ClickHouse/issues/27193). [#27605](https://github.com/ClickHouse/ClickHouse/pull/27605) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fix crash during projection materialization when some parts contain missing columns. This fixes [#27512](https://github.com/ClickHouse/ClickHouse/issues/27512). [#27528](https://github.com/ClickHouse/ClickHouse/pull/27528) ([Amos Bird](https://github.com/amosbird)).
+* fix metric `BackgroundMessageBrokerSchedulePoolTask`, maybe mistyped. [#27452](https://github.com/ClickHouse/ClickHouse/pull/27452) ([Ben](https://github.com/benbiti)).
+* Fix distributed queries with zero shards and aggregation. [#27427](https://github.com/ClickHouse/ClickHouse/pull/27427) ([Azat Khuzhin](https://github.com/azat)).
+* Compatibility when `/proc/meminfo` does not contain KB suffix. [#27361](https://github.com/ClickHouse/ClickHouse/pull/27361) ([Mike Kot](https://github.com/myrrc)).
+* Fix incorrect result for query with row-level security, PREWHERE and LowCardinality filter. Fixes [#27179](https://github.com/ClickHouse/ClickHouse/issues/27179). [#27329](https://github.com/ClickHouse/ClickHouse/pull/27329) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed incorrect validation of partition id for MergeTree tables that created with old syntax. [#27328](https://github.com/ClickHouse/ClickHouse/pull/27328) ([tavplubix](https://github.com/tavplubix)).
+* Fix MySQL protocol when using parallel formats (CSV / TSV). [#27326](https://github.com/ClickHouse/ClickHouse/pull/27326) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix `Cannot find column` error for queries with sampling. Was introduced in [#24574](https://github.com/ClickHouse/ClickHouse/issues/24574). Fixes [#26522](https://github.com/ClickHouse/ClickHouse/issues/26522). [#27301](https://github.com/ClickHouse/ClickHouse/pull/27301) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix errors like `Expected ColumnLowCardinality, gotUInt8` or `Bad cast from type DB::ColumnVector<char8_t> to DB::ColumnLowCardinality` for some queries with `LowCardinality` in `PREWHERE`. And more importantly, fix the lack of whitespace in the error message. Fixes [#23515](https://github.com/ClickHouse/ClickHouse/issues/23515). [#27298](https://github.com/ClickHouse/ClickHouse/pull/27298) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `distributed_group_by_no_merge = 2` with `distributed_push_down_limit = 1` or `optimize_distributed_group_by_sharding_key = 1` with `LIMIT BY` and `LIMIT OFFSET`. [#27249](https://github.com/ClickHouse/ClickHouse/pull/27249) ([Azat Khuzhin](https://github.com/azat)). These are obscure combination of settings that no one is using.
+* Fix mutation stuck on invalid partitions in non-replicated MergeTree. [#27248](https://github.com/ClickHouse/ClickHouse/pull/27248) ([Azat Khuzhin](https://github.com/azat)).
+* In case of ambiguity, lambda functions prefer its arguments to other aliases or identifiers. [#27235](https://github.com/ClickHouse/ClickHouse/pull/27235) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix column structure in merge join, close [#27091](https://github.com/ClickHouse/ClickHouse/issues/27091). [#27217](https://github.com/ClickHouse/ClickHouse/pull/27217) ([Vladimir C](https://github.com/vdimir)).
+* In rare cases `system.detached_parts` table might contain incorrect information for some parts, it's fixed. Fixes [#27114](https://github.com/ClickHouse/ClickHouse/issues/27114). [#27183](https://github.com/ClickHouse/ClickHouse/pull/27183) ([tavplubix](https://github.com/tavplubix)).
+* Fix uninitialized memory in functions `multiSearch*` with empty array, close [#27169](https://github.com/ClickHouse/ClickHouse/issues/27169). [#27181](https://github.com/ClickHouse/ClickHouse/pull/27181) ([Vladimir C](https://github.com/vdimir)).
+* Fix synchronization in GRPCServer. This PR fixes [#27024](https://github.com/ClickHouse/ClickHouse/issues/27024). [#27064](https://github.com/ClickHouse/ClickHouse/pull/27064) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed `cache`, `complex_key_cache`, `ssd_cache`, `complex_key_ssd_cache` configuration parsing. Options `allow_read_expired_keys`, `max_update_queue_size`, `update_queue_push_timeout_milliseconds`, `query_wait_timeout_milliseconds` were not parsed for dictionaries with non `cache` type. [#27032](https://github.com/ClickHouse/ClickHouse/pull/27032) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix possible mutation stack due to race with DROP_RANGE. [#27002](https://github.com/ClickHouse/ClickHouse/pull/27002) ([Azat Khuzhin](https://github.com/azat)).
+* Now partition ID in queries like `ALTER TABLE ... PARTITION ID xxx` validates for correctness. Fixes [#25718](https://github.com/ClickHouse/ClickHouse/issues/25718). [#26963](https://github.com/ClickHouse/ClickHouse/pull/26963) ([alesapin](https://github.com/alesapin)).
+* Fix "Unknown column name" error with multiple JOINs in some cases, close [#26899](https://github.com/ClickHouse/ClickHouse/issues/26899). [#26957](https://github.com/ClickHouse/ClickHouse/pull/26957) ([Vladimir C](https://github.com/vdimir)).
+* Fix reading of custom TLDs (stops processing with lower buffer or bigger file). [#26948](https://github.com/ClickHouse/ClickHouse/pull/26948) ([Azat Khuzhin](https://github.com/azat)).
+* Fix error `Missing columns: 'xxx'` when `DEFAULT` column references other non materialized column without `DEFAULT` expression. Fixes [#26591](https://github.com/ClickHouse/ClickHouse/issues/26591). [#26900](https://github.com/ClickHouse/ClickHouse/pull/26900) ([alesapin](https://github.com/alesapin)).
+* Fix loading of dictionary keys in `library-bridge` for `library` dictionary source. [#26834](https://github.com/ClickHouse/ClickHouse/pull/26834) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Aggregate function parameters might be lost when applying some combinators causing exceptions like `Conversion from AggregateFunction(topKArray, Array(String)) to AggregateFunction(topKArray(10), Array(String)) is not supported`. It's fixed. Fixes [#26196](https://github.com/ClickHouse/ClickHouse/issues/26196) and [#26433](https://github.com/ClickHouse/ClickHouse/issues/26433). [#26814](https://github.com/ClickHouse/ClickHouse/pull/26814) ([tavplubix](https://github.com/tavplubix)).
+* Add `event_time_microseconds` value for `REMOVE_PART` in `system.part_log`. In previous versions is was not set. [#26720](https://github.com/ClickHouse/ClickHouse/pull/26720) ([Azat Khuzhin](https://github.com/azat)).
+* Do not remove data on ReplicatedMergeTree table shutdown to avoid creating data to metadata inconsistency. [#26716](https://github.com/ClickHouse/ClickHouse/pull/26716) ([nvartolomei](https://github.com/nvartolomei)).
+* Sometimes `SET ROLE` could work incorrectly, this PR fixes that. [#26707](https://github.com/ClickHouse/ClickHouse/pull/26707) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Some fixes for parallel formatting (https://github.com/ClickHouse/ClickHouse/issues/26694). [#26703](https://github.com/ClickHouse/ClickHouse/pull/26703) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix potential nullptr dereference in window functions. This fixes [#25276](https://github.com/ClickHouse/ClickHouse/issues/25276). [#26668](https://github.com/ClickHouse/ClickHouse/pull/26668) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix clickhouse-client history file conversion (when upgrading from the format of 3 years old version of clickhouse-client) if file is empty. [#26589](https://github.com/ClickHouse/ClickHouse/pull/26589) ([Azat Khuzhin](https://github.com/azat)).
+* Fix incorrect function names of groupBitmapAnd/Or/Xor (can be displayed in some occasions). This fixes. [#26557](https://github.com/ClickHouse/ClickHouse/pull/26557) ([Amos Bird](https://github.com/amosbird)).
+* Update `chown` cmd check in clickhouse-server docker entrypoint. It fixes the bug that cluster pod restart failed (or timeout) on kubernetes. [#26545](https://github.com/ClickHouse/ClickHouse/pull/26545) ([Ky Li](https://github.com/Kylinrix)).
+* Fix crash in `RabbitMQ` shutdown in case `RabbitMQ` setup was not started. Closes [#26504](https://github.com/ClickHouse/ClickHouse/issues/26504). [#26529](https://github.com/ClickHouse/ClickHouse/pull/26529) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix issues with `CREATE DICTIONARY` query if dictionary name or database name was quoted. Closes [#26491](https://github.com/ClickHouse/ClickHouse/issues/26491). [#26508](https://github.com/ClickHouse/ClickHouse/pull/26508) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix broken column name resolution after rewriting column aliases. This fixes [#26432](https://github.com/ClickHouse/ClickHouse/issues/26432). [#26475](https://github.com/ClickHouse/ClickHouse/pull/26475) ([Amos Bird](https://github.com/amosbird)).
+* Fix some fuzzed msan crash. Fixes [#22517](https://github.com/ClickHouse/ClickHouse/issues/22517). [#26428](https://github.com/ClickHouse/ClickHouse/pull/26428) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix infinite non joined block stream in `partial_merge_join` close [#26325](https://github.com/ClickHouse/ClickHouse/issues/26325). [#26374](https://github.com/ClickHouse/ClickHouse/pull/26374) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible crash when login as dropped user. This PR fixes [#26073](https://github.com/ClickHouse/ClickHouse/issues/26073). [#26363](https://github.com/ClickHouse/ClickHouse/pull/26363) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix `optimize_distributed_group_by_sharding_key` for multiple columns (leads to incorrect result w/ `optimize_skip_unused_shards=1`/`allow_nondeterministic_optimize_skip_unused_shards=1` and multiple columns in sharding key expression). [#26353](https://github.com/ClickHouse/ClickHouse/pull/26353) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed rare bug in lost replica recovery that may cause replicas to diverge. [#26321](https://github.com/ClickHouse/ClickHouse/pull/26321) ([tavplubix](https://github.com/tavplubix)).
+* Fix zstd decompression (for import/export in zstd framing format that is unrelated to tables data) in case there are escape sequences at the end of internal buffer. Closes [#26013](https://github.com/ClickHouse/ClickHouse/issues/26013). [#26314](https://github.com/ClickHouse/ClickHouse/pull/26314) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix logical error on join with totals, close [#26017](https://github.com/ClickHouse/ClickHouse/issues/26017). [#26250](https://github.com/ClickHouse/ClickHouse/pull/26250) ([Vladimir C](https://github.com/vdimir)).
+* Remove excessive newline in `thread_name` column in `system.stack_trace` table. This fixes [#24124](https://github.com/ClickHouse/ClickHouse/issues/24124). [#26210](https://github.com/ClickHouse/ClickHouse/pull/26210) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential crash if more than one `untuple` expression is used. [#26179](https://github.com/ClickHouse/ClickHouse/pull/26179) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Don't throw exception in `toString` for Nullable Enum if Enum does not have a value for zero, close [#25806](https://github.com/ClickHouse/ClickHouse/issues/25806). [#26123](https://github.com/ClickHouse/ClickHouse/pull/26123) ([Vladimir C](https://github.com/vdimir)).
+* Fixed incorrect `sequence_id` in MySQL protocol packets that ClickHouse sends on exception during query execution. It might cause MySQL client to reset connection to ClickHouse server. Fixes [#21184](https://github.com/ClickHouse/ClickHouse/issues/21184). [#26051](https://github.com/ClickHouse/ClickHouse/pull/26051) ([tavplubix](https://github.com/tavplubix)).
+* Fix for the case that `cutToFirstSignificantSubdomainCustom()`/`cutToFirstSignificantSubdomainCustomWithWWW()`/`firstSignificantSubdomainCustom()` returns incorrect type for consts, and hence `optimize_skip_unused_shards` does not work:. [#26041](https://github.com/ClickHouse/ClickHouse/pull/26041) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible mismatched header when using normal projection with prewhere. This fixes [#26020](https://github.com/ClickHouse/ClickHouse/issues/26020). [#26038](https://github.com/ClickHouse/ClickHouse/pull/26038) ([Amos Bird](https://github.com/amosbird)).
+* Fix sharding_key from column w/o function for remote() (before `select * from remote('127.1', system.one, dummy)` leads to `Unknown column: dummy, there are only columns .` error). [#25824](https://github.com/ClickHouse/ClickHouse/pull/25824) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `Not found column ...` and `Missing column ...` errors when selecting from `MaterializeMySQL`. Fixes [#23708](https://github.com/ClickHouse/ClickHouse/issues/23708), [#24830](https://github.com/ClickHouse/ClickHouse/issues/24830), [#25794](https://github.com/ClickHouse/ClickHouse/issues/25794). [#25822](https://github.com/ClickHouse/ClickHouse/pull/25822) ([tavplubix](https://github.com/tavplubix)).
+* Fix `optimize_skip_unused_shards_rewrite_in` for non-UInt64 types (may select incorrect shards eventually or throw `Cannot infer type of an empty tuple` or `Function tuple requires at least one argument`). [#25798](https://github.com/ClickHouse/ClickHouse/pull/25798) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Build/Testing/Packaging Improvement
+
+* Now we ran stateful and stateless tests in random timezones. Fixes [#12439](https://github.com/ClickHouse/ClickHouse/issues/12439). Reading String as DateTime and writing DateTime as String in Protobuf format now respect timezone. Reading UInt16 as DateTime in Arrow and Parquet formats now treat it as Date and then converts to DateTime with respect to DateTime's timezone, because Date is serialized in Arrow and Parquet as UInt16. GraphiteMergeTree now respect time zone for rounding of times. Fixes [#5098](https://github.com/ClickHouse/ClickHouse/issues/5098). Author: @alexey-milovidov. [#15408](https://github.com/ClickHouse/ClickHouse/pull/15408) ([alesapin](https://github.com/alesapin)).
+* `clickhouse-test` supports SQL tests with [Jinja2](https://jinja.palletsprojects.com/en/3.0.x/templates/#synopsis) templates. [#26579](https://github.com/ClickHouse/ClickHouse/pull/26579) ([Vladimir C](https://github.com/vdimir)).
+* Add support for build with `clang-13`. This closes [#27705](https://github.com/ClickHouse/ClickHouse/issues/27705). [#27714](https://github.com/ClickHouse/ClickHouse/pull/27714) ([alexey-milovidov](https://github.com/alexey-milovidov)). [#27777](https://github.com/ClickHouse/ClickHouse/pull/27777) ([Sergei Semin](https://github.com/syominsergey))
+* Add CMake options to build with or without specific CPU instruction set. This is for [#17469](https://github.com/ClickHouse/ClickHouse/issues/17469) and [#27509](https://github.com/ClickHouse/ClickHouse/issues/27509). [#27508](https://github.com/ClickHouse/ClickHouse/pull/27508) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix linking of auxiliar programs when using dynamic libraries. [#26958](https://github.com/ClickHouse/ClickHouse/pull/26958) ([Raúl Marín](https://github.com/Algunenano)).
+* Update RocksDB to `2021-07-16` master. [#26411](https://github.com/ClickHouse/ClickHouse/pull/26411) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+
 ### ClickHouse release v21.8, 2021-08-12
 
 #### Upgrade Notes
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de517b1b589..9c8903d853c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,16 +80,16 @@ include (cmake/find/ccache.cmake)
 # ccache ignore it.
 option(ENABLE_CHECK_HEAVY_BUILDS "Don't allow C++ translation units to compile too long or to take too much memory while compiling." OFF)
 if (ENABLE_CHECK_HEAVY_BUILDS)
-    # set DATA (since RSS does not work since 2.6.x+) to 2G
+    # set DATA (since RSS does not work since 2.6.x+) to 5G
     set (RLIMIT_DATA 5000000000)
     # set VIRT (RLIMIT_AS) to 10G (DATA*10)
     set (RLIMIT_AS 10000000000)
-    # set CPU time limit to 600 seconds
-    set (RLIMIT_CPU 600)
+    # set CPU time limit to 1000 seconds
+    set (RLIMIT_CPU 1000)
 
     # gcc10/gcc10/clang -fsanitize=memory is too heavy
     if (SANITIZE STREQUAL "memory" OR COMPILER_GCC)
-       set (RLIMIT_DATA 10000000000)
+       set (RLIMIT_DATA 10000000000) # 10G
     endif()
 
     set (CMAKE_CXX_COMPILER_LAUNCHER prlimit --as=${RLIMIT_AS} --data=${RLIMIT_DATA} --cpu=${RLIMIT_CPU} ${CMAKE_CXX_COMPILER_LAUNCHER})
@@ -152,6 +152,7 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND NOT DISABLE_COLORED_BUILD)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
 endif ()
 
+include (cmake/check_flags.cmake)
 include (cmake/add_warning.cmake)
 
 if (NOT MSVC)
@@ -165,6 +166,14 @@ if (COMPILER_CLANG)
     if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
         set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
     endif ()
+
+    if (HAS_USE_CTOR_HOMING)
+        # For more info see https://blog.llvm.org/posts/2021-04-05-constructor-homing-for-debug-info/
+		if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
+            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
+        endif()
+    endif()
 endif ()
 
 # If turned `ON`, assumes the user has either the system GTest library or the bundled one.
@@ -185,7 +194,7 @@ endif ()
 # Make sure the final executable has symbols exported
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
 
-find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-12" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
+find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-13" "llvm-objcopy-12" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
 
 if (NOT OBJCOPY_PATH AND OS_DARWIN)
     find_program (BREW_PATH NAMES "brew")
@@ -372,7 +381,7 @@ if (COMPILER_CLANG)
     endif ()
 
     # Always prefer llvm tools when using clang. For instance, we cannot use GNU ar when llvm LTO is enabled
-    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
 
     if (LLVM_AR_PATH)
         message(STATUS "Using llvm-ar: ${LLVM_AR_PATH}.")
@@ -381,7 +390,7 @@ if (COMPILER_CLANG)
         message(WARNING "Cannot find llvm-ar. System ar will be used instead. It does not work with ThinLTO.")
     endif ()
 
-    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
+    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
 
     if (LLVM_RANLIB_PATH)
         message(STATUS "Using llvm-ranlib: ${LLVM_RANLIB_PATH}.")
@@ -622,9 +631,6 @@ include_directories(${ConfigIncludePath})
 # Add as many warnings as possible for our own code.
 include (cmake/warnings.cmake)
 
-# Check if needed compiler flags are supported
-include (cmake/check_flags.cmake)
-
 add_subdirectory (base)
 add_subdirectory (src)
 add_subdirectory (programs)
diff --git a/LICENSE b/LICENSE
index 9167b80e269..c46bc7d19e1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2016-2021 Yandex LLC
+Copyright 2016-2021 ClickHouse, Inc.
 
                                  Apache License
                            Version 2.0, January 2004
diff --git a/SECURITY.md b/SECURITY.md
index 846b7e8239c..0405d5cf8fc 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -28,15 +28,16 @@ The following versions of ClickHouse server are currently being supported with s
 | 21.3   | ✅ |
 | 21.4   | :x: |
 | 21.5   | :x: |
-| 21.6   | ✅ |
+| 21.6   | :x: |
 | 21.7   | ✅ |
 | 21.8   | ✅ |
+| 21.9   | ✅ |
 
 ## Reporting a Vulnerability
 
 We're extremely grateful for security researchers and users that report vulnerabilities to the ClickHouse Open Source Community. All reports are thoroughly investigated by developers.
 
-To report a potential vulnerability in ClickHouse please send the details about it to [clickhouse-feedback@yandex-team.com](mailto:clickhouse-feedback@yandex-team.com).
+To report a potential vulnerability in ClickHouse please send the details about it to [security@clickhouse.com](mailto:security@clickhouse.com).
 
 ### When Should I Report a Vulnerability?
 
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index e5e18669ebe..202a2dff56f 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -85,6 +85,7 @@ target_link_libraries (common
         replxx
         cctz
         fmt
+        magic_enum
 )
 
 if (ENABLE_TESTS)
diff --git a/base/common/Decimal.h b/base/common/Decimal.h
new file mode 100644
index 00000000000..e856abf23c7
--- /dev/null
+++ b/base/common/Decimal.h
@@ -0,0 +1,157 @@
+#pragma once
+#include "common/extended_types.h"
+
+#if !defined(NO_SANITIZE_UNDEFINED)
+#if defined(__clang__)
+    #define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
+#else
+    #define NO_SANITIZE_UNDEFINED
+#endif
+#endif
+
+namespace DB
+{
+template <class> struct Decimal;
+class DateTime64;
+
+using Decimal32 = Decimal<Int32>;
+using Decimal64 = Decimal<Int64>;
+using Decimal128 = Decimal<Int128>;
+using Decimal256 = Decimal<Int256>;
+
+template <class T>
+concept is_decimal =
+    std::is_same_v<T, Decimal32>
+    || std::is_same_v<T, Decimal64>
+    || std::is_same_v<T, Decimal128>
+    || std::is_same_v<T, Decimal256>
+    || std::is_same_v<T, DateTime64>;
+
+template <class T>
+concept is_over_big_int =
+    std::is_same_v<T, Int128>
+    || std::is_same_v<T, UInt128>
+    || std::is_same_v<T, Int256>
+    || std::is_same_v<T, UInt256>
+    || std::is_same_v<T, Decimal128>
+    || std::is_same_v<T, Decimal256>;
+
+template <class T> struct NativeTypeT { using Type = T; };
+template <is_decimal T> struct NativeTypeT<T> { using Type = typename T::NativeType; };
+template <class T> using NativeType = typename NativeTypeT<T>::Type;
+
+/// Own FieldType for Decimal.
+/// It is only a "storage" for decimal.
+/// To perform operations, you also have to provide a scale (number of digits after point).
+template <typename T>
+struct Decimal
+{
+    using NativeType = T;
+
+    constexpr Decimal() = default;
+    constexpr Decimal(Decimal<T> &&) = default;
+    constexpr Decimal(const Decimal<T> &) = default;
+
+    constexpr Decimal(const T & value_): value(value_) {}
+
+    template <typename U>
+    constexpr Decimal(const Decimal<U> & x): value(x.value) {}
+
+    constexpr Decimal<T> & operator = (Decimal<T> &&) = default;
+    constexpr Decimal<T> & operator = (const Decimal<T> &) = default;
+
+    constexpr operator T () const { return value; }
+
+    template <typename U>
+    constexpr U convertTo() const
+    {
+        if constexpr (is_decimal<U>)
+            return convertTo<typename U::NativeType>();
+        else
+            return static_cast<U>(value);
+    }
+
+    const Decimal<T> & operator += (const T & x) { value += x; return *this; }
+    const Decimal<T> & operator -= (const T & x) { value -= x; return *this; }
+    const Decimal<T> & operator *= (const T & x) { value *= x; return *this; }
+    const Decimal<T> & operator /= (const T & x) { value /= x; return *this; }
+    const Decimal<T> & operator %= (const T & x) { value %= x; return *this; }
+
+    template <typename U> const Decimal<T> & operator += (const Decimal<U> & x) { value += x.value; return *this; }
+    template <typename U> const Decimal<T> & operator -= (const Decimal<U> & x) { value -= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator *= (const Decimal<U> & x) { value *= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator /= (const Decimal<U> & x) { value /= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator %= (const Decimal<U> & x) { value %= x.value; return *this; }
+
+    /// This is to avoid UB for sumWithOverflow()
+    void NO_SANITIZE_UNDEFINED addOverflow(const T & x) { value += x; }
+
+    T value;
+};
+
+template <typename T> inline bool operator< (const Decimal<T> & x, const Decimal<T> & y) { return x.value < y.value; }
+template <typename T> inline bool operator> (const Decimal<T> & x, const Decimal<T> & y) { return x.value > y.value; }
+template <typename T> inline bool operator<= (const Decimal<T> & x, const Decimal<T> & y) { return x.value <= y.value; }
+template <typename T> inline bool operator>= (const Decimal<T> & x, const Decimal<T> & y) { return x.value >= y.value; }
+template <typename T> inline bool operator== (const Decimal<T> & x, const Decimal<T> & y) { return x.value == y.value; }
+template <typename T> inline bool operator!= (const Decimal<T> & x, const Decimal<T> & y) { return x.value != y.value; }
+
+template <typename T> inline Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y) { return x.value + y.value; }
+template <typename T> inline Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y) { return x.value - y.value; }
+template <typename T> inline Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y) { return x.value * y.value; }
+template <typename T> inline Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
+template <typename T> inline Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
+
+/// Distinguishable type to allow function resolution/deduction based on value type,
+/// but also relatively easy to convert to/from Decimal64.
+class DateTime64 : public Decimal64
+{
+public:
+    using Base = Decimal64;
+    using Base::Base;
+    using NativeType = Base::NativeType;
+
+    constexpr DateTime64(const Base & v): Base(v) {}
+};
+}
+
+constexpr DB::UInt64 max_uint_mask = std::numeric_limits<DB::UInt64>::max();
+
+namespace std
+{
+    template <typename T>
+    struct hash<DB::Decimal<T>>
+    {
+        size_t operator()(const DB::Decimal<T> & x) const { return hash<T>()(x.value); }
+    };
+
+    template <>
+    struct hash<DB::Decimal128>
+    {
+        size_t operator()(const DB::Decimal128 & x) const
+        {
+            return std::hash<DB::Int64>()(x.value >> 64)
+                ^ std::hash<DB::Int64>()(x.value & max_uint_mask);
+        }
+    };
+
+    template <>
+    struct hash<DB::DateTime64>
+    {
+        size_t operator()(const DB::DateTime64 & x) const
+        {
+            return std::hash<DB::DateTime64::NativeType>()(x);
+        }
+    };
+
+    template <>
+    struct hash<DB::Decimal256>
+    {
+        size_t operator()(const DB::Decimal256 & x) const
+        {
+            // FIXME temp solution
+            return std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value >> 64 & max_uint_mask))
+                ^ std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value & max_uint_mask));
+        }
+    };
+}
diff --git a/base/common/EnumReflection.h b/base/common/EnumReflection.h
new file mode 100644
index 00000000000..0d1f8ae0a40
--- /dev/null
+++ b/base/common/EnumReflection.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <magic_enum.hpp>
+#include <fmt/format.h>
+
+template <class T> concept is_enum = std::is_enum_v<T>;
+
+namespace detail
+{
+template <is_enum E, class F, size_t ...I>
+constexpr void static_for(F && f, std::index_sequence<I...>)
+{
+    (std::forward<F>(f)(std::integral_constant<E, magic_enum::enum_value<E>(I)>()) , ...);
+}
+}
+
+/**
+ * Iterate over enum values in compile-time (compile-time switch/case, loop unrolling).
+ *
+ * @example static_for<E>([](auto enum_value) { return template_func<enum_value>(); }
+ * ^ enum_value can be used as a template parameter
+ */
+template <is_enum E, class F>
+constexpr void static_for(F && f)
+{
+    constexpr size_t count = magic_enum::enum_count<E>();
+    detail::static_for<E>(std::forward<F>(f), std::make_index_sequence<count>());
+}
+
+/// Enable printing enum values as strings via fmt + magic_enum
+template <is_enum T>
+struct fmt::formatter<T> : fmt::formatter<std::string_view>
+{
+    constexpr auto format(T value, auto& format_context)
+    {
+        return formatter<string_view>::format(magic_enum::enum_name(value), format_context);
+    }
+};
diff --git a/base/common/LineReader.cpp b/base/common/LineReader.cpp
index a32906dd5a5..7dc37322bb0 100644
--- a/base/common/LineReader.cpp
+++ b/base/common/LineReader.cpp
@@ -16,6 +16,10 @@ extern "C"
 }
 #endif
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace
 {
 
diff --git a/base/common/StringRef.h b/base/common/StringRef.h
index ac9d7c47b72..61abc268da4 100644
--- a/base/common/StringRef.h
+++ b/base/common/StringRef.h
@@ -96,6 +96,39 @@ inline bool compareSSE2x4(const char * p1, const char * p2)
 
 inline bool memequalSSE2Wide(const char * p1, const char * p2, size_t size)
 {
+    /** The order of branches and the trick with overlapping comparisons
+      * are the same as in memcpy implementation.
+      * See the comments in base/glibc-compatibility/memcpy/memcpy.h
+      */
+
+    if (size <= 16)
+    {
+        if (size >= 8)
+        {
+            /// Chunks of 8..16 bytes.
+            return unalignedLoad<uint64_t>(p1) == unalignedLoad<uint64_t>(p2)
+                && unalignedLoad<uint64_t>(p1 + size - 8) == unalignedLoad<uint64_t>(p2 + size - 8);
+        }
+        else if (size >= 4)
+        {
+            /// Chunks of 4..7 bytes.
+            return unalignedLoad<uint32_t>(p1) == unalignedLoad<uint32_t>(p2)
+                && unalignedLoad<uint32_t>(p1 + size - 4) == unalignedLoad<uint32_t>(p2 + size - 4);
+        }
+        else if (size >= 2)
+        {
+            /// Chunks of 2..3 bytes.
+            return unalignedLoad<uint16_t>(p1) == unalignedLoad<uint16_t>(p2)
+                && unalignedLoad<uint16_t>(p1 + size - 2) == unalignedLoad<uint16_t>(p2 + size - 2);
+        }
+        else if (size >= 1)
+        {
+            /// A single byte.
+            return *p1 == *p2;
+        }
+        return true;
+    }
+
     while (size >= 64)
     {
         if (compareSSE2x4(p1, p2))
@@ -108,39 +141,14 @@ inline bool memequalSSE2Wide(const char * p1, const char * p2, size_t size)
             return false;
     }
 
-    switch ((size % 64) / 16)
+    switch (size / 16)
     {
         case 3: if (!compareSSE2(p1 + 32, p2 + 32)) return false; [[fallthrough]];
         case 2: if (!compareSSE2(p1 + 16, p2 + 16)) return false; [[fallthrough]];
-        case 1: if (!compareSSE2(p1     , p2     )) return false; [[fallthrough]];
-        case 0: break;
+        case 1: if (!compareSSE2(p1, p2)) return false;
     }
 
-    p1 += (size % 64) / 16 * 16;
-    p2 += (size % 64) / 16 * 16;
-
-    switch (size % 16)
-    {
-        case 15: if (p1[14] != p2[14]) return false; [[fallthrough]];
-        case 14: if (p1[13] != p2[13]) return false; [[fallthrough]];
-        case 13: if (p1[12] != p2[12]) return false; [[fallthrough]];
-        case 12: if (unalignedLoad<uint32_t>(p1 + 8) == unalignedLoad<uint32_t>(p2 + 8)) goto l8; else return false;
-        case 11: if (p1[10] != p2[10]) return false; [[fallthrough]];
-        case 10: if (p1[9] != p2[9]) return false; [[fallthrough]];
-        case 9:  if (p1[8] != p2[8]) return false;
-        l8: [[fallthrough]];
-        case 8:  return unalignedLoad<uint64_t>(p1) == unalignedLoad<uint64_t>(p2);
-        case 7:  if (p1[6] != p2[6]) return false; [[fallthrough]];
-        case 6:  if (p1[5] != p2[5]) return false; [[fallthrough]];
-        case 5:  if (p1[4] != p2[4]) return false; [[fallthrough]];
-        case 4:  return unalignedLoad<uint32_t>(p1) == unalignedLoad<uint32_t>(p2);
-        case 3:  if (p1[2] != p2[2]) return false; [[fallthrough]];
-        case 2:  return unalignedLoad<uint16_t>(p1) == unalignedLoad<uint16_t>(p2);
-        case 1:  if (p1[0] != p2[0]) return false; [[fallthrough]];
-        case 0:  break;
-    }
-
-    return true;
+    return compareSSE2(p1 + size - 16, p2 + size - 16);
 }
 
 #endif
diff --git a/base/common/arithmeticOverflow.h b/base/common/arithmeticOverflow.h
index 175e75a62f4..0957342bbb4 100644
--- a/base/common/arithmeticOverflow.h
+++ b/base/common/arithmeticOverflow.h
@@ -145,6 +145,19 @@ namespace common
         return __builtin_mul_overflow(x, y, &res);
     }
 
+    template <typename T, typename U, typename R>
+    inline bool mulOverflow(T x, U y, R & res)
+    {
+        // not built in type, wide integer
+        if constexpr (is_big_int_v<T>  || is_big_int_v<R> || is_big_int_v<U>)
+        {
+            res = mulIgnoreOverflow<R>(x, y);
+            return false;
+        }
+        else
+            return __builtin_mul_overflow(x, y, &res);
+    }
+
     template <>
     inline bool mulOverflow(int x, int y, int & res)
     {
diff --git a/base/common/extended_types.h b/base/common/extended_types.h
index 79209568ef5..cbd5688c491 100644
--- a/base/common/extended_types.h
+++ b/base/common/extended_types.h
@@ -41,22 +41,14 @@ template <> struct is_unsigned<UInt256> { static constexpr bool value = true; };
 template <typename T>
 inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
 
+template <class T> concept is_integer =
+    std::is_integral_v<T>
+    || std::is_same_v<T, Int128>
+    || std::is_same_v<T, UInt128>
+    || std::is_same_v<T, Int256>
+    || std::is_same_v<T, UInt256>;
 
-/// TODO: is_integral includes char, char8_t and wchar_t.
-template <typename T>
-struct is_integer
-{
-    static constexpr bool value = std::is_integral_v<T>;
-};
-
-template <> struct is_integer<Int128> { static constexpr bool value = true; };
-template <> struct is_integer<UInt128> { static constexpr bool value = true; };
-template <> struct is_integer<Int256> { static constexpr bool value = true; };
-template <> struct is_integer<UInt256> { static constexpr bool value = true; };
-
-template <typename T>
-inline constexpr bool is_integer_v = is_integer<T>::value;
-
+template <class T> concept is_floating_point = std::is_floating_point_v<T>;
 
 template <typename T>
 struct is_arithmetic
diff --git a/base/common/find_symbols.h b/base/common/find_symbols.h
index a5921b813a1..b28749afda6 100644
--- a/base/common/find_symbols.h
+++ b/base/common/find_symbols.h
@@ -36,18 +36,7 @@
 
 namespace detail
 {
-
-template <char s0>
-inline bool is_in(char x)
-{
-    return x == s0;
-}
-
-template <char s0, char s1, char... tail>
-inline bool is_in(char x)
-{
-    return x == s0 || is_in<s1, tail...>(x);
-}
+template <char ...chars> constexpr bool is_in(char x) { return ((x == chars) || ...); }
 
 #if defined(__SSE2__)
 template <char s0>
@@ -67,16 +56,10 @@ inline __m128i mm_is_in(__m128i bytes)
 #endif
 
 template <bool positive>
-bool maybe_negate(bool x)
-{
-    if constexpr (positive)
-        return x;
-    else
-        return !x;
-}
+constexpr bool maybe_negate(bool x) { return x == positive; }
 
 template <bool positive>
-uint16_t maybe_negate(uint16_t x)
+constexpr uint16_t maybe_negate(uint16_t x)
 {
     if constexpr (positive)
         return x;
@@ -149,12 +132,13 @@ template <bool positive, ReturnMode return_mode, size_t num_chars,
     char c05 = 0, char c06 = 0, char c07 = 0, char c08 = 0,
     char c09 = 0, char c10 = 0, char c11 = 0, char c12 = 0,
     char c13 = 0, char c14 = 0, char c15 = 0, char c16 = 0>
-inline const char * find_first_symbols_sse42_impl(const char * const begin, const char * const end)
+inline const char * find_first_symbols_sse42(const char * const begin, const char * const end)
 {
     const char * pos = begin;
 
 #if defined(__SSE4_2__)
-#define MODE (_SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT)
+    constexpr int mode = _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT;
+
     __m128i set = _mm_setr_epi8(c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14, c15, c16);
 
     for (; pos + 15 < end; pos += 16)
@@ -163,16 +147,15 @@ inline const char * find_first_symbols_sse42_impl(const char * const begin, cons
 
         if constexpr (positive)
         {
-            if (_mm_cmpestrc(set, num_chars, bytes, 16, MODE))
-                return pos + _mm_cmpestri(set, num_chars, bytes, 16, MODE);
+            if (_mm_cmpestrc(set, num_chars, bytes, 16, mode))
+                return pos + _mm_cmpestri(set, num_chars, bytes, 16, mode);
         }
         else
         {
-            if (_mm_cmpestrc(set, num_chars, bytes, 16, MODE | _SIDD_NEGATIVE_POLARITY))
-                return pos + _mm_cmpestri(set, num_chars, bytes, 16, MODE | _SIDD_NEGATIVE_POLARITY);
+            if (_mm_cmpestrc(set, num_chars, bytes, 16, mode | _SIDD_NEGATIVE_POLARITY))
+                return pos + _mm_cmpestri(set, num_chars, bytes, 16, mode | _SIDD_NEGATIVE_POLARITY);
         }
     }
-#undef MODE
 #endif
 
     for (; pos < end; ++pos)
@@ -197,20 +180,15 @@ inline const char * find_first_symbols_sse42_impl(const char * const begin, cons
 }
 
 
-template <bool positive, ReturnMode return_mode, char... symbols>
-inline const char * find_first_symbols_sse42(const char * begin, const char * end)
-{
-    return find_first_symbols_sse42_impl<positive, return_mode, sizeof...(symbols), symbols...>(begin, end);
-}
-
 /// NOTE No SSE 4.2 implementation for find_last_symbols_or_null. Not worth to do.
 
 template <bool positive, ReturnMode return_mode, char... symbols>
 inline const char * find_first_symbols_dispatch(const char * begin, const char * end)
+    requires(0 <= sizeof...(symbols) && sizeof...(symbols) <= 16)
 {
 #if defined(__SSE4_2__)
     if (sizeof...(symbols) >= 5)
-        return find_first_symbols_sse42<positive, return_mode, symbols...>(begin, end);
+        return find_first_symbols_sse42<positive, return_mode, sizeof...(symbols), symbols...>(begin, end);
     else
 #endif
         return find_first_symbols_sse2<positive, return_mode, symbols...>(begin, end);
diff --git a/base/common/phdr_cache.cpp b/base/common/phdr_cache.cpp
index 49d566dac19..8ca9137cd29 100644
--- a/base/common/phdr_cache.cpp
+++ b/base/common/phdr_cache.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 /// This code was based on the code by Fedor Korotkiy (prime@yandex-team.ru) for YT product in Yandex.
 
 #include <common/defines.h>
diff --git a/base/common/strong_typedef.h b/base/common/strong_typedef.h
index a1e2b253aa7..0c2e9ca7e8e 100644
--- a/base/common/strong_typedef.h
+++ b/base/common/strong_typedef.h
@@ -15,15 +15,15 @@ private:
 public:
     using UnderlyingType = T;
     template <class Enable = typename std::is_copy_constructible<T>::type>
-    explicit StrongTypedef(const T & t_) : t(t_) {}
+    constexpr explicit StrongTypedef(const T & t_) : t(t_) {}
     template <class Enable = typename std::is_move_constructible<T>::type>
-    explicit StrongTypedef(T && t_) : t(std::move(t_)) {}
+    constexpr explicit StrongTypedef(T && t_) : t(std::move(t_)) {}
 
     template <class Enable = typename std::is_default_constructible<T>::type>
-    StrongTypedef(): t() {}
+    constexpr StrongTypedef(): t() {}
 
-    StrongTypedef(const Self &) = default;
-    StrongTypedef(Self &&) = default;
+    constexpr StrongTypedef(const Self &) = default;
+    constexpr StrongTypedef(Self &&) = default;
 
     Self & operator=(const Self &) = default;
     Self & operator=(Self &&) = default;
diff --git a/base/common/unit.h b/base/common/unit.h
index d5c8d5c9027..5bf5e00c049 100644
--- a/base/common/unit.h
+++ b/base/common/unit.h
@@ -1,6 +1,10 @@
 #pragma once
 #include <cstddef>
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 constexpr size_t KiB = 1024;
 constexpr size_t MiB = 1024 * KiB;
 constexpr size_t GiB = 1024 * MiB;
diff --git a/base/common/ya.make b/base/common/ya.make
deleted file mode 100644
index fd88760c933..00000000000
--- a/base/common/ya.make
+++ /dev/null
@@ -1,63 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    GLOBAL clickhouse/base
-)
-
-CFLAGS (GLOBAL -DARCADIA_BUILD)
-
-CFLAGS (GLOBAL -DUSE_CPUID=1)
-CFLAGS (GLOBAL -DUSE_JEMALLOC=0)
-CFLAGS (GLOBAL -DUSE_RAPIDJSON=1)
-CFLAGS (GLOBAL -DUSE_SSL=1)
-
-IF (OS_DARWIN)
-    CFLAGS (GLOBAL -DOS_DARWIN)
-ELSEIF (OS_FREEBSD)
-    CFLAGS (GLOBAL -DOS_FREEBSD)
-ELSEIF (OS_LINUX)
-    CFLAGS (GLOBAL -DOS_LINUX)
-ENDIF ()
-
-PEERDIR(
-    contrib/libs/cctz
-    contrib/libs/cxxsupp/libcxx-filesystem
-    contrib/libs/poco/Net
-    contrib/libs/poco/Util
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/fmt
-    contrib/restricted/boost
-    contrib/restricted/cityhash-1.0.2
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    DateLUT.cpp
-    DateLUTImpl.cpp
-    JSON.cpp
-    LineReader.cpp
-    StringRef.cpp
-    argsToConfig.cpp
-    coverage.cpp
-    demangle.cpp
-    errnoToString.cpp
-    getFQDNOrHostName.cpp
-    getMemoryAmount.cpp
-    getPageSize.cpp
-    getResource.cpp
-    getThreadId.cpp
-    mremap.cpp
-    phdr_cache.cpp
-    preciseExp10.cpp
-    setTerminalEcho.cpp
-    shift10.cpp
-    sleep.cpp
-    terminalColors.cpp
-
-)
-
-END()
diff --git a/base/common/ya.make.in b/base/common/ya.make.in
deleted file mode 100644
index 3deb36a2c71..00000000000
--- a/base/common/ya.make.in
+++ /dev/null
@@ -1,41 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    GLOBAL clickhouse/base
-)
-
-CFLAGS (GLOBAL -DARCADIA_BUILD)
-
-CFLAGS (GLOBAL -DUSE_CPUID=1)
-CFLAGS (GLOBAL -DUSE_JEMALLOC=0)
-CFLAGS (GLOBAL -DUSE_RAPIDJSON=1)
-CFLAGS (GLOBAL -DUSE_SSL=1)
-
-IF (OS_DARWIN)
-    CFLAGS (GLOBAL -DOS_DARWIN)
-ELSEIF (OS_FREEBSD)
-    CFLAGS (GLOBAL -DOS_FREEBSD)
-ELSEIF (OS_LINUX)
-    CFLAGS (GLOBAL -DOS_LINUX)
-ENDIF ()
-
-PEERDIR(
-    contrib/libs/cctz
-    contrib/libs/cxxsupp/libcxx-filesystem
-    contrib/libs/poco/Net
-    contrib/libs/poco/Util
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/fmt
-    contrib/restricted/boost
-    contrib/restricted/cityhash-1.0.2
-)
-
-CFLAGS(-g0)
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F examples | grep -v -F Replxx | grep -v -F Readline | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/base/daemon/BaseDaemon.cpp b/base/daemon/BaseDaemon.cpp
index 745e020c8bb..141b7b7bbc6 100644
--- a/base/daemon/BaseDaemon.cpp
+++ b/base/daemon/BaseDaemon.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <daemon/BaseDaemon.h>
 #include <daemon/SentryWriter.h>
 
diff --git a/base/daemon/ya.make b/base/daemon/ya.make
deleted file mode 100644
index f3b4059f002..00000000000
--- a/base/daemon/ya.make
+++ /dev/null
@@ -1,19 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-NO_COMPILER_WARNINGS()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    BaseDaemon.cpp
-    GraphiteWriter.cpp
-    SentryWriter.cpp
-)
-
-END()
diff --git a/base/loggers/ya.make b/base/loggers/ya.make
deleted file mode 100644
index 943b6f12b73..00000000000
--- a/base/loggers/ya.make
+++ /dev/null
@@ -1,19 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    ExtendedLogChannel.cpp
-    Loggers.cpp
-    OwnFormattingChannel.cpp
-    OwnPatternFormatter.cpp
-    OwnSplitChannel.cpp
-)
-
-END()
diff --git a/base/mysqlxx/CMakeLists.txt b/base/mysqlxx/CMakeLists.txt
index c5230c2b49f..947f61f9051 100644
--- a/base/mysqlxx/CMakeLists.txt
+++ b/base/mysqlxx/CMakeLists.txt
@@ -49,6 +49,8 @@ if (NOT USE_INTERNAL_MYSQL_LIBRARY AND OPENSSL_INCLUDE_DIR)
     target_include_directories (mysqlxx SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
 endif ()
 
+target_no_warning(mysqlxx reserved-macro-identifier)
+
 if (NOT USE_INTERNAL_MYSQL_LIBRARY AND USE_STATIC_LIBRARIES)
    message(WARNING "Statically linking with system mysql/mariadb only works "
            "if mysql client libraries are built with same openssl version as "
diff --git a/base/mysqlxx/Pool.cpp b/base/mysqlxx/Pool.cpp
index 2f47aa67356..cee386311d4 100644
--- a/base/mysqlxx/Pool.cpp
+++ b/base/mysqlxx/Pool.cpp
@@ -7,10 +7,22 @@
 #endif
 
 #include <mysqlxx/Pool.h>
-
 #include <common/sleep.h>
-
 #include <Poco/Util/LayeredConfiguration.h>
+#include <ctime>
+
+
+namespace
+{
+
+inline uint64_t clock_gettime_ns(clockid_t clock_type = CLOCK_MONOTONIC)
+{
+    struct timespec ts;
+    clock_gettime(clock_type, &ts);
+    return uint64_t(ts.tv_sec * 1000000000LL + ts.tv_nsec);
+}
+
+}
 
 
 namespace mysqlxx
@@ -124,10 +136,15 @@ Pool::~Pool()
 }
 
 
-Pool::Entry Pool::get()
+Pool::Entry Pool::get(uint64_t wait_timeout)
 {
     std::unique_lock<std::mutex> lock(mutex);
 
+    uint64_t deadline = 0;
+    /// UINT64_MAX -- wait indefinitely
+    if (wait_timeout && wait_timeout != UINT64_MAX)
+        deadline = clock_gettime_ns() + wait_timeout * 1'000'000'000;
+
     initialize();
     for (;;)
     {
@@ -153,6 +170,12 @@ Pool::Entry Pool::get()
             logger.trace("(%s): Unable to create a new connection: Max number of connections has been reached.", getDescription());
         }
 
+        if (!wait_timeout)
+            throw Poco::Exception("mysqlxx::Pool is full (wait is disabled, see connection_wait_timeout setting)");
+
+        if (deadline && clock_gettime_ns() >= deadline)
+            throw Poco::Exception("mysqlxx::Pool is full (connection_wait_timeout is exceeded)");
+
         lock.unlock();
         logger.trace("(%s): Sleeping for %d seconds.", getDescription(), MYSQLXX_POOL_SLEEP_ON_CONNECT_FAIL);
         sleepForSeconds(MYSQLXX_POOL_SLEEP_ON_CONNECT_FAIL);
diff --git a/base/mysqlxx/Pool.h b/base/mysqlxx/Pool.h
index 530e2c78cf2..f542c3d3b76 100644
--- a/base/mysqlxx/Pool.h
+++ b/base/mysqlxx/Pool.h
@@ -189,7 +189,7 @@ public:
     ~Pool();
 
     /// Allocates connection.
-    Entry get();
+    Entry get(uint64_t wait_timeout = UINT64_MAX);
 
     /// Allocates connection.
     /// If database is not accessible, returns empty Entry object.
diff --git a/base/mysqlxx/PoolFactory.cpp b/base/mysqlxx/PoolFactory.cpp
index f0a5543d723..1d2f9fc74c7 100644
--- a/base/mysqlxx/PoolFactory.cpp
+++ b/base/mysqlxx/PoolFactory.cpp
@@ -79,7 +79,7 @@ PoolWithFailover PoolFactory::get(const Poco::Util::AbstractConfiguration & conf
     std::lock_guard<std::mutex> lock(impl->mutex);
     if (auto entry = impl->pools.find(config_name); entry != impl->pools.end())
     {
-        return *(entry->second.get());
+        return *(entry->second);
     }
     else
     {
@@ -100,7 +100,7 @@ PoolWithFailover PoolFactory::get(const Poco::Util::AbstractConfiguration & conf
             impl->pools.insert_or_assign(config_name, pool);
             impl->pools_by_ids.insert_or_assign(entry_name, config_name);
         }
-        return *(pool.get());
+        return *pool;
     }
 }
 
diff --git a/base/mysqlxx/PoolWithFailover.cpp b/base/mysqlxx/PoolWithFailover.cpp
index e317ab7f228..14c0db9ecd5 100644
--- a/base/mysqlxx/PoolWithFailover.cpp
+++ b/base/mysqlxx/PoolWithFailover.cpp
@@ -21,8 +21,9 @@ PoolWithFailover::PoolWithFailover(
         const unsigned max_connections_,
         const size_t max_tries_)
     : max_tries(max_tries_)
+    , shareable(config_.getBool(config_name_ + ".share_connection", false))
+    , wait_timeout(UINT64_MAX)
 {
-    shareable = config_.getBool(config_name_ + ".share_connection", false);
     if (config_.has(config_name_ + ".replica"))
     {
         Poco::Util::AbstractConfiguration::Keys replica_keys;
@@ -80,9 +81,11 @@ PoolWithFailover::PoolWithFailover(
         const std::string & password,
         unsigned default_connections_,
         unsigned max_connections_,
-        size_t max_tries_)
+        size_t max_tries_,
+        uint64_t wait_timeout_)
     : max_tries(max_tries_)
     , shareable(false)
+    , wait_timeout(wait_timeout_)
 {
     /// Replicas have the same priority, but traversed replicas are moved to the end of the queue.
     for (const auto & [host, port] : addresses)
@@ -101,6 +104,7 @@ PoolWithFailover::PoolWithFailover(
 PoolWithFailover::PoolWithFailover(const PoolWithFailover & other)
     : max_tries{other.max_tries}
     , shareable{other.shareable}
+    , wait_timeout(other.wait_timeout)
 {
     if (shareable)
     {
@@ -140,7 +144,7 @@ PoolWithFailover::Entry PoolWithFailover::get()
 
                 try
                 {
-                    Entry entry = shareable ? pool->get() : pool->tryGet();
+                    Entry entry = shareable ? pool->get(wait_timeout) : pool->tryGet();
 
                     if (!entry.isNull())
                     {
@@ -172,7 +176,7 @@ PoolWithFailover::Entry PoolWithFailover::get()
     if (full_pool)
     {
         app.logger().error("All connections failed, trying to wait on a full pool " + (*full_pool)->getDescription());
-        return (*full_pool)->get();
+        return (*full_pool)->get(wait_timeout);
     }
 
     std::stringstream message;
diff --git a/base/mysqlxx/PoolWithFailover.h b/base/mysqlxx/PoolWithFailover.h
index 1c7a63e76c0..2bd5ec9f30a 100644
--- a/base/mysqlxx/PoolWithFailover.h
+++ b/base/mysqlxx/PoolWithFailover.h
@@ -80,6 +80,8 @@ namespace mysqlxx
         std::mutex mutex;
         /// Can the Pool be shared
         bool shareable;
+        /// Timeout for waiting free connection.
+        uint64_t wait_timeout = 0;
 
     public:
         using Entry = Pool::Entry;
@@ -96,6 +98,7 @@ namespace mysqlxx
          * default_connections   Number of connection in pool to each replica at start.
          * max_connections       Maximum number of connections in pool to each replica.
          * max_tries_            Max number of connection tries.
+         * wait_timeout_         Timeout for waiting free connection.
          */
         PoolWithFailover(
             const std::string & config_name_,
@@ -117,7 +120,8 @@ namespace mysqlxx
             const std::string & password,
             unsigned default_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
             unsigned max_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_CONNECTIONS,
-            size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
+            size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES,
+            uint64_t wait_timeout_ = UINT64_MAX);
 
         PoolWithFailover(const PoolWithFailover & other);
 
diff --git a/base/mysqlxx/Query.cpp b/base/mysqlxx/Query.cpp
index c0d5c20fdfd..e7d1e0c1d69 100644
--- a/base/mysqlxx/Query.cpp
+++ b/base/mysqlxx/Query.cpp
@@ -77,7 +77,9 @@ void Query::executeImpl()
         case CR_SERVER_LOST:
             throw ConnectionLost(errorMessage(mysql_driver), err_no);
         default:
-            throw BadQuery(errorMessage(mysql_driver), err_no);
+            /// Add query to the exception message, since it may differs from the user input query.
+            /// (also you can use this and create query with an error to see what query ClickHouse created)
+            throw BadQuery(errorMessage(mysql_driver) + " (query: " + query_string + ")", err_no);
         }
     }
 }
diff --git a/base/mysqlxx/ya.make b/base/mysqlxx/ya.make
deleted file mode 100644
index aabc9922e72..00000000000
--- a/base/mysqlxx/ya.make
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-LIBRARY()
-
-OWNER(g:clickhouse)
-
-CFLAGS(-g0)
-
-PEERDIR(
-    contrib/restricted/boost/libs
-    contrib/libs/libmysql_r
-    contrib/libs/poco/Foundation
-    contrib/libs/poco/Util
-)
-
-ADDINCL(
-    GLOBAL clickhouse/base
-    clickhouse/base
-    contrib/libs/libmysql_r
-)
-
-NO_COMPILER_WARNINGS()
-
-NO_UTIL()
-
-SRCS(
-    Connection.cpp
-    Exception.cpp
-    Pool.cpp
-    PoolFactory.cpp
-    PoolWithFailover.cpp
-    Query.cpp
-    ResultBase.cpp
-    Row.cpp
-    UseQueryResult.cpp
-    Value.cpp
-
-)
-
-END()
diff --git a/base/mysqlxx/ya.make.in b/base/mysqlxx/ya.make.in
deleted file mode 100644
index 10755078e20..00000000000
--- a/base/mysqlxx/ya.make.in
+++ /dev/null
@@ -1,28 +0,0 @@
-LIBRARY()
-
-OWNER(g:clickhouse)
-
-CFLAGS(-g0)
-
-PEERDIR(
-    contrib/restricted/boost/libs
-    contrib/libs/libmysql_r
-    contrib/libs/poco/Foundation
-    contrib/libs/poco/Util
-)
-
-ADDINCL(
-    GLOBAL clickhouse/base
-    clickhouse/base
-    contrib/libs/libmysql_r
-)
-
-NO_COMPILER_WARNINGS()
-
-NO_UTIL()
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/base/pcg-random/ya.make b/base/pcg-random/ya.make
deleted file mode 100644
index 705cdc05341..00000000000
--- a/base/pcg-random/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL (GLOBAL clickhouse/base/pcg-random)
-
-END()
diff --git a/base/readpassphrase/readpassphrase.c b/base/readpassphrase/readpassphrase.c
index 8a7d3153915..3bcad34e481 100644
--- a/base/readpassphrase/readpassphrase.c
+++ b/base/readpassphrase/readpassphrase.c
@@ -27,6 +27,10 @@
 #define _PATH_TTY "/dev/tty"
 #endif
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <termios.h>
 #include <signal.h>
 #include <ctype.h>
diff --git a/base/readpassphrase/ya.make b/base/readpassphrase/ya.make
deleted file mode 100644
index d1ace8925ae..00000000000
--- a/base/readpassphrase/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-CFLAGS(-g0)
-
-SRCS(
-    readpassphrase.c
-)
-
-END()
diff --git a/base/widechar_width/ya.make b/base/widechar_width/ya.make
deleted file mode 100644
index 0d61e0dbf70..00000000000
--- a/base/widechar_width/ya.make
+++ /dev/null
@@ -1,13 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(GLOBAL clickhouse/base/widechar_width)
-
-CFLAGS(-g0)
-
-SRCS(
-    widechar_width.cpp
-)
-
-END()
diff --git a/base/ya.make b/base/ya.make
deleted file mode 100644
index 19a16044280..00000000000
--- a/base/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-OWNER(g:clickhouse)
-
-RECURSE(
-    common
-    daemon
-    loggers
-    mysqlxx
-    pcg-random
-    widechar_width
-    readpassphrase
-)
diff --git a/cmake/analysis.cmake b/cmake/analysis.cmake
index 267bb34248b..d1b9c86f15f 100644
--- a/cmake/analysis.cmake
+++ b/cmake/analysis.cmake
@@ -6,7 +6,7 @@ if (ENABLE_CLANG_TIDY)
         message(FATAL_ERROR "clang-tidy requires CMake version at least 3.6.")
     endif()
 
-    find_program (CLANG_TIDY_PATH NAMES "clang-tidy" "clang-tidy-11" "clang-tidy-10" "clang-tidy-9" "clang-tidy-8")
+    find_program (CLANG_TIDY_PATH NAMES "clang-tidy" "clang-tidy-13" "clang-tidy-12" "clang-tidy-11" "clang-tidy-10" "clang-tidy-9" "clang-tidy-8")
 
     if (CLANG_TIDY_PATH)
         message(STATUS
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index 03247b4b3ea..dd6ead7d97f 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -2,11 +2,11 @@
 
 # NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54455)
+SET(VERSION_REVISION 54456)
 SET(VERSION_MAJOR 21)
-SET(VERSION_MINOR 10)
+SET(VERSION_MINOR 11)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 09df5018f95edcd0f759d4689ac5d029dd400c2a)
-SET(VERSION_DESCRIBE v21.10.1.1-testing)
-SET(VERSION_STRING 21.10.1.1)
+SET(VERSION_GITHASH 7a4a0b0edef0ad6e0aa662cd3b90c3f4acf796e7)
+SET(VERSION_DESCRIBE v21.11.1.1-prestable)
+SET(VERSION_STRING 21.11.1.1)
 # end of autochange
diff --git a/cmake/check_flags.cmake b/cmake/check_flags.cmake
index 5a4ff472868..58605543dff 100644
--- a/cmake/check_flags.cmake
+++ b/cmake/check_flags.cmake
@@ -4,3 +4,4 @@ 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)
+check_cxx_compiler_flag("-Xclang -fuse-ctor-homing" HAS_USE_CTOR_HOMING)
diff --git a/cmake/find/ccache.cmake b/cmake/find/ccache.cmake
index 986c9cb5fe2..43c2de0c921 100644
--- a/cmake/find/ccache.cmake
+++ b/cmake/find/ccache.cmake
@@ -51,8 +51,8 @@ if (CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
          message(STATUS "ccache is 4.2+ no quirks for SOURCE_DATE_EPOCH required")
       elseif (CCACHE_VERSION VERSION_GREATER_EQUAL "4.0")
          message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache")
-         set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE "env -u SOURCE_DATE_EPOCH ${CCACHE_FOUND}")
-         set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK "env -u SOURCE_DATE_EPOCH ${CCACHE_FOUND}")
+         set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE "env -u SOURCE_DATE_EPOCH")
+         set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK "env -u SOURCE_DATE_EPOCH")
       endif()
    else ()
       message(${RECONFIGURE_MESSAGE_LEVEL} "Not using ${CCACHE_FOUND} ${CCACHE_VERSION} bug: https://bugzilla.samba.org/show_bug.cgi?id=8118")
diff --git a/cmake/find/llvm.cmake b/cmake/find/llvm.cmake
index 816164bef10..84ac29991ab 100644
--- a/cmake/find/llvm.cmake
+++ b/cmake/find/llvm.cmake
@@ -1,8 +1,10 @@
-if (APPLE OR SPLIT_SHARED_LIBRARIES OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
-    set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
+if (APPLE OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
+    set (ENABLE_EMBEDDED_COMPILER_DEFAULT OFF)
+else()
+    set (ENABLE_EMBEDDED_COMPILER_DEFAULT ON)
 endif()
 
-option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ON)
+option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ${ENABLE_EMBEDDED_COMPILER_DEFAULT})
 
 if (NOT ENABLE_EMBEDDED_COMPILER)
     set (USE_EMBEDDED_COMPILER 0)
diff --git a/cmake/freebsd/toolchain-x86_64.cmake b/cmake/freebsd/toolchain-x86_64.cmake
index d9839ec74ee..f9e45686db7 100644
--- a/cmake/freebsd/toolchain-x86_64.cmake
+++ b/cmake/freebsd/toolchain-x86_64.cmake
@@ -10,7 +10,7 @@ set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it
 set (CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "" FORCE)
 set (CMAKE_RANLIB "/usr/bin/ranlib" CACHE FILEPATH "" FORCE)
 
-set (LINKER_NAME "lld" CACHE STRING "" FORCE)
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
 
 set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
 set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
diff --git a/cmake/linux/toolchain-aarch64.cmake b/cmake/linux/toolchain-aarch64.cmake
index e3924fdc537..b4dc6e45cbb 100644
--- a/cmake/linux/toolchain-aarch64.cmake
+++ b/cmake/linux/toolchain-aarch64.cmake
@@ -13,7 +13,7 @@ set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${CMAKE_CURRENT_LIST_D
 set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${CMAKE_CURRENT_LIST_DIR}/../toolchain/linux-aarch64")
 set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${CMAKE_CURRENT_LIST_DIR}/../toolchain/linux-aarch64")
 
-set (LINKER_NAME "lld" CACHE STRING "" FORCE)
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
 
 set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
 set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 8ff94ab867b..f94f4b289a3 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -79,8 +79,9 @@ endif ()
 
 if (LINKER_NAME)
     if (COMPILER_CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 12.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 12.0.0))
-        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LINKER_NAME}")
-        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --ld-path=${LINKER_NAME}")
+        find_program (LLD_PATH NAMES ${LINKER_NAME})
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LLD_PATH}")
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --ld-path=${LLD_PATH}")
     else ()
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
         set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index a85fe8963c7..0b6bbe36cf9 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -192,4 +192,29 @@ elseif (COMPILER_GCC)
         # For some reason (bug in gcc?) macro 'GCC diagnostic ignored "-Wstringop-overflow"' doesn't help.
         add_cxx_compile_options(-Wno-stringop-overflow)
     endif()
+
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
+        # reinterpretAs.cpp:182:31: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type
+        # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
+        # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
+        add_cxx_compile_options(-Wno-error=class-memaccess)
+
+        # Maybe false positive...
+        # In file included from /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:673,
+        # In function ‘void std::__1::__libcpp_operator_delete(_Args ...) [with _Args = {void*, long unsigned int}]’,
+        # inlined from ‘void std::__1::__do_deallocate_handle_size(void*, size_t, _Args ...) [with _Args = {}]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:271:34,
+        # inlined from ‘void std::__1::__libcpp_deallocate(void*, size_t, size_t)’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:285:41,
+        # inlined from ‘constexpr void std::__1::allocator<_Tp>::deallocate(_Tp*, size_t) [with _Tp = char]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:849:39,
+        # inlined from ‘static constexpr void std::__1::allocator_traits<_Alloc>::deallocate(std::__1::allocator_traits<_Alloc>::allocator_type&, std::__1::allocator_traits<_Alloc>::pointer, std::__1::allocator_traits<_Alloc>::size_type) [with _Alloc = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/__memory/allocator_traits.h:476:24,
+        # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2219:35,
+        # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2213:1,
+        # inlined from ‘DB::JSONBuilder::JSONMap::Pair::~Pair()’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:90:12,
+        # inlined from ‘void DB::JSONBuilder::JSONMap::add(std::__1::string, DB::JSONBuilder::ItemPtr)’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:97:68,
+        # inlined from ‘virtual void DB::ExpressionStep::describeActions(DB::JSONBuilder::JSONMap&) const’ at /home/jakalletti/ClickHouse/ClickHouse/src/Processors/QueryPlan/ExpressionStep.cpp:102:12:
+        # /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:247:20: error: ‘void operator delete(void*, size_t)’ called on a pointer to an unallocated object ‘7598543875853023301’ [-Werror=free-nonheap-object]
+        add_cxx_compile_options(-Wno-error=free-nonheap-object)
+
+        # AggregateFunctionAvg.h:203:100: error: ‘this’ pointer is null [-Werror=nonnull]
+        add_cxx_compile_options(-Wno-error=nonnull)
+    endif()
 endif ()
diff --git a/cmake/yandex/ya.make.versions.inc b/cmake/yandex/ya.make.versions.inc
deleted file mode 100644
index 6910164d0aa..00000000000
--- a/cmake/yandex/ya.make.versions.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/autogenerated_versions.txt)
-
-# TODO: not sure if this is customizable per-binary
-SET(VERSION_NAME "ClickHouse")
-
-# TODO: not quite sure how to replace dash with space in ya.make
-SET(VERSION_FULL "${VERSION_NAME}-${VERSION_STRING}")
-
-CFLAGS (GLOBAL -DDBMS_NAME=\"ClickHouse\")
-CFLAGS (GLOBAL -DDBMS_VERSION_MAJOR=${VERSION_MAJOR})
-CFLAGS (GLOBAL -DDBMS_VERSION_MINOR=${VERSION_MINOR})
-CFLAGS (GLOBAL -DDBMS_VERSION_PATCH=${VERSION_PATCH})
-CFLAGS (GLOBAL -DVERSION_FULL=\"\\\"${VERSION_FULL}\\\"\")
-CFLAGS (GLOBAL -DVERSION_MAJOR=${VERSION_MAJOR})
-CFLAGS (GLOBAL -DVERSION_MINOR=${VERSION_MINOR})
-CFLAGS (GLOBAL -DVERSION_PATCH=${VERSION_PATCH})
-
-# TODO: not supported yet, not sure if ya.make supports arithmetic.
-CFLAGS (GLOBAL -DVERSION_INTEGER=0)
-
-CFLAGS (GLOBAL -DVERSION_NAME=\"\\\"${VERSION_NAME}\\\"\")
-CFLAGS (GLOBAL -DVERSION_OFFICIAL=\"-arcadia\")
-CFLAGS (GLOBAL -DVERSION_REVISION=${VERSION_REVISION})
-CFLAGS (GLOBAL -DVERSION_STRING=\"\\\"${VERSION_STRING}\\\"\")
-
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index e6e098a05b3..140cc0846ec 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -33,6 +33,7 @@ endif()
 set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
 
 add_subdirectory (abseil-cpp-cmake)
+add_subdirectory (magic-enum-cmake)
 add_subdirectory (boost-cmake)
 add_subdirectory (cctz-cmake)
 add_subdirectory (consistent-hashing)
@@ -206,12 +207,14 @@ elseif(GTEST_SRC_DIR)
     target_compile_definitions(gtest INTERFACE GTEST_HAS_POSIX_RE=0)
 endif()
 
-if (USE_EMBEDDED_COMPILER)
+function(add_llvm)
     # ld: unknown option: --color-diagnostics
     if (APPLE)
         set (LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL "")
     endif ()
 
+    # Do not adjust RPATH in llvm, since then it will not be able to find libcxx/libcxxabi/libunwind
+    set (CMAKE_INSTALL_RPATH "ON")
     set (LLVM_ENABLE_EH 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_RTTI 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_PIC 0 CACHE INTERNAL "")
@@ -219,13 +222,12 @@ if (USE_EMBEDDED_COMPILER)
 
     # Need to use C++17 since the compilation is not possible with C++20 currently, due to ambiguous operator != etc.
     # LLVM project will set its default value for the -std=... but our global setting from CMake will override it.
-    set (CMAKE_CXX_STANDARD_bak ${CMAKE_CXX_STANDARD})
     set (CMAKE_CXX_STANDARD 17)
 
     add_subdirectory (llvm/llvm)
-
-    set (CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_bak})
-    unset (CMAKE_CXX_STANDARD_bak)
+endfunction()
+if (USE_EMBEDDED_COMPILER)
+    add_llvm()
 endif ()
 
 if (USE_INTERNAL_LIBGSASL_LIBRARY)
diff --git a/contrib/abseil-cpp b/contrib/abseil-cpp
index 4f3b686f86c..b004a8a0241 160000
--- a/contrib/abseil-cpp
+++ b/contrib/abseil-cpp
@@ -1 +1 @@
-Subproject commit 4f3b686f86c3ebaba7e4e926e62a79cb1c659a54
+Subproject commit b004a8a02418b83de8b686caa0b0f6e39ac2191f
diff --git a/contrib/boost b/contrib/boost
index 9cf09dbfd55..66d17f060c4 160000
--- a/contrib/boost
+++ b/contrib/boost
@@ -1 +1 @@
-Subproject commit 9cf09dbfd55a5c6202dedbdf40781a51b02c2675
+Subproject commit 66d17f060c4867aeea99fa2a20cfdae89ae2a2ec
diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt
index 675931d319f..27072910135 100644
--- a/contrib/boost-cmake/CMakeLists.txt
+++ b/contrib/boost-cmake/CMakeLists.txt
@@ -16,7 +16,7 @@ if (NOT USE_INTERNAL_BOOST_LIBRARY)
         graph
     )
 
-    if(Boost_INCLUDE_DIR AND Boost_FILESYSTEM_LIBRARY AND Boost_FILESYSTEM_LIBRARY AND
+    if(Boost_INCLUDE_DIR AND Boost_FILESYSTEM_LIBRARY AND
         Boost_PROGRAM_OPTIONS_LIBRARY AND Boost_REGEX_LIBRARY AND Boost_SYSTEM_LIBRARY AND Boost_CONTEXT_LIBRARY AND
         Boost_COROUTINE_LIBRARY AND Boost_GRAPH_LIBRARY)
 
@@ -238,4 +238,14 @@ if (NOT EXTERNAL_BOOST_FOUND)
     target_include_directories (_boost_graph PRIVATE ${LIBRARY_DIR})
     target_link_libraries(_boost_graph PRIVATE _boost_regex)
 
+    # circular buffer
+    add_library(_boost_circular_buffer INTERFACE)
+    add_library(boost::circular_buffer ALIAS _boost_circular_buffer)
+    target_include_directories(_boost_circular_buffer SYSTEM BEFORE INTERFACE ${LIBRARY_DIR})
+
+    # heap
+    add_library(_boost_heap INTERFACE)
+    add_library(boost::heap ALIAS _boost_heap)
+    target_include_directories(_boost_heap SYSTEM BEFORE INTERFACE ${LIBRARY_DIR})
+
 endif ()
diff --git a/contrib/fastops b/contrib/fastops
index 88752a5e03c..012b777df9e 160000
--- a/contrib/fastops
+++ b/contrib/fastops
@@ -1 +1 @@
-Subproject commit 88752a5e03cf34639a4a37a4b41d8b463fffd2b5
+Subproject commit 012b777df9e2d145a24800a6c8c3d4a0249bb09e
diff --git a/contrib/libhdfs3 b/contrib/libhdfs3
index 095b9d48b40..082e55f17d1 160000
--- a/contrib/libhdfs3
+++ b/contrib/libhdfs3
@@ -1 +1 @@
-Subproject commit 095b9d48b400abb72d967cb0539af13b1e3d90cf
+Subproject commit 082e55f17d1c58bf124290fb044fea40e985ec11
diff --git a/contrib/llvm b/contrib/llvm
index e5751459412..f30bbecef78 160000
--- a/contrib/llvm
+++ b/contrib/llvm
@@ -1 +1 @@
-Subproject commit e5751459412bce1391fb7a2e9bbc01e131bf72f1
+Subproject commit f30bbecef78b75b527e257c1304d0be2f2f95975
diff --git a/contrib/magic-enum-cmake/CMakeLists.txt b/contrib/magic-enum-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..142f9c7c755
--- /dev/null
+++ b/contrib/magic-enum-cmake/CMakeLists.txt
@@ -0,0 +1,3 @@
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/magic_enum")
+add_library (magic_enum INTERFACE)
+target_include_directories(magic_enum INTERFACE ${LIBRARY_DIR}/include)
diff --git a/contrib/magic_enum b/contrib/magic_enum
new file mode 160000
index 00000000000..38f86e4d093
--- /dev/null
+++ b/contrib/magic_enum
@@ -0,0 +1 @@
+Subproject commit 38f86e4d093cfc9034a140d37de2168e3951bef3
diff --git a/contrib/rocksdb b/contrib/rocksdb
index b6480c69bf3..5ea892c8673 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit b6480c69bf3ab6e298e0d019a07fd4f69029b26a
+Subproject commit 5ea892c8673e6c5a052887653673b967d44cc59b
diff --git a/debian/changelog b/debian/changelog
index f3e740d20cf..460424bdb36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-clickhouse (21.10.1.1) unstable; urgency=low
+clickhouse (21.11.1.1) unstable; urgency=low
 
   * Modified source code
 
- -- clickhouse-release <clickhouse-release@yandex-team.ru>  Sat, 17 Jul 2021 08:45:03 +0300
+ -- clickhouse-release <clickhouse-release@yandex-team.ru>  Thu, 09 Sep 2021 12:03:26 +0300
diff --git a/debian/clickhouse-server.init b/debian/clickhouse-server.init
index 4e70d382b36..1dd87fe80ae 100755
--- a/debian/clickhouse-server.init
+++ b/debian/clickhouse-server.init
@@ -3,10 +3,17 @@
 # Provides:          clickhouse-server
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Required-Start:    $network
-# Required-Stop:     $network
+# Should-Start:      $time $network
+# Should-Stop:       $network
 # Short-Description: Yandex clickhouse-server daemon
 ### END INIT INFO
+#
+# NOTES:
+# - Should-* -- script can start if the listed facilities are missing, unlike Required-*
+#
+# For the documentation [1]:
+#
+#   [1]: https://wiki.debian.org/LSBInitScripts
 
 CLICKHOUSE_USER=clickhouse
 CLICKHOUSE_GROUP=${CLICKHOUSE_USER}
diff --git a/debian/clickhouse-server.service b/debian/clickhouse-server.service
index b9681f9279e..bc19235cb3a 100644
--- a/debian/clickhouse-server.service
+++ b/debian/clickhouse-server.service
@@ -1,7 +1,12 @@
 [Unit]
 Description=ClickHouse Server (analytic DBMS for big data)
 Requires=network-online.target
-After=network-online.target
+# NOTE: that After/Wants=time-sync.target is not enough, you need to ensure
+# that the time was adjusted already, if you use systemd-timesyncd you are
+# safe, but if you use ntp or some other daemon, you should configure it
+# additionaly.
+After=time-sync.target network-online.target
+Wants=time-sync.target
 
 [Service]
 Type=simple
@@ -16,4 +21,5 @@ LimitNOFILE=500000
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_IPC_LOCK CAP_SYS_NICE
 
 [Install]
+# ClickHouse should not start from the rescue shell (rescue.target).
 WantedBy=multi-user.target
diff --git a/debian/control b/debian/control
index 9b34e982698..633b7e7c8a3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,13 @@
 Source: clickhouse
 Section: database
 Priority: optional
-Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
+Maintainer: Alexey Milovidov <milovidov@clickhouse.com>
 Build-Depends: debhelper (>= 9),
                cmake | cmake3,
                ninja-build,
-               clang-11,
-               llvm-11,
+               clang-13,
+               llvm-13,
                libc6-dev,
-               libicu-dev,
-               libreadline-dev,
-               gperf,
                tzdata
 Standards-Version: 3.9.8
 
diff --git a/debian/rules b/debian/rules
index 73d1f3d3b34..4562d24bec4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,8 @@ endif
 
 CMAKE_FLAGS += -DENABLE_UTILS=0
 
-DEB_CC ?= $(shell which gcc-10 gcc-9 gcc | head -n1)
-DEB_CXX ?= $(shell which g++-10 g++-9 g++ | head -n1)
+DEB_CC ?= $(shell which gcc-11 gcc-10 gcc-9 gcc | head -n1)
+DEB_CXX ?= $(shell which g++-11 g++-10 g++-9 g++ | head -n1)
 
 ifdef DEB_CXX
     DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile
index abe102e9c80..5a998ffbe3e 100644
--- a/docker/builder/Dockerfile
+++ b/docker/builder/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
diff --git a/docker/builder/build.sh b/docker/builder/build.sh
index d4cf662e91b..1025af3f96e 100755
--- a/docker/builder/build.sh
+++ b/docker/builder/build.sh
@@ -4,7 +4,7 @@ set -e
 #ccache -s # uncomment to display CCache statistics
 mkdir -p /server/build_docker
 cd /server/build_docker
-cmake -G Ninja /server "-DCMAKE_C_COMPILER=$(command -v clang-11)" "-DCMAKE_CXX_COMPILER=$(command -v clang++-11)"
+cmake -G Ninja /server "-DCMAKE_C_COMPILER=$(command -v clang-13)" "-DCMAKE_CXX_COMPILER=$(command -v clang++-13)"
 
 # Set the number of build jobs to the half of number of virtual CPU cores (rounded up).
 # By default, ninja use all virtual CPU cores, that leads to very high memory consumption without much improvement in build time.
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index 1b398b43c32..962459ccead 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.10.1.*
+ARG version=21.11.1.*
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
diff --git a/docker/images.json b/docker/images.json
index e2e22468596..96424bb9432 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -1,12 +1,12 @@
 {
     "docker/packager/deb": {
-        "name": "yandex/clickhouse-deb-builder",
+        "name": "clickhouse/deb-builder",
         "dependent": [
             "docker/packager/unbundled"
         ]
     },
     "docker/packager/binary": {
-        "name": "yandex/clickhouse-binary-builder",
+        "name": "clickhouse/binary-builder",
         "dependent": [
             "docker/test/split_build_smoke_test",
             "docker/test/pvs",
@@ -14,155 +14,150 @@
         ]
     },
     "docker/packager/unbundled": {
-        "name": "yandex/clickhouse-unbundled-builder",
+        "name": "clickhouse/unbundled-builder",
         "dependent": []
     },
     "docker/test/compatibility/centos": {
-        "name": "yandex/clickhouse-test-old-centos",
+        "name": "clickhouse/test-old-centos",
         "dependent": []
     },
     "docker/test/compatibility/ubuntu": {
-        "name": "yandex/clickhouse-test-old-ubuntu",
+        "name": "clickhouse/test-old-ubuntu",
         "dependent": []
     },
     "docker/test/integration/base": {
-        "name": "yandex/clickhouse-integration-test",
+        "name": "clickhouse/integration-test",
         "dependent": []
     },
     "docker/test/fuzzer": {
-        "name": "yandex/clickhouse-fuzzer",
+        "name": "clickhouse/fuzzer",
         "dependent": []
     },
     "docker/test/performance-comparison": {
-        "name": "yandex/clickhouse-performance-comparison",
+        "name": "clickhouse/performance-comparison",
         "dependent": []
     },
     "docker/test/pvs": {
-        "name": "yandex/clickhouse-pvs-test",
+        "name": "clickhouse/pvs-test",
         "dependent": []
     },
     "docker/test/stateless": {
-        "name": "yandex/clickhouse-stateless-test",
+        "name": "clickhouse/stateless-test",
         "dependent": [
             "docker/test/stateful",
             "docker/test/coverage",
             "docker/test/unit"
         ]
     },
-    "docker/test/stateless_pytest": {
-        "name": "yandex/clickhouse-stateless-pytest",
-        "dependent": []
-    },
     "docker/test/stateful": {
-        "name": "yandex/clickhouse-stateful-test",
+        "name": "clickhouse/stateful-test",
         "dependent": [
             "docker/test/stress"
         ]
     },
     "docker/test/coverage": {
-        "name": "yandex/clickhouse-test-coverage",
+        "name": "clickhouse/test-coverage",
         "dependent": []
     },
     "docker/test/unit": {
-        "name": "yandex/clickhouse-unit-test",
+        "name": "clickhouse/unit-test",
         "dependent": []
     },
     "docker/test/stress": {
-        "name": "yandex/clickhouse-stress-test",
+        "name": "clickhouse/stress-test",
         "dependent": []
     },
     "docker/test/split_build_smoke_test": {
-        "name": "yandex/clickhouse-split-build-smoke-test",
+        "name": "clickhouse/split-build-smoke-test",
         "dependent": []
     },
     "docker/test/codebrowser": {
-        "name": "yandex/clickhouse-codebrowser",
+        "name": "clickhouse/codebrowser",
         "dependent": []
     },
     "docker/test/integration/runner": {
-        "name": "yandex/clickhouse-integration-tests-runner",
+        "name": "clickhouse/integration-tests-runner",
         "dependent": []
     },
     "docker/test/testflows/runner": {
-        "name": "yandex/clickhouse-testflows-runner",
+        "name": "clickhouse/testflows-runner",
         "dependent": []
     },
     "docker/test/fasttest": {
-        "name": "yandex/clickhouse-fasttest",
+        "name": "clickhouse/fasttest",
         "dependent": []
     },
     "docker/test/style": {
-        "name": "yandex/clickhouse-style-test",
+        "name": "clickhouse/style-test",
         "dependent": []
     },
     "docker/test/integration/s3_proxy": {
-        "name": "yandex/clickhouse-s3-proxy",
+        "name": "clickhouse/s3-proxy",
         "dependent": []
     },
     "docker/test/integration/resolver": {
-        "name": "yandex/clickhouse-python-bottle",
+        "name": "clickhouse/python-bottle",
         "dependent": []
     },
     "docker/test/integration/helper_container": {
-        "name": "yandex/clickhouse-integration-helper",
+        "name": "clickhouse/integration-helper",
         "dependent": []
     },
     "docker/test/integration/mysql_golang_client": {
-        "name": "yandex/clickhouse-mysql-golang-client",
+        "name": "clickhouse/mysql-golang-client",
         "dependent": []
     },
     "docker/test/integration/mysql_java_client": {
-        "name": "yandex/clickhouse-mysql-java-client",
+        "name": "clickhouse/mysql-java-client",
         "dependent": []
     },
     "docker/test/integration/mysql_js_client": {
-        "name": "yandex/clickhouse-mysql-js-client",
+        "name": "clickhouse/mysql-js-client",
         "dependent": []
     },
     "docker/test/integration/mysql_php_client": {
-        "name": "yandex/clickhouse-mysql-php-client",
+        "name": "clickhouse/mysql-php-client",
         "dependent": []
     },
     "docker/test/integration/postgresql_java_client": {
-        "name": "yandex/clickhouse-postgresql-java-client",
+        "name": "clickhouse/postgresql-java-client",
         "dependent": []
     },
     "docker/test/integration/kerberos_kdc": {
-        "name": "yandex/clickhouse-kerberos-kdc",
+        "name": "clickhouse/kerberos-kdc",
         "dependent": []
     },
     "docker/test/base": {
-         "name": "yandex/clickhouse-test-base",
+         "name": "clickhouse/test-base",
          "dependent": [
             "docker/test/stateless",
             "docker/test/stateless_unbundled",
-            "docker/test/stateless_pytest",
             "docker/test/integration/base",
             "docker/test/fuzzer",
             "docker/test/keeper-jepsen"
          ]
     },
     "docker/packager/unbundled": {
-         "name": "yandex/clickhouse-unbundled-builder",
+         "name": "clickhouse/unbundled-builder",
          "dependent": [
             "docker/test/stateless_unbundled"
          ]
     },
     "docker/test/stateless_unbundled": {
-         "name": "yandex/clickhouse-stateless-unbundled-test",
+         "name": "clickhouse/stateless-unbundled-test",
          "dependent": [
          ]
     },
     "docker/test/integration/kerberized_hadoop": {
-        "name": "yandex/clickhouse-kerberized-hadoop",
+        "name": "clickhouse/kerberized-hadoop",
         "dependent": []
     },
     "docker/test/sqlancer": {
-        "name": "yandex/clickhouse-sqlancer-test",
+        "name": "clickhouse/sqlancer-test",
         "dependent": []
     },
     "docker/test/keeper-jepsen": {
-        "name": "yandex/clickhouse-keeper-jepsen-test",
+        "name": "clickhouse/keeper-jepsen-test",
         "dependent": []
     }
 }
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 0393669df48..23012a38f9d 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -1,7 +1,7 @@
-#  docker build -t yandex/clickhouse-binary-builder .
+#  docker build -t clickhouse/binary-builder .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
@@ -39,20 +39,18 @@ RUN apt-get update \
         bash \
         build-essential \
         ccache \
-        clang-11 \
-        clang-tidy-11 \
         cmake \
         curl \
-        g++-10 \
-        gcc-10 \
         gdb \
         git \
         gperf \
+        clang-${LLVM_VERSION} \
+        clang-tidy-${LLVM_VERSION} \
+        lld-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION}-dev \
         libicu-dev \
         libreadline-dev \
-        lld-11 \
-        llvm-11 \
-        llvm-11-dev \
         moreutils \
         ninja-build \
         pigz \
@@ -102,15 +100,10 @@ RUN wget -nv "https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.0
 # Download toolchain for FreeBSD 11.3
 RUN wget -nv https://clickhouse-datasets.s3.yandex.net/toolchains/toolchains/freebsd-11.3-toolchain.tar.xz
 
-# NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
-# Current workaround is to use latest version proposed repo. Remove as soon as
-# gcc-10.2 appear in stable repo.
-RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/proposed-repositories.list
-
-RUN apt-get update \
-    && apt-get install gcc-10 g++-10 --yes
-
-RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
+# NOTE: Seems like gcc-11 is too new for ubuntu20 repository
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
+    && apt-get update \
+    && apt-get install gcc-11 g++-11 --yes
 
 
 COPY build.sh /
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index b9900e34bf1..71402a2fd66 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -4,7 +4,6 @@ set -x -e
 
 mkdir -p build/cmake/toolchain/darwin-x86_64
 tar xJf MacOSX11.0.sdk.tar.xz -C build/cmake/toolchain/darwin-x86_64 --strip-components=1
-
 ln -sf darwin-x86_64 build/cmake/toolchain/darwin-aarch64
 
 mkdir -p build/cmake/toolchain/linux-aarch64
@@ -23,6 +22,7 @@ cd build/build_docker
 rm -f CMakeCache.txt
 # Read cmake arguments into array (possibly empty)
 read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
+env
 cmake --debug-trycompile --verbose=1 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
 
 ccache --show-config ||:
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 294c8645455..318b960e0b4 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -1,7 +1,7 @@
-# docker build -t yandex/clickhouse-deb-builder .
+# docker build -t clickhouse/deb-builder .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
@@ -37,17 +37,17 @@ RUN curl -O https://clickhouse-datasets.s3.yandex.net/utils/1/dpkg-deb \
 RUN apt-get update \
     && apt-get install \
         alien \
-        clang-11 \
-        clang-tidy-11 \
+        clang-${LLVM_VERSION} \
+        clang-tidy-${LLVM_VERSION} \
         cmake \
         debhelper \
         devscripts \
         gdb  \
         git \
         gperf \
-        lld-11 \
-        llvm-11 \
-        llvm-11-dev \
+        lld-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION}-dev \
         moreutils \
         ninja-build \
         perl \
@@ -57,15 +57,11 @@ RUN apt-get update \
         tzdata \
         --yes --no-install-recommends
 
-# NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
-# Current workaround is to use latest version proposed repo. Remove as soon as
-# gcc-10.2 appear in stable repo.
-RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/proposed-repositories.list
+# NOTE: Seems like gcc-11 is too new for ubuntu20 repository
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
+    && apt-get update \
+    && apt-get install gcc-11 g++-11 --yes
 
-RUN apt-get update \
-    && apt-get install gcc-10 g++-10 --yes --no-install-recommends
-
-RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
 
 # This symlink required by gcc to find lld compiler
 RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
diff --git a/docker/packager/packager b/docker/packager/packager
index 673878bce43..f8e5fd717cf 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -9,9 +9,9 @@ import sys
 SCRIPT_PATH = os.path.realpath(__file__)
 
 IMAGE_MAP = {
-    "deb": "yandex/clickhouse-deb-builder",
-    "binary": "yandex/clickhouse-binary-builder",
-    "unbundled": "yandex/clickhouse-unbundled-builder"
+    "deb": "clickhouse/deb-builder",
+    "binary": "clickhouse/binary-builder",
+    "unbundled": "clickhouse/unbundled-builder"
 }
 
 def check_image_exists_locally(image_name):
@@ -75,7 +75,7 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
     # Explicitly use LLD with Clang by default.
     # Don't force linker for cross-compilation.
     if is_clang and not is_cross_compile:
-        cmake_flags.append("-DLINKER_NAME=lld")
+        cmake_flags.append("-DLINKER_NAME=ld.lld")
 
     if is_cross_darwin:
         cc = compiler[:-len(DARWIN_SUFFIX)]
@@ -204,7 +204,9 @@ if __name__ == "__main__":
     parser.add_argument("--output-dir", required=True)
     parser.add_argument("--build-type", choices=("debug", ""), default="")
     parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-darwin-aarch64", "clang-11-aarch64",
-                                               "clang-11-freebsd", "gcc-10"), default="clang-11")
+                                               "clang-12", "clang-12-darwin", "clang-12-darwin-aarch64", "clang-12-aarch64",
+                                               "clang-13", "clang-13-darwin", "clang-13-darwin-aarch64", "clang-13-aarch64",
+                                               "clang-11-freebsd", "clang-12-freebsd", "clang-13-freebsd", "gcc-11"), default="clang-13")
     parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
     parser.add_argument("--unbundled", action="store_true")
     parser.add_argument("--split-binary", action="store_true")
diff --git a/docker/packager/unbundled/Dockerfile b/docker/packager/unbundled/Dockerfile
index b2d9f555f19..4fe093a0751 100644
--- a/docker/packager/unbundled/Dockerfile
+++ b/docker/packager/unbundled/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-unbundled-builder .
-FROM yandex/clickhouse-deb-builder
+# docker build -t clickhouse/unbundled-builder .
+FROM clickhouse/deb-builder
 
 RUN export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
     && wget -nv -O /tmp/arrow-keyring.deb "https://apache.jfrog.io/artifactory/arrow/ubuntu/apache-arrow-apt-source-latest-${CODENAME}.deb" \
@@ -17,6 +17,7 @@ RUN apt-get update \
         devscripts \
         libc++-dev \
         libc++abi-dev \
+        libboost-all-dev \
         libboost-program-options-dev \
         libboost-system-dev \
         libboost-filesystem-dev \
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index 6307e74c633..7309574b16c 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.10.1.*
+ARG version=21.11.1.*
 ARG gosu_ver=1.10
 
 # set non-empty deb_location_url url to create a docker image
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
index 62cfcf9e896..b3a23bf9662 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.10.1.*
+ARG version=21.11.1.*
 
 RUN apt-get update && \
     apt-get install -y apt-transport-https dirmngr && \
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index 611ef6b7702..2d49c207ac3 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -1,7 +1,7 @@
-# docker build -t yandex/clickhouse-test-base .
+# docker build -t clickhouse/test-base .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
diff --git a/docker/test/codebrowser/Dockerfile b/docker/test/codebrowser/Dockerfile
index 33173ab90f9..94aa321252b 100644
--- a/docker/test/codebrowser/Dockerfile
+++ b/docker/test/codebrowser/Dockerfile
@@ -1,6 +1,6 @@
-# docker build --network=host -t yandex/clickhouse-codebrowser .
-# docker run --volume=path_to_repo:/repo_folder --volume=path_to_result:/test_output yandex/clickhouse-codebrowser
-FROM yandex/clickhouse-binary-builder
+# docker build --network=host -t clickhouse/codebrowser .
+# docker run --volume=path_to_repo:/repo_folder --volume=path_to_result:/test_output clickhouse/codebrowser
+FROM clickhouse/binary-builder
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get --yes --allow-unauthenticated install clang-9 libl
 # https://github.com/ClickHouse-Extras/woboq_codebrowser/commit/37e15eaf377b920acb0b48dbe82471be9203f76b
 RUN git clone https://github.com/ClickHouse-Extras/woboq_codebrowser
 
-RUN cd woboq_codebrowser && cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-9 -DCMAKE_C_COMPILER=clang-9 && make -j
+RUN cd woboq_codebrowser && cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-13 -DCMAKE_C_COMPILER=clang-13 && make -j
 
 ENV CODEGEN=/woboq_codebrowser/generator/codebrowser_generator
 ENV CODEINDEX=/woboq_codebrowser/indexgenerator/codebrowser_indexgenerator
@@ -24,7 +24,7 @@ ENV SHA=nosha
 ENV DATA="data"
 
 CMD mkdir -p $BUILD_DIRECTORY && cd $BUILD_DIRECTORY && \
-    cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-11 -DCMAKE_C_COMPILER=/usr/bin/clang-11 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
+    cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-13 -DCMAKE_C_COMPILER=/usr/bin/clang-13 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
     mkdir -p $HTML_RESULT_DIRECTORY && \
     $CODEGEN -b $BUILD_DIRECTORY -a -o $HTML_RESULT_DIRECTORY -p ClickHouse:$SOURCE_DIRECTORY:$SHA -d $DATA | ts '%Y-%m-%d %H:%M:%S' && \
     cp -r $STATIC_DATA $HTML_RESULT_DIRECTORY/ &&\
diff --git a/docker/test/compatibility/centos/Dockerfile b/docker/test/compatibility/centos/Dockerfile
index 0ef119d1bb1..628609e374f 100644
--- a/docker/test/compatibility/centos/Dockerfile
+++ b/docker/test/compatibility/centos/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-test-old-centos .
+# docker build -t clickhouse/test-old-centos .
 FROM centos:5
 
 CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \
diff --git a/docker/test/compatibility/ubuntu/Dockerfile b/docker/test/compatibility/ubuntu/Dockerfile
index 28f89e47b95..ddd0a76bd44 100644
--- a/docker/test/compatibility/ubuntu/Dockerfile
+++ b/docker/test/compatibility/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-test-old-ubuntu .
+# docker build -t clickhouse/test-old-ubuntu .
 FROM ubuntu:12.04
 
 CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \
diff --git a/docker/test/coverage/Dockerfile b/docker/test/coverage/Dockerfile
index 681f65e0f6f..ccf0bbc7c83 100644
--- a/docker/test/coverage/Dockerfile
+++ b/docker/test/coverage/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-test-coverage .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/test-coverage .
+FROM clickhouse/stateless-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/coverage/run.sh b/docker/test/coverage/run.sh
index 11b6ce13ea1..807efdf1e47 100755
--- a/docker/test/coverage/run.sh
+++ b/docker/test/coverage/run.sh
@@ -80,7 +80,7 @@ LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "RENAM
 LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
 LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "SHOW TABLES FROM test"
 
-LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test -j 8 --testname --shard --zookeeper --print-time --use-skip-list 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee /test_result.txt
+LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test -j 8 --testname --shard --zookeeper --print-time 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee /test_result.txt
 
 readarray -t FAILED_TESTS < <(awk '/FAIL|TIMEOUT|ERROR/ { print substr($3, 1, length($3)-1) }' "/test_result.txt")
 
@@ -97,7 +97,7 @@ then
 
     echo "Going to run again: ${FAILED_TESTS[*]}"
 
-    LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test --order=random --testname --shard --zookeeper --use-skip-list "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a /test_result.txt
+    LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test --order=random --testname --shard --zookeeper "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a /test_result.txt
 else
     echo "No failed tests"
 fi
diff --git a/docker/test/coverage/s3downloader b/docker/test/coverage/s3downloader
index 363ece8dac6..eb3b3cd9faf 100755
--- a/docker/test/coverage/s3downloader
+++ b/docker/test/coverage/s3downloader
@@ -92,7 +92,7 @@ if __name__ == "__main__":
             logging.info("Some exception occured %s", str(ex))
             raise
         finally:
-            logging.info("Will remove dowloaded file %s from filesystem if it exists", temp_archive_path)
+            logging.info("Will remove downloaded file %s from filesystem if it exists", temp_archive_path)
             if os.path.exists(temp_archive_path):
                 os.remove(temp_archive_path)
         logging.info("Processing of %s finished", dataset)
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 2e0bbcd350f..3119b2f1bb3 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -1,7 +1,7 @@
-#  docker build -t yandex/clickhouse-fasttest .
+#  docker build -t clickhouse/fasttest .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index b7c8240abba..0cda2f8f17f 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -9,7 +9,7 @@ trap 'kill $(jobs -pr) ||:' EXIT
 stage=${stage:-}
 
 # Compiler version, normally set by Dockerfile
-export LLVM_VERSION=${LLVM_VERSION:-11}
+export LLVM_VERSION=${LLVM_VERSION:-13}
 
 # A variable to pass additional flags to CMake.
 # Here we explicitly default it to nothing so that bash doesn't complain about
@@ -159,6 +159,7 @@ function clone_submodules
         cd "$FASTTEST_SOURCE"
 
         SUBMODULES_TO_UPDATE=(
+            contrib/magic_enum
             contrib/abseil-cpp
             contrib/boost
             contrib/zlib-ng
@@ -261,150 +262,8 @@ function run_tests
 
     start_server
 
-    TESTS_TO_SKIP=(
-        00105_shard_collations
-        00109_shard_totals_after_having
-        00110_external_sort
-        00302_http_compression
-        00417_kill_query
-        00436_convert_charset
-        00490_special_line_separators_and_characters_outside_of_bmp
-        00652_replicated_mutations_zookeeper
-        00682_empty_parts_merge
-        00701_rollup
-        00834_cancel_http_readonly_queries_on_client_close
-        00911_tautological_compare
-
-        # Hyperscan
-        00926_multimatch
-        00929_multi_match_edit_distance
-        01681_hyperscan_debug_assertion
-        02004_max_hyperscan_regex_length
-
-        01176_mysql_client_interactive          # requires mysql client
-        01031_mutations_interpreter_and_context
-        01053_ssd_dictionary # this test mistakenly requires acces to /var/lib/clickhouse -- can't run this locally, disabled
-        01083_expressions_in_engine_arguments
-        01092_memory_profiler
-        01098_msgpack_format
-        01098_temporary_and_external_tables
-        01103_check_cpu_instructions_at_startup # avoid dependency on qemu -- invonvenient when running locally
-        01193_metadata_loading
-        01238_http_memory_tracking              # max_memory_usage_for_user can interfere another queries running concurrently
-        01251_dict_is_in_infinite_loop
-        01259_dictionary_custom_settings_ddl
-        01268_dictionary_direct_layout
-        01280_ssd_complex_key_dictionary
-        01281_group_by_limit_memory_tracking    # max_memory_usage_for_user can interfere another queries running concurrently
-        01318_encrypt                           # Depends on OpenSSL
-        01318_decrypt                           # Depends on OpenSSL
-        01663_aes_msan                          # Depends on OpenSSL
-        01667_aes_args_check                    # Depends on OpenSSL
-        01683_codec_encrypted                   # Depends on OpenSSL
-        01776_decrypt_aead_size_check           # Depends on OpenSSL
-        01811_filter_by_null                    # Depends on OpenSSL
-        02012_sha512_fixedstring                # Depends on OpenSSL
-        01281_unsucceeded_insert_select_queries_counter
-        01292_create_user
-        01294_lazy_database_concurrent
-        01305_replica_create_drop_zookeeper
-        01354_order_by_tuple_collate_const
-        01355_ilike
-        01411_bayesian_ab_testing
-        01798_uniq_theta_sketch
-        01799_long_uniq_theta_sketch
-        01890_stem                               # depends on libstemmer_c
-        02003_compress_bz2                       # depends on bzip2
-        01059_storage_file_compression           # depends on brotli and bzip2
-        collate
-        collation
-        _orc_
-        arrow
-        avro
-        base64
-        brotli
-        capnproto
-        client
-        ddl_dictionaries
-        h3
-        hashing
-        hdfs
-        java_hash
-        json
-        limit_memory
-        live_view
-        memory_leak
-        memory_limit
-        mysql
-        odbc
-        parallel_alter
-        parquet
-        protobuf
-        secure
-        sha256
-        xz
-
-        # Not sure why these two fail even in sequential mode. Disabled for now
-        # to make some progress.
-        00646_url_engine
-        00974_query_profiler
-
-         # In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
-        01504_rocksdb
-        01686_rocksdb
-
-        # Look at DistributedFilesToInsert, so cannot run in parallel.
-        01460_DistributedFilesToInsert
-
-        01541_max_memory_usage_for_user_long
-
-        # Require python libraries like scipy, pandas and numpy
-        01322_ttest_scipy
-        01561_mann_whitney_scipy
-
-        01545_system_errors
-        # Checks system.errors
-        01563_distributed_query_finish
-
-        # nc - command not found
-        01601_proxy_protocol
-        01622_defaults_for_url_engine
-
-        # JSON functions
-        01666_blns
-
-        # Requires postgresql-client
-        01802_test_postgresql_protocol_with_row_policy
-
-        # Depends on AWS
-        01801_s3_cluster
-        02012_settings_clause_for_s3
-
-        # needs psql
-        01889_postgresql_protocol_null_fields
-
-        # needs pv
-        01923_network_receive_time_metric_insert
-
-        01889_sqlite_read_write
-
-        # needs s2
-        01849_geoToS2
-        01851_s2_to_geo
-        01852_s2_get_neighbours
-        01853_s2_cells_intersect
-        01854_s2_cap_contains
-        01854_s2_cap_union
-
-        # needs s3
-        01944_insert_partition_by
-
-        # depends on Go
-        02013_zlib_read_after_eof
-    )
-
-    time clickhouse-test --hung-check -j 8 --order=random --use-skip-list \
-            --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" \
+    time clickhouse-test --hung-check -j 8 --order=random \
+            --fast-tests-only --no-long --testname --shard --zookeeper \
             -- "$FASTTEST_FOCUS" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
         | tee "$FASTTEST_OUTPUT/test_log.txt"
diff --git a/docker/test/fuzzer/Dockerfile b/docker/test/fuzzer/Dockerfile
index 9a96ac1dfa7..6444e745c47 100644
--- a/docker/test/fuzzer/Dockerfile
+++ b/docker/test/fuzzer/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-fuzzer .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/fuzzer .
+FROM clickhouse/test-base
 
 ENV LANG=C.UTF-8
 ENV TZ=Europe/Moscow
@@ -36,5 +36,5 @@ CMD set -o pipefail \
     && cd /workspace \
     && /run-fuzzer.sh 2>&1 | ts "$(printf '%%Y-%%m-%%d %%H:%%M:%%S\t')" | tee main.log
 
-# docker run --network=host --volume <workspace>:/workspace -e PR_TO_TEST=<> -e SHA_TO_TEST=<> yandex/clickhouse-fuzzer
+# docker run --network=host --volume <workspace>:/workspace -e PR_TO_TEST=<> -e SHA_TO_TEST=<> clickhouse/fuzzer
 
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 603c35ede54..0b26476c20e 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -12,7 +12,7 @@ stage=${stage:-}
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 echo "$script_dir"
 repo_dir=ch
-BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-11_debug_none_bundled_unsplitted_disable_False_binary"}
+BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-13_debug_none_bundled_unsplitted_disable_False_binary"}
 
 function clone
 {
diff --git a/docker/test/integration/base/Dockerfile b/docker/test/integration/base/Dockerfile
index 344c1b9a698..519c64297e5 100644
--- a/docker/test/integration/base/Dockerfile
+++ b/docker/test/integration/base/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-integration-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/integration-test .
+FROM clickhouse/test-base
 
 SHELL ["/bin/bash", "-c"]
 
diff --git a/docker/test/integration/helper_container/Dockerfile b/docker/test/integration/helper_container/Dockerfile
index 922eb2c6f22..6a093081bf2 100644
--- a/docker/test/integration/helper_container/Dockerfile
+++ b/docker/test/integration/helper_container/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-integration-helper .
+# docker build -t clickhouse/integration-helper .
 # Helper docker container to run iptables without sudo
 
 FROM alpine
diff --git a/docker/test/integration/kerberized_hadoop/Dockerfile b/docker/test/integration/kerberized_hadoop/Dockerfile
index 6a2fd96e7a7..11da590f901 100644
--- a/docker/test/integration/kerberized_hadoop/Dockerfile
+++ b/docker/test/integration/kerberized_hadoop/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-kerberized-hadoop .
+# docker build -t clickhouse/kerberized-hadoop .
 
 FROM sequenceiq/hadoop-docker:2.7.0
 RUN sed -i -e 's/^\#baseurl/baseurl/' /etc/yum.repos.d/CentOS-Base.repo
diff --git a/docker/test/integration/kerberos_kdc/Dockerfile b/docker/test/integration/kerberos_kdc/Dockerfile
index ea231b1191d..a203c33a331 100644
--- a/docker/test/integration/kerberos_kdc/Dockerfile
+++ b/docker/test/integration/kerberos_kdc/Dockerfile
@@ -1,9 +1,9 @@
-# docker build -t yandex/clickhouse-kerberos-kdc .
+# docker build -t clickhouse/kerberos-kdc .
+FROM centos:6
 
-FROM centos:6.6
-# old OS to make is faster and smaller
+RUN sed -i '/^mirrorlist/s/^/#/;/^#baseurl/{s/#//;s/mirror.centos.org\/centos\/$releasever/vault.centos.org\/6.10/}' /etc/yum.repos.d/*B*
 
-RUN yum install -y krb5-server krb5-libs krb5-auth-dialog krb5-workstation
+RUN yum install -y ca-certificates krb5-server krb5-libs krb5-auth-dialog krb5-workstation
 
 EXPOSE 88 749
 
diff --git a/docker/test/integration/mysql_golang_client/Dockerfile b/docker/test/integration/mysql_golang_client/Dockerfile
index 4380383d1fb..68b0aaab42c 100644
--- a/docker/test/integration/mysql_golang_client/Dockerfile
+++ b/docker/test/integration/mysql_golang_client/Dockerfile
@@ -1,7 +1,7 @@
-# docker build -t yandex/clickhouse-mysql-golang-client .
+# docker build -t clickhouse/mysql-golang-client .
 # MySQL golang client docker container
 
-FROM golang:1.12.2
+FROM golang:1.13
 
 RUN go get "github.com/go-sql-driver/mysql"
 
diff --git a/docker/test/integration/mysql_java_client/Dockerfile b/docker/test/integration/mysql_java_client/Dockerfile
index fcb6a39f33b..0abf50cd493 100644
--- a/docker/test/integration/mysql_java_client/Dockerfile
+++ b/docker/test/integration/mysql_java_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-java-client .
+# docker build -t clickhouse/mysql-java-client .
 # MySQL Java client docker container
 
 FROM ubuntu:18.04
diff --git a/docker/test/integration/mysql_js_client/Dockerfile b/docker/test/integration/mysql_js_client/Dockerfile
index 4f12de004ac..b1397b40d38 100644
--- a/docker/test/integration/mysql_js_client/Dockerfile
+++ b/docker/test/integration/mysql_js_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-js-client .
+# docker build -t clickhouse/mysql-js-client .
 # MySQL JavaScript client docker container
 
 FROM node:8
diff --git a/docker/test/integration/mysql_php_client/Dockerfile b/docker/test/integration/mysql_php_client/Dockerfile
index e2ceb62f44f..0fb77bf8ffb 100644
--- a/docker/test/integration/mysql_php_client/Dockerfile
+++ b/docker/test/integration/mysql_php_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-php-client .
+# docker build -t clickhouse/mysql-php-client .
 # MySQL PHP client docker container
 
 FROM php:7.3-cli
diff --git a/docker/test/integration/postgresql_java_client/Dockerfile b/docker/test/integration/postgresql_java_client/Dockerfile
index eab236c9590..f5484028ec9 100644
--- a/docker/test/integration/postgresql_java_client/Dockerfile
+++ b/docker/test/integration/postgresql_java_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-postgresql-java-client .
+# docker build -t clickhouse/postgresql-java-client .
 # PostgreSQL Java client docker container
 
 FROM ubuntu:18.04
diff --git a/docker/test/integration/resolver/Dockerfile b/docker/test/integration/resolver/Dockerfile
index b0efb4b46d5..01b9b777614 100644
--- a/docker/test/integration/resolver/Dockerfile
+++ b/docker/test/integration/resolver/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-python-bottle .
+# docker build -t clickhouse/python-bottle .
 # Helper docker container to run python bottle apps
 
 FROM python:3
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index ef333e461c5..06e1f64ced2 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-integration-tests-runner .
+# docker build -t clickhouse/integration-tests-runner .
 FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
diff --git a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
index a65ef629df6..b3686adc21c 100644
--- a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
+++ b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
   bridge1:
-    image: yandex/clickhouse-jdbc-bridge
+    image: clickhouse/jdbc-bridge
     command: |
       /bin/bash -c 'cat << EOF > config/datasources/self.json
       {
diff --git a/docker/test/integration/runner/compose/docker_compose_keeper.yml b/docker/test/integration/runner/compose/docker_compose_keeper.yml
index e11a13e6eab..134ffbff1f7 100644
--- a/docker/test/integration/runner/compose/docker_compose_keeper.yml
+++ b/docker/test/integration/runner/compose/docker_compose_keeper.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
     zoo1:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
@@ -31,7 +31,7 @@ services:
             - inet6
             - rotate
     zoo2:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
@@ -61,7 +61,7 @@ services:
             - inet6
             - rotate
     zoo3:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml b/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
index b09e75a8515..88be3e45085 100644
--- a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
+++ b/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
@@ -4,7 +4,7 @@ services:
   kerberizedhdfs1:
     cap_add:
       - DAC_READ_SEARCH
-    image: yandex/clickhouse-kerberized-hadoop:16621
+    image: clickhouse/kerberized-hadoop
     hostname: kerberizedhdfs1
     restart: always
     volumes:
@@ -22,7 +22,7 @@ services:
     entrypoint: /etc/bootstrap.sh -d
 
   hdfskerberos:
-    image: yandex/clickhouse-kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
+    image: clickhouse/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
     hostname: hdfskerberos
     volumes:
       - ${KERBERIZED_HDFS_DIR}/secrets:/tmp/keytab
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml b/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
index 081b90c4f27..d57e4e4d5be 100644
--- a/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
+++ b/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
@@ -50,7 +50,7 @@ services:
       - label:disable
 
   kafka_kerberos:
-    image: yandex/clickhouse-kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
+    image: clickhouse/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
     hostname: kafka_kerberos
     volumes:
       - ${KERBERIZED_KAFKA_DIR}/secrets:/tmp/keytab
diff --git a/docker/test/integration/runner/compose/docker_compose_minio.yml b/docker/test/integration/runner/compose/docker_compose_minio.yml
index 96a5f8bdc31..4384c0868a5 100644
--- a/docker/test/integration/runner/compose/docker_compose_minio.yml
+++ b/docker/test/integration/runner/compose/docker_compose_minio.yml
@@ -19,14 +19,14 @@ services:
 
   # HTTP proxies for Minio.
   proxy1:
-    image: yandex/clickhouse-s3-proxy
+    image: clickhouse/s3-proxy
     expose:
       - "8080" # Redirect proxy port
       - "80"   # Reverse proxy port
       - "443"  # Reverse proxy port (secure)
 
   proxy2:
-    image: yandex/clickhouse-s3-proxy
+    image: clickhouse/s3-proxy
     expose:
       - "8080"
       - "80"
@@ -34,7 +34,7 @@ services:
 
   # Empty container to run proxy resolver.
   resolver:
-    image: yandex/clickhouse-python-bottle
+    image: clickhouse/python-bottle
     expose:
       - "8080"
     tty: true
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
index a6a338eb6a8..56cc0410574 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   golang1:
-    image: yandex/clickhouse-mysql-golang-client:${DOCKER_MYSQL_GOLANG_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-golang-client:${DOCKER_MYSQL_GOLANG_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
index 21d927df82c..eb5ffb01baa 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   java1:
-    image: yandex/clickhouse-mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
index dbd85cf2382..90939449c5f 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   mysqljs1:
-    image: yandex/clickhouse-mysql-js-client:${DOCKER_MYSQL_JS_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-js-client:${DOCKER_MYSQL_JS_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
index f24f5337a7e..408b8ff089a 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   php1:
-    image: yandex/clickhouse-mysql-php-client:${DOCKER_MYSQL_PHP_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-php-client:${DOCKER_MYSQL_PHP_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml b/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
index 38191f1bdd6..904bfffdfd5 100644
--- a/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
@@ -1,6 +1,6 @@
 version: '2.2'
 services:
   java:
-    image: yandex/clickhouse-postgresql-java-client:${DOCKER_POSTGRESQL_JAVA_CLIENT_TAG:-latest}
+    image: clickhouse/postgresql-java-client:${DOCKER_POSTGRESQL_JAVA_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/s3_proxy/Dockerfile b/docker/test/integration/s3_proxy/Dockerfile
index d8b1754fa71..5858218e4e4 100644
--- a/docker/test/integration/s3_proxy/Dockerfile
+++ b/docker/test/integration/s3_proxy/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-s3-proxy .
+# docker build -t clickhouse/s3-proxy .
 FROM nginx:alpine
 
 COPY run.sh /run.sh
diff --git a/docker/test/keeper-jepsen/Dockerfile b/docker/test/keeper-jepsen/Dockerfile
index 1a62d5e793f..5bb7f9433c2 100644
--- a/docker/test/keeper-jepsen/Dockerfile
+++ b/docker/test/keeper-jepsen/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-keeper-jepsen-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/keeper-jepsen-test .
+FROM clickhouse/test-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV CLOJURE_VERSION=1.10.3.814
diff --git a/docker/test/keeper-jepsen/run.sh b/docker/test/keeper-jepsen/run.sh
index 352585e16e3..d7534270e2c 100644
--- a/docker/test/keeper-jepsen/run.sh
+++ b/docker/test/keeper-jepsen/run.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 
-CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
+CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-13_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
 CLICKHOUSE_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}
 
 
diff --git a/docker/test/performance-comparison/Dockerfile b/docker/test/performance-comparison/Dockerfile
index 1a61c4b274a..88b66d42ecb 100644
--- a/docker/test/performance-comparison/Dockerfile
+++ b/docker/test/performance-comparison/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-performance-comparison .
+# docker build -t clickhouse/performance-comparison .
 FROM ubuntu:18.04
 
 ENV LANG=C.UTF-8
@@ -54,4 +54,4 @@ COPY * /
 # it gives '/bin/sh: 1: [bash,: not found' otherwise.
 CMD ["bash", "-c", "node=$((RANDOM % $(numactl --hardware | sed -n 's/^.*available:\\(.*\\)nodes.*$/\\1/p'))); echo Will bind to NUMA node $node; numactl --cpunodebind=$node --membind=$node /entrypoint.sh"]
 
-# docker run --network=host --volume <workspace>:/workspace --volume=<output>:/output -e PR_TO_TEST=<> -e SHA_TO_TEST=<> yandex/clickhouse-performance-comparison
+# docker run --network=host --volume <workspace>:/workspace --volume=<output>:/output -e PR_TO_TEST=<> -e SHA_TO_TEST=<> clickhouse/performance-comparison
diff --git a/docker/test/performance-comparison/README.md b/docker/test/performance-comparison/README.md
index 782644a81dd..75213fad077 100644
--- a/docker/test/performance-comparison/README.md
+++ b/docker/test/performance-comparison/README.md
@@ -116,7 +116,7 @@ pull requests (0 for master) manually.
 docker run --network=host --volume=$(pwd)/workspace:/workspace --volume=$(pwd)/output:/output
     [-e REF_PR={} -e REF_SHA={}]
     -e PR_TO_TEST={} -e SHA_TO_TEST={}
-    yandex/clickhouse-performance-comparison
+    clickhouse/performance-comparison
 ```
 
 Then see the `report.html` in the `output` directory.
diff --git a/docker/test/pvs/Dockerfile b/docker/test/pvs/Dockerfile
index 7bd45ba4018..f4675d35819 100644
--- a/docker/test/pvs/Dockerfile
+++ b/docker/test/pvs/Dockerfile
@@ -1,6 +1,6 @@
-# docker build -t yandex/clickhouse-pvs-test .
+# docker build -t clickhouse/pvs-test .
 
-FROM yandex/clickhouse-binary-builder
+FROM clickhouse/binary-builder
 
 RUN apt-get update --yes \
     && apt-get install \
@@ -28,7 +28,7 @@ RUN apt-get update --yes \
 ENV PKG_VERSION="pvs-studio-latest"
 
 RUN set -x \
-    && export PUBKEY_HASHSUM="686e5eb8b3c543a5c54442c39ec876b6c2d912fe8a729099e600017ae53c877dda3368fe38ed7a66024fe26df6b5892a" \
+    && export PUBKEY_HASHSUM="ad369a2e9d8b8c30f5a9f2eb131121739b79c78e03fef0f016ea51871a5f78cd4e6257b270dca0ac3be3d1f19d885516" \
     && wget -nv https://files.viva64.com/etc/pubkey.txt -O /tmp/pubkey.txt \
     && echo "${PUBKEY_HASHSUM} /tmp/pubkey.txt" | sha384sum -c \
     && apt-key add /tmp/pubkey.txt \
@@ -38,7 +38,7 @@ RUN set -x \
     && dpkg -i "${PKG_VERSION}.deb"
 
 CMD echo "Running PVS version $PKG_VERSION" && cd /repo_folder && pvs-studio-analyzer credentials $LICENCE_NAME $LICENCE_KEY -o ./licence.lic  \
-    && cmake . -D"ENABLE_EMBEDDED_COMPILER"=OFF -D"USE_INTERNAL_PROTOBUF_LIBRARY"=OFF -D"USE_INTERNAL_GRPC_LIBRARY"=OFF \
+    && cmake . -D"ENABLE_EMBEDDED_COMPILER"=OFF -D"USE_INTERNAL_PROTOBUF_LIBRARY"=OFF -D"USE_INTERNAL_GRPC_LIBRARY"=OFF -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang\+\+-13 \
     && ninja re2_st clickhouse_grpc_protos \
     && pvs-studio-analyzer analyze -o pvs-studio.log -e contrib -j 4 -l ./licence.lic; \
     cp /repo_folder/pvs-studio.log /test_output; \
diff --git a/docker/test/split_build_smoke_test/Dockerfile b/docker/test/split_build_smoke_test/Dockerfile
index 54a9eb17868..3cc2f26a507 100644
--- a/docker/test/split_build_smoke_test/Dockerfile
+++ b/docker/test/split_build_smoke_test/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-split-build-smoke-test .
-FROM yandex/clickhouse-binary-builder
+# docker build -t clickhouse/split-build-smoke-test .
+FROM clickhouse/binary-builder
 
 COPY run.sh /run.sh
 COPY process_split_build_smoke_test_result.py /
diff --git a/docker/test/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index 67236402352..e73fd03fb6d 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -1,9 +1,9 @@
-# docker build -t yandex/clickhouse-sqlancer-test .
+# docker build -t clickhouse/sqlancer-test .
 FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
-RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git openjdk-14-jdk maven python3 --yes --no-install-recommends
+RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git default-jdk maven python3 --yes --no-install-recommends
 RUN wget https://github.com/sqlancer/sqlancer/archive/master.zip -O /sqlancer.zip
 RUN mkdir /sqlancer && \
 	cd /sqlancer && \
diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile
index 07aad75a2ea..c237a712f52 100644
--- a/docker/test/stateful/Dockerfile
+++ b/docker/test/stateful/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateful-test .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/stateful-test .
+FROM clickhouse/stateless-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index de058469192..dd5984fd7b5 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -108,7 +108,7 @@ function run_tests()
         ADDITIONAL_OPTIONS+=('--replicated-database')
     fi
 
-    clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --use-skip-list --print-time "${ADDITIONAL_OPTIONS[@]}" \
+    clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --print-time "${ADDITIONAL_OPTIONS[@]}" \
         "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
 }
 
diff --git a/docker/test/stateful/s3downloader b/docker/test/stateful/s3downloader
index 363ece8dac6..eb3b3cd9faf 100755
--- a/docker/test/stateful/s3downloader
+++ b/docker/test/stateful/s3downloader
@@ -92,7 +92,7 @@ if __name__ == "__main__":
             logging.info("Some exception occured %s", str(ex))
             raise
         finally:
-            logging.info("Will remove dowloaded file %s from filesystem if it exists", temp_archive_path)
+            logging.info("Will remove downloaded file %s from filesystem if it exists", temp_archive_path)
             if os.path.exists(temp_archive_path):
                 os.remove(temp_archive_path)
         logging.info("Processing of %s finished", dataset)
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index b66fa055e7b..3b5edb2c869 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-test .
+FROM clickhouse/test-base
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
 
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index 154126a3880..ed721690281 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -97,7 +97,7 @@ function run_tests()
     fi
 
     clickhouse-test --testname --shard --zookeeper --hung-check --print-time \
-            --use-skip-list --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
+            --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
         | tee -a test_output/test_result.txt
 }
diff --git a/docker/test/stateless_pytest/Dockerfile b/docker/test/stateless_pytest/Dockerfile
index 947a70426d6..c1e47523f6d 100644
--- a/docker/test/stateless_pytest/Dockerfile
+++ b/docker/test/stateless_pytest/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-pytest .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-pytest .
+FROM clickhouse/test-base
 
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
diff --git a/docker/test/stateless_unbundled/Dockerfile b/docker/test/stateless_unbundled/Dockerfile
index 53857a90ac7..dfe441e08a6 100644
--- a/docker/test/stateless_unbundled/Dockerfile
+++ b/docker/test/stateless_unbundled/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-unbundled-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-unbundled-test .
+FROM clickhouse/test-base
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
 
diff --git a/docker/test/stateless_unbundled/run.sh b/docker/test/stateless_unbundled/run.sh
index 8b8612d4211..f8396706ed2 100755
--- a/docker/test/stateless_unbundled/run.sh
+++ b/docker/test/stateless_unbundled/run.sh
@@ -13,8 +13,4 @@ dpkg -i package_folder/clickhouse-test_*.deb
 
 service clickhouse-server start && sleep 5
 
-if grep -q -- "--use-skip-list" /usr/bin/clickhouse-test; then
-    SKIP_LIST_OPT="--use-skip-list"
-fi
-
-clickhouse-test --testname --shard --zookeeper "$SKIP_LIST_OPT" "$ADDITIONAL_OPTIONS" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
+clickhouse-test --testname --shard --zookeeper "$ADDITIONAL_OPTIONS" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile
index e1df32ec3d7..3fe1b790d5a 100644
--- a/docker/test/stress/Dockerfile
+++ b/docker/test/stress/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stress-test .
-FROM yandex/clickhouse-stateful-test
+# docker build -t clickhouse/stress-test .
+FROM clickhouse/stateful-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/stress/README.md b/docker/test/stress/README.md
index f747996fa2d..b1519e7968d 100644
--- a/docker/test/stress/README.md
+++ b/docker/test/stress/README.md
@@ -6,7 +6,7 @@ Usage:
 ```
 $ ls $HOME/someclickhouse
 clickhouse-client_18.14.9_all.deb clickhouse-common-static_18.14.9_amd64.deb clickhouse-server_18.14.9_all.deb clickhouse-test_18.14.9_all.deb
-$ docker run --volume=$HOME/someclickhouse:/package_folder --volume=$HOME/test_output:/test_output yandex/clickhouse-stress-test
+$ docker run --volume=$HOME/someclickhouse:/package_folder --volume=$HOME/test_output:/test_output clickhouse/stress-test
 Selecting previously unselected package clickhouse-common-static.
 (Reading database ... 14442 files and directories currently installed.)
 ...
diff --git a/docker/test/stress/stress b/docker/test/stress/stress
index c71722809d7..8fc4ade2da6 100755
--- a/docker/test/stress/stress
+++ b/docker/test/stress/stress
@@ -10,14 +10,6 @@ import logging
 import time
 
 
-def get_skip_list_cmd(path):
-    with open(path, 'r') as f:
-        for line in f:
-            if '--use-skip-list' in line:
-                return '--use-skip-list'
-    return ''
-
-
 def get_options(i):
     options = []
     client_options = []
@@ -56,8 +48,6 @@ def get_options(i):
 
 
 def run_func_test(cmd, output_prefix, num_processes, skip_tests_option, global_time_limit):
-    skip_list_opt = get_skip_list_cmd(cmd)
-
     global_time_limit_option = ''
     if global_time_limit:
         global_time_limit_option = "--global_time_limit={}".format(global_time_limit)
@@ -66,7 +56,7 @@ def run_func_test(cmd, output_prefix, num_processes, skip_tests_option, global_t
     pipes = []
     for i in range(0, len(output_paths)):
         f = open(output_paths[i], 'w')
-        full_command = "{} {} {} {} {}".format(cmd, skip_list_opt, get_options(i), global_time_limit_option, skip_tests_option)
+        full_command = "{} {} {} {}".format(cmd, get_options(i), global_time_limit_option, skip_tests_option)
         logging.info("Run func tests '%s'", full_command)
         p = Popen(full_command, shell=True, stdout=f, stderr=f)
         pipes.append(p)
@@ -80,6 +70,9 @@ def compress_stress_logs(output_path, files_prefix):
 def prepare_for_hung_check(drop_databases):
     # FIXME this function should not exist, but...
 
+    # ThreadFuzzer significantly slows down server and causes false-positive hung check failures
+    call("clickhouse client -q 'SYSTEM STOP THREAD FUZZER'", shell=True, stderr=STDOUT)
+
     # We attach gdb to clickhouse-server before running tests
     # to print stacktraces of all crashes even if clickhouse cannot print it for some reason.
     # However, it obstruct checking for hung queries.
diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index c0b3b0102cf..33cdb9db57a 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-style-test .
+# docker build -t clickhouse/style-test .
 FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
diff --git a/docker/test/test_runner.sh b/docker/test/test_runner.sh
index cd6367b2964..0c99c8c2b32 100755
--- a/docker/test/test_runner.sh
+++ b/docker/test/test_runner.sh
@@ -49,7 +49,7 @@ fi
 
 # Build server image (optional) from local packages
 if [ -z "${CLICKHOUSE_SERVER_IMAGE}" ]; then
-    CLICKHOUSE_SERVER_IMAGE="yandex/clickhouse-server:local"
+    CLICKHOUSE_SERVER_IMAGE="clickhouse/server:local"
 
     if [ "${CLICKHOUSE_PACKAGES_ARG}" != "${NO_REBUILD_FLAG}" ]; then
         docker build --network=host \
diff --git a/docker/test/testflows/runner/Dockerfile b/docker/test/testflows/runner/Dockerfile
index 81d431635b7..91d0eb844d9 100644
--- a/docker/test/testflows/runner/Dockerfile
+++ b/docker/test/testflows/runner/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-testflows-runner .
+# docker build -t clickhouse/testflows-runner .
 FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
diff --git a/docker/test/unit/Dockerfile b/docker/test/unit/Dockerfile
index e111611eecd..20d67773363 100644
--- a/docker/test/unit/Dockerfile
+++ b/docker/test/unit/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-unit-test .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/unit-test .
+FROM clickhouse/stateless-test
 
 RUN apt-get install gdb
 
diff --git a/docs/README.md b/docs/README.md
index d71e92f20d1..cd5c1af0cbd 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -38,7 +38,7 @@ Writing the docs is extremely useful for project's users and developers, and gro
 
 The documentation contains information about all the aspects of the ClickHouse lifecycle: developing, testing, installing, operating, and using. The base language of the documentation is English. The English version is the most actual. All other languages are supported as much as they can by contributors from different countries.
 
-At the moment, [documentation](https://clickhouse.tech/docs) exists in English, Russian, Chinese, Japanese, and Farsi. We store the documentation besides the ClickHouse source code in the [GitHub repository](https://github.com/ClickHouse/ClickHouse/tree/master/docs).
+At the moment, [documentation](https://clickhouse.com/docs) exists in English, Russian, Chinese, Japanese, and Farsi. We store the documentation besides the ClickHouse source code in the [GitHub repository](https://github.com/ClickHouse/ClickHouse/tree/master/docs).
 
 Each language lays in the corresponding folder. Files that are not translated from English are the symbolic links to the English ones.
 
@@ -54,7 +54,7 @@ You can contribute to the documentation in many ways, for example:
 
 - Open a required file in the ClickHouse repository and edit it from the GitHub web interface.
 
-    You can do it on GitHub, or on the [ClickHouse Documentation](https://clickhouse.tech/docs/en/) site. Each page of ClickHouse Documentation site contains an "Edit this page" (🖋) element in the upper right corner. Clicking this symbol, you get to the ClickHouse docs file opened for editing.
+    You can do it on GitHub, or on the [ClickHouse Documentation](https://clickhouse.com/docs/en/) site. Each page of ClickHouse Documentation site contains an "Edit this page" (🖋) element in the upper right corner. Clicking this symbol, you get to the ClickHouse docs file opened for editing.
 
     When you are saving a file, GitHub opens a pull-request for your contribution. Add the `documentation` label to this pull request for proper automatic checks applying. If you have no permissions for adding labels, the reviewer of your PR adds it.
 
@@ -128,7 +128,7 @@ Contribute all new information in English language. Other languages are translat
 
 When you add a new file, it should end with a link like:
 
-`[Original article](https://clickhouse.tech/docs/<path-to-the-page>) <!--hide-->`
+`[Original article](https://clickhouse.com/docs/<path-to-the-page>) <!--hide-->`
 
 and there should be **a new empty line** after it.
 
@@ -164,7 +164,7 @@ When writing documentation, think about people who read it. Each audience has sp
 
 ClickHouse documentation can be divided by the audience for the following parts:
 
-- Conceptual topics in [Introduction](https://clickhouse.tech/docs/en/), tutorials and overviews, changelog.
+- Conceptual topics in [Introduction](https://clickhouse.com/docs/en/), tutorials and overviews, changelog.
 
     These topics are for the most common auditory. When editing text in them, use the most common terms that are comfortable for the audience with basic technical skills.
 
diff --git a/docs/_description_templates/template-data-type.md b/docs/_description_templates/template-data-type.md
index d39be305838..239edb2808b 100644
--- a/docs/_description_templates/template-data-type.md
+++ b/docs/_description_templates/template-data-type.md
@@ -26,4 +26,4 @@ The name of an additional section can be any, for example, **Usage**.
 
 -   [link](#)
 
-[Original article](https://clickhouse.tech/docs/en/data-types/<data-type-name>/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data-types/<data-type-name>/) <!--hide-->
diff --git a/docs/_description_templates/template-statement.md b/docs/_description_templates/template-statement.md
index bca015a2ac6..238570c2217 100644
--- a/docs/_description_templates/template-statement.md
+++ b/docs/_description_templates/template-statement.md
@@ -12,9 +12,9 @@ Syntax of the statement.
 
 Examples of descriptions with a complicated structure:
 
-- https://clickhouse.tech/docs/en/sql-reference/statements/grant/
-- https://clickhouse.tech/docs/en/sql-reference/statements/revoke/
-- https://clickhouse.tech/docs/en/sql-reference/statements/select/join/
+- https://clickhouse.com/docs/en/sql-reference/statements/grant/
+- https://clickhouse.com/docs/en/sql-reference/statements/revoke/
+- https://clickhouse.com/docs/en/sql-reference/statements/select/join/
 
 
 **See Also** (Optional)
diff --git a/docs/en/commercial/cloud.md b/docs/en/commercial/cloud.md
index a30d17828ab..afa2e23b7a8 100644
--- a/docs/en/commercial/cloud.md
+++ b/docs/en/commercial/cloud.md
@@ -3,60 +3,7 @@ toc_priority: 1
 toc_title: Cloud
 ---
 
-# ClickHouse Cloud Service Providers {#clickhouse-cloud-service-providers}
+# ClickHouse Cloud Service {#clickhouse-cloud-service}
 
 !!! info "Info"
-    If you have launched a public cloud with managed ClickHouse service, feel free to [open a pull-request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) adding it to the following list.
-
-## Yandex Cloud {#yandex-cloud}
-
-[Yandex Managed Service for ClickHouse](https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) provides the following key features:
-
--   Fully managed ZooKeeper service for [ClickHouse replication](../engines/table-engines/mergetree-family/replication.md)
--   Multiple storage type choices
--   Replicas in different availability zones
--   Encryption and isolation
--   Automated maintenance
-
-## Altinity.Cloud {#altinity.cloud}
-
-[Altinity.Cloud](https://altinity.com/cloud-database/) is a fully managed ClickHouse-as-a-Service for the Amazon public cloud.
-
--   Fast deployment of ClickHouse clusters on Amazon resources
--   Easy scale-out/scale-in as well as vertical scaling of nodes
--   Isolated per-tenant VPCs with public endpoint or VPC peering
--   Configurable storage types and volume configurations
--   Cross-AZ scaling for performance and high availability
--   Built-in monitoring and SQL query editor
-
-## Alibaba Cloud {#alibaba-cloud}
-
-[Alibaba Cloud Managed Service for ClickHouse](https://www.alibabacloud.com/product/clickhouse) provides the following key features:
-
--   Highly reliable cloud disk storage engine based on [Alibaba Cloud Apsara](https://www.alibabacloud.com/product/apsara-stack) distributed system
--   Expand capacity on demand without manual data migration
--   Support single-node, single-replica, multi-node, and multi-replica architectures, and support hot and cold data tiering
--   Support access allow-list, one-key recovery, multi-layer network security protection, cloud disk encryption
--   Seamless integration with cloud log systems, databases, and data application tools
--   Built-in monitoring and database management platform
--   Professional database expert technical support and service
-
-## SberCloud {#sbercloud}
-
-[SberCloud.Advanced](https://sbercloud.ru/en/advanced) provides [MapReduce Service (MRS)](https://docs.sbercloud.ru/mrs/ug/topics/ug__clickhouse.html), a reliable, secure, and easy-to-use enterprise-level platform for storing, processing, and analyzing big data. MRS allows you to quickly create and manage ClickHouse clusters.
-
--   A ClickHouse instance consists of three ZooKeeper nodes and multiple ClickHouse nodes. The Dedicated Replica mode is used to ensure high reliability of dual data copies.
--   MRS provides smooth and elastic scaling capabilities to quickly meet service growth requirements in scenarios where the cluster storage capacity or CPU computing resources are not enough. When you expand the capacity of ClickHouse nodes in a cluster, MRS provides a one-click data balancing tool and gives you the initiative to balance data. You can determine the data balancing mode and time based on service characteristics to ensure service availability, implementing smooth scaling.
--   MRS uses the Elastic Load Balance ensuring high availability deployment architecture to automatically distribute user access traffic to multiple backend nodes, expanding service capabilities to external systems and improving fault tolerance. With the ELB polling mechanism, data is written to local tables and read from distributed tables on different nodes. In this way, data read/write load and high availability of application access are guaranteed.
-
-## Tencent Cloud {#tencent-cloud}
-
-[Tencent Managed Service for ClickHouse](https://cloud.tencent.com/product/cdwch) provides the following key features:
-
--   Easy to deploy and manage on Tencent Cloud
--   Highly scalable and available
--   Integrated monitor and alert service
--   High security with isolated per cluster VPCs
--   On-demand pricing with no upfront costs or long-term commitments
-
-{## [Original article](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
+    Detailed public description for ClickHouse cloud services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/en/commercial/index.md b/docs/en/commercial/index.md
index 90e74d88ea8..1f1911b8c4d 100644
--- a/docs/en/commercial/index.md
+++ b/docs/en/commercial/index.md
@@ -6,12 +6,8 @@ toc_title: Introduction
 
 # ClickHouse Commercial Services {#clickhouse-commercial-services}
 
-This section is a directory of commercial service providers specializing in ClickHouse. They are independent companies not necessarily affiliated with Yandex.
-
 Service categories:
 
 -   [Cloud](../commercial/cloud.md)
 -   [Support](../commercial/support.md)
 
-!!! note "For service providers"
-    If you happen to represent one of them, feel free to open a pull request adding your company to the respective section (or even adding a new section if the service does not fit into existing categories). The easiest way to open a pull-request for documentation page is by using a “pencil” edit button in the top-right corner. If your service available in some local market, make sure to mention it in a localized documentation page as well (or at least point it out in a pull-request description).
diff --git a/docs/en/commercial/support.md b/docs/en/commercial/support.md
index 27f3f0c6a22..33b69b40b2d 100644
--- a/docs/en/commercial/support.md
+++ b/docs/en/commercial/support.md
@@ -3,23 +3,7 @@ toc_priority: 3
 toc_title: Support
 ---
 
-# ClickHouse Commercial Support Service Providers {#clickhouse-commercial-support-service-providers}
+# ClickHouse Commercial Support Service  {#clickhouse-commercial-support-service}
 
 !!! info "Info"
-    If you have launched a ClickHouse commercial support service, feel free to [open a pull-request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/support.md) adding it to the following list.
-
-## Yandex.Cloud
-
-ClickHouse worldwide support from the authors of ClickHouse. Supports on-premise and cloud deployments. Ask details on clickhouse-support@yandex-team.com
-
-## Altinity {#altinity}
-
-Altinity has offered enterprise ClickHouse support and services since 2017. Altinity customers range from Fortune 100 enterprises to startups. Visit [www.altinity.com](https://www.altinity.com/) for more information.
-
-## Mafiree {#mafiree}
-
-[Service description](http://mafiree.com/clickhouse-analytics-services.php)
-
-## MinervaDB {#minervadb}
-
-[Service description](https://minervadb.com/index.php/clickhouse-consulting-and-support-by-minervadb/)
+    Detailed public description for ClickHouse support services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/en/development/adding_test_queries.md b/docs/en/development/adding_test_queries.md
index 4da027b8fb1..a73b0e1ac5d 100644
--- a/docs/en/development/adding_test_queries.md
+++ b/docs/en/development/adding_test_queries.md
@@ -63,7 +63,7 @@ git checkout -b name_for_a_branch_with_my_test upstream/master
 
 #### Install & run clickhouse
 
-1) install `clickhouse-server` (follow [official docs](https://clickhouse.tech/docs/en/getting-started/install/))
+1) install `clickhouse-server` (follow [official docs](https://clickhouse.com/docs/en/getting-started/install/))
 2) install test configurations (it will use Zookeeper mock implementation and adjust some settings)
 ```
 cd ~/workspace/ClickHouse/tests/config
diff --git a/docs/en/development/architecture.md b/docs/en/development/architecture.md
index e2e40603d30..44e68d645b7 100644
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@@ -196,4 +196,4 @@ Besides, each replica stores its state in ZooKeeper as the set of parts and its
 !!! note "Note"
     The ClickHouse cluster consists of independent shards, and each shard consists of replicas. The cluster is **not elastic**, so after adding a new shard, data is not rebalanced between shards automatically. Instead, the cluster load is supposed to be adjusted to be uneven. This implementation gives you more control, and it is ok for relatively small clusters, such as tens of nodes. But for clusters with hundreds of nodes that we are using in production, this approach becomes a significant drawback. We should implement a table engine that spans across the cluster with dynamically replicated regions that could be split and balanced between clusters automatically.
 
-{## [Original article](https://clickhouse.tech/docs/en/development/architecture/) ##}
+{## [Original article](https://clickhouse.com/docs/en/development/architecture/) ##}
diff --git a/docs/en/development/browse-code.md b/docs/en/development/browse-code.md
index e65a4d5e549..35555bbd79c 100644
--- a/docs/en/development/browse-code.md
+++ b/docs/en/development/browse-code.md
@@ -5,7 +5,7 @@ toc_title: Source Code Browser
 
 # Browse ClickHouse Source Code {#browse-clickhouse-source-code}
 
-You can use **Woboq** online code browser available [here](https://clickhouse.tech/codebrowser/html_report/ClickHouse/src/index.html). It provides code navigation and semantic highlighting, search and indexing. The code snapshot is updated daily.
+You can use **Woboq** online code browser available [here](https://clickhouse.com/codebrowser/html_report/ClickHouse/src/index.html). It provides code navigation and semantic highlighting, search and indexing. The code snapshot is updated daily.
 
 Also, you can browse sources on [GitHub](https://github.com/ClickHouse/ClickHouse) as usual.
 
diff --git a/docs/en/development/build-osx.md b/docs/en/development/build-osx.md
index 687e0179e07..d188b4bb147 100644
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@@ -76,7 +76,7 @@ cd ClickHouse
 rm -rf build
 mkdir build
 cd build
-cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-10 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-10 -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-11 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-11 -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 cmake --build . --config RelWithDebInfo
 cd ..
 ```
@@ -114,15 +114,25 @@ To do so, create the `/Library/LaunchDaemons/limit.maxfiles.plist` file with the
 </plist>
 ```
 
-Execute the following command:
+Give the file correct permissions:
 
 ``` bash
 sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
 ```
 
-Reboot.
+Validate that the file is correct:
 
-To check if it’s working, you can use `ulimit -n` command.
+``` bash
+plutil /Library/LaunchDaemons/limit.maxfiles.plist
+```
+
+Load the file (or reboot):
+
+``` bash
+sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
+```
+
+To check if it’s working, use the `ulimit -n` or `launchctl limit maxfiles` commands.
 
 ## Run ClickHouse server:
 
@@ -131,4 +141,4 @@ cd ClickHouse
 ./build/programs/clickhouse-server --config-file ./programs/server/config.xml
 ```
 
-[Original article](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index be45c1ed5f7..633549c68f3 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -23,7 +23,7 @@ $ sudo apt-get install git cmake python ninja-build
 
 Or cmake3 instead of cmake on older systems.
 
-### Install clang-11 (recommended) {#install-clang-11}
+### Install clang-13 (recommended) {#install-clang-13}
 
 On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
@@ -33,11 +33,11 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 For other Linux distribution - check the availability of the [prebuild packages](https://releases.llvm.org/download.html) or build clang [from sources](https://clang.llvm.org/get_started.html).
 
-#### Use clang-11 for Builds
+#### Use clang-13 for Builds
 
 ``` bash
-$ export CC=clang-11
-$ export CXX=clang++-11
+$ export CC=clang-13
+$ export CXX=clang++-13
 ```
 
 Gcc can also be used though it is discouraged.
@@ -161,4 +161,4 @@ Note that the split build has several drawbacks:
 * You cannot run the integration tests since they only work a single complete binary.
 * You can't easily copy the binaries elsewhere. Instead of moving a single binary you'll need to copy all binaries and libraries.
 
-[Original article](https://clickhouse.tech/docs/en/development/build/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/build/) <!--hide-->
diff --git a/docs/en/development/continuous-integration.md b/docs/en/development/continuous-integration.md
index 95a7e7bbc69..0176a2dcb76 100644
--- a/docs/en/development/continuous-integration.md
+++ b/docs/en/development/continuous-integration.md
@@ -117,7 +117,7 @@ described [here](tests.md#functional-test-locally).
 
 ## Build Check {#build-check}
 
-Builds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The `cmake` options can be found in the build log, grepping for `cmake`. Use these options and follow the [general build process](build.md).
+Builds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The `cmake` options can be found in the build log, grepping for `cmake`. Use these options and follow the [general build process](../development/build.md).
 
 ### Report Details
 
@@ -127,7 +127,7 @@ Builds ClickHouse in various configurations for use in further steps. You have t
 - **Build type**: `Debug` or `RelWithDebInfo` (cmake).
 - **Sanitizer**: `none` (without sanitizers), `address` (ASan), `memory` (MSan), `undefined` (UBSan), or `thread` (TSan).
 - **Bundled**: `bundled` build uses libraries from `contrib` folder, and `unbundled` build uses system libraries.
-- **Splitted** `splitted` is a [split build](build.md#split-build)
+- **Splitted** `splitted` is a [split build](../development/build.md#split-build)
 - **Status**: `success` or `fail`
 - **Build log**: link to the building and files copying log, useful when build failed.
 - **Build time**.
@@ -157,7 +157,7 @@ etc. Look at the report to see which tests fail, then reproduce the failure
 locally as described [here](tests.md#functional-test-locally). Note that you
 have to use the correct build configuration to reproduce -- a test might fail
 under AddressSanitizer but pass in Debug. Download the binary from [CI build
-checks page](build.md#you-dont-have-to-build-clickhouse), or build it locally.
+checks page](../development/build.md#you-dont-have-to-build-clickhouse), or build it locally.
 
 
 ## Functional Stateful Tests
@@ -183,11 +183,11 @@ concurrency-related errors. If it fails:
 
 ## Split Build Smoke Test
 
-Checks that the server build in [split build](build.md#split-build)
+Checks that the server build in [split build](../development/build.md#split-build)
 configuration can start and run simple queries.  If it fails:
 
     * Fix other test errors first;
-    * Build the server in [split build](build.md#split-build) configuration
+    * Build the server in [split build](../development/build.md#split-build) configuration
       locally and check whether it can start and run `select 1`.
 
 
diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md
index 537ed6a9c4f..0cc0b0a24e5 100644
--- a/docs/en/development/developer-instruction.md
+++ b/docs/en/development/developer-instruction.md
@@ -233,13 +233,13 @@ Just in case, it is worth mentioning that CLion creates `build` path on its own,
 
 ## Writing Code {#writing-code}
 
-The description of ClickHouse architecture can be found here: https://clickhouse.tech/docs/en/development/architecture/
+The description of ClickHouse architecture can be found here: https://clickhouse.com/docs/en/development/architecture/
 
-The Code Style Guide: https://clickhouse.tech/docs/en/development/style/
+The Code Style Guide: https://clickhouse.com/docs/en/development/style/
 
-Adding third-party libraries: https://clickhouse.tech/docs/en/development/contrib/#adding-third-party-libraries
+Adding third-party libraries: https://clickhouse.com/docs/en/development/contrib/#adding-third-party-libraries
 
-Writing tests: https://clickhouse.tech/docs/en/development/tests/
+Writing tests: https://clickhouse.com/docs/en/development/tests/
 
 List of tasks: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
diff --git a/docs/en/development/index.md b/docs/en/development/index.md
index bb4158554d3..f9f0d644973 100644
--- a/docs/en/development/index.md
+++ b/docs/en/development/index.md
@@ -7,4 +7,4 @@ toc_title: hidden
 
 # ClickHouse Development {#clickhouse-development}
 
-[Original article](https://clickhouse.tech/docs/en/development/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/) <!--hide-->
diff --git a/docs/en/development/style.md b/docs/en/development/style.md
index 987df275c1d..bc38f0711cf 100644
--- a/docs/en/development/style.md
+++ b/docs/en/development/style.md
@@ -828,4 +828,4 @@ function(
       size_t limit)
 ```
 
-[Original article](https://clickhouse.tech/docs/en/development/style/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/style/) <!--hide-->
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index c7c0ec88be4..0e2aa348483 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -239,7 +239,7 @@ Google OSS-Fuzz can be found at `docker/fuzz`.
 We also use simple fuzz test to generate random SQL queries and to check that the server does not die executing them.
 You can find it in `00746_sql_fuzzy.pl`. This test should be run continuously (overnight and longer).
 
-We also use sophisticated AST-based query fuzzer that is able to find huge amount of corner cases. It does random permutations and substitutions in queries AST. It remembers AST nodes from previous tests to use them for fuzzing of subsequent tests while processing them in random order. You can learn more about this fuzzer in [this blog article](https://clickhouse.tech/blog/en/2021/fuzzing-clickhouse/).
+We also use sophisticated AST-based query fuzzer that is able to find huge amount of corner cases. It does random permutations and substitutions in queries AST. It remembers AST nodes from previous tests to use them for fuzzing of subsequent tests while processing them in random order. You can learn more about this fuzzer in [this blog article](https://clickhouse.com/blog/en/2021/fuzzing-clickhouse/).
 
 ## Stress test
 
@@ -341,4 +341,4 @@ Build jobs and tests are run in Sandbox on per commit basis. Resulting packages
 We do not use Travis CI due to the limit on time and computational power.
 We do not use Jenkins. It was used before and now we are happy we are not using Jenkins.
 
-[Original article](https://clickhouse.tech/docs/en/development/tests/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/tests/) <!--hide-->
diff --git a/docs/en/engines/database-engines/lazy.md b/docs/en/engines/database-engines/lazy.md
index c59abec0ba5..ecd4b94f579 100644
--- a/docs/en/engines/database-engines/lazy.md
+++ b/docs/en/engines/database-engines/lazy.md
@@ -13,4 +13,4 @@ It’s optimized for storing many small \*Log tables, for which there is a long
 
     CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
 
-[Original article](https://clickhouse.tech/docs/en/database_engines/lazy/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/database_engines/lazy/) <!--hide-->
diff --git a/docs/en/engines/database-engines/materialized-mysql.md b/docs/en/engines/database-engines/materialized-mysql.md
index 7e099ac3802..5aa969daf88 100644
--- a/docs/en/engines/database-engines/materialized-mysql.md
+++ b/docs/en/engines/database-engines/materialized-mysql.md
@@ -197,4 +197,4 @@ SELECT * FROM mysql.test;
 └───┴─────┴──────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/database-engines/materialized-mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/database-engines/materialized-mysql/) <!--hide-->
diff --git a/docs/en/engines/database-engines/materialized-postgresql.md b/docs/en/engines/database-engines/materialized-postgresql.md
index 77a5f2af0e0..e759ba2f416 100644
--- a/docs/en/engines/database-engines/materialized-postgresql.md
+++ b/docs/en/engines/database-engines/materialized-postgresql.md
@@ -23,6 +23,20 @@ ENGINE = MaterializedPostgreSQL('host:port', ['database' | database], 'user', 'p
 -   `user` — PostgreSQL user.
 -   `password` — User password.
 
+## Dynamically adding new tables to replication
+
+``` sql
+ATTACH TABLE postgres_database.new_table;
+```
+
+It will work as well if there is a setting `materialized_postgresql_tables_list`.
+
+## Dynamically removing tables from replication
+
+``` sql
+DETACH TABLE postgres_database.table_to_remove;
+```
+
 ## Settings {#settings}
 
 -   [materialized_postgresql_max_block_size](../../operations/settings/settings.md#materialized-postgresql-max-block-size)
@@ -44,6 +58,12 @@ SETTINGS materialized_postgresql_max_block_size = 65536,
 SELECT * FROM database1.table1;
 ```
 
+It is also possible to change settings at run time.
+
+``` sql
+ALTER DATABASE postgres_database MODIFY SETTING materialized_postgresql_max_block_size = <new_size>;
+```
+
 ## Requirements {#requirements}
 
 1. The [wal_level](https://www.postgresql.org/docs/current/runtime-config-wal.html) setting must have a value `logical` and `max_replication_slots` parameter must have a value at least `2` in the PostgreSQL config file.
diff --git a/docs/en/engines/database-engines/mysql.md b/docs/en/engines/database-engines/mysql.md
index 0507be6bd46..c5a1bba44b2 100644
--- a/docs/en/engines/database-engines/mysql.md
+++ b/docs/en/engines/database-engines/mysql.md
@@ -147,4 +147,4 @@ SELECT * FROM mysql_db.mysql_table
 └────────┴───────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/database_engines/mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/database_engines/mysql/) <!--hide-->
diff --git a/docs/en/engines/database-engines/postgresql.md b/docs/en/engines/database-engines/postgresql.md
index 9e339f9d6f4..76ef484e773 100644
--- a/docs/en/engines/database-engines/postgresql.md
+++ b/docs/en/engines/database-engines/postgresql.md
@@ -136,4 +136,4 @@ DESCRIBE TABLE test_database.test_table;
 └────────┴───────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/database-engines/postgresql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/database-engines/postgresql/) <!--hide-->
diff --git a/docs/en/engines/index.md b/docs/en/engines/index.md
index 6b2b6509e8b..b3f4a4f7b69 100644
--- a/docs/en/engines/index.md
+++ b/docs/en/engines/index.md
@@ -12,4 +12,4 @@ There are two key engine kinds in ClickHouse:
 -   [Table engines](../engines/table-engines/index.md)
 -   [Database engines](../engines/database-engines/index.md)
 
-{## [Original article](https://clickhouse.tech/docs/en/engines/) ##}
+{## [Original article](https://clickhouse.com/docs/en/engines/) ##}
diff --git a/docs/en/engines/table-engines/index.md b/docs/en/engines/table-engines/index.md
index 13b3395e15b..09e0147bbf7 100644
--- a/docs/en/engines/table-engines/index.md
+++ b/docs/en/engines/table-engines/index.md
@@ -86,4 +86,4 @@ To select data from a virtual column, you must specify its name in the `SELECT`
 
 If you create a table with a column that has the same name as one of the table virtual columns, the virtual column becomes inaccessible. We do not recommend doing this. To help avoid conflicts, virtual column names are usually prefixed with an underscore.
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
index b55f1b68aea..7b9f8b8c400 100644
--- a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
@@ -81,4 +81,4 @@ You can also change any [rocksdb options](https://github.com/facebook/rocksdb/wi
 </rocksdb>
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/hdfs.md b/docs/en/engines/table-engines/integrations/hdfs.md
index 81dd29741aa..0fcf7a63dd8 100644
--- a/docs/en/engines/table-engines/integrations/hdfs.md
+++ b/docs/en/engines/table-engines/integrations/hdfs.md
@@ -224,4 +224,4 @@ libhdfs3 support HDFS namenode HA.
 
 -   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/hdfs/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/hdfs/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/jdbc.md b/docs/en/engines/table-engines/integrations/jdbc.md
index e43e782a420..2f442fd7753 100644
--- a/docs/en/engines/table-engines/integrations/jdbc.md
+++ b/docs/en/engines/table-engines/integrations/jdbc.md
@@ -92,4 +92,4 @@ FROM system.numbers
 
 -   [JDBC table function](../../../sql-reference/table-functions/jdbc.md).
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/jdbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/jdbc/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/kafka.md b/docs/en/engines/table-engines/integrations/kafka.md
index a3a13f9d152..879e919e823 100644
--- a/docs/en/engines/table-engines/integrations/kafka.md
+++ b/docs/en/engines/table-engines/integrations/kafka.md
@@ -194,4 +194,4 @@ Example:
 -   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/kafka/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/kafka/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/mongodb.md b/docs/en/engines/table-engines/integrations/mongodb.md
index 9839893d4e8..b8a9bb19a05 100644
--- a/docs/en/engines/table-engines/integrations/mongodb.md
+++ b/docs/en/engines/table-engines/integrations/mongodb.md
@@ -66,4 +66,4 @@ SELECT COUNT() FROM mongo_table;
 └─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/mysql.md b/docs/en/engines/table-engines/integrations/mysql.md
index a6402e00bc9..b0e5959c0c2 100644
--- a/docs/en/engines/table-engines/integrations/mysql.md
+++ b/docs/en/engines/table-engines/integrations/mysql.md
@@ -19,6 +19,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 SETTINGS
     [connection_pool_size=16, ]
     [connection_max_tries=3, ]
+    [connection_wait_timeout=5, ] /* 0 -- do not wait */
     [connection_auto_close=true ]
 ;
 ```
@@ -112,4 +113,4 @@ SELECT * FROM mysql_table
 -   [The ‘mysql’ table function](../../../sql-reference/table-functions/mysql.md)
 -   [Using MySQL as a source of external dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/mysql/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/odbc.md b/docs/en/engines/table-engines/integrations/odbc.md
index ab39fb7a811..0ef21d8565a 100644
--- a/docs/en/engines/table-engines/integrations/odbc.md
+++ b/docs/en/engines/table-engines/integrations/odbc.md
@@ -128,4 +128,4 @@ SELECT * FROM odbc_t
 -   [ODBC external dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBC table function](../../../sql-reference/table-functions/odbc.md)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/odbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/odbc/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/postgresql.md b/docs/en/engines/table-engines/integrations/postgresql.md
index 53ab3f5088c..0bdb54e0c16 100644
--- a/docs/en/engines/table-engines/integrations/postgresql.md
+++ b/docs/en/engines/table-engines/integrations/postgresql.md
@@ -149,4 +149,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [The `postgresql` table function](../../../sql-reference/table-functions/postgresql.md)
 -   [Using PostgreSQL as a source of external dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/rabbitmq.md b/docs/en/engines/table-engines/integrations/rabbitmq.md
index a3ee1115c00..ebb42461204 100644
--- a/docs/en/engines/table-engines/integrations/rabbitmq.md
+++ b/docs/en/engines/table-engines/integrations/rabbitmq.md
@@ -170,4 +170,4 @@ Example:
 -   `_message_id` - messageID of the received message; non-empty if was set, when message was published.
 -   `_timestamp` - timestamp of the received message; non-empty if was set, when message was published.
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index 7249e24aff9..e494e9aec6a 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -210,4 +210,4 @@ ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-
 
 ## See also
 
--  [S3 table function](../../../sql-reference/table-functions/s3.md)
+-  [s3 table function](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/en/engines/table-engines/log-family/index.md b/docs/en/engines/table-engines/log-family/index.md
index b505fe1c474..910df09e67f 100644
--- a/docs/en/engines/table-engines/log-family/index.md
+++ b/docs/en/engines/table-engines/log-family/index.md
@@ -44,4 +44,4 @@ The `TinyLog` engine is the simplest in the family and provides the poorest func
 
 The `Log` and `StripeLog` engines support parallel data reading. When reading data, ClickHouse uses multiple threads. Each thread processes a separate data block. The `Log` engine uses a separate file for each column of the table. `StripeLog` stores all the data in one file. As a result, the `StripeLog` engine uses fewer file descriptors, but the `Log` engine provides higher efficiency when reading data.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/log_family/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/en/engines/table-engines/log-family/stripelog.md b/docs/en/engines/table-engines/log-family/stripelog.md
index 693f5a21db2..62703245062 100644
--- a/docs/en/engines/table-engines/log-family/stripelog.md
+++ b/docs/en/engines/table-engines/log-family/stripelog.md
@@ -90,4 +90,4 @@ SELECT * FROM stripe_log_table ORDER BY timestamp
 └─────────────────────┴──────────────┴────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/stripelog/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/en/engines/table-engines/log-family/tinylog.md b/docs/en/engines/table-engines/log-family/tinylog.md
index ea2138e36fe..2407355a857 100644
--- a/docs/en/engines/table-engines/log-family/tinylog.md
+++ b/docs/en/engines/table-engines/log-family/tinylog.md
@@ -11,4 +11,4 @@ This table engine is typically used with the write-once method: write data one t
 
 Queries are executed in a single stream. In other words, this engine is intended for relatively small tables (up to about 1,000,000 rows). It makes sense to use this table engine if you have many small tables, since it’s simpler than the [Log](../../../engines/table-engines/log-family/log.md) engine (fewer files need to be opened).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/tinylog/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 818830646cb..8c9f8dd8ce3 100644
--- a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -100,4 +100,4 @@ GROUP BY StartDate
 ORDER BY StartDate;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
index 4ec976eda30..271b8b20fdb 100644
--- a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -303,4 +303,4 @@ select * FROM UAct
 └─────────────────────┴───────────┴──────────┴──────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 706e5dd3c4b..2711c76aeb6 100644
--- a/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -127,4 +127,4 @@ Note that on the operating server, you cannot manually change the set of parts o
 
 ClickHouse allows you to perform operations with the partitions: delete them, copy from one table to another, or create a backup. See the list of all operations in the section [Manipulations With Partitions and Parts](../../../sql-reference/statements/alter/partition.md#alter_manipulations-with-partitions).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
index 33707709fdf..79ba06096b2 100644
--- a/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -170,4 +170,4 @@ Fields for `pattern` and `default` sections:
 !!! warning "Warning"
     Data rollup is performed during merges. Usually, for old partitions, merges are not started, so for rollup it is necessary to trigger an unscheduled merge using [optimize](../../../sql-reference/statements/optimize.md). Or use additional tools, for example [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index fd82dbaea7a..f7118f7557e 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -100,8 +100,8 @@ For a description of parameters, see the [CREATE query description](../../../sql
     -   `min_merge_bytes_to_use_direct_io` — The minimum data volume for merge operation that is required for using direct I/O access to the storage disk. When merging data parts, ClickHouse calculates the total storage volume of all the data to be merged. If the volume exceeds `min_merge_bytes_to_use_direct_io` bytes, ClickHouse reads and writes the data to the storage disk using the direct I/O interface (`O_DIRECT` option). If `min_merge_bytes_to_use_direct_io = 0`, then direct I/O is disabled. Default value: `10 * 1024 * 1024 * 1024` bytes.
         <a name="mergetree_setting-merge_with_ttl_timeout"></a>
     -   `merge_with_ttl_timeout` — Minimum delay in seconds before repeating a merge with delete TTL. Default value: `14400` seconds (4 hours).
-    -   `merge_with_recompression_ttl_timeout` — Minimum delay in seconds before repeating a merge with recompression TTL. Default value: `14400` seconds (4 hours).    
-    -   `try_fetch_recompressed_part_timeout` — Timeout (in seconds) before starting merge with recompression. During this time ClickHouse tries to fetch recompressed part from replica which assigned this merge with recompression. Default value: `7200` seconds (2 hours).    
+    -   `merge_with_recompression_ttl_timeout` — Minimum delay in seconds before repeating a merge with recompression TTL. Default value: `14400` seconds (4 hours).
+    -   `try_fetch_recompressed_part_timeout` — Timeout (in seconds) before starting merge with recompression. During this time ClickHouse tries to fetch recompressed part from replica which assigned this merge with recompression. Default value: `7200` seconds (2 hours).
     -   `write_final_mark` — Enables or disables writing the final index mark at the end of data part (after the last byte). Default value: 1. Don’t turn it off.
     -   `merge_max_block_size` — Maximum number of rows in block for merge operations. Default value: 8192.
     -   `storage_policy` — Storage policy. See [Using Multiple Block Devices for Data Storage](#table_engine-mergetree-multiple-volumes).
@@ -335,7 +335,16 @@ SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
 
     The optional `false_positive` parameter is the probability of receiving a false positive response from the filter. Possible values: (0, 1). Default value: 0.025.
 
-    Supported data types: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`, `UUID`.
+    Supported data types: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`, `UUID`, `Map`.
+
+    For `Map` data type client can specify if index should be created for keys or values using [mapKeys](../../../sql-reference/functions/tuple-map-functions.md#mapkeys) or [mapValues](../../../sql-reference/functions/tuple-map-functions.md#mapvalues)  function.
+
+    Example of index creation for `Map` data type
+
+```
+INDEX map_key_index mapKeys(map_column) TYPE bloom_filter GRANULARITY 1
+INDEX map_key_index mapValues(map_column) TYPE bloom_filter GRANULARITY 1
+```
 
     The following functions can use it: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions.md), [notIn](../../../sql-reference/functions/in-functions.md), [has](../../../sql-reference/functions/array-functions.md).
 
@@ -398,7 +407,7 @@ Projections are an experimental feature. To enable them you must set the [allow_
 Projections are not supported in the `SELECT` statements with the [FINAL](../../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
 ### Projection Query {#projection-query}
-A projection query is what defines a projection. It implicitly selects data from the parent table. 
+A projection query is what defines a projection. It implicitly selects data from the parent table.
 **Syntax**
 
 ```sql
@@ -548,7 +557,7 @@ ORDER BY d
 TTL d + INTERVAL 1 MONTH DELETE WHERE toDayOfWeek(d) = 1;
 ```
 
-Creating a table, where expired rows are recompressed: 
+Creating a table, where expired rows are recompressed:
 
 ```sql
 CREATE TABLE table_for_recompression
diff --git a/docs/en/engines/table-engines/mergetree-family/replication.md b/docs/en/engines/table-engines/mergetree-family/replication.md
index 277339f9b47..7cd58d35362 100644
--- a/docs/en/engines/table-engines/mergetree-family/replication.md
+++ b/docs/en/engines/table-engines/mergetree-family/replication.md
@@ -288,5 +288,7 @@ If the data in ZooKeeper was lost or damaged, you can save data by moving it to
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 -   [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
+-   [max_replicated_fetches_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
+-   [max_replicated_sends_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/summingmergetree.md b/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
index 36840e6fd0b..5726acf000e 100644
--- a/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
@@ -136,4 +136,4 @@ When requesting data, use the [sumMap(key, value)](../../../sql-reference/aggreg
 
 For nested data structure, you do not need to specify its columns in the tuple of columns for summation.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index 93c35344e24..8266bf34876 100644
--- a/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -233,4 +233,4 @@ SELECT * FROM UAct FINAL
 
 This is a very inefficient way to select data. Don’t use it for large tables.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/buffer.md b/docs/en/engines/table-engines/special/buffer.md
index 0e7f0a53da8..884774cbfae 100644
--- a/docs/en/engines/table-engines/special/buffer.md
+++ b/docs/en/engines/table-engines/special/buffer.md
@@ -75,4 +75,4 @@ A Buffer table is used when too many INSERTs are received from a large number of
 
 Note that it does not make sense to insert data one row at a time, even for Buffer tables. This will only produce a speed of a few thousand rows per second, while inserting larger blocks of data can produce over a million rows per second (see the section “Performance”).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/buffer/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/distributed.md b/docs/en/engines/table-engines/special/distributed.md
index 5c911c6cc0a..368849359ef 100644
--- a/docs/en/engines/table-engines/special/distributed.md
+++ b/docs/en/engines/table-engines/special/distributed.md
@@ -198,4 +198,4 @@ When the `max_parallel_replicas` option is enabled, query processing is parallel
 -   [Virtual columns](../../../engines/table-engines/special/index.md#table_engines-virtual_columns)
 -   [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/distributed/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/external-data.md b/docs/en/engines/table-engines/special/external-data.md
index b5429ccad12..4ec90905fe5 100644
--- a/docs/en/engines/table-engines/special/external-data.md
+++ b/docs/en/engines/table-engines/special/external-data.md
@@ -63,4 +63,4 @@ $ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+coun
 
 For distributed query processing, the temporary tables are sent to all the remote servers.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/external_data/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/file.md b/docs/en/engines/table-engines/special/file.md
index cb5baf368d2..7673f45ca8d 100644
--- a/docs/en/engines/table-engines/special/file.md
+++ b/docs/en/engines/table-engines/special/file.md
@@ -85,4 +85,4 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
     -   Indices
     -   Replication
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/file/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/file/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/generate.md b/docs/en/engines/table-engines/special/generate.md
index 393f7ccab23..fabe31897bb 100644
--- a/docs/en/engines/table-engines/special/generate.md
+++ b/docs/en/engines/table-engines/special/generate.md
@@ -56,4 +56,4 @@ SELECT * FROM generate_engine_table LIMIT 3
     -   Indices
     -   Replication
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/generate/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/generate/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/materializedview.md b/docs/en/engines/table-engines/special/materializedview.md
index 1d98eb2e3b7..75161829a7e 100644
--- a/docs/en/engines/table-engines/special/materializedview.md
+++ b/docs/en/engines/table-engines/special/materializedview.md
@@ -7,4 +7,4 @@ toc_title: MaterializedView
 
 Used for implementing materialized views (for more information, see [CREATE VIEW](../../../sql-reference/statements/create/view.md#materialized)). For storing data, it uses a different engine that was specified when creating the view. When reading from a table, it just uses that engine.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/materializedview/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/memory.md b/docs/en/engines/table-engines/special/memory.md
index b6402c2030b..eb557d36c50 100644
--- a/docs/en/engines/table-engines/special/memory.md
+++ b/docs/en/engines/table-engines/special/memory.md
@@ -15,4 +15,4 @@ Normally, using this table engine is not justified. However, it can be used for
 
 The Memory engine is used by the system for temporary tables with external query data (see the section “External data for processing a query”), and for implementing `GLOBAL IN` (see the section “IN operators”).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/memory/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/merge.md b/docs/en/engines/table-engines/special/merge.md
index 07cb778c6e9..19ce19fcc64 100644
--- a/docs/en/engines/table-engines/special/merge.md
+++ b/docs/en/engines/table-engines/special/merge.md
@@ -69,4 +69,4 @@ FROM WatchLog
 
 -   [Virtual columns](../../../engines/table-engines/special/index.md#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/merge/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/null.md b/docs/en/engines/table-engines/special/null.md
index 5f9a2ac679b..39ed9c1c1a6 100644
--- a/docs/en/engines/table-engines/special/null.md
+++ b/docs/en/engines/table-engines/special/null.md
@@ -10,4 +10,4 @@ When writing to a `Null` table, data is ignored. When reading from a `Null` tabl
 !!! info "Hint"
     However, you can create a materialized view on a `Null` table. So the data written to the table will end up affecting the view, but original raw data will still be discarded.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/null/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/null/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/set.md b/docs/en/engines/table-engines/special/set.md
index a5a7e46af13..c38c2418093 100644
--- a/docs/en/engines/table-engines/special/set.md
+++ b/docs/en/engines/table-engines/special/set.md
@@ -20,4 +20,4 @@ When creating a table, the following settings are applied:
 
 -   [persistent](../../../operations/settings/settings.md#persistent)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/set/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/set/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/url.md b/docs/en/engines/table-engines/special/url.md
index d3f577f8f4f..04f035206b5 100644
--- a/docs/en/engines/table-engines/special/url.md
+++ b/docs/en/engines/table-engines/special/url.md
@@ -78,4 +78,4 @@ SELECT * FROM url_engine_table
     -   Indexes.
     -   Replication.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/url/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/url/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/view.md b/docs/en/engines/table-engines/special/view.md
index c4f95adfa6d..9b847a0e2d5 100644
--- a/docs/en/engines/table-engines/special/view.md
+++ b/docs/en/engines/table-engines/special/view.md
@@ -7,4 +7,4 @@ toc_title: View
 
 Used for implementing views (for more information, see the `CREATE VIEW query`). It does not store data, but only stores the specified `SELECT` query. When reading from a table, it runs this query (and deletes all unnecessary columns from the query).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/view/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/view/) <!--hide-->
diff --git a/docs/en/faq/general/columnar-database.md b/docs/en/faq/general/columnar-database.md
index e30b4a94a87..cbc5f77d0ba 100644
--- a/docs/en/faq/general/columnar-database.md
+++ b/docs/en/faq/general/columnar-database.md
@@ -17,9 +17,9 @@ Key columnar database advantages are:
 Here is the illustration of the difference between traditional row-oriented systems and columnar databases when building reports:
 
 **Traditional row-oriented**
-![Traditional row-oriented](https://clickhouse.tech/docs/en/images/row-oriented.gif#)
+![Traditional row-oriented](https://clickhouse.com/docs/en/images/row-oriented.gif#)
 
 **Columnar**
-![Columnar](https://clickhouse.tech/docs/en/images/column-oriented.gif#)
+![Columnar](https://clickhouse.com/docs/en/images/column-oriented.gif#)
 
 A columnar database is a preferred choice for analytical applications because it allows to have many columns in a table just in case, but do not pay the cost for unused columns on read query execution time. Column-oriented databases are designed for big data processing because and data warehousing, they often natively scale using distributed clusters of low-cost hardware to increase throughput. ClickHouse does it with combination of [distributed](../../engines/table-engines/special/distributed.md) and [replicated](../../engines/table-engines/mergetree-family/replication.md) tables.
diff --git a/docs/en/faq/general/index.md b/docs/en/faq/general/index.md
index 8b4a1432a61..cd2368be1cf 100644
--- a/docs/en/faq/general/index.md
+++ b/docs/en/faq/general/index.md
@@ -21,4 +21,4 @@ Questions:
 !!! info "Don’t see what you were looking for?"
     Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
 
-{## [Original article](https://clickhouse.tech/docs/en/faq/general/) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq/general/) ##}
diff --git a/docs/en/faq/general/ne-tormozit.md b/docs/en/faq/general/ne-tormozit.md
index 17c5479fa6d..26ae741216d 100644
--- a/docs/en/faq/general/ne-tormozit.md
+++ b/docs/en/faq/general/ne-tormozit.md
@@ -23,4 +23,4 @@ If you haven’t seen one of those t-shirts in person, you can check them out on
 
 ![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
 
-P.S. These t-shirts are not for sale, they are given away for free on most [ClickHouse Meetups](https://clickhouse.tech/#meet), usually for best questions or other forms of active participation.
+P.S. These t-shirts are not for sale, they are given away for free on most [ClickHouse Meetups](https://clickhouse.com/#meet), usually for best questions or other forms of active participation.
diff --git a/docs/en/faq/index.md b/docs/en/faq/index.md
index 1e9c3b8ae64..d845b8c5898 100644
--- a/docs/en/faq/index.md
+++ b/docs/en/faq/index.md
@@ -43,4 +43,4 @@ Question candidates:
 - Window function workarounds (row_number, lag/lead, running diff/sum/average)
 ##}
 
-{## [Original article](https://clickhouse.tech/docs/en/faq) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq) ##}
diff --git a/docs/en/faq/integration/index.md b/docs/en/faq/integration/index.md
index 74ff4d04c49..51a2593b751 100644
--- a/docs/en/faq/integration/index.md
+++ b/docs/en/faq/integration/index.md
@@ -16,4 +16,4 @@ Questions:
 !!! info "Don’t see what you were looking for?"
     Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
 
-{## [Original article](https://clickhouse.tech/docs/en/faq/integration/) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq/integration/) ##}
diff --git a/docs/en/faq/operations/index.md b/docs/en/faq/operations/index.md
index bb354771086..c0a6d85b66d 100644
--- a/docs/en/faq/operations/index.md
+++ b/docs/en/faq/operations/index.md
@@ -15,4 +15,4 @@ Questions:
 !!! info "Don’t see what you were looking for?"
     Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
 
-{## [Original article](https://clickhouse.tech/docs/en/faq/production/) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq/production/) ##}
diff --git a/docs/en/faq/use-cases/index.md b/docs/en/faq/use-cases/index.md
index 27090af3830..aac5493b105 100644
--- a/docs/en/faq/use-cases/index.md
+++ b/docs/en/faq/use-cases/index.md
@@ -15,4 +15,4 @@ Questions:
 !!! info "Don’t see what you were looking for?"
     Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
 
-{## [Original article](https://clickhouse.tech/docs/en/faq/use-cases/) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq/use-cases/) ##}
diff --git a/docs/en/faq/use-cases/time-series.md b/docs/en/faq/use-cases/time-series.md
index 4fc53c0bea4..bf97ac4b1e2 100644
--- a/docs/en/faq/use-cases/time-series.md
+++ b/docs/en/faq/use-cases/time-series.md
@@ -6,7 +6,7 @@ toc_priority: 101
 
 # Can I Use ClickHouse As a Time-Series Database? {#can-i-use-clickhouse-as-a-time-series-database}
 
-ClickHouse is a generic data storage solution for [OLAP](../../faq/general/olap.md) workloads, while there are many specialized time-series database management systems. Nevertheless, ClickHouse’s [focus on query execution speed](../../faq/general/why-clickhouse-is-so-fast.md) allows it to outperform specialized systems in many cases. There are many independent benchmarks on this topic out there ([example](https://medium.com/@AltinityDB/clickhouse-for-time-series-scalability-benchmarks-e181132a895b)), so we’re not going to conduct one here. Instead, let’s focus on ClickHouse features that are important to use if that’s your use case.
+ClickHouse is a generic data storage solution for [OLAP](../../faq/general/olap.md) workloads, while there are many specialized time-series database management systems. Nevertheless, ClickHouse’s [focus on query execution speed](../../faq/general/why-clickhouse-is-so-fast.md) allows it to outperform specialized systems in many cases. There are many independent benchmarks on this topic out there, so we’re not going to conduct one here. Instead, let’s focus on ClickHouse features that are important to use if that’s your use case.
 
 First of all, there are **[specialized codecs](../../sql-reference/statements/create/table.md#create-query-specialized-codecs)** which make typical time-series. Either common algorithms like `DoubleDelta` and `Gorilla` or specific to ClickHouse like `T64`.
 
diff --git a/docs/en/getting-started/example-datasets/amplab-benchmark.md b/docs/en/getting-started/example-datasets/amplab-benchmark.md
index 27ddfd27f78..b410a3595ec 100644
--- a/docs/en/getting-started/example-datasets/amplab-benchmark.md
+++ b/docs/en/getting-started/example-datasets/amplab-benchmark.md
@@ -124,4 +124,4 @@ ORDER BY totalRevenue DESC
 LIMIT 1
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/brown-benchmark.md b/docs/en/getting-started/example-datasets/brown-benchmark.md
index c9b74a84a54..ef00a6e68ec 100644
--- a/docs/en/getting-started/example-datasets/brown-benchmark.md
+++ b/docs/en/getting-started/example-datasets/brown-benchmark.md
@@ -413,4 +413,4 @@ ORDER BY yr,
 
 The data is also available for interactive queries in the [Playground](https://gh-api.clickhouse.tech/play?user=play), [example](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/brown-benchmark/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/brown-benchmark/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/criteo.md b/docs/en/getting-started/example-datasets/criteo.md
index 261d1606fa4..08298172c70 100644
--- a/docs/en/getting-started/example-datasets/criteo.md
+++ b/docs/en/getting-started/example-datasets/criteo.md
@@ -76,4 +76,4 @@ INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int
 DROP TABLE criteo_log;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/github-events.md b/docs/en/getting-started/example-datasets/github-events.md
index a6c71733832..e470e88b182 100644
--- a/docs/en/getting-started/example-datasets/github-events.md
+++ b/docs/en/getting-started/example-datasets/github-events.md
@@ -7,5 +7,5 @@ toc_title: GitHub Events
 
 Dataset contains all events on GitHub from 2011 to Dec 6 2020, the size is 3.1 billion records. Download size is 75 GB and it will require up to 200 GB space on disk if stored in a table with lz4 compression.
 
-Full dataset description, insights, download instruction and interactive queries are posted [here](https://github-sql.github.io/explorer/).
+Full dataset description, insights, download instruction and interactive queries are posted [here](https://ghe.clickhouse.tech/).
 
diff --git a/docs/en/getting-started/example-datasets/index.md b/docs/en/getting-started/example-datasets/index.md
index e61c76970a7..78eb96a3f39 100644
--- a/docs/en/getting-started/example-datasets/index.md
+++ b/docs/en/getting-started/example-datasets/index.md
@@ -25,4 +25,4 @@ The list of documented datasets:
 -   [Brown University Benchmark](../../getting-started/example-datasets/brown-benchmark.md)
 -   [Cell Towers](../../getting-started/example-datasets/cell-towers.md)
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/metrica.md b/docs/en/getting-started/example-datasets/metrica.md
index 159c99b15a0..296f18a8f83 100644
--- a/docs/en/getting-started/example-datasets/metrica.md
+++ b/docs/en/getting-started/example-datasets/metrica.md
@@ -42,7 +42,11 @@ md5sum hits_v1.tsv
 # Checksum should be equal to: f3631b6295bf06989c1437491f7592cb
 # now create table
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
+# for hits_v1
 clickhouse-client --query "CREATE TABLE datasets.hits_v1 ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
+# for hits_100m_obfuscated
+clickhouse-client --query="CREATE TABLE  hits_100m_obfuscated (WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, Refresh UInt8, RefererCategoryID UInt16, RefererRegionID UInt32, URLCategoryID UInt16, URLRegionID UInt32, ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, OriginalURL String, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), LocalEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, RemoteIP UInt32, WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming UInt32, DNSTiming UInt32, ConnectTiming UInt32, ResponseStartTiming UInt32, ResponseEndTiming UInt32, FetchTiming UInt32, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER  BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
+
 # import data
 cat hits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.hits_v1 FORMAT TSV" --max_insert_block_size=100000
 # optionally you can optimize table
diff --git a/docs/en/getting-started/example-datasets/nyc-taxi.md b/docs/en/getting-started/example-datasets/nyc-taxi.md
index 38a87a674f9..5869822811a 100644
--- a/docs/en/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/en/getting-started/example-datasets/nyc-taxi.md
@@ -385,4 +385,4 @@ We ran queries using a client located in a Yandex datacenter in Finland on a clu
 | 3       | 0.212 | 0.438 | 0.733 | 1.241 |
 | 140     | 0.028 | 0.043 | 0.051 | 0.072 |
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/ontime.md b/docs/en/getting-started/example-datasets/ontime.md
index dfa1d7ff964..5bced0280f5 100644
--- a/docs/en/getting-started/example-datasets/ontime.md
+++ b/docs/en/getting-started/example-datasets/ontime.md
@@ -404,4 +404,4 @@ This performance test was created by Vadim Tkachenko. See:
 -   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
 -   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/recipes.md b/docs/en/getting-started/example-datasets/recipes.md
index 22c068af358..c512809d328 100644
--- a/docs/en/getting-started/example-datasets/recipes.md
+++ b/docs/en/getting-started/example-datasets/recipes.md
@@ -337,4 +337,4 @@ Result:
 
 The dataset is also available in the [Online Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
 
-[Original article](https://clickhouse.tech/docs/en/getting-started/example-datasets/recipes/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting-started/example-datasets/recipes/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/star-schema.md b/docs/en/getting-started/example-datasets/star-schema.md
index 8a019e7ded3..14fa7cef654 100644
--- a/docs/en/getting-started/example-datasets/star-schema.md
+++ b/docs/en/getting-started/example-datasets/star-schema.md
@@ -365,4 +365,4 @@ ORDER BY
     P_BRAND ASC;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/wikistat.md b/docs/en/getting-started/example-datasets/wikistat.md
index 619711582f4..3e3f7b164ce 100644
--- a/docs/en/getting-started/example-datasets/wikistat.md
+++ b/docs/en/getting-started/example-datasets/wikistat.md
@@ -30,4 +30,4 @@ $ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/page
 $ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/en/getting-started/index.md b/docs/en/getting-started/index.md
index 066809aac89..372e8d7bd64 100644
--- a/docs/en/getting-started/index.md
+++ b/docs/en/getting-started/index.md
@@ -12,4 +12,4 @@ If you are new to ClickHouse and want to get a hands-on feeling of its performan
 -   [Go through detailed tutorial](../getting-started/tutorial.md)
 -   [Experiment with example datasets](../getting-started/example-datasets/ontime.md)
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/) <!--hide-->
diff --git a/docs/en/getting-started/install.md b/docs/en/getting-started/install.md
index 517be8704e4..26b44962dca 100644
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@@ -38,6 +38,10 @@ You can also download and install packages manually from [here](https://repo.cli
 -   `clickhouse-client` — Creates a symbolic link for `clickhouse-client` and other client-related tools. and installs client configuration files.
 -   `clickhouse-common-static-dbg` — Installs ClickHouse compiled binary files with debug info.
 
+!!! attention "Attention"
+    If you need to install specific version of ClickHouse you have to install all packages with the same version:
+    `sudo apt-get install clickhouse-server=21.8.5.7 clickhouse-client=21.8.5.7 clickhouse-common-static=21.8.5.7`
+
 ### From RPM Packages {#from-rpm-packages}
 
 It is recommended to use official pre-compiled `rpm` packages for CentOS, RedHat, and all other rpm-based Linux distributions.
@@ -199,6 +203,6 @@ SELECT 1
 
 **Congratulations, the system works!**
 
-To continue experimenting, you can download one of the test data sets or go through [tutorial](https://clickhouse.tech/tutorial.html).
+To continue experimenting, you can download one of the test data sets or go through [tutorial](https://clickhouse.com/tutorial.html).
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/install/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/install/) <!--hide-->
diff --git a/docs/en/getting-started/tutorial.md b/docs/en/getting-started/tutorial.md
index 694a82e100e..9ed79222389 100644
--- a/docs/en/getting-started/tutorial.md
+++ b/docs/en/getting-started/tutorial.md
@@ -659,4 +659,4 @@ INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 
 Replication operates in multi-master mode. Data can be loaded into any replica, and the system then syncs it with other instances automatically. Replication is asynchronous so at a given moment, not all replicas may contain recently inserted data. At least one replica should be up to allow data ingestion. Others will sync up data and repair consistency once they will become active again. Note that this approach allows for the low possibility of a loss of recently inserted data.
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/en/guides/apply-catboost-model.md b/docs/en/guides/apply-catboost-model.md
index b354a42a843..9fd48fcc62d 100644
--- a/docs/en/guides/apply-catboost-model.md
+++ b/docs/en/guides/apply-catboost-model.md
@@ -239,4 +239,4 @@ FROM
 !!! note "Note"
     More info about [avg()](../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) and [log()](../sql-reference/functions/math-functions.md) functions.
 
-[Original article](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/en/guides/index.md b/docs/en/guides/index.md
index 8a48a411b7a..eb4ca9af367 100644
--- a/docs/en/guides/index.md
+++ b/docs/en/guides/index.md
@@ -11,4 +11,4 @@ List of detailed step-by-step instructions that help to solve various tasks usin
 -   [Tutorial on simple cluster set-up](../getting-started/tutorial.md)
 -   [Applying a CatBoost model in ClickHouse](../guides/apply-catboost-model.md)
 
-[Original article](https://clickhouse.tech/docs/en/guides/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/guides/) <!--hide-->
diff --git a/docs/en/index.md b/docs/en/index.md
index 12e72ebdf3b..532be035bbc 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -92,4 +92,4 @@ This is not done in “normal” databases, because it does not make sense when
 
 Note that for CPU efficiency, the query language must be declarative (SQL or MDX), or at least a vector (J, K). The query should only contain implicit loops, allowing for optimization.
 
-{## [Original article](https://clickhouse.tech/docs/en/) ##}
+{## [Original article](https://clickhouse.com/docs/en/) ##}
diff --git a/docs/en/interfaces/cpp.md b/docs/en/interfaces/cpp.md
index 479b0ac87d9..dcd1228ea0f 100644
--- a/docs/en/interfaces/cpp.md
+++ b/docs/en/interfaces/cpp.md
@@ -7,4 +7,4 @@ toc_title: C++ Client Library
 
 See README at [clickhouse-cpp](https://github.com/ClickHouse/clickhouse-cpp) repository.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/cpp/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/cpp/) <!--hide-->
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index bac67ecf140..6e06fc1f06a 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -23,7 +23,6 @@ The supported formats are:
 | [CustomSeparated](#format-customseparated)                                              | ✔     | ✔      |
 | [Values](#data-format-values)                                                           | ✔     | ✔      |
 | [Vertical](#vertical)                                                                   | ✗     | ✔      |
-| [VerticalRaw](#verticalraw)                                                             | ✗     | ✔      |
 | [JSON](#json)                                                                           | ✗     | ✔      |
 | [JSONAsString](#jsonasstring)                                                           | ✔     | ✗      |
 | [JSONStrings](#jsonstrings)                                                               | ✗     | ✔      |
@@ -60,6 +59,7 @@ The supported formats are:
 | [LineAsString](#lineasstring)                                                           | ✔     | ✗      |
 | [Regexp](#data-format-regexp)                                                           | ✔     | ✗      |
 | [RawBLOB](#rawblob)                                                                     | ✔     | ✔      |
+| [MsgPack](#msgpack)                                                                     | ✔     | ✔      |
 
 You can control some format processing parameters with the ClickHouse settings. For more information read the [Settings](../operations/settings/settings.md) section.
 
@@ -74,7 +74,7 @@ The `TabSeparated` format is convenient for processing data using custom program
 The `TabSeparated` format supports outputting total values (when using WITH TOTALS) and extreme values (when ‘extremes’ is set to 1). In these cases, the total values and extremes are output after the main data. The main result, total values, and extremes are separated from each other by an empty line. Example:
 
 ``` sql
-SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT TabSeparated``
+SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT TabSeparated
 ```
 
 ``` text
@@ -943,10 +943,6 @@ test: string with 'quotes' and      with some special
 
 This format is only appropriate for outputting a query result, but not for parsing (retrieving data to insert in a table).
 
-## VerticalRaw {#verticalraw}
-
-Similar to [Vertical](#vertical), but with escaping disabled. This format is only suitable for outputting query results, not for parsing (receiving data and inserting it in the table).
-
 ## XML {#xml}
 
 XML format is suitable only for output, not for parsing. Example:
@@ -1270,6 +1266,8 @@ You can insert Parquet data from a file into ClickHouse table by the following c
 $ cat {filename} | clickhouse-client --query="INSERT INTO {some_table} FORMAT Parquet"
 ```
 
+To insert data into [Nested](../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs values you must switch on the [input_format_parquet_import_nested](../operations/settings/settings.md#input_format_parquet_import_nested) setting.
+
 You can select data from a ClickHouse table and save them into some file in the Parquet format by the following command:
 
 ``` bash
@@ -1328,6 +1326,8 @@ You can insert Arrow data from a file into ClickHouse table by the following com
 $ cat filename.arrow | clickhouse-client --query="INSERT INTO some_table FORMAT Arrow"
 ```
 
+To insert data into [Nested](../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs values you must switch on the [input_format_arrow_import_nested](../operations/settings/settings.md#input_format_arrow_import_nested) setting.
+
 ### Selecting Data {#selecting-data-arrow}
 
 You can select data from a ClickHouse table and save them into some file in the Arrow format by the following command:
@@ -1384,6 +1384,8 @@ You can insert ORC data from a file into ClickHouse table by the following comma
 $ cat filename.orc | clickhouse-client --query="INSERT INTO some_table FORMAT ORC"
 ```
 
+To insert data into [Nested](../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs values you must switch on the [input_format_orc_import_nested](../operations/settings/settings.md#input_format_orc_import_nested) setting.
+
 ### Selecting Data {#selecting-data-2}
 
 You can select data from a ClickHouse table and save them into some file in the ORC format by the following command:
@@ -1545,4 +1547,33 @@ Result:
 f9725a22f9191e064120d718e26862a9  -
 ```
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/formats/) <!--hide-->
+## MsgPack {#msgpack}
+
+ClickHouse supports reading and writing [MessagePack](https://msgpack.org/) data files.
+
+### Data Types Matching {#data-types-matching-msgpack}
+
+| MessagePack data type (`INSERT`)                                   | ClickHouse data type                                      | MessagePack data type (`SELECT`)   |
+|--------------------------------------------------------------------|-----------------------------------------------------------|------------------------------------|
+| `uint N`, `positive fixint`                                        | [UIntN](../sql-reference/data-types/int-uint.md)          | `uint N`                           |
+| `int N`                                                            | [IntN](../sql-reference/data-types/int-uint.md)           | `int N`                            |
+| `bool`                                                             | [UInt8](../sql-reference/data-types/int-uint.md)          | `uint 8`                           |
+| `fixstr`, `str 8`, `str 16`, `str 32`, `bin 8`, `bin 16`, `bin 32` | [String](../sql-reference/data-types/string.md)           | `bin 8`, `bin 16`, `bin 32`        |
+| `fixstr`, `str 8`, `str 16`, `str 32`, `bin 8`, `bin 16`, `bin 32` | [FixedString](../sql-reference/data-types/fixedstring.md) | `bin 8`, `bin 16`, `bin 32`        |
+| `float 32`                                                         | [Float32](../sql-reference/data-types/float.md)           | `float 32`                         |
+| `float 64`                                                         | [Float64](../sql-reference/data-types/float.md)           | `float 64`                         |
+| `uint 16`                                                          | [Date](../sql-reference/data-types/date.md)               | `uint 16`                          |
+| `uint 32`                                                          | [DateTime](../sql-reference/data-types/datetime.md)       | `uint 32`                          |
+| `uint 64`                                                          | [DateTime64](../sql-reference/data-types/datetime.md)     | `uint 64`                          |
+| `fixarray`, `array 16`, `array 32`                                 | [Array](../sql-reference/data-types/array.md)             | `fixarray`, `array 16`, `array 32` |
+| `fixmap`, `map 16`, `map 32`                                       | [Map](../sql-reference/data-types/map.md)                 | `fixmap`, `map 16`, `map 32`       |
+
+Example:
+
+Writing to a file ".msgpk":
+
+```sql
+$ clickhouse-client --query="CREATE TABLE msgpack (array Array(UInt8)) ENGINE = Memory;"
+$ clickhouse-client --query="INSERT INTO msgpack VALUES ([0, 1, 2, 3, 42, 253, 254, 255]), ([255, 254, 253, 42, 3, 2, 1, 0])";
+$ clickhouse-client --query="SELECT * FROM msgpack FORMAT MsgPack" > tmp_msgpack.msgpk;
+```
diff --git a/docs/en/interfaces/index.md b/docs/en/interfaces/index.md
index 1613e8508a5..10f15ae47d6 100644
--- a/docs/en/interfaces/index.md
+++ b/docs/en/interfaces/index.md
@@ -24,4 +24,4 @@ There are also a wide range of third-party libraries for working with ClickHouse
 -   [Integrations](../interfaces/third-party/integrations.md)
 -   [Visual interfaces](../interfaces/third-party/gui.md)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/) <!--hide-->
diff --git a/docs/en/interfaces/jdbc.md b/docs/en/interfaces/jdbc.md
index ec3fa2fe89a..cf97568a8de 100644
--- a/docs/en/interfaces/jdbc.md
+++ b/docs/en/interfaces/jdbc.md
@@ -10,4 +10,4 @@ toc_title: JDBC Driver
     -   [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
     -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/jdbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/jdbc/) <!--hide-->
diff --git a/docs/en/interfaces/mysql.md b/docs/en/interfaces/mysql.md
index 619e2deab31..38bcc2b68f8 100644
--- a/docs/en/interfaces/mysql.md
+++ b/docs/en/interfaces/mysql.md
@@ -50,4 +50,4 @@ To cancel a long query use `KILL QUERY connection_id` statement (it is replaced
 $ mysql --protocol tcp -h mysql_server -P 9004 default -u default --password=123 -e "KILL QUERY 123456;"
 ```
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/mysql/) <!--hide-->
diff --git a/docs/en/interfaces/odbc.md b/docs/en/interfaces/odbc.md
index 42ae4cf5b53..fa58ed8b43e 100644
--- a/docs/en/interfaces/odbc.md
+++ b/docs/en/interfaces/odbc.md
@@ -7,4 +7,4 @@ toc_title: ODBC Driver
 
 -   [Official driver](https://github.com/ClickHouse/clickhouse-odbc)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/odbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/odbc/) <!--hide-->
diff --git a/docs/en/interfaces/tcp.md b/docs/en/interfaces/tcp.md
index 75ca3e3fd91..b23f8110320 100644
--- a/docs/en/interfaces/tcp.md
+++ b/docs/en/interfaces/tcp.md
@@ -7,4 +7,4 @@ toc_title: Native Interface (TCP)
 
 The native protocol is used in the [command-line client](../interfaces/cli.md), for inter-server communication during distributed query processing, and also in other C++ programs. Unfortunately, native ClickHouse protocol does not have formal specification yet, but it can be reverse-engineered from ClickHouse source code (starting [around here](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client)) and/or by intercepting and analyzing TCP traffic.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/tcp/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/tcp/) <!--hide-->
diff --git a/docs/en/interfaces/third-party/client-libraries.md b/docs/en/interfaces/third-party/client-libraries.md
index 835e3c6e98a..cb8679e4bdd 100644
--- a/docs/en/interfaces/third-party/client-libraries.md
+++ b/docs/en/interfaces/third-party/client-libraries.md
@@ -67,4 +67,4 @@ toc_title: Client Libraries
 -   Haskell
     -   [hdbc-clickhouse](https://github.com/zaneli/hdbc-clickhouse)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index f2c6d1ee542..06474499ccd 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -84,7 +84,7 @@ Features:
 -   Table data preview.
 -   Full-text search.
 
-By default, DBeaver does not connect using a session (the CLI for example does). If you require session support (for example to set settings for your session), edit the driver connection properties and set session_id to a random string (it uses the http connection under the hood). Then you can use any setting from the query window 
+By default, DBeaver does not connect using a session (the CLI for example does). If you require session support (for example to set settings for your session), edit the driver connection properties and set `session_id` to a random string (it uses the http connection under the hood). Then you can use any setting from the query window.
 
 ### clickhouse-cli {#clickhouse-cli}
 
@@ -113,6 +113,22 @@ Features:
 
 [MindsDB](https://mindsdb.com/) is an open-source AI layer for databases including ClickHouse that allows you to effortlessly develop, train and deploy state-of-the-art machine learning models. MindsDB Studio(GUI) allows you to train new models from database, interpret predictions made by the model, identify potential data biases, and evaluate and visualize model accuracy using the Explainable AI function to adapt and tune your Machine Learning models faster.
 
+### DBM {#dbm}
+
+[DBM](https://dbm.incubator.edurt.io/) DBM is a visual management tool for ClickHouse!
+
+Features:
+
+-   Support query history (pagination, clear all, etc.)
+-   Support selected sql clauses query
+-   Support terminating query
+-   Support table management (metadata, delete, preview)
+-   Support database management (delete, create)
+-   Support custom query
+-   Support multiple data sources management(connection test, monitoring)
+-   Support monitor (processor, connection, query)
+-   Support migrate data
+
 ## Commercial {#commercial}
 
 ### DataGrip {#datagrip}
@@ -190,20 +206,4 @@ SeekTable is [free](https://www.seektable.com/help/cloud-pricing) for personal/i
 
 [Chadmin](https://github.com/bun4uk/chadmin) is a simple UI where you can visualize your currently running queries on your ClickHouse cluster and info about them and kill them if you want.
 
-### DBM {#dbm}
-
-[DBM](https://dbm.incubator.edurt.io/) DBM is a visual management tool for ClickHouse!
-
-Features:
-
--   Support query history (pagination, clear all, etc.)
--   Support selected sql clauses query
--   Support terminating query
--   Support table management (metadata, delete, preview)
--   Support database management (delete, create)
--   Support custom query
--   Support multiple data sources management(connection test, monitoring)
--   Support monitor (processor, connection, query)
--   Support migrate data
-
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/en/interfaces/third-party/integrations.md b/docs/en/interfaces/third-party/integrations.md
index 48782268940..d7b31fb36d0 100644
--- a/docs/en/interfaces/third-party/integrations.md
+++ b/docs/en/interfaces/third-party/integrations.md
@@ -108,4 +108,4 @@ toc_title: Integrations
     -   [GraphQL](https://github.com/graphql)
         -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/integrations/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/en/interfaces/third-party/proxy.md b/docs/en/interfaces/third-party/proxy.md
index fc01568e35a..31a2d5afae9 100644
--- a/docs/en/interfaces/third-party/proxy.md
+++ b/docs/en/interfaces/third-party/proxy.md
@@ -41,4 +41,4 @@ Features:
 
 Implemented in Go.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/proxy/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/en/introduction/adopters.md b/docs/en/introduction/adopters.md
index 83cbfde939d..9060cd37d6a 100644
--- a/docs/en/introduction/adopters.md
+++ b/docs/en/introduction/adopters.md
@@ -58,7 +58,7 @@ toc_title: Adopters
 | <a href="https://glaber.io/" class="favicon">Glaber</a> | Monitoring | Main product | — | — | [Website](https://glaber.io/) |
 | <a href="https://www.huya.com/" class="favicon">HUYA</a> | Video Streaming | Analytics | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf) |
 | <a href="https://www.the-ica.com/" class="favicon">ICA</a> | FinTech | Risk Management | — | — | [Blog Post in English, Sep 2020](https://altinity.com/blog/clickhouse-vs-redshift-performance-for-fintech-risk-management?utm_campaign=ClickHouse%20vs%20RedShift&utm_content=143520807&utm_medium=social&utm_source=twitter&hss_channel=tw-3894792263) |
-| <a href="https://www.idealista.com" class="favicon">Idealista</a> | Real Estate | Analytics | — | — | [Blog Post in English, April 2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019) |
+| <a href="https://www.idealista.com" class="favicon">Idealista</a> | Real Estate | Analytics | — | — | [Blog Post in English, April 2019](https://clickhouse.com/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019) |
 | <a href="https://infobaleen.com" class="favicon">Infobaleen</a> | AI markting tool  | Analytics | — | — | [Official site](https://infobaleen.com) |
 | <a href="https://www.infovista.com/" class="favicon">Infovista</a> | Networks | Analytics | — | — | [Slides in English, October 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf) |
 | <a href="https://www.innogames.com" class="favicon">InnoGames</a> | Games | Metrics, Logging | — | — | [Slides in Russian, September 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf) |
@@ -70,7 +70,7 @@ toc_title: Adopters
 | <a href="https://jinshuju.net" class="favicon">Jinshuju 金数据</a> | BI Analytics | Main product | — | — | [Slides in Chinese, October 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/3.%20金数据数据架构调整方案Public.pdf) |
 | <a href="https://www.kodiakdata.com/" class="favicon">Kodiak Data</a> | Clouds | Main product | — | — | [Slides in Engish, April 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup13/kodiak_data.pdf) |
 | <a href="https://kontur.ru" class="favicon">Kontur</a> | Software Development | Metrics | — | — | [Talk in Russian, November 2018](https://www.youtube.com/watch?v=U4u4Bd0FtrY) |
-| <a href="https://www.kuaishou.com/" class="favicon">Kuaishou</a> | Video | — | — | — | [ClickHouse Meetup, October 2018](https://clickhouse.tech/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/) |
+| <a href="https://www.kuaishou.com/" class="favicon">Kuaishou</a> | Video | — | — | — | [ClickHouse Meetup, October 2018](https://clickhouse.com/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/) |
 | <a href="https://www.lbl.gov" class="favicon">Lawrence Berkeley National Laboratory</a> | Research | Traffic analysis | 1 server | 11.8 TiB | [Slides in English, April 2019](https://www.smitasin.com/presentations/2019-04-17_DOE-NSM.pdf) |
 | <a href="https://lifestreet.com/" class="favicon">LifeStreet</a> | Ad network | Main product | 75 servers (3 replicas) | 5.27 PiB | [Blog post in Russian, February 2017](https://habr.com/en/post/322620/) |
 | <a href="https://mcs.mail.ru/" class="favicon">Mail.ru Cloud Solutions</a> | Cloud services | Main product | — | — | [Article in Russian](https://mcs.mail.ru/help/db-create/clickhouse#) |
@@ -160,4 +160,4 @@ toc_title: Adopters
 | <a href="https://zagravagames.com/en/" class="favicon">Zagrava Trading</a> | — | — | — | — | [Job offer, May 2021](https://twitter.com/datastackjobs/status/1394707267082063874) |
 | <a href="https://beeline.ru/" class="favicon">Beeline</a> | Telecom | Data Platform | — | — | [Blog post, July 2021](https://habr.com/en/company/beeline/blog/567508/) |
 
-[Original article](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/en/introduction/distinctive-features.md b/docs/en/introduction/distinctive-features.md
index ee9f9484c67..34ba4b89415 100644
--- a/docs/en/introduction/distinctive-features.md
+++ b/docs/en/introduction/distinctive-features.md
@@ -93,4 +93,4 @@ ClickHouse implements user account management using SQL queries and allows for [
 2.  Lack of ability to modify or delete already inserted data with a high rate and low latency. There are batch deletes and updates available to clean up or modify data, for example, to comply with [GDPR](https://gdpr-info.eu).
 3.  The sparse index makes ClickHouse not so efficient for point queries retrieving single rows by their keys.
 
-[Original article](https://clickhouse.tech/docs/en/introduction/distinctive-features/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/distinctive-features/) <!--hide-->
diff --git a/docs/en/introduction/history.md b/docs/en/introduction/history.md
index 247c4afc375..d192eff80ea 100644
--- a/docs/en/introduction/history.md
+++ b/docs/en/introduction/history.md
@@ -51,4 +51,4 @@ OLAPServer worked well for non-aggregated data, but it had many restrictions tha
 
 The initial goal for ClickHouse was to remove the limitations of OLAPServer and solve the problem of working with non-aggregated data for all reports, but over the years, it has grown into a general-purpose database management system suitable for a wide range of analytical tasks.
 
-[Original article](https://clickhouse.tech/docs/en/introduction/history/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/history/) <!--hide-->
diff --git a/docs/en/introduction/info.md b/docs/en/introduction/info.md
deleted file mode 100644
index a397c40950d..00000000000
--- a/docs/en/introduction/info.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-toc_priority: 100
----
-
-# Information support {#information-support}
-
-- Email address: <a class="feedback-email"></a>
-- Phone: <a href="tel:+74957806510">+7-495-780-6510</a>
-
-[Original article](https://clickhouse.tech/docs/en/introduction/info/) <!--hide-->
\ No newline at end of file
diff --git a/docs/en/introduction/performance.md b/docs/en/introduction/performance.md
index 6e5710347a1..6ae37086181 100644
--- a/docs/en/introduction/performance.md
+++ b/docs/en/introduction/performance.md
@@ -5,9 +5,9 @@ toc_title: Performance
 
 # Performance {#performance}
 
-According to internal testing results at Yandex, ClickHouse shows the best performance (both the highest throughput for long queries and the lowest latency on short queries) for comparable operating scenarios among systems of its class that were available for testing. You can view the test results on a [separate page](https://clickhouse.tech/benchmark/dbms/).
+According to internal testing results at Yandex, ClickHouse shows the best performance (both the highest throughput for long queries and the lowest latency on short queries) for comparable operating scenarios among systems of its class that were available for testing. You can view the test results on a [separate page](https://clickhouse.com/benchmark/dbms/).
 
-Numerous independent benchmarks came to similar conclusions. They are not difficult to find using an internet search, or you can see [our small collection of related links](https://clickhouse.tech/#independent-benchmarks).
+Numerous independent benchmarks came to similar conclusions. They are not difficult to find using an internet search, or you can see [our small collection of related links](https://clickhouse.com/#independent-benchmarks).
 
 ## Throughput for a Single Large Query {#throughput-for-a-single-large-query}
 
@@ -27,4 +27,4 @@ Under the same conditions, ClickHouse can handle several hundred queries per sec
 
 We recommend inserting data in packets of at least 1000 rows, or no more than a single request per second. When inserting to a MergeTree table from a tab-separated dump, the insertion speed can be from 50 to 200 MB/s. If the inserted rows are around 1 KB in size, the speed will be from 50,000 to 200,000 rows per second. If the rows are small, the performance can be higher in rows per second (on Banner System data -`>` 500,000 rows per second; on Graphite data -`>` 1,000,000 rows per second). To improve performance, you can make multiple INSERT queries in parallel, which scales linearly.
 
-{## [Original article](https://clickhouse.tech/docs/en/introduction/performance/) ##}
+{## [Original article](https://clickhouse.com/docs/en/introduction/performance/) ##}
diff --git a/docs/en/operations/access-rights.md b/docs/en/operations/access-rights.md
index 8d48218f417..52f7fb87ffd 100644
--- a/docs/en/operations/access-rights.md
+++ b/docs/en/operations/access-rights.md
@@ -149,4 +149,4 @@ Management queries:
 
     By default, SQL-driven access control and account management is disabled for all users. You need to configure at least one user in the `users.xml` configuration file and set the value of the [access_management](../operations/settings/settings-users.md#access_management-user-setting) setting to 1.
 
-[Original article](https://clickhouse.tech/docs/en/operations/access_rights/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/access_rights/) <!--hide-->
diff --git a/docs/en/operations/backup.md b/docs/en/operations/backup.md
index 9c8f5389ccd..7f0ed48928a 100644
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@@ -37,4 +37,4 @@ For more information about queries related to partition manipulations, see the [
 
 A third-party tool is available to automate this approach: [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup).
 
-[Original article](https://clickhouse.tech/docs/en/operations/backup/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index ec7e4239a9d..279204a8af1 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -26,4 +26,4 @@ Indirectly used:
 
 To drop cache, use [SYSTEM DROP ... CACHE](../sql-reference/statements/system.md) statements.
 
-[Original article](https://clickhouse.tech/docs/en/operations/caches/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/caches/) <!--hide-->
diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index 389cf2361f8..58c59ce9f79 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -3,58 +3,58 @@ toc_priority: 66
 toc_title: ClickHouse Keeper
 ---
 
-# [pre-production] clickhouse-keeper
+# [pre-production] ClickHouse Keeper
 
-ClickHouse server use [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
+ClickHouse server uses [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
 
 !!! warning "Warning"
-    This feature currently in pre-production stage. We test it in our CI and on small internal installations.
+    This feature is currently in the pre-production stage. We test it in our CI and on small internal installations.
 
 ## Implementation details
 
-ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper `clickhouse-keeper` written in C++ and use [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
+ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper ClickHouse Keeper is written in C++ and uses [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
 
-By default, `clickhouse-keeper` provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with `clickhouse-keeper`. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to `clickhouse-keeper` snapshot. Interserver protocol in `clickhouse-keeper` also incompatible with ZooKeeper so mixed ZooKeeper/clickhouse-keeper cluster is impossible.
+By default, ClickHouse Keeper provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with ClickHouse Keeper. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to ClickHouse Keeper snapshot. Interserver protocol in ClickHouse Keeper is also incompatible with ZooKeeper so mixed ZooKeeper / ClickHouse Keeper cluster is impossible.
 
 ## Configuration
 
-`clickhouse-keeper` can be used as a standalone replacement for ZooKeeper or as an internal part of the `clickhouse-server`, but in both cases configuration is almost the same `.xml` file. The main `clickhouse-keeper` configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
+ClickHouse Keeper can be used as a standalone replacement for ZooKeeper or as an internal part of the ClickHouse server, but in both cases configuration is almost the same `.xml` file. The main ClickHouse Keeper configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
 
--    `tcp_port` — the port for a client to connect (default for ZooKeeper is `2181`)
--    `tcp_port_secure` — the secure port for a client to connect
--    `server_id` — unique server id, each participant of the clickhouse-keeper cluster must have a unique number (1, 2, 3, and so on)
--    `log_storage_path` — path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper)
--    `snapshot_storage_path` — path to coordination snapshots
+-    `tcp_port` — Port for a client to connect (default for ZooKeeper is `2181`).
+-    `tcp_port_secure` — Secure port for a client to connect.
+-    `server_id` — Unique server id, each participant of the ClickHouse Keeper cluster must have a unique number (1, 2, 3, and so on).
+-    `log_storage_path` — Path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper).
+-    `snapshot_storage_path` — Path to coordination snapshots.
 
-Other common parameters are inherited from clickhouse-server config (`listen_host`, `logger` and so on).
+Other common parameters are inherited from the ClickHouse server config (`listen_host`, `logger`, and so on).
 
 Internal coordination settings are located in `<keeper_server>.<coordination_settings>` section:
 
--    `operation_timeout_ms` — timeout for a single client operation (default: 10000)
--    `session_timeout_ms` — timeout for client session (default: 30000)
--    `dead_session_check_period_ms` — how often clickhouse-keeper check dead sessions and remove them (default: 500)
--    `heart_beat_interval_ms` — how often a clickhouse-keeper leader will send heartbeats to followers (default: 500)
--    `election_timeout_lower_bound_ms` — if follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000)
--    `election_timeout_upper_bound_ms` — if follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000)
--    `rotate_log_storage_interval` — how many log records to store in a single file (default: 100000)
--    `reserved_log_items` — how many coordination log records to store before compaction (default: 100000)
--    `snapshot_distance` — how often clickhouse-keeper will create new snapshots (in the number of records in logs) (default: 100000)
--    `snapshots_to_keep` — how many snapshots to keep (default: 3)
--    `stale_log_gap` — the threshold when leader consider follower as stale and send snapshot to it instead of logs (default: 10000)
--    `fresh_log_gap` - when node became fresh (default: 200)
--    `max_requests_batch_size` - max size of batch in requests count before it will be sent to RAFT (default: 100)
--    `force_sync` — call `fsync` on each write to coordination log (default: true)
--    `quorum_reads` - execute read requests as writes through whole RAFT consesus with similar speed (default: false)
--    `raft_logs_level` — text logging level about coordination (trace, debug, and so on) (default: system default)
--    `auto_forwarding` - allow to forward write requests from followers to leader (default: true)
--    `shutdown_timeout` — wait to finish internal connections and shutdown (ms) (default: 5000)
--    `startup_timeout` — if the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000)
+-    `operation_timeout_ms` — Timeout for a single client operation (ms) (default: 10000).
+-    `session_timeout_ms` — Timeout for client session (ms) (default: 30000).
+-    `dead_session_check_period_ms` — How often ClickHouse Keeper check dead sessions and remove them (ms) (default: 500).
+-    `heart_beat_interval_ms` — How often a ClickHouse Keeper leader will send heartbeats to followers (ms) (default: 500).
+-    `election_timeout_lower_bound_ms` — If the follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000).
+-    `election_timeout_upper_bound_ms` — If the follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000).
+-    `rotate_log_storage_interval` — How many log records to store in a single file (default: 100000).
+-    `reserved_log_items` — How many coordination log records to store before compaction (default: 100000).
+-    `snapshot_distance` — How often ClickHouse Keeper will create new snapshots (in the number of records in logs) (default: 100000).
+-    `snapshots_to_keep` — How many snapshots to keep (default: 3).
+-    `stale_log_gap` — Threshold when leader considers follower as stale and sends the snapshot to it instead of logs (default: 10000).
+-    `fresh_log_gap` — When node became fresh (default: 200).
+-    `max_requests_batch_size` - Max size of batch in requests count before it will be sent to RAFT (default: 100).
+-    `force_sync` — Call `fsync` on each write to coordination log (default: true).
+-    `quorum_reads` — Execute read requests as writes through whole RAFT consensus with similar speed (default: false).
+-    `raft_logs_level` — Text logging level about coordination (trace, debug, and so on) (default: system default).
+-    `auto_forwarding` — Allow to forward write requests from followers to the leader (default: true).
+-    `shutdown_timeout` — Wait to finish internal connections and shutdown (ms) (default: 5000).
+-    `startup_timeout` — If the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000).
 
 Quorum configuration is located in `<keeper_server>.<raft_configuration>` section and contain servers description. The only parameter for the whole quorum is `secure`, which enables encrypted connection for communication between quorum participants. The main parameters for each `<server>` are:
 
--    `id` — server_id in quorum
--    `hostname` — hostname where this server placed
--    `port` — port where this server listen for connections
+-    `id` — Server identifier in a quorum.
+-    `hostname` — Hostname where this server is placed.
+-    `port` — Port where this server listens for connections.
 
 
 Examples of configuration for quorum with three nodes can be found in [integration tests](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) with `test_keeper_` prefix. Example configuration for server #1:
@@ -94,7 +94,7 @@ Examples of configuration for quorum with three nodes can be found in [integrati
 
 ## How to run
 
-`clickhouse-keeper` is bundled into `clickhouse-server` package, just add configuration of `<keeper_server>` and start clickhouse-server as always. If you want to run standalone `clickhouse-keeper` you can start it in a similar way with:
+ClickHouse Keeper is bundled into the ClickHouse server package, just add configuration of `<keeper_server>` and start ClickHouse server as always. If you want to run standalone ClickHouse Keeper you can start it in a similar way with:
 
 ```bash
 clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
@@ -102,17 +102,18 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 
 ## [experimental] Migration from ZooKeeper
 
-Seamlessly migration from ZooKeeper to `clickhouse-keeper` is impossible you have to stop your ZooKeeper cluster, convert data and start `clickhouse-keeper`. `clickhouse-keeper-converter` tool allows to convert ZooKeeper logs and snapshots to `clickhouse-keeper` snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
+Seamlessly migration from ZooKeeper to ClickHouse Keeper is impossible you have to stop your ZooKeeper cluster, convert data and start ClickHouse Keeper. `clickhouse-keeper-converter` tool allows converting ZooKeeper logs and snapshots to ClickHouse Keeper snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
 
 1. Stop all ZooKeeper nodes.
 
-2. [optional, but recommended] Found ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create consistent snapshot.
+2. Optional, but recommended: find ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create a consistent snapshot.
 
-3. Run `clickhouse-keeper-converter` on leader, example
+3. Run `clickhouse-keeper-converter` on a leader, for example:
 
 ```bash
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Copy snapshot to `clickhouse-server` nodes with configured `keeper` or start `clickhouse-keeper` instead of ZooKeeper. Snapshot must persist on all nodes, otherwise empty nodes can be faster and one of them can becamse leader.
+4. Copy snapshot to ClickHouse server nodes with a configured `keeper` or start ClickHouse Keeper instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become a leader.
 
+[Original article](https://clickhouse.com/docs/en/operations/clickhouse-keeper/) <!--hide-->
diff --git a/docs/en/operations/configuration-files.md b/docs/en/operations/configuration-files.md
index aafad0220bd..aeaf421b2d7 100644
--- a/docs/en/operations/configuration-files.md
+++ b/docs/en/operations/configuration-files.md
@@ -156,4 +156,4 @@ For each config file, the server also generates `file-preprocessed.xml` files wh
 
 The server tracks changes in config files, as well as files and ZooKeeper nodes that were used when performing substitutions and overrides, and reloads the settings for users and clusters on the fly. This means that you can modify the cluster, users, and their settings without restarting the server.
 
-[Original article](https://clickhouse.tech/docs/en/operations/configuration-files/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/configuration-files/) <!--hide-->
diff --git a/docs/en/operations/external-authenticators/index.md b/docs/en/operations/external-authenticators/index.md
index aa220f50ef8..13b07b8e51e 100644
--- a/docs/en/operations/external-authenticators/index.md
+++ b/docs/en/operations/external-authenticators/index.md
@@ -13,4 +13,4 @@ The following external authenticators and directories are supported:
 - [LDAP](./ldap.md#external-authenticators-ldap) [Authenticator](./ldap.md#ldap-external-authenticator) and [Directory](./ldap.md#ldap-external-user-directory)
 - Kerberos [Authenticator](./kerberos.md#external-authenticators-kerberos)
 
-[Original article](https://clickhouse.tech/docs/en/operations/external-authenticators/index/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/external-authenticators/index/) <!--hide-->
diff --git a/docs/en/operations/external-authenticators/ldap.md b/docs/en/operations/external-authenticators/ldap.md
index 5a3db6faf55..c33700f0e31 100644
--- a/docs/en/operations/external-authenticators/ldap.md
+++ b/docs/en/operations/external-authenticators/ldap.md
@@ -179,4 +179,4 @@ Note that `my_ldap_server` referred in the `ldap` section inside the `user_direc
         - `attribute` — Attribute name whose values will be returned by the LDAP search. `cn`, by default.
         - `prefix` — Prefix, that will be expected to be in front of each string in the original list of strings returned by the LDAP search. The prefix will be removed from the original strings and the resulting strings will be treated as local role names. Empty by default.
 
-[Original article](https://clickhouse.tech/docs/en/operations/external-authenticators/ldap/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/external-authenticators/ldap/) <!--hide-->
diff --git a/docs/en/operations/index.md b/docs/en/operations/index.md
index 3364598ebc2..b78633f2d6b 100644
--- a/docs/en/operations/index.md
+++ b/docs/en/operations/index.md
@@ -23,4 +23,4 @@ ClickHouse operations manual consists of the following major sections:
 -   [Settings](../operations/settings/index.md)
 -   [Utilities](../operations/utilities/index.md)
 
-{## [Original article](https://clickhouse.tech/docs/en/operations/) ##}
+{## [Original article](https://clickhouse.com/docs/en/operations/) ##}
diff --git a/docs/en/operations/opentelemetry.md b/docs/en/operations/opentelemetry.md
index 74c9c6dd18f..6dac8736372 100644
--- a/docs/en/operations/opentelemetry.md
+++ b/docs/en/operations/opentelemetry.md
@@ -61,4 +61,4 @@ FROM system.opentelemetry_span_log
 
 In case of any errors, the part of the log data for which the error has occurred will be silently lost. Check the server log for error messages if the data does not arrive.
 
-[Original article](https://clickhouse.tech/docs/en/operations/opentelemetry/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/opentelemetry/) <!--hide-->
diff --git a/docs/en/operations/performance-test.md b/docs/en/operations/performance-test.md
index d6d9cdb55cc..7259a325086 100644
--- a/docs/en/operations/performance-test.md
+++ b/docs/en/operations/performance-test.md
@@ -25,7 +25,7 @@ chmod a+x ./hardware.sh
 
 3. Copy the output and send it to clickhouse-feedback@yandex-team.com
 
-All the results are published here: https://clickhouse.tech/benchmark/hardware/
+All the results are published here: https://clickhouse.com/benchmark/hardware/
 
 
 ## Manual Run
@@ -68,4 +68,4 @@ mv hits_100m_obfuscated_v1/* .
 ```
 7.  Send the numbers and the info about your hardware configuration to clickhouse-feedback@yandex-team.com
 
-All the results are published here: https://clickhouse.tech/benchmark/hardware/
+All the results are published here: https://clickhouse.com/benchmark/hardware/
diff --git a/docs/en/operations/quotas.md b/docs/en/operations/quotas.md
index bbea735cdba..eec8961b595 100644
--- a/docs/en/operations/quotas.md
+++ b/docs/en/operations/quotas.md
@@ -117,4 +117,4 @@ For distributed query processing, the accumulated amounts are stored on the requ
 
 When the server is restarted, quotas are reset.
 
-[Original article](https://clickhouse.tech/docs/en/operations/quotas/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/quotas/) <!--hide-->
diff --git a/docs/en/operations/server-configuration-parameters/index.md b/docs/en/operations/server-configuration-parameters/index.md
index 02bbe7362cf..a95d198bd0d 100644
--- a/docs/en/operations/server-configuration-parameters/index.md
+++ b/docs/en/operations/server-configuration-parameters/index.md
@@ -14,4 +14,4 @@ Other settings are described in the “[Settings](../../operations/settings/inde
 
 Before studying the settings, read the [Configuration files](../../operations/configuration-files.md#configuration_files) section and note the use of substitutions (the `incl` and `optional` attributes).
 
-[Original article](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index be19f476978..3d299e21019 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -69,29 +69,85 @@ If no conditions met for a data part, ClickHouse uses the `lz4` compression.
 </compression>
 ```
 
-<!--
 ## encryption {#server-settings-encryption}
 
-Configures a command to obtain a key to be used by [encryption codecs](../../sql-reference/statements/create/table.md#create-query-encryption-codecs). The command, or a shell script, is expected to write a Base64-encoded key of any length to the stdout.
+Configures a command to obtain a key to be used by [encryption codecs](../../sql-reference/statements/create/table.md#create-query-encryption-codecs). Key (or keys) should be written in enviroment variables or be set in configuration file.
+
+Keys can be hex or string. Their length must be equal to 16.
 
 **Example**
 
-For Linux with systemd:
+Load from config:
 
 ```xml
-<encryption>
-    <key_command>/usr/bin/systemd-ask-password --id="clickhouse-server" --timeout=0 "Enter the ClickHouse encryption passphrase:" | base64</key_command>
-</encryption>
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key>12345567812345678</key>
+    </aes_128_gcm_siv>
+</encryption_codecs>
 ```
 
-For other systems:
+!!! note "NOTE"
+    Storing keys in configuration file is not recommended. It isn't secure. You can move the keys into a separate config file on a secure disk and put a symlink to that config file to `config.d/` folder.
+
+Load from config, when key is in hex:
 
 ```xml
-<encryption>
-    <key_command><![CDATA[IFS=; echo -n >/dev/tty "Enter the ClickHouse encryption passphrase: "; stty=`stty -F /dev/tty -g`; stty -F /dev/tty -echo; read k </dev/tty; stty -F /dev/tty "$stty"; echo -n $k | base64]]></key_command>
-</encryption>
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex>00112233445566778899aabbccddeeff</key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
 ```
--->
+
+Load key from environment variable:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex from_env="KEY"></key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Where `current_key_id` sets the current key for encryption, and all specified keys can be used for decryption.
+
+All this methods can be applied for multiple keys:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex id="0">00112233445566778899aabbccddeeff</key_hex>
+        <key_hex id="1" from_env=".."></key_hex>
+        <current_key_id>1</current_key_id>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Where `current_key_id` shows current key for encryption.
+
+Also user can add nonce that must be 12 bytes long (by default encryption and decryption will use nonce consisting of zero bytes):
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce>0123456789101</nonce>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Or it can be set in hex:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce_hex>abcdefabcdef</nonce_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Everything above can be applied for `aes_256_gcm_siv` (but key must be 32 bytes length).
+
 ## custom_settings_prefixes {#custom_settings_prefixes}
 
 List of prefixes for [custom settings](../../operations/settings/index.md#custom_settings). The prefixes must be separated with commas.
@@ -126,6 +182,7 @@ Default value: `1073741824` (1 GB).
     <size_limit>1073741824</size_limit>
 </core_dump>
 ```
+
 ## database_atomic_delay_before_drop_table_sec {#database_atomic_delay_before_drop_table_sec}
 
 Sets the delay before remove table data in seconds. If the query has `SYNC` modifier, this setting is ignored.
@@ -805,7 +862,7 @@ Use the following parameters to configure logging:
 
 The path to the directory containing data.
 
-!!! note "Note"
+!!! warning "Warning"
     The trailing slash is mandatory.
 
 **Example**
@@ -894,9 +951,9 @@ If the table does not exist, ClickHouse will create it. If the structure of the
 
 ## query_views_log {#server_configuration_parameters-query_views_log}
 
-Setting for logging views dependant of queries received with the [log_query_views=1](../../operations/settings/settings.md#settings-log-query-views) setting.
+Setting for logging views (live, materialized etc) dependant of queries received with the [log_query_views=1](../../operations/settings/settings.md#settings-log-query-views) setting.
 
-Queries are logged in the [system.query_views_log](../../operations/system-tables/query_thread_log.md#system_tables-query_views_log) table, not in a separate file. You can change the name of the table in the `table` parameter (see below).
+Queries are logged in the [system.query_views_log](../../operations/system-tables/query_views_log.md#system_tables-query_views_log) table, not in a separate file. You can change the name of the table in the `table` parameter (see below).
 
 Use the following parameters to configure logging:
 
@@ -974,8 +1031,7 @@ The default server configuration file `config.xml` contains the following settin
 
 Regexp-based rules, which will be applied to queries as well as all log messages before storing them in server logs,
 `system.query_log`, `system.text_log`, `system.processes` tables, and in logs sent to the client. That allows preventing
-sensitive data leakage from SQL queries (like names, emails, personal
-identifiers or credit card numbers) to logs.
+sensitive data leakage from SQL queries (like names, emails, personal identifiers or credit card numbers) to logs.
 
 **Example**
 
@@ -1073,7 +1129,7 @@ Example
 
 Path to temporary data for processing large queries.
 
-!!! note "Note"
+!!! warning "Note"
     The trailing slash is mandatory.
 
 **Example**
@@ -1090,9 +1146,9 @@ If not set, [tmp_path](#tmp-path) is used, otherwise it is ignored.
 
 !!! note "Note"
     - `move_factor` is ignored.
-- `keep_free_space_bytes` is ignored.
-- `max_data_part_size_bytes` is ignored.
-- Уou must have exactly one volume in that policy.
+    - `keep_free_space_bytes` is ignored.
+    - `max_data_part_size_bytes` is ignored.
+    - Уou must have exactly one volume in that policy.
 
 ## uncompressed_cache_size {#server-settings-uncompressed_cache_size}
 
@@ -1156,9 +1212,10 @@ This section contains the following parameters:
 
       The `index` attribute specifies the node order when trying to connect to the ZooKeeper cluster.
 
--   `session_timeout` — Maximum timeout for the client session in milliseconds.
--   `root` — The [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes) that is used as the root for znodes used by the ClickHouse server. Optional.
--   `identity` — User and password, that can be required by ZooKeeper to give access to requested znodes. Optional.
+- `session_timeout_ms` — Maximum timeout for the client session in milliseconds.
+- `operation_timeout_ms` — Maximum timeout for one operation in milliseconds.
+- `root` — The [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes) that is used as the root for znodes used by the ClickHouse server. Optional.
+- `identity` — User and password, that can be required by ZooKeeper to give access to requested znodes. Optional.
 
 **Example configuration**
 
@@ -1232,6 +1289,39 @@ The update is performed asynchronously, in a separate system thread.
 
 -   [background_schedule_pool_size](../../operations/settings/settings.md#background_schedule_pool_size)
 
+## distributed_ddl {#server-settings-distributed_ddl}
+
+Manage executing [distributed ddl queries](../../sql-reference/distributed-ddl.md)  (CREATE, DROP, ALTER, RENAME) on cluster.
+Works only if [ZooKeeper](#server-settings_zookeeper) is enabled.
+
+**Example**
+
+```xml
+<distributed_ddl>
+    <!-- Path in ZooKeeper to queue with DDL queries -->
+    <path>/clickhouse/task_queue/ddl</path>
+
+    <!-- Settings from this profile will be used to execute DDL queries -->
+    <profile>default</profile>
+
+    <!-- Controls how much ON CLUSTER queries can be run simultaneously. -->
+    <pool_size>1</pool_size>
+
+    <!--
+         Cleanup settings (active tasks will not be removed)
+    -->
+
+    <!-- Controls task TTL (default 1 week) -->
+    <task_max_lifetime>604800</task_max_lifetime>
+
+    <!-- Controls how often cleanup should be performed (in seconds) -->
+    <cleanup_delay_period>60</cleanup_delay_period>
+
+    <!-- Controls how many tasks could be in the queue -->
+    <max_tasks_in_queue>1000</max_tasks_in_queue>
+</distributed_ddl>
+```
+
 ## access_control_path {#access_control_path}
 
 Path to a folder where a ClickHouse server stores user and role configurations created by SQL commands.
@@ -1240,7 +1330,7 @@ Default value: `/var/lib/clickhouse/access/`.
 
 **See also**
 
--   [Access Control and Account Management](../../operations/access-rights.md#access-control)
+- [Access Control and Account Management](../../operations/access-rights.md#access-control)
 
 ## user_directories {#user_directories}
 
@@ -1297,4 +1387,4 @@ To add an LDAP server as a remote user directory of users that are not defined l
 </ldap>
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/en/operations/settings/constraints-on-settings.md b/docs/en/operations/settings/constraints-on-settings.md
index 2fe75aaad58..338949c5a6a 100644
--- a/docs/en/operations/settings/constraints-on-settings.md
+++ b/docs/en/operations/settings/constraints-on-settings.md
@@ -70,4 +70,4 @@ Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should n
 
 **Note:** the `default` profile has special handling: all the constraints defined for the `default` profile become the default constraints, so they restrict all the users until they’re overridden explicitly for these users.
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/en/operations/settings/index.md b/docs/en/operations/settings/index.md
index b5dcef932e8..f2a6bfc515a 100644
--- a/docs/en/operations/settings/index.md
+++ b/docs/en/operations/settings/index.md
@@ -55,4 +55,4 @@ SELECT getSetting('custom_a');
 
 -   [Server Configuration Settings](../../operations/server-configuration-parameters/settings.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/) <!--hide-->
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 65d63438aea..a3a258234e1 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -181,6 +181,44 @@ Possible values:
 
 Default value: 0.
 
+## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches. This setting is applied to a particular table, unlike the [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server) setting, which is applied to the server.
+
+You can limit both server network and network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_fetches_network_bandwidth_for_server` setting.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating data to add or replace new nodes.
+
+## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends. This setting is applied to a particular table, unlike the [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server) setting, which is applied to the server.
+
+You can limit both server network and network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_sends_network_bandwidth_for_server` setting.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating data to add or replace new nodes.
+
 ## old_parts_lifetime {#old-parts-lifetime}
 
 The time (in seconds) of storing inactive parts to protect against data loss during spontaneous server reboots.
diff --git a/docs/en/operations/settings/permissions-for-queries.md b/docs/en/operations/settings/permissions-for-queries.md
index 2ab13216d9e..47551f288bb 100644
--- a/docs/en/operations/settings/permissions-for-queries.md
+++ b/docs/en/operations/settings/permissions-for-queries.md
@@ -56,4 +56,4 @@ You can’t execute `SET allow_ddl = 1` if `allow_ddl = 0` for the current sessi
 
 Default value: 1
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/en/operations/settings/query-complexity.md b/docs/en/operations/settings/query-complexity.md
index 236359bfe55..3287caacdf8 100644
--- a/docs/en/operations/settings/query-complexity.md
+++ b/docs/en/operations/settings/query-complexity.md
@@ -312,4 +312,4 @@ When inserting data, ClickHouse calculates the number of partitions in the inser
 
 > “Too many partitions for single INSERT block (more than” + toString(max_parts) + “). The limit is controlled by ‘max_partitions_per_insert_block’ setting. A large number of partitions is a common misconception. It will lead to severe negative performance impact, including slow server startup, slow INSERT queries and slow SELECT queries. Recommended total number of partitions for a table is under 1000..10000. Please note, that partitioning is not intended to speed up SELECT queries (ORDER BY key is sufficient to make range queries fast). Partitions are intended for data manipulation (DROP PARTITION, etc).”
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/query_complexity/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/en/operations/settings/settings-profiles.md b/docs/en/operations/settings/settings-profiles.md
index c7a01466462..1939b21bfc3 100644
--- a/docs/en/operations/settings/settings-profiles.md
+++ b/docs/en/operations/settings/settings-profiles.md
@@ -76,4 +76,4 @@ The `default` profile has a special purpose: it must always be present and is ap
 
 The `web` profile is a regular profile that can be set using the `SET` query or using a URL parameter in an HTTP query.
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/settings_profiles/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/en/operations/settings/settings-users.md b/docs/en/operations/settings/settings-users.md
index 2c8315ad069..1a1d2e2a0fa 100644
--- a/docs/en/operations/settings/settings-users.md
+++ b/docs/en/operations/settings/settings-users.md
@@ -159,4 +159,4 @@ The following configuration forces that user `user1` can only see the rows of `t
 
 The `filter` can be any expression resulting in a [UInt8](../../sql-reference/data-types/int-uint.md)-type value. It usually contains comparisons and logical operators. Rows from `database_name.table1` where filter results to 0 are not returned for this user. The filtering is incompatible with `PREWHERE` operations and disables `WHERE→PREWHERE` optimization.
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/settings_users/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index c99c39fe05c..17317a13908 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -260,6 +260,39 @@ If an error occurred while reading rows but the error counter is still less than
 
 If both `input_format_allow_errors_num` and `input_format_allow_errors_ratio` are exceeded, ClickHouse throws an exception.
 
+## input_format_parquet_import_nested {#input_format_parquet_import_nested}
+
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [Parquet](../../interfaces/formats.md#data-format-parquet) input format.
+
+Possible values:
+
+-   0 — Data can not be inserted into `Nested` columns as an array of structs.
+-   1 — Data can be inserted into `Nested` columns as an array of structs.
+
+Default value: `0`.
+
+## input_format_arrow_import_nested {#input_format_arrow_import_nested}
+
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [Arrow](../../interfaces/formats.md#data_types-matching-arrow) input format.
+
+Possible values:
+
+-   0 — Data can not be inserted into `Nested` columns as an array of structs.
+-   1 — Data can be inserted into `Nested` columns as an array of structs.
+
+Default value: `0`.
+
+## input_format_orc_import_nested {#input_format_orc_import_nested}
+
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [ORC](../../interfaces/formats.md#data-format-orc) input format.
+
+Possible values:
+
+-   0 — Data can not be inserted into `Nested` columns as an array of structs.
+-   1 — Data can be inserted into `Nested` columns as an array of structs.
+
+Default value: `0`.
+
 ## input_format_values_interpret_expressions {#settings-input_format_values_interpret_expressions}
 
 Enables or disables the full SQL parser if the fast stream parser can’t parse the data. This setting is used only for the [Values](../../interfaces/formats.md#data-format-values) format at the data insertion. For more information about syntax parsing, see the [Syntax](../../sql-reference/syntax.md) section.
@@ -777,7 +810,7 @@ If ClickHouse should read more than `merge_tree_max_bytes_to_use_cache` bytes in
 
 The cache of uncompressed blocks stores data extracted for queries. ClickHouse uses this cache to speed up responses to repeated small queries. This setting protects the cache from trashing by queries that read a large amount of data. The [uncompressed_cache_size](../../operations/server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) server setting defines the size of the cache of uncompressed blocks.
 
-Possible value:
+Possible values:
 
 -   Any positive integer.
 
@@ -785,23 +818,23 @@ Default value: 2013265920.
 
 ## merge_tree_clear_old_temporary_directories_interval_seconds {#setting-merge-tree-clear-old-temporary-directories-interval-seconds}
 
-The interval in seconds for ClickHouse to execute the cleanup old temporary directories.
+Sets the interval in seconds for ClickHouse to execute the cleanup of old temporary directories.
 
-Possible value:
+Possible values:
 
 -   Any positive integer.
 
-Default value: 60.
+Default value: `60` seconds.
 
 ## merge_tree_clear_old_parts_interval_seconds {#setting-merge-tree-clear-old-parts-interval-seconds}
 
-The interval in seconds for ClickHouse to execute the cleanup old parts, WALs, and mutations.
+Sets the interval in seconds for ClickHouse to execute the cleanup of old parts, WALs, and mutations.
 
-Possible value:
+Possible values:
 
 -   Any positive integer.
 
-Default value: 1.
+Default value: `1` second.
 
 ## min_bytes_to_use_direct_io {#settings-min-bytes-to-use-direct-io}
 
@@ -1107,6 +1140,40 @@ Possible values:
 
 Default value: `5`.
 
+## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for the server. Only has meaning at server startup. You can also limit the speed for a particular table with [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth) setting.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating the data to add or replace new nodes.
+
+## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for the server. Only has meaning at server startup.  You can also limit the speed for a particular table with [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth) setting.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating the data to add or replace new nodes.
+
 ## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
 
 The timeout in milliseconds for connecting to a remote server for a Distributed table engine, if the ‘shard’ and ‘replica’ sections are used in the cluster definition.
@@ -2766,6 +2833,43 @@ Possible values:
 
 Default value: `1`.
 
+## output_format_csv_null_representation {#output_format_csv_null_representation}
+
+Defines the representation of `NULL` for [CSV](../../interfaces/formats.md#csv) output format. User can set any string as a value, for example, `My NULL`.
+
+Default value: `\N`.
+
+**Examples**
+
+Query
+
+```sql
+SELECT * from csv_custom_null FORMAT CSV;
+```
+
+Result
+
+```text
+788
+\N
+\N
+```
+
+Query
+
+```sql
+SET output_format_csv_null_representation = 'My NULL';
+SELECT * FROM csv_custom_null FORMAT CSV;
+```
+
+Result
+
+```text
+788
+My NULL
+My NULL
+```
+
 ## output_format_tsv_null_representation {#output_format_tsv_null_representation}
 
 Defines the representation of `NULL` for [TSV](../../interfaces/formats.md#tabseparated) output format. User can set any string as a value, for example, `My NULL`.
@@ -3239,7 +3343,7 @@ Result:
 └─────┘
 ```
 
-## optimize_fuse_sum_count_avg {#optimize_fuse_sum_count_avg}
+## optimize_syntax_fuse_functions {#optimize_syntax_fuse_functions}
 
 Enables to fuse aggregate functions with identical argument. It rewrites query contains at least two aggregate functions from [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum), [count](../../sql-reference/aggregate-functions/reference/count.md#agg_function-count) or [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) with identical argument to [sumCount](../../sql-reference/aggregate-functions/reference/sumcount.md#agg_function-sumCount).
 
@@ -3256,7 +3360,7 @@ Query:
 
 ``` sql
 CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
-SET optimize_fuse_sum_count_avg = 1;
+SET optimize_syntax_fuse_functions = 1;
 EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b), avg(b) from fuse_tbl FORMAT TSV;
 ```
 
@@ -3466,6 +3570,30 @@ Possible values:
 
 Default value: `0`.
 
+## replication_alter_partitions_sync {#replication-alter-partitions-sync}
+
+Allows to set up waiting for actions to be executed on replicas by [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) or [TRUNCATE](../../sql-reference/statements/truncate.md) queries.
+
+Possible values:
+
+-   0 — Do not wait.
+-   1 — Wait for own execution.
+-   2 — Wait for everyone.
+
+Default value: `1`.
+
+## replication_wait_for_inactive_replica_timeout {#replication-wait-for-inactive-replica-timeout}
+
+Specifies how long (in seconds) to wait for inactive replicas to execute [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) or [TRUNCATE](../../sql-reference/statements/truncate.md) queries.
+
+Possible values:
+
+-   0 — Do not wait.
+-   Negative integer — Wait for unlimited time.
+-   Positive integer — The number of seconds to wait.
+
+Default value: `120` seconds.
+
 ## regexp_max_matches_per_row {#regexp-max-matches-per-row}
 
 Sets the maximum number of matches for a single regular expression per row. Use it to protect against memory overload when using greedy regular expression in the [extractAllGroupsHorizontal](../../sql-reference/functions/string-search-functions.md#extractallgroups-horizontal) function.
@@ -3475,3 +3603,113 @@ Possible values:
 -   Positive integer.
 
 Default value: `1000`.
+
+## log_queries_probability {#log-queries-probability}
+
+Allows a user to write to [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md), and [query_views_log](../../operations/system-tables/query_views_log.md) system tables only a sample of queries selected randomly with the specified probability. It helps to reduce the load with a large volume of queries in a second.
+
+Possible values:
+
+-   0 — Queries are not logged in the system tables.
+-   Positive floating-point number in the range [0..1]. For example, if the setting value is `0.5`, about half of the queries are logged in the system tables.
+-   1 — All queries are logged in the system tables.
+
+Default value: `1`.
+
+## short_circuit_function_evaluation {#short-circuit-function-evaluation}
+
+Allows calculating the [if](../../sql-reference/functions/conditional-functions.md#if), [multiIf](../../sql-reference/functions/conditional-functions.md#multiif), [and](../../sql-reference/functions/logical-functions.md#logical-and-function), and [or](../../sql-reference/functions/logical-functions.md#logical-or-function) functions according to a [short scheme](https://en.wikipedia.org/wiki/Short-circuit_evaluation). This helps optimize the execution of complex expressions in these functions and prevent possible exceptions (such as division by zero when it is not expected).
+
+Possible values:
+
+-   `enable` — Enables short-circuit function evaluation for functions that are suitable for it (can throw an exception or computationally heavy).
+-   `force_enable` — Enables short-circuit function evaluation for all functions.
+-   `disable` — Disables short-circuit function evaluation.
+
+Default value: `enable`.
+
+## max_hyperscan_regexp_length {#max-hyperscan-regexp-length}
+
+Defines the maximum length for each regular expression in the [hyperscan multi-match functions](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn). 
+
+Possible values:
+
+-   Positive integer.
+-   0 - The length is not limited.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 3;
+```
+
+Result:
+
+```text
+┌─multiMatchAny('abcd', ['ab', 'bcd', 'c', 'd'])─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+```
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 2;
+```
+
+Result:
+
+```text
+Exception: Regexp length too large.
+```
+
+**See Also**
+
+-   [max_hyperscan_regexp_total_length](#max-hyperscan-regexp-total-length)
+
+## max_hyperscan_regexp_total_length {#max-hyperscan-regexp-total-length}
+
+Sets the maximum length total of all regular expressions in each [hyperscan multi-match function](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn). 
+
+Possible values:
+
+-   Positive integer.
+-   0 - The length is not limited.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['a','b','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Result:
+
+```text
+┌─multiMatchAny('abcd', ['a', 'b', 'c', 'd'])─┐
+│                                           1 │
+└─────────────────────────────────────────────┘
+```
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bc','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Result:
+
+```text
+Exception: Total regexp lengths too large.
+```
+
+**See Also**
+
+-   [max_hyperscan_regexp_length](#max-hyperscan-regexp-length)
diff --git a/docs/en/operations/system-tables/asynchronous_metric_log.md b/docs/en/operations/system-tables/asynchronous_metric_log.md
index de2e8faab10..273f1f00d71 100644
--- a/docs/en/operations/system-tables/asynchronous_metric_log.md
+++ b/docs/en/operations/system-tables/asynchronous_metric_log.md
@@ -36,4 +36,4 @@ SELECT * FROM system.asynchronous_metric_log LIMIT 10
 - [system.asynchronous_metrics](../system-tables/asynchronous_metrics.md) — Contains metrics, calculated periodically in the background.
 - [system.metric_log](../system-tables/metric_log.md) — Contains history of metrics values from tables `system.metrics` and `system.events`, periodically flushed to disk.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/asynchronous_metric_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/asynchronous_metric_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/asynchronous_metrics.md b/docs/en/operations/system-tables/asynchronous_metrics.md
index fc801aa1c80..11255a868cc 100644
--- a/docs/en/operations/system-tables/asynchronous_metrics.md
+++ b/docs/en/operations/system-tables/asynchronous_metrics.md
@@ -35,4 +35,4 @@ SELECT * FROM system.asynchronous_metrics LIMIT 10
 -   [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that have occurred.
 -   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` and `system.events`.
 
- [Original article](https://clickhouse.tech/docs/en/operations/system-tables/asynchronous_metrics) <!--hide-->
+ [Original article](https://clickhouse.com/docs/en/operations/system-tables/asynchronous_metrics) <!--hide-->
diff --git a/docs/en/operations/system-tables/clusters.md b/docs/en/operations/system-tables/clusters.md
index 16cf183de53..18a4152df70 100644
--- a/docs/en/operations/system-tables/clusters.md
+++ b/docs/en/operations/system-tables/clusters.md
@@ -68,4 +68,4 @@ estimated_recovery_time: 0
 -   [distributed_replica_error_cap setting](../../operations/settings/settings.md#settings-distributed_replica_error_cap)
 -   [distributed_replica_error_half_life setting](../../operations/settings/settings.md#settings-distributed_replica_error_half_life)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/clusters) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/clusters) <!--hide-->
diff --git a/docs/en/operations/system-tables/columns.md b/docs/en/operations/system-tables/columns.md
index da4bcec48ed..de878cce793 100644
--- a/docs/en/operations/system-tables/columns.md
+++ b/docs/en/operations/system-tables/columns.md
@@ -86,4 +86,4 @@ The `system.columns` table contains the following columns (the column type is sh
 -   `is_in_primary_key` (UInt8) — Flag that indicates whether the column is in the primary key expression.
 -   `is_in_sampling_key` (UInt8) — Flag that indicates whether the column is in the sampling key expression.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/columns) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/columns) <!--hide-->
diff --git a/docs/en/operations/system-tables/contributors.md b/docs/en/operations/system-tables/contributors.md
index a718c403c11..0b6e977e0e3 100644
--- a/docs/en/operations/system-tables/contributors.md
+++ b/docs/en/operations/system-tables/contributors.md
@@ -38,4 +38,4 @@ SELECT * FROM system.contributors WHERE name = 'Olga Khvostikova'
 │ Olga Khvostikova │
 └──────────────────┘
 ```
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/contributors) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/contributors) <!--hide-->
diff --git a/docs/en/operations/system-tables/crash-log.md b/docs/en/operations/system-tables/crash-log.md
index 5e9fec53429..404010afc05 100644
--- a/docs/en/operations/system-tables/crash-log.md
+++ b/docs/en/operations/system-tables/crash-log.md
@@ -45,4 +45,4 @@ build_id:
 **See also**
 -   [trace_log](../../operations/system-tables/trace_log.md) system table
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/crash-log)
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/crash-log)
diff --git a/docs/en/operations/system-tables/current-roles.md b/docs/en/operations/system-tables/current-roles.md
index 56dbb602637..c029f367998 100644
--- a/docs/en/operations/system-tables/current-roles.md
+++ b/docs/en/operations/system-tables/current-roles.md
@@ -8,4 +8,4 @@ Columns:
  - `with_admin_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `current_role` is a role with `ADMIN OPTION` privilege.
  - `is_default` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `current_role` is a default role.
 
- [Original article](https://clickhouse.tech/docs/en/operations/system-tables/current-roles) <!--hide-->
+ [Original article](https://clickhouse.com/docs/en/operations/system-tables/current-roles) <!--hide-->
diff --git a/docs/en/operations/system-tables/data_type_families.md b/docs/en/operations/system-tables/data_type_families.md
index fdce9c33b37..0d11b1cfefb 100644
--- a/docs/en/operations/system-tables/data_type_families.md
+++ b/docs/en/operations/system-tables/data_type_families.md
@@ -33,4 +33,4 @@ SELECT * FROM system.data_type_families WHERE alias_to = 'String'
 
 -   [Syntax](../../sql-reference/syntax.md) — Information about supported syntax.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/data_type_families) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/data_type_families) <!--hide-->
diff --git a/docs/en/operations/system-tables/databases.md b/docs/en/operations/system-tables/databases.md
index 2c78fd25c2b..c9fc8786333 100644
--- a/docs/en/operations/system-tables/databases.md
+++ b/docs/en/operations/system-tables/databases.md
@@ -35,4 +35,4 @@ SELECT * FROM system.databases
 └────────────────────────────────┴────────┴────────────────────────────┴─────────────────────────────────────────────────────────────────────┴──────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/databases) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/databases) <!--hide-->
diff --git a/docs/en/operations/system-tables/detached_parts.md b/docs/en/operations/system-tables/detached_parts.md
index a5748128426..7345aa4ba6c 100644
--- a/docs/en/operations/system-tables/detached_parts.md
+++ b/docs/en/operations/system-tables/detached_parts.md
@@ -8,4 +8,4 @@ For the description of other columns, see [system.parts](../../operations/system
 
 If part name is invalid, values of some columns may be `NULL`. Such parts can be deleted with [ALTER TABLE DROP DETACHED PART](../../sql-reference/statements/alter/partition.md#alter_drop-detached).
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/detached_parts) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/detached_parts) <!--hide-->
diff --git a/docs/en/operations/system-tables/dictionaries.md b/docs/en/operations/system-tables/dictionaries.md
index a34e893599c..bf8dcb9b5e4 100644
--- a/docs/en/operations/system-tables/dictionaries.md
+++ b/docs/en/operations/system-tables/dictionaries.md
@@ -61,4 +61,4 @@ SELECT * FROM system.dictionaries
 └──────────┴──────┴────────┴─────────────┴──────┴────────┴──────────────────────────────────────┴─────────────────────┴─────────────────┴─────────────┴──────────┴───────────────┴───────────────────────┴────────────────────────────┴──────────────┴──────────────┴─────────────────────┴──────────────────────────────┘───────────────────────┴────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/dictionaries) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/dictionaries) <!--hide-->
diff --git a/docs/en/operations/system-tables/disks.md b/docs/en/operations/system-tables/disks.md
index 027e722dc55..f643e3fcfe1 100644
--- a/docs/en/operations/system-tables/disks.md
+++ b/docs/en/operations/system-tables/disks.md
@@ -24,4 +24,4 @@ Columns:
 1 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/disks) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/disks) <!--hide-->
diff --git a/docs/en/operations/system-tables/distributed_ddl_queue.md b/docs/en/operations/system-tables/distributed_ddl_queue.md
index 07f72d76324..47899ae5628 100644
--- a/docs/en/operations/system-tables/distributed_ddl_queue.md
+++ b/docs/en/operations/system-tables/distributed_ddl_queue.md
@@ -61,4 +61,4 @@ exception_code:    ZOK
 2 rows in set. Elapsed: 0.025 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/distributed_ddl_queuedistributed_ddl_queue.md) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/distributed_ddl_queuedistributed_ddl_queue.md) <!--hide-->
diff --git a/docs/en/operations/system-tables/distribution_queue.md b/docs/en/operations/system-tables/distribution_queue.md
index a7037a23312..2b0ca536119 100644
--- a/docs/en/operations/system-tables/distribution_queue.md
+++ b/docs/en/operations/system-tables/distribution_queue.md
@@ -47,4 +47,4 @@ last_exception:
 
 -   [Distributed table engine](../../engines/table-engines/special/distributed.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/distribution_queue) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/distribution_queue) <!--hide-->
diff --git a/docs/en/operations/system-tables/enabled-roles.md b/docs/en/operations/system-tables/enabled-roles.md
index ecfb889b6ef..54569ebbca6 100644
--- a/docs/en/operations/system-tables/enabled-roles.md
+++ b/docs/en/operations/system-tables/enabled-roles.md
@@ -9,4 +9,4 @@ Columns:
 - `is_current` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `enabled_role` is a current role of a current user.
 - `is_default` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `enabled_role` is a default role.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/enabled-roles) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/enabled-roles) <!--hide-->
diff --git a/docs/en/operations/system-tables/events.md b/docs/en/operations/system-tables/events.md
index 2fcb5d8edec..719216a54be 100644
--- a/docs/en/operations/system-tables/events.md
+++ b/docs/en/operations/system-tables/events.md
@@ -31,4 +31,4 @@ SELECT * FROM system.events LIMIT 5
 -   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
 -   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/events) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/events) <!--hide-->
diff --git a/docs/en/operations/system-tables/functions.md b/docs/en/operations/system-tables/functions.md
index 38aa62c9c09..b952c103310 100644
--- a/docs/en/operations/system-tables/functions.md
+++ b/docs/en/operations/system-tables/functions.md
@@ -30,4 +30,4 @@ Columns:
 10 rows in set. Elapsed: 0.002 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/functions) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/functions) <!--hide-->
diff --git a/docs/en/operations/system-tables/grants.md b/docs/en/operations/system-tables/grants.md
index 927fa4f3227..bd0d8c3c5b8 100644
--- a/docs/en/operations/system-tables/grants.md
+++ b/docs/en/operations/system-tables/grants.md
@@ -21,4 +21,4 @@ Columns:
 
 -    `grant_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Permission is granted `WITH GRANT OPTION`, see [GRANT](../../sql-reference/statements/grant.md#grant-privigele-syntax).
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/grants) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/grants) <!--hide-->
diff --git a/docs/en/operations/system-tables/graphite_retentions.md b/docs/en/operations/system-tables/graphite_retentions.md
index 0d56242dc95..af35da1f6e5 100644
--- a/docs/en/operations/system-tables/graphite_retentions.md
+++ b/docs/en/operations/system-tables/graphite_retentions.md
@@ -14,4 +14,4 @@ Columns:
 -   `Tables.database` (Array(String)) - Array of names of database tables that use the `config_name` parameter.
 -   `Tables.table` (Array(String)) - Array of table names that use the `config_name` parameter.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/graphite_retentions) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/graphite_retentions) <!--hide-->
diff --git a/docs/en/operations/system-tables/index.md b/docs/en/operations/system-tables/index.md
index ab3ba25493a..0cc5e834af1 100644
--- a/docs/en/operations/system-tables/index.md
+++ b/docs/en/operations/system-tables/index.md
@@ -71,4 +71,4 @@ If procfs is supported and enabled on the system, ClickHouse server collects the
 -   `OSReadBytes`
 -   `OSWriteBytes`
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/) <!--hide-->
diff --git a/docs/en/operations/system-tables/licenses.md b/docs/en/operations/system-tables/licenses.md
index d1c3e1cc5de..caef97697a6 100644
--- a/docs/en/operations/system-tables/licenses.md
+++ b/docs/en/operations/system-tables/licenses.md
@@ -36,4 +36,4 @@ SELECT library_name, license_type, license_path FROM system.licenses LIMIT 15
 
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/licenses) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/licenses) <!--hide-->
diff --git a/docs/en/operations/system-tables/merge_tree_settings.md b/docs/en/operations/system-tables/merge_tree_settings.md
index ce82cd09b8a..1f24bdbe0cf 100644
--- a/docs/en/operations/system-tables/merge_tree_settings.md
+++ b/docs/en/operations/system-tables/merge_tree_settings.md
@@ -51,4 +51,4 @@ type:        SettingUInt64
 4 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/merge_tree_settings) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/merge_tree_settings) <!--hide-->
diff --git a/docs/en/operations/system-tables/merges.md b/docs/en/operations/system-tables/merges.md
index c7bdaee42e1..e9ca30d5f2c 100644
--- a/docs/en/operations/system-tables/merges.md
+++ b/docs/en/operations/system-tables/merges.md
@@ -22,4 +22,4 @@ Columns:
 -   `merge_type` — The type of current merge. Empty if it's an mutation.
 -   `merge_algorithm` — The algorithm used in current merge. Empty if it's an mutation.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/merges) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/merges) <!--hide-->
diff --git a/docs/en/operations/system-tables/metric_log.md b/docs/en/operations/system-tables/metric_log.md
index ab149703309..875e443d0a6 100644
--- a/docs/en/operations/system-tables/metric_log.md
+++ b/docs/en/operations/system-tables/metric_log.md
@@ -48,4 +48,4 @@ CurrentMetric_DistributedFilesToInsert:                          0
 -   [system.metrics](../../operations/system-tables/metrics.md) — Contains instantly calculated metrics.
 -   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/metric_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/metric_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/metrics.md b/docs/en/operations/system-tables/metrics.md
index 4afab40764b..551c63d1aa3 100644
--- a/docs/en/operations/system-tables/metrics.md
+++ b/docs/en/operations/system-tables/metrics.md
@@ -38,4 +38,4 @@ SELECT * FROM system.metrics LIMIT 10
 -   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
 -   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/metrics) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/metrics) <!--hide-->
diff --git a/docs/en/operations/system-tables/mutations.md b/docs/en/operations/system-tables/mutations.md
index e7d3e90b806..66ce500f213 100644
--- a/docs/en/operations/system-tables/mutations.md
+++ b/docs/en/operations/system-tables/mutations.md
@@ -45,4 +45,4 @@ If there were problems with mutating some data parts, the following columns cont
 -   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table engine
 -   [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/mutations) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/mutations) <!--hide-->
diff --git a/docs/en/operations/system-tables/numbers.md b/docs/en/operations/system-tables/numbers.md
index e9d64483525..774fdf86b76 100644
--- a/docs/en/operations/system-tables/numbers.md
+++ b/docs/en/operations/system-tables/numbers.md
@@ -29,4 +29,4 @@ Reads from this table are not parallelized.
 10 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/numbers) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/numbers) <!--hide-->
diff --git a/docs/en/operations/system-tables/numbers_mt.md b/docs/en/operations/system-tables/numbers_mt.md
index e11515d4c06..978a6565b71 100644
--- a/docs/en/operations/system-tables/numbers_mt.md
+++ b/docs/en/operations/system-tables/numbers_mt.md
@@ -27,4 +27,4 @@ Used for tests.
 10 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/numbers_mt) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/numbers_mt) <!--hide-->
diff --git a/docs/en/operations/system-tables/one.md b/docs/en/operations/system-tables/one.md
index 4a00e118b05..293f0412955 100644
--- a/docs/en/operations/system-tables/one.md
+++ b/docs/en/operations/system-tables/one.md
@@ -20,4 +20,4 @@ This is similar to the `DUAL` table found in other DBMSs.
 1 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/one) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/one) <!--hide-->
diff --git a/docs/en/operations/system-tables/opentelemetry_span_log.md b/docs/en/operations/system-tables/opentelemetry_span_log.md
index 9e36eae7a1b..521c155d0f7 100644
--- a/docs/en/operations/system-tables/opentelemetry_span_log.md
+++ b/docs/en/operations/system-tables/opentelemetry_span_log.md
@@ -50,4 +50,4 @@ attribute.values: []
 
 -   [OpenTelemetry](../../operations/opentelemetry.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/opentelemetry_span_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/opentelemetry_span_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/part_log.md b/docs/en/operations/system-tables/part_log.md
index ce983282880..1fb5b12e87e 100644
--- a/docs/en/operations/system-tables/part_log.md
+++ b/docs/en/operations/system-tables/part_log.md
@@ -66,4 +66,4 @@ error:                         0
 exception:
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/part_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/part_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/parts.md b/docs/en/operations/system-tables/parts.md
index cd5b3fc799a..51a0a1180f3 100644
--- a/docs/en/operations/system-tables/parts.md
+++ b/docs/en/operations/system-tables/parts.md
@@ -155,4 +155,4 @@ move_ttl_info.max:                     []
 -   [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
 -   [TTL for Columns and Tables](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/parts) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/parts) <!--hide-->
diff --git a/docs/en/operations/system-tables/parts_columns.md b/docs/en/operations/system-tables/parts_columns.md
index 81529544a8b..0be4324bab5 100644
--- a/docs/en/operations/system-tables/parts_columns.md
+++ b/docs/en/operations/system-tables/parts_columns.md
@@ -145,4 +145,4 @@ column_marks_bytes:                    48
 
 -   [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/parts_columns) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/parts_columns) <!--hide-->
diff --git a/docs/en/operations/system-tables/processes.md b/docs/en/operations/system-tables/processes.md
index 6090c5e4555..ee8daf0e5bf 100644
--- a/docs/en/operations/system-tables/processes.md
+++ b/docs/en/operations/system-tables/processes.md
@@ -58,4 +58,4 @@ Settings:             {'background_pool_size':'32','load_balancing':'random','al
 1 rows in set. Elapsed: 0.002 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/processes) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/processes) <!--hide-->
diff --git a/docs/en/operations/system-tables/query_log.md b/docs/en/operations/system-tables/query_log.md
index 548e454cf58..0cadc975bd4 100644
--- a/docs/en/operations/system-tables/query_log.md
+++ b/docs/en/operations/system-tables/query_log.md
@@ -24,6 +24,8 @@ Each query creates one or two rows in the `query_log` table, depending on the st
 2.  If an error occurred during query processing, two events with the `QueryStart` and `ExceptionWhileProcessing` types are created.
 3.  If an error occurred before launching the query, a single event with the `ExceptionBeforeStart` type is created.
 
+You can use the [log_queries_probability](../../operations/settings/settings.md#log-queries-probability) setting to reduce the number of queries, registered in the `query_log` table.
+
 Columns:
 
 -   `type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of an event that occurred when executing the query. Values:
@@ -183,4 +185,4 @@ used_table_functions:                  []
 -   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
 -   [system.query_views_log](../../operations/system-tables/query_views_log.md#system_tables-query_views_log) — This table contains information about each view executed during a query.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/query_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/query_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/query_thread_log.md b/docs/en/operations/system-tables/query_thread_log.md
index 152a10504bb..aa064d675ce 100644
--- a/docs/en/operations/system-tables/query_thread_log.md
+++ b/docs/en/operations/system-tables/query_thread_log.md
@@ -11,6 +11,8 @@ The flushing period of data is set in `flush_interval_milliseconds` parameter of
 
 ClickHouse does not delete data from the table automatically. See [Introduction](../../operations/system-tables/index.md#system-tables-introduction) for more details.
 
+You can use the [log_queries_probability](../../operations/settings/settings.md#log-queries-probability) setting to reduce the number of queries, registered in the `query_thread_log` table.
+
 Columns:
 
 -   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the thread has finished execution of the query.
@@ -114,4 +116,4 @@ ProfileEvents:        {'Query':1,'SelectQuery':1,'ReadCompressedBytes':36,'Compr
 -   [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — Description of the `query_log` system table which contains common information about queries execution.
 -   [system.query_views_log](../../operations/system-tables/query_views_log.md#system_tables-query_views_log) — This table contains information about each view executed during a query.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/query_thread_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/query_thread_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/query_views_log.md b/docs/en/operations/system-tables/query_views_log.md
index 48d36a6a118..25d7f6522f5 100644
--- a/docs/en/operations/system-tables/query_views_log.md
+++ b/docs/en/operations/system-tables/query_views_log.md
@@ -11,6 +11,8 @@ The flushing period of data is set in `flush_interval_milliseconds` parameter of
 
 ClickHouse does not delete data from the table automatically. See [Introduction](../../operations/system-tables/index.md#system-tables-introduction) for more details.
 
+You can use the [log_queries_probability](../../operations/settings/settings.md#log-queries-probability) setting to reduce the number of queries, registered in the `query_views_log` table.
+
 Columns:
 
 -   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the last event of the view happened.
@@ -43,10 +45,14 @@ Columns:
 
 **Example**
 
+Query:
+
 ``` sql
- SELECT * FROM system.query_views_log LIMIT 1 \G
+SELECT * FROM system.query_views_log LIMIT 1 \G;
 ```
 
+Result:
+
 ``` text
 Row 1:
 ──────
@@ -77,5 +83,4 @@ stack_trace:
 -   [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — Description of the `query_log` system table which contains common information about queries execution.
 -   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
 
-
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/query_thread_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/query_thread_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/quota_limits.md b/docs/en/operations/system-tables/quota_limits.md
index 0088b086e8c..708c4e4e33e 100644
--- a/docs/en/operations/system-tables/quota_limits.md
+++ b/docs/en/operations/system-tables/quota_limits.md
@@ -18,4 +18,4 @@ Columns:
 - `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum number of bytes read from all tables and table functions participated in queries.
 - `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Maximum of the query execution time, in seconds.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/quota_limits) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/quota_limits) <!--hide-->
diff --git a/docs/en/operations/system-tables/quota_usage.md b/docs/en/operations/system-tables/quota_usage.md
index 2f35b6b7dae..6f4d3c9c8ee 100644
--- a/docs/en/operations/system-tables/quota_usage.md
+++ b/docs/en/operations/system-tables/quota_usage.md
@@ -29,4 +29,4 @@ Columns:
 
 -   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/quota_usage) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/quota_usage) <!--hide-->
diff --git a/docs/en/operations/system-tables/quotas.md b/docs/en/operations/system-tables/quotas.md
index 6acc349a54f..d7a73de5046 100644
--- a/docs/en/operations/system-tables/quotas.md
+++ b/docs/en/operations/system-tables/quotas.md
@@ -24,5 +24,5 @@ Columns:
 
 -   [SHOW QUOTAS](../../sql-reference/statements/show.md#show-quotas-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/quotas) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/quotas) <!--hide-->
 
diff --git a/docs/en/operations/system-tables/quotas_usage.md b/docs/en/operations/system-tables/quotas_usage.md
index 6ba88cb935a..7d39af0f601 100644
--- a/docs/en/operations/system-tables/quotas_usage.md
+++ b/docs/en/operations/system-tables/quotas_usage.md
@@ -32,4 +32,4 @@ Columns:
 
 -   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/quotas_usage) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/quotas_usage) <!--hide-->
diff --git a/docs/en/operations/system-tables/replicas.md b/docs/en/operations/system-tables/replicas.md
index e2cc607f6d8..64fc5957e69 100644
--- a/docs/en/operations/system-tables/replicas.md
+++ b/docs/en/operations/system-tables/replicas.md
@@ -121,5 +121,5 @@ WHERE
 
 If this query does not return anything, it means that everything is fine.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/replicas) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/replicas) <!--hide-->
 
diff --git a/docs/en/operations/system-tables/replicated_fetches.md b/docs/en/operations/system-tables/replicated_fetches.md
index bc7e6335c0d..241bb609853 100644
--- a/docs/en/operations/system-tables/replicated_fetches.md
+++ b/docs/en/operations/system-tables/replicated_fetches.md
@@ -67,4 +67,4 @@ thread_id:                   54
 
 -   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system/#query-language-system-replicated)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/replicated_fetches) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/replicated_fetches) <!--hide-->
diff --git a/docs/en/operations/system-tables/replication_queue.md b/docs/en/operations/system-tables/replication_queue.md
index 965774b81bf..ac4cdddb37b 100644
--- a/docs/en/operations/system-tables/replication_queue.md
+++ b/docs/en/operations/system-tables/replication_queue.md
@@ -88,4 +88,4 @@ last_postpone_time:     1970-01-01 03:00:00
 
 -   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md#query-language-system-replicated)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/replication_queue) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/replication_queue) <!--hide-->
diff --git a/docs/en/operations/system-tables/role-grants.md b/docs/en/operations/system-tables/role-grants.md
index d754c6d7fb5..6da221af1a4 100644
--- a/docs/en/operations/system-tables/role-grants.md
+++ b/docs/en/operations/system-tables/role-grants.md
@@ -18,4 +18,4 @@ Columns:
     -   1 — The role has `ADMIN OPTION` privilege.
     -   0 — The role without `ADMIN OPTION` privilege.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/role-grants) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/role-grants) <!--hide-->
diff --git a/docs/en/operations/system-tables/roles.md b/docs/en/operations/system-tables/roles.md
index e68d5ed290a..7a71270b6c4 100644
--- a/docs/en/operations/system-tables/roles.md
+++ b/docs/en/operations/system-tables/roles.md
@@ -12,4 +12,4 @@ Columns:
 
 -   [SHOW ROLES](../../sql-reference/statements/show.md#show-roles-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/roles) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/roles) <!--hide-->
diff --git a/docs/en/operations/system-tables/row_policies.md b/docs/en/operations/system-tables/row_policies.md
index 157ec75f05e..95a26efe952 100644
--- a/docs/en/operations/system-tables/row_policies.md
+++ b/docs/en/operations/system-tables/row_policies.md
@@ -31,4 +31,4 @@ Columns:
 
 -   [SHOW POLICIES](../../sql-reference/statements/show.md#show-policies-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/row_policies) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/row_policies) <!--hide-->
diff --git a/docs/en/operations/system-tables/settings.md b/docs/en/operations/system-tables/settings.md
index cfd9f43655a..5d5eda2abc1 100644
--- a/docs/en/operations/system-tables/settings.md
+++ b/docs/en/operations/system-tables/settings.md
@@ -50,4 +50,4 @@ SELECT * FROM system.settings WHERE changed AND name='load_balancing'
 -   [Constraints on Settings](../../operations/settings/constraints-on-settings.md)
 -   [SHOW SETTINGS](../../sql-reference/statements/show.md#show-settings) statement
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/settings) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/settings) <!--hide-->
diff --git a/docs/en/operations/system-tables/settings_profile_elements.md b/docs/en/operations/system-tables/settings_profile_elements.md
index 3c8c728e645..d812d8f74e0 100644
--- a/docs/en/operations/system-tables/settings_profile_elements.md
+++ b/docs/en/operations/system-tables/settings_profile_elements.md
@@ -27,4 +27,4 @@ Columns:
 
 -    `inherit_profile` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — A parent profile for this setting profile. `NULL` if not set. Setting profile will inherit all the settings' values and constraints (`min`, `max`, `readonly`) from its parent profiles.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/settings_profile_elements) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/settings_profile_elements) <!--hide-->
diff --git a/docs/en/operations/system-tables/settings_profiles.md b/docs/en/operations/system-tables/settings_profiles.md
index 7339c5c2ef6..f9b62cf5194 100644
--- a/docs/en/operations/system-tables/settings_profiles.md
+++ b/docs/en/operations/system-tables/settings_profiles.md
@@ -21,4 +21,4 @@ Columns:
 
 -   [SHOW PROFILES](../../sql-reference/statements/show.md#show-profiles-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/settings_profiles) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/settings_profiles) <!--hide-->
diff --git a/docs/en/operations/system-tables/storage_policies.md b/docs/en/operations/system-tables/storage_policies.md
index 4b07b593926..3d5be4b952b 100644
--- a/docs/en/operations/system-tables/storage_policies.md
+++ b/docs/en/operations/system-tables/storage_policies.md
@@ -14,4 +14,4 @@ Columns:
 
 If the storage policy contains more then one volume, then information for each volume is stored in the individual row of the table.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/storage_policies) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/storage_policies) <!--hide-->
diff --git a/docs/en/operations/system-tables/table_engines.md b/docs/en/operations/system-tables/table_engines.md
index 45ff6f1ac19..57fb5b0ff37 100644
--- a/docs/en/operations/system-tables/table_engines.md
+++ b/docs/en/operations/system-tables/table_engines.md
@@ -35,4 +35,4 @@ WHERE name in ('Kafka', 'MergeTree', 'ReplicatedCollapsingMergeTree')
 -   Kafka [settings](../../engines/table-engines/integrations/kafka.md#table_engine-kafka-creating-a-table)
 -   Join [settings](../../engines/table-engines/special/join.md#join-limitations-and-settings)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/table_engines) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/table_engines) <!--hide-->
diff --git a/docs/en/operations/system-tables/tables.md b/docs/en/operations/system-tables/tables.md
index f37da02cf5b..f7da8a39856 100644
--- a/docs/en/operations/system-tables/tables.md
+++ b/docs/en/operations/system-tables/tables.md
@@ -117,4 +117,4 @@ lifetime_bytes:             ᴺᵁᴸᴸ
 comment:
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/tables) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/tables) <!--hide-->
diff --git a/docs/en/operations/system-tables/text_log.md b/docs/en/operations/system-tables/text_log.md
index e97af34beec..9ed0aa1ee5b 100644
--- a/docs/en/operations/system-tables/text_log.md
+++ b/docs/en/operations/system-tables/text_log.md
@@ -50,4 +50,4 @@ source_file:             /ClickHouse/src/Interpreters/DNSCacheUpdater.cpp; void
 source_line:             45
 ```
 
- [Original article](https://clickhouse.tech/docs/en/operations/system-tables/text_log) <!--hide-->
+ [Original article](https://clickhouse.com/docs/en/operations/system-tables/text_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/time_zones.md b/docs/en/operations/system-tables/time_zones.md
index fa467124884..68f16a665cc 100644
--- a/docs/en/operations/system-tables/time_zones.md
+++ b/docs/en/operations/system-tables/time_zones.md
@@ -27,4 +27,4 @@ SELECT * FROM system.time_zones LIMIT 10
 └────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/time_zones) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/time_zones) <!--hide-->
diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md
index cc70b2d8236..4902b09004d 100644
--- a/docs/en/operations/system-tables/trace_log.md
+++ b/docs/en/operations/system-tables/trace_log.md
@@ -54,4 +54,4 @@ trace:                   [371912858,371912789,371798468,371799717,371801313,3717
 size:                    5244400
 ```
 
- [Original article](https://clickhouse.tech/docs/en/operations/system-tables/trace_log) <!--hide-->
+ [Original article](https://clickhouse.com/docs/en/operations/system-tables/trace_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/users.md b/docs/en/operations/system-tables/users.md
index 0170c85a6d5..e6ab63b9df5 100644
--- a/docs/en/operations/system-tables/users.md
+++ b/docs/en/operations/system-tables/users.md
@@ -31,4 +31,4 @@ Columns:
 
 -   [SHOW USERS](../../sql-reference/statements/show.md#show-users-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/users) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/users) <!--hide-->
diff --git a/docs/en/operations/system-tables/views.md b/docs/en/operations/system-tables/views.md
deleted file mode 100644
index 8edebf00a91..00000000000
--- a/docs/en/operations/system-tables/views.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# system.views {#system-views}
-
-Contains the dependencies of all views and the type to which the view belongs. The metadata of the view comes from the [system.tables](tables.md).
-
-Columns:
-
--   `database` ([String](../../sql-reference/data-types/string.md)) — The name of the database the view is in.
-
--   `name` ([String](../../sql-reference/data-types/string.md)) — Name of the view.
-
--   `main_dependency_database` ([String](../../sql-reference/data-types/string.md)) — The name of the database on which the view depends.
-
--   `main_dependency_table` ([String](../../sql-reference/data-types/string.md)) - The name of the table on which the view depends.
-
--   `view_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of the view. Values:
-    -   `'Default' = 1` — [Default views](../../sql-reference/statements/create/view.md#normal). Should not appear in this log.
-    -   `'Materialized' = 2` — [Materialized views](../../sql-reference/statements/create/view.md#materialized).
-    -   `'Live' = 3` — [Live views](../../sql-reference/statements/create/view.md#live-view).
-
-**Example**
-
-```sql
-SELECT * FROM system.views LIMIT 2 FORMAT Vertical;
-```
-
-```text
-Row 1:
-──────
-database:                 default
-name:                     live_view
-main_dependency_database: default
-main_dependency_table:    view_source_tb
-view_type:                Live
-
-Row 2:
-──────
-database:                 default
-name:                     materialized_view
-main_dependency_database: default
-main_dependency_table:    view_source_tb
-view_type:                Materialized
-```
-
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/views) <!--hide-->
diff --git a/docs/en/operations/system-tables/zookeeper.md b/docs/en/operations/system-tables/zookeeper.md
index 52d1c686e52..bec1d1272d6 100644
--- a/docs/en/operations/system-tables/zookeeper.md
+++ b/docs/en/operations/system-tables/zookeeper.md
@@ -72,4 +72,4 @@ numChildren:    7
 pzxid:          987021252247
 path:           /clickhouse/tables/01-08/visits/replicas
 ```
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/zookeeper) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/zookeeper) <!--hide-->
diff --git a/docs/en/operations/tips.md b/docs/en/operations/tips.md
index 4291b91b41d..9c4232f4f01 100644
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@@ -259,4 +259,4 @@ script
 end script
 ```
 
-{## [Original article](https://clickhouse.tech/docs/en/operations/tips/) ##}
+{## [Original article](https://clickhouse.com/docs/en/operations/tips/) ##}
diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index 5971fc0f9b3..6aa5ea556fc 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -160,4 +160,4 @@ localhost:9000, queries 10, QPS: 6.082, RPS: 121959604.568, MiB/s: 930.478, resu
 99.990%     0.172 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/utilities/clickhouse-benchmark.md) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark.md) <!--hide-->
diff --git a/docs/en/operations/utilities/clickhouse-copier.md b/docs/en/operations/utilities/clickhouse-copier.md
index d9c209f2101..3e729a3a3dd 100644
--- a/docs/en/operations/utilities/clickhouse-copier.md
+++ b/docs/en/operations/utilities/clickhouse-copier.md
@@ -73,7 +73,7 @@ Parameters:
             <!--
                 source cluster & destination clusters accept exactly the same
                 parameters as parameters for the usual Distributed table
-                see https://clickhouse.tech/docs/en/engines/table-engines/special/distributed/
+                see https://clickhouse.com/docs/en/engines/table-engines/special/distributed/
             -->
             <shard>
                 <internal_replication>false</internal_replication>
@@ -184,4 +184,4 @@ Parameters:
 
 `clickhouse-copier` tracks the changes in `/task/path/description` and applies them on the fly. For instance, if you change the value of `max_workers`, the number of processes running tasks will also change.
 
-[Original article](https://clickhouse.tech/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/en/operations/utilities/clickhouse-local.md b/docs/en/operations/utilities/clickhouse-local.md
index b166e2f1b3c..9d28dffbc16 100644
--- a/docs/en/operations/utilities/clickhouse-local.md
+++ b/docs/en/operations/utilities/clickhouse-local.md
@@ -114,4 +114,4 @@ Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ...
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/utils/clickhouse-local/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/avg.md b/docs/en/sql-reference/aggregate-functions/reference/avg.md
index 14a4a4c5ad5..9a22faedf7c 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/avg.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/avg.md
@@ -63,4 +63,4 @@ Result:
 └────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avg/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/avg/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/index.md b/docs/en/sql-reference/aggregate-functions/reference/index.md
index b96fa887279..59befed8785 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/index.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/index.md
@@ -66,9 +66,11 @@ ClickHouse-specific aggregate functions:
 -   [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md)
 -   [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md)
 -   [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md)
+-   [quantileBFloat16](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16)
+-   [quantileBFloat16Weighted](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16weighted)
 -   [simpleLinearRegression](../../../sql-reference/aggregate-functions/reference/simplelinearregression.md)
 -   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
 -   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
 -   [categoricalInformationValue](../../../sql-reference/aggregate-functions/reference/categoricalinformationvalue.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md b/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
index 8c57a3eb896..fe97f7edbf8 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
@@ -71,4 +71,4 @@ Result:
 -   [Mann–Whitney U test](https://en.wikipedia.org/wiki/Mann%E2%80%93Whitney_U_test)
 -   [Stochastic ordering](https://en.wikipedia.org/wiki/Stochastic_ordering)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
index 25c7233aa56..728c200441d 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -58,6 +58,10 @@ Result:
 ```
 Note that all floating point values in the example are truncated to 1.0 when converting to `bfloat16`.
 
+# quantileBFloat16Weighted {#quantilebfloat16weighted}
+
+Like `quantileBFloat16` but takes into account the weight of each sequence member.
+
 **See Also**
 
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/studentttest.md b/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
index 36f80ae6cd7..fd391298bc3 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
@@ -63,4 +63,4 @@ Result:
 -   [Student's t-test](https://en.wikipedia.org/wiki/Student%27s_t-test)
 -   [welchTTest function](welchttest.md#welchttest)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/studentttest/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/studentttest/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/sumcount.md b/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
index 2986511e01a..00a7a9fc9f1 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
@@ -43,4 +43,4 @@ Result:
 
 **See also**
 
-- [optimize_fuse_sum_count_avg](../../../operations/settings/settings.md#optimize_fuse_sum_count_avg) setting.
+- [optimize_syntax_fuse_functions](../../../operations/settings/settings.md#optimize_syntax_fuse_functions) setting.
diff --git a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
index 2c1a043aed6..62f5761b32e 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
@@ -63,4 +63,4 @@ Result:
 -   [Welch's t-test](https://en.wikipedia.org/wiki/Welch%27s_t-test)
 -   [studentTTest function](studentttest.md#studentttest)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/welchTTest/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/welchTTest/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/aggregatefunction.md b/docs/en/sql-reference/data-types/aggregatefunction.md
index 5bc8ffc666b..81945eeece6 100644
--- a/docs/en/sql-reference/data-types/aggregatefunction.md
+++ b/docs/en/sql-reference/data-types/aggregatefunction.md
@@ -65,4 +65,4 @@ SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP
 
 See [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) engine description.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/boolean.md b/docs/en/sql-reference/data-types/boolean.md
index 5890725da8f..ca44238277c 100644
--- a/docs/en/sql-reference/data-types/boolean.md
+++ b/docs/en/sql-reference/data-types/boolean.md
@@ -7,4 +7,4 @@ toc_title: Boolean
 
 There is no separate type for boolean values. Use UInt8 type, restricted to the values 0 or 1.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/boolean/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/boolean/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/datetime.md b/docs/en/sql-reference/data-types/datetime.md
index ed07f599b91..1f9a79b5444 100644
--- a/docs/en/sql-reference/data-types/datetime.md
+++ b/docs/en/sql-reference/data-types/datetime.md
@@ -145,4 +145,4 @@ Time shifts for multiple days. Some pacific islands changed their timezone offse
 -   [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
 -   [The `Date` data type](../../sql-reference/data-types/date.md)
 
-[Original article](https://clickhouse.tech/docs/en/data_types/datetime/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/datetime/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/decimal.md b/docs/en/sql-reference/data-types/decimal.md
index af2655cd0c2..fae0bb6dbb9 100644
--- a/docs/en/sql-reference/data-types/decimal.md
+++ b/docs/en/sql-reference/data-types/decimal.md
@@ -111,4 +111,4 @@ DB::Exception: Can't compare.
 -   [isDecimalOverflow](../../sql-reference/functions/other-functions.md#is-decimal-overflow)
 -   [countDigits](../../sql-reference/functions/other-functions.md#count-digits)
 
-[Original article](https://clickhouse.tech/docs/en/data_types/decimal/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/decimal/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/domains/index.md b/docs/en/sql-reference/data-types/domains/index.md
index 143aafe4db3..57db0c4263c 100644
--- a/docs/en/sql-reference/data-types/domains/index.md
+++ b/docs/en/sql-reference/data-types/domains/index.md
@@ -28,4 +28,4 @@ You can use domains anywhere corresponding base type can be used, for example:
 -   Can’t implicitly convert string values into domain values when inserting data from another column or table.
 -   Domain adds no constrains on stored values.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/domains/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/domains/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/domains/ipv4.md b/docs/en/sql-reference/data-types/domains/ipv4.md
index 1237514b9e7..aafd46edef8 100644
--- a/docs/en/sql-reference/data-types/domains/ipv4.md
+++ b/docs/en/sql-reference/data-types/domains/ipv4.md
@@ -31,16 +31,16 @@ CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
 `IPv4` domain supports custom input format as IPv4-strings:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.com', '183.247.232.58')('https://clickhouse.com/docs/en/', '116.106.34.242');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬───────────from─┐
-│ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
+│ https://clickhouse.com/docs/en/ │ 116.106.34.242 │
 │ https://wikipedia.org              │ 116.253.40.133 │
-│ https://clickhouse.tech          │ 183.247.232.58 │
+│ https://clickhouse.com          │ 183.247.232.58 │
 └────────────────────────────────────┴────────────────┘
 ```
 
@@ -79,4 +79,4 @@ SELECT toTypeName(i), CAST(from as UInt32) as i FROM hits LIMIT 1;
 └──────────────────────────────────┴────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/domains/ipv4) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/domains/ipv6.md b/docs/en/sql-reference/data-types/domains/ipv6.md
index bc57202bf66..30b3c8add69 100644
--- a/docs/en/sql-reference/data-types/domains/ipv6.md
+++ b/docs/en/sql-reference/data-types/domains/ipv6.md
@@ -31,15 +31,15 @@ CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
 `IPv6` domain supports custom input as IPv6-strings:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.com', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.com/docs/en/', '2a02:e980:1e::1');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬─from──────────────────────────┐
-│ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-│ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
+│ https://clickhouse.com          │ 2001:44c8:129:2632:33:0:252:2 │
+│ https://clickhouse.com/docs/en/ │ 2a02:e980:1e::1               │
 │ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
 └────────────────────────────────────┴───────────────────────────────┘
 ```
@@ -81,4 +81,4 @@ SELECT toTypeName(i), CAST(from as FixedString(16)) as i FROM hits LIMIT 1;
 └───────────────────────────────────────────┴─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/domains/ipv6) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/enum.md b/docs/en/sql-reference/data-types/enum.md
index 8c1e42aec79..ae22e60a5f3 100644
--- a/docs/en/sql-reference/data-types/enum.md
+++ b/docs/en/sql-reference/data-types/enum.md
@@ -127,4 +127,4 @@ The Enum type can be changed without cost using ALTER, if only the set of values
 
 Using ALTER, it is possible to change an Enum8 to an Enum16 or vice versa, just like changing an Int8 to Int16.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/enum/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/enum/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/fixedstring.md b/docs/en/sql-reference/data-types/fixedstring.md
index 6f5725b017c..59ed123fb10 100644
--- a/docs/en/sql-reference/data-types/fixedstring.md
+++ b/docs/en/sql-reference/data-types/fixedstring.md
@@ -58,4 +58,4 @@ This behaviour differs from MySQL for the `CHAR` type (where strings are padded
 
 Note that the length of the `FixedString(N)` value is constant. The [length](../../sql-reference/functions/array-functions.md#array_functions-length) function returns `N` even if the `FixedString(N)` value is filled only with null bytes, but the [empty](../../sql-reference/functions/string-functions.md#empty) function returns `1` in this case.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/fixedstring/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/fixedstring/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/float.md b/docs/en/sql-reference/data-types/float.md
index 1e3486cdae7..fcc071b9f9a 100644
--- a/docs/en/sql-reference/data-types/float.md
+++ b/docs/en/sql-reference/data-types/float.md
@@ -89,4 +89,4 @@ SELECT 0 / 0
 
 See the rules for `NaN` sorting in the section [ORDER BY clause](../../sql-reference/statements/select/order-by.md).
 
-[Original article](https://clickhouse.tech/docs/en/data_types/float/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/float/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/geo.md b/docs/en/sql-reference/data-types/geo.md
index d44f86a4262..e6d32ef3305 100644
--- a/docs/en/sql-reference/data-types/geo.md
+++ b/docs/en/sql-reference/data-types/geo.md
@@ -103,4 +103,4 @@ Result:
 └─────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data-types/geo/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data-types/geo/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/index.md b/docs/en/sql-reference/data-types/index.md
index 92a4d034278..831b8d19d94 100644
--- a/docs/en/sql-reference/data-types/index.md
+++ b/docs/en/sql-reference/data-types/index.md
@@ -12,4 +12,4 @@ This section describes the supported data types and special considerations for u
 
 You can check whether data type name is case-sensitive in the [system.data_type_families](../../operations/system-tables/data_type_families.md#system_tables-data_type_families) table.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/int-uint.md b/docs/en/sql-reference/data-types/int-uint.md
index 95d1120ed3d..588b5a2d7d6 100644
--- a/docs/en/sql-reference/data-types/int-uint.md
+++ b/docs/en/sql-reference/data-types/int-uint.md
@@ -25,14 +25,13 @@ Aliases:
 -   `Int32` — `INT`, `INT4`, `INTEGER`.
 -   `Int64` — `BIGINT`.
 
-## Uint Ranges {#uint-ranges}
+## UInt Ranges {#uint-ranges}
 
 -   `UInt8` — \[0 : 255\]
 -   `UInt16` — \[0 : 65535\]
 -   `UInt32` — \[0 : 4294967295\]
 -   `UInt64` — \[0 : 18446744073709551615\]
+-   `UInt128` — \[0 : 340282366920938463463374607431768211455\]
 -   `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
 
-`UInt128` is not supported yet.
-
-[Original article](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/int_uint/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/lowcardinality.md b/docs/en/sql-reference/data-types/lowcardinality.md
index b3ff26a943d..e4b496aaaab 100644
--- a/docs/en/sql-reference/data-types/lowcardinality.md
+++ b/docs/en/sql-reference/data-types/lowcardinality.md
@@ -55,6 +55,5 @@ Functions:
 
 ## See Also {#see-also}
 
--   [A Magical Mystery Tour of the LowCardinality Data Type](https://www.altinity.com/blog/2019/3/27/low-cardinality).
 -   [Reducing ClickHouse Storage Cost with the Low Cardinality Type – Lessons from an Instana Engineer](https://www.instana.com/blog/reducing-clickhouse-storage-cost-with-the-low-cardinality-type-lessons-from-an-instana-engineer/).
 -   [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/yandex/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
diff --git a/docs/en/sql-reference/data-types/map.md b/docs/en/sql-reference/data-types/map.md
index bfad4375f28..cdc3c874043 100644
--- a/docs/en/sql-reference/data-types/map.md
+++ b/docs/en/sql-reference/data-types/map.md
@@ -108,4 +108,4 @@ Result:
 -   [map()](../../sql-reference/functions/tuple-map-functions.md#function-map) function
 -   [CAST()](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) function
 
-[Original article](https://clickhouse.tech/docs/en/data-types/map/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data-types/map/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/multiword-types.md b/docs/en/sql-reference/data-types/multiword-types.md
index 5012fbb404e..bd91dd10ad6 100644
--- a/docs/en/sql-reference/data-types/multiword-types.md
+++ b/docs/en/sql-reference/data-types/multiword-types.md
@@ -26,4 +26,4 @@ When creating tables, you can use data types with a name consisting of several w
 | BINARY LARGE OBJECT              | [String](../../sql-reference/data-types/string.md)           |
 | BINARY VARYING                   | [String](../../sql-reference/data-types/string.md)           |
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/data-types/multiword-types/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/data-types/multiword-types/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/nested-data-structures/index.md b/docs/en/sql-reference/data-types/nested-data-structures/index.md
index 14562254e57..b383fc53464 100644
--- a/docs/en/sql-reference/data-types/nested-data-structures/index.md
+++ b/docs/en/sql-reference/data-types/nested-data-structures/index.md
@@ -7,4 +7,4 @@ toc_title: hidden
 
 # Nested Data Structures {#nested-data-structures}
 
-[Original article](https://clickhouse.tech/docs/en/data_types/nested_data_structures/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/nested_data_structures/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/nested-data-structures/nested.md b/docs/en/sql-reference/data-types/nested-data-structures/nested.md
index ec6c613a956..e08b7e0de3e 100644
--- a/docs/en/sql-reference/data-types/nested-data-structures/nested.md
+++ b/docs/en/sql-reference/data-types/nested-data-structures/nested.md
@@ -3,7 +3,9 @@ toc_priority: 57
 toc_title: Nested(Name1 Type1, Name2 Type2, ...)
 ---
 
-# Nested(name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
+# Nested {#nested}
+
+## Nested(name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
 
 A nested data structure is like a table inside a cell. The parameters of a nested data structure – the column names and types – are specified the same way as in a [CREATE TABLE](../../../sql-reference/statements/create/table.md) query. Each table row can correspond to any number of rows in a nested data structure.
 
@@ -101,4 +103,4 @@ For a DESCRIBE query, the columns in a nested data structure are listed separate
 
 The ALTER query for elements in a nested data structure has limitations.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/nullable.md b/docs/en/sql-reference/data-types/nullable.md
index de53a47afb7..2154315d269 100644
--- a/docs/en/sql-reference/data-types/nullable.md
+++ b/docs/en/sql-reference/data-types/nullable.md
@@ -68,4 +68,4 @@ SELECT x + y FROM t_null
 └────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/nullable/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/nullable/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/simpleaggregatefunction.md b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
index e0d8001dcbb..7a4c4375541 100644
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@@ -38,4 +38,4 @@ The following aggregate functions are supported:
 CREATE TABLE simple (id UInt64, val SimpleAggregateFunction(sum, Double)) ENGINE=AggregatingMergeTree ORDER BY id;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/special-data-types/expression.md b/docs/en/sql-reference/data-types/special-data-types/expression.md
index c707a01cf26..e1ffba478e6 100644
--- a/docs/en/sql-reference/data-types/special-data-types/expression.md
+++ b/docs/en/sql-reference/data-types/special-data-types/expression.md
@@ -7,4 +7,4 @@ toc_title: Expression
 
 Expressions are used for representing lambdas in high-order functions.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/special_data_types/expression/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/special_data_types/expression/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/special-data-types/index.md b/docs/en/sql-reference/data-types/special-data-types/index.md
index 83919eee56b..3398af94c70 100644
--- a/docs/en/sql-reference/data-types/special-data-types/index.md
+++ b/docs/en/sql-reference/data-types/special-data-types/index.md
@@ -9,4 +9,4 @@ toc_title: hidden
 
 Special data type values can’t be serialized for saving in a table or output in query results, but can be used as an intermediate result during query execution.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/special_data_types/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/special_data_types/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/special-data-types/nothing.md b/docs/en/sql-reference/data-types/special-data-types/nothing.md
index 0edd5a0cd6d..e69272a665e 100644
--- a/docs/en/sql-reference/data-types/special-data-types/nothing.md
+++ b/docs/en/sql-reference/data-types/special-data-types/nothing.md
@@ -21,4 +21,4 @@ SELECT toTypeName(array())
 └─────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/special_data_types/nothing/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/special_data_types/nothing/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/special-data-types/set.md b/docs/en/sql-reference/data-types/special-data-types/set.md
index fdc03ad3de1..6babd047888 100644
--- a/docs/en/sql-reference/data-types/special-data-types/set.md
+++ b/docs/en/sql-reference/data-types/special-data-types/set.md
@@ -7,4 +7,4 @@ toc_title: Set
 
 Used for the right half of an [IN](../../../sql-reference/operators/in.md#select-in-operators) expression.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/special_data_types/set/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/special_data_types/set/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/string.md b/docs/en/sql-reference/data-types/string.md
index 2cf11ac85a3..5b0059b330e 100644
--- a/docs/en/sql-reference/data-types/string.md
+++ b/docs/en/sql-reference/data-types/string.md
@@ -17,4 +17,4 @@ If you need to store texts, we recommend using UTF-8 encoding. At the very least
 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](../functions/string-functions.md#length) function calculates the string length in bytes, while the [lengthUTF8](../functions/string-functions.md#lengthutf8) function calculates the string length in Unicode code points, assuming that the value is UTF-8 encoded.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/string/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/string/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/tuple.md b/docs/en/sql-reference/data-types/tuple.md
index dea5e10365f..b28bef67af5 100644
--- a/docs/en/sql-reference/data-types/tuple.md
+++ b/docs/en/sql-reference/data-types/tuple.md
@@ -75,4 +75,4 @@ Result:
 └────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/tuple/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/tuple/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/uuid.md b/docs/en/sql-reference/data-types/uuid.md
index 1e22b41b508..528534de0a0 100644
--- a/docs/en/sql-reference/data-types/uuid.md
+++ b/docs/en/sql-reference/data-types/uuid.md
@@ -72,4 +72,4 @@ The UUID data type only supports functions which [String](../../sql-reference/da
 
 The UUID data type is not supported by arithmetic operations (for example, [abs](../../sql-reference/functions/arithmetic-functions.md#arithm_func-abs)) or aggregate functions, such as [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum) and [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg).
 
-[Original article](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/uuid/) <!--hide-->
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index 00a9610ce91..f525ea64aa2 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
@@ -175,7 +175,10 @@ Example: The table contains discounts for each advertiser in the format:
 +---------|-------------|-------------|------+
 ```
 
-To use a sample for date ranges, define the `range_min` and `range_max` elements in the [structure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). These elements must contain elements `name` and`type` (if `type` is not specified, the default type will be used - Date). `type` can be any numeric type (Date / DateTime / UInt64 / Int32 / others).
+To use a sample for date ranges, define the `range_min` and `range_max` elements in the [structure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). These elements must contain elements `name` and `type` (if `type` is not specified, the default type will be used - Date). `type` can be any numeric type (Date / DateTime / UInt64 / Int32 / others).
+
+!!! warning "Warning"
+    Values of `range_min` and `range_max` should fit in `Int64` type.
 
 Example:
 
@@ -226,34 +229,33 @@ Configuration example:
 
 ``` xml
 <yandex>
-        <dictionary>
+    <dictionary>
+        ...
 
-                ...
+        <layout>
+            <range_hashed />
+        </layout>
 
-                <layout>
-                        <range_hashed />
-                </layout>
+        <structure>
+            <id>
+                <name>Abcdef</name>
+            </id>
+            <range_min>
+                <name>StartTimeStamp</name>
+                <type>UInt64</type>
+            </range_min>
+            <range_max>
+                <name>EndTimeStamp</name>
+                <type>UInt64</type>
+            </range_max>
+            <attribute>
+                <name>XXXType</name>
+                <type>String</type>
+                <null_value />
+            </attribute>
+        </structure>
 
-                <structure>
-                        <id>
-                                <name>Abcdef</name>
-                        </id>
-                        <range_min>
-                                <name>StartTimeStamp</name>
-                                <type>UInt64</type>
-                        </range_min>
-                        <range_max>
-                                <name>EndTimeStamp</name>
-                                <type>UInt64</type>
-                        </range_max>
-                        <attribute>
-                                <name>XXXType</name>
-                                <type>String</type>
-                                <null_value />
-                        </attribute>
-                </structure>
-
-        </dictionary>
+    </dictionary>
 </yandex>
 ```
 
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index 1148edc6a58..d85092d683a 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -860,13 +860,13 @@ arrayDifference(array)
 
 **Arguments**
 
--   `array` – [Array](https://clickhouse.tech/docs/en/data_types/array/).
+-   `array` – [Array](https://clickhouse.com/docs/en/data_types/array/).
 
 **Returned values**
 
 Returns an array of differences between adjacent elements.
 
-Type: [UInt\*](https://clickhouse.tech/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.tech/docs/en/data_types/int_uint/#int-ranges), [Float\*](https://clickhouse.tech/docs/en/data_types/float/).
+Type: [UInt\*](https://clickhouse.com/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.com/docs/en/data_types/int_uint/#int-ranges), [Float\*](https://clickhouse.com/docs/en/data_types/float/).
 
 **Example**
 
@@ -912,7 +912,7 @@ arrayDistinct(array)
 
 **Arguments**
 
--   `array` – [Array](https://clickhouse.tech/docs/en/data_types/array/).
+-   `array` – [Array](https://clickhouse.com/docs/en/data_types/array/).
 
 **Returned values**
 
diff --git a/docs/en/sql-reference/functions/bitmap-functions.md b/docs/en/sql-reference/functions/bitmap-functions.md
index f8d1fdc69fa..a6104835469 100644
--- a/docs/en/sql-reference/functions/bitmap-functions.md
+++ b/docs/en/sql-reference/functions/bitmap-functions.md
@@ -107,7 +107,7 @@ bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
 
 The subset.
 
-Type: `Bitmap object`.
+Type: [Bitmap object](#bitmap_functions-bitmapbuild).
 
 **Example**
 
@@ -125,9 +125,9 @@ Result:
 └───────────────────────────┘
 ```
 
-## subBitmap {#subBitmap}
+## subBitmap {#subbitmap}
 
-Creates a subset of bitmap limit the results to `cardinality_limit` with offset of `offset`.
+Returns the bitmap elements, starting from the `offset` position. The number of returned elements is limited by the `cardinality_limit` parameter. Analog of the [substring](string-functions.md#substring)) string function, but for bitmap.
 
 **Syntax**
 
@@ -137,15 +137,15 @@ subBitmap(bitmap, offset, cardinality_limit)
 
 **Arguments**
 
--   `bitmap` – [Bitmap object](#bitmap_functions-bitmapbuild).
--   `offset` – the number of offsets. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
--   `cardinality_limit` – The subset cardinality upper limit. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+-   `bitmap` – The bitmap. Type: [Bitmap object](#bitmap_functions-bitmapbuild).
+-   `offset` – The position of the first element of the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+-   `cardinality_limit` – The maximum number of elements in the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
 
 The subset.
 
-Type: `Bitmap object`.
+Type: [Bitmap object](#bitmap_functions-bitmapbuild).
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/conditional-functions.md b/docs/en/sql-reference/functions/conditional-functions.md
index a23da82a9c6..241112f7f7f 100644
--- a/docs/en/sql-reference/functions/conditional-functions.md
+++ b/docs/en/sql-reference/functions/conditional-functions.md
@@ -12,11 +12,13 @@ Controls conditional branching. Unlike most systems, ClickHouse always evaluate
 **Syntax**
 
 ``` sql
-SELECT if(cond, then, else)
+if(cond, then, else)
 ```
 
 If the condition `cond` evaluates to a non-zero value, returns the result of the expression `then`, and the result of the expression `else`, if present, is skipped. If the `cond` is zero or `NULL`, then the result of the `then` expression is skipped and the result of the `else` expression, if present, is returned.
 
+You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `if` function according to a short scheme. If this setting is enabled, `then` expression is evaluated only on rows where `cond` is true, `else` expression – where `cond` is false. For example, an exception about division by zero is not thrown when executing the query `SELECT if(number = 0, 0, intDiv(42, number)) FROM numbers(10)`, because `intDiv(42, number)` will be evaluated only for numbers that doesn't satisfy condition `number = 0`.
+
 **Arguments**
 
 -   `cond` – The condition for evaluation that can be zero or not. The type is UInt8, Nullable(UInt8) or NULL.
@@ -115,9 +117,15 @@ Returns `then` if the `cond` evaluates to be true (greater than zero), otherwise
 
 Allows you to write the [CASE](../../sql-reference/operators/index.md#operator_case) operator more compactly in the query.
 
-Syntax: `multiIf(cond_1, then_1, cond_2, then_2, ..., else)`
+**Syntax**
 
-**Arguments:**
+``` sql
+multiIf(cond_1, then_1, cond_2, then_2, ..., else)
+```
+
+You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `multiIf` function according to a short scheme. If this setting is enabled, `then_i` expression is evaluated only on rows where `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}) AND cond_i)` is true, `cond_i` will be evaluated only on rows where `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}))` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT multiIf(number = 2, intDiv(1, number), number = 5) FROM numbers(10)`.
+
+**Arguments**
 
 -   `cond_N` — The condition for the function to return `then_N`.
 -   `then_N` — The result of the function when executed.
@@ -201,4 +209,3 @@ FROM LEFT_RIGHT
 │    4 │  ᴺᵁᴸᴸ │ Both equal       │
 └──────┴───────┴──────────────────┘
 ```
-
diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index c22f041e0c3..69dd14da1bf 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -87,7 +87,23 @@ The function is using uppercase letters `A-F` and not using any prefixes (like `
 
 For integer arguments, it prints hex digits (“nibbles”) from the most significant to least significant (big-endian or “human-readable” order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints both digits of every byte even if the leading digit is zero.
 
-**Example**
+Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../../sql-reference/data-types/datetime.md) are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
+
+For [String](../../sql-reference/data-types/string.md) and [FixedString](../../sql-reference/data-types/fixedstring.md), all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
+
+Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+
+**Arguments**
+
+-   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Returned value**
+
+-   A string with the hexadecimal representation of the argument.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Examples**
 
 Query:
 
@@ -101,28 +117,10 @@ Result:
 01
 ```
 
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
-
-For `String` and `FixedString`, all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
-
-Values of floating point and Decimal types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
-
-**Arguments**
-
--   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
-
-**Returned value**
-
--   A string with the hexadecimal representation of the argument.
-
-Type: `String`.
-
-**Example**
-
 Query:
 
 ``` sql
-SELECT hex(toFloat32(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat32(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -137,7 +135,7 @@ Result:
 Query:
 
 ``` sql
-SELECT hex(toFloat64(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat64(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -210,52 +208,52 @@ Result:
 
 Returns a string containing the argument’s binary representation.
 
-Alias: `BIN`.
-
 **Syntax**
 
 ``` sql
 bin(arg)
 ```
 
+Alias: `BIN`.
+
 For integer arguments, it prints bin digits from the most significant to least significant (big-endian or “human-readable” order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints eight digits of every byte if the leading digit is zero.
 
-**Example**
+Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../../sql-reference/data-types/datetime.md) are formatted as corresponding integers (the number of days since Epoch for `Date` and the value of Unix Timestamp for `DateTime`).
 
-Query:
+For [String](../../sql-reference/data-types/string.md) and [FixedString](../../sql-reference/data-types/fixedstring.md), all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
 
-``` sql
-SELECT bin(1);
-```
-
-Result:
-
-``` text
-00000001
-```
-
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
-
-For `String` and `FixedString`, all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
-
-Values of floating-point and Decimal types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
 
 **Arguments**
 
--   `arg` — A value to convert to binary. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+-   `arg` — A value to convert to binary. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md), or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
 -   A string with the binary representation of the argument.
 
-Type: `String`.
+Type: [String](../../sql-reference/data-types/string.md).
 
-**Example**
+**Examples**
 
 Query:
 
 ``` sql
-SELECT bin(toFloat32(number)) as bin_presentation FROM numbers(15, 2);
+SELECT bin(14);
+```
+
+Result:
+
+``` text
+┌─bin(14)──┐
+│ 00001110 │
+└──────────┘
+```
+
+Query:
+
+``` sql
+SELECT bin(toFloat32(number)) AS bin_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -270,7 +268,7 @@ Result:
 Query:
 
 ``` sql
-SELECT bin(toFloat64(number)) as bin_presentation FROM numbers(15, 2);
+SELECT bin(toFloat64(number)) AS bin_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -284,14 +282,7 @@ Result:
 
 ## unbin {#unbinstr}
 
-Performs the opposite operation of [bin](#bin). It interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The return value is a binary string (BLOB).
-
-If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) functions.
-
-!!! note "Note"
-    If `unbin` is invoked from within the `clickhouse-client`, binary strings display using UTF-8.
-
-Alias: `UNBIN`.
+Interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The functions performs the opposite operation to [bin](#bin).
 
 **Syntax**
 
@@ -299,11 +290,18 @@ Alias: `UNBIN`.
 unbin(arg)
 ```
 
+Alias: `UNBIN`.
+
+For a numeric argument `unbin()` does not return the inverse of `bin()`. If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#reinterpretasuint8163264) functions.
+
+!!! note "Note"
+    If `unbin` is invoked from within the `clickhouse-client`, binary strings are displayed using UTF-8.
+
+Supports binary digits `0` and `1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). 
+
 **Arguments**
 
--   `arg` — A string containing any number of binary digits. Type: [String](../../sql-reference/data-types/string.md).
-
-Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). For a numeric argument the inverse of bin(N) is not performed by unbin().
+-   `arg` — A string containing any number of binary digits. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -311,7 +309,7 @@ Supports binary digits `0-1`. The number of binary digits does not have to be mu
 
 Type: [String](../../sql-reference/data-types/string.md).
 
-**Example**
+**Examples**
 
 Query:
 
@@ -330,14 +328,14 @@ Result:
 Query:
 
 ``` sql
-SELECT reinterpretAsUInt64(reverse(unbin('1010'))) AS num;
+SELECT reinterpretAsUInt64(reverse(unbin('1110'))) AS num;
 ```
 
 Result:
 
 ``` text
 ┌─num─┐
-│  10 │
+│  14 │
 └─────┘
 ```
 
@@ -396,7 +394,7 @@ Result:
 Query:
 
 ``` sql
-select bitPositionsToArray(toInt8(-1)) as bit_positions;
+SELECT bitPositionsToArray(toInt8(-1)) AS bit_positions;
 ```
 
 Result:
diff --git a/docs/en/sql-reference/functions/encryption-functions.md b/docs/en/sql-reference/functions/encryption-functions.md
index 8dc59c65904..ea4d0f84488 100644
--- a/docs/en/sql-reference/functions/encryption-functions.md
+++ b/docs/en/sql-reference/functions/encryption-functions.md
@@ -358,4 +358,4 @@ Result:
 └───────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/encryption_functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/encryption_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/coordinates.md b/docs/en/sql-reference/functions/geo/coordinates.md
index 2d9bb41fc27..b0862dded67 100644
--- a/docs/en/sql-reference/functions/geo/coordinates.md
+++ b/docs/en/sql-reference/functions/geo/coordinates.md
@@ -144,4 +144,4 @@ SELECT pointInPolygon((3., 3.), [(6, 0), (8, 4), (5, 8), (0, 2)]) AS res
 ```
 
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/geo/coordinates) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/coordinates) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/geohash.md b/docs/en/sql-reference/functions/geo/geohash.md
index 5fbd286eba6..1192ed5f56a 100644
--- a/docs/en/sql-reference/functions/geo/geohash.md
+++ b/docs/en/sql-reference/functions/geo/geohash.md
@@ -109,4 +109,4 @@ Result:
 └─────────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/geo/geohash) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/geohash) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/h3.md b/docs/en/sql-reference/functions/geo/h3.md
index ad7b4657af7..faa86527c7d 100644
--- a/docs/en/sql-reference/functions/geo/h3.md
+++ b/docs/en/sql-reference/functions/geo/h3.md
@@ -229,6 +229,42 @@ Result:
 └───────────────────────────────────────┘
 ```
 
+## h3ToGeoBoundary {#h3togeoboundary}
+
+Returns array of pairs `(lon, lat)`, which corresponds to the boundary of the provided H3 index.
+
+**Syntax**
+
+``` sql
+h3ToGeoBoundary(h3Index)
+```
+
+**Arguments**
+
+-   `h3Index` — H3 Index. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-    Array of pairs '(lon, lat)'.
+Type: [Array](../../../sql-reference/data-types/array.md)([Float64](../../../sql-reference/data-types/float.md), [Float64](../../../sql-reference/data-types/float.md)).
+
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3ToGeoBoundary(644325524701193974) AS coordinates;
+```
+
+Result:
+
+``` text
+┌─h3ToGeoBoundary(599686042433355775)────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ [(37.2713558667319,-121.91508032705622),(37.353926450852256,-121.8622232890249),(37.42834118609435,-121.92354999630156),(37.42012867767779,-122.03773496427027),(37.33755608435299,-122.090428929044),(37.26319797461824,-122.02910130919001)] │
+└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
 ## h3kRing {#h3kring}
 
  Lists all the [H3](#h3index) hexagons in the raduis of `k` from the given hexagon in random order.
@@ -558,4 +594,114 @@ Result:
 └─────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/geo/h3) <!--hide-->
+## h3ResIsClassIII {#h3resisclassIII}
+
+Returns whether [H3](#h3index) index has a resolution with Class III orientation.
+
+**Syntax**
+
+``` sql
+h3ResIsClassIII(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   `1` — Index has a resolution with Class III orientation.
+-   `0` — Index doesn't have a resolution with Class III orientation.
+
+Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3ResIsClassIII(617420388352917503) as res;
+```
+
+Result:
+
+``` text
+┌─res─┐
+│   1 │
+└─────┘
+```
+
+## h3IsPentagon {#h3ispentagon  }
+
+Returns whether this [H3](#h3index) index represents a pentagonal cell.
+
+**Syntax**
+
+``` sql
+h3IsPentagon(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   `1` — Index represents a pentagonal cell.
+-   `0` — Index doesn't represent a pentagonal cell.
+
+Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT SELECT h3IsPentagon(644721767722457330) as pentagon;
+```
+
+Result:
+
+``` text
+┌─pentagon─┐
+│        0 │
+└──────────┘
+```
+
+## h3GetFaces {#h3getfaces}
+
+Returns icosahedron faces intersected by a given [H3](#h3index) index.
+
+**Syntax**
+
+``` sql
+h3GetFaces(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   Array containing icosahedron faces intersected by a given H3 index.
+
+Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT SELECT h3GetFaces(599686042433355775) as faces;
+```
+
+Result:
+
+``` text
+┌─faces─┐
+│ [7]   │
+└───────┘
+```
+
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/h3) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/index.md b/docs/en/sql-reference/functions/geo/index.md
index 10b42332ece..65bf2ab83cb 100644
--- a/docs/en/sql-reference/functions/geo/index.md
+++ b/docs/en/sql-reference/functions/geo/index.md
@@ -5,4 +5,4 @@ toc_folder_title: Geo
 ---
 
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/geo/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/index.md b/docs/en/sql-reference/functions/index.md
index 54afd461e1d..47da4e6f3cc 100644
--- a/docs/en/sql-reference/functions/index.md
+++ b/docs/en/sql-reference/functions/index.md
@@ -59,6 +59,10 @@ A lambda function that accepts multiple arguments can also be passed to a higher
 
 For some functions the first argument (the lambda function) can be omitted. In this case, identical mapping is assumed.
 
+## User Defined Functions {#user-defined-functions}
+
+Custom functions can be created using the [CREATE FUNCTION](../statements/create/function.md) statement. To delete these functions use the [DROP FUNCTION](../statements/drop.md#drop-function) statement.
+
 ## Error Handling {#error-handling}
 
 Some functions might throw an exception if the data is invalid. In this case, the query is canceled and an error text is returned to the client. For distributed processing, when an exception occurs on one of the servers, the other servers also attempt to abort the query.
diff --git a/docs/en/sql-reference/functions/introspection.md b/docs/en/sql-reference/functions/introspection.md
index 44685e3cb67..21b570c65d4 100644
--- a/docs/en/sql-reference/functions/introspection.md
+++ b/docs/en/sql-reference/functions/introspection.md
@@ -308,7 +308,7 @@ clone
 ```
 ## tid {#tid}
 
-Returns id of the thread, in which current [Block](https://clickhouse.tech/docs/en/development/architecture/#block) is processed.
+Returns id of the thread, in which current [Block](https://clickhouse.com/docs/en/development/architecture/#block) is processed.
 
 **Syntax**
 
@@ -338,7 +338,7 @@ Result:
 
 ## logTrace {#logtrace}
 
-Emits trace log message to server log for each [Block](https://clickhouse.tech/docs/en/development/architecture/#block).
+Emits trace log message to server log for each [Block](https://clickhouse.com/docs/en/development/architecture/#block).
 
 **Syntax**
 
diff --git a/docs/en/sql-reference/functions/logical-functions.md b/docs/en/sql-reference/functions/logical-functions.md
index 965ed97f20c..dcdb01e2059 100644
--- a/docs/en/sql-reference/functions/logical-functions.md
+++ b/docs/en/sql-reference/functions/logical-functions.md
@@ -19,6 +19,8 @@ Calculates the result of the logical conjunction between two or more values. Cor
 and(val1, val2...)
 ```
 
+You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `and` function according to a short scheme. If this setting is enabled, `vali` is evaluated only on rows where `(val1 AND val2 AND ... AND val{i-1})` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT and(number = 2, intDiv(1, number)) FROM numbers(10)`.
+
 **Arguments**
 
 -   `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
@@ -68,9 +70,11 @@ Calculates the result of the logical disjunction between two or more values. Cor
 **Syntax**
 
 ``` sql
-and(val1, val2...)
+or(val1, val2...)
 ```
 
+You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `or` function according to a short scheme. If this setting is enabled, `vali` is evaluated only on rows where `((NOT val1) AND (NOT val2) AND ... AND (NOT val{i-1}))` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT or(number = 0, intDiv(1, number) != 0) FROM numbers(10)`.
+
 **Arguments**
 
 -   `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
diff --git a/docs/en/sql-reference/functions/rounding-functions.md b/docs/en/sql-reference/functions/rounding-functions.md
index 5f74c6329d1..ad92ba502e1 100644
--- a/docs/en/sql-reference/functions/rounding-functions.md
+++ b/docs/en/sql-reference/functions/rounding-functions.md
@@ -29,7 +29,7 @@ Returns the round number with largest absolute value that has an absolute value
 
 Rounds a value to a specified number of decimal places.
 
-The function returns the nearest number of the specified order. In case when given number has equal distance to surrounding numbers, the function uses banker’s rounding for float number types and rounds away from zero for the other number types.
+The function returns the nearest number of the specified order. In case when given number has equal distance to surrounding numbers, the function uses banker’s rounding for float number types and rounds away from zero for the other number types (Decimal).
 
 ``` sql
 round(expression [, decimal_places])
@@ -49,7 +49,7 @@ The rounded number of the same type as the input number.
 
 ### Examples {#examples}
 
-**Example of use**
+**Example of use with Float**
 
 ``` sql
 SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
@@ -63,6 +63,20 @@ SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
 └─────┴──────────────────────────┘
 ```
 
+**Example of use with Decimal**
+
+``` sql
+SELECT cast(number / 2 AS  Decimal(10,4)) AS x, round(x) FROM system.numbers LIMIT 3
+```
+
+``` text
+┌──────x─┬─round(CAST(divide(number, 2), 'Decimal(10, 4)'))─┐
+│ 0.0000 │                                           0.0000 │
+│ 0.5000 │                                           1.0000 │
+│ 1.0000 │                                           1.0000 │
+└────────┴──────────────────────────────────────────────────┘
+```
+
 **Examples of rounding**
 
 Rounding to the nearest number.
@@ -162,7 +176,7 @@ roundBankers(4.5) = 4
 roundBankers(3.55, 1) = 3.6
 roundBankers(3.65, 1) = 3.6
 roundBankers(10.35, 1) = 10.4
-roundBankers(10.755, 2) = 11,76
+roundBankers(10.755, 2) = 10.76
 ```
 
 **See Also**
diff --git a/docs/en/sql-reference/functions/string-search-functions.md b/docs/en/sql-reference/functions/string-search-functions.md
index d3b4fc908cc..a036482463a 100644
--- a/docs/en/sql-reference/functions/string-search-functions.md
+++ b/docs/en/sql-reference/functions/string-search-functions.md
@@ -502,7 +502,7 @@ The same thing as ‘like’, but negative.
 
 ## ilike {#ilike}
 
-Case insensitive variant of [like](https://clickhouse.tech/docs/en/sql-reference/functions/string-search-functions/#function-like) function. You can use `ILIKE` operator instead of the `ilike` function.
+Case insensitive variant of [like](https://clickhouse.com/docs/en/sql-reference/functions/string-search-functions/#function-like) function. You can use `ILIKE` operator instead of the `ilike` function.
 
 **Syntax**
 
@@ -558,7 +558,7 @@ Result:
 
 **See Also**
 
--   [like](https://clickhouse.tech/docs/en/sql-reference/functions/string-search-functions/#function-like) <!--hide-->
+-   [like](https://clickhouse.com/docs/en/sql-reference/functions/string-search-functions/#function-like) <!--hide-->
 
 ## ngramDistance(haystack, needle) {#ngramdistancehaystack-needle}
 
diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index ef5f5814017..6ddac9a0530 100644
--- a/docs/en/sql-reference/functions/tuple-map-functions.md
+++ b/docs/en/sql-reference/functions/tuple-map-functions.md
@@ -78,7 +78,7 @@ mapAdd(arg1, arg2 [, ...])
 
 **Arguments**
 
-Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array), where items in the first array represent keys, and the second array contains values for the each key. All key arrays should have same type, and all value arrays should contain items which are promote to the one type ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) or [Float64](../../sql-reference/data-types/float.md#float32-float64)). The common promoted type is used as a type for the result array.
+Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array), where items in the first array represent keys, and the second array contains values for the each key. All key arrays should have same type, and all value arrays should contain items which are promoted to the one type ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) or [Float64](../../sql-reference/data-types/float.md#float32-float64)). The common promoted type is used as a type for the result array.
 
 **Returned value**
 
@@ -86,7 +86,7 @@ Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sq
 
 **Example**
 
-Query with a tuple map:
+Query with a tuple:
 
 ```sql
 SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTypeName(res) as type;
@@ -352,4 +352,4 @@ Result:
 └──────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/tuple-map-functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/tuple-map-functions/) <!--hide-->
diff --git a/docs/en/sql-reference/index.md b/docs/en/sql-reference/index.md
index 07e0cadd3a8..e8fe092e622 100644
--- a/docs/en/sql-reference/index.md
+++ b/docs/en/sql-reference/index.md
@@ -15,4 +15,4 @@ ClickHouse supports the following types of queries:
 -   [ALTER](../sql-reference/statements/alter/index.md)
 -   [Other types of queries](../sql-reference/statements/index.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/alter/index.md b/docs/en/sql-reference/statements/alter/index.md
index 71333e6fcce..dbf695edf3b 100644
--- a/docs/en/sql-reference/statements/alter/index.md
+++ b/docs/en/sql-reference/statements/alter/index.md
@@ -5,7 +5,7 @@ toc_title: ALTER
 
 ## ALTER {#query_language_queries_alter}
 
-Most `ALTER` queries modify table settings or data:
+Most `ALTER TABLE` queries modify table settings or data:
 
 -   [COLUMN](../../../sql-reference/statements/alter/column.md)
 -   [PARTITION](../../../sql-reference/statements/alter/partition.md)
@@ -17,9 +17,14 @@ Most `ALTER` queries modify table settings or data:
 -   [TTL](../../../sql-reference/statements/alter/ttl.md)
 
 !!! note "Note"
-    Most `ALTER` queries are supported only for [\*MergeTree](../../../engines/table-engines/mergetree-family/index.md) tables, as well as [Merge](../../../engines/table-engines/special/merge.md) and [Distributed](../../../engines/table-engines/special/distributed.md).
+    Most `ALTER TABLE` queries are supported only for [\*MergeTree](../../../engines/table-engines/mergetree-family/index.md) tables, as well as [Merge](../../../engines/table-engines/special/merge.md) and [Distributed](../../../engines/table-engines/special/distributed.md).
 
-While these `ALTER` settings modify entities related to role-based access control:
+These `ALTER` statements manipulate views:
+
+-   [ALTER TABLE ... MODIFY QUERY](../../../sql-reference/statements/alter/view.md) — Modifies a [Materialized view](../create/view.md#materialized) structure.
+-   [ALTER LIVE VIEW](../../../sql-reference/statements/alter/view.md#alter-live-view) — Refreshes a [Live view](../create/view.md#live-view).
+
+These `ALTER` statements modify entities related to role-based access control:
 
 -   [USER](../../../sql-reference/statements/alter/user.md)
 -   [ROLE](../../../sql-reference/statements/alter/role.md)
@@ -43,7 +48,11 @@ Entries for finished mutations are not deleted right away (the number of preserv
 
 For non-replicated tables, all `ALTER` queries are performed synchronously. For replicated tables, the query just adds instructions for the appropriate actions to `ZooKeeper`, and the actions themselves are performed as soon as possible. However, the query can wait for these actions to be completed on all the replicas.
 
-For `ALTER ... ATTACH|DETACH|DROP` queries, you can use the `replication_alter_partitions_sync` setting to set up waiting. Possible values: `0` – do not wait; `1` – only wait for own execution (default); `2` – wait for all.
+For all `ALTER` queries, you can use the [replication_alter_partitions_sync](../../../operations/settings/settings.md#replication-alter-partitions-sync) setting to set up waiting.
+
+You can specify how long (in seconds) to wait for inactive replicas to execute all `ALTER` queries with the [replication_wait_for_inactive_replica_timeout](../../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    For all `ALTER` queries, if `replication_alter_partitions_sync = 2` and some replicas are not active for more than the time, specified in the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
 
 For `ALTER TABLE ... UPDATE|DELETE` queries the synchronicity is defined by the [mutations_sync](../../../operations/settings/settings.md#mutations_sync) setting.
-
diff --git a/docs/en/sql-reference/statements/alter/index/index.md b/docs/en/sql-reference/statements/alter/index/index.md
index fd5657c3666..4e2943d37f3 100644
--- a/docs/en/sql-reference/statements/alter/index/index.md
+++ b/docs/en/sql-reference/statements/alter/index/index.md
@@ -12,7 +12,7 @@ The following operations are available:
 
 -   `ALTER TABLE [db].name DROP INDEX name` - Removes index description from tables metadata and deletes index files from disk.
 
--   `ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name` - The query rebuilds the secondary index `name` in the partition `partition_name`. Implemented as a [mutation](../../../../sql-reference/statements/alter/index.md#mutations).
+-   `ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name` - The query rebuilds the secondary index `name` in the partition `partition_name`. Implemented as a [mutation](../../../../sql-reference/statements/alter/index.md#mutations). To rebuild index over the whole data in the table you need to remove `IN PARTITION` from query.
 
 The first two commands are lightweight in a sense that they only change metadata or remove files.
 
diff --git a/docs/en/sql-reference/statements/alter/order-by.md b/docs/en/sql-reference/statements/alter/order-by.md
index d41b9a91724..16f9ace206d 100644
--- a/docs/en/sql-reference/statements/alter/order-by.md
+++ b/docs/en/sql-reference/statements/alter/order-by.md
@@ -11,7 +11,7 @@ ALTER TABLE [db].name [ON CLUSTER cluster] MODIFY ORDER BY new_expression
 
 The command changes the [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md) of the table to `new_expression` (an expression or a tuple of expressions). Primary key remains the same.
 
-The command is lightweight in a sense that it only changes metadata. To keep the property that data part rows are ordered by the sorting key expression you cannot add expressions containing existing columns to the sorting key (only columns added by the `ADD COLUMN` command in the same `ALTER` query).
+The command is lightweight in a sense that it only changes metadata. To keep the property that data part rows are ordered by the sorting key expression you cannot add expressions containing existing columns to the sorting key (only columns added by the `ADD COLUMN` command in the same `ALTER` query, without default column value).
 
 !!! note "Note"
     It only works for tables in the [`MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md) family (including [replicated](../../../engines/table-engines/mergetree-family/replication.md) tables).
diff --git a/docs/en/sql-reference/statements/alter/view.md b/docs/en/sql-reference/statements/alter/view.md
new file mode 100644
index 00000000000..0fb1c4be0ff
--- /dev/null
+++ b/docs/en/sql-reference/statements/alter/view.md
@@ -0,0 +1,44 @@
+---
+toc_priority: 50
+toc_title: VIEW
+---
+
+# ALTER TABLE … MODIFY QUERY Statement {#alter-modify-query}
+
+You can modify `SELECT` query that was specified when a [materialized view](../create/view.md#materialized) was created with the `ALTER TABLE … MODIFY QUERY` statement. Use it when the materialized view was created without the `TO [db.]name` clause. The `allow_experimental_alter_materialized_view_structure` setting must be enabled. 
+
+If a materialized view uses the `TO [db.]name` construction, you must [DETACH](../detach.md) the view, run [ALTER TABLE](index.md) query for the target table, and then [ATTACH](../attach.md) the previously detached (`DETACH`) view.
+
+**Example**
+
+```sql
+CREATE TABLE src_table (`a` UInt32) ENGINE = MergeTree ORDER BY a;
+CREATE MATERIALIZED VIEW mv (`a` UInt32) ENGINE = MergeTree ORDER BY a AS SELECT a FROM src_table; 
+INSERT INTO src_table (a) VALUES (1), (2);
+SELECT * FROM mv;
+```
+```text
+┌─a─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+```sql
+ALTER TABLE mv MODIFY QUERY SELECT a * 2 as a FROM src_table;
+INSERT INTO src_table (a) VALUES (3), (4);
+SELECT * FROM mv;
+```
+```text
+┌─a─┐
+│ 6 │
+│ 8 │
+└───┘
+┌─a─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+
+## ALTER LIVE VIEW Statement {#alter-live-view}
+
+`ALTER LIVE VIEW ... REFRESH` statement refreshes a [Live view](../create/view.md#live-view). See [Force Live View Refresh](../create/view.md#live-view-alter-refresh).
diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
new file mode 100644
index 00000000000..ddfcdfef521
--- /dev/null
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 38
+toc_title: FUNCTION
+---
+
+# CREATE FUNCTION {#create-function}
+
+Creates a user defined function from a lambda expression. The expression must consist of function parameters, constants, operators, or other function calls.
+
+**Syntax**
+
+```sql
+CREATE FUNCTION name AS (parameter0, ...) -> expression
+```
+A function can have an arbitrary number of parameters.
+
+There are a few restrictions:
+
+-   The name of a function must be unique among user defined and system functions.
+-   Recursive functions are not allowed.
+-   All variables used by a function must be specified in its parameter list.
+
+If any restriction is violated then an exception is raised.
+
+**Example**
+
+Query:
+
+```sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+SELECT number, linear_equation(number, 2, 1) FROM numbers(3);
+```
+
+Result:
+
+``` text
+┌─number─┬─plus(multiply(2, number), 1)─┐
+│      0 │                            1 │
+│      1 │                            3 │
+│      2 │                            5 │
+└────────┴──────────────────────────────┘
+```
+
+A [conditional function](../../../sql-reference/functions/conditional-functions.md) is called in a user defined function in the following query:
+
+```sql
+CREATE FUNCTION parity_str AS (n) -> if(n % 2, 'odd', 'even');
+SELECT number, parity_str(number) FROM numbers(3);
+```
+
+Result:
+
+``` text
+┌─number─┬─if(modulo(number, 2), 'odd', 'even')─┐
+│      0 │ even                                 │
+│      1 │ odd                                  │
+│      2 │ even                                 │
+└────────┴──────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/statements/create/index.md b/docs/en/sql-reference/statements/create/index.md
index 902a4348bac..3df62869e2b 100644
--- a/docs/en/sql-reference/statements/create/index.md
+++ b/docs/en/sql-reference/statements/create/index.md
@@ -12,10 +12,11 @@ Create queries make a new entity of one of the following kinds:
 -   [TABLE](../../../sql-reference/statements/create/table.md)
 -   [VIEW](../../../sql-reference/statements/create/view.md)
 -   [DICTIONARY](../../../sql-reference/statements/create/dictionary.md)
+-   [FUNCTION](../../../sql-reference/statements/create/function.md)
 -   [USER](../../../sql-reference/statements/create/user.md)
 -   [ROLE](../../../sql-reference/statements/create/role.md)
 -   [ROW POLICY](../../../sql-reference/statements/create/row-policy.md)
 -   [QUOTA](../../../sql-reference/statements/create/quota.md)
 -   [SETTINGS PROFILE](../../../sql-reference/statements/create/settings-profile.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/create/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/create/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index d09ff24efcd..5334532a54f 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -207,8 +207,6 @@ ALTER TABLE codec_example MODIFY COLUMN float_value CODEC(Default);
 
 Codecs can be combined in a pipeline, for example, `CODEC(Delta, Default)`.
 
-To select the best codec combination for you project, pass benchmarks similar to described in the Altinity [New Encodings to Improve ClickHouse Efficiency](https://www.altinity.com/blog/2019/7/new-encodings-to-improve-clickhouse) article. One thing to note is that codec can't be applied for ALIAS column type.
-
 !!! warning "Warning"
     You can’t decompress ClickHouse database files with external utilities like `lz4`. Instead, use the special [clickhouse-compressor](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor) utility.
 
diff --git a/docs/en/sql-reference/statements/create/view.md b/docs/en/sql-reference/statements/create/view.md
index 110eb2aaaf2..b6a09e25f95 100644
--- a/docs/en/sql-reference/statements/create/view.md
+++ b/docs/en/sql-reference/statements/create/view.md
@@ -5,9 +5,9 @@ toc_title: VIEW
 
 # CREATE VIEW {#create-view}
 
-Creates a new view. There are two types of views: normal and materialized.
+Creates a new view. Views can be [normal](#normal), [materialized](#materialized) and [live](#live-view) (the latter is an experimental feature).
 
-## Normal {#normal}
+## Normal View {#normal}
 
 Syntax:
 
@@ -35,7 +35,7 @@ This query is fully equivalent to using the subquery:
 SELECT a, b, c FROM (SELECT ...)
 ```
 
-## Materialized {#materialized}
+## Materialized View {#materialized}
 
 ``` sql
 CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]name] [ENGINE = engine] [POPULATE] AS SELECT ...
@@ -59,7 +59,7 @@ If you specify `POPULATE`, the existing table data is inserted in the view when
 
 A `SELECT` query can contain `DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`… Note that the corresponding conversions are performed independently on each block of inserted data. For example, if `GROUP BY` is set, data is aggregated during insertion, but only within a single packet of inserted data. The data won’t be further aggregated. The exception is when using an `ENGINE` that independently performs data aggregation, such as `SummingMergeTree`.
 
-The execution of [ALTER](../../../sql-reference/statements/alter/index.md) queries on materialized views has limitations, so they might be inconvenient. If the materialized view uses the construction `TO [db.]name`, you can `DETACH` the view, run `ALTER` for the target table, and then `ATTACH` the previously detached (`DETACH`) view.
+The execution of [ALTER](../../../sql-reference/statements/alter/view.md) queries on materialized views has limitations, so they might be inconvenient. If the materialized view uses the construction `TO [db.]name`, you can `DETACH` the view, run `ALTER` for the target table, and then `ATTACH` the previously detached (`DETACH`) view.
 
 Note that materialized view is influenced by [optimize_on_insert](../../../operations/settings/settings.md#optimize-on-insert) setting. The data is merged before the insertion into a view.
 
@@ -67,7 +67,7 @@ Views look the same as normal tables. For example, they are listed in the result
 
 To delete a view, use [DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). Although `DROP TABLE` works for VIEWs as well.
 
-## Live View (Experimental) {#live-view}
+## Live View [Experimental] {#live-view}
 
 !!! important "Important"
     This is an experimental feature that may change in backwards-incompatible ways in the future releases.
@@ -93,7 +93,7 @@ Live views work similarly to how a query in a distributed table works. But inste
 
     See [WITH REFRESH](#live-view-with-refresh) to force periodic updates of a live view that in some cases can be used as a workaround.
 
-### Monitoring Changes {#live-view-monitoring}
+### Monitoring Live View Changes {#live-view-monitoring}
 
 You can monitor changes in the `LIVE VIEW` query result using [WATCH](../../../sql-reference/statements/watch.md) query.
 
@@ -118,12 +118,11 @@ WATCH lv;
 │      1 │        1 │
 └────────┴──────────┘
 ┌─sum(x)─┬─_version─┐
-│      2 │        2 │
+│      3 │        2 │
 └────────┴──────────┘
 ┌─sum(x)─┬─_version─┐
 │      6 │        3 │
 └────────┴──────────┘
-...
 ```
 
 ```sql
@@ -154,7 +153,6 @@ WATCH lv EVENTS;
 ┌─version─┐
 │       3 │
 └─────────┘
-...
 ```
 
 You can execute [SELECT](../../../sql-reference/statements/select/index.md) query on a live view in the same way as for any regular view or a table. If the query result is cached it will return the result immediately without running the stored query on the underlying tables.
@@ -163,7 +161,7 @@ You can execute [SELECT](../../../sql-reference/statements/select/index.md) quer
 SELECT * FROM [db.]live_view WHERE ...
 ```
 
-### Force Refresh {#live-view-alter-refresh}
+### Force Live View Refresh {#live-view-alter-refresh}
 
 You can force live view refresh using the `ALTER LIVE VIEW [db.]table_name REFRESH` statement.
 
@@ -235,7 +233,7 @@ WATCH lv
 Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv does not exist..
 ```
 
-### Usage {#live-view-usage}
+### Live View Usage {#live-view-usage}
 
 Most common uses of live view tables include:
 
@@ -244,4 +242,5 @@ Most common uses of live view tables include:
 - Watching for table changes and triggering a follow-up select queries.
 - Watching metrics from system tables using periodic refresh.
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/create/view/) <!--hide-->
+**See Also**
+-   [ALTER LIVE VIEW](../alter/view.md#alter-live-view)
diff --git a/docs/en/sql-reference/statements/drop.md b/docs/en/sql-reference/statements/drop.md
index 90a2a46c7cf..552a7b5f1a9 100644
--- a/docs/en/sql-reference/statements/drop.md
+++ b/docs/en/sql-reference/statements/drop.md
@@ -97,4 +97,20 @@ Syntax:
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
-[Оriginal article](https://clickhouse.tech/docs/en/sql-reference/statements/drop/) <!--hide-->
+## DROP FUNCTION {#drop-function}
+
+Deletes a user defined function created by [CREATE FUNCTION](./create/function.md).
+System functions can not be dropped.
+
+**Syntax**
+
+``` sql
+DROP FUNCTION [IF EXISTS] function_name
+```
+
+**Example**
+
+``` sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+DROP FUNCTION linear_equation;
+```
diff --git a/docs/en/sql-reference/statements/explain.md b/docs/en/sql-reference/statements/explain.md
index 9afea708d16..2d129f1bc60 100644
--- a/docs/en/sql-reference/statements/explain.md
+++ b/docs/en/sql-reference/statements/explain.md
@@ -412,4 +412,4 @@ Result:
 └──────────┴───────┴───────┴──────┴───────┘
 ```
 
-[Оriginal article](https://clickhouse.tech/docs/en/sql-reference/statements/explain/) <!--hide-->
+[Оriginal article](https://clickhouse.com/docs/en/sql-reference/statements/explain/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index 25dffc36954..2b3cd68fbb2 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -107,11 +107,13 @@ Hierarchy of privileges:
         -   `CREATE TEMPORARY TABLE`
     -   `CREATE VIEW`
     -   `CREATE DICTIONARY`
+    -   `CREATE FUNCTION`
 -   [DROP](#grant-drop)
     -   `DROP DATABASE`
     -   `DROP TABLE`
     -   `DROP VIEW`
     -   `DROP DICTIONARY`
+    -   `DROP FUNCTION`
 -   [TRUNCATE](#grant-truncate)
 -   [OPTIMIZE](#grant-optimize)
 -   [SHOW](#grant-show)
diff --git a/docs/en/sql-reference/statements/optimize.md b/docs/en/sql-reference/statements/optimize.md
index 864509cec94..4054f373cc1 100644
--- a/docs/en/sql-reference/statements/optimize.md
+++ b/docs/en/sql-reference/statements/optimize.md
@@ -18,13 +18,17 @@ OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION I
 
 The `OPTMIZE` query is supported for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) family, the [MaterializedView](../../engines/table-engines/special/materializedview.md) and the [Buffer](../../engines/table-engines/special/buffer.md) engines. Other table engines aren’t supported.
 
-When `OPTIMIZE` is used with the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family of table engines, ClickHouse creates a task for merging and waits for execution on all nodes (if the `replication_alter_partitions_sync` setting is enabled).
+When `OPTIMIZE` is used with the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family of table engines, ClickHouse creates a task for merging and waits for execution on all replicas (if the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting is set to `2`) or on current replica (if the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting is set to `1`).
 
 -   If `OPTIMIZE` does not perform a merge for any reason, it does not notify the client. To enable notifications, use the [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) setting.
 -   If you specify a `PARTITION`, only the specified partition is optimized. [How to set partition expression](../../sql-reference/statements/alter/index.md#alter-how-to-specify-part-expr).
 -   If you specify `FINAL`, optimization is performed even when all the data is already in one part. Also merge is forced even if concurrent merges are performed.
 -   If you specify `DEDUPLICATE`, then completely identical rows (unless by-clause is specified) will be deduplicated (all columns are compared), it makes sense only for the MergeTree engine.
 
+You can specify how long (in seconds) to wait for inactive replicas to execute `OPTIMIZE` queries by the [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    If the `replication_alter_partitions_sync` is set to `2` and some replicas are not active for more than the time, specified by the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
 
 ## BY expression {#by-expression}
 
diff --git a/docs/en/sql-reference/statements/revoke.md b/docs/en/sql-reference/statements/revoke.md
index 71a76546096..75005260c4a 100644
--- a/docs/en/sql-reference/statements/revoke.md
+++ b/docs/en/sql-reference/statements/revoke.md
@@ -45,4 +45,4 @@ GRANT SELECT ON accounts.staff TO mira;
 REVOKE SELECT(wage) ON accounts.staff FROM mira;
 ```
 
-{## [Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) ##}
+{## [Original article](https://clickhouse.com/docs/en/operations/settings/settings/) ##}
diff --git a/docs/en/sql-reference/statements/select/all.md b/docs/en/sql-reference/statements/select/all.md
index 891b82c4319..ba66f63b447 100644
--- a/docs/en/sql-reference/statements/select/all.md
+++ b/docs/en/sql-reference/statements/select/all.md
@@ -18,4 +18,4 @@ equals to
 SELECT sum(number) FROM numbers(10);
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/all) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/all) <!--hide-->
diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index 4e96bae8493..b3cc7555d91 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -282,4 +282,4 @@ Other ways to make settings see [here](../../../operations/settings/index.md).
 SELECT * FROM some_table SETTINGS optimize_read_in_order=1, cast_keep_nullable=1;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/)<!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/)<!--hide-->
diff --git a/docs/en/sql-reference/statements/select/order-by.md b/docs/en/sql-reference/statements/select/order-by.md
index 156f68935b5..030f04d5e83 100644
--- a/docs/en/sql-reference/statements/select/order-by.md
+++ b/docs/en/sql-reference/statements/select/order-by.md
@@ -400,4 +400,4 @@ Result:
 └────────────┴────────────┴──────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/order-by/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/order-by/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/select/union.md b/docs/en/sql-reference/statements/select/union.md
index 6cedfb89787..6dfe554edf0 100644
--- a/docs/en/sql-reference/statements/select/union.md
+++ b/docs/en/sql-reference/statements/select/union.md
@@ -84,4 +84,4 @@ Queries that are parts of `UNION/UNION ALL/UNION DISTINCT` can be run simultaneo
 -   [union_default_mode](../../../operations/settings/settings.md#union-default-mode) setting.
 
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/union/) <!-- hide -->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/union/) <!-- hide -->
diff --git a/docs/en/sql-reference/statements/select/where.md b/docs/en/sql-reference/statements/select/where.md
index f1532115e55..69505a51db4 100644
--- a/docs/en/sql-reference/statements/select/where.md
+++ b/docs/en/sql-reference/statements/select/where.md
@@ -6,7 +6,7 @@ toc_title: WHERE
 
 `WHERE` clause allows to filter the data that is coming from [FROM](../../../sql-reference/statements/select/from.md) clause of `SELECT`.
 
-If there is a `WHERE` clause, it must contain an expression with the `UInt8` type. This is usually an expression with comparison and logical operators. Rows where this expression evaluates to 0 are expluded from further transformations or result.
+If there is a `WHERE` clause, it must contain an expression with the `UInt8` type. This is usually an expression with comparison and logical operators. Rows where this expression evaluates to 0 are excluded from further transformations or result.
 
 `WHERE` expression is evaluated on the ability to use indexes and partition pruning, if the underlying table engine supports that.
 
diff --git a/docs/en/sql-reference/statements/select/with.md b/docs/en/sql-reference/statements/select/with.md
index 2dca9650340..d6c8da261cb 100644
--- a/docs/en/sql-reference/statements/select/with.md
+++ b/docs/en/sql-reference/statements/select/with.md
@@ -67,4 +67,4 @@ WITH test1 AS (SELECT i + 1, j + 1 FROM test1)
 SELECT * FROM test1;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/with/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/with/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index b5df38642ad..e00d58dfed4 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -8,7 +8,7 @@ toc_title: SHOW
 ## SHOW CREATE TABLE {#show-create-table}
 
 ``` sql
-SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY] [db.]table [INTO OUTFILE filename] [FORMAT format]
+SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY|VIEW] [db.]table|view [INTO OUTFILE filename] [FORMAT format]
 ```
 
 Returns a single `String`-type ‘statement’ column, which contains a single value – the `CREATE` query used for creating the specified object.
@@ -91,7 +91,7 @@ Result:
 
 ### See Also {#see-also}
 
--   [CREATE DATABASE](https://clickhouse.tech/docs/en/sql-reference/statements/create/database/#query-language-create-database)
+-   [CREATE DATABASE](https://clickhouse.com/docs/en/sql-reference/statements/create/database/#query-language-create-database)
 
 ## SHOW PROCESSLIST {#show-processlist}
 
@@ -190,8 +190,8 @@ Result:
 
 ### See Also {#see-also}
 
--   [Create Tables](https://clickhouse.tech/docs/en/getting-started/tutorial/#create-tables)
--   [SHOW CREATE TABLE](https://clickhouse.tech/docs/en/sql-reference/statements/show/#show-create-table)
+-   [Create Tables](https://clickhouse.com/docs/en/getting-started/tutorial/#create-tables)
+-   [SHOW CREATE TABLE](https://clickhouse.com/docs/en/sql-reference/statements/show/#show-create-table)
 
 ## SHOW DICTIONARIES {#show-dictionaries}
 
@@ -493,4 +493,4 @@ Result:
 
 -   [system.settings](../../operations/system-tables/settings.md) table
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/show/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/show/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/truncate.md b/docs/en/sql-reference/statements/truncate.md
index f302a8605e2..b5354196fa4 100644
--- a/docs/en/sql-reference/statements/truncate.md
+++ b/docs/en/sql-reference/statements/truncate.md
@@ -12,3 +12,10 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 Removes all data from a table. When the clause `IF EXISTS` is omitted, the query returns an error if the table does not exist.
 
 The `TRUNCATE` query is not supported for [View](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md), [Buffer](../../engines/table-engines/special/buffer.md) and [Null](../../engines/table-engines/special/null.md) table engines.
+
+You can use the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting to set up waiting for actions to be executed on replicas.
+
+You can specify how long (in seconds) to wait for inactive replicas to execute `TRUNCATE` queries with the [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    If the `replication_alter_partitions_sync` is set to `2` and some replicas are not active for more than the time, specified by the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
diff --git a/docs/en/sql-reference/syntax.md b/docs/en/sql-reference/syntax.md
index 573e35d2f71..207b2b82cd2 100644
--- a/docs/en/sql-reference/syntax.md
+++ b/docs/en/sql-reference/syntax.md
@@ -104,6 +104,28 @@ There are many nuances to processing `NULL`. For example, if at least one of the
 
 In queries, you can check `NULL` using the [IS NULL](../sql-reference/operators/index.md#operator-is-null) and [IS NOT NULL](../sql-reference/operators/index.md) operators and the related functions `isNull` and `isNotNull`.
 
+### Heredoc {#heredeoc}
+
+A [heredoc](https://en.wikipedia.org/wiki/Here_document) is a way to define a string (often multiline), while maintaining the original formatting. A heredoc is defined as a custom string literal, placed between two `$` symbols, for example `$heredoc$`. A value between two heredocs is processed "as-is". 
+
+You can use a heredoc to embed snippets of SQL, HTML, or XML code, etc. 
+
+**Example**
+
+Query:
+
+```sql
+SELECT $smth$SHOW CREATE VIEW my_view$smth$;
+```
+
+Result:
+
+```text
+┌─'SHOW CREATE VIEW my_view'─┐
+│ SHOW CREATE VIEW my_view   │
+└────────────────────────────┘
+```
+
 ## Functions {#functions}
 
 Function calls are written like an identifier with a list of arguments (possibly empty) in round brackets. In contrast to standard SQL, the brackets are required, even for an empty argument list. Example: `now()`.
@@ -183,4 +205,4 @@ An expression is a function, identifier, literal, application of an operator, ex
 A list of expressions is one or more expressions separated by commas.
 Functions and operators, in turn, can have expressions as arguments.
 
-[Original article](https://clickhouse.tech/docs/en/sql_reference/syntax/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql_reference/syntax/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index e1459b5e254..f7c2a9e6d5b 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -126,4 +126,4 @@ SELECT count(*) FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String,
 
 -   [Virtual columns](../../engines/table-engines/index.md#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/file/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/file/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/index.md b/docs/en/sql-reference/table-functions/index.md
index 64afe30ef18..c32ae0c2a86 100644
--- a/docs/en/sql-reference/table-functions/index.md
+++ b/docs/en/sql-reference/table-functions/index.md
@@ -36,4 +36,4 @@ You can use table functions in:
 | [s3](../../sql-reference/table-functions/s3.md)                  | Creates a [S3](../../engines/table-engines/integrations/s3.md)-engine table.                                                           |
 | [sqlite](../../sql-reference/table-functions/sqlite.md)          | Creates a [sqlite](../../engines/table-engines/integrations/sqlite.md)-engine table.                                                       |
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/jdbc.md b/docs/en/sql-reference/table-functions/jdbc.md
index 4943e0291df..9fe1333fc94 100644
--- a/docs/en/sql-reference/table-functions/jdbc.md
+++ b/docs/en/sql-reference/table-functions/jdbc.md
@@ -35,4 +35,4 @@ FROM jdbc('mysql-dev?datasource_column', 'show databases') a
 INNER JOIN jdbc('self?datasource_column', 'show databases') b ON a.Database = b.name
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/mysql.md b/docs/en/sql-reference/table-functions/mysql.md
index 627b81a3ddb..b45ab86f60f 100644
--- a/docs/en/sql-reference/table-functions/mysql.md
+++ b/docs/en/sql-reference/table-functions/mysql.md
@@ -110,4 +110,4 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 -   [The ‘MySQL’ table engine](../../engines/table-engines/integrations/mysql.md)
 -   [Using MySQL as a source of external dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table_functions/mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table_functions/mysql/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/null.md b/docs/en/sql-reference/table-functions/null.md
index 273091f8fd1..4a8d221d620 100644
--- a/docs/en/sql-reference/table-functions/null.md
+++ b/docs/en/sql-reference/table-functions/null.md
@@ -40,4 +40,4 @@ See also:
 
 -   [Null table engine](../../engines/table-engines/special/null.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/null/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/null/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/postgresql.md b/docs/en/sql-reference/table-functions/postgresql.md
index 85c9366daf9..b2bdc2495e5 100644
--- a/docs/en/sql-reference/table-functions/postgresql.md
+++ b/docs/en/sql-reference/table-functions/postgresql.md
@@ -129,4 +129,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [The PostgreSQL table engine](../../engines/table-engines/integrations/postgresql.md)
 -   [Using PostgreSQL as a source of external dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index d84edb3f46e..599213561f2 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -3,7 +3,7 @@ toc_priority: 45
 toc_title: s3
 ---
 
-# S3 Table Function {#s3-table-function}
+# s3 Table Function {#s3-table-function}
 
 Provides table-like interface to select/insert files in [Amazon S3](https://aws.amazon.com/s3/). This table function is similar to [hdfs](../../sql-reference/table-functions/hdfs.md), but provides S3-specific features.
 
@@ -125,8 +125,32 @@ INSERT INTO FUNCTION s3('https://storage.yandexcloud.net/my-test-bucket-768/test
 SELECT name, value FROM existing_table;
 ```
 
+## Partitioned Write {#partitioned-write}
+
+If you specify `PARTITION BY` expression when inserting data into `S3` table, a separate file is created for each partition value. Splitting the data into separate files helps to improve reading operations efficiency.
+
+**Examples**
+
+1. Using partition ID in a key creates separate files:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a String, b UInt32, c UInt32')
+    PARTITION BY a VALUES ('x', 2, 3), ('x', 4, 5), ('y', 11, 12), ('y', 13, 14), ('z', 21, 22), ('z', 23, 24);
+```
+As a result, the data is written into three files: `file_x.csv`, `file_y.csv`, and `file_z.csv`.
+
+2. Using partition ID in a bucket name creates files in different buckets:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24);
+```
+As a result, the data is written into three files in different buckets: `my_bucket_1/file.csv`, `my_bucket_10/file.csv`, and `my_bucket_20/file.csv`.
+
 **See Also**
 
 -   [S3 engine](../../engines/table-engines/integrations/s3.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/s3/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/s3/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/view.md b/docs/en/sql-reference/table-functions/view.md
index 18323ec4e92..f78120c370e 100644
--- a/docs/en/sql-reference/table-functions/view.md
+++ b/docs/en/sql-reference/table-functions/view.md
@@ -5,7 +5,7 @@ toc_title: view
 
 ## view {#view}
 
-Turns a subquery into a table. The function implements views (see [CREATE VIEW](https://clickhouse.tech/docs/en/sql-reference/statements/create/view/#create-view)). The resulting table does not store data, but only stores the specified `SELECT` query. When reading from the table, ClickHouse executes the query and deletes all unnecessary columns from the result.
+Turns a subquery into a table. The function implements views (see [CREATE VIEW](https://clickhouse.com/docs/en/sql-reference/statements/create/view/#create-view)). The resulting table does not store data, but only stores the specified `SELECT` query. When reading from the table, ClickHouse executes the query and deletes all unnecessary columns from the result.
 
 **Syntax**
 
@@ -51,7 +51,7 @@ Result:
 └──────────┘
 ```
 
-You can use the `view` function as a parameter of the [remote](https://clickhouse.tech/docs/en/sql-reference/table-functions/remote/#remote-remotesecure) and [cluster](https://clickhouse.tech/docs/en/sql-reference/table-functions/cluster/#cluster-clusterallreplicas) table functions:
+You can use the `view` function as a parameter of the [remote](https://clickhouse.com/docs/en/sql-reference/table-functions/remote/#remote-remotesecure) and [cluster](https://clickhouse.com/docs/en/sql-reference/table-functions/cluster/#cluster-clusterallreplicas) table functions:
 
 ``` sql
 SELECT * FROM remote(`127.0.0.1`, view(SELECT a, b, c FROM table_name));
@@ -63,6 +63,6 @@ SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name));
 
 **See Also**
 
--   [View Table Engine](https://clickhouse.tech/docs/en/engines/table-engines/special/view/)
+-   [View Table Engine](https://clickhouse.com/docs/en/engines/table-engines/special/view/)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/view/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/view/) <!--hide-->
diff --git a/docs/en/whats-new/changelog/2017.md b/docs/en/whats-new/changelog/2017.md
index 9ceca2b6c4a..af82c69386a 100644
--- a/docs/en/whats-new/changelog/2017.md
+++ b/docs/en/whats-new/changelog/2017.md
@@ -24,7 +24,7 @@ This release contains bug fixes for the previous release 1.1.54310:
 #### New Features: {#new-features}
 
 -   Custom partitioning key for the MergeTree family of table engines.
--   [Kafka](https://clickhouse.tech/docs/en/operations/table_engines/kafka/) table engine.
+-   [Kafka](https://clickhouse.com/docs/en/operations/table_engines/kafka/) table engine.
 -   Added support for loading [CatBoost](https://catboost.yandex/) models and applying them to data stored in ClickHouse.
 -   Added support for time zones with non-integer offsets from UTC.
 -   Added support for arithmetic operations with time intervals.
diff --git a/docs/en/whats-new/roadmap.md b/docs/en/whats-new/roadmap.md
index 4abc36b5136..8872c42818f 100644
--- a/docs/en/whats-new/roadmap.md
+++ b/docs/en/whats-new/roadmap.md
@@ -7,4 +7,4 @@ toc_title: Roadmap
 
 The roadmap for the year 2021 is published for open discussion [here](https://github.com/ClickHouse/ClickHouse/issues/17623).
 
-{## [Original article](https://clickhouse.tech/docs/en/roadmap/) ##}
+{## [Original article](https://clickhouse.com/docs/en/roadmap/) ##}
diff --git a/docs/en/whats-new/security-changelog.md b/docs/en/whats-new/security-changelog.md
index 97cad9965fd..bcfeaa06e24 100644
--- a/docs/en/whats-new/security-changelog.md
+++ b/docs/en/whats-new/security-changelog.md
@@ -81,4 +81,4 @@ Incorrect configuration in deb package could lead to the unauthorized use of the
 
 Credits: the UK’s National Cyber Security Centre (NCSC)
 
-{## [Original article](https://clickhouse.tech/docs/en/security_changelog/) ##}
+{## [Original article](https://clickhouse.com/docs/en/security_changelog/) ##}
diff --git a/docs/ja/commercial/cloud.md b/docs/ja/commercial/cloud.md
index 62fc75ecbda..312b8aed6ea 100644
--- a/docs/ja/commercial/cloud.md
+++ b/docs/ja/commercial/cloud.md
@@ -5,31 +5,7 @@ toc_priority: 1
 toc_title: "\u30AF\u30E9\u30A6\u30C9"
 ---
 
-# ClickHouseの雲のサービス提供者 {#clickhouse-cloud-service-providers}
+# ClickHouse Cloud Service {#clickhouse-cloud-service}
 
-!!! info "情報"
-    Managed ClickHouse serviceを使用してパブリッククラウドを起動した場合は、以下をお気軽にご利用ください [プル要求を開く](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) それを次のリストに追加します。
-
-## Yandexクラウド {#yandex-cloud}
-
-[ClickHouseのためのYandexの管理サービス](https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) 次の主な機能を提供します:
-
--   完全に管理された飼育係サービス [クリックハウス複製](../engines/table-engines/mergetree-family/replication.md)
--   複数の記憶域タイプの選択肢
--   異なる可用性ゾーンのレプリカ
--   暗号化と分離
--   自動メンテナンス
-
-## Alibaba Cloud {#alibaba-cloud}
-
-[ClickHouseのためのAlibaba Cloudの管理サービス](https://www.alibabacloud.com/product/clickhouse) 次の主な機能を提供します:
-
--   Alibaba Cloud Apsara分散システムをベースにした信頼性の高いクラウドディスクストレージエンジン
--   手動でのデータ移行を必要とせずに、オン・デマンドで容量を拡張
--   シングル・ノード、シングル・レプリカ、マルチ・ノード、マルチ・レプリカ・アーキテクチャをサポートし、ホット・データとコールド・データの階層化をサポート
--   アクセスホワイトリスト、OneKey Recovery、マルチレイヤーネットワークセキュリティ保護、クラウドディスク暗号化をサポート
--   クラウドログシステム、データベース、およびデータアプリケーションツールとのシームレスな統合
--   組み込み型の監視およびデータベース管理プラットフォーム
--   プロフェッショナルデータベースエキスパートによるテクニカル・サポートとサービス
-
-{## [元の記事](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
+!!! info "Info"
+    Detailed public description for ClickHouse cloud services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/ja/commercial/index.md b/docs/ja/commercial/index.md
index 75e13112d9e..75bbe782750 100644
--- a/docs/ja/commercial/index.md
+++ b/docs/ja/commercial/index.md
@@ -6,4 +6,9 @@ toc_priority: 70
 toc_title: "\u5546\u696D"
 ---
 
+# ClickHouse Commercial Services {#clickhouse-commercial-services}
 
+Service categories:
+
+-   [Cloud](../commercial/cloud.md)
+-   [Support](../commercial/support.md)
diff --git a/docs/ja/development/adding_test_queries.md b/docs/ja/development/adding_test_queries.md
new file mode 120000
index 00000000000..def9c4077be
--- /dev/null
+++ b/docs/ja/development/adding_test_queries.md
@@ -0,0 +1 @@
+../../en/development/adding_test_queries.md
\ No newline at end of file
diff --git a/docs/ja/development/architecture.md b/docs/ja/development/architecture.md
index 8dc1d471007..7e5460bb9cf 100644
--- a/docs/ja/development/architecture.md
+++ b/docs/ja/development/architecture.md
@@ -200,4 +200,4 @@ ClickHouseでのレプリケーションは、テーブルごとに構成でき
 !!! note "注"
     ClickHouseクラスターは独立したシャードで構成され、各シャードはレプリカで構成されます。 クラスターは **弾性ではない** したがって、新しいシャードを追加した後、データはシャード間で自動的に再調整されません。 代わりに、クラスタ負荷は不均一に調整されることになっています。 この実装はより多くの制御を提供し、数十のノードなどの比較的小さなクラスタでもokです。 しかし、運用環境で使用している数百のノードを持つクラスターでは、このアプローチは重大な欠点になります。 を実行すべきである"と述べていテーブルエンジンで広がる、クラスターを動的に再現れる可能性がある地域分割のバランスとクラスターの動します。
 
-{## [元の記事](https://clickhouse.tech/docs/en/development/architecture/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/development/architecture/) ##}
diff --git a/docs/ja/development/browse-code.md b/docs/ja/development/browse-code.md
index 45eba084f4a..6539014eaf0 100644
--- a/docs/ja/development/browse-code.md
+++ b/docs/ja/development/browse-code.md
@@ -7,7 +7,7 @@ toc_title: "\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306E\u53C2\u7167"
 
 # ClickHouseのソースコードを参照 {#browse-clickhouse-source-code}
 
-以下を使用できます **Woboq** オンラインのコードブラウザをご利用 [ここに](https://clickhouse.tech/codebrowser/html_report/ClickHouse/src/index.html). このコードナビゲーションや意味のハイライト表示、検索インデックス. コードのスナップショットは随時更新中です。
+以下を使用できます **Woboq** オンラインのコードブラウザをご利用 [ここに](https://clickhouse.com/codebrowser/html_report/ClickHouse/src/index.html). このコードナビゲーションや意味のハイライト表示、検索インデックス. コードのスナップショットは随時更新中です。
 
 また、ソースを参照することもできます [GitHub](https://github.com/ClickHouse/ClickHouse) いつものように
 
diff --git a/docs/ja/development/build-cross-arm.md b/docs/ja/development/build-cross-arm.md
index a5fb0595d08..06df5f1936e 100644
--- a/docs/ja/development/build-cross-arm.md
+++ b/docs/ja/development/build-cross-arm.md
@@ -10,7 +10,7 @@ toc_title: "Aarch64\u7528\u306ELinux\u4E0A\u3067ClickHouse\u3092\u69CB\u7BC9\u30
 
 これは、Linuxマシンを使用してビルドする場合のためのものです `clickhouse` AARCH64CPUアーキテクチャを持つ別のLinuxマシン上で実行されるバイナリ。 この目的のために継続的インテグレーションをチェックを実行Linuxサーバー
 
-AARCH64のクロスビルドは [ビルド命令](build.md) 先について来い
+AARCH64のクロスビルドは [ビルド命令](../development/build.md) 先について来い
 
 # Clang-8をインストール {#install-clang-8}
 
diff --git a/docs/ja/development/build-cross-osx.md b/docs/ja/development/build-cross-osx.md
index 7444a384e05..9ca1070cf27 100644
--- a/docs/ja/development/build-cross-osx.md
+++ b/docs/ja/development/build-cross-osx.md
@@ -8,9 +8,9 @@ toc_title: "Mac OS X\u7528\u306ELinux\u4E0A\u3067ClickHouse\u3092\u69CB\u7BC9\u3
 
 # Mac OS X用のLinux上でClickHouseを構築する方法 {#how-to-build-clickhouse-on-linux-for-mac-os-x}
 
-これは、Linuxマシンを使用してビルドする場合のためのものです `clickhouse` これは、Linuxサーバー上で実行される継続的な統合チェックを目的としています。 Mac OS X上でClickHouseを直接ビルドする場合は、次の手順に進みます [別の命令](build-osx.md).
+これは、Linuxマシンを使用してビルドする場合のためのものです `clickhouse` これは、Linuxサーバー上で実行される継続的な統合チェックを目的としています。 Mac OS X上でClickHouseを直接ビルドする場合は、次の手順に進みます [別の命令](../development/build-osx.md).
 
-Mac OS X用のクロスビルドは [ビルド命令](build.md) 先について来い
+Mac OS X用のクロスビルドは [ビルド命令](../development/build.md) 先について来い
 
 # Clang-8をインストール {#install-clang-8}
 
diff --git a/docs/ja/development/build-osx.md b/docs/ja/development/build-osx.md
index 5d0af7d8f43..16557951b02 100644
--- a/docs/ja/development/build-osx.md
+++ b/docs/ja/development/build-osx.md
@@ -90,4 +90,4 @@ $ sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
 
 チェックの場合は、利用できる `ulimit -n` コマンド
 
-[元の記事](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/ja/development/build.md b/docs/ja/development/build.md
index 191fa665ccd..807b02714b4 100644
--- a/docs/ja/development/build.md
+++ b/docs/ja/development/build.md
@@ -127,4 +127,4 @@ $ cd ClickHouse
 $ ./release
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/development/build/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/development/build/) <!--hide-->
diff --git a/docs/ja/development/continuous-integration.md b/docs/ja/development/continuous-integration.md
new file mode 120000
index 00000000000..f68058a436e
--- /dev/null
+++ b/docs/ja/development/continuous-integration.md
@@ -0,0 +1 @@
+../../en/development/continuous-integration.md
\ No newline at end of file
diff --git a/docs/ja/development/developer-instruction.md b/docs/ja/development/developer-instruction.md
index d7e5217b3b6..4ac864d6414 100644
--- a/docs/ja/development/developer-instruction.md
+++ b/docs/ja/development/developer-instruction.md
@@ -236,11 +236,11 @@ KDevelopとQTCreatorは、ClickHouseを開発するためのIDEの他の優れ
 
 # コードの作成 {#writing-code}
 
-の説明ClickHouse建築で、できるだけ早く送ってくださhttps://clickhouse.tech/docs/en/開発/アーキテクチャ/
+の説明ClickHouse建築で、できるだけ早く送ってくださhttps://clickhouse.com/docs/en/開発/アーキテクチャ/
 
-コードのスタイルガイド:https://clickhouse.tech/docs/en/開発/スタイル/
+コードのスタイルガイド:https://clickhouse.com/docs/en/開発/スタイル/
 
-筆記試験：https://clickhouse.tech/docs/en/development/tests/
+筆記試験：https://clickhouse.com/docs/en/development/tests/
 
 タスクのリスト：https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
diff --git a/docs/ja/development/index.md b/docs/ja/development/index.md
index 4e14fd1a032..d69e9ea0d9e 100644
--- a/docs/ja/development/index.md
+++ b/docs/ja/development/index.md
@@ -9,4 +9,4 @@ toc_title: "\u96A0\u3057"
 
 # ClickHouse開発 {#clickhouse-development}
 
-[元の記事](https://clickhouse.tech/docs/en/development/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/development/) <!--hide-->
diff --git a/docs/ja/development/style.md b/docs/ja/development/style.md
index 596e29f4414..8c5451e4b63 100644
--- a/docs/ja/development/style.md
+++ b/docs/ja/development/style.md
@@ -830,4 +830,4 @@ function(
       size_t limit)
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/development/style/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/development/style/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/atomic.md b/docs/ja/engines/database-engines/atomic.md
index f019b94a00b..8f76d832764 100644
--- a/docs/ja/engines/database-engines/atomic.md
+++ b/docs/ja/engines/database-engines/atomic.md
@@ -14,4 +14,4 @@ It is supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHAN
 CREATE DATABASE test ENGINE = Atomic;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/database_engines/atomic/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/index.md b/docs/ja/engines/database-engines/index.md
index 1cdd1912b5f..9702430d1f3 100644
--- a/docs/ja/engines/database-engines/index.md
+++ b/docs/ja/engines/database-engines/index.md
@@ -18,4 +18,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 -   [怠け者](lazy.md)
 
-[元の記事](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/database_engines/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/lazy.md b/docs/ja/engines/database-engines/lazy.md
index 504907f6894..5086a2e000e 100644
--- a/docs/ja/engines/database-engines/lazy.md
+++ b/docs/ja/engines/database-engines/lazy.md
@@ -15,4 +15,4 @@ RAM内のテーブルのみを保持 `expiration_time_in_seconds` 最後のア
 
     CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
 
-[元の記事](https://clickhouse.tech/docs/en/database_engines/lazy/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/database_engines/lazy/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/materialized-mysql.md b/docs/ja/engines/database-engines/materialized-mysql.md
new file mode 120000
index 00000000000..02118b85df4
--- /dev/null
+++ b/docs/ja/engines/database-engines/materialized-mysql.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/materialized-mysql.md
\ No newline at end of file
diff --git a/docs/ja/engines/database-engines/materialized-postgresql.md b/docs/ja/engines/database-engines/materialized-postgresql.md
new file mode 120000
index 00000000000..e501cb344bb
--- /dev/null
+++ b/docs/ja/engines/database-engines/materialized-postgresql.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/materialized-postgresql.md
\ No newline at end of file
diff --git a/docs/ja/engines/database-engines/mysql.md b/docs/ja/engines/database-engines/mysql.md
index efb3893a385..506295af5da 100644
--- a/docs/ja/engines/database-engines/mysql.md
+++ b/docs/ja/engines/database-engines/mysql.md
@@ -132,4 +132,4 @@ SELECT * FROM mysql_db.mysql_table
 └────────┴───────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/database_engines/mysql/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/database_engines/mysql/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/postgresql.md b/docs/ja/engines/database-engines/postgresql.md
new file mode 120000
index 00000000000..9405ec25dc2
--- /dev/null
+++ b/docs/ja/engines/database-engines/postgresql.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/postgresql.md
\ No newline at end of file
diff --git a/docs/ja/engines/database-engines/replicated.md b/docs/ja/engines/database-engines/replicated.md
new file mode 120000
index 00000000000..065fadff7fd
--- /dev/null
+++ b/docs/ja/engines/database-engines/replicated.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/replicated.md
\ No newline at end of file
diff --git a/docs/ja/engines/database-engines/sqlite.md b/docs/ja/engines/database-engines/sqlite.md
new file mode 120000
index 00000000000..776734647c2
--- /dev/null
+++ b/docs/ja/engines/database-engines/sqlite.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/sqlite.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/index.md b/docs/ja/engines/table-engines/index.md
index e1a7b085a29..b904729f45b 100644
--- a/docs/ja/engines/table-engines/index.md
+++ b/docs/ja/engines/table-engines/index.md
@@ -82,4 +82,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 テーブル仮想列のいずれかと同じ名前の列を持つテーブルを作成すると、仮想列にアクセスできなくなります。 これはお勧めしません。 競合を避けるために、仮想列名には通常、アンダースコアが付けられます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/ExternalDistributed.md b/docs/ja/engines/table-engines/integrations/ExternalDistributed.md
new file mode 120000
index 00000000000..f843983ad4d
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/ExternalDistributed.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/ExternalDistributed.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ja/engines/table-engines/integrations/embedded-rocksdb.md
new file mode 120000
index 00000000000..a1eaf673ce1
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/embedded-rocksdb.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/embedded-rocksdb.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/hdfs.md b/docs/ja/engines/table-engines/integrations/hdfs.md
index 53e5cd3df34..b6042582890 100644
--- a/docs/ja/engines/table-engines/integrations/hdfs.md
+++ b/docs/ja/engines/table-engines/integrations/hdfs.md
@@ -120,4 +120,4 @@ CREARE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
 
 -   [仮想列](../index.md#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/hdfs/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/hdfs/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/jdbc.md b/docs/ja/engines/table-engines/integrations/jdbc.md
index d2ac8e9cbfe..6c5bb895ae7 100644
--- a/docs/ja/engines/table-engines/integrations/jdbc.md
+++ b/docs/ja/engines/table-engines/integrations/jdbc.md
@@ -93,4 +93,4 @@ FROM system.numbers
 
 -   [JDBCテーブル関数](../../../sql-reference/table-functions/jdbc.md).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/jdbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/jdbc/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/kafka.md b/docs/ja/engines/table-engines/integrations/kafka.md
index 08e3e951263..e54b7b4252c 100644
--- a/docs/ja/engines/table-engines/integrations/kafka.md
+++ b/docs/ja/engines/table-engines/integrations/kafka.md
@@ -177,4 +177,4 @@ GraphiteMergeTreeと同様に、KafkaエンジンはClickHouse設定ファイル
 
 -   [仮想列](../index.md#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/kafka/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/kafka/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/materialized-postgresql.md b/docs/ja/engines/table-engines/integrations/materialized-postgresql.md
new file mode 120000
index 00000000000..c8dcba4bc19
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/materialized-postgresql.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/materialized-postgresql.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/mongodb.md b/docs/ja/engines/table-engines/integrations/mongodb.md
new file mode 120000
index 00000000000..fe2f6b256ce
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/mongodb.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/mongodb.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/mysql.md b/docs/ja/engines/table-engines/integrations/mysql.md
index 6b92c8a36ce..1f08486be7d 100644
--- a/docs/ja/engines/table-engines/integrations/mysql.md
+++ b/docs/ja/engines/table-engines/integrations/mysql.md
@@ -102,4 +102,4 @@ SELECT * FROM mysql_table
 -   [その ‘mysql’ テーブル関数](../../../sql-reference/table-functions/mysql.md)
 -   [外部辞書のソースとしてMySQLを使用する](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/mysql/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/mysql/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/odbc.md b/docs/ja/engines/table-engines/integrations/odbc.md
index 78709e65e09..7a50f5d6fc0 100644
--- a/docs/ja/engines/table-engines/integrations/odbc.md
+++ b/docs/ja/engines/table-engines/integrations/odbc.md
@@ -129,4 +129,4 @@ SELECT * FROM odbc_t
 -   [ODBC外部辞書](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBCテーブル関数](../../../sql-reference/table-functions/odbc.md)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/odbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/odbc/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/postgresql.md b/docs/ja/engines/table-engines/integrations/postgresql.md
new file mode 120000
index 00000000000..af3fc116c02
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/postgresql.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/postgresql.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/rabbitmq.md b/docs/ja/engines/table-engines/integrations/rabbitmq.md
new file mode 120000
index 00000000000..938c968c15b
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/rabbitmq.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/rabbitmq.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/s3.md b/docs/ja/engines/table-engines/integrations/s3.md
new file mode 120000
index 00000000000..68fc96be8e0
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/s3.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/s3.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/sqlite.md b/docs/ja/engines/table-engines/integrations/sqlite.md
new file mode 120000
index 00000000000..56d0a490f52
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/sqlite.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/sqlite.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/log-family/index.md b/docs/ja/engines/table-engines/log-family/index.md
index 91bbdb0db47..c5729481092 100644
--- a/docs/ja/engines/table-engines/log-family/index.md
+++ b/docs/ja/engines/table-engines/log-family/index.md
@@ -44,4 +44,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 その `Log` と `StripeLog` エンジンの支援並列データです。 読み込み時にデータClickHouse使複数のスレッド）。 各スレッドプロセス別データブロックです。 その `Log` エンジンは、テーブルの各列に個別のファイルを使用します。 `StripeLog` すべてのデータファイルです。 その結果、 `StripeLog` エンジンは、オペレーティングシス `Log` エンジンはデータを読むとき高性能を提供する。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/log_family/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/log-family/log.md b/docs/ja/engines/table-engines/log-family/log.md
index 904c601257f..a609d111ace 100644
--- a/docs/ja/engines/table-engines/log-family/log.md
+++ b/docs/ja/engines/table-engines/log-family/log.md
@@ -13,4 +13,4 @@ toc_title: "\u30ED\u30B0"
 同時データアクセスの場合、読み取り操作は同時に実行できますが、書き込み操作は読み取りをブロックします。
 ログエンジ 同様に、テーブルへの書き込みが失敗した場合、テーブルは壊れ、そこから読み込むとエラーが返されます。 ログエンジンは、一時データ、書き込み一度テーブル、およびテストまたはデモの目的に適しています。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/log/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/log/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/log-family/stripelog.md b/docs/ja/engines/table-engines/log-family/stripelog.md
index bbecd50bbea..5083115f127 100644
--- a/docs/ja/engines/table-engines/log-family/stripelog.md
+++ b/docs/ja/engines/table-engines/log-family/stripelog.md
@@ -92,4 +92,4 @@ SELECT * FROM stripe_log_table ORDER BY timestamp
 └─────────────────────┴──────────────┴────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/stripelog/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/log-family/tinylog.md b/docs/ja/engines/table-engines/log-family/tinylog.md
index 1bee48fc53e..d38d02514fc 100644
--- a/docs/ja/engines/table-engines/log-family/tinylog.md
+++ b/docs/ja/engines/table-engines/log-family/tinylog.md
@@ -13,4 +13,4 @@ toc_title: TinyLog
 
 クエリは単一のストリームで実行されます。 言い換えれば、このエンジンは比較的小さなテーブル（最大約1,000,000行）を対象としています。 小さなテーブルが多い場合は、このテーブルエンジンを使用するのが理にかなっています。 [ログ](log.md) エンジン(開く必要の少ないファイル)。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/tinylog/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/aggregatingmergetree.md
index d304ec2802d..04c99a1f2dd 100644
--- a/docs/ja/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -102,4 +102,4 @@ GROUP BY StartDate
 ORDER BY StartDate;
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/collapsingmergetree.md
index e26172c1fd5..e2506da146d 100644
--- a/docs/ja/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -303,4 +303,4 @@ select * FROM UAct
 └─────────────────────┴───────────┴──────────┴──────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/ja/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 30cd3c72af5..047595984ba 100644
--- a/docs/ja/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/ja/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -124,4 +124,4 @@ drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 detached
 
 ClickHouseでは、パーティションの削除、テーブル間のコピー、またはバックアップの作成などの操作を実行できます。 セクションのすべての操作の一覧を参照してください [パーティションとパーツの操作](../../../sql-reference/statements/alter.md#alter_manipulations-with-partitions).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/ja/engines/table-engines/mergetree-family/graphitemergetree.md
index 18ab9390f0f..aa2cacbcdaa 100644
--- a/docs/ja/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -171,4 +171,4 @@ default
 </graphite_rollup>
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/mergetree.md b/docs/ja/engines/table-engines/mergetree-family/mergetree.md
index f93d5ea4a64..83ea6866178 100644
--- a/docs/ja/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/mergetree.md
@@ -651,4 +651,4 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 バックグラウンドマージと突然変異の完了後、古い部分は一定時間後にのみ削除されます (`old_parts_lifetime`).
 この間、他のボリュームまたはディスクには移動されません。 したがって、部品が最終的に除去されるまで、それらは占有されたディスク領域の評価のために考慮される。
 
-[元の記事](https://clickhouse.tech/docs/ru/operations/table_engines/mergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/ru/operations/table_engines/mergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/replacingmergetree.md
index c3df9559415..dcc4c6b1785 100644
--- a/docs/ja/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -66,4 +66,4 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 </details>
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/replication.md b/docs/ja/engines/table-engines/mergetree-family/replication.md
index 4e0d2bc0831..195c2453467 100644
--- a/docs/ja/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ja/engines/table-engines/mergetree-family/replication.md
@@ -215,4 +215,4 @@ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 
 ZooKeeperのデータが紛失または破損している場合は、上記のように再生されていないテーブルに移動することでデータを保存できます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/summingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/summingmergetree.md
index 356b10037d2..988dd62ca1e 100644
--- a/docs/ja/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/summingmergetree.md
@@ -138,4 +138,4 @@ Columnが主キーになく、集計されていない場合は、既存の値
 
 入れ子になったデータ構造の場合、合計のために列のタプルにその列を指定する必要はありません。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index 2d323629c4e..7b542199cdc 100644
--- a/docs/ja/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -236,4 +236,4 @@ SELECT * FROM UAct FINAL
 
 これは、データを選択する非常に非効率的な方法です。 大きなテーブルには使用しないでください。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/buffer.md b/docs/ja/engines/table-engines/special/buffer.md
index deb38c04692..c93ea279885 100644
--- a/docs/ja/engines/table-engines/special/buffer.md
+++ b/docs/ja/engines/table-engines/special/buffer.md
@@ -68,4 +68,4 @@ DROP TABLEまたはDETACH TABLEを使用してサーバーを停止すると、
 
 バッファテーブルであっても、一度にデータ行を挿入することは意味がありません。 これにより、毎秒数千行の速度が生成されますが、より大きなデータブロックを挿入すると、毎秒百万行を超える速度が生成されます（セクションを参照 “Performance”).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/buffer/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/dictionary.md b/docs/ja/engines/table-engines/special/dictionary.md
index 9de7c7b78db..09d42aaa7df 100644
--- a/docs/ja/engines/table-engines/special/dictionary.md
+++ b/docs/ja/engines/table-engines/special/dictionary.md
@@ -94,4 +94,4 @@ select * from products limit 1;
 └───────────────┴─────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/dictionary/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/dictionary/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/distributed.md b/docs/ja/engines/table-engines/special/distributed.md
index 87d8c1bc6d5..7d347b3eeb2 100644
--- a/docs/ja/engines/table-engines/special/distributed.md
+++ b/docs/ja/engines/table-engines/special/distributed.md
@@ -149,4 +149,4 @@ Max_parallel_replicasオプションを有効にすると、単一のシャー
 
 -   [仮想列](index.md#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/distributed/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/external-data.md b/docs/ja/engines/table-engines/special/external-data.md
index ffa726be923..eac722c92fb 100644
--- a/docs/ja/engines/table-engines/special/external-data.md
+++ b/docs/ja/engines/table-engines/special/external-data.md
@@ -65,4 +65,4 @@ $ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+coun
 
 分散クエリ処理では、一時テーブルがすべてのリモートサーバーに送信されます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/external_data/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/file.md b/docs/ja/engines/table-engines/special/file.md
index 8427c369c2a..b51468407ef 100644
--- a/docs/ja/engines/table-engines/special/file.md
+++ b/docs/ja/engines/table-engines/special/file.md
@@ -87,4 +87,4 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
     -   指数
     -   複製
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/file/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/file/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/generate.md b/docs/ja/engines/table-engines/special/generate.md
index 58005ed2717..54c209aaf53 100644
--- a/docs/ja/engines/table-engines/special/generate.md
+++ b/docs/ja/engines/table-engines/special/generate.md
@@ -58,4 +58,4 @@ SELECT * FROM generate_engine_table LIMIT 3
     -   指数
     -   複製
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/generate/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/generate/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/join.md b/docs/ja/engines/table-engines/special/join.md
index bf96f64e7fc..300a76297c8 100644
--- a/docs/ja/engines/table-engines/special/join.md
+++ b/docs/ja/engines/table-engines/special/join.md
@@ -108,4 +108,4 @@ SELECT joinGet('id_val_join', 'val', toUInt32(1))
 
 場合はサーバが再起動誤り、データブロックのディスクがいます。 この場合、破損したデータを含むファイルを手動で削除する必要がある場合があります。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/join/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/join/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/materializedview.md b/docs/ja/engines/table-engines/special/materializedview.md
index 64b13600bbb..6cfea4249b6 100644
--- a/docs/ja/engines/table-engines/special/materializedview.md
+++ b/docs/ja/engines/table-engines/special/materializedview.md
@@ -9,4 +9,4 @@ toc_title: "\u30DE\u30C6\u30EA\u30A2\u30E9\u30A4\u30BA\u30C9\u30D3\u30E5\u30FC"
 
 マテリアライズドビューの実装に使用されます(詳細については、 [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query)). データを格納するために、ビューの作成時に指定された別のエンジンを使用します。 読み込み時にテーブルから、使用してこのエンジンです。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/materializedview/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/memory.md b/docs/ja/engines/table-engines/special/memory.md
index c2b50553023..a09d6658463 100644
--- a/docs/ja/engines/table-engines/special/memory.md
+++ b/docs/ja/engines/table-engines/special/memory.md
@@ -16,4 +16,4 @@ toc_title: "\u30E1\u30E2\u30EA"
 
 メモリーのエンジンを使用するシステムの一時テーブルの外部クエリデータの項をご参照ください “External data for processing a query”グローバルでの実装については、セクションを参照 “IN operators”).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/memory/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/merge.md b/docs/ja/engines/table-engines/special/merge.md
index 0a22b71964e..10248f98060 100644
--- a/docs/ja/engines/table-engines/special/merge.md
+++ b/docs/ja/engines/table-engines/special/merge.md
@@ -67,4 +67,4 @@ FROM WatchLog
 
 -   [仮想列](index.md#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/merge/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/null.md b/docs/ja/engines/table-engines/special/null.md
index 588500cdcde..328591e6af9 100644
--- a/docs/ja/engines/table-engines/special/null.md
+++ b/docs/ja/engines/table-engines/special/null.md
@@ -11,4 +11,4 @@ Nullテーブルに書き込む場合、データは無視されます。 Null
 
 ただし、Nullテーブルにマテリアライズドビューを作成できます。 したがって、テーブルに書き込まれたデータはビュー内で終了します。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/null/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/null/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/set.md b/docs/ja/engines/table-engines/special/set.md
index 2b6cd0a2a9e..5b9a2f0adcc 100644
--- a/docs/ja/engines/table-engines/special/set.md
+++ b/docs/ja/engines/table-engines/special/set.md
@@ -16,4 +16,4 @@ INSERTを使用すると、テーブルにデータを挿入できます。 新
 
 ラサーバを再起動し、ブロックのデータのディスクが失われることも想定されます。 後者の場合、破損したデータを含むファイルを手動で削除する必要がある場合があります。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/set/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/set/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/url.md b/docs/ja/engines/table-engines/special/url.md
index bf920d23be8..ac86f2480db 100644
--- a/docs/ja/engines/table-engines/special/url.md
+++ b/docs/ja/engines/table-engines/special/url.md
@@ -79,4 +79,4 @@ SELECT * FROM url_engine_table
     -   インデックス。
     -   複製。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/url/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/url/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/view.md b/docs/ja/engines/table-engines/special/view.md
index 270246bedb9..3ac429b812b 100644
--- a/docs/ja/engines/table-engines/special/view.md
+++ b/docs/ja/engines/table-engines/special/view.md
@@ -9,4 +9,4 @@ toc_title: "\u8868\u793A"
 
 ビューの実装に使用されます(詳細については、 `CREATE VIEW query`). これはデータを格納せず、指定されたデータのみを格納します `SELECT` クエリ。 テーブルから読み取るときに、このクエリが実行されます（クエリから不要な列がすべて削除されます）。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/view/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/view/) <!--hide-->
diff --git a/docs/ja/faq/general.md b/docs/ja/faq/general.md
index e7e3f9328f4..5807ef980bc 100644
--- a/docs/ja/faq/general.md
+++ b/docs/ja/faq/general.md
@@ -57,4 +57,4 @@ $ clickhouse-client --query "SELECT * from table" --format FormatName > result.t
 
 見る [clickhouse-クライアント](../interfaces/cli.md).
 
-{## [元の記事](https://clickhouse.tech/docs/en/faq/general/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/faq/general/) ##}
diff --git a/docs/ja/faq/general/columnar-database.md b/docs/ja/faq/general/columnar-database.md
new file mode 120000
index 00000000000..b7557b62010
--- /dev/null
+++ b/docs/ja/faq/general/columnar-database.md
@@ -0,0 +1 @@
+../../../en/faq/general/columnar-database.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/dbms-naming.md b/docs/ja/faq/general/dbms-naming.md
new file mode 120000
index 00000000000..0df856af0ca
--- /dev/null
+++ b/docs/ja/faq/general/dbms-naming.md
@@ -0,0 +1 @@
+../../../en/faq/general/dbms-naming.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/index.md b/docs/ja/faq/general/index.md
new file mode 120000
index 00000000000..5ff33ccb360
--- /dev/null
+++ b/docs/ja/faq/general/index.md
@@ -0,0 +1 @@
+../../../en/faq/general/index.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/mapreduce.md b/docs/ja/faq/general/mapreduce.md
new file mode 120000
index 00000000000..49b79ad4841
--- /dev/null
+++ b/docs/ja/faq/general/mapreduce.md
@@ -0,0 +1 @@
+../../../en/faq/general/mapreduce.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/ne-tormozit.md b/docs/ja/faq/general/ne-tormozit.md
new file mode 120000
index 00000000000..a8273c56b2d
--- /dev/null
+++ b/docs/ja/faq/general/ne-tormozit.md
@@ -0,0 +1 @@
+../../../en/faq/general/ne-tormozit.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/olap.md b/docs/ja/faq/general/olap.md
new file mode 120000
index 00000000000..99caa8218c8
--- /dev/null
+++ b/docs/ja/faq/general/olap.md
@@ -0,0 +1 @@
+../../../en/faq/general/olap.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/who-is-using-clickhouse.md b/docs/ja/faq/general/who-is-using-clickhouse.md
new file mode 120000
index 00000000000..b4e9782df7e
--- /dev/null
+++ b/docs/ja/faq/general/who-is-using-clickhouse.md
@@ -0,0 +1 @@
+../../../en/faq/general/who-is-using-clickhouse.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/why-clickhouse-is-so-fast.md b/docs/ja/faq/general/why-clickhouse-is-so-fast.md
new file mode 120000
index 00000000000..77b8c3fcd68
--- /dev/null
+++ b/docs/ja/faq/general/why-clickhouse-is-so-fast.md
@@ -0,0 +1 @@
+../../../en/faq/general/why-clickhouse-is-so-fast.md
\ No newline at end of file
diff --git a/docs/ja/faq/integration/file-export.md b/docs/ja/faq/integration/file-export.md
new file mode 120000
index 00000000000..19a5c67148b
--- /dev/null
+++ b/docs/ja/faq/integration/file-export.md
@@ -0,0 +1 @@
+../../../en/faq/integration/file-export.md
\ No newline at end of file
diff --git a/docs/ja/faq/integration/index.md b/docs/ja/faq/integration/index.md
new file mode 120000
index 00000000000..8323d6218a3
--- /dev/null
+++ b/docs/ja/faq/integration/index.md
@@ -0,0 +1 @@
+../../../en/faq/integration/index.md
\ No newline at end of file
diff --git a/docs/ja/faq/integration/json-import.md b/docs/ja/faq/integration/json-import.md
new file mode 120000
index 00000000000..e90f4386602
--- /dev/null
+++ b/docs/ja/faq/integration/json-import.md
@@ -0,0 +1 @@
+../../../en/faq/integration/json-import.md
\ No newline at end of file
diff --git a/docs/ja/faq/integration/oracle-odbc.md b/docs/ja/faq/integration/oracle-odbc.md
new file mode 120000
index 00000000000..47fe6189ee3
--- /dev/null
+++ b/docs/ja/faq/integration/oracle-odbc.md
@@ -0,0 +1 @@
+../../../en/faq/integration/oracle-odbc.md
\ No newline at end of file
diff --git a/docs/ja/faq/operations/delete-old-data.md b/docs/ja/faq/operations/delete-old-data.md
new file mode 120000
index 00000000000..aef26953cd3
--- /dev/null
+++ b/docs/ja/faq/operations/delete-old-data.md
@@ -0,0 +1 @@
+../../../en/faq/operations/delete-old-data.md
\ No newline at end of file
diff --git a/docs/ja/faq/operations/index.md b/docs/ja/faq/operations/index.md
new file mode 120000
index 00000000000..fd141164fdc
--- /dev/null
+++ b/docs/ja/faq/operations/index.md
@@ -0,0 +1 @@
+../../../en/faq/operations/index.md
\ No newline at end of file
diff --git a/docs/ja/faq/operations/production.md b/docs/ja/faq/operations/production.md
new file mode 120000
index 00000000000..8203988975c
--- /dev/null
+++ b/docs/ja/faq/operations/production.md
@@ -0,0 +1 @@
+../../../en/faq/operations/production.md
\ No newline at end of file
diff --git a/docs/ja/faq/use-cases/index.md b/docs/ja/faq/use-cases/index.md
new file mode 120000
index 00000000000..cc545acb000
--- /dev/null
+++ b/docs/ja/faq/use-cases/index.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/index.md
\ No newline at end of file
diff --git a/docs/ja/faq/use-cases/key-value.md b/docs/ja/faq/use-cases/key-value.md
new file mode 120000
index 00000000000..63140458d12
--- /dev/null
+++ b/docs/ja/faq/use-cases/key-value.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/key-value.md
\ No newline at end of file
diff --git a/docs/ja/faq/use-cases/time-series.md b/docs/ja/faq/use-cases/time-series.md
new file mode 120000
index 00000000000..55cbcfc243f
--- /dev/null
+++ b/docs/ja/faq/use-cases/time-series.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/time-series.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/amplab-benchmark.md b/docs/ja/getting-started/example-datasets/amplab-benchmark.md
index a3f66e1a0de..23d287d8354 100644
--- a/docs/ja/getting-started/example-datasets/amplab-benchmark.md
+++ b/docs/ja/getting-started/example-datasets/amplab-benchmark.md
@@ -126,4 +126,4 @@ ORDER BY totalRevenue DESC
 LIMIT 1
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/brown-benchmark.md b/docs/ja/getting-started/example-datasets/brown-benchmark.md
new file mode 120000
index 00000000000..1f6e2be14fa
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/brown-benchmark.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/brown-benchmark.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/cell-towers.md b/docs/ja/getting-started/example-datasets/cell-towers.md
new file mode 120000
index 00000000000..899946803d1
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/cell-towers.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/cell-towers.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/criteo.md b/docs/ja/getting-started/example-datasets/criteo.md
index 7690b7d966d..8b85ec11313 100644
--- a/docs/ja/getting-started/example-datasets/criteo.md
+++ b/docs/ja/getting-started/example-datasets/criteo.md
@@ -76,4 +76,4 @@ INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int
 DROP TABLE criteo_log;
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/github-events.md b/docs/ja/getting-started/example-datasets/github-events.md
new file mode 120000
index 00000000000..c9649c0a61f
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/github-events.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/github-events.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/index.md b/docs/ja/getting-started/example-datasets/index.md
index 302d062eab9..f85cead6582 100644
--- a/docs/ja/getting-started/example-datasets/index.md
+++ b/docs/ja/getting-started/example-datasets/index.md
@@ -17,4 +17,4 @@ toc_title: "イントロダクション"
 -   [ニューヨークタクシ](nyc-taxi.md)
 -   [オンタイム](ontime.md)
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/menus.md b/docs/ja/getting-started/example-datasets/menus.md
new file mode 120000
index 00000000000..d82b3198962
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/menus.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/menus.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/nyc-taxi.md b/docs/ja/getting-started/example-datasets/nyc-taxi.md
index a717b64b2b2..2f7cd6a4e44 100644
--- a/docs/ja/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/ja/getting-started/example-datasets/nyc-taxi.md
@@ -388,4 +388,4 @@ Q4:0.072秒
 | 3      | 0.212 | 0.438 | 0.733 | 1.241 |
 | 140    | 0.028 | 0.043 | 0.051 | 0.072 |
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/ontime.md b/docs/ja/getting-started/example-datasets/ontime.md
index d12d8a36069..7968bc87209 100644
--- a/docs/ja/getting-started/example-datasets/ontime.md
+++ b/docs/ja/getting-started/example-datasets/ontime.md
@@ -408,4 +408,4 @@ LIMIT 10;
 -   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
 -   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/opensky.md b/docs/ja/getting-started/example-datasets/opensky.md
new file mode 120000
index 00000000000..4305c0cac3c
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/opensky.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/opensky.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/recipes.md b/docs/ja/getting-started/example-datasets/recipes.md
new file mode 120000
index 00000000000..4fdaa5de5b8
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/recipes.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/recipes.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/star-schema.md b/docs/ja/getting-started/example-datasets/star-schema.md
index a01074ba50a..b8aa38c737f 100644
--- a/docs/ja/getting-started/example-datasets/star-schema.md
+++ b/docs/ja/getting-started/example-datasets/star-schema.md
@@ -365,4 +365,4 @@ ORDER BY
     P_BRAND ASC;
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/uk-price-paid.md b/docs/ja/getting-started/example-datasets/uk-price-paid.md
new file mode 120000
index 00000000000..e48bcf21d7b
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/uk-price-paid.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/uk-price-paid.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/wikistat.md b/docs/ja/getting-started/example-datasets/wikistat.md
index 50d71faf963..0ef80455b66 100644
--- a/docs/ja/getting-started/example-datasets/wikistat.md
+++ b/docs/ja/getting-started/example-datasets/wikistat.md
@@ -30,4 +30,4 @@ $ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/page
 $ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/ja/getting-started/index.md b/docs/ja/getting-started/index.md
index fffa07f2a2c..7c3592318ae 100644
--- a/docs/ja/getting-started/index.md
+++ b/docs/ja/getting-started/index.md
@@ -13,4 +13,4 @@ toc_title: hidden
 -   [詳細なチュートリアル](../getting-started/tutorial.md)
 -   [データセット例を用いて試す](../getting-started/example-datasets/ontime.md)
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/) <!--hide-->
diff --git a/docs/ja/getting-started/install.md b/docs/ja/getting-started/install.md
index 81df2df7da7..189cd5119b4 100644
--- a/docs/ja/getting-started/install.md
+++ b/docs/ja/getting-started/install.md
@@ -186,6 +186,6 @@ SELECT 1
 
 **おめでとうございます！システムが動きました！**
 
-動作確認を続けるには、テストデータセットをダウンロードするか、[チュートリアル](https://clickhouse.tech/tutorial.html)を参照してください。
+動作確認を続けるには、テストデータセットをダウンロードするか、[チュートリアル](https://clickhouse.com/tutorial.html)を参照してください。
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/install/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/install/) <!--hide-->
diff --git a/docs/ja/getting-started/tutorial.md b/docs/ja/getting-started/tutorial.md
index 82459944015..1f7230a6b6a 100644
--- a/docs/ja/getting-started/tutorial.md
+++ b/docs/ja/getting-started/tutorial.md
@@ -687,4 +687,4 @@ INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 他のレプリカはデータを同期させ、再びアクティブになると整合性を修復します。
 この方法では、最近挿入されたデータが失われる可能性が低いことに注意してください。
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/ja/guides/apply-catboost-model.md b/docs/ja/guides/apply-catboost-model.md
index e3adb19c6c7..3fb90d90619 100644
--- a/docs/ja/guides/apply-catboost-model.md
+++ b/docs/ja/guides/apply-catboost-model.md
@@ -236,4 +236,4 @@ FROM
 !!! note "注"
     詳細について [avg()](../sql-reference/aggregate-functions/reference.md#agg_function-avg) と [ログ()](../sql-reference/functions/math-functions.md) 機能。
 
-[元の記事](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/ja/guides/index.md b/docs/ja/guides/index.md
index 585fe7fa983..97d6d4f9ad7 100644
--- a/docs/ja/guides/index.md
+++ b/docs/ja/guides/index.md
@@ -13,4 +13,4 @@ ClickHouseを使用してさまざまなタスクを解決するのに役立つ
 -   [簡単なクラスター設定のチュートリアル](../getting-started/tutorial.md)
 -   [ClickHouseでのCatBoostモデルの適用](apply-catboost-model.md)
 
-[元の記事](https://clickhouse.tech/docs/en/guides/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/guides/) <!--hide-->
diff --git a/docs/ja/index.md b/docs/ja/index.md
index 3c5117b3a2c..b45bb2ba385 100644
--- a/docs/ja/index.md
+++ b/docs/ja/index.md
@@ -94,4 +94,4 @@ OLAPシナリオは、他の一般的なシナリオ（OLTPやKey-Valueアクセ
 
 CPU効率のために、クエリ言語は宣言型（SQLまたはMDX）、または少なくともベクトル（J、K）でなければなりません。 クエリには、最適化を可能にする暗黙的なループのみを含める必要があります。
 
-{## [元の記事](https://clickhouse.tech/docs/en/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/) ##}
diff --git a/docs/ja/interfaces/cli.md b/docs/ja/interfaces/cli.md
index 7037fcf5512..2cc9f6246bb 100644
--- a/docs/ja/interfaces/cli.md
+++ b/docs/ja/interfaces/cli.md
@@ -146,4 +146,4 @@ $ clickhouse-client --param_tuple_in_tuple="(10, ('dt', 10))" -q "SELECT * FROM
 </config>
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/cli/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/cli/) <!--hide-->
diff --git a/docs/ja/interfaces/cpp.md b/docs/ja/interfaces/cpp.md
index caec195e85d..468b2a90fc0 100644
--- a/docs/ja/interfaces/cpp.md
+++ b/docs/ja/interfaces/cpp.md
@@ -9,4 +9,4 @@ toc_title: "C++\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30E9\u30A4"
 
 のREADMEを参照してください [クリックハウス-cpp](https://github.com/ClickHouse/clickhouse-cpp) リポジトリ。
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/cpp/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/cpp/) <!--hide-->
diff --git a/docs/ja/interfaces/formats.md b/docs/ja/interfaces/formats.md
index 35cfd4f67fb..bebfd438c1e 100644
--- a/docs/ja/interfaces/formats.md
+++ b/docs/ja/interfaces/formats.md
@@ -26,7 +26,6 @@ aの結果 `SELECT`、および実行する `INSERT`ファイルバックアッ
 | [カスタム区切り](#format-customseparated)                       | ✔    | ✔    |
 | [値](#data-format-values)                                       | ✔    | ✔    |
 | [垂直](#vertical)                                               | ✗    | ✔    |
-| [VerticalRaw](#verticalraw)                                     | ✗    | ✔    |
 | [JSON](#json)                                                   | ✗    | ✔    |
 | [JSONCompact](#jsoncompact)                                     | ✗    | ✔    |
 | [JSONEachRow](#jsoneachrow)                                     | ✔    | ✔    |
@@ -819,10 +818,6 @@ test: string with 'quotes' and      with some special
 
 この形式は、クエリ結果の出力にのみ適していますが、解析(テーブルに挿入するデータの取得)には適していません。
 
-## VerticalRaw {#verticalraw}
-
-に類似した [垂直](#vertical) しかし、エスケープ無効で。 この形式は、クエリ結果の出力にのみ適しており、解析（データの受信とテーブルへの挿入）には適していません。
-
 ## XML {#xml}
 
 XML形式は出力にのみ適しており、解析には適していません。 例:
@@ -1210,4 +1205,4 @@ e.g. `schemafile.proto:MessageType`.
 -解析エラーの場合 `JSONEachRow` 新しい行(またはEOF)まですべてのデータをスキップします。 `\n` エラーを正しく数える。
 - `Template` と `CustomSeparated` 最後の列の後にdelimiterを使用し、行の間にdelimiterを使用すると、次の行の先頭を見つけることができます。
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/formats/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/formats/) <!--hide-->
diff --git a/docs/ja/interfaces/http.md b/docs/ja/interfaces/http.md
index 84850c159a4..4ac9cd9e472 100644
--- a/docs/ja/interfaces/http.md
+++ b/docs/ja/interfaces/http.md
@@ -614,4 +614,4 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 * Connection #0 to host localhost left intact
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/http_interface/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/http_interface/) <!--hide-->
diff --git a/docs/ja/interfaces/index.md b/docs/ja/interfaces/index.md
index bf93b4f8f66..860742d8290 100644
--- a/docs/ja/interfaces/index.md
+++ b/docs/ja/interfaces/index.md
@@ -26,4 +26,4 @@ ClickHouseを操作するための幅広いサードパーティのライブラ
 -   [統合](third-party/integrations.md)
 -   [視界面](third-party/gui.md)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/) <!--hide-->
diff --git a/docs/ja/interfaces/jdbc.md b/docs/ja/interfaces/jdbc.md
index 6dc8f36c58d..077c4a13a17 100644
--- a/docs/ja/interfaces/jdbc.md
+++ b/docs/ja/interfaces/jdbc.md
@@ -12,4 +12,4 @@ toc_title: "JDBC\u30C9\u30E9\u30A4\u30D0"
     -   [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
     -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/jdbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/jdbc/) <!--hide-->
diff --git a/docs/ja/interfaces/mysql.md b/docs/ja/interfaces/mysql.md
index 21a3f0fb98a..30eb3bc7618 100644
--- a/docs/ja/interfaces/mysql.md
+++ b/docs/ja/interfaces/mysql.md
@@ -46,4 +46,4 @@ mysql>
 
 -   一部のデータ型は文字列として送信されます
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/mysql/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/mysql/) <!--hide-->
diff --git a/docs/ja/interfaces/odbc.md b/docs/ja/interfaces/odbc.md
index a40047eb04f..570d53df791 100644
--- a/docs/ja/interfaces/odbc.md
+++ b/docs/ja/interfaces/odbc.md
@@ -9,4 +9,4 @@ toc_title: "ODBC\u30C9\u30E9\u30A4\u30D0"
 
 -   [公式ドライバー](https://github.com/ClickHouse/clickhouse-odbc).
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/odbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/odbc/) <!--hide-->
diff --git a/docs/ja/interfaces/tcp.md b/docs/ja/interfaces/tcp.md
index 6f7df838be6..549a031bf6b 100644
--- a/docs/ja/interfaces/tcp.md
+++ b/docs/ja/interfaces/tcp.md
@@ -9,4 +9,4 @@ toc_title: "\u30CD\u30A4\u30C6\u30A3\u30D6\u30A4)"
 
 ネイティブプロトコルは [コマンド行クライアント](cli.md)、分散クエリ処理中のサーバー間通信、および他のC++プログラムでも使用できます。 残念ながら、ネイティブClickHouseプロトコルは形式的仕様記述を利用できるバーからClickHouseソースコードを開始 [この辺り](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client) や傍受し、分析すTCPます。
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/tcp/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/tcp/) <!--hide-->
diff --git a/docs/ja/interfaces/third-party/client-libraries.md b/docs/ja/interfaces/third-party/client-libraries.md
index c7bd368bc4c..d7766687f23 100644
--- a/docs/ja/interfaces/third-party/client-libraries.md
+++ b/docs/ja/interfaces/third-party/client-libraries.md
@@ -59,4 +59,4 @@ toc_title: "\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8"
 -   Nim
     -   [ニム-クリックハウス](https://github.com/leonardoce/nim-clickhouse)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/ja/interfaces/third-party/gui.md b/docs/ja/interfaces/third-party/gui.md
index 13b178984d3..d10bec7af5f 100644
--- a/docs/ja/interfaces/third-party/gui.md
+++ b/docs/ja/interfaces/third-party/gui.md
@@ -153,4 +153,4 @@ toc_title: "\u8996\u754C\u9762"
 
 [LookerでClickHouseを設定する方法。](https://docs.looker.com/setup-and-management/database-config/clickhouse)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/ja/interfaces/third-party/integrations.md b/docs/ja/interfaces/third-party/integrations.md
index 1cf996a3011..7f3b2dc9bbc 100644
--- a/docs/ja/interfaces/third-party/integrations.md
+++ b/docs/ja/interfaces/third-party/integrations.md
@@ -107,4 +107,4 @@ toc_title: "\u7D71\u5408"
     -   [GraphQL](https://github.com/graphql)
         -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/third-party/integrations/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/ja/interfaces/third-party/proxy.md b/docs/ja/interfaces/third-party/proxy.md
index e817b743787..5bd5b042d7b 100644
--- a/docs/ja/interfaces/third-party/proxy.md
+++ b/docs/ja/interfaces/third-party/proxy.md
@@ -43,4 +43,4 @@ Goで実装。
 
 Goで実装。
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/third-party/proxy/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/ja/introduction/adopters.md b/docs/ja/introduction/adopters.md
index a1a89f6795f..bc646fa77c8 100644
--- a/docs/ja/introduction/adopters.md
+++ b/docs/ja/introduction/adopters.md
@@ -37,7 +37,7 @@ toc_title: "\u30A2\u30C0\u30D7\u30BF\u30FC"
 | <a href="https://www.exness.com" class="favicon">Exness</a>                                    | 取引                         | 指標、ロギング       | —                                                 | —                                                                        | [ロシア語で話す,May2019](https://youtu.be/_rpU-TvSfZ8?t=3215)                                                                                                                                                     |
 | <a href="https://geniee.co.jp" class="favicon">魔神</a>                                        | 広告ネットワーク             | 主な製品             | —                                                 | —                                                                        | [ブログ投稿日本語,July2017](https://tech.geniee.co.jp/entry/2017/07/20/160100)                                                                                                                                    |
 | <a href="https://www.huya.com/" class="favicon">HUYA</a>                                       | ビデオストリーミング         | 分析                 | —                                                 | —                                                                        | [中国語でのスライド,October2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf)                                       |
-| <a href="https://www.idealista.com" class="favicon">イデアリスタ</a>                           | 不動産                       | 分析                 | —                                                 | —                                                                        | [ブログ投稿英語,April2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                         |
+| <a href="https://www.idealista.com" class="favicon">イデアリスタ</a>                           | 不動産                       | 分析                 | —                                                 | —                                                                        | [ブログ投稿英語,April2019](https://clickhouse.com/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                         |
 | <a href="https://www.infovista.com/" class="favicon">インフォビスタ</a>                        | ネット                       | 分析                 | —                                                 | —                                                                        | [2019年のスライド](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf)                                                                                                     |
 | <a href="https://www.innogames.com" class="favicon">InnoGames</a>                              | ゲーム                       | 指標、ロギング       | —                                                 | —                                                                        | [2019年ロシア](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf)                                                                                           |
 | <a href="https://integros.com" class="favicon">インテグロス</a>                                | Platformビデオサービス       | 分析                 | —                                                 | —                                                                        | [ロシア語でのスライド,月2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                         |
@@ -83,4 +83,4 @@ toc_title: "\u30A2\u30C0\u30D7\u30BF\u30FC"
 | <a href="https://crazypanda.ru/en/" class="favicon">Crazypanda</a>                             | ゲーム                       |                      | —                                                 | —                                                                        | ClickHouse meetupのライブセッション                                                                                                                                                                               |
 | <a href="https://fun.co/rp" class="favicon">FunCorp</a>                                        | ゲーム                       |                      | —                                                 | —                                                                        | [記事](https://www.altinity.com/blog/migrating-from-redshift-to-clickhouse)                                                                                                                                       |
 
-[元の記事](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/ja/introduction/distinctive-features.md b/docs/ja/introduction/distinctive-features.md
index 88dc91e0a3b..154b7d6ace3 100644
--- a/docs/ja/introduction/distinctive-features.md
+++ b/docs/ja/introduction/distinctive-features.md
@@ -69,4 +69,4 @@ ClickHouseには、精度を犠牲にしてパフォーマンスを得るため
 2.  既に挿入されたデータの変更または削除を、高頻度かつ低遅延に行う機能はありません。 [GDPR](https://gdpr-info.eu)に準拠するなど、データをクリーンアップまたは変更するために、バッチ削除およびバッチ更新が利用可能です。
 3.  インデックスが疎であるため、ClickHouseは、キーで単一行を取得するようなクエリにはあまり適していません。
 
-[Original article](https://clickhouse.tech/docs/en/introduction/distinctive_features/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/distinctive_features/) <!--hide-->
diff --git a/docs/ja/introduction/history.md b/docs/ja/introduction/history.md
index 162ed3ba415..c1f82c0b2cf 100644
--- a/docs/ja/introduction/history.md
+++ b/docs/ja/introduction/history.md
@@ -48,4 +48,4 @@ Yandex.Metricaには、Metrageと呼ばれるデータを集計するための
 
 OLAPServerの制限を取り除き、レポートのための非集計データを扱う問題を解決するために、私達は ClickHouse DBMSを開発しました。
 
-[Original article](https://clickhouse.tech/docs/en/introduction/history/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/history/) <!--hide-->
diff --git a/docs/ja/introduction/performance.md b/docs/ja/introduction/performance.md
index 7750a10c0ec..412ddb65211 100644
--- a/docs/ja/introduction/performance.md
+++ b/docs/ja/introduction/performance.md
@@ -5,9 +5,9 @@ toc_title: "\u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9"
 
 # パフォーマンス {#pahuomansu}
 
-Yandexの内部テスト結果によると、ClickHouseは、テスト可能なクラスのシステム間で同等の動作シナリオで最高のパフォーマンス(長時間のクエリで最も高いスループットと、短時間のクエリで最小のレイテンシの両方)を示します。 [別のページで](https://clickhouse.tech/benchmark/dbms/)テスト結果を表示できます 。
+Yandexの内部テスト結果によると、ClickHouseは、テスト可能なクラスのシステム間で同等の動作シナリオで最高のパフォーマンス(長時間のクエリで最も高いスループットと、短時間のクエリで最小のレイテンシの両方)を示します。 [別のページで](https://clickhouse.com/benchmark/dbms/)テスト結果を表示できます 。
 
-これは、多数の独立したベンチマークでも確認されています。インターネット検索で見つけることは難しくありませんし、 [私達がまとめた関連リンク集](https://clickhouse.tech/#independent-benchmarks) から見つけることもできます。
+これは、多数の独立したベンチマークでも確認されています。インターネット検索で見つけることは難しくありませんし、 [私達がまとめた関連リンク集](https://clickhouse.com/#independent-benchmarks) から見つけることもできます。
 
 ## 単一の巨大なクエリのスループット {#dan-yi-noju-da-nakuerinosurupututo}
 
@@ -27,4 +27,4 @@ Yandexの内部テスト結果によると、ClickHouseは、テスト可能な
 
 少なくとも1000行のパケットにデータを挿入することをお勧めします。または、1秒あたり1回のリクエストを超えないでください。タブ区切りのダンプデータをMergeTreeテーブルに挿入する場合、挿入速度は50〜200MB/sになります。挿入された行のサイズが約1Kbの場合、速度は毎秒50,000〜200,000行になります。行が小さい場合、パフォーマンスは1秒あたりの行数で高くなります(Banner System データ- `>` 500,000行/秒、Graphite データ- `>` 1,000,000行/秒)。パフォーマンスを向上させるために、複数のINSERTクエリを並行して作成することで、パフォーマンスを線形に向上できます。
 
-[Original article](https://clickhouse.tech/docs/ja/introduction/performance/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ja/introduction/performance/) <!--hide-->
diff --git a/docs/ja/operations/access-rights.md b/docs/ja/operations/access-rights.md
index c3fea6bfe5c..9b11d95033e 100644
--- a/docs/ja/operations/access-rights.md
+++ b/docs/ja/operations/access-rights.md
@@ -141,4 +141,4 @@ Roleは、ユーザーアカウントに付与できるaccessエンティティ
 
     デフォルトのSQL型のアクセス制御及び特別口座の口座管理オのすべてのユーザー ユーザーを設定する必要があります。 `users.xml` に1を割り当てます。 [access_management](settings/settings-users.md#access_management-user-setting) 設定。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/access_rights/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/access_rights/) <!--hide-->
diff --git a/docs/ja/operations/backup.md b/docs/ja/operations/backup.md
index b0cde00e23c..208c535eb57 100644
--- a/docs/ja/operations/backup.md
+++ b/docs/ja/operations/backup.md
@@ -38,4 +38,4 @@ ClickHouseは、 `ALTER TABLE ... FREEZE PARTITION ...` クエリをコピーの
 
 第三者ツールを自動化するこのアプローチ: [clickhouse-バックアップ](https://github.com/AlexAkulov/clickhouse-backup).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/backup/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/ja/operations/caches.md b/docs/ja/operations/caches.md
new file mode 120000
index 00000000000..ab229298e5f
--- /dev/null
+++ b/docs/ja/operations/caches.md
@@ -0,0 +1 @@
+../../en/operations/caches.md
\ No newline at end of file
diff --git a/docs/ja/operations/clickhouse-keeper.md b/docs/ja/operations/clickhouse-keeper.md
new file mode 120000
index 00000000000..528ba82fea4
--- /dev/null
+++ b/docs/ja/operations/clickhouse-keeper.md
@@ -0,0 +1 @@
+../../en/operations/clickhouse-keeper.md
\ No newline at end of file
diff --git a/docs/ja/operations/configuration-files.md b/docs/ja/operations/configuration-files.md
index b269508f408..7ba1c3b0058 100644
--- a/docs/ja/operations/configuration-files.md
+++ b/docs/ja/operations/configuration-files.md
@@ -54,4 +54,4 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 
 サーバーは、設定ファイルの変更、置換および上書きの実行時に使用されたファイルおよびZooKeeperノードを追跡し、ユーザーおよびクラスターの設定をその場で再ロード つまり、サーバーを再起動せずにクラスター、ユーザー、およびその設定を変更できます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/configuration_files/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/configuration_files/) <!--hide-->
diff --git a/docs/ja/operations/external-authenticators/index.md b/docs/ja/operations/external-authenticators/index.md
new file mode 120000
index 00000000000..5f656246c9d
--- /dev/null
+++ b/docs/ja/operations/external-authenticators/index.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/index.md
\ No newline at end of file
diff --git a/docs/ja/operations/external-authenticators/kerberos.md b/docs/ja/operations/external-authenticators/kerberos.md
new file mode 120000
index 00000000000..b5a4d557de4
--- /dev/null
+++ b/docs/ja/operations/external-authenticators/kerberos.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/kerberos.md
\ No newline at end of file
diff --git a/docs/ja/operations/external-authenticators/ldap.md b/docs/ja/operations/external-authenticators/ldap.md
new file mode 120000
index 00000000000..a171d0ac05a
--- /dev/null
+++ b/docs/ja/operations/external-authenticators/ldap.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/ldap.md
\ No newline at end of file
diff --git a/docs/ja/operations/index.md b/docs/ja/operations/index.md
index 3fc7d869800..dcc5479bda8 100644
--- a/docs/ja/operations/index.md
+++ b/docs/ja/operations/index.md
@@ -25,4 +25,4 @@ ClickHouse操作マニュアルの以下の主要部:
 -   [設定](settings/index.md)
 -   [ユーティリ](utilities/index.md)
 
-{## [元の記事](https://clickhouse.tech/docs/en/operations/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/operations/) ##}
diff --git a/docs/ja/operations/opentelemetry.md b/docs/ja/operations/opentelemetry.md
new file mode 120000
index 00000000000..a4d96e36a4e
--- /dev/null
+++ b/docs/ja/operations/opentelemetry.md
@@ -0,0 +1 @@
+../../en/operations/opentelemetry.md
\ No newline at end of file
diff --git a/docs/ja/operations/quotas.md b/docs/ja/operations/quotas.md
index bca708cd041..2de45397350 100644
--- a/docs/ja/operations/quotas.md
+++ b/docs/ja/operations/quotas.md
@@ -109,4 +109,4 @@ toc_title: "\u30AF\u30A9\u30FC\u30BF"
 
 サーバーを再起動すると、クォータがリセットされます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/quotas/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/quotas/) <!--hide-->
diff --git a/docs/ja/operations/server-configuration-parameters/index.md b/docs/ja/operations/server-configuration-parameters/index.md
index f8e63412a1c..77f406482e8 100644
--- a/docs/ja/operations/server-configuration-parameters/index.md
+++ b/docs/ja/operations/server-configuration-parameters/index.md
@@ -16,4 +16,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 設定を勉強する前に、 [設定ファイル](../configuration-files.md#configuration_files) セクションと置換の使用に注意してください( `incl` と `optional` 属性）。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/ja/operations/server-configuration-parameters/settings.md b/docs/ja/operations/server-configuration-parameters/settings.md
index 9f67c7e5f38..7e0d5ebcc22 100644
--- a/docs/ja/operations/server-configuration-parameters/settings.md
+++ b/docs/ja/operations/server-configuration-parameters/settings.md
@@ -903,4 +903,4 @@ ClickHouse内部DNSキャッシュに格納されているIPアドレスの更
 
 -   [アクセス制御とアカウント管理](../access-rights.md#access-control)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/ja/operations/settings/constraints-on-settings.md b/docs/ja/operations/settings/constraints-on-settings.md
index da7371564b4..4c73fdb3667 100644
--- a/docs/ja/operations/settings/constraints-on-settings.md
+++ b/docs/ja/operations/settings/constraints-on-settings.md
@@ -72,4 +72,4 @@ Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should n
 
 **注:** その `default` プロファイルには特別な処理があります。 `default` プロのデフォルトの制約、その制限するすべてのユーザーまでの彼らのメソッドを明示的にこれらのユーザー
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/ja/operations/settings/index.md b/docs/ja/operations/settings/index.md
index f64c339ef9e..da8343484d2 100644
--- a/docs/ja/operations/settings/index.md
+++ b/docs/ja/operations/settings/index.md
@@ -30,4 +30,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 サーバー設定ファイルでのみ行うことができる設定は、このセクションでは説明しません。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/) <!--hide-->
diff --git a/docs/ja/operations/settings/merge-tree-settings.md b/docs/ja/operations/settings/merge-tree-settings.md
new file mode 120000
index 00000000000..51825e80601
--- /dev/null
+++ b/docs/ja/operations/settings/merge-tree-settings.md
@@ -0,0 +1 @@
+../../../en/operations/settings/merge-tree-settings.md
\ No newline at end of file
diff --git a/docs/ja/operations/settings/permissions-for-queries.md b/docs/ja/operations/settings/permissions-for-queries.md
index d77bed96464..48bd2d06506 100644
--- a/docs/ja/operations/settings/permissions-for-queries.md
+++ b/docs/ja/operations/settings/permissions-for-queries.md
@@ -58,4 +58,4 @@ toc_title: "\u30AF\u30A8\u30EA\u306E\u6A29\u9650"
 
 デフォルト値:1
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/ja/operations/settings/query-complexity.md b/docs/ja/operations/settings/query-complexity.md
index f98e55ef572..d893bd7ee60 100644
--- a/docs/ja/operations/settings/query-complexity.md
+++ b/docs/ja/operations/settings/query-complexity.md
@@ -298,4 +298,4 @@ ClickHouseは、制限に達したときにさまざまなアクションを続
 
 > “Too many partitions for single INSERT block (more than” +toString(max_parts)+ “). The limit is controlled by ‘max_partitions_per_insert_block’ setting. A large number of partitions is a common misconception. It will lead to severe negative performance impact, including slow server startup, slow INSERT queries and slow SELECT queries. Recommended total number of partitions for a table is under 1000..10000. Please note, that partitioning is not intended to speed up SELECT queries (ORDER BY key is sufficient to make range queries fast). Partitions are intended for data manipulation (DROP PARTITION, etc).”
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/query_complexity/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/ja/operations/settings/settings-profiles.md b/docs/ja/operations/settings/settings-profiles.md
index 09f10a231cf..dfbb4f1df85 100644
--- a/docs/ja/operations/settings/settings-profiles.md
+++ b/docs/ja/operations/settings/settings-profiles.md
@@ -78,4 +78,4 @@ SET profile = 'web'
 
 その `web` プロファイルは通常のプロファイルです。 `SET` クエリまたはHTTPクエリでURLパラメータを使用する。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/settings_profiles/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/ja/operations/settings/settings-users.md b/docs/ja/operations/settings/settings-users.md
index dc72c6ceb6f..65545790614 100644
--- a/docs/ja/operations/settings/settings-users.md
+++ b/docs/ja/operations/settings/settings-users.md
@@ -161,4 +161,4 @@ toc_title: "\u30E6\u30FC\u30B6\u30FC\u8A2D\u5B9A"
 
 その `filter` 任意の式にすることができます。 [UInt8](../../sql-reference/data-types/int-uint.md)-タイプ値。 通常、比較演算子と論理演算子が含まれています。 からの行 `database_name.table1` る結果をフィルターを0においても返却いたしませんこのユーザーです。 このフィルタリングは `PREWHERE` 操作と無効 `WHERE→PREWHERE` 最適化。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/settings_users/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/ja/operations/settings/settings.md b/docs/ja/operations/settings/settings.md
index 8ba30f318ab..91c442d3165 100644
--- a/docs/ja/operations/settings/settings.md
+++ b/docs/ja/operations/settings/settings.md
@@ -1235,4 +1235,4 @@ PREWHERE/WHEREにシャーディングキー条件があるSELECTクエリの未
 
 デフォルト値は16です。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/ja/operations/storing-data.md b/docs/ja/operations/storing-data.md
new file mode 120000
index 00000000000..16722fb5a39
--- /dev/null
+++ b/docs/ja/operations/storing-data.md
@@ -0,0 +1 @@
+../../en/operations/storing-data.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables.md b/docs/ja/operations/system-tables.md
index be0c3356247..4a18028c084 100644
--- a/docs/ja/operations/system-tables.md
+++ b/docs/ja/operations/system-tables.md
@@ -1162,4 +1162,4 @@ path:           /clickhouse/tables/01-08/visits/replicas
 
 ストレージポリシーに複数のボリュームが含まれている場合は、各ボリュームの情報がテーブルの個々の行に格納されます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/system_tables/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/system_tables/) <!--hide-->
diff --git a/docs/ja/operations/system-tables/asynchronous_metric_log.md b/docs/ja/operations/system-tables/asynchronous_metric_log.md
new file mode 120000
index 00000000000..8ffe4dca1ba
--- /dev/null
+++ b/docs/ja/operations/system-tables/asynchronous_metric_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/asynchronous_metric_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/asynchronous_metrics.md b/docs/ja/operations/system-tables/asynchronous_metrics.md
new file mode 120000
index 00000000000..fcaf428f59c
--- /dev/null
+++ b/docs/ja/operations/system-tables/asynchronous_metrics.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/asynchronous_metrics.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/clusters.md b/docs/ja/operations/system-tables/clusters.md
new file mode 120000
index 00000000000..41c8a05c3b8
--- /dev/null
+++ b/docs/ja/operations/system-tables/clusters.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/clusters.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/columns.md b/docs/ja/operations/system-tables/columns.md
new file mode 120000
index 00000000000..ff7fb750f7e
--- /dev/null
+++ b/docs/ja/operations/system-tables/columns.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/columns.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/contributors.md b/docs/ja/operations/system-tables/contributors.md
new file mode 120000
index 00000000000..2eb2c01f5a1
--- /dev/null
+++ b/docs/ja/operations/system-tables/contributors.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/contributors.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/crash-log.md b/docs/ja/operations/system-tables/crash-log.md
new file mode 120000
index 00000000000..d1aa67601bc
--- /dev/null
+++ b/docs/ja/operations/system-tables/crash-log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/crash-log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/current-roles.md b/docs/ja/operations/system-tables/current-roles.md
new file mode 120000
index 00000000000..b9f1f9d6e9d
--- /dev/null
+++ b/docs/ja/operations/system-tables/current-roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/current-roles.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/data_skipping_indices.md b/docs/ja/operations/system-tables/data_skipping_indices.md
new file mode 120000
index 00000000000..2820987bf69
--- /dev/null
+++ b/docs/ja/operations/system-tables/data_skipping_indices.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/data_skipping_indices.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/data_type_families.md b/docs/ja/operations/system-tables/data_type_families.md
new file mode 120000
index 00000000000..6d47b6f3f20
--- /dev/null
+++ b/docs/ja/operations/system-tables/data_type_families.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/data_type_families.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/databases.md b/docs/ja/operations/system-tables/databases.md
new file mode 120000
index 00000000000..058c2f32350
--- /dev/null
+++ b/docs/ja/operations/system-tables/databases.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/databases.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/detached_parts.md b/docs/ja/operations/system-tables/detached_parts.md
new file mode 120000
index 00000000000..5199756766a
--- /dev/null
+++ b/docs/ja/operations/system-tables/detached_parts.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/detached_parts.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/dictionaries.md b/docs/ja/operations/system-tables/dictionaries.md
new file mode 120000
index 00000000000..6c7d41422da
--- /dev/null
+++ b/docs/ja/operations/system-tables/dictionaries.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/dictionaries.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/disks.md b/docs/ja/operations/system-tables/disks.md
new file mode 120000
index 00000000000..faace23e9d7
--- /dev/null
+++ b/docs/ja/operations/system-tables/disks.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/disks.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/distributed_ddl_queue.md b/docs/ja/operations/system-tables/distributed_ddl_queue.md
new file mode 120000
index 00000000000..a9cadc74af2
--- /dev/null
+++ b/docs/ja/operations/system-tables/distributed_ddl_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/distributed_ddl_queue.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/distribution_queue.md b/docs/ja/operations/system-tables/distribution_queue.md
new file mode 120000
index 00000000000..3831b85000c
--- /dev/null
+++ b/docs/ja/operations/system-tables/distribution_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/distribution_queue.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/enabled-roles.md b/docs/ja/operations/system-tables/enabled-roles.md
new file mode 120000
index 00000000000..04ffee25343
--- /dev/null
+++ b/docs/ja/operations/system-tables/enabled-roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/enabled-roles.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/errors.md b/docs/ja/operations/system-tables/errors.md
new file mode 120000
index 00000000000..2bb8c1dff0d
--- /dev/null
+++ b/docs/ja/operations/system-tables/errors.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/errors.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/events.md b/docs/ja/operations/system-tables/events.md
new file mode 120000
index 00000000000..b9eb57426f2
--- /dev/null
+++ b/docs/ja/operations/system-tables/events.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/events.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/functions.md b/docs/ja/operations/system-tables/functions.md
new file mode 120000
index 00000000000..7a0f2d1853f
--- /dev/null
+++ b/docs/ja/operations/system-tables/functions.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/functions.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/grants.md b/docs/ja/operations/system-tables/grants.md
new file mode 120000
index 00000000000..ec7f50b118e
--- /dev/null
+++ b/docs/ja/operations/system-tables/grants.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/grants.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/graphite_retentions.md b/docs/ja/operations/system-tables/graphite_retentions.md
new file mode 120000
index 00000000000..b8c049625ac
--- /dev/null
+++ b/docs/ja/operations/system-tables/graphite_retentions.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/graphite_retentions.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/index.md b/docs/ja/operations/system-tables/index.md
new file mode 120000
index 00000000000..77d10f24c7f
--- /dev/null
+++ b/docs/ja/operations/system-tables/index.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/index.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/licenses.md b/docs/ja/operations/system-tables/licenses.md
new file mode 120000
index 00000000000..a84b4bbf3e3
--- /dev/null
+++ b/docs/ja/operations/system-tables/licenses.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/licenses.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/merge_tree_settings.md b/docs/ja/operations/system-tables/merge_tree_settings.md
new file mode 120000
index 00000000000..dbff2462867
--- /dev/null
+++ b/docs/ja/operations/system-tables/merge_tree_settings.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/merge_tree_settings.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/merges.md b/docs/ja/operations/system-tables/merges.md
new file mode 120000
index 00000000000..21406d070e7
--- /dev/null
+++ b/docs/ja/operations/system-tables/merges.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/merges.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/metric_log.md b/docs/ja/operations/system-tables/metric_log.md
new file mode 120000
index 00000000000..57c04f0fd54
--- /dev/null
+++ b/docs/ja/operations/system-tables/metric_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/metric_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/metrics.md b/docs/ja/operations/system-tables/metrics.md
new file mode 120000
index 00000000000..06359d159b2
--- /dev/null
+++ b/docs/ja/operations/system-tables/metrics.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/metrics.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/mutations.md b/docs/ja/operations/system-tables/mutations.md
new file mode 120000
index 00000000000..598f05d4381
--- /dev/null
+++ b/docs/ja/operations/system-tables/mutations.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/mutations.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/numbers.md b/docs/ja/operations/system-tables/numbers.md
new file mode 120000
index 00000000000..29fce9b3569
--- /dev/null
+++ b/docs/ja/operations/system-tables/numbers.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/numbers.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/numbers_mt.md b/docs/ja/operations/system-tables/numbers_mt.md
new file mode 120000
index 00000000000..7547a8e014c
--- /dev/null
+++ b/docs/ja/operations/system-tables/numbers_mt.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/numbers_mt.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/one.md b/docs/ja/operations/system-tables/one.md
new file mode 120000
index 00000000000..ad50d714928
--- /dev/null
+++ b/docs/ja/operations/system-tables/one.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/one.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/opentelemetry_span_log.md b/docs/ja/operations/system-tables/opentelemetry_span_log.md
new file mode 120000
index 00000000000..59aab8cd11d
--- /dev/null
+++ b/docs/ja/operations/system-tables/opentelemetry_span_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/opentelemetry_span_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/part_log.md b/docs/ja/operations/system-tables/part_log.md
new file mode 120000
index 00000000000..274900a57ad
--- /dev/null
+++ b/docs/ja/operations/system-tables/part_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/part_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/parts.md b/docs/ja/operations/system-tables/parts.md
new file mode 120000
index 00000000000..900bb5240a0
--- /dev/null
+++ b/docs/ja/operations/system-tables/parts.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/parts.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/parts_columns.md b/docs/ja/operations/system-tables/parts_columns.md
new file mode 120000
index 00000000000..f2c7d4dde34
--- /dev/null
+++ b/docs/ja/operations/system-tables/parts_columns.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/parts_columns.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/processes.md b/docs/ja/operations/system-tables/processes.md
new file mode 120000
index 00000000000..b565db02713
--- /dev/null
+++ b/docs/ja/operations/system-tables/processes.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/processes.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/query_log.md b/docs/ja/operations/system-tables/query_log.md
new file mode 120000
index 00000000000..df9c4d8ba58
--- /dev/null
+++ b/docs/ja/operations/system-tables/query_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/query_thread_log.md b/docs/ja/operations/system-tables/query_thread_log.md
new file mode 120000
index 00000000000..98be3538c4c
--- /dev/null
+++ b/docs/ja/operations/system-tables/query_thread_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_thread_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/query_views_log.md b/docs/ja/operations/system-tables/query_views_log.md
new file mode 120000
index 00000000000..f606e4108ca
--- /dev/null
+++ b/docs/ja/operations/system-tables/query_views_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_views_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/quota_limits.md b/docs/ja/operations/system-tables/quota_limits.md
new file mode 120000
index 00000000000..3fecf881c92
--- /dev/null
+++ b/docs/ja/operations/system-tables/quota_limits.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quota_limits.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/quota_usage.md b/docs/ja/operations/system-tables/quota_usage.md
new file mode 120000
index 00000000000..c79f1a75033
--- /dev/null
+++ b/docs/ja/operations/system-tables/quota_usage.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quota_usage.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/quotas.md b/docs/ja/operations/system-tables/quotas.md
new file mode 120000
index 00000000000..b6a26bf77f3
--- /dev/null
+++ b/docs/ja/operations/system-tables/quotas.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quotas.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/quotas_usage.md b/docs/ja/operations/system-tables/quotas_usage.md
new file mode 120000
index 00000000000..ba204a4d9c0
--- /dev/null
+++ b/docs/ja/operations/system-tables/quotas_usage.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quotas_usage.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/replicas.md b/docs/ja/operations/system-tables/replicas.md
new file mode 120000
index 00000000000..dd231c5c80d
--- /dev/null
+++ b/docs/ja/operations/system-tables/replicas.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replicas.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/replicated_fetches.md b/docs/ja/operations/system-tables/replicated_fetches.md
new file mode 120000
index 00000000000..bf4547ebd07
--- /dev/null
+++ b/docs/ja/operations/system-tables/replicated_fetches.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replicated_fetches.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/replication_queue.md b/docs/ja/operations/system-tables/replication_queue.md
new file mode 120000
index 00000000000..cdc452594e6
--- /dev/null
+++ b/docs/ja/operations/system-tables/replication_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replication_queue.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/role-grants.md b/docs/ja/operations/system-tables/role-grants.md
new file mode 120000
index 00000000000..6a25ffa31ce
--- /dev/null
+++ b/docs/ja/operations/system-tables/role-grants.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/role-grants.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/roles.md b/docs/ja/operations/system-tables/roles.md
new file mode 120000
index 00000000000..391bc980a48
--- /dev/null
+++ b/docs/ja/operations/system-tables/roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/roles.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/row_policies.md b/docs/ja/operations/system-tables/row_policies.md
new file mode 120000
index 00000000000..b194161cf1d
--- /dev/null
+++ b/docs/ja/operations/system-tables/row_policies.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/row_policies.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/settings.md b/docs/ja/operations/system-tables/settings.md
new file mode 120000
index 00000000000..69b03c2312c
--- /dev/null
+++ b/docs/ja/operations/system-tables/settings.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/settings_profile_elements.md b/docs/ja/operations/system-tables/settings_profile_elements.md
new file mode 120000
index 00000000000..3b0e70ead49
--- /dev/null
+++ b/docs/ja/operations/system-tables/settings_profile_elements.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings_profile_elements.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/settings_profiles.md b/docs/ja/operations/system-tables/settings_profiles.md
new file mode 120000
index 00000000000..1c559bf2445
--- /dev/null
+++ b/docs/ja/operations/system-tables/settings_profiles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings_profiles.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/stack_trace.md b/docs/ja/operations/system-tables/stack_trace.md
new file mode 120000
index 00000000000..8dea20028f1
--- /dev/null
+++ b/docs/ja/operations/system-tables/stack_trace.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/stack_trace.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/storage_policies.md b/docs/ja/operations/system-tables/storage_policies.md
new file mode 120000
index 00000000000..b225b8d7cf6
--- /dev/null
+++ b/docs/ja/operations/system-tables/storage_policies.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/storage_policies.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/table_engines.md b/docs/ja/operations/system-tables/table_engines.md
new file mode 120000
index 00000000000..4bdfb34cb7e
--- /dev/null
+++ b/docs/ja/operations/system-tables/table_engines.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/table_engines.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/tables.md b/docs/ja/operations/system-tables/tables.md
new file mode 120000
index 00000000000..6b2ae90a766
--- /dev/null
+++ b/docs/ja/operations/system-tables/tables.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/tables.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/text_log.md b/docs/ja/operations/system-tables/text_log.md
new file mode 120000
index 00000000000..0419e4c2080
--- /dev/null
+++ b/docs/ja/operations/system-tables/text_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/text_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/time_zones.md b/docs/ja/operations/system-tables/time_zones.md
new file mode 120000
index 00000000000..d7b0f07d326
--- /dev/null
+++ b/docs/ja/operations/system-tables/time_zones.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/time_zones.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/trace_log.md b/docs/ja/operations/system-tables/trace_log.md
new file mode 120000
index 00000000000..f092330b46a
--- /dev/null
+++ b/docs/ja/operations/system-tables/trace_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/trace_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/users.md b/docs/ja/operations/system-tables/users.md
new file mode 120000
index 00000000000..540c5ac6620
--- /dev/null
+++ b/docs/ja/operations/system-tables/users.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/users.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/zookeeper.md b/docs/ja/operations/system-tables/zookeeper.md
new file mode 120000
index 00000000000..3e761b0e676
--- /dev/null
+++ b/docs/ja/operations/system-tables/zookeeper.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/zookeeper.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/zookeeper_log.md b/docs/ja/operations/system-tables/zookeeper_log.md
new file mode 120000
index 00000000000..c7db82e978a
--- /dev/null
+++ b/docs/ja/operations/system-tables/zookeeper_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/zookeeper_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/tips.md b/docs/ja/operations/tips.md
index 5c64a216e1d..1967654af79 100644
--- a/docs/ja/operations/tips.md
+++ b/docs/ja/operations/tips.md
@@ -248,4 +248,4 @@ script
 end script
 ```
 
-{## [元の記事](https://clickhouse.tech/docs/en/operations/tips/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/operations/tips/) ##}
diff --git a/docs/ja/operations/utilities/clickhouse-compressor.md b/docs/ja/operations/utilities/clickhouse-compressor.md
new file mode 120000
index 00000000000..98b1d8c4c7c
--- /dev/null
+++ b/docs/ja/operations/utilities/clickhouse-compressor.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-compressor.md
\ No newline at end of file
diff --git a/docs/ja/operations/utilities/clickhouse-copier.md b/docs/ja/operations/utilities/clickhouse-copier.md
index 43e96647775..4d825f02b76 100644
--- a/docs/ja/operations/utilities/clickhouse-copier.md
+++ b/docs/ja/operations/utilities/clickhouse-copier.md
@@ -173,4 +173,4 @@ $ clickhouse-copier copier --daemon --config zookeeper.xml --task-path /task/pat
 
 `clickhouse-copier` の変更を追跡します `/task/path/description` そしてその場でそれらを適用します。 たとえば、次の値を変更すると `max_workers`、タスクを実行しているプロセスの数も変更されます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/ja/operations/utilities/clickhouse-format.md b/docs/ja/operations/utilities/clickhouse-format.md
new file mode 120000
index 00000000000..d71a78cd40b
--- /dev/null
+++ b/docs/ja/operations/utilities/clickhouse-format.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-format.md
\ No newline at end of file
diff --git a/docs/ja/operations/utilities/clickhouse-local.md b/docs/ja/operations/utilities/clickhouse-local.md
index 5f665bde19f..25714aec8d9 100644
--- a/docs/ja/operations/utilities/clickhouse-local.md
+++ b/docs/ja/operations/utilities/clickhouse-local.md
@@ -78,4 +78,4 @@ Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ...
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/utils/clickhouse-local/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/ja/operations/utilities/clickhouse-obfuscator.md b/docs/ja/operations/utilities/clickhouse-obfuscator.md
new file mode 120000
index 00000000000..06d1df70693
--- /dev/null
+++ b/docs/ja/operations/utilities/clickhouse-obfuscator.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-obfuscator.md
\ No newline at end of file
diff --git a/docs/ja/operations/utilities/index.md b/docs/ja/operations/utilities/index.md
index 8dd37072b50..99d168fe670 100644
--- a/docs/ja/operations/utilities/index.md
+++ b/docs/ja/operations/utilities/index.md
@@ -12,4 +12,4 @@ toc_title: "\u6982\u8981"
 -   [クリックハウス-複写機](clickhouse-copier.md) — Copies (and reshards) data from one cluster to another cluster.
 -   [clickhouse-ベンチマーク](clickhouse-benchmark.md) — Loads server with the custom queries and settings.
 
-[元の記事](https://clickhouse.tech/docs/en/operations/utils/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/utils/) <!--hide-->
diff --git a/docs/ja/operations/utilities/odbc-bridge.md b/docs/ja/operations/utilities/odbc-bridge.md
new file mode 120000
index 00000000000..c5772389199
--- /dev/null
+++ b/docs/ja/operations/utilities/odbc-bridge.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/odbc-bridge.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/combinators.md b/docs/ja/sql-reference/aggregate-functions/combinators.md
index c5121f5259a..f44bf4f6e7e 100644
--- a/docs/ja/sql-reference/aggregate-functions/combinators.md
+++ b/docs/ja/sql-reference/aggregate-functions/combinators.md
@@ -242,4 +242,4 @@ FROM people
 └────────┴───────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/agg_functions/combinators/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/agg_functions/combinators/) <!--hide-->
diff --git a/docs/ja/sql-reference/aggregate-functions/index.md b/docs/ja/sql-reference/aggregate-functions/index.md
index bf1e47103ba..3f40eeb7221 100644
--- a/docs/ja/sql-reference/aggregate-functions/index.md
+++ b/docs/ja/sql-reference/aggregate-functions/index.md
@@ -59,4 +59,4 @@ SELECT groupArray(y) FROM t_null_big
 
 `groupArray` 含まない `NULL` 結果の配列で。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/agg_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/agg_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/aggregate-functions/parametric-functions.md b/docs/ja/sql-reference/aggregate-functions/parametric-functions.md
index 9eba5baf8a7..82396f9bf95 100644
--- a/docs/ja/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/ja/sql-reference/aggregate-functions/parametric-functions.md
@@ -492,7 +492,7 @@ Problem: Generate a report that shows only keywords that produced at least 5 uni
 Solution: Write in the GROUP BY query SearchPhrase HAVING uniqUpTo(4)(UserID) >= 5
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
 
 ## sumMapFiltered(keys_to_keep)(キー,値) {#summapfilteredkeys-to-keepkeys-values}
 
diff --git a/docs/ja/sql-reference/aggregate-functions/reference.md b/docs/ja/sql-reference/aggregate-functions/reference.md
index c66e9b54746..636992e19a8 100644
--- a/docs/ja/sql-reference/aggregate-functions/reference.md
+++ b/docs/ja/sql-reference/aggregate-functions/reference.md
@@ -1911,4 +1911,4 @@ SELECT arraySort(bitmapToArray(groupBitmapXorState(z))) FROM bitmap_column_expr_
 └──────────────────────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/agg_functions/reference/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/agg_functions/reference/) <!--hide-->
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/any.md b/docs/ja/sql-reference/aggregate-functions/reference/any.md
new file mode 120000
index 00000000000..1a180fae79b
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/any.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/any.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/anyheavy.md b/docs/ja/sql-reference/aggregate-functions/reference/anyheavy.md
new file mode 120000
index 00000000000..3dd65a5a6ac
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/anyheavy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/anyheavy.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/anylast.md b/docs/ja/sql-reference/aggregate-functions/reference/anylast.md
new file mode 120000
index 00000000000..d2f88acf37d
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/anylast.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/anylast.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/argmax.md b/docs/ja/sql-reference/aggregate-functions/reference/argmax.md
new file mode 120000
index 00000000000..9260aa64e32
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/argmax.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/argmax.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/argmin.md b/docs/ja/sql-reference/aggregate-functions/reference/argmin.md
new file mode 120000
index 00000000000..cc04e48011a
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/argmin.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/argmin.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/avg.md b/docs/ja/sql-reference/aggregate-functions/reference/avg.md
new file mode 120000
index 00000000000..dce5db3d1f8
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/avg.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/avg.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/avgweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/avgweighted.md
new file mode 120000
index 00000000000..c7584607600
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/avgweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/avgweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md b/docs/ja/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
new file mode 120000
index 00000000000..22a84e3e5d2
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/corr.md b/docs/ja/sql-reference/aggregate-functions/reference/corr.md
new file mode 120000
index 00000000000..582cc9c15cd
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/corr.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/corr.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/count.md b/docs/ja/sql-reference/aggregate-functions/reference/count.md
new file mode 120000
index 00000000000..d17713f7fe6
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/count.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/count.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/covarpop.md b/docs/ja/sql-reference/aggregate-functions/reference/covarpop.md
new file mode 120000
index 00000000000..c31a289939b
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/covarpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/covarpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/covarsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/covarsamp.md
new file mode 120000
index 00000000000..21282114272
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/covarsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/covarsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/deltasum.md b/docs/ja/sql-reference/aggregate-functions/reference/deltasum.md
new file mode 120000
index 00000000000..b9a8bdce6fe
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/deltasum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/deltasum.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/deltasumtimestamp.md b/docs/ja/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
new file mode 120000
index 00000000000..3720d4f7b98
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparray.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparray.md
new file mode 120000
index 00000000000..cbc4b5ed5b7
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparray.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparray.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparrayinsertat.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
new file mode 120000
index 00000000000..9710872316e
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingavg.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
new file mode 120000
index 00000000000..2e7abdd3184
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingsum.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
new file mode 120000
index 00000000000..5d5eb7e6884
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparraysample.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparraysample.md
new file mode 120000
index 00000000000..797f57e7457
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparraysample.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparraysample.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitand.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitand.md
new file mode 120000
index 00000000000..464b68b114d
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitand.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitand.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitmap.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmap.md
new file mode 120000
index 00000000000..04386983f6c
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmap.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmap.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapand.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapand.md
new file mode 120000
index 00000000000..861ac2c3dd3
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapand.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapand.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapor.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapor.md
new file mode 120000
index 00000000000..0fcb851d0a4
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapor.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapxor.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapxor.md
new file mode 120000
index 00000000000..13c79b37200
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapxor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapxor.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitor.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitor.md
new file mode 120000
index 00000000000..06664ee3fdb
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitor.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitxor.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitxor.md
new file mode 120000
index 00000000000..d98130b4b30
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitxor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitxor.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupuniqarray.md b/docs/ja/sql-reference/aggregate-functions/reference/groupuniqarray.md
new file mode 120000
index 00000000000..f739df80064
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupuniqarray.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupuniqarray.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/index.md b/docs/ja/sql-reference/aggregate-functions/reference/index.md
new file mode 120000
index 00000000000..bde1a622626
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/intervalLengthSum.md b/docs/ja/sql-reference/aggregate-functions/reference/intervalLengthSum.md
new file mode 120000
index 00000000000..b69019d0cf2
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/intervalLengthSum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/intervalLengthSum.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/kurtpop.md b/docs/ja/sql-reference/aggregate-functions/reference/kurtpop.md
new file mode 120000
index 00000000000..ee8f9be79fd
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/kurtpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/kurtpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/kurtsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/kurtsamp.md
new file mode 120000
index 00000000000..dbc05efec9e
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/kurtsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/kurtsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/mannwhitneyutest.md b/docs/ja/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
new file mode 120000
index 00000000000..7cbd9ceb1be
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/max.md b/docs/ja/sql-reference/aggregate-functions/reference/max.md
new file mode 120000
index 00000000000..ae47679c80e
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/max.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/max.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/maxmap.md b/docs/ja/sql-reference/aggregate-functions/reference/maxmap.md
new file mode 120000
index 00000000000..ffd64c34667
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/maxmap.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/maxmap.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/median.md b/docs/ja/sql-reference/aggregate-functions/reference/median.md
new file mode 120000
index 00000000000..d05756b8978
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/median.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/median.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/min.md b/docs/ja/sql-reference/aggregate-functions/reference/min.md
new file mode 120000
index 00000000000..61417b347a8
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/min.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/min.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/minmap.md b/docs/ja/sql-reference/aggregate-functions/reference/minmap.md
new file mode 120000
index 00000000000..bf075897bd9
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/minmap.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/minmap.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantile.md b/docs/ja/sql-reference/aggregate-functions/reference/quantile.md
new file mode 120000
index 00000000000..12d80246267
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantile.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/ja/sql-reference/aggregate-functions/reference/quantilebfloat16.md
new file mode 120000
index 00000000000..dd4fd12eb40
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiledeterministic.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiledeterministic.md
new file mode 120000
index 00000000000..60be9721f31
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiledeterministic.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiledeterministic.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantileexact.md b/docs/ja/sql-reference/aggregate-functions/reference/quantileexact.md
new file mode 120000
index 00000000000..06fe3567621
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantileexact.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantileexact.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantileexactweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/quantileexactweighted.md
new file mode 120000
index 00000000000..f5dd2a23c1c
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantileexactweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantileexactweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiles.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiles.md
new file mode 120000
index 00000000000..67e5037b8fa
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiles.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiles.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigest.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigest.md
new file mode 120000
index 00000000000..360c513eca1
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigest.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiletdigest.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
new file mode 120000
index 00000000000..a130216554f
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiletiming.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiletiming.md
new file mode 120000
index 00000000000..eda78f3382a
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiletiming.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiletiming.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiletimingweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
new file mode 120000
index 00000000000..b333a6726b1
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/rankCorr.md b/docs/ja/sql-reference/aggregate-functions/reference/rankCorr.md
new file mode 120000
index 00000000000..d1809ad364d
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/rankCorr.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/rankCorr.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/simplelinearregression.md b/docs/ja/sql-reference/aggregate-functions/reference/simplelinearregression.md
new file mode 120000
index 00000000000..8a07049140c
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/simplelinearregression.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/simplelinearregression.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/skewpop.md b/docs/ja/sql-reference/aggregate-functions/reference/skewpop.md
new file mode 120000
index 00000000000..2ce2f5259d7
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/skewpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/skewpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/skewsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/skewsamp.md
new file mode 120000
index 00000000000..3d2f39e8063
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/skewsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/skewsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/stddevpop.md b/docs/ja/sql-reference/aggregate-functions/reference/stddevpop.md
new file mode 120000
index 00000000000..e6f6719f3cf
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/stddevpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/stddevpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/stddevsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/stddevsamp.md
new file mode 120000
index 00000000000..55d8a4ea6db
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/stddevsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/stddevsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/stochasticlinearregression.md b/docs/ja/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
new file mode 120000
index 00000000000..cfa196bc3f3
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md b/docs/ja/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
new file mode 120000
index 00000000000..377807709d1
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/studentttest.md b/docs/ja/sql-reference/aggregate-functions/reference/studentttest.md
new file mode 120000
index 00000000000..ef39bb83322
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/studentttest.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/studentttest.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/sum.md b/docs/ja/sql-reference/aggregate-functions/reference/sum.md
new file mode 120000
index 00000000000..d81cdf86f04
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/sum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sum.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/sumcount.md b/docs/ja/sql-reference/aggregate-functions/reference/sumcount.md
new file mode 120000
index 00000000000..9f0299a5fe7
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/sumcount.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumcount.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/sumkahan.md b/docs/ja/sql-reference/aggregate-functions/reference/sumkahan.md
new file mode 120000
index 00000000000..650f8a34d9d
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/sumkahan.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumkahan.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/summap.md b/docs/ja/sql-reference/aggregate-functions/reference/summap.md
new file mode 120000
index 00000000000..acdb0c63e38
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/summap.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/summap.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/sumwithoverflow.md b/docs/ja/sql-reference/aggregate-functions/reference/sumwithoverflow.md
new file mode 120000
index 00000000000..7c9342b0e1e
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/sumwithoverflow.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumwithoverflow.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/topk.md b/docs/ja/sql-reference/aggregate-functions/reference/topk.md
new file mode 120000
index 00000000000..08da6abe743
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/topk.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/topk.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/topkweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/topkweighted.md
new file mode 120000
index 00000000000..7d1ce22ed6a
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/topkweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/topkweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniq.md b/docs/ja/sql-reference/aggregate-functions/reference/uniq.md
new file mode 120000
index 00000000000..e52d21ff731
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniq.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniq.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined.md
new file mode 120000
index 00000000000..d8d59dfd8bb
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqcombined.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined64.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined64.md
new file mode 120000
index 00000000000..e1750183f01
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined64.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqcombined64.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqexact.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqexact.md
new file mode 120000
index 00000000000..080ea046e2f
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqexact.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqexact.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqhll12.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqhll12.md
new file mode 120000
index 00000000000..3aa80e68d6c
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqhll12.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqhll12.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqthetasketch.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqthetasketch.md
new file mode 120000
index 00000000000..ac61a28677f
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/varpop.md b/docs/ja/sql-reference/aggregate-functions/reference/varpop.md
new file mode 120000
index 00000000000..52ba6246b3b
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/varpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/varpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/varsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/varsamp.md
new file mode 120000
index 00000000000..f9cd855fea6
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/varsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/varsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/welchttest.md b/docs/ja/sql-reference/aggregate-functions/reference/welchttest.md
new file mode 120000
index 00000000000..b0c6ca1ad68
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/welchttest.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/welchttest.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/aggregatefunction.md b/docs/ja/sql-reference/data-types/aggregatefunction.md
index 45aea71a2a9..036988066a7 100644
--- a/docs/ja/sql-reference/data-types/aggregatefunction.md
+++ b/docs/ja/sql-reference/data-types/aggregatefunction.md
@@ -67,4 +67,4 @@ SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP
 
 見る [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) エンジンの説明。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/array.md b/docs/ja/sql-reference/data-types/array.md
index 93fbb057701..18d9b483d8f 100644
--- a/docs/ja/sql-reference/data-types/array.md
+++ b/docs/ja/sql-reference/data-types/array.md
@@ -74,4 +74,4 @@ Received exception from server (version 1.1.54388):
 Code: 386. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: There is no supertype for types UInt8, String because some of them are String/FixedString and some of them are not.
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/array/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/array/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/boolean.md b/docs/ja/sql-reference/data-types/boolean.md
index bcf5aa0289c..075e5d2ec7a 100644
--- a/docs/ja/sql-reference/data-types/boolean.md
+++ b/docs/ja/sql-reference/data-types/boolean.md
@@ -9,4 +9,4 @@ toc_title: "\u30D6\u30FC\u30EB\u5024"
 
 ブール値には別の型はありません。 UInt8型を使用し、値0または1に制限します。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/boolean/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/boolean/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/date.md b/docs/ja/sql-reference/data-types/date.md
index bcdc8f7224d..47b105627c2 100644
--- a/docs/ja/sql-reference/data-types/date.md
+++ b/docs/ja/sql-reference/data-types/date.md
@@ -9,4 +9,4 @@ toc_title: "\u65E5\u4ED8"
 
 日付値は、タイムゾーンなしで格納されます。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/date/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/date/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/date32.md b/docs/ja/sql-reference/data-types/date32.md
new file mode 120000
index 00000000000..2c8eca18107
--- /dev/null
+++ b/docs/ja/sql-reference/data-types/date32.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/date32.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/datetime.md b/docs/ja/sql-reference/data-types/datetime.md
index 8c6164881d8..50f06cee21c 100644
--- a/docs/ja/sql-reference/data-types/datetime.md
+++ b/docs/ja/sql-reference/data-types/datetime.md
@@ -126,4 +126,4 @@ FROM dt
 -   [日付と時刻を操作する演算子](../../sql-reference/operators/index.md#operators-datetime)
 -   [その `Date` データ型](date.md)
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/datetime/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/datetime/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/decimal.md b/docs/ja/sql-reference/data-types/decimal.md
index 52fc336d331..e9c68f3c625 100644
--- a/docs/ja/sql-reference/data-types/decimal.md
+++ b/docs/ja/sql-reference/data-types/decimal.md
@@ -106,4 +106,4 @@ SELECT toDecimal32(1, 8) < 100
 DB::Exception: Can't compare.
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/decimal/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/decimal/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/domains/index.md b/docs/ja/sql-reference/data-types/domains/index.md
index 4f8c2b7add8..9a1688d94e6 100644
--- a/docs/ja/sql-reference/data-types/domains/index.md
+++ b/docs/ja/sql-reference/data-types/domains/index.md
@@ -30,4 +30,4 @@ toc_title: "\u6982\u8981"
 -   別の列または表からデータを挿入するときに、文字列値を暗黙的にドメイン値に変換できません。
 -   ドメインは、格納された値に制約を追加しません。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/domains/overview) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/domains/overview) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/domains/ipv4.md b/docs/ja/sql-reference/data-types/domains/ipv4.md
index c329028ad40..fd1f3b84096 100644
--- a/docs/ja/sql-reference/data-types/domains/ipv4.md
+++ b/docs/ja/sql-reference/data-types/domains/ipv4.md
@@ -33,16 +33,16 @@ CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
 `IPv4` ドメインはIPv4文字列としてカスタム入力形式をサポート:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.com', '183.247.232.58')('https://clickhouse.com/docs/en/', '116.106.34.242');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬───────────from─┐
-│ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
+│ https://clickhouse.com/docs/en/ │ 116.106.34.242 │
 │ https://wikipedia.org              │ 116.253.40.133 │
-│ https://clickhouse.tech          │ 183.247.232.58 │
+│ https://clickhouse.com          │ 183.247.232.58 │
 └────────────────────────────────────┴────────────────┘
 ```
 
@@ -81,4 +81,4 @@ SELECT toTypeName(i), CAST(from as UInt32) as i FROM hits LIMIT 1;
 └──────────────────────────────────┴────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/domains/ipv4) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/domains/ipv6.md b/docs/ja/sql-reference/data-types/domains/ipv6.md
index 26583429ec8..d0576341301 100644
--- a/docs/ja/sql-reference/data-types/domains/ipv6.md
+++ b/docs/ja/sql-reference/data-types/domains/ipv6.md
@@ -33,15 +33,15 @@ CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
 `IPv6` ドメイ:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.com', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.com/docs/en/', '2a02:e980:1e::1');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬─from──────────────────────────┐
-│ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-│ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
+│ https://clickhouse.com          │ 2001:44c8:129:2632:33:0:252:2 │
+│ https://clickhouse.com/docs/en/ │ 2a02:e980:1e::1               │
 │ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
 └────────────────────────────────────┴───────────────────────────────┘
 ```
@@ -83,4 +83,4 @@ SELECT toTypeName(i), CAST(from as FixedString(16)) as i FROM hits LIMIT 1;
 └───────────────────────────────────────────┴─────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/domains/ipv6) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/enum.md b/docs/ja/sql-reference/data-types/enum.md
index aef4855ef06..e995d05febe 100644
--- a/docs/ja/sql-reference/data-types/enum.md
+++ b/docs/ja/sql-reference/data-types/enum.md
@@ -129,4 +129,4 @@ Most numeric and string operations are not defined for Enum values, e.g. adding
 
 ALTERを使用すると、Int8をInt16に変更するのと同じように、Enum8をEnum16に変更することも、その逆も可能です。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/enum/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/enum/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/fixedstring.md b/docs/ja/sql-reference/data-types/fixedstring.md
index ef94410e285..3db284b3338 100644
--- a/docs/ja/sql-reference/data-types/fixedstring.md
+++ b/docs/ja/sql-reference/data-types/fixedstring.md
@@ -60,4 +60,4 @@ WHERE a = 'b\0'
 
 の長さに注意してください。 `FixedString(N)` 値は一定です。 その [長さ](../../sql-reference/functions/array-functions.md#array_functions-length) 関数の戻り値 `N` たとえ `FixedString(N)` 値はnullバイトのみで埋められますが、 [空](../../sql-reference/functions/string-functions.md#empty) 関数の戻り値 `1` この場合。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/fixedstring/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/fixedstring/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/float.md b/docs/ja/sql-reference/data-types/float.md
index b9333ae297d..c1344edbc1c 100644
--- a/docs/ja/sql-reference/data-types/float.md
+++ b/docs/ja/sql-reference/data-types/float.md
@@ -84,4 +84,4 @@ SELECT 0 / 0
 
     See the rules for `NaN` sorting in the section [ORDER BY clause](../sql_reference/statements/select/order-by.md).
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/float/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/float/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/geo.md b/docs/ja/sql-reference/data-types/geo.md
new file mode 120000
index 00000000000..e25bc66b201
--- /dev/null
+++ b/docs/ja/sql-reference/data-types/geo.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/geo.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/index.md b/docs/ja/sql-reference/data-types/index.md
index 5f82d86ce46..0db65e66630 100644
--- a/docs/ja/sql-reference/data-types/index.md
+++ b/docs/ja/sql-reference/data-types/index.md
@@ -12,4 +12,4 @@ ClickHouseは、表のセルにさまざまな種類のデータを格納でき
 
 この章ではサポートされているデータの種類と特別な配慮のための利用および/または実施しています。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/int-uint.md b/docs/ja/sql-reference/data-types/int-uint.md
index e6ac277b3b5..1248c2940b7 100644
--- a/docs/ja/sql-reference/data-types/int-uint.md
+++ b/docs/ja/sql-reference/data-types/int-uint.md
@@ -24,4 +24,4 @@ toc_title: "UInt8\u3001UInt16\u3001UInt32\u3001UInt64\u3001Int8\u3001Int16\u3001
 -   UInt32-\[0:4294967295\]
 -   UInt64-\[0:18446744073709551615\]
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/int_uint/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/map.md b/docs/ja/sql-reference/data-types/map.md
new file mode 120000
index 00000000000..20de64e06d7
--- /dev/null
+++ b/docs/ja/sql-reference/data-types/map.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/map.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/multiword-types.md b/docs/ja/sql-reference/data-types/multiword-types.md
new file mode 120000
index 00000000000..aeb86eadd2b
--- /dev/null
+++ b/docs/ja/sql-reference/data-types/multiword-types.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/multiword-types.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/nested-data-structures/index.md b/docs/ja/sql-reference/data-types/nested-data-structures/index.md
index d003868a135..c4b1f387bfe 100644
--- a/docs/ja/sql-reference/data-types/nested-data-structures/index.md
+++ b/docs/ja/sql-reference/data-types/nested-data-structures/index.md
@@ -9,4 +9,4 @@ toc_title: "\u96A0\u3057"
 
 # 入れ子データ構造 {#nested-data-structures}
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/nested_data_structures/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/nested_data_structures/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/nested-data-structures/nested.md b/docs/ja/sql-reference/data-types/nested-data-structures/nested.md
index 68b6337a15e..2b1461d4e65 100644
--- a/docs/ja/sql-reference/data-types/nested-data-structures/nested.md
+++ b/docs/ja/sql-reference/data-types/nested-data-structures/nested.md
@@ -103,4 +103,4 @@ DESCRIBEクエリの場合、入れ子になったデータ構造の列は、同
 
 入れ子になったデータ構造内の要素のALTERクエリには制限があります。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/nullable.md b/docs/ja/sql-reference/data-types/nullable.md
index 5c6631aa99a..007e7ad1668 100644
--- a/docs/ja/sql-reference/data-types/nullable.md
+++ b/docs/ja/sql-reference/data-types/nullable.md
@@ -43,4 +43,4 @@ SELECT x + y FROM t_null
 └────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/nullable/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/nullable/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/simpleaggregatefunction.md b/docs/ja/sql-reference/data-types/simpleaggregatefunction.md
index 9d28bcdb62c..f486feddb2b 100644
--- a/docs/ja/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/ja/sql-reference/data-types/simpleaggregatefunction.md
@@ -37,4 +37,4 @@ CREATE TABLE t
 ) ENGINE = ...
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/special-data-types/expression.md b/docs/ja/sql-reference/data-types/special-data-types/expression.md
index f777929abb6..f2f7f881ee1 100644
--- a/docs/ja/sql-reference/data-types/special-data-types/expression.md
+++ b/docs/ja/sql-reference/data-types/special-data-types/expression.md
@@ -9,4 +9,4 @@ toc_title: "\u5F0F"
 
 式は、高次関数のラムダを表すために使用されます。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/special_data_types/expression/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/special_data_types/expression/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/special-data-types/index.md b/docs/ja/sql-reference/data-types/special-data-types/index.md
index 4ad98970909..9ae66028cc1 100644
--- a/docs/ja/sql-reference/data-types/special-data-types/index.md
+++ b/docs/ja/sql-reference/data-types/special-data-types/index.md
@@ -11,4 +11,4 @@ toc_title: "\u96A0\u3057"
 
 特別なデータ型の値は、テーブルへの保存やクエリ結果の出力のためにシリアル化することはできませんが、クエリ実行時の中間結果として使用でき
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/special_data_types/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/special_data_types/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/special-data-types/nothing.md b/docs/ja/sql-reference/data-types/special-data-types/nothing.md
index 796a11f7a29..c4339a86752 100644
--- a/docs/ja/sql-reference/data-types/special-data-types/nothing.md
+++ b/docs/ja/sql-reference/data-types/special-data-types/nothing.md
@@ -23,4 +23,4 @@ SELECT toTypeName(array())
 └─────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/special_data_types/nothing/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/special_data_types/nothing/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/special-data-types/set.md b/docs/ja/sql-reference/data-types/special-data-types/set.md
index bb4cded3df2..01bfff2e8c1 100644
--- a/docs/ja/sql-reference/data-types/special-data-types/set.md
+++ b/docs/ja/sql-reference/data-types/special-data-types/set.md
@@ -9,4 +9,4 @@ toc_title: "\u30BB\u30C3\u30C8"
 
 の右半分に使用されます [IN](../../operators/in.md#select-in-operators) 式。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/special_data_types/set/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/special_data_types/set/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/string.md b/docs/ja/sql-reference/data-types/string.md
index f487314e5cb..266c0260022 100644
--- a/docs/ja/sql-reference/data-types/string.md
+++ b/docs/ja/sql-reference/data-types/string.md
@@ -17,4 +17,4 @@ ClickHouseにはエンコーディングの概念はありません。 文字列
 同様に、文字列を操作するための特定の関数には、UTF-8でエンコードされたテキストを表すバイトセットが文字列に含まれているという前提の下で
 例えば、 ‘length’ 関数は、文字列の長さをバイト単位で計算します。 ‘lengthUTF8’ 関数は、値がUTF-8でエンコードされていると仮定して、Unicodeコードポイントで文字列の長さを計算します。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/string/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/string/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/tuple.md b/docs/ja/sql-reference/data-types/tuple.md
index 7dbd2f3ea17..10ee6046daa 100644
--- a/docs/ja/sql-reference/data-types/tuple.md
+++ b/docs/ja/sql-reference/data-types/tuple.md
@@ -49,4 +49,4 @@ SELECT tuple(1, NULL) AS x, toTypeName(x)
 └──────────┴─────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/tuple/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/tuple/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/uuid.md b/docs/ja/sql-reference/data-types/uuid.md
index 3c691dda362..ca5cccfa8cd 100644
--- a/docs/ja/sql-reference/data-types/uuid.md
+++ b/docs/ja/sql-reference/data-types/uuid.md
@@ -74,4 +74,4 @@ UUIDデータ型は、以下の関数のみをサポートします [文字列](
 
 Uuidデータ型は、算術演算ではサポートされません(たとえば, [abs](../../sql-reference/functions/arithmetic-functions.md#arithm_func-abs)）または、以下のような集計関数 [和](../../sql-reference/aggregate-functions/reference.md#agg_function-sum) と [avg](../../sql-reference/aggregate-functions/reference.md#agg_function-avg).
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/uuid/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
index 1e99b782043..38eab3f38e2 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
@@ -67,4 +67,4 @@ ClickHouseは、階層辞書をサポートしています [数値キー](extern
 </dictionary>
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index ac632b99332..3286cf04113 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
@@ -399,4 +399,4 @@ dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
 
 データは `trie`. それはRAMに完全に収まる必要があります。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
index 154c5b40bfb..2ead32f409a 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@@ -88,4 +88,4 @@ SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source wher
 ...
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
new file mode 120000
index 00000000000..a8e9c37c515
--- /dev/null
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index f29a608b85e..5aefd7050e3 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -627,4 +627,4 @@ SOURCE(REDIS(
 -   `storage_type` – The structure of internal Redis storage using for work with keys. `simple` は簡単な源のためのハッシュされたシングルキー源, `hash_map` 二つのキーを持つハッシュソース用です。 距源およびキャッシュ源の複雑な鍵サポートされていません。 省略可能であり、デフォルト値は `simple`.
 -   `db_index` – The specific numeric index of Redis logical database. May be omitted, default value is 0.
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index b35b0477b75..c8d9cb969b9 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -172,4 +172,4 @@ CREATE DICTIONARY somename (
 
 -   [外部辞書を操作するための関数](../../../sql-reference/functions/ext-dict-functions.md).
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
index 6972e09e324..6276b69bbfd 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
@@ -50,4 +50,4 @@ LIFETIME(...) -- Lifetime of dictionary in memory
 -   [構造](external-dicts-dict-structure.md) — Structure of the dictionary . A key and attributes that can be retrieved by this key.
 -   [生涯](external-dicts-dict-lifetime.md) — Frequency of dictionary updates.
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts.md
index 01e6e57d2ca..4f90ac18267 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts.md
@@ -59,4 +59,4 @@ toc_title: "\u4E00\u822C\u7684\u306A\u8AAC\u660E"
 -   [辞書キーとフィールド](external-dicts-dict-structure.md)
 -   [外部辞書を操作するための関数](../../../sql-reference/functions/ext-dict-functions.md)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/index.md b/docs/ja/sql-reference/dictionaries/index.md
index cb6bb168e1f..f4e6b9b2706 100644
--- a/docs/ja/sql-reference/dictionaries/index.md
+++ b/docs/ja/sql-reference/dictionaries/index.md
@@ -19,4 +19,4 @@ ClickHouseサポート:
 -   [組み込み辞書](internal-dicts.md#internal_dicts) 特定の [関数のセット](../../sql-reference/functions/ym-dict-functions.md).
 -   [プラグイン(外部)辞書](external-dictionaries/external-dicts.md#dicts-external-dicts) と [関数のセット](../../sql-reference/functions/ext-dict-functions.md).
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/internal-dicts.md b/docs/ja/sql-reference/dictionaries/internal-dicts.md
index 81b75075c27..74eb384d427 100644
--- a/docs/ja/sql-reference/dictionaries/internal-dicts.md
+++ b/docs/ja/sql-reference/dictionaries/internal-dicts.md
@@ -52,4 +52,4 @@ Geobaseで辞書を定期的に更新することをお勧めします。 更新
 
 OS識別子とYandexを操作するための機能もあります。Metricaの調査エンジン、しかしそれらは使用されるべきではない。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
diff --git a/docs/ja/sql-reference/distributed-ddl.md b/docs/ja/sql-reference/distributed-ddl.md
new file mode 120000
index 00000000000..705fba9bc0f
--- /dev/null
+++ b/docs/ja/sql-reference/distributed-ddl.md
@@ -0,0 +1 @@
+../../en/sql-reference/distributed-ddl.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/arithmetic-functions.md b/docs/ja/sql-reference/functions/arithmetic-functions.md
index 0afd85b63bc..77cc76d2f82 100644
--- a/docs/ja/sql-reference/functions/arithmetic-functions.md
+++ b/docs/ja/sql-reference/functions/arithmetic-functions.md
@@ -84,4 +84,4 @@ You can also calculate integer numbers from a date or date with time. The idea i
 数値の最小公倍数を返します。
 例外は、ゼロで除算するとき、または最小の負の数をマイナスで除算するときにスローされます。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/array-functions.md b/docs/ja/sql-reference/functions/array-functions.md
index 6eab7656c25..efb6cebab61 100644
--- a/docs/ja/sql-reference/functions/array-functions.md
+++ b/docs/ja/sql-reference/functions/array-functions.md
@@ -702,13 +702,13 @@ arrayDifference(array)
 
 **パラメータ**
 
--   `array` – [配列](https://clickhouse.tech/docs/en/data_types/array/).
+-   `array` – [配列](https://clickhouse.com/docs/en/data_types/array/).
 
 **戻り値**
 
 隣接する要素間の差分の配列を返します。
 
-タイプ: [UInt\*](https://clickhouse.tech/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.tech/docs/en/data_types/int_uint/#int-ranges), [フロート\*](https://clickhouse.tech/docs/en/data_types/float/).
+タイプ: [UInt\*](https://clickhouse.com/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.com/docs/en/data_types/int_uint/#int-ranges), [フロート\*](https://clickhouse.com/docs/en/data_types/float/).
 
 **例**
 
@@ -754,7 +754,7 @@ arrayDistinct(array)
 
 **パラメータ**
 
--   `array` – [配列](https://clickhouse.tech/docs/en/data_types/array/).
+-   `array` – [配列](https://clickhouse.com/docs/en/data_types/array/).
 
 **戻り値**
 
@@ -1058,4 +1058,4 @@ select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])
 └────────────────────────────────────────---──┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/array_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/array_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/array-join.md b/docs/ja/sql-reference/functions/array-join.md
index d3a2ab76398..c50be7750a9 100644
--- a/docs/ja/sql-reference/functions/array-join.md
+++ b/docs/ja/sql-reference/functions/array-join.md
@@ -34,4 +34,4 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
 └─────┴───────────┴─────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/array_join/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/array_join/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/bit-functions.md b/docs/ja/sql-reference/functions/bit-functions.md
index 6ea1189f6a4..909cbf6f01f 100644
--- a/docs/ja/sql-reference/functions/bit-functions.md
+++ b/docs/ja/sql-reference/functions/bit-functions.md
@@ -252,4 +252,4 @@ SELECT bitCount(333)
 └───────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/bit_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/bit_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/bitmap-functions.md b/docs/ja/sql-reference/functions/bitmap-functions.md
index de3ce938444..89a165d7ff8 100644
--- a/docs/ja/sql-reference/functions/bitmap-functions.md
+++ b/docs/ja/sql-reference/functions/bitmap-functions.md
@@ -493,4 +493,4 @@ SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
 └─────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/comparison-functions.md b/docs/ja/sql-reference/functions/comparison-functions.md
index ab223c36c6b..0e09ebe2e62 100644
--- a/docs/ja/sql-reference/functions/comparison-functions.md
+++ b/docs/ja/sql-reference/functions/comparison-functions.md
@@ -34,4 +34,4 @@ toc_title: "\u6BD4\u8F03"
 
 ## greaterOrEquals,\>=演算子 {#function-greaterorequals}
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/comparison_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/comparison_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/conditional-functions.md b/docs/ja/sql-reference/functions/conditional-functions.md
index 2a18caf743f..c553d6a61f7 100644
--- a/docs/ja/sql-reference/functions/conditional-functions.md
+++ b/docs/ja/sql-reference/functions/conditional-functions.md
@@ -204,4 +204,4 @@ FROM LEFT_RIGHT
 └──────┴───────┴──────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/conditional_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/conditional_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/date-time-functions.md b/docs/ja/sql-reference/functions/date-time-functions.md
index a0d51439339..565b10eaece 100644
--- a/docs/ja/sql-reference/functions/date-time-functions.md
+++ b/docs/ja/sql-reference/functions/date-time-functions.md
@@ -447,4 +447,4 @@ Function formats a Time according given Format string. N.B.: Format is a constan
 | %Y     | 年                                              | 2018       |
 | %%     | %記号                                           | %          |
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/date_time_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/date_time_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/encoding-functions.md b/docs/ja/sql-reference/functions/encoding-functions.md
index c3eaeaa18c3..91811489028 100644
--- a/docs/ja/sql-reference/functions/encoding-functions.md
+++ b/docs/ja/sql-reference/functions/encoding-functions.md
@@ -172,4 +172,4 @@ FixedString(16)値を受け取ります。 36文字を含む文字列をテキ
 
 整数を受け取ります。 合計されたときにソース番号を合計する二つのべき乗のリストを含むUInt64数値の配列を返します。 配列内の数値は昇順です。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/encoding_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/encoding_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/encryption-functions.md b/docs/ja/sql-reference/functions/encryption-functions.md
new file mode 120000
index 00000000000..8d33d60a5ba
--- /dev/null
+++ b/docs/ja/sql-reference/functions/encryption-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/encryption-functions.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/ext-dict-functions.md b/docs/ja/sql-reference/functions/ext-dict-functions.md
index 8a438d6e935..6a90d99a5f0 100644
--- a/docs/ja/sql-reference/functions/ext-dict-functions.md
+++ b/docs/ja/sql-reference/functions/ext-dict-functions.md
@@ -202,4 +202,4 @@ dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 
 ClickHouseは、属性の値を解析できない場合、または値が属性データ型と一致しない場合に例外をスローします。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/files.md b/docs/ja/sql-reference/functions/files.md
new file mode 120000
index 00000000000..df6eac6031e
--- /dev/null
+++ b/docs/ja/sql-reference/functions/files.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/files.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/functions-for-nulls.md b/docs/ja/sql-reference/functions/functions-for-nulls.md
index cbd981a3530..5b509735945 100644
--- a/docs/ja/sql-reference/functions/functions-for-nulls.md
+++ b/docs/ja/sql-reference/functions/functions-for-nulls.md
@@ -309,4 +309,4 @@ SELECT toTypeName(toNullable(10))
 └────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/geo.md b/docs/ja/sql-reference/functions/geo.md
index 4237e43b8dc..01444843f9c 100644
--- a/docs/ja/sql-reference/functions/geo.md
+++ b/docs/ja/sql-reference/functions/geo.md
@@ -507,4 +507,4 @@ SELECT h3GetResolution(617420388352917503) as res
 └─────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/geo/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/geo/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/geo/coordinates.md b/docs/ja/sql-reference/functions/geo/coordinates.md
new file mode 120000
index 00000000000..f3f694c50c9
--- /dev/null
+++ b/docs/ja/sql-reference/functions/geo/coordinates.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/coordinates.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/geo/geohash.md b/docs/ja/sql-reference/functions/geo/geohash.md
new file mode 120000
index 00000000000..5b17ac944bb
--- /dev/null
+++ b/docs/ja/sql-reference/functions/geo/geohash.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/geohash.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/geo/h3.md b/docs/ja/sql-reference/functions/geo/h3.md
new file mode 120000
index 00000000000..eb3926f4e3e
--- /dev/null
+++ b/docs/ja/sql-reference/functions/geo/h3.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/h3.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/geo/index.md b/docs/ja/sql-reference/functions/geo/index.md
new file mode 120000
index 00000000000..8eb51e63d5b
--- /dev/null
+++ b/docs/ja/sql-reference/functions/geo/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/hash-functions.md b/docs/ja/sql-reference/functions/hash-functions.md
index a98ae60690d..2db2ace952b 100644
--- a/docs/ja/sql-reference/functions/hash-functions.md
+++ b/docs/ja/sql-reference/functions/hash-functions.md
@@ -481,4 +481,4 @@ SELECT xxHash32('Hello, world!');
 
 -   [xxHash](http://cyan4973.github.io/xxHash/).
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/hash_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/hash_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/higher-order-functions.md b/docs/ja/sql-reference/functions/higher-order-functions.md
index f130f9a2ee4..2d6a86c527d 100644
--- a/docs/ja/sql-reference/functions/higher-order-functions.md
+++ b/docs/ja/sql-reference/functions/higher-order-functions.md
@@ -261,4 +261,4 @@ SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
 
 詳細については、 `arrayReverseSort` 方法は、参照してください [配列を操作するための関数](array-functions.md#array_functions-reverse-sort) セクション
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/in-functions.md b/docs/ja/sql-reference/functions/in-functions.md
index 575f9787ec2..11149665474 100644
--- a/docs/ja/sql-reference/functions/in-functions.md
+++ b/docs/ja/sql-reference/functions/in-functions.md
@@ -23,4 +23,4 @@ For columns with the types T1, T2, …, it returns a Tuple(T1, T2, …) type tup
 ‘N’ 1から始まる列インデックスです。 Nは定数でなければなりません。 ‘N’ 定数でなければなりません。 ‘N’ 組のサイズより大きくない厳密なpostive整数でなければなりません。
 関数を実行するコストはありません。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/in_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/in_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/index.md b/docs/ja/sql-reference/functions/index.md
index 0a51bbb778e..9125df5bf8e 100644
--- a/docs/ja/sql-reference/functions/index.md
+++ b/docs/ja/sql-reference/functions/index.md
@@ -71,4 +71,4 @@ Functions can't change the values of their arguments – any changes are returne
 
 クエリ内の関数がリクエスタサーバで実行されているが、リモートサーバで実行する必要がある場合は、リクエスタサーバにラップすることができます。 ‘any’ 関数を集計するか、キーに追加します `GROUP BY`.
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/ip-address-functions.md b/docs/ja/sql-reference/functions/ip-address-functions.md
index 295a6f673b9..567ca0693b0 100644
--- a/docs/ja/sql-reference/functions/ip-address-functions.md
+++ b/docs/ja/sql-reference/functions/ip-address-functions.md
@@ -245,4 +245,4 @@ SELECT
 └───────────────────────────────────┴──────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/json-functions.md b/docs/ja/sql-reference/functions/json-functions.md
index 7ceb26c9c9d..8901af41e86 100644
--- a/docs/ja/sql-reference/functions/json-functions.md
+++ b/docs/ja/sql-reference/functions/json-functions.md
@@ -294,4 +294,4 @@ SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello"
 └───────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/json_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/json_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/logical-functions.md b/docs/ja/sql-reference/functions/logical-functions.md
index b1b35c56c43..3f55fd9610b 100644
--- a/docs/ja/sql-reference/functions/logical-functions.md
+++ b/docs/ja/sql-reference/functions/logical-functions.md
@@ -19,4 +19,4 @@ toc_title: "\u8AD6\u7406"
 
 ## xor {#xor}
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/logical_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/logical_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/math-functions.md b/docs/ja/sql-reference/functions/math-functions.md
index 656d1350043..732c92fd669 100644
--- a/docs/ja/sql-reference/functions/math-functions.md
+++ b/docs/ja/sql-reference/functions/math-functions.md
@@ -113,4 +113,4 @@ Yの累乗に近いFloat64の数値を返します。
 
 数値引数を受け取り、xの累乗に10に近いUInt64の数値を返します。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/math_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/nlp-functions.md b/docs/ja/sql-reference/functions/nlp-functions.md
new file mode 120000
index 00000000000..612039dcb2c
--- /dev/null
+++ b/docs/ja/sql-reference/functions/nlp-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/nlp-functions.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/other-functions.md b/docs/ja/sql-reference/functions/other-functions.md
index c590612aeeb..1c5d138e22e 100644
--- a/docs/ja/sql-reference/functions/other-functions.md
+++ b/docs/ja/sql-reference/functions/other-functions.md
@@ -1202,4 +1202,4 @@ SELECT number, randomPrintableASCII(30) as str, length(str) FROM system.numbers
 └────────┴────────────────────────────────┴──────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/other_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/other_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/random-functions.md b/docs/ja/sql-reference/functions/random-functions.md
index b976ed513ea..364b6d88e3b 100644
--- a/docs/ja/sql-reference/functions/random-functions.md
+++ b/docs/ja/sql-reference/functions/random-functions.md
@@ -62,4 +62,4 @@ FROM numbers(3)
 └────────────┴────────────┴──────────────┴────────────────┴─────────────────┴──────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/random_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/random_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/rounding-functions.md b/docs/ja/sql-reference/functions/rounding-functions.md
index d4f566e53f6..de9bc11ef96 100644
--- a/docs/ja/sql-reference/functions/rounding-functions.md
+++ b/docs/ja/sql-reference/functions/rounding-functions.md
@@ -187,4 +187,4 @@ roundBankers(10.755, 2) = 11,76
 
 数値を受け取り、指定された配列内の要素に切り捨てます。 値が最低限界より小さい場合は、最低限界が返されます。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/rounding_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/rounding_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/splitting-merging-functions.md b/docs/ja/sql-reference/functions/splitting-merging-functions.md
index 5f95efc793e..b348c3a8184 100644
--- a/docs/ja/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/ja/sql-reference/functions/splitting-merging-functions.md
@@ -114,4 +114,4 @@ SELECT alphaTokens('abca1abc')
 └─────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/string-functions.md b/docs/ja/sql-reference/functions/string-functions.md
index 2c436cd2419..09e00ab1ce5 100644
--- a/docs/ja/sql-reference/functions/string-functions.md
+++ b/docs/ja/sql-reference/functions/string-functions.md
@@ -486,4 +486,4 @@ CRC-64-ECMA多項式を使用して、文字列のCRC64チェックサムを返
 
 結果の型はUInt64です。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/string_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/string_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/string-replace-functions.md b/docs/ja/sql-reference/functions/string-replace-functions.md
index ea1b9cb66cd..b0621c99029 100644
--- a/docs/ja/sql-reference/functions/string-replace-functions.md
+++ b/docs/ja/sql-reference/functions/string-replace-functions.md
@@ -91,4 +91,4 @@ SELECT replaceRegexpAll('Hello, World!', '^', 'here: ') AS res
 この実装はre2::RE2::QuoteMetaとは若干異なります。 ゼロバイトは00の代わりに\\0としてエスケープされ、必要な文字のみがエスケープされます。
 詳細は、リンクを参照してください: [RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/string-search-functions.md b/docs/ja/sql-reference/functions/string-search-functions.md
index e5858ba4941..faa904e39ba 100644
--- a/docs/ja/sql-reference/functions/string-search-functions.md
+++ b/docs/ja/sql-reference/functions/string-search-functions.md
@@ -380,4 +380,4 @@ SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])
 !!! note "注"
     For UTF-8 case we use 3-gram distance. All these are not perfectly fair n-gram distances. We use 2-byte hashes to hash n-grams and then calculate the (non-)symmetric difference between these hash tables – collisions may occur. With UTF-8 case-insensitive format we do not use fair `tolower` function – we zero the 5-th bit (starting from zero) of each codepoint byte and first bit of zeroth byte if bytes more than one – this works for Latin and mostly for all Cyrillic letters.
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/string_search_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/string_search_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/tuple-functions.md b/docs/ja/sql-reference/functions/tuple-functions.md
new file mode 120000
index 00000000000..daaf22f11f4
--- /dev/null
+++ b/docs/ja/sql-reference/functions/tuple-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/tuple-functions.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/tuple-map-functions.md b/docs/ja/sql-reference/functions/tuple-map-functions.md
new file mode 120000
index 00000000000..e77338e1118
--- /dev/null
+++ b/docs/ja/sql-reference/functions/tuple-map-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/tuple-map-functions.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/type-conversion-functions.md b/docs/ja/sql-reference/functions/type-conversion-functions.md
index 7058407d5b5..fd935c23d5f 100644
--- a/docs/ja/sql-reference/functions/type-conversion-functions.md
+++ b/docs/ja/sql-reference/functions/type-conversion-functions.md
@@ -531,4 +531,4 @@ SELECT parseDateTimeBestEffort('10 20:19')
 
 同じように [parseDateTimeBestEffort](#parsedatetimebesteffort) ただし、処理できない日付形式が検出されたときにゼロの日付またはゼロの日付時刻を返します。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/url-functions.md b/docs/ja/sql-reference/functions/url-functions.md
index 22e8dbd028d..02da4602618 100644
--- a/docs/ja/sql-reference/functions/url-functions.md
+++ b/docs/ja/sql-reference/functions/url-functions.md
@@ -206,4 +206,4 @@ URLに類似のものがない場合、URLは変更されません。
 
 を削除します。 ‘name’ URLパラメータが存在する場合。 この関数は、パラメータ名が渡された引数とまったく同じ方法でURLにエンコードされるという前提の下で機能します。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/url_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/url_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/uuid-functions.md b/docs/ja/sql-reference/functions/uuid-functions.md
index 138d54b4d84..230a719eef1 100644
--- a/docs/ja/sql-reference/functions/uuid-functions.md
+++ b/docs/ja/sql-reference/functions/uuid-functions.md
@@ -119,4 +119,4 @@ SELECT
 
 -   [dictGetUUID](ext-dict-functions.md#ext_dict_functions-other)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/uuid_function/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/uuid_function/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/ym-dict-functions.md b/docs/ja/sql-reference/functions/ym-dict-functions.md
index 53721e07103..f6120172249 100644
--- a/docs/ja/sql-reference/functions/ym-dict-functions.md
+++ b/docs/ja/sql-reference/functions/ym-dict-functions.md
@@ -152,4 +152,4 @@ Accepts a UInt32 number – the region ID from the Yandex geobase. A string with
 
 `ua` と `uk` もうクです。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/index.md b/docs/ja/sql-reference/index.md
index 31d451b63a9..f548d4e0ed3 100644
--- a/docs/ja/sql-reference/index.md
+++ b/docs/ja/sql-reference/index.md
@@ -17,4 +17,4 @@ ClickHouseは次の種類のクエリをサポートします:
 -   [ALTER](statements/alter.md#query_language_queries_alter)
 -   [その他の種類のクエリ](statements/misc.md)
 
-[元の記事](https://clickhouse.tech/docs/en/sql-reference/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/sql-reference/) <!--hide-->
diff --git a/docs/ja/sql-reference/operators/index.md b/docs/ja/sql-reference/operators/index.md
index 37be3231a6c..1629229ad7e 100644
--- a/docs/ja/sql-reference/operators/index.md
+++ b/docs/ja/sql-reference/operators/index.md
@@ -274,4 +274,4 @@ SELECT * FROM t_null WHERE y IS NOT NULL
 └───┴───┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/operators/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/operators/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/alter.md b/docs/ja/sql-reference/statements/alter.md
index 0967f60e06a..5f17471747d 100644
--- a/docs/ja/sql-reference/statements/alter.md
+++ b/docs/ja/sql-reference/statements/alter.md
@@ -599,4 +599,4 @@ ALTER SETTINGS PROFILE [IF EXISTS] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/alter/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/alter/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/alter/column.md b/docs/ja/sql-reference/statements/alter/column.md
new file mode 120000
index 00000000000..e1123d197fe
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/column.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/column.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/constraint.md b/docs/ja/sql-reference/statements/alter/constraint.md
new file mode 120000
index 00000000000..e3b245408d1
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/constraint.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/constraint.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/delete.md b/docs/ja/sql-reference/statements/alter/delete.md
new file mode 120000
index 00000000000..b9d6a233197
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/delete.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/delete.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/index.md b/docs/ja/sql-reference/statements/alter/index.md
new file mode 120000
index 00000000000..cd1bda718a5
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/index/index.md b/docs/ja/sql-reference/statements/alter/index/index.md
new file mode 120000
index 00000000000..b754fa71b83
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/index/index.md
@@ -0,0 +1 @@
+../../../../../en/sql-reference/statements/alter/index/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/order-by.md b/docs/ja/sql-reference/statements/alter/order-by.md
new file mode 120000
index 00000000000..ef5a22dc165
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/order-by.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/order-by.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/partition.md b/docs/ja/sql-reference/statements/alter/partition.md
new file mode 120000
index 00000000000..09a6fa34645
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/partition.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/partition.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/projection.md b/docs/ja/sql-reference/statements/alter/projection.md
new file mode 120000
index 00000000000..b7365ec9fe4
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/projection.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/projection.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/quota.md b/docs/ja/sql-reference/statements/alter/quota.md
new file mode 120000
index 00000000000..c6c477c3b61
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/quota.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/quota.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/role.md b/docs/ja/sql-reference/statements/alter/role.md
new file mode 120000
index 00000000000..ce1f0a94eb3
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/role.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/role.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/row-policy.md b/docs/ja/sql-reference/statements/alter/row-policy.md
new file mode 120000
index 00000000000..09ad2d301f3
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/row-policy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/row-policy.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/sample-by.md b/docs/ja/sql-reference/statements/alter/sample-by.md
new file mode 120000
index 00000000000..fda9d991f40
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/sample-by.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/sample-by.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/setting.md b/docs/ja/sql-reference/statements/alter/setting.md
new file mode 120000
index 00000000000..12fdba11505
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/setting.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/setting.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/settings-profile.md b/docs/ja/sql-reference/statements/alter/settings-profile.md
new file mode 120000
index 00000000000..0e71ac4e831
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/settings-profile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/settings-profile.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/ttl.md b/docs/ja/sql-reference/statements/alter/ttl.md
new file mode 120000
index 00000000000..94a112e7a17
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/ttl.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/ttl.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/update.md b/docs/ja/sql-reference/statements/alter/update.md
new file mode 120000
index 00000000000..fa9be21c070
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/update.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/update.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/user.md b/docs/ja/sql-reference/statements/alter/user.md
new file mode 120000
index 00000000000..9379ef3aaf6
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/user.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/user.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/view.md b/docs/ja/sql-reference/statements/alter/view.md
new file mode 120000
index 00000000000..89bdcee5912
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/view.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/view.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/attach.md b/docs/ja/sql-reference/statements/attach.md
new file mode 120000
index 00000000000..54672449823
--- /dev/null
+++ b/docs/ja/sql-reference/statements/attach.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/attach.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/check-table.md b/docs/ja/sql-reference/statements/check-table.md
new file mode 120000
index 00000000000..1ce3a05c6ea
--- /dev/null
+++ b/docs/ja/sql-reference/statements/check-table.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/check-table.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create.md b/docs/ja/sql-reference/statements/create.md
index 1d1f2c57556..0117b082faf 100644
--- a/docs/ja/sql-reference/statements/create.md
+++ b/docs/ja/sql-reference/statements/create.md
@@ -147,8 +147,6 @@ ENGINE = <Engine>
 ...
 ```
 
-コーデックが指定されている場合、既定のコーデックは適用されません。 コーデックはパイプラインで結合できます。, `CODEC(Delta, ZSTD)`. の選定と大型ブリッジダイオードコーデックの組み合わせますプロジェクト、ベンチマークと同様に記載のAltinity [ClickHouseの効率を改善する新しい符号化](https://www.altinity.com/blog/2019/7/new-encodings-to-improve-clickhouse) 記事だ
-
 !!! warning "警告"
     できない解凍ClickHouseデータベースファイルを外部の事のように `lz4`. 代わりに、特別な [clickhouse-コンプレッサー](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor) ユーティリティ
 
@@ -499,4 +497,4 @@ CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_na
 CREATE SETTINGS PROFILE max_memory_usage_profile SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 TO robin
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/create/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/create/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/create/database.md b/docs/ja/sql-reference/statements/create/database.md
new file mode 120000
index 00000000000..4c8069ab92b
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/database.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/database.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/dictionary.md b/docs/ja/sql-reference/statements/create/dictionary.md
new file mode 120000
index 00000000000..e9eff6ba066
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/dictionary.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/dictionary.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/function.md b/docs/ja/sql-reference/statements/create/function.md
new file mode 120000
index 00000000000..d41429cb260
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/function.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/function.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/index.md b/docs/ja/sql-reference/statements/create/index.md
new file mode 120000
index 00000000000..0f8d5c71d28
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/quota.md b/docs/ja/sql-reference/statements/create/quota.md
new file mode 120000
index 00000000000..f941b7bcdad
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/quota.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/quota.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/role.md b/docs/ja/sql-reference/statements/create/role.md
new file mode 120000
index 00000000000..d48b490bb1f
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/role.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/role.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/row-policy.md b/docs/ja/sql-reference/statements/create/row-policy.md
new file mode 120000
index 00000000000..383ef88ed1f
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/row-policy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/row-policy.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/settings-profile.md b/docs/ja/sql-reference/statements/create/settings-profile.md
new file mode 120000
index 00000000000..093dd9adcde
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/settings-profile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/settings-profile.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/table.md b/docs/ja/sql-reference/statements/create/table.md
new file mode 120000
index 00000000000..61a92816de6
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/table.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/table.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/user.md b/docs/ja/sql-reference/statements/create/user.md
new file mode 120000
index 00000000000..5c4882bede7
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/user.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/user.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/view.md b/docs/ja/sql-reference/statements/create/view.md
new file mode 120000
index 00000000000..7fbc2d67bec
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/view.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/view.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/describe-table.md b/docs/ja/sql-reference/statements/describe-table.md
new file mode 120000
index 00000000000..eb76534f3cd
--- /dev/null
+++ b/docs/ja/sql-reference/statements/describe-table.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/describe-table.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/detach.md b/docs/ja/sql-reference/statements/detach.md
new file mode 120000
index 00000000000..19d37ee535a
--- /dev/null
+++ b/docs/ja/sql-reference/statements/detach.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/detach.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/drop.md b/docs/ja/sql-reference/statements/drop.md
new file mode 120000
index 00000000000..48fe0648c6b
--- /dev/null
+++ b/docs/ja/sql-reference/statements/drop.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/drop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/exchange.md b/docs/ja/sql-reference/statements/exchange.md
new file mode 120000
index 00000000000..8213eac93b7
--- /dev/null
+++ b/docs/ja/sql-reference/statements/exchange.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/exchange.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/exists.md b/docs/ja/sql-reference/statements/exists.md
new file mode 120000
index 00000000000..d69e8224fe6
--- /dev/null
+++ b/docs/ja/sql-reference/statements/exists.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/exists.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/explain.md b/docs/ja/sql-reference/statements/explain.md
new file mode 120000
index 00000000000..36f1f2cc9d4
--- /dev/null
+++ b/docs/ja/sql-reference/statements/explain.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/explain.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/grant.md b/docs/ja/sql-reference/statements/grant.md
index 4a088e0e78b..6300ecd2987 100644
--- a/docs/ja/sql-reference/statements/grant.md
+++ b/docs/ja/sql-reference/statements/grant.md
@@ -475,4 +475,4 @@ GRANT INSERT(x,y) ON db.table TO john
 
 この `ADMIN OPTION` 特典できるユーザー補助金の役割を他のユーザーです。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/grant/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/grant/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/insert-into.md b/docs/ja/sql-reference/statements/insert-into.md
index 2709137a04e..d9e8821a70c 100644
--- a/docs/ja/sql-reference/statements/insert-into.md
+++ b/docs/ja/sql-reference/statements/insert-into.md
@@ -77,4 +77,4 @@ INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
 -   データはリアルタイムで追加されます。
 -   アップロードしたデータとは、通常はソートされました。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/insert_into/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/insert_into/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/kill.md b/docs/ja/sql-reference/statements/kill.md
new file mode 120000
index 00000000000..1afbc9008f3
--- /dev/null
+++ b/docs/ja/sql-reference/statements/kill.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/kill.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/misc.md b/docs/ja/sql-reference/statements/misc.md
index d4f4b245c9a..71202782ab4 100644
--- a/docs/ja/sql-reference/statements/misc.md
+++ b/docs/ja/sql-reference/statements/misc.md
@@ -355,4 +355,4 @@ USE db
 現在のデータベースは、データベースがクエリで明示的に定義されていない場合、テーブルの検索に使用されます。
 セッションの概念がないため、HTTPプロトコルを使用する場合は、このクエリを実行できません。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/misc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/misc/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/rename.md b/docs/ja/sql-reference/statements/rename.md
new file mode 120000
index 00000000000..889822decaa
--- /dev/null
+++ b/docs/ja/sql-reference/statements/rename.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/rename.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/select/all.md b/docs/ja/sql-reference/statements/select/all.md
new file mode 120000
index 00000000000..871440515a0
--- /dev/null
+++ b/docs/ja/sql-reference/statements/select/all.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/select/all.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/set-role.md b/docs/ja/sql-reference/statements/set-role.md
new file mode 120000
index 00000000000..a6525622a68
--- /dev/null
+++ b/docs/ja/sql-reference/statements/set-role.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/set-role.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/set.md b/docs/ja/sql-reference/statements/set.md
new file mode 120000
index 00000000000..02e106afc9f
--- /dev/null
+++ b/docs/ja/sql-reference/statements/set.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/set.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/show.md b/docs/ja/sql-reference/statements/show.md
index 8f2ee59a259..a68b5bf130f 100644
--- a/docs/ja/sql-reference/statements/show.md
+++ b/docs/ja/sql-reference/statements/show.md
@@ -166,4 +166,4 @@ Aで使用されたパラメータを示します [設定プロファイルの
 SHOW CREATE [SETTINGS] PROFILE name
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/show/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/system.md b/docs/ja/sql-reference/statements/system.md
index c15c3a79cd5..08c077e4fac 100644
--- a/docs/ja/sql-reference/statements/system.md
+++ b/docs/ja/sql-reference/statements/system.md
@@ -110,4 +110,4 @@ MergeTreeファミリ内のテーブルのバックグラウンドマージを
 SYSTEM START MERGES [[db.]merge_tree_family_table_name]
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/system/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/system/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/truncate.md b/docs/ja/sql-reference/statements/truncate.md
new file mode 120000
index 00000000000..92fbd705e8f
--- /dev/null
+++ b/docs/ja/sql-reference/statements/truncate.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/truncate.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/use.md b/docs/ja/sql-reference/statements/use.md
new file mode 120000
index 00000000000..7bdbf049326
--- /dev/null
+++ b/docs/ja/sql-reference/statements/use.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/use.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/watch.md b/docs/ja/sql-reference/statements/watch.md
new file mode 120000
index 00000000000..a79631bf222
--- /dev/null
+++ b/docs/ja/sql-reference/statements/watch.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/watch.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/syntax.md b/docs/ja/sql-reference/syntax.md
index 5d15f408b5d..49dd17e0cb1 100644
--- a/docs/ja/sql-reference/syntax.md
+++ b/docs/ja/sql-reference/syntax.md
@@ -184,4 +184,4 @@ Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception
 式のリストは、カンマで区切られた一つ以上の式です。
 関数と演算子は、引数として式を持つことができます。
 
-[元の記事](https://clickhouse.tech/docs/en/sql_reference/syntax/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/sql_reference/syntax/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/cluster.md b/docs/ja/sql-reference/table-functions/cluster.md
new file mode 120000
index 00000000000..4721debec48
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/cluster.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/cluster.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/dictionary.md b/docs/ja/sql-reference/table-functions/dictionary.md
new file mode 120000
index 00000000000..f9f453831a4
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/dictionary.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/dictionary.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/file.md b/docs/ja/sql-reference/table-functions/file.md
index 7f93df69495..fe7484ace49 100644
--- a/docs/ja/sql-reference/table-functions/file.md
+++ b/docs/ja/sql-reference/table-functions/file.md
@@ -116,6 +116,6 @@ FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
 
 **も参照。**
 
--   [仮想列](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [仮想列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/file/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/file/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/generate.md b/docs/ja/sql-reference/table-functions/generate.md
index 0e76b88945e..1fa8fdcbb94 100644
--- a/docs/ja/sql-reference/table-functions/generate.md
+++ b/docs/ja/sql-reference/table-functions/generate.md
@@ -41,4 +41,4 @@ SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(
 └──────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/generate/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/generate/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/hdfs.md b/docs/ja/sql-reference/table-functions/hdfs.md
index 23772bc2400..b166b13d698 100644
--- a/docs/ja/sql-reference/table-functions/hdfs.md
+++ b/docs/ja/sql-reference/table-functions/hdfs.md
@@ -99,6 +99,6 @@ FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name Strin
 
 **も参照。**
 
--   [仮想列](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [仮想列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/hdfs/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/hdfs/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/index.md b/docs/ja/sql-reference/table-functions/index.md
index 10ef4b991af..5ea4266466c 100644
--- a/docs/ja/sql-reference/table-functions/index.md
+++ b/docs/ja/sql-reference/table-functions/index.md
@@ -35,4 +35,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 | [odbc](odbc.md)       | を作成します。 [ODBC](../../engines/table-engines/integrations/odbc.md)-エンジンテーブル。                                             |
 | [hdfs](hdfs.md)       | を作成します。 [HDFS](../../engines/table-engines/integrations/hdfs.md)-エンジンテーブル。                                             |
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/input.md b/docs/ja/sql-reference/table-functions/input.md
index f40be9d250f..ea3d64241fe 100644
--- a/docs/ja/sql-reference/table-functions/input.md
+++ b/docs/ja/sql-reference/table-functions/input.md
@@ -44,4 +44,4 @@ $ cat data.csv | clickhouse-client --query="INSERT INTO test FORMAT CSV"
 $ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT * FROM input('test_structure') FORMAT CSV"
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/input/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/input/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/jdbc.md b/docs/ja/sql-reference/table-functions/jdbc.md
index 313aefdf581..670c53a6663 100644
--- a/docs/ja/sql-reference/table-functions/jdbc.md
+++ b/docs/ja/sql-reference/table-functions/jdbc.md
@@ -37,4 +37,4 @@ FROM jdbc('mysql-dev?datasource_column', 'show databases') a
 INNER JOIN jdbc('self?datasource_column', 'show databases') b ON a.Database = b.name
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/merge.md b/docs/ja/sql-reference/table-functions/merge.md
index 46981706844..097b020f65a 100644
--- a/docs/ja/sql-reference/table-functions/merge.md
+++ b/docs/ja/sql-reference/table-functions/merge.md
@@ -11,4 +11,4 @@ toc_title: "\u30DE\u30FC\u30B8"
 
 テーブル構造は、正規表現に一致する最初に検出されたテーブルから取得されます。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/merge/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/mysql.md b/docs/ja/sql-reference/table-functions/mysql.md
index d7b494bb423..50c3dacaf3a 100644
--- a/docs/ja/sql-reference/table-functions/mysql.md
+++ b/docs/ja/sql-reference/table-functions/mysql.md
@@ -83,4 +83,4 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123')
 -   [その ‘MySQL’ 表エンジン](../../engines/table-engines/integrations/mysql.md)
 -   [外部辞書のソースとしてMySQLを使用する](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/mysql/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/mysql/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/null.md b/docs/ja/sql-reference/table-functions/null.md
new file mode 120000
index 00000000000..bff05386e28
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/null.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/null.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/numbers.md b/docs/ja/sql-reference/table-functions/numbers.md
index 3cc35fc2d82..04f1e10c459 100644
--- a/docs/ja/sql-reference/table-functions/numbers.md
+++ b/docs/ja/sql-reference/table-functions/numbers.md
@@ -27,4 +27,4 @@ SELECT * FROM system.numbers LIMIT 10;
 select toDate('2010-01-01') + number as d FROM numbers(365);
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/numbers/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/numbers/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/odbc.md b/docs/ja/sql-reference/table-functions/odbc.md
index 746a8e44ddf..10d285d66be 100644
--- a/docs/ja/sql-reference/table-functions/odbc.md
+++ b/docs/ja/sql-reference/table-functions/odbc.md
@@ -105,4 +105,4 @@ SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
 -   [ODBC外部辞書](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBCテーブルエンジン](../../engines/table-engines/integrations/odbc.md).
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/postgresql.md b/docs/ja/sql-reference/table-functions/postgresql.md
new file mode 120000
index 00000000000..4fb04199780
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/postgresql.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/postgresql.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/remote.md b/docs/ja/sql-reference/table-functions/remote.md
index b2ec55ec182..19a3b17beb6 100644
--- a/docs/ja/sql-reference/table-functions/remote.md
+++ b/docs/ja/sql-reference/table-functions/remote.md
@@ -82,4 +82,4 @@ example01-{01..02}-{1|2}
 
 `remoteSecure` -同じように `remote` but with secured connection. Default port — [tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) 設定または9440から。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/remote/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/remote/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/s3.md b/docs/ja/sql-reference/table-functions/s3.md
new file mode 120000
index 00000000000..1878638f6e2
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/s3.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/s3.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/s3Cluster.md b/docs/ja/sql-reference/table-functions/s3Cluster.md
new file mode 120000
index 00000000000..48e5367084e
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/s3Cluster.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/s3Cluster.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/sqlite.md b/docs/ja/sql-reference/table-functions/sqlite.md
new file mode 120000
index 00000000000..7f203c4d062
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/sqlite.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/sqlite.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/url.md b/docs/ja/sql-reference/table-functions/url.md
index 245bbae29e0..13362f9cff2 100644
--- a/docs/ja/sql-reference/table-functions/url.md
+++ b/docs/ja/sql-reference/table-functions/url.md
@@ -23,4 +23,4 @@ structure-テーブルの構造 `'UserID UInt64, Name String'` 形式。 列名
 SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/url/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/url/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/view.md b/docs/ja/sql-reference/table-functions/view.md
new file mode 120000
index 00000000000..19a5bf245cd
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/view.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/view.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/window-functions/index.md b/docs/ja/sql-reference/window-functions/index.md
new file mode 120000
index 00000000000..206505bf0eb
--- /dev/null
+++ b/docs/ja/sql-reference/window-functions/index.md
@@ -0,0 +1 @@
+../../../en/sql-reference/window-functions/index.md
\ No newline at end of file
diff --git a/docs/ja/whats-new/changelog/2020.md b/docs/ja/whats-new/changelog/2020.md
new file mode 120000
index 00000000000..f0fb97311d2
--- /dev/null
+++ b/docs/ja/whats-new/changelog/2020.md
@@ -0,0 +1 @@
+../../../en/whats-new/changelog/2020.md
\ No newline at end of file
diff --git a/docs/ja/whats-new/roadmap.md b/docs/ja/whats-new/roadmap.md
index 468d4599b8f..c67f7d977ea 100644
--- a/docs/ja/whats-new/roadmap.md
+++ b/docs/ja/whats-new/roadmap.md
@@ -16,4 +16,4 @@ toc_title: "\u30ED\u30FC\u30C9"
 -   外部認証サービスとの統合
 -   資源のプールのためのより精密な分布のクラスター能力とユーザー
 
-{## [元の記事](https://clickhouse.tech/docs/en/roadmap/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/roadmap/) ##}
diff --git a/docs/ja/whats-new/security-changelog.md b/docs/ja/whats-new/security-changelog.md
index aa93f9c42ae..73665a2bc0b 100644
--- a/docs/ja/whats-new/security-changelog.md
+++ b/docs/ja/whats-new/security-changelog.md
@@ -73,4 +73,4 @@ Debパッケージ内の不適切な構成は、データベースの不正使
 
 クレジット：英国の国立サイバーセキュリティセンター（NCSC)
 
-{## [元の記事](https://clickhouse.tech/docs/en/security_changelog/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/security_changelog/) ##}
diff --git a/docs/ru/commercial/cloud.md b/docs/ru/commercial/cloud.md
index e00fc3be673..549978f3cdf 100644
--- a/docs/ru/commercial/cloud.md
+++ b/docs/ru/commercial/cloud.md
@@ -5,54 +5,5 @@ toc_title: "Поставщики облачных услуг ClickHouse"
 
 # Поставщики облачных услуг ClickHouse {#clickhouse-cloud-service-providers}
 
-!!! info "Инфо"
-    Если вы запустили публичный облачный сервис с управляемым ClickHouse, не стесняйтесь [открыть pull request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) c добавлением его в последующий список.
-
-## Yandex Cloud {#yandex-cloud}
-
-[Yandex Managed Service for ClickHouse](https://cloud.yandex.ru/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) предоставляет следующие ключевые возможности:
-
--   полностью управляемый сервис ZooKeeper для [репликации ClickHouse](../engines/table-engines/mergetree-family/replication.md)
--   выбор типа хранилища
--   реплики в разных зонах доступности
--   шифрование и изоляция
--   автоматизированное техническое обслуживание
-
-## Altinity.Cloud {#altinity.cloud}
-
-[Altinity.Cloud](https://altinity.com/cloud-database/) — это полностью управляемый ClickHouse-as-a-Service для публичного облака Amazon.
-
--   быстрое развертывание кластеров ClickHouse на ресурсах Amazon.
--   легкое горизонтальное масштабирование также, как и вертикальное масштабирование узлов.
--   изолированные виртуальные сети для каждого клиента с общедоступным эндпоинтом или пирингом VPC.
--   настраиваемые типы и объемы хранилищ
--   cross-az масштабирование для повышения производительности и обеспечения высокой доступности
--   встроенный мониторинг и редактор SQL-запросов
-
-## Alibaba Cloud {#alibaba-cloud}
-
-Управляемый облачный сервис Alibaba для ClickHouse: [китайская площадка](https://www.aliyun.com/product/clickhouse), будет доступен на международной площадке в мае 2021 года. Сервис предоставляет следующие возможности:
-
--   надежный сервер для облачного хранилища на основе распределенной системы [Alibaba Cloud Apsara](https://www.alibabacloud.com/product/apsara-stack);
--   расширяемая по запросу емкость, без переноса данных вручную;
--   поддержка одноузловой и многоузловой архитектуры, архитектуры с одной или несколькими репликами, а также многоуровневого хранения cold и hot data;
--   поддержка прав доступа, one-key восстановления, многоуровневая защита сети, шифрование облачного диска;
--   полная интеграция с облачными системами логирования, базами данных и инструментами обработки данных;
--   встроенная платформа для мониторинга и управления базами данных;
--   техническая поддержка от экспертов по работе с базами данных.
-
-## SberCloud {#sbercloud}
-
-[Облачная платформа SberCloud.Advanced](https://sbercloud.ru/ru/advanced):
-
--   предоставляет более 50 высокотехнологичных сервисов;
--   позволяет быстро создавать и эффективно управлять ИТ-инфраструктурой, приложениями и интернет-сервисами;
--   радикально минимизирует ресурсы, требуемые для работы корпоративных ИТ-систем;
--   в разы сокращает время вывода новых продуктов на рынок.
-
-SberCloud.Advanced предоставляет [MapReduce Service (MRS)](https://docs.sbercloud.ru/mrs/ug/topics/ug__clickhouse.html) — надежную, безопасную и простую в использовании платформу корпоративного уровня для хранения, обработки и анализа больших данных. MRS позволяет быстро создавать и управлять кластерами ClickHouse.
-
--   Инстанс ClickHouse состоит из трех узлов ZooKeeper и нескольких узлов ClickHouse. Выделенный режим реплики используется для обеспечения высокой надежности двойных копий данных.
--   MRS предлагает возможности гибкого масштабирования при быстром росте сервисов в сценариях, когда емкости кластерного хранилища или вычислительных ресурсов процессора недостаточно. MRS в один клик предоставляет инструмент для балансировки данных при расширении узлов ClickHouse в кластере. Вы можете определить режим и время балансировки данных на основе характеристик сервиса, чтобы обеспечить доступность сервиса.
--   MRS использует архитектуру развертывания высокой доступности на основе Elastic Load Balance (ELB) — сервиса для автоматического распределения трафика на несколько внутренних узлов. Благодаря ELB, данные записываются в локальные таблицы и считываются из распределенных таблиц на разных узлах. Такая архитектура повышает отказоустойчивость кластера и гарантирует высокую доступность приложений.
-
+!!! info "Info"
+    Detailed public description for ClickHouse cloud services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/ru/commercial/index.md b/docs/ru/commercial/index.md
index 66b1b125823..00fb1be7625 100644
--- a/docs/ru/commercial/index.md
+++ b/docs/ru/commercial/index.md
@@ -10,8 +10,5 @@ toc_title: "Коммерческие услуги"
 
 Категории услуг:
 
--   Облачные услуги [Cloud](../commercial/cloud.md)
--   Поддержка [Support](../commercial/support.md)
-
-!!! note "Для поставщиков услуг"
-    Если вы — представитель компании-поставщика услуг, вы можете отправить запрос на добавление вашей компании и ваших услуг в соответствующий раздел данной документации (или на добавление нового раздела, если ваши услуги не соответствуют ни одной из существующих категорий). Чтобы отправить запрос (pull-request) на добавление описания в документацию, нажмите на значок "карандаша" в правом верхнем углу страницы. Если ваши услуги доступны в только отдельных регионах, не забудьте указать это на соответствующих локализованных страницах (и обязательно отметьте это при отправке заявки).
+-   [Облачные услуги](../commercial/cloud.md)
+-   [Поддержка](../commercial/support.md)
diff --git a/docs/ru/development/adding_test_queries.md b/docs/ru/development/adding_test_queries.md
new file mode 120000
index 00000000000..def9c4077be
--- /dev/null
+++ b/docs/ru/development/adding_test_queries.md
@@ -0,0 +1 @@
+../../en/development/adding_test_queries.md
\ No newline at end of file
diff --git a/docs/ru/development/architecture.md b/docs/ru/development/architecture.md
index 8317377b3db..77effe5916a 100644
--- a/docs/ru/development/architecture.md
+++ b/docs/ru/development/architecture.md
@@ -199,4 +199,4 @@ ClickHouse имеет сильную типизацию, поэтому нет 
 !!! note "Note"
     Кластер ClickHouse состоит из независимых шардов, а каждый шард состоит из реплик. Кластер **не является эластичным** (not elastic), поэтому после добавления нового шарда данные не будут автоматически распределены между ними. Вместо этого нужно изменить настройки, чтобы выровнять нагрузку на кластер. Эта реализация дает вам больший контроль, и вполне приемлема для относительно небольших кластеров, таких как десятки узлов. Но для кластеров с сотнями узлов, которые мы используем в эксплуатации, такой подход становится существенным недостатком. Движки таблиц, которые охватывают весь кластер с динамически реплицируемыми областями, которые могут быть автоматически разделены и сбалансированы между кластерами, еще предстоит реализовать.
 
-{## [Original article](https://clickhouse.tech/docs/ru/development/architecture/) ##}
+{## [Original article](https://clickhouse.com/docs/ru/development/architecture/) ##}
diff --git a/docs/ru/development/browse-code.md b/docs/ru/development/browse-code.md
index 3f6de574abe..196054c3307 100644
--- a/docs/ru/development/browse-code.md
+++ b/docs/ru/development/browse-code.md
@@ -6,7 +6,7 @@ toc_title: "Навигация по коду ClickHouse"
 
 # Навигация по коду ClickHouse {#navigatsiia-po-kodu-clickhouse}
 
-Для навигации по коду онлайн доступен **Woboq**, он расположен [здесь](https://clickhouse.tech/codebrowser/html_report///ClickHouse/src/index.html). В нём реализовано удобное перемещение между исходными файлами, семантическая подсветка, подсказки, индексация и поиск. Слепок кода обновляется ежедневно.
+Для навигации по коду онлайн доступен **Woboq**, он расположен [здесь](https://clickhouse.com/codebrowser/html_report///ClickHouse/src/index.html). В нём реализовано удобное перемещение между исходными файлами, семантическая подсветка, подсказки, индексация и поиск. Слепок кода обновляется ежедневно.
 
 Также вы можете просматривать исходники на [GitHub](https://github.com/ClickHouse/ClickHouse).
 
diff --git a/docs/ru/development/build-osx.md b/docs/ru/development/build-osx.md
index 8d5d06a544c..a1192b509df 100644
--- a/docs/ru/development/build-osx.md
+++ b/docs/ru/development/build-osx.md
@@ -74,7 +74,7 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
   $ rm -rf build
   $ mkdir build
   $ cd build
-  $ cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-10 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-10 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
+  $ cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-11 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-11 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
   $ cmake --build . --config RelWithDebInfo
   $ cd ..
   ```
@@ -122,4 +122,4 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
 
 4. Чтобы проверить, как это работает, выполните команду `ulimit -n`.
 
-[Original article](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/ru/development/continuous-integration.md b/docs/ru/development/continuous-integration.md
new file mode 120000
index 00000000000..f68058a436e
--- /dev/null
+++ b/docs/ru/development/continuous-integration.md
@@ -0,0 +1 @@
+../../en/development/continuous-integration.md
\ No newline at end of file
diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md
index c568db4731f..13564ae2c9f 100644
--- a/docs/ru/development/developer-instruction.md
+++ b/docs/ru/development/developer-instruction.md
@@ -251,13 +251,13 @@ sudo ./llvm.sh 12
 
 ## Написание кода {#napisanie-koda}
 
-Описание архитектуры ClickHouse: https://clickhouse.tech/docs/ru/development/architecture/
+Описание архитектуры ClickHouse: https://clickhouse.com/docs/ru/development/architecture/
 
-Стиль кода: https://clickhouse.tech/docs/ru/development/style/
+Стиль кода: https://clickhouse.com/docs/ru/development/style/
 
-Рекомендации по добавлению сторонних библиотек и поддержанию в них пользовательских изменений: https://clickhouse.tech/docs/ru/development/contrib/#adding-third-party-libraries
+Рекомендации по добавлению сторонних библиотек и поддержанию в них пользовательских изменений: https://clickhouse.com/docs/ru/development/contrib/#adding-third-party-libraries
 
-Разработка тестов: https://clickhouse.tech/docs/ru/development/tests/
+Разработка тестов: https://clickhouse.com/docs/ru/development/tests/
 
 Список задач: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
diff --git a/docs/ru/engines/database-engines/materialized-mysql.md b/docs/ru/engines/database-engines/materialized-mysql.md
index 1cd864c01e9..4073df7b7ec 100644
--- a/docs/ru/engines/database-engines/materialized-mysql.md
+++ b/docs/ru/engines/database-engines/materialized-mysql.md
@@ -194,4 +194,4 @@ SELECT * FROM mysql.test;
 └───┴─────┴──────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/database-engines/materialized-mysql/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/engines/database-engines/materialized-mysql/) <!--hide-->
diff --git a/docs/ru/engines/database-engines/postgresql.md b/docs/ru/engines/database-engines/postgresql.md
index 06e2b35b002..092abaf0b4d 100644
--- a/docs/ru/engines/database-engines/postgresql.md
+++ b/docs/ru/engines/database-engines/postgresql.md
@@ -15,7 +15,7 @@ toc_title: PostgreSQL
 
 ``` sql
 CREATE DATABASE test_database
-ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cache`]);
+ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `schema`, `use_table_cache`]);
 ```
 
 **Параметры движка**
@@ -24,6 +24,7 @@ ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cac
 -   `database` — имя удаленной БД.
 -   `user` — пользователь PostgreSQL.
 -   `password` — пароль пользователя.
+ -  `schema` — схема PostgreSQL.
 -   `use_table_cache` —  определяет кеширование структуры таблиц БД. Необязательный параметр. Значение по умолчанию: `0`.
 
 ## Поддерживаемые типы данных {#data_types-support}
@@ -135,4 +136,4 @@ DESCRIBE TABLE test_database.test_table;
 └────────┴───────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/database-engines/postgresql/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/database-engines/postgresql/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/mongodb.md b/docs/ru/engines/table-engines/integrations/mongodb.md
index 05820d03fe6..700377ac564 100644
--- a/docs/ru/engines/table-engines/integrations/mongodb.md
+++ b/docs/ru/engines/table-engines/integrations/mongodb.md
@@ -54,4 +54,4 @@ SELECT COUNT() FROM mongo_table;
 └─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/ru/engines/table-engines/integrations/mongodb/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ru/engines/table-engines/integrations/mongodb/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/postgresql.md b/docs/ru/engines/table-engines/integrations/postgresql.md
index b2b0db3067a..e19527415bc 100644
--- a/docs/ru/engines/table-engines/integrations/postgresql.md
+++ b/docs/ru/engines/table-engines/integrations/postgresql.md
@@ -148,4 +148,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [Табличная функция `postgresql`](../../../sql-reference/table-functions/postgresql.md)
 -   [Использование PostgreSQL в качестве источника для внешнего словаря](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/table-engines/integrations/postgresql/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/engines/table-engines/integrations/postgresql/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/s3.md b/docs/ru/engines/table-engines/integrations/s3.md
index 5895bd43d2f..c90b7293e1c 100644
--- a/docs/ru/engines/table-engines/integrations/s3.md
+++ b/docs/ru/engines/table-engines/integrations/s3.md
@@ -151,4 +151,4 @@ ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-
 
 **Смотрите также**
 
--  [Табличная функция S3](../../../sql-reference/table-functions/s3.md)
+-  [Табличная функция s3](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/ru/engines/table-engines/mergetree-family/replication.md b/docs/ru/engines/table-engines/mergetree-family/replication.md
index db749ba455e..a7c1a7d2d1b 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replication.md
@@ -253,4 +253,5 @@ $ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 -   [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
-
+-   [max_replicated_fetches_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
+-   [max_replicated_sends_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
diff --git a/docs/ru/faq/general/columnar-database.md b/docs/ru/faq/general/columnar-database.md
index 5ed6185736d..3931051b2b7 100644
--- a/docs/ru/faq/general/columnar-database.md
+++ b/docs/ru/faq/general/columnar-database.md
@@ -17,9 +17,9 @@ toc_priority: 101
 Ниже — иллюстрация того, как извлекаются данные для отчетов при использовании обычной строковой СУБД и столбцовой СУБД:
 
 **Стандартная строковая СУБД**
-![Стандартная строковая СУБД](https://clickhouse.tech/docs/en/images/row-oriented.gif#)
+![Стандартная строковая СУБД](/docs/en/images/row-oriented.gif#)
 
 **Столбцовая СУБД**
-![Столбцовая СУБД](https://clickhouse.tech/docs/en/images/column-oriented.gif#)
+![Столбцовая СУБД](/docs/en/images/column-oriented.gif#)
 
 Для аналитических приложений столбцовые СУБД предпочтительнее, так как в них можно хранить много столбцов в таблице просто на всякий случай, и это не будет сказываться на скорости чтения данных. Столбцовые СУБД предназначены для обработки и хранения больших данных. Они прекрасно масштабируются при помощи распределенных кластеров на относительно недорогих серверах — для увеличения производительности. В ClickHouse для этого используются [распределенные](../../engines/table-engines/special/distributed.md) и [реплицированные](../../engines/table-engines/mergetree-family/replication.md) таблицы.
diff --git a/docs/ru/faq/general/index.md b/docs/ru/faq/general/index.md
index cf105eaf8bb..cb30771aa49 100644
--- a/docs/ru/faq/general/index.md
+++ b/docs/ru/faq/general/index.md
@@ -21,4 +21,4 @@ toc_title: Общие вопросы
 !!! info "Если вы не нашли то, что искали:"
     Загляните в другие категории F.A.Q. или поищите в остальных разделах документации, ориентируясь по оглавлению слева.
 
-[Original article](https://clickhouse.tech/docs/ru/faq/general/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ru/faq/general/) <!--hide-->
diff --git a/docs/ru/faq/general/ne-tormozit.md b/docs/ru/faq/general/ne-tormozit.md
index c1cf87d5b0c..35b6de72a67 100644
--- a/docs/ru/faq/general/ne-tormozit.md
+++ b/docs/ru/faq/general/ne-tormozit.md
@@ -22,4 +22,4 @@ toc_priority: 11
 
 ![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
 
-P.S. Эти футболки не продаются, а распространяются бесплатно на большинстве митапов [ClickHouse](https://clickhouse.tech/#meet), обычно в награду за самые интересные вопросы или другие виды активного участия.
+P.S. Эти футболки не продаются, а распространяются бесплатно на большинстве митапов [ClickHouse](https://clickhouse.com/#meet), обычно в награду за самые интересные вопросы или другие виды активного участия.
diff --git a/docs/ru/faq/integration/index.md b/docs/ru/faq/integration/index.md
index fdb9039d066..54e7e2c8e40 100644
--- a/docs/ru/faq/integration/index.md
+++ b/docs/ru/faq/integration/index.md
@@ -16,4 +16,4 @@ toc_title: Интеграция
 !!! info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
 
-[Original article](https://clickhouse.tech/docs/ru/faq/integration/)
+[Original article](https://clickhouse.com/docs/ru/faq/integration/)
diff --git a/docs/ru/faq/operations/index.md b/docs/ru/faq/operations/index.md
index 723ae2d10d3..53fda842472 100644
--- a/docs/ru/faq/operations/index.md
+++ b/docs/ru/faq/operations/index.md
@@ -15,4 +15,4 @@ toc_title: Операции
 !!! info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
 
-[Original article](https://clickhouse.tech/docs/en/faq/operations/)
+[Original article](https://clickhouse.com/docs/en/faq/operations/)
diff --git a/docs/ru/faq/use-cases/time-series.md b/docs/ru/faq/use-cases/time-series.md
index ea56660cc10..5b46de78274 100644
--- a/docs/ru/faq/use-cases/time-series.md
+++ b/docs/ru/faq/use-cases/time-series.md
@@ -6,7 +6,7 @@ toc_priority: 101
 
 # Можно ли использовать ClickHouse как базу данных временных рядов? {#can-i-use-clickhouse-as-a-time-series-database}
 
-ClickHouse — это универсальное решение для [OLAP](../../faq/general/olap.md) операций, в то время как существует много специализированных СУБД временных рядов. Однако [высокая скорость выполнения запросов](../../faq/general/why-clickhouse-is-so-fast.md) позволяет CLickHouse во многих случаях "побеждать" специализированные аналоги. В подтверждение этому есть много [примеров](https://medium.com/@AltinityDB/clickhouse-for-time-series-scalability-benchmarks-e181132a895b) с конкретными показателями производительности, так что мы не будем останавливаться на этом подробно. Лучше рассмотрим те возможности ClickHouse, которые стоит использовать.
+ClickHouse — это универсальное решение для [OLAP](../../faq/general/olap.md) операций, в то время как существует много специализированных СУБД временных рядов. Однако [высокая скорость выполнения запросов](../../faq/general/why-clickhouse-is-so-fast.md) позволяет CLickHouse во многих случаях "побеждать" специализированные аналоги. В подтверждение этому есть много примеров с конкретными показателями производительности, так что мы не будем останавливаться на этом подробно. Лучше рассмотрим те возможности ClickHouse, которые стоит использовать.
 
 Во-первых, есть **[специальные кодеки](../../sql-reference/statements/create/table.md#create-query-specialized-codecs)**, которые составляют типичные временные ряды. Это могут быть либо стандартные алгоритмы, такие как `DoubleDelta` или `Gorilla`, либо специфические для ClickHouse, например `T64`.
 
diff --git a/docs/ru/getting-started/example-datasets/github-events.md b/docs/ru/getting-started/example-datasets/github-events.md
new file mode 120000
index 00000000000..c9649c0a61f
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/github-events.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/github-events.md
\ No newline at end of file
diff --git a/docs/ru/getting-started/example-datasets/menus.md b/docs/ru/getting-started/example-datasets/menus.md
new file mode 120000
index 00000000000..d82b3198962
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/menus.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/menus.md
\ No newline at end of file
diff --git a/docs/ru/getting-started/example-datasets/opensky.md b/docs/ru/getting-started/example-datasets/opensky.md
new file mode 120000
index 00000000000..4305c0cac3c
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/opensky.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/opensky.md
\ No newline at end of file
diff --git a/docs/ru/getting-started/example-datasets/recipes.md b/docs/ru/getting-started/example-datasets/recipes.md
index 75e385150e8..89a37c0732c 100644
--- a/docs/ru/getting-started/example-datasets/recipes.md
+++ b/docs/ru/getting-started/example-datasets/recipes.md
@@ -339,4 +339,4 @@ WHERE title = 'Chocolate-Strawberry-Orange Wedding Cake';
 
 Этот набор данных доступен в [Online Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting-started/example-datasets/recipes/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/getting-started/example-datasets/recipes/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/star-schema.md b/docs/ru/getting-started/example-datasets/star-schema.md
index f7502e8409d..d9a875752dd 100644
--- a/docs/ru/getting-started/example-datasets/star-schema.md
+++ b/docs/ru/getting-started/example-datasets/star-schema.md
@@ -365,4 +365,4 @@ ORDER BY
     P_BRAND ASC;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/uk-price-paid.md b/docs/ru/getting-started/example-datasets/uk-price-paid.md
new file mode 120000
index 00000000000..e48bcf21d7b
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/uk-price-paid.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/uk-price-paid.md
\ No newline at end of file
diff --git a/docs/ru/getting-started/install.md b/docs/ru/getting-started/install.md
index 1cbeb70ef96..92f76c4951c 100644
--- a/docs/ru/getting-started/install.md
+++ b/docs/ru/getting-started/install.md
@@ -31,6 +31,19 @@ grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not su
 
 Если вы хотите использовать наиболее свежую версию, замените `stable` на `testing` (рекомендуется для тестовых окружений).
 
+Также вы можете вручную скачать и установить пакеты из [репозитория](https://repo.clickhouse.tech/deb/stable/main/).
+
+#### Пакеты {#packages}
+
+-   `clickhouse-common-static` — Устанавливает исполняемые файлы ClickHouse.
+-   `clickhouse-server` — Создает символические ссылки для `clickhouse-server` и устанавливает конфигурационные файлы.
+-   `clickhouse-client` — Создает символические ссылки для `clickhouse-client` и других клиентских инструментов и устанавливает конфигурационные файлы `clickhouse-client`.
+-   `clickhouse-common-static-dbg` — Устанавливает исполняемые файлы ClickHouse собранные с отладочной информацией.
+
+!!! attention "Внимание"
+    Если вам нужно установить ClickHouse определенной версии, вы должны установить все пакеты одной версии:
+    `sudo apt-get install clickhouse-server=21.8.5.7 clickhouse-client=21.8.5.7 clickhouse-common-static=21.8.5.7`
+
 ### Из RPM пакетов {#from-rpm-packages}
 
 Команда ClickHouse в Яндексе рекомендует использовать официальные предкомпилированные `rpm` пакеты для CentOS, RedHat и всех остальных дистрибутивов Linux, основанных на rpm.
@@ -182,4 +195,4 @@ SELECT 1
 
 **Поздравляем, система работает!**
 
-Для дальнейших экспериментов можно попробовать загрузить один из тестовых наборов данных или пройти [пошаговое руководство для начинающих](https://clickhouse.tech/tutorial.html).
+Для дальнейших экспериментов можно попробовать загрузить один из тестовых наборов данных или пройти [пошаговое руководство для начинающих](https://clickhouse.com/tutorial.html).
diff --git a/docs/ru/getting-started/tutorial.md b/docs/ru/getting-started/tutorial.md
index 68b3e4dbae7..a78260eea18 100644
--- a/docs/ru/getting-started/tutorial.md
+++ b/docs/ru/getting-started/tutorial.md
@@ -659,4 +659,4 @@ INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 
 Replication operates in multi-master mode. Data can be loaded into any replica, and the system then syncs it with other instances automatically. Replication is asynchronous so at a given moment, not all replicas may contain recently inserted data. At least one replica should be up to allow data ingestion. Others will sync up data and repair consistency once they will become active again. Note that this approach allows for the low possibility of a loss of recently inserted data.
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 1dd10e1f76d..059ddc3ed44 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -22,7 +22,6 @@ ClickHouse может принимать (`INSERT`) и отдавать (`SELECT
 | [CustomSeparated](#format-customseparated)                                              | ✔     | ✔      |
 | [Values](#data-format-values)                                                           | ✔     | ✔      |
 | [Vertical](#vertical)                                                                   | ✗     | ✔      |
-| [VerticalRaw](#verticalraw)                                                             | ✗     | ✔      |
 | [JSON](#json)                                                                           | ✗     | ✔      |
 | [JSONAsString](#jsonasstring)                                                           | ✔     | ✗      |
 | [JSONStrings](#jsonstrings)                                                               | ✗     | ✔      |
@@ -59,6 +58,7 @@ ClickHouse может принимать (`INSERT`) и отдавать (`SELECT
 | [LineAsString](#lineasstring)                                                           | ✔     | ✗      |
 | [Regexp](#data-format-regexp)                                                           | ✔     | ✗      |
 | [RawBLOB](#rawblob)                                                                     | ✔     | ✔      |
+| [MsgPack](#msgpack)                                                                     | ✔     | ✔      |
 
 Вы можете регулировать некоторые параметры работы с форматами с помощью настроек ClickHouse. За дополнительной информацией обращайтесь к разделу [Настройки](../operations/settings/settings.md).
 
@@ -915,10 +915,6 @@ test: string with 'quotes' and   with some special
 
 Этот формат подходит только для вывода результата выполнения запроса, но не для парсинга (приёма данных для вставки в таблицу).
 
-## VerticalRaw {#verticalraw}
-
-Аналогичен [Vertical](#vertical), но с отключенным выходом. Этот формат подходит только для вывода результата выполнения запроса, но не для парсинга (приёма данных для вставки в таблицу).
-
 ## XML {#xml}
 
 Формат XML подходит только для вывода данных, не для парсинга. Пример:
@@ -1180,7 +1176,7 @@ ClickHouse поддерживает настраиваемую точность
 
 Типы данных столбцов в ClickHouse могут отличаться от типов данных соответствующих полей файла в формате Parquet. При вставке данных ClickHouse интерпретирует типы данных в соответствии с таблицей выше, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к тому типу, который установлен для столбца таблицы.
 
-### Вставка и выборка данных {#vstavka-i-vyborka-dannykh}
+### Вставка и выборка данных {#inserting-and-selecting-data}
 
 Чтобы вставить в ClickHouse данные из файла в формате Parquet, выполните команду следующего вида:
 
@@ -1188,6 +1184,8 @@ ClickHouse поддерживает настраиваемую точность
 $ cat {filename} | clickhouse-client --query="INSERT INTO {some_table} FORMAT Parquet"
 ```
 
+Чтобы вставить данные в колонки типа [Nested](../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур, нужно включить настройку [input_format_parquet_import_nested](../operations/settings/settings.md#input_format_parquet_import_nested).
+
 Чтобы получить данные из таблицы ClickHouse и сохранить их в файл формата Parquet, используйте команду следующего вида:
 
 ``` bash
@@ -1246,6 +1244,8 @@ ClickHouse поддерживает настраиваемую точность
 $ cat filename.arrow | clickhouse-client --query="INSERT INTO some_table FORMAT Arrow"
 ```
 
+Чтобы вставить данные в колонки типа [Nested](../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур, нужно включить настройку [input_format_arrow_import_nested](../operations/settings/settings.md#input_format_arrow_import_nested).
+
 ### Вывод данных {#selecting-data-arrow}
 
 Чтобы получить данные из таблицы ClickHouse и сохранить их в файл формата Arrow, используйте команду следующего вида:
@@ -1294,7 +1294,7 @@ ClickHouse поддерживает настраиваемую точность
 
 Типы данных столбцов в таблицах ClickHouse могут отличаться от типов данных для соответствующих полей ORC. При вставке данных ClickHouse интерпретирует типы данных ORC согласно таблице соответствия, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к типу, установленному для столбца таблицы ClickHouse.
 
-### Вставка данных {#vstavka-dannykh-1}
+### Вставка данных {#inserting-data-2}
 
 Чтобы вставить в ClickHouse данные из файла в формате ORC, используйте команду следующего вида:
 
@@ -1302,7 +1302,9 @@ ClickHouse поддерживает настраиваемую точность
 $ cat filename.orc | clickhouse-client --query="INSERT INTO some_table FORMAT ORC"
 ```
 
-### Вывод данных {#vyvod-dannykh-1}
+Чтобы вставить данные в колонки типа [Nested](../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур, нужно включить настройку [input_format_orc_import_nested](../operations/settings/settings.md#input_format_orc_import_nested).
+
+### Вывод данных {#selecting-data-2}
 
 Чтобы получить данные из таблицы ClickHouse и сохранить их в файл формата ORC, используйте команду следующего вида:
 
@@ -1458,3 +1460,32 @@ $ clickhouse-client --query "SELECT * FROM {some_table} FORMAT RawBLOB" | md5sum
 ``` text
 f9725a22f9191e064120d718e26862a9  -
 ```
+
+## MsgPack {#msgpack}
+
+ClickHouse поддерживает запись и чтение из файлов в формате [MessagePack](https://msgpack.org/).
+
+### Соответствие типов данных {#data-types-matching-msgpack}
+
+| Тип данных MsgPack              | Тип данных ClickHouse                                                              |
+|---------------------------------|------------------------------------------------------------------------------------|
+| `uint N`, `positive fixint`         | [UIntN](../sql-reference/data-types/int-uint.md)                               |
+| `int N`                           | [IntN](../sql-reference/data-types/int-uint.md)                                  |
+| `fixstr`, `str 8`, `str 16`, `str 32`   | [String](../sql-reference/data-types/string.md), [FixedString](../sql-reference/data-types/fixedstring.md)                   |
+| `float 32`                        | [Float32](../sql-reference/data-types/float.md)                                  |
+| `float 64`                        | [Float64](../sql-reference/data-types/float.md)                                  |
+| `uint 16`                         | [Date](../sql-reference/data-types/date.md)                                      |
+| `uint 32`                         | [DateTime](../sql-reference/data-types/datetime.md)                              |
+| `uint 64`                         | [DateTime64](../sql-reference/data-types/datetime.md)                            |
+| `fixarray`, `array 16`, `array 32`| [Array](../sql-reference/data-types/array.md)                                    |
+| `nil`                             | [Nothing](../sql-reference/data-types/special-data-types/nothing.md)             |
+
+Пример:
+
+Запись в файл ".msgpk":
+
+```sql
+$ clickhouse-client --query="CREATE TABLE msgpack (array Array(UInt8)) ENGINE = Memory;"
+$ clickhouse-client --query="INSERT INTO msgpack VALUES ([0, 1, 2, 3, 42, 253, 254, 255]), ([255, 254, 253, 42, 3, 2, 1, 0])";
+$ clickhouse-client --query="SELECT * FROM msgpack FORMAT MsgPack" > tmp_msgpack.msgpk;
+```
diff --git a/docs/ru/interfaces/third-party/gui.md b/docs/ru/interfaces/third-party/gui.md
index 9cb28a2c9a2..8e987fab554 100644
--- a/docs/ru/interfaces/third-party/gui.md
+++ b/docs/ru/interfaces/third-party/gui.md
@@ -75,11 +75,13 @@ toc_title: "Визуальные интерфейсы от сторонних р
 
 Основные возможности:
 
--   Построение запросов с подсветкой синтаксиса;
--   Просмотр таблиц;
--   Автодополнение команд;
+-   Построение запросов с подсветкой синтаксиса.
+-   Просмотр таблиц.
+-   Автодополнение команд.
 -   Полнотекстовый поиск.
 
+По умолчанию DBeaver не использует сессии при подключении (в отличие от CLI, например). Если вам нужна поддержка сессий (например, для установки настроек на сессию), измените настройки подключения драйвера и укажите для настройки `session_id` любое произвольное значение (драйвер использует подключение по http). После этого вы можете использовать любую настройку (setting) в окне запроса. 
+
 ### clickhouse-cli {#clickhouse-cli}
 
 [clickhouse-cli](https://github.com/hatarist/clickhouse-cli) - это альтернативный клиент командной строки для ClickHouse, написанный на Python 3.
@@ -187,4 +189,4 @@ SeekTable [бесплатен](https://www.seektable.com/help/cloud-pricing) д
 
 [Chadmin](https://github.com/bun4uk/chadmin) — простой графический интерфейс для визуализации запущенных запросов на вашем кластере ClickHouse. Он отображает информацию о запросах и дает возможность их завершать.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/ru/introduction/info.md b/docs/ru/introduction/info.md
deleted file mode 100644
index a5e7efffc7e..00000000000
--- a/docs/ru/introduction/info.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-toc_priority: 100
----
-
-# Информационная поддержка {#informatsionnaia-podderzhka}
-
-Информационная поддержка ClickHouse осуществляется на всей территории Российской Федерации без ограничений посредством использования телефонной связи и средств электронной почты на русском языке в круглосуточном режиме:
-
--   Адрес электронной почты: <a class="feedback-email"></a>
--   Телефон: <a href="tel:+74957806510">+7-495-780-6510</a>
-
diff --git a/docs/ru/introduction/performance.md b/docs/ru/introduction/performance.md
index eec1dcf4d0a..246d88f5886 100644
--- a/docs/ru/introduction/performance.md
+++ b/docs/ru/introduction/performance.md
@@ -5,9 +5,9 @@ toc_title: "Производительность"
 
 # Производительность {#proizvoditelnost}
 
-По результатам внутреннего тестирования в Яндексе, ClickHouse обладает наиболее высокой производительностью (как наиболее высокой пропускной способностью на длинных запросах, так и наиболее низкой задержкой на коротких запросах), при соответствующем сценарии работы, среди доступных для тестирования систем подобного класса. Результаты тестирования можно посмотреть на [отдельной странице](https://clickhouse.tech/benchmark/dbms/).
+По результатам внутреннего тестирования в Яндексе, ClickHouse обладает наиболее высокой производительностью (как наиболее высокой пропускной способностью на длинных запросах, так и наиболее низкой задержкой на коротких запросах), при соответствующем сценарии работы, среди доступных для тестирования систем подобного класса. Результаты тестирования можно посмотреть на [отдельной странице](https://clickhouse.com/benchmark/dbms/).
 
-Также это подтверждают многочисленные независимые бенчмарки. Их не сложно найти в Интернете самостоятельно, либо можно воспользоваться [небольшой коллекцией ссылок по теме](https://clickhouse.tech/#independent-benchmarks).
+Также это подтверждают многочисленные независимые бенчмарки. Их не сложно найти в Интернете самостоятельно, либо можно воспользоваться [небольшой коллекцией ссылок по теме](https://clickhouse.com/#independent-benchmarks).
 
 ## Пропускная способность при обработке одного большого запроса {#propusknaia-sposobnost-pri-obrabotke-odnogo-bolshogo-zaprosa}
 
diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
new file mode 100644
index 00000000000..14d95ebae68
--- /dev/null
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -0,0 +1,119 @@
+---
+toc_priority: 66
+toc_title: ClickHouse Keeper
+---
+
+# [пре-продакшн] ClickHouse Keeper
+
+Сервер ClickHouse использует сервис координации [ZooKeeper](https://zookeeper.apache.org/) для [репликации](../engines/table-engines/mergetree-family/replication.md) данных и выполнения [распределенных DDL запросов](../sql-reference/distributed-ddl.md). ClickHouse Keeper — это альтернативный сервис координации, совместимый с ZooKeeper.
+
+!!! warning "Предупреждение"
+    ClickHouse Keeper находится в стадии пре-продакшн и тестируется в CI ClickHouse и на нескольких внутренних инсталляциях.
+
+## Детали реализации
+
+ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом. Он реализован на языке программирования Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, ClickHouse Keeper реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм позволяет достичь линеаризуемости чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
+
+По умолчанию ClickHouse Keeper предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записей, последовательная согласованность чтений). У него есть совместимый клиент-серверный протокол, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с ClickHouse Keeper. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот ClickHouse Keeper с помощью `clickhouse-keeper-converter`. Межсерверный протокол ClickHouse Keeper также несовместим с ZooKeeper, поэтому создание смешанного кластера ZooKeeper / ClickHouse Keeper невозможно.
+
+## Конфигурация
+
+ClickHouse Keeper может использоваться как равноценная замена ZooKeeper или как внутренняя часть сервера ClickHouse, но в обоих случаях конфигурация представлена файлом `.xml`. Главный тег конфигурации ClickHouse Keeper — это `<keeper_server>`. Параметры конфигурации:
+
+-    `tcp_port` — порт для подключения клиента (по умолчанию для ZooKeeper: `2181`).
+-    `tcp_port_secure` — зашифрованный порт для подключения клиента.
+-    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер&nbsp;(1,&nbsp;2,&nbsp;3&nbsp;и&nbsp;т.&nbsp;д.).
+-    `log_storage_path` — путь к журналам координации, лучше хранить их на незанятом устройстве (актуально и для ZooKeeper).
+-    `snapshot_storage_path` — путь к снэпшотам координации.
+
+Другие общие параметры наследуются из конфигурации сервера ClickHouse (`listen_host`, `logger`, и т. д.).
+
+Настройки внутренней координации находятся в `<keeper_server>.<coordination_settings>`:
+
+-    `operation_timeout_ms` — максимальное время ожидания для одной клиентской операции в миллисекундах (по умолчанию: 10000).
+-    `session_timeout_ms` — максимальное время ожидания для клиентской сессии в миллисекундах (по умолчанию: 30000).
+-    `dead_session_check_period_ms` — частота, с которой ClickHouse Keeper проверяет мертвые сессии и удаляет их, в миллисекундах (по умолчанию: 500).
+-    `heart_beat_interval_ms` — частота, с которой узел-лидер ClickHouse Keeper отправляет хартбиты узлам-последователям, в миллисекундах (по умолчанию: 500).
+-    `election_timeout_lower_bound_ms` — время, после которого последователь может инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 1000).
+-    `election_timeout_upper_bound_ms` — время, после которого последователь должен инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 2000).
+-    `rotate_log_storage_interval` — количество записей в журнале  координации для хранения в одном файле (по умолчанию: 100000).
+-    `reserved_log_items` — минимальное количество записей в журнале координации которые нужно сохранять после снятия снепшота (по умолчанию: 100000).
+-    `snapshot_distance` — частота, с которой ClickHouse Keeper делает новые снэпшоты (по количеству записей в журналах), в миллисекундах (по умолчанию: 100000).
+-    `snapshots_to_keep` — количество снэпшотов для сохранения (по умолчанию: 3).
+-    `stale_log_gap` — время, после которого лидер считает последователя устаревшим и отправляет ему снэпшот вместо журналов (по умолчанию: 10000).
+-    `fresh_log_gap` — максимальное отставание от лидера в количестве записей журнала после которого последователь считает себя не отстающим (по умолчанию: 200).
+-    `max_requests_batch_size` — количество запросов на запись, которые будут сгруппированы в один перед отправкой через RAFT (по умолчанию: 100).
+-    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true).
+-    `quorum_reads` — выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с негативным эффектом на производительность и размер журналов (по умолчанию: false).
+-    `raft_logs_level` — уровень логгирования сообщений в текстовый лог  (trace, debug и т. д.) (по умолчанию: information).
+-    `auto_forwarding` — разрешить пересылку запросов на запись от последователей лидеру (по умолчанию: true).
+-    `shutdown_timeout` — время ожидания завершения внутренних подключений и выключения, в миллисекундах (по умолчанию: 5000).
+-    `startup_timeout` — время отключения сервера, если он не подключается к другим участникам кворума, в миллисекундах (по умолчанию: 30000).
+
+Конфигурация кворума находится в `<keeper_server>.<raft_configuration>` и содержит описание серверов. Единственный параметр для всего кворума — `secure`, который включает зашифрованное соединение для связи между участниками кворума. Параметры для каждого `<server>`:
+
+-    `id` — идентификатор сервера в кворуме.
+-    `hostname` — имя хоста, на котором размещен сервер.
+-    `port` — порт, на котором серверу доступны соединения для внутренней коммуникации.
+
+
+Примеры конфигурации кворума с тремя узлами можно найти в [интеграционных тестах](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) с префиксом `test_keeper_`. Пример конфигурации для сервера №1:
+
+```xml
+<keeper_server>
+    <tcp_port>2181</tcp_port>
+    <server_id>1</server_id>
+    <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+    <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+    <coordination_settings>
+        <operation_timeout_ms>10000</operation_timeout_ms>
+        <session_timeout_ms>30000</session_timeout_ms>
+        <raft_logs_level>trace</raft_logs_level>
+    </coordination_settings>
+
+    <raft_configuration>
+        <server>
+            <id>1</id>
+            <hostname>zoo1</hostname>
+            <port>9444</port>
+        </server>
+        <server>
+            <id>2</id>
+            <hostname>zoo2</hostname>
+            <port>9444</port>
+        </server>
+        <server>
+            <id>3</id>
+            <hostname>zoo3</hostname>
+            <port>9444</port>
+        </server>
+    </raft_configuration>
+</keeper_server>
+```
+
+## Как запустить
+
+ClickHouse Keeper входит в пакет `clickhouse-server`, просто добавьте кофигурацию `<keeper_server>` и запустите сервер ClickHouse как обычно. Если вы хотите запустить ClickHouse Keeper автономно, сделайте это аналогичным способом:
+
+```bash
+clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
+```
+
+## [экспериментально] Переход с ZooKeeper
+
+Плавный переход с ZooKeeper на ClickHouse Keeper невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить ClickHouse Keeper. Утилита `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот ClickHouse Keeper. Работа утилиты проверена только для версий ZooKeeper выше 3.4. Для миграции необходимо выполнить следующие шаги:
+
+1. Остановите все узлы ZooKeeper.
+
+2. Необязательно, но рекомендуется: найдите узел-лидер ZooKeeper, запустите и снова остановите его. Это заставит ZooKeeper создать консистентный снэпшот.
+
+3. Запустите `clickhouse-keeper-converter` на лидере, например:
+
+```bash
+clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
+```
+
+4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным `keeper` или запустите ClickHouse Keeper вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы могут захватить лидерство и сконвертированные данные могут быть отброшены на старте.
+
+[Original article](https://clickhouse.com/docs/en/operations/clickhouse-keeper/) <!--hide-->
diff --git a/docs/ru/operations/external-authenticators/index.md b/docs/ru/operations/external-authenticators/index.md
index c2ed9750562..8465e57d792 100644
--- a/docs/ru/operations/external-authenticators/index.md
+++ b/docs/ru/operations/external-authenticators/index.md
@@ -13,4 +13,4 @@ ClickHouse поддерживает аутентификацию и управл
 - [LDAP](./ldap.md#external-authenticators-ldap) [аутентификатор](./ldap.md#ldap-external-authenticator) и [каталог](./ldap.md#ldap-external-user-directory)
 - Kerberos [аутентификатор](./kerberos.md#external-authenticators-kerberos)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/external-authenticators/index/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/operations/external-authenticators/index/) <!--hide-->
diff --git a/docs/ru/operations/external-authenticators/ldap.md b/docs/ru/operations/external-authenticators/ldap.md
index 8f1328c9aa6..7b4bab0290c 100644
--- a/docs/ru/operations/external-authenticators/ldap.md
+++ b/docs/ru/operations/external-authenticators/ldap.md
@@ -179,4 +179,4 @@ CREATE USER my_user IDENTIFIED WITH ldap SERVER 'my_ldap_server';
         - `attribute` — имя атрибута, значение которого будет возвращаться LDAP поиском. По умолчанию: `cn`.
         - `prefix` — префикс, который, как предполагается, будет находиться перед началом каждой строки в исходном списке строк, возвращаемых LDAP поиском. Префикс будет удален из исходных строк, а сами они будут рассматриваться как имена локальных ролей. По умолчанию: пустая строка.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/operations/external-authenticators/ldap) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/en/operations/external-authenticators/ldap) <!--hide-->
diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md
index fbecdbdc15e..b713242401d 100644
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@@ -69,6 +69,85 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 </compression>
 ```
 
+## encryption {#server-settings-encryption}
+
+Настраивает комманду для получения ключа используемого [кодеками шифрования](../../sql-reference/statements/create/table.md#create-query-encryption-codecs). Ключ (или несколько ключей) должны быть записаны в переменные окружения или установлены в конфигурационном файле .
+
+Ключи могут быть представлены в шестнадцатеричной или строковой форме. Их длинна должна быть равна 16.
+
+**Пример**
+
+Загрузка из файла конфигурации:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key>12345567812345678</key>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+!!! note "Примечание"
+    Хранение ключей в конфигурационном файле не рекомендовано. Это не безопасно. Вы можете переместить ключи в отдельный файл на секретном диске и сделать symlink к этому конфигурационному файлу в папке `config.d/`.
+
+Загрузка из файла конфигурации, когда ключ представлен в шестнадцатеричной форме:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex>00112233445566778899aabbccddeeff</key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Загрузка ключа из переменной окружения:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex from_env="KEY"></key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Параметр `current_key_id` устанавливает текущий ключ для шифрования, и все указанные ключи можно использовать для расшифровки.
+
+Все эти методы могут быть применены для нескольких ключей:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex id="0">00112233445566778899aabbccddeeff</key_hex>
+        <key_hex id="1" from_env=".."></key_hex>
+        <current_key_id>1</current_key_id>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Параметр `current_key_id` указывает текущий ключ для шифрования.
+
+Также пользователь может добавить одноразовое случайное число длинной 12 байт (по умолчанию шифрование и дешифровка будут использовать одноразовое число длинной 12 байт, заполненное нулями):
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce>0123456789101</nonce>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Одноразовое число также может быть представлено в шестнадцатеричной форме:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce_hex>abcdefabcdef</nonce_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Все вышеперечисленное можно применить также для алгоритма `aes_256_gcm_siv` (но ключ должен быть длинной 32 байта).
+
 ## custom_settings_prefixes {#custom_settings_prefixes}
 
 Список префиксов для [пользовательских настроек](../../operations/settings/index.md#custom_settings). Префиксы должны перечисляться через запятую.
@@ -345,8 +424,6 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 <interserver_https_host>example.yandex.ru</interserver_https_host>
 ```
 
-
-
 ## interserver_http_credentials {#server-settings-interserver-http-credentials}
 
 Имя пользователя и пароль, использующиеся для аутентификации при [репликации](../../operations/server-configuration-parameters/settings.md) движками Replicated\*. Это имя пользователя и пароль используются только для взаимодействия между репликами кластера и никак не связаны с аутентификацией клиентов ClickHouse. Сервер проверяет совпадение имени и пароля для соединяющихся с ним реплик, а также использует это же имя и пароль для соединения с другими репликами. Соответственно, эти имя и пароль должны быть прописаны одинаковыми для всех реплик кластера.
@@ -414,7 +491,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 </logger>
 ```
 
-Также, существует поддержка записи в syslog. Пример конфига:
+Также, существует поддержка записи в syslog. Пример настроек:
 
 ``` xml
 <logger>
@@ -873,6 +950,33 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 </query_thread_log>
 ```
 
+## query_views_log {#server_configuration_parameters-query_views_log}
+
+Настройки логирования информации о зависимых представлениях (materialized, live и т.п.) в запросах принятых с настройкой [log_query_views=1](../../operations/settings/settings.md#settings-log-query-views).
+
+Запросы сохраняются в таблицу system.query_views_log. Вы можете изменить название этой таблицы в параметре `table` (см. ниже).
+
+При настройке логирования используются следующие параметры:
+
+-   `database` – имя базы данных.
+-   `table` – имя таблицы куда будут записываться использованные представления.
+-   `partition_by` — устанавливает [произвольный ключ партиционирования](../../engines/table-engines/mergetree-family/custom-partitioning-key.md). Нельзя использовать если используется `engine`
+-   `engine` - устанавливает [настройки MergeTree Engine](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) для системной таблицы. Нельзя использовать если используется `partition_by`.
+-   `flush_interval_milliseconds` — период сброса данных из буфера в памяти в таблицу.
+
+Если таблица не существует, то ClickHouse создаст её. Если структура журнала запросов изменилась при обновлении сервера ClickHouse, то таблица со старой структурой переименовывается, а новая таблица создается автоматически.
+
+**Example**
+
+``` xml
+<query_views_log>
+    <database>system</database>
+    <table>query_views_log</table>
+    <partition_by>toYYYYMM(event_date)</partition_by>
+    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+</query_views_log>
+```
+
 ## text_log {#server_configuration_parameters-text_log}
 
 Настройка логирования текстовых сообщений в системную таблицу [text_log](../../operations/system-tables/text_log.md#system_tables-text_log).
@@ -882,7 +986,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 -   `level` — Максимальный уровень сообщения (по умолчанию `Trace`) которое будет сохранено в таблице.
 -   `database` — имя базы данных для хранения таблицы.
 -   `table` — имя таблицы, куда будут записываться текстовые сообщения.
--   `partition_by` — устанавливает [произвольный ключ партиционирования](../../operations/server-configuration-parameters/settings.md). Нельзя использовать если используется `engine`
+-   `partition_by` — устанавливает [произвольный ключ партиционирования](../../engines/table-engines/mergetree-family/custom-partitioning-key.md). Нельзя использовать если используется `engine`
 -   `engine` - устанавливает [настройки MergeTree Engine](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) для системной таблицы. Нельзя использовать если используется `partition_by`.
 -   `flush_interval_milliseconds` — период сброса данных из буфера в памяти в таблицу.
 
@@ -913,7 +1017,7 @@ Parameters:
 -   `engine` - устанавливает [настройки MergeTree Engine](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) для системной таблицы. Нельзя использовать если используется `partition_by`.
 -   `flush_interval_milliseconds` — Interval for flushing data from the buffer in memory to the table.
 
-The default server configuration file `config.xml` contains the following settings section:
+По умолчанию файл настроек сервера `config.xml` содержит следующие настройки:
 
 ``` xml
 <trace_log>
@@ -1096,7 +1200,7 @@ ClickHouse использует ZooKeeper для хранения метадан
 
 -   `node` — адрес ноды (сервера) ZooKeeper. Можно сконфигурировать несколько нод.
 
-        Например:
+    Например:
 
 <!-- -->
 
@@ -1109,9 +1213,10 @@ ClickHouse использует ZooKeeper для хранения метадан
 
       Атрибут `index` задает порядок опроса нод при попытках подключиться к кластеру ZooKeeper.
 
--   `session_timeout` — максимальный таймаут клиентской сессии в миллисекундах.
--   `root` — [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes), который используется как корневой для всех znode, которые использует сервер ClickHouse. Необязательный.
--   `identity` — пользователь и пароль, которые может потребовать ZooKeeper для доступа к запрошенным znode. Необязательный.
+- `session_timeout_ms` — максимальный таймаут клиентской сессии в миллисекундах.
+- `operation_timeout_ms` — максимальный таймаут для одной операции в миллисекундах.
+- `root` — [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes), который используется как корневой для всех znode, которые использует сервер ClickHouse. Необязательный.
+- `identity` — пользователь и пароль, которые может потребовать ZooKeeper для доступа к запрошенным znode. Необязательный.
 
 **Пример конфигурации**
 
@@ -1185,6 +1290,39 @@ ClickHouse использует ZooKeeper для хранения метадан
 
 -   [background_schedule_pool_size](../settings/settings.md#background_schedule_pool_size)
 
+## distributed_ddl {#server-settings-distributed_ddl}
+
+Управление запуском [распределенных ddl запросов](../../sql-reference/distributed-ddl.md) (CREATE, DROP, ALTER, RENAME) в кластере.
+Работает только если разрешена [работа с ZooKeeper](#server-settings_zookeeper).
+
+**Пример**
+
+```xml
+<distributed_ddl>
+    <!-- Путь в ZooKeeper для очереди содержащей DDL запросы -->
+    <path>/clickhouse/task_queue/ddl</path>
+
+    <!-- Настройки из этого профиля будут использованы для запуска DDL запросов -->
+    <profile>default</profile>
+
+    <!-- Контроль того как много ON CLUSTER запросов могут исполняться одновременно. -->
+    <pool_size>1</pool_size>
+
+    <!--
+         Настройки очистки (активные задачи в очереди не будут удаляться)
+    -->
+
+    <!-- Время TTL для задач в секундах (по умолчанию 1 week) -->
+    <task_max_lifetime>604800</task_max_lifetime>
+
+    <!-- Как часто будет запускаться очистка данных  (в секундах) -->
+    <cleanup_delay_period>60</cleanup_delay_period>
+
+    <!-- Как много задач может быть в очереди -->
+    <max_tasks_in_queue>1000</max_tasks_in_queue>
+</distributed_ddl>
+```
+
 ## access_control_path {#access_control_path}
 
 Путь к каталогу, где сервер ClickHouse хранит конфигурации пользователей и ролей, созданные командами SQL.
@@ -1193,7 +1331,7 @@ ClickHouse использует ZooKeeper для хранения метадан
 
 **Смотрите также**
 
-- [Управление доступом](../access-rights.md#access-control)
+- [Управление доступом](../../operations/access-rights.md#access-control)
 
 ## user_directories {#user_directories}
 
diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index 88c511d4d80..08ea9979426 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -201,6 +201,44 @@ Eсли суммарное число активных кусков во все
 
 Значение по умолчанию: `0`.
 
+## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
+
+Ограничивает максимальную скорость скачивания данных в сети (в байтах в секунду) для синхронизаций между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server), которая применяется к серверу.
+
+Можно ограничить скорость обмена данными как для всего сервера, так и для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_fetches_network_bandwidth_for_server`.
+
+Настройка соблюдается неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для ограничения скорости передачи данных при репликации данных для добавления или замены новых узлов.
+
+## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
+
+Ограничивает максимальную скорость отправки данных по сети (в байтах в секунду) для синхронизации между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server), которая применяется к серверу.
+
+Можно ограничить скорость обмена данными как для всего сервера, так и для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_sends_network_bandwidth_for_server`.
+
+Настройка следуется неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
+
 ## max_bytes_to_merge_at_max_space_in_pool {#max-bytes-to-merge-at-max-space-in-pool}
 
 Максимальный суммарный размер кусков (в байтах) в одном слиянии, если есть свободные ресурсы в фоновом пуле.
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 56b04e81a94..dd38b26f8f4 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -237,6 +237,39 @@ ClickHouse применяет настройку в тех случаях, ко
 
 В случае превышения `input_format_allow_errors_ratio` ClickHouse генерирует исключение.
 
+## input_format_parquet_import_nested {#input_format_parquet_import_nested}
+
+Включает или отключает возможность вставки данных в колонки типа [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур  в формате ввода [Parquet](../../interfaces/formats.md#data-format-parquet).
+
+Возможные значения:
+
+-   0 — данные не могут быть вставлены в колонки типа `Nested` в виде массива структур.
+-   0 — данные могут быть вставлены в колонки типа `Nested` в виде массива структур.
+
+Значение по умолчанию: `0`.
+
+## input_format_arrow_import_nested {#input_format_arrow_import_nested}
+
+Включает или отключает возможность вставки данных в колонки типа [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур в формате ввода [Arrow](../../interfaces/formats.md#data_types-matching-arrow).
+
+Возможные значения:
+
+-   0 — данные не могут быть вставлены в колонки типа `Nested` в виде массива структур.
+-   0 — данные могут быть вставлены в колонки типа `Nested` в виде массива структур.
+
+Значение по умолчанию: `0`.
+
+## input_format_orc_import_nested {#input_format_orc_import_nested}
+
+Включает или отключает возможность вставки данных в колонки типа [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур в формате ввода [ORC](../../interfaces/formats.md#data-format-orc).
+
+Возможные значения:
+
+-   0 — данные не могут быть вставлены в колонки типа `Nested` в виде массива структур.
+-   0 — данные могут быть вставлены в колонки типа `Nested` в виде массива структур.
+
+Значение по умолчанию: `0`.
+
 ## input_format_values_interpret_expressions {#settings-input_format_values_interpret_expressions}
 
 Включает или отключает парсер SQL, если потоковый парсер не может проанализировать данные. Этот параметр используется только для формата [Values](../../interfaces/formats.md#data-format-values) при вставке данных. Дополнительные сведения о парсерах читайте в разделе [Синтаксис](../../sql-reference/syntax.md).
@@ -768,12 +801,32 @@ ClickHouse может парсить только базовый формат `Y
 
 Кэш несжатых блоков хранит данные, извлечённые при выполнении запросов. ClickHouse использует кэш для ускорения ответов на повторяющиеся небольшие запросы. Настройка защищает кэш от переполнения. Настройка сервера [uncompressed_cache_size](../server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) определяет размер кэша несжатых блоков.
 
-Возможное значение:
+Возможные значения:
 
 -   Положительное целое число.
 
 Значение по умолчанию: 2013265920.
 
+## merge_tree_clear_old_temporary_directories_interval_seconds {#setting-merge-tree-clear-old-temporary-directories-interval-seconds}
+
+Задает интервал в секундах для удаления старых временных каталогов на сервере ClickHouse.
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: `60` секунд.
+
+## merge_tree_clear_old_parts_interval_seconds {#setting-merge-tree-clear-old-parts-interval-seconds}
+
+Задает интервал в секундах для удаления старых кусков данных, журналов предзаписи (WAL) и мутаций на сервере ClickHouse .
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: `1` секунда.
+
 ## min_bytes_to_use_direct_io {#settings-min-bytes-to-use-direct-io}
 
 Минимальный объём данных, необходимый для прямого (небуферизованного) чтения/записи (direct I/O) на диск.
@@ -1065,6 +1118,40 @@ SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test'
 
 Значение по умолчанию: `5`.
 
+## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
+
+Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для синхронизации между [репликами](../../engines/table-engines/mergetree-family/replication.md). Применяется только при запуске сервера. Можно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth).
+
+Значение настройки соблюдается неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
+
+## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
+
+Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для [репликационных](../../engines/table-engines/mergetree-family/replication.md) отправок. Применяется только при запуске сервера. Можно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth).
+
+Значение настройки соблюдается неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
+
 ## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
 
 Таймаут в миллисекундах на соединение с удалённым сервером, для движка таблиц Distributed, если используются секции shard и replica в описании кластера.
@@ -3055,7 +3142,7 @@ SELECT * FROM test LIMIT 10 OFFSET 100;
 
 Значение по умолчанию: `1800`.
 
-## optimize_fuse_sum_count_avg {#optimize_fuse_sum_count_avg}
+## optimize_syntax_fuse_functions {#optimize_syntax_fuse_functions}
 
 Позволяет объединить агрегатные функции с одинаковым аргументом. Запрос, содержащий по крайней мере две агрегатные функции: [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum), [count](../../sql-reference/aggregate-functions/reference/count.md#agg_function-count) или [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) с одинаковым аргументом, перезаписывается как [sumCount](../../sql-reference/aggregate-functions/reference/sumcount.md#agg_function-sumCount).
 
@@ -3072,7 +3159,7 @@ SELECT * FROM test LIMIT 10 OFFSET 100;
 
 ``` sql
 CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
-SET optimize_fuse_sum_count_avg = 1;
+SET optimize_syntax_fuse_functions = 1;
 EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b), avg(b) from fuse_tbl FORMAT TSV;
 ```
 
@@ -3266,7 +3353,7 @@ SETTINGS index_granularity = 8192 │
 
 ## force_optimize_projection {#force-optimize-projection}
 
-Включает или отключает обязательное использование [проекций](../../engines/table-engines/mergetree-family/mergetree.md#projections) в запросах `SELECT`, если поддержка проекций включена (см. настройку [allow_experimental_projection_optimization](#allow-experimental-projection-optimization)). 
+Включает или отключает обязательное использование [проекций](../../engines/table-engines/mergetree-family/mergetree.md#projections) в запросах `SELECT`, если поддержка проекций включена (см. настройку [allow_experimental_projection_optimization](#allow-experimental-projection-optimization)).
 
 Возможные значения:
 
@@ -3275,6 +3362,30 @@ SETTINGS index_granularity = 8192 │
 
 Значение по умолчанию: `0`.
 
+## replication_alter_partitions_sync {#replication-alter-partitions-sync}
+
+Позволяет настроить ожидание выполнения действий на репликах запросами [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) или [TRUNCATE](../../sql-reference/statements/truncate.md).
+
+Возможные значения:
+
+-   0 — не ждать.
+-   1 — ждать выполнения действий на своей реплике.
+-   2 — ждать выполнения действий на всех репликах.
+
+Значение по умолчанию: `1`.
+
+## replication_wait_for_inactive_replica_timeout {#replication-wait-for-inactive-replica-timeout}
+
+Указывает время ожидания (в секундах) выполнения запросов [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) или [TRUNCATE](../../sql-reference/statements/truncate.md) для неактивных реплик.
+
+Возможные значения:
+
+-   0 — не ждать.
+-   Отрицательное целое число — ждать неограниченное время.
+-   Положительное целое число — установить соответствующее количество секунд ожидания.
+
+Значение по умолчанию: `120` секунд.
+
 ## regexp_max_matches_per_row {#regexp-max-matches-per-row}
 
 Задает максимальное количество совпадений для регулярного выражения. Настройка применяется для защиты памяти от перегрузки при использовании "жадных" квантификаторов в регулярном выражении для функции [extractAllGroupsHorizontal](../../sql-reference/functions/string-search-functions.md#extractallgroups-horizontal).
@@ -3283,4 +3394,114 @@ SETTINGS index_granularity = 8192 │
 
 -   Положительное целое число.
 
-Значение по умолчанию: `1000`.
\ No newline at end of file
+Значение по умолчанию: `1000`.
+
+## log_queries_probability {#log-queries-probability}
+
+Позволяет пользователю записывать в системные таблицы [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md) и [query_views_log](../../operations/system-tables/query_views_log.md) только часть запросов, выбранных случайным образом, с указанной вероятностью. Это помогает снизить нагрузку при большом объеме запросов в секунду.
+
+Возможные значения:
+
+-   0 — запросы не регистрируются в системных таблицах.
+-   Положительное число с плавающей точкой в диапазоне [0..1]. Например, при значении настройки, равном `0.5`, примерно половина запросов регистрируется в системных таблицах.
+-   1 — все запросы регистрируются в системных таблицах.
+
+Значение по умолчанию: `1`.
+
+## short_circuit_function_evaluation {#short-circuit-function-evaluation}
+
+Позволяет вычислять функции [if](../../sql-reference/functions/conditional-functions.md#if), [multiIf](../../sql-reference/functions/conditional-functions.md#multiif), [and](../../sql-reference/functions/logical-functions.md#logical-and-function) и [or](../../sql-reference/functions/logical-functions.md#logical-or-function) по [короткой схеме](https://ru-wikipedia-org.turbopages.org/ru.wikipedia.org/s/wiki/Вычисления_по_короткой_схеме). Это помогает оптимизировать выполнение сложных выражений в этих функциях и предотвратить возможные исключения (например, деление на ноль, когда оно не ожидается).
+
+Возможные значения:
+
+-   `enable` — по короткой схеме вычисляются функции, которые подходят для этого (могут сгенерировать исключение или требуют сложных вычислений).
+-   `force_enable` — все функции вычисляются по короткой схеме.
+-   `disable` — вычисление функций по короткой схеме отключено.
+
+Значение по умолчанию: `enable`.
+
+## max_hyperscan_regexp_length {#max-hyperscan-regexp-length}
+
+Задает максимальную длину каждого регулярного выражения в [hyperscan-функциях](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn)  поиска множественных совпадений в строке. 
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 - длина не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 3;
+```
+
+Результат:
+
+```text
+┌─multiMatchAny('abcd', ['ab', 'bcd', 'c', 'd'])─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+```
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 2;
+```
+
+Результат:
+
+```text
+Exception: Regexp length too large.
+```
+
+**См. также**
+
+-   [max_hyperscan_regexp_total_length](#max-hyperscan-regexp-total-length)
+
+## max_hyperscan_regexp_total_length {#max-hyperscan-regexp-total-length}
+
+Задает максимальную общую длину всех регулярных выражений в каждой [hyperscan-функции](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn)  поиска множественных совпадений в строке.
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 - длина не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['a','b','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Результат:
+
+```text
+┌─multiMatchAny('abcd', ['a', 'b', 'c', 'd'])─┐
+│                                           1 │
+└─────────────────────────────────────────────┘
+```
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bc','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Результат:
+
+```text
+Exception: Total regexp lengths too large.
+```
+
+**См. также**
+
+-   [max_hyperscan_regexp_length](#max-hyperscan-regexp-length)
diff --git a/docs/ru/operations/system-tables/clusters.md b/docs/ru/operations/system-tables/clusters.md
index 6bfeb8aa818..832f5090ce5 100644
--- a/docs/ru/operations/system-tables/clusters.md
+++ b/docs/ru/operations/system-tables/clusters.md
@@ -68,4 +68,4 @@ estimated_recovery_time: 0
 -   [Настройка distributed_replica_error_cap](../../operations/settings/settings.md#settings-distributed_replica_error_cap)
 -   [Настройка distributed_replica_error_half_life](../../operations/settings/settings.md#settings-distributed_replica_error_half_life)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/clusters) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/operations/system_tables/clusters) <!--hide-->
diff --git a/docs/ru/operations/system-tables/crash-log.md b/docs/ru/operations/system-tables/crash-log.md
index d2b3ae5c6f5..7aaac343585 100644
--- a/docs/ru/operations/system-tables/crash-log.md
+++ b/docs/ru/operations/system-tables/crash-log.md
@@ -45,4 +45,4 @@ build_id:
 **См. также**
 -   Системная таблица [trace_log](../../operations/system-tables/trace_log.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/crash-log)
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/crash-log)
diff --git a/docs/ru/operations/system-tables/merge_tree_settings.md b/docs/ru/operations/system-tables/merge_tree_settings.md
new file mode 120000
index 00000000000..dbff2462867
--- /dev/null
+++ b/docs/ru/operations/system-tables/merge_tree_settings.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/merge_tree_settings.md
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/query_log.md b/docs/ru/operations/system-tables/query_log.md
index 7e98ddedcec..f7709d6f3da 100644
--- a/docs/ru/operations/system-tables/query_log.md
+++ b/docs/ru/operations/system-tables/query_log.md
@@ -24,6 +24,8 @@ ClickHouse не удаляет данные из таблица автомати
 2.  Если во время обработки запроса возникла ошибка, создаются два события с типами `QueryStart` и `ExceptionWhileProcessing`.
 3.  Если ошибка произошла ещё до запуска запроса, создается одно событие с типом `ExceptionBeforeStart`.
 
+Чтобы уменьшить количество запросов, регистрирующихся в таблице `query_log`, вы можете использовать настройку [log_queries_probability](../../operations/settings/settings.md#log-queries-probability).
+
 Столбцы:
 
 -   `type` ([Enum8](../../sql-reference/data-types/enum.md)) — тип события, произошедшего при выполнении запроса. Значения:
@@ -181,4 +183,4 @@ used_table_functions:                  []
 
 -   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — в этой таблице содержится информация о цепочке каждого выполненного запроса.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/query_log) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/operations/system_tables/query_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/query_thread_log.md b/docs/ru/operations/system-tables/query_thread_log.md
index 6eade8fc53f..219d468e222 100644
--- a/docs/ru/operations/system-tables/query_thread_log.md
+++ b/docs/ru/operations/system-tables/query_thread_log.md
@@ -11,6 +11,8 @@
 
 ClickHouse не удаляет данные из таблицы автоматически. Подробности в разделе [Введение](#system-tables-introduction).
 
+Чтобы уменьшить количество запросов, регистрирующихся в таблице `query_thread_log`, вы можете использовать настройку [log_queries_probability](../../operations/settings/settings.md#log-queries-probability).
+
 Столбцы:
 
 -   `event_date` ([Date](../../sql-reference/data-types/date.md)) — дата завершения выполнения запроса потоком.
diff --git a/docs/ru/operations/system-tables/query_views_log.md b/docs/ru/operations/system-tables/query_views_log.md
new file mode 120000
index 00000000000..f606e4108ca
--- /dev/null
+++ b/docs/ru/operations/system-tables/query_views_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_views_log.md
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/replicas.md b/docs/ru/operations/system-tables/replicas.md
index 7879ee707a4..ff58355145d 100644
--- a/docs/ru/operations/system-tables/replicas.md
+++ b/docs/ru/operations/system-tables/replicas.md
@@ -78,10 +78,11 @@ active_replicas:            2
 
 -   `log_max_index` (`UInt64`) - максимальный номер записи в общем логе действий.
 -   `log_pointer` (`UInt64`) - максимальный номер записи из общего лога действий, которую реплика скопировала в свою очередь для выполнения, плюс единица. Если log_pointer сильно меньше log_max_index, значит что-то не так.
--   `last_queue_update` (`DateTime`) - When the queue was updated last time.
--   `absolute_delay` (`UInt64`) - How big lag in seconds the current replica has.
+-   `last_queue_update` (`DateTime`) - время последнего обновления запроса.
+-   `absolute_delay` (`UInt64`) - задержка (в секундах) для текущей реплики.
 -   `total_replicas` (`UInt8`) - общее число известных реплик этой таблицы.
 -   `active_replicas` (`UInt8`) - число реплик этой таблицы, имеющих сессию в ZK; то есть, число работающих реплик.
+-   `replica_is_active` ([Map(String, UInt8)](../../sql-reference/data-types/map.md)) — соответствие между именем реплики и признаком активности реплики.
 
 Если запрашивать все столбцы, то таблица может работать слегка медленно, так как на каждую строчку делается несколько чтений из ZK.
 Если не запрашивать последние 4 столбца (log_max_index, log_pointer, total_replicas, active_replicas), то таблица работает быстро.
diff --git a/docs/ru/operations/system-tables/time_zones.md b/docs/ru/operations/system-tables/time_zones.md
new file mode 120000
index 00000000000..d7b0f07d326
--- /dev/null
+++ b/docs/ru/operations/system-tables/time_zones.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/time_zones.md
\ No newline at end of file
diff --git a/docs/ru/operations/utilities/clickhouse-copier.md b/docs/ru/operations/utilities/clickhouse-copier.md
index f1bde2be23d..7e1364f9ee1 100644
--- a/docs/ru/operations/utilities/clickhouse-copier.md
+++ b/docs/ru/operations/utilities/clickhouse-copier.md
@@ -70,7 +70,7 @@ $ clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --bas
 		    <!--
                 source cluster & destination clusters accept exactly the same
                 parameters as parameters for the usual Distributed table
-                see https://clickhouse.tech/docs/ru/engines/table-engines/special/distributed/
+                see https://clickhouse.com/docs/ru/engines/table-engines/special/distributed/
             -->
             <shard>
                 <internal_replication>false</internal_replication>
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md b/docs/ru/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
new file mode 120000
index 00000000000..22a84e3e5d2
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapand.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapand.md
new file mode 120000
index 00000000000..861ac2c3dd3
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapand.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapand.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapor.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapor.md
new file mode 120000
index 00000000000..0fcb851d0a4
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapor.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapxor.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapxor.md
new file mode 120000
index 00000000000..13c79b37200
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapxor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapxor.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/index.md b/docs/ru/sql-reference/aggregate-functions/reference/index.md
index b2172e1e70e..c372a0713ca 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/index.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/index.md
@@ -61,6 +61,8 @@ toc_hidden: true
 -   [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md)
 -   [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md)
 -   [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md)
+-   [quantileBFloat16](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16)
+-   [quantileBFloat16Weighted](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16weighted)
 -   [simpleLinearRegression](../../../sql-reference/aggregate-functions/reference/simplelinearregression.md)
 -   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
 -   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/ru/sql-reference/aggregate-functions/reference/quantilebfloat16.md
index f8622e3fd05..8f240a3a009 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantilebfloat16.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -58,6 +58,10 @@ SELECT quantileBFloat16(0.75)(a), quantileBFloat16(0.75)(b) FROM example_table;
 ```
 Обратите внимание, что все числа с плавающей точкой в примере были округлены до 1.0 при преобразовании к `bfloat16`.
 
+# quantileBFloat16Weighted {#quantilebfloat16weighted}
+
+Версия функции `quantileBFloat16`, которая учитывает вес каждого элемента последовательности.
+
 **См. также**
 
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md b/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
index 6da0f6caacd..85524c7ede3 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
@@ -50,7 +50,7 @@ AS state FROM train_data;
 
 После сохранения состояния в таблице мы можем использовать его несколько раз для прогнозирования или смёржить с другими состояниями и создать новые, улучшенные модели.
 
-``` sql
+```sql
 WITH (SELECT state FROM your_model) AS model SELECT
 evalMLMethod(model, param1, param2) FROM test_data
 ```
@@ -65,9 +65,9 @@ evalMLMethod(model, param1, param2) FROM test_data
 
 <!-- -->
 
-    ``` sql
-    SELECT state1 + state2 FROM your_models
-    ```
+```sql
+SELECT state1 + state2 FROM your_models
+```
 
 где таблица `your_models` содержит обе модели. Запрос вернёт новый объект `AggregateFunctionState`.
 
@@ -75,9 +75,9 @@ evalMLMethod(model, param1, param2) FROM test_data
 
 <!-- -->
 
-    ``` sql
-    SELECT stochasticLinearRegression(0.01)(target, param1, param2) FROM train_data
-    ```
+```sql
+SELECT stochasticLinearRegression(0.01)(target, param1, param2) FROM train_data
+```
 
 Подобный запрос строит модель и возвращает её веса, отвечающие параметрам моделей и смещение. Таким образом, в приведенном выше примере запрос вернет столбец с тремя значениями.
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md b/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md
index 5a8f93209cf..ac721577a9a 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md
@@ -43,4 +43,4 @@ SELECT sumCount(x) from s_table;
 
 **Смотрите также**
 
-- Настройка [optimize_fuse_sum_count_avg](../../../operations/settings/settings.md#optimize_fuse_sum_count_avg)
+- Настройка [optimize_syntax_fuse_functions](../../../operations/settings/settings.md#optimize_syntax_fuse_functions)
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/uniqthetasketch.md b/docs/ru/sql-reference/aggregate-functions/reference/uniqthetasketch.md
new file mode 120000
index 00000000000..ac61a28677f
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/data-types/domains/ipv4.md b/docs/ru/sql-reference/data-types/domains/ipv4.md
index af5f8261fae..2cab40ab38d 100644
--- a/docs/ru/sql-reference/data-types/domains/ipv4.md
+++ b/docs/ru/sql-reference/data-types/domains/ipv4.md
@@ -31,16 +31,16 @@ CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
 `IPv4` поддерживает вставку в виде строк с текстовым представлением IPv4 адреса:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.com', '183.247.232.58')('https://clickhouse.com/docs/en/', '116.106.34.242');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬───────────from─┐
-│ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
+│ https://clickhouse.com/docs/en/ │ 116.106.34.242 │
 │ https://wikipedia.org              │ 116.253.40.133 │
-│ https://clickhouse.tech          │ 183.247.232.58 │
+│ https://clickhouse.com          │ 183.247.232.58 │
 └────────────────────────────────────┴────────────────┘
 ```
 
diff --git a/docs/ru/sql-reference/data-types/domains/ipv6.md b/docs/ru/sql-reference/data-types/domains/ipv6.md
index 5b3c17feceb..96e5e817642 100644
--- a/docs/ru/sql-reference/data-types/domains/ipv6.md
+++ b/docs/ru/sql-reference/data-types/domains/ipv6.md
@@ -31,15 +31,15 @@ CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
 `IPv6` поддерживает вставку в виде строк с текстовым представлением IPv6 адреса:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.com', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.com/docs/en/', '2a02:e980:1e::1');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬─from──────────────────────────┐
-│ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-│ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
+│ https://clickhouse.com          │ 2001:44c8:129:2632:33:0:252:2 │
+│ https://clickhouse.com/docs/en/ │ 2a02:e980:1e::1               │
 │ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
 └────────────────────────────────────┴───────────────────────────────┘
 ```
diff --git a/docs/ru/sql-reference/data-types/lowcardinality.md b/docs/ru/sql-reference/data-types/lowcardinality.md
index 49ba5db0169..dee201bce33 100644
--- a/docs/ru/sql-reference/data-types/lowcardinality.md
+++ b/docs/ru/sql-reference/data-types/lowcardinality.md
@@ -55,6 +55,5 @@ ORDER BY id
 
 ## Смотрите также
 
--   [A Magical Mystery Tour of the LowCardinality Data Type](https://www.altinity.com/blog/2019/3/27/low-cardinality).
 -   [Reducing Clickhouse Storage Cost with the Low Cardinality Type – Lessons from an Instana Engineer](https://www.instana.com/blog/reducing-clickhouse-storage-cost-with-the-low-cardinality-type-lessons-from-an-instana-engineer/).
 -   [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/yandex/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
diff --git a/docs/ru/sql-reference/data-types/map.md b/docs/ru/sql-reference/data-types/map.md
index 32eb4a80b3e..8fa742a0d03 100644
--- a/docs/ru/sql-reference/data-types/map.md
+++ b/docs/ru/sql-reference/data-types/map.md
@@ -94,4 +94,4 @@ SELECT a.values FROM t_map;
 -   функция [map()](../../sql-reference/functions/tuple-map-functions.md#function-map)
 -   функция [CAST()](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast)
 
-[Original article](https://clickhouse.tech/docs/ru/data-types/map/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ru/data-types/map/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/nested-data-structures/nested.md b/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
index 718fe77ae95..db957e57502 100644
--- a/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
+++ b/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
@@ -1,4 +1,6 @@
-# Nested(Name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
+# Nested {#nested}
+
+## Nested(Name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
 
 Вложенная структура данных - это как будто вложенная таблица. Параметры вложенной структуры данных - имена и типы столбцов, указываются так же, как у запроса CREATE. Каждой строке таблицы может соответствовать произвольное количество строк вложенной структуры данных.
 
@@ -95,4 +97,3 @@ LIMIT 10
 При запросе DESCRIBE, столбцы вложенной структуры данных перечисляются так же по отдельности.
 
 Работоспособность запроса ALTER для элементов вложенных структур данных, является сильно ограниченной.
-
diff --git a/docs/ru/sql-reference/data-types/uuid.md b/docs/ru/sql-reference/data-types/uuid.md
index b780190f6f4..002573a7455 100644
--- a/docs/ru/sql-reference/data-types/uuid.md
+++ b/docs/ru/sql-reference/data-types/uuid.md
@@ -75,4 +75,4 @@ SELECT * FROM t_uuid
 
 Тип данных UUID не поддерживается арифметическими операциями (например, [abs](../../sql-reference/data-types/uuid.md#arithm_func-abs)) или агрегатными функциями, такими как [sum](../../sql-reference/data-types/uuid.md#agg_function-sum) и [avg](../../sql-reference/data-types/uuid.md#agg_function-avg).
 
-[Original article](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/uuid/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/array-functions.md b/docs/ru/sql-reference/functions/array-functions.md
index 6586dd663c7..5507ca77f16 100644
--- a/docs/ru/sql-reference/functions/array-functions.md
+++ b/docs/ru/sql-reference/functions/array-functions.md
@@ -816,7 +816,7 @@ arrayDifference(array)
 
 **Аргументы**
 
--   `array` – [массив](https://clickhouse.tech/docs/ru/data_types/array/).
+-   `array` – [массив](https://clickhouse.com/docs/ru/data_types/array/).
 
 **Возвращаемое значение**
 
@@ -866,7 +866,7 @@ arrayDistinct(array)
 
 **Аргументы**
 
--   `array` – [массив](https://clickhouse.tech/docs/ru/data_types/array/).
+-   `array` – [массив](https://clickhouse.com/docs/ru/data_types/array/).
 
 **Возвращаемое значение**
 
diff --git a/docs/ru/sql-reference/functions/bitmap-functions.md b/docs/ru/sql-reference/functions/bitmap-functions.md
index 3da729664d0..011d339c847 100644
--- a/docs/ru/sql-reference/functions/bitmap-functions.md
+++ b/docs/ru/sql-reference/functions/bitmap-functions.md
@@ -66,15 +66,14 @@ bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
 **Аргументы**
 
 -   `bitmap` – битмап. [Bitmap object](#bitmap_functions-bitmapbuild).
-
 -   `range_start` – начальная точка подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
--   `cardinality_limit` – Верхний предел подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
+-   `cardinality_limit` – верхний предел подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
 
 **Возвращаемое значение**
 
 Подмножество битмапа.
 
-Тип: `Bitmap object`.
+Тип: [Bitmap object](#bitmap_functions-bitmapbuild).
 
 **Пример**
 
@@ -92,6 +91,44 @@ SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12
 └───────────────────────────┘
 ```
 
+## subBitmap {#subbitmap}
+
+Возвращает элементы битмапа, начиная с позиции `offset`. Число возвращаемых элементов ограничивается параметром `cardinality_limit`. Аналог строковой функции [substring](string-functions.md#substring)), но для битмапа.
+
+**Синтаксис**
+
+``` sql
+subBitmap(bitmap, offset, cardinality_limit)
+```
+
+**Аргументы**
+
+-   `bitmap` – битмап. Тип: [Bitmap object](#bitmap_functions-bitmapbuild).
+-   `offset` – позиция первого элемента возвращаемого подмножества. Тип: [UInt32](../../sql-reference/data-types/int-uint.md).
+-   `cardinality_limit` – максимальное число элементов возвращаемого подмножества. Тип: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+Подмножество битмапа.
+
+Тип: [Bitmap object](#bitmap_functions-bitmapbuild).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT bitmapToArray(subBitmap(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(10), toUInt32(10))) AS res;
+```
+
+Результат:
+
+``` text
+┌─res─────────────────────────────┐
+│ [10,11,12,13,14,15,16,17,18,19] │
+└─────────────────────────────────┘
+```
+
 ## bitmapContains {#bitmap_functions-bitmapcontains}
 
 Проверяет вхождение элемента в битовый массив.
diff --git a/docs/ru/sql-reference/functions/conditional-functions.md b/docs/ru/sql-reference/functions/conditional-functions.md
index 8a78425efd4..521df785df2 100644
--- a/docs/ru/sql-reference/functions/conditional-functions.md
+++ b/docs/ru/sql-reference/functions/conditional-functions.md
@@ -12,11 +12,13 @@ toc_title: "Условные функции"
 **Синтаксис**
 
 ``` sql
-SELECT if(cond, then, else)
+if(cond, then, else)
 ```
 
 Если условие `cond` не равно нулю, то возвращается результат выражения `then`. Если условие `cond` равно нулю или является NULL, то результат выражения `then` пропускается и возвращается результат выражения `else`.
 
+Чтобы вычислять функцию `if` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `then` вычисляется только для строк, где условие `cond` верно, а выражение `else` – для строк, где условие `cond` неверно. Например, при выполнении запроса `SELECT if(number = 0, 0, intDiv(42, number)) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль, так как `intDiv(42, number)` будет вычислено только для чисел, которые не удовлетворяют условию `number = 0`.
+
 **Аргументы**
 
 -   `cond` – проверяемое условие. Может быть [UInt8](../../sql-reference/functions/conditional-functions.md) или `NULL`.
@@ -77,7 +79,13 @@ SELECT if(0, plus(2, 2), plus(2, 6));
 
 Позволяет более компактно записать оператор [CASE](../operators/index.md#operator_case) в запросе.
 
-    multiIf(cond_1, then_1, cond_2, then_2...else)
+**Синтаксис**
+
+``` sql
+multiIf(cond_1, then_1, cond_2, then_2, ..., else)
+```
+
+Чтобы вычислять функцию `multiIf` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `then_i` вычисляется только для строк, где условие `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}) AND cond_i)` верно, `cond_i` вычисляется только для строк, где условие `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}))` верно. Например, при выполнении запроса `SELECT multiIf(number = 2, intDiv(1, number), number = 5) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль.
 
 **Аргументы**
 
@@ -110,4 +118,3 @@ SELECT if(0, plus(2, 2), plus(2, 6));
 │                                       ᴺᵁᴸᴸ │
 └────────────────────────────────────────────┘
 ```
-
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 161c1304b7c..694dfef7d75 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -17,13 +17,13 @@ char(number_1, [number_2, ..., number_n]);
 
 **Аргументы**
 
--   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md).
+-   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md).
 
 **Возвращаемое значение**
 
 -   Строка из соответствующих байт.
 
-Тип: `String`.
+Тип: [String](../../sql-reference/data-types/string.md).
 
 **Пример**
 
@@ -73,61 +73,57 @@ SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
 
 ## hex {#hex}
 
-Returns a string containing the argument’s hexadecimal representation.
+Возвращает строку, содержащую шестнадцатеричное представление аргумента.
 
 Синоним: `HEX`.
 
-**Syntax**
+**Синтаксис**
 
 ``` sql
 hex(arg)
 ```
 
-The function is using uppercase letters `A-F` and not using any prefixes (like `0x`) or suffixes (like `h`).
+Функция использует прописные буквы `A-F` и не использует никаких префиксов (например, `0x`) или суффиксов (например, `h`).
 
-For integer arguments, it prints hex digits («nibbles») from the most significant to least significant (big endian or «human readable» order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints both digits of every byte even if leading digit is zero.
+Для целочисленных аргументов возвращает шестнадцатеричные цифры от наиболее до наименее значимых (`big endian`, человекочитаемый порядок).Он начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда выводит обе цифры каждого байта, даже если начальная цифра равна нулю.
 
-Example:
+Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) формируются как соответствующие целые числа (количество дней с момента Unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
 
-**Example**
+Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md), все байты просто кодируются как два шестнадцатеричных числа. Нулевые байты не опущены.
 
-Query:
+Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные/конечные байты не опущены.
+
+**Аргументы**
+
+-   `arg` — значение для преобразования в шестнадцатеричное. [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Возвращаемое значение**
+
+-   Строка — шестнадцатеричное представление аргумента.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Примеры**
+
+Запрос:
 
 ``` sql
 SELECT hex(1);
 ```
 
-Result:
+Результат:
 
 ``` text
 01
 ```
 
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
-
-For `String` and `FixedString`, all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
-
-Values of floating point and Decimal types are encoded as their representation in memory. As we support little endian architecture, they are encoded in little endian. Zero leading/trailing bytes are not omitted.
-
-**Parameters**
-
--   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/functions/encoding-functions.md), [UInt](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md), [Decimal](../../sql-reference/functions/encoding-functions.md), [Date](../../sql-reference/functions/encoding-functions.md) or [DateTime](../../sql-reference/functions/encoding-functions.md).
-
-**Returned value**
-
--   A string with the hexadecimal representation of the argument.
-
-Type: `String`.
-
-**Example**
-
-Query:
+Запрос:
 
 ``` sql
-SELECT hex(toFloat32(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat32(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
-Result:
+Результат:
 
 ``` text
 ┌─hex_presentation─┐
@@ -136,13 +132,13 @@ Result:
 └──────────────────┘
 ```
 
-Query:
+Запрос:
 
 ``` sql
-SELECT hex(toFloat64(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat64(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
-Result:
+Результат:
 
 ``` text
 ┌─hex_presentation─┐
@@ -208,6 +204,141 @@ SELECT reinterpretAsUInt64(reverse(unhex('FFF'))) AS num;
 └──────┘
 ```
 
+## bin {#bin}
+
+Возвращает строку, содержащую бинарное представление аргумента.
+
+**Синтаксис**
+
+``` sql
+bin(arg)
+```
+
+Синоним: `BIN`.
+
+Для целочисленных аргументов возвращаются двоичные числа от наиболее значимого до наименее значимого (`big-endian`, человекочитаемый порядок). Порядок начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда возвращает восемь цифр каждого байта, если начальная цифра равна нулю.
+
+Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) формируются как соответствующие целые числа (количество дней с момента Unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
+
+Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md) все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
+
+Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные/конечные байты не опущены.
+
+**Аргументы**
+
+-   `arg` — значение для преобразования в двоичный код. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Возвращаемое значение**
+
+-   Бинарная строка (BLOB) — двоичное представление аргумента.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT bin(14);
+```
+
+Результат:
+
+``` text
+┌─bin(14)──┐
+│ 00001110 │
+└──────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT bin(toFloat32(number)) AS bin_presentation FROM numbers(15, 2);
+```
+
+Результат:
+
+``` text
+┌─bin_presentation─────────────────┐
+│ 00000000000000000111000001000001 │
+│ 00000000000000001000000001000001 │
+└──────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT bin(toFloat64(number)) AS bin_presentation FROM numbers(15, 2);
+```
+
+Результат:
+
+``` text
+┌─bin_presentation─────────────────────────────────────────────────┐
+│ 0000000000000000000000000000000000000000000000000010111001000000 │
+│ 0000000000000000000000000000000000000000000000000011000001000000 │
+└──────────────────────────────────────────────────────────────────┘
+```
+
+## unbin {#unbinstr}
+
+Интерпретирует каждую пару двоичных цифр аргумента как число и преобразует его в байт, представленный числом. Функция выполняет операцию, противоположную [bin](#bin).
+
+**Синтаксис**
+
+``` sql
+unbin(arg)
+```
+
+Синоним: `UNBIN`.
+
+Для числового аргумента `unbin()` не возвращает значение, обратное результату `bin()`. Чтобы преобразовать результат в число, используйте функции [reverse](../../sql-reference/functions/string-functions.md#reverse) и [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#reinterpretasuint8163264).
+
+!!! note "Примечание"
+    Если `unbin` вызывается из клиента `clickhouse-client`, бинарная строка возвращается в кодировке UTF-8.
+
+Поддерживает двоичные цифры `0` и `1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). 
+
+**Аргументы**
+
+-   `arg` — строка, содержащая любое количество двоичных цифр. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Бинарная строка (BLOB).
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT UNBIN('001100000011000100110010'), UNBIN('0100110101111001010100110101000101001100');
+```
+
+Результат:
+
+``` text
+┌─unbin('001100000011000100110010')─┬─unbin('0100110101111001010100110101000101001100')─┐
+│ 012                               │ MySQL                                             │
+└───────────────────────────────────┴───────────────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT reinterpretAsUInt64(reverse(unbin('1110'))) AS num;
+```
+
+Результат:
+
+``` text
+┌─num─┐
+│  14 │
+└─────┘
+```
+
 ## UUIDStringToNum(str) {#uuidstringtonumstr}
 
 Принимает строку, содержащую 36 символов в формате `123e4567-e89b-12d3-a456-426655440000`, и возвращает в виде набора байт в FixedString(16).
@@ -263,7 +394,7 @@ SELECT bitPositionsToArray(toInt8(1)) AS bit_positions;
 Запрос:
 
 ``` sql
-select bitPositionsToArray(toInt8(-1)) as bit_positions;
+SELECT bitPositionsToArray(toInt8(-1)) AS bit_positions;
 ```
 
 Результат:
diff --git a/docs/ru/sql-reference/functions/encryption-functions.md b/docs/ru/sql-reference/functions/encryption-functions.md
index d9bcbaf0887..14add7e295c 100644
--- a/docs/ru/sql-reference/functions/encryption-functions.md
+++ b/docs/ru/sql-reference/functions/encryption-functions.md
@@ -358,4 +358,4 @@ SELECT aes_decrypt_mysql('aes-256-cfb128', unhex('24E9E4966469'), '1234567891012
 │ Secret    │
 └───────────┘
 ```
-[Original article](https://clickhouse.tech/docs/ru/sql-reference/functions/encryption_functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ru/sql-reference/functions/encryption_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/index.md b/docs/ru/sql-reference/functions/index.md
index 15da9d36ef5..92bd1c1c2f8 100644
--- a/docs/ru/sql-reference/functions/index.md
+++ b/docs/ru/sql-reference/functions/index.md
@@ -58,6 +58,10 @@ str -> str != Referer
 
 Для некоторых функций первый аргумент (лямбда-функция) может отсутствовать. В этом случае подразумевается тождественное отображение.
 
+## Пользовательские функции {#user-defined-functions}
+
+Функции можно создавать с помощью выражения [CREATE FUNCTION](../statements/create/function.md). Для удаления таких функций используется выражение [DROP FUNCTION](../statements/drop.md#drop-function).
+
 ## Обработка ошибок {#obrabotka-oshibok}
 
 Некоторые функции могут кидать исключения в случае ошибочных данных. В этом случае, выполнение запроса прерывается, и текст ошибки выводится клиенту. При распределённой обработке запроса, при возникновении исключения на одном из серверов, на другие серверы пытается отправиться просьба тоже прервать выполнение запроса.
diff --git a/docs/ru/sql-reference/functions/introspection.md b/docs/ru/sql-reference/functions/introspection.md
index cb2bcdb787f..1947bfce42d 100644
--- a/docs/ru/sql-reference/functions/introspection.md
+++ b/docs/ru/sql-reference/functions/introspection.md
@@ -309,7 +309,7 @@ clone
 
 ## tid {#tid}
 
-Возвращает id потока, в котором обрабатывается текущий [Block](https://clickhouse.tech/docs/ru/development/architecture/#block).
+Возвращает id потока, в котором обрабатывается текущий [Block](https://clickhouse.com/docs/ru/development/architecture/#block).
 
 **Синтаксис**
 
@@ -339,7 +339,7 @@ SELECT tid();
 
 ## logTrace {#logtrace}
 
- Выводит сообщение в лог сервера для каждого [Block](https://clickhouse.tech/docs/ru/development/architecture/#block).
+ Выводит сообщение в лог сервера для каждого [Block](https://clickhouse.com/docs/ru/development/architecture/#block).
 
 **Синтаксис**
 
@@ -371,4 +371,4 @@ SELECT logTrace('logTrace message');
 └──────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/introspection/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/query_language/functions/introspection/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/logical-functions.md b/docs/ru/sql-reference/functions/logical-functions.md
index 837541ec58f..6ba55dca30f 100644
--- a/docs/ru/sql-reference/functions/logical-functions.md
+++ b/docs/ru/sql-reference/functions/logical-functions.md
@@ -19,6 +19,8 @@ toc_title: "Логические функции"
 and(val1, val2...)
 ```
 
+Чтобы вычислять функцию `and` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `vali` вычисляется только для строк, где условие `(val1 AND val2 AND ... AND val{i-1})` верно. Например, при выполнении запроса `SELECT and(number = 2, intDiv(1, number)) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль.
+
 **Аргументы**
 
 -   `val1, val2, ...` — список из как минимум двух значений. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) или [Nullable](../../sql-reference/data-types/nullable.md).
@@ -71,6 +73,8 @@ SELECT and(NULL, 1, 10, -2);
 and(val1, val2...)
 ```
 
+Чтобы вычислять функцию `or` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `vali` вычисляется только для строк, где условие `((NOT val1) AND (NOT val2) AND ... AND (NOT val{i-1}))` верно. Например, при выполнении запроса `SELECT or(number = 0, intDiv(1, number) != 0) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль.
+
 **Аргументы**
 
 -   `val1, val2, ...` — список из как минимум двух значений. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) или [Nullable](../../sql-reference/data-types/nullable.md).
diff --git a/docs/ru/sql-reference/functions/rounding-functions.md b/docs/ru/sql-reference/functions/rounding-functions.md
index 276f85bf6b7..1eede1ea57c 100644
--- a/docs/ru/sql-reference/functions/rounding-functions.md
+++ b/docs/ru/sql-reference/functions/rounding-functions.md
@@ -27,7 +27,7 @@ N может быть отрицательным.
 
 Округляет значение до указанного десятичного разряда.
 
-Функция возвращает ближайшее значение указанного порядка. В случае, когда заданное число равноудалено от чисел необходимого порядка, функция возвращает то из них, которое имеет ближайшую чётную цифру (банковское округление).
+Функция возвращает ближайшее значение указанного порядка. В случае, когда заданное число равноудалено от чисел необходимого порядка, для типов с плавающей точкой (Float32/64) функция возвращает то из них, которое имеет ближайшую чётную цифру (банковское округление), для типов с фиксированной точкой (Decimal) функция использует округление в бо́льшую по модулю сторону (математическое округление).
 
 ``` sql
 round(expression [, decimal_places])
@@ -47,7 +47,7 @@ round(expression [, decimal_places])
 
 ### Примеры {#primery}
 
-**Пример использования**
+**Пример использования с Float**
 
 ``` sql
 SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
@@ -61,6 +61,21 @@ SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
 └─────┴──────────────────────────┘
 ```
 
+**Пример использования с Decimal**
+
+
+``` sql
+SELECT cast(number / 2 AS  Decimal(10,4)) AS x, round(x) FROM system.numbers LIMIT 3
+```
+
+``` text
+┌──────x─┬─round(CAST(divide(number, 2), 'Decimal(10, 4)'))─┐
+│ 0.0000 │                                           0.0000 │
+│ 0.5000 │                                           1.0000 │
+│ 1.0000 │                                           1.0000 │
+└────────┴──────────────────────────────────────────────────┘
+```
+
 **Примеры округления**
 
 Округление до ближайшего числа.
diff --git a/docs/ru/sql-reference/functions/string-search-functions.md b/docs/ru/sql-reference/functions/string-search-functions.md
index 5b6cbc68d2e..5bbd760bfb6 100644
--- a/docs/ru/sql-reference/functions/string-search-functions.md
+++ b/docs/ru/sql-reference/functions/string-search-functions.md
@@ -486,7 +486,7 @@ SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[
 
 ## ilike {#ilike}
 
-Нечувствительный к регистру вариант функции [like](https://clickhouse.tech/docs/ru/sql-reference/functions/string-search-functions/#function-like). Вы можете использовать оператор `ILIKE` вместо функции `ilike`.
+Нечувствительный к регистру вариант функции [like](https://clickhouse.com/docs/ru/sql-reference/functions/string-search-functions/#function-like). Вы можете использовать оператор `ILIKE` вместо функции `ilike`.
 
 **Синтаксис**
 
@@ -542,7 +542,7 @@ SELECT * FROM Months WHERE ilike(name, '%j%');
 
 **Смотрите также**
 
--   [like](https://clickhouse.tech/docs/ru/sql-reference/functions/string-search-functions/#function-like) <!--hide-->
+-   [like](https://clickhouse.com/docs/ru/sql-reference/functions/string-search-functions/#function-like) <!--hide-->
 
 ## ngramDistance(haystack, needle) {#ngramdistancehaystack-needle}
 
diff --git a/docs/ru/sql-reference/functions/tuple-map-functions.md b/docs/ru/sql-reference/functions/tuple-map-functions.md
index 4775152fb54..e4cc1fefab4 100644
--- a/docs/ru/sql-reference/functions/tuple-map-functions.md
+++ b/docs/ru/sql-reference/functions/tuple-map-functions.md
@@ -73,22 +73,22 @@ SELECT a['key2'] FROM table_map;
 **Синтаксис**
 
 ``` sql
-mapAdd(Tuple(Array, Array), Tuple(Array, Array) [, ...])
+mapAdd(arg1, arg2 [, ...])
 ```
 
 **Аргументы**
 
-Аргументами являются [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
+Аргументами являются контейнеры [Map](../../sql-reference/data-types/map.md) или [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
 Все массивы ключей должны иметь один и тот же тип, а все массивы значений должны содержать элементы, которые можно приводить к одному типу ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) или [Float64](../../sql-reference/data-types/float.md#float32-float64)).
 Общий приведенный тип используется в качестве типа для результирующего массива.
 
 **Возвращаемое значение**
 
--   Возвращает один [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
+-   В зависимости от типа аргументов возвращает один [Map](../../sql-reference/data-types/map.md) или [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
 
 **Пример**
 
-Запрос:
+Запрос с кортежем:
 
 ``` sql
 SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTypeName(res) as type;
@@ -102,6 +102,20 @@ SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTy
 └───────────────┴────────────────────────────────────┘
 ```
 
+Запрос с контейнером `Map`:
+
+```sql
+SELECT mapAdd(map(1,1), map(1,1));
+```
+
+Result:
+
+```text
+┌─mapAdd(map(1, 1), map(1, 1))─┐
+│ {1:2}                        │
+└──────────────────────────────┘
+```
+
 ## mapSubtract {#function-mapsubtract}
 
 Собирает все ключи и вычитает соответствующие значения.
diff --git a/docs/ru/sql-reference/statements/alter/index.md b/docs/ru/sql-reference/statements/alter/index.md
index 043ac3839d9..73ee201b56b 100644
--- a/docs/ru/sql-reference/statements/alter/index.md
+++ b/docs/ru/sql-reference/statements/alter/index.md
@@ -14,7 +14,7 @@ ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN
 В запросе указывается список из одного или более действий через запятую.
 Каждое действие — операция над столбцом.
 
-Большинство запросов `ALTER` изменяют настройки таблицы или данные:
+Большинство запросов `ALTER TABLE` изменяют настройки таблицы или данные:
 
 -   [COLUMN](../../../sql-reference/statements/alter/column.md)
 -   [PARTITION](../../../sql-reference/statements/alter/partition.md)
@@ -26,7 +26,12 @@ ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN
 -   [TTL](../../../sql-reference/statements/alter/ttl.md)
 
 !!! note "Note"
-    Запрос `ALTER` поддерживается только для таблиц типа `*MergeTree`, а также `Merge` и `Distributed`. Запрос имеет несколько вариантов.
+    Запрос `ALTER TABLE` поддерживается только для таблиц типа `*MergeTree`, а также `Merge` и `Distributed`. Запрос имеет несколько вариантов.
+
+Следующие запросы `ALTER` управляют представлениями:
+
+-   [ALTER TABLE ... MODIFY QUERY](../../../sql-reference/statements/alter/view.md) — изменяет структуру [Materialized view](../create/view.md#materialized).
+-   [ALTER LIVE VIEW](../../../sql-reference/statements/alter/view.md#alter-live-view) — обновляет [Live view](../create/view.md#live-view).
 
 Следующие запросы `ALTER` изменяют сущности, связанные с управлением доступом на основе ролей:
 
@@ -64,8 +69,11 @@ ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 
 Для нереплицируемых таблиц, все запросы `ALTER` выполняются синхронно. Для реплицируемых таблиц, запрос всего лишь добавляет инструкцию по соответствующим действиям в `ZooKeeper`, а сами действия осуществляются при первой возможности. Но при этом, запрос может ждать завершения выполнения этих действий на всех репликах.
 
-Для запросов `ALTER ... ATTACH|DETACH|DROP` можно настроить ожидание, с помощью настройки `replication_alter_partitions_sync`.
-Возможные значения: `0` - не ждать, `1` - ждать выполнения только у себя (по умолчанию), `2` - ждать всех.
+Для всех запросов `ALTER` можно настроить ожидание с помощью настройки [replication_alter_partitions_sync](../../../operations/settings/settings.md#replication-alter-partitions-sync).
+
+Вы можете указать время ожидания (в секундах) выполнения всех запросов `ALTER` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Для всех запросов `ALTER` при `replication_alter_partitions_sync = 2` и неактивности некоторых реплик больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, генерируется исключение `UNFINISHED`.
 
 Для запросов `ALTER TABLE ... UPDATE|DELETE` синхронность выполнения определяется настройкой [mutations_sync](../../../operations/settings/settings.md#mutations_sync).
-
diff --git a/docs/ru/sql-reference/statements/alter/index/index.md b/docs/ru/sql-reference/statements/alter/index/index.md
index 1f6bbea5c4b..c3d1e75a77d 100644
--- a/docs/ru/sql-reference/statements/alter/index/index.md
+++ b/docs/ru/sql-reference/statements/alter/index/index.md
@@ -19,7 +19,7 @@ ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 Команда `ADD INDEX` добавляет описание индексов в метаданные, а `DROP INDEX` удаляет индекс из метаданных и стирает файлы индекса с диска, поэтому они легковесные и работают мгновенно.
 
 Если индекс появился в метаданных, то он начнет считаться в последующих слияниях и записях в таблицу, а не сразу после выполнения операции `ALTER`.
-`MATERIALIZE INDEX` - перестраивает индекс в указанной партиции. Реализовано как мутация.
+`MATERIALIZE INDEX` - перестраивает индекс в указанной партиции. Реализовано как мутация. В случае если нужно перестроить индекс над всеми данными то писать `IN PARTITION` не нужно.
 
 Запрос на изменение индексов реплицируется, сохраняя новые метаданные в ZooKeeper и применяя изменения на всех репликах.
 
diff --git a/docs/ru/sql-reference/statements/alter/view.md b/docs/ru/sql-reference/statements/alter/view.md
new file mode 100644
index 00000000000..86dd018a947
--- /dev/null
+++ b/docs/ru/sql-reference/statements/alter/view.md
@@ -0,0 +1,44 @@
+---
+toc_priority: 50
+toc_title: VIEW
+---
+
+# Выражение ALTER TABLE … MODIFY QUERY {#alter-modify-query}
+
+Вы можеие изменить запрос `SELECT`, который был задан при создании [материализованного представления](../create/view.md#materialized), с помощью запроса 'ALTER TABLE … MODIFY QUERY'. Используйте его если при создании материализованного представления не использовалась секция `TO [db.]name`. Настройка `allow_experimental_alter_materialized_view_structure` должна быть включена. 
+
+Если при создании материализованного представления использовалась конструкция `TO [db.]name`, то для изменения отсоедините представление с помощью [DETACH](../detach.md), измените таблицу с помощью [ALTER TABLE](index.md), а затем снова присоедините запрос с помощью [ATTACH](../attach.md).
+
+**Пример**
+
+```sql
+CREATE TABLE src_table (`a` UInt32) ENGINE = MergeTree ORDER BY a;
+CREATE MATERIALIZED VIEW mv (`a` UInt32) ENGINE = MergeTree ORDER BY a AS SELECT a FROM src_table; 
+INSERT INTO src_table (a) VALUES (1), (2);
+SELECT * FROM mv;
+```
+```text
+┌─a─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+```sql
+ALTER TABLE mv MODIFY QUERY SELECT a * 2 as a FROM src_table;
+INSERT INTO src_table (a) VALUES (3), (4);
+SELECT * FROM mv;
+```
+```text
+┌─a─┐
+│ 6 │
+│ 8 │
+└───┘
+┌─a─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+
+## Выражение ALTER LIVE VIEW {#alter-live-view}
+
+Выражение `ALTER LIVE VIEW ... REFRESH` обновляет [Live-представление](../create/view.md#live-view). См. раздел [Force Live View Refresh](../create/view.md#live-view-alter-refresh).
diff --git a/docs/ru/sql-reference/statements/create/function.md b/docs/ru/sql-reference/statements/create/function.md
new file mode 100644
index 00000000000..90838b25744
--- /dev/null
+++ b/docs/ru/sql-reference/statements/create/function.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 38
+toc_title: FUNCTION
+---
+
+# CREATE FUNCTION {#create-function}
+
+Создает пользовательскую функцию из лямбда-выражения. Выражение должно состоять из параметров функции, констант, операторов и вызовов других функций.
+
+**Синтаксис**
+
+```sql
+CREATE FUNCTION name AS (parameter0, ...) -> expression
+```
+У функции может быть произвольное число параметров.
+
+Существует несколько ограничений на создаваемые функции:
+
+-   Имя функции должно быть уникальным среди всех пользовательских и системных функций.
+-   Рекурсивные функции запрещены.
+-   Все переменные, используемые функцией, должны быть перечислены в списке ее параметров.
+
+Если какое-нибудь ограничение нарушается, то при попытке создать функцию возникает исключение.
+
+**Пример**
+
+Запрос:
+
+```sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+SELECT number, linear_equation(number, 2, 1) FROM numbers(3);
+```
+
+Результат:
+
+``` text
+┌─number─┬─plus(multiply(2, number), 1)─┐
+│      0 │                            1 │
+│      1 │                            3 │
+│      2 │                            5 │
+└────────┴──────────────────────────────┘
+```
+
+В следующем запросе пользовательская функция вызывает [условную функцию](../../../sql-reference/functions/conditional-functions.md):
+
+```sql
+CREATE FUNCTION parity_str AS (n) -> if(n % 2, 'odd', 'even');
+SELECT number, parity_str(number) FROM numbers(3);
+```
+
+Результат:
+
+``` text
+┌─number─┬─if(modulo(number, 2), 'odd', 'even')─┐
+│      0 │ even                                 │
+│      1 │ odd                                  │
+│      2 │ even                                 │
+└────────┴──────────────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/statements/create/index.md b/docs/ru/sql-reference/statements/create/index.md
index dfa5c28fff7..61d4d053fec 100644
--- a/docs/ru/sql-reference/statements/create/index.md
+++ b/docs/ru/sql-reference/statements/create/index.md
@@ -12,6 +12,7 @@ toc_title: "Обзор"
 -   [TABLE](../../../sql-reference/statements/create/table.md)
 -   [VIEW](../../../sql-reference/statements/create/view.md)
 -   [DICTIONARY](../../../sql-reference/statements/create/dictionary.md)
+-   [FUNCTION](../../../sql-reference/statements/create/function.md)
 -   [USER](../../../sql-reference/statements/create/user.md)
 -   [ROLE](../../../sql-reference/statements/create/role.md)
 -   [ROW POLICY](../../../sql-reference/statements/create/row-policy.md)
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index 77c192b2b26..6601276d573 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -201,8 +201,6 @@ ALTER TABLE codec_example MODIFY COLUMN float_value CODEC(Default);
 
 Кодеки можно последовательно комбинировать, например, `CODEC(Delta, Default)`.
 
-Чтобы выбрать наиболее подходящую для вашего проекта комбинацию кодеков, необходимо провести сравнительные тесты, подобные тем, что описаны в статье Altinity [New Encodings to Improve ClickHouse Efficiency](https://www.altinity.com/blog/2019/7/new-encodings-to-improve-clickhouse). Для столбцов типа `ALIAS` кодеки не применяются.
-
 !!! warning "Предупреждение"
     Нельзя распаковать базу данных ClickHouse с помощью сторонних утилит наподобие `lz4`. Необходимо использовать специальную утилиту [clickhouse-compressor](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor).
 
diff --git a/docs/ru/sql-reference/statements/create/view.md b/docs/ru/sql-reference/statements/create/view.md
index 0be29b12aea..ccbf79baa73 100644
--- a/docs/ru/sql-reference/statements/create/view.md
+++ b/docs/ru/sql-reference/statements/create/view.md
@@ -5,7 +5,7 @@ toc_title: "Представление"
 
 # CREATE VIEW {#create-view}
 
-Создаёт представление. Представления бывают двух видов - обычные и материализованные (MATERIALIZED).
+Создаёт представление. Представления бывают [обычные](#normal), [материализованные](#materialized) (MATERIALIZED) и [LIVE](#live-view).
 
 ## Обычные представления {#normal}
 
@@ -54,7 +54,7 @@ CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]na
 
 Запрос `SELECT` может содержать `DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`… Следует иметь ввиду, что соответствующие преобразования будут выполняться независимо, на каждый блок вставляемых данных. Например, при наличии `GROUP BY`, данные будут агрегироваться при вставке, но только в рамках одной пачки вставляемых данных. Далее, данные не будут доагрегированы. Исключение - использование ENGINE, производящего агрегацию данных самостоятельно, например, `SummingMergeTree`.
 
-Недоработано выполнение запросов `ALTER` над материализованными представлениями, поэтому они могут быть неудобными для использования. Если материализованное представление использует конструкцию `TO [db.]name`, то можно выполнить `DETACH` представления, `ALTER` для целевой таблицы и последующий `ATTACH` ранее отсоединенного (`DETACH`) представления.
+Выполнение запросов [ALTER](../../../sql-reference/statements/alter/view.md) над материализованными представлениями имеет свои особенности, поэтому эти запросы могут быть неудобными для использования. Если материализованное представление использует конструкцию `TO [db.]name`, то можно выполнить `DETACH` представления, `ALTER` для целевой таблицы и последующий `ATTACH` ранее отсоединенного (`DETACH`) представления.
 
 Обратите внимание, что работа материализованного представления находится под влиянием настройки [optimize_on_insert](../../../operations/settings/settings.md#optimize-on-insert). Перед вставкой данных в таблицу происходит их слияние.
 
@@ -62,7 +62,7 @@ CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]na
 
 Чтобы удалить представление, следует использовать [DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). Впрочем, `DROP TABLE` тоже работает для представлений.
 
-## LIVE-представления {#live-view}
+## LIVE-представления [экспериментальный функционал] {#live-view}
 
 !!! important "Важно"
    Представления `LIVE VIEW` являются экспериментальной возможностью. Их использование может повлечь потерю совместимости в будущих версиях.
@@ -86,7 +86,7 @@ LIVE-представления работают по тому же принци
 
     В случаях, когда `LIVE VIEW` не обновляется автоматически, чтобы обновлять его принудительно с заданной периодичностью, используйте [WITH REFRESH](#live-view-with-refresh).
 
-### Отслеживание изменений {#live-view-monitoring}
+### Отслеживание изменений LIVE-представлений {#live-view-monitoring}
 
 Для отслеживания изменений LIVE-представления используйте запрос [WATCH](../../../sql-reference/statements/watch.md).
 
@@ -108,12 +108,11 @@ WATCH lv;
 │      1 │        1 │
 └────────┴──────────┘
 ┌─sum(x)─┬─_version─┐
-│      2 │        2 │
+│      3 │        2 │
 └────────┴──────────┘
 ┌─sum(x)─┬─_version─┐
 │      6 │        3 │
 └────────┴──────────┘
-...
 ```
 
 ```sql
@@ -148,7 +147,7 @@ WATCH lv EVENTS;
 SELECT * FROM [db.]live_view WHERE ...
 ```
 
-### Принудительное обновление {#live-view-alter-refresh}
+### Принудительное обновление LIVE-представлений {#live-view-alter-refresh}
 
 Чтобы принудительно обновить LIVE-представление, используйте запрос `ALTER LIVE VIEW [db.]table_name REFRESH`.
 
@@ -220,13 +219,13 @@ WATCH lv;
 Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv doesn't exist..
 ```
 
-### Использование {#live-view-usage}
+### Использование LIVE-представлений {#live-view-usage}
 
-Наиболее частые случаи использования `LIVE-VIEW`:
+Наиболее частые случаи использования `LIVE-представлений`:
 
 - Получение push-уведомлений об изменениях данных без дополнительных периодических запросов.
 - Кеширование результатов часто используемых запросов для получения их без задержки.
 - Отслеживание изменений таблицы для запуска других запросов `SELECT`.
 - Отслеживание показателей из системных таблиц с помощью периодических обновлений.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/view) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/statements/create/view) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/drop.md b/docs/ru/sql-reference/statements/drop.md
index 118f8eb923a..437c2d02a94 100644
--- a/docs/ru/sql-reference/statements/drop.md
+++ b/docs/ru/sql-reference/statements/drop.md
@@ -97,3 +97,20 @@ DROP [SETTINGS] PROFILE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
+## DROP FUNCTION {#drop-function}
+
+Удаляет пользовательскую функцию, созданную с помощью [CREATE FUNCTION](./create/function.md).
+Удалить системные функции нельзя.
+
+**Синтаксис**
+
+``` sql
+DROP FUNCTION [IF EXISTS] function_name
+```
+
+**Пример**
+
+``` sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+DROP FUNCTION linear_equation;
+```
diff --git a/docs/ru/sql-reference/statements/explain.md b/docs/ru/sql-reference/statements/explain.md
index 7a028b31a12..8120df67139 100644
--- a/docs/ru/sql-reference/statements/explain.md
+++ b/docs/ru/sql-reference/statements/explain.md
@@ -413,4 +413,4 @@ EXPLAIN ESTIMATE SELECT * FROM ttt;
 └──────────┴───────┴───────┴──────┴───────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/explain/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/statements/explain/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/grant.md b/docs/ru/sql-reference/statements/grant.md
index 8d6605e1571..45ba9bb0343 100644
--- a/docs/ru/sql-reference/statements/grant.md
+++ b/docs/ru/sql-reference/statements/grant.md
@@ -109,11 +109,13 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
         - `CREATE TEMPORARY TABLE`
     - `CREATE VIEW`
     - `CREATE DICTIONARY`
+    - `CREATE FUNCTION`
 - [DROP](#grant-drop)
     - `DROP DATABASE`
     - `DROP TABLE`
     - `DROP VIEW`
     - `DROP DICTIONARY`
+    - `DROP FUNCTION`
 - [TRUNCATE](#grant-truncate)
 - [OPTIMIZE](#grant-optimize)
 - [SHOW](#grant-show)
diff --git a/docs/ru/sql-reference/statements/optimize.md b/docs/ru/sql-reference/statements/optimize.md
index 1f0c5a0ebe9..e6a71c4f611 100644
--- a/docs/ru/sql-reference/statements/optimize.md
+++ b/docs/ru/sql-reference/statements/optimize.md
@@ -18,7 +18,7 @@ OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION I
 
 Может применяться к таблицам семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md), [MaterializedView](../../engines/table-engines/special/materializedview.md) и [Buffer](../../engines/table-engines/special/buffer.md). Другие движки таблиц не поддерживаются.
 
-Если запрос `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на слияние и ожидает её исполнения на всех узлах (если активирована настройка `replication_alter_partitions_sync`).
+Если запрос `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на слияние и ожидает её исполнения на всех репликах (если значение настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) равно `2`) или на текущей реплике (если значение настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) равно `1`).
 
 -   По умолчанию, если запросу `OPTIMIZE` не удалось выполнить слияние, то
 ClickHouse не оповещает клиента. Чтобы включить оповещения, используйте настройку [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop).
@@ -26,6 +26,11 @@ ClickHouse не оповещает клиента. Чтобы включить 
 -   Если указать `FINAL`, то оптимизация выполняется даже в том случае, если все данные уже лежат в одном куске данных. Кроме того, слияние является принудительным, даже если выполняются параллельные слияния.
 -   Если указать `DEDUPLICATE`, то произойдет схлопывание полностью одинаковых строк (сравниваются значения во всех столбцах), имеет смысл только для движка MergeTree.
 
+Вы можете указать время ожидания (в секундах) выполнения запросов `OPTIMIZE` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
+
 ## Выражение BY {#by-expression}
 
 Чтобы выполнить дедупликацию по произвольному набору столбцов, вы можете явно указать список столбцов или использовать любую комбинацию подстановки [`*`](../../sql-reference/statements/select/index.md#asterisk), выражений [`COLUMNS`](../../sql-reference/statements/select/index.md#columns-expression) и [`EXCEPT`](../../sql-reference/statements/select/index.md#except-modifier).
diff --git a/docs/ru/sql-reference/statements/show.md b/docs/ru/sql-reference/statements/show.md
index 7b5296e988e..f2b2c61e2bb 100644
--- a/docs/ru/sql-reference/statements/show.md
+++ b/docs/ru/sql-reference/statements/show.md
@@ -8,10 +8,10 @@ toc_title: SHOW
 ## SHOW CREATE TABLE {#show-create-table}
 
 ``` sql
-SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY] [db.]table [INTO OUTFILE filename] [FORMAT format]
+SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY|VIEW] [db.]table|view [INTO OUTFILE filename] [FORMAT format]
 ```
 
-Возвращает один столбец типа `String` с именем statement, содержащий одно значение — запрос `CREATE TABLE`, с помощью которого был создан указанный объект.
+Возвращает один столбец типа `String` с именем statement, содержащий одно значение — запрос `CREATE`, с помощью которого был создан указанный объект.
 
 ## SHOW DATABASES {#show-databases}
 
@@ -91,7 +91,7 @@ SHOW DATABASES LIMIT 2
 
 ### Смотрите также {#see-also}
 
--   [CREATE DATABASE](https://clickhouse.tech/docs/ru/sql-reference/statements/create/database/#query-language-create-database)
+-   [CREATE DATABASE](https://clickhouse.com/docs/ru/sql-reference/statements/create/database/#query-language-create-database)
 
 ## SHOW PROCESSLIST {#show-processlist}
 
@@ -190,8 +190,8 @@ SHOW TABLES FROM system LIMIT 2
 
 ### Смотрите также {#see-also}
 
--   [Create Tables](https://clickhouse.tech/docs/ru/getting-started/tutorial/#create-tables)
--   [SHOW CREATE TABLE](https://clickhouse.tech/docs/ru/sql-reference/statements/show/#show-create-table)
+-   [Create Tables](https://clickhouse.com/docs/ru/getting-started/tutorial/#create-tables)
+-   [SHOW CREATE TABLE](https://clickhouse.com/docs/ru/sql-reference/statements/show/#show-create-table)
 
 ## SHOW DICTIONARIES {#show-dictionaries}
 
diff --git a/docs/ru/sql-reference/statements/truncate.md b/docs/ru/sql-reference/statements/truncate.md
index 63f7fa86ea5..028959690cd 100644
--- a/docs/ru/sql-reference/statements/truncate.md
+++ b/docs/ru/sql-reference/statements/truncate.md
@@ -13,4 +13,9 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 
 Запрос `TRUNCATE` не поддерживается для следующих движков: [View](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md), [Buffer](../../engines/table-engines/special/buffer.md) и [Null](../../engines/table-engines/special/null.md).
 
+Вы можете настроить ожидание выполнения действий на репликах с помощью настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync).
 
+Вы можете указать время ожидания (в секундах) выполнения запросов `TRUNCATE` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
diff --git a/docs/ru/sql-reference/syntax.md b/docs/ru/sql-reference/syntax.md
index 488e327dd31..6705b1068fe 100644
--- a/docs/ru/sql-reference/syntax.md
+++ b/docs/ru/sql-reference/syntax.md
@@ -3,7 +3,7 @@ toc_priority: 31
 toc_title: "Синтаксис"
 ---
 
-# Синтаксис {#sintaksis}
+# Синтаксис {#syntax}
 
 В системе есть два вида парсеров: полноценный парсер SQL (recursive descent parser) и парсер форматов данных (быстрый потоковый парсер).
 Во всех случаях кроме запроса INSERT, используется только полноценный парсер SQL.
@@ -21,11 +21,11 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 Далее пойдёт речь о полноценном парсере. О парсерах форматов, смотри раздел «Форматы».
 
-## Пробелы {#probely}
+## Пробелы {#spaces}
 
 Между синтаксическими конструкциями (в том числе, в начале и конце запроса) может быть расположено произвольное количество пробельных символов. К пробельным символам относятся пробел, таб, перевод строки, CR, form feed.
 
-## Комментарии {#kommentarii}
+## Комментарии {#comments}
 
 Поддерживаются комментарии в SQL-стиле и C-стиле.
 Комментарии в SQL-стиле: от `--` до конца строки. Пробел после `--` может не ставиться.
@@ -63,7 +63,7 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 Существуют: числовые, строковые, составные литералы и `NULL`.
 
-### Числовые {#chislovye}
+### Числовые {#numeric}
 
 Числовой литерал пытается распарситься:
 
@@ -83,7 +83,7 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 Минимальный набор символов, которых вам необходимо экранировать в строковых литералах: `'` и `\`. Одинарная кавычка может быть экранирована одинарной кавычкой, литералы `'It\'s'` и `'It''s'` эквивалентны.
 
-### Составные {#sostavnye}
+### Составные {#compound}
 
 Поддерживаются конструкции для массивов: `[1, 2, 3]` и кортежей: `(1, 'Hello, world!', 2)`.
 На самом деле, это вовсе не литералы, а выражение с оператором создания массива и оператором создания кортежа, соответственно.
@@ -102,17 +102,39 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 В запросах можно проверить `NULL` с помощью операторов [IS NULL](operators/index.md#operator-is-null) и [IS NOT NULL](operators/index.md), а также соответствующих функций `isNull` и `isNotNull`.
 
-## Функции {#funktsii}
+### Heredoc {#heredeoc}
+
+Синтаксис [heredoc](https://ru.wikipedia.org/wiki/Heredoc-синтаксис) — это способ определения строк с сохранением исходного формата (часто с переносом строки). `Heredoc` задается как произвольный строковый литерал между двумя символами `$`, например `$heredoc$`. Значение между двумя `heredoc` обрабатывается "как есть". 
+
+Синтаксис `heredoc` часто используют для вставки кусков кода SQL, HTML, XML и т.п. 
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT $smth$SHOW CREATE VIEW my_view$smth$;
+```
+
+Результат:
+
+```text
+┌─'SHOW CREATE VIEW my_view'─┐
+│ SHOW CREATE VIEW my_view   │
+└────────────────────────────┘
+```
+
+## Функции {#functions}
 
 Функции записываются как идентификатор со списком аргументов (возможно, пустым) в скобках. В отличие от стандартного SQL, даже в случае пустого списка аргументов, скобки обязательны. Пример: `now()`.
 Бывают обычные и агрегатные функции (смотрите раздел «Агрегатные функции»). Некоторые агрегатные функции могут содержать два списка аргументов в круглых скобках. Пример: `quantile(0.9)(x)`. Такие агрегатные функции называются «параметрическими», а первый список аргументов называется «параметрами». Синтаксис агрегатных функций без параметров ничем не отличается от обычных функций.
 
-## Операторы {#operatory}
+## Операторы {#operators}
 
 Операторы преобразуются в соответствующие им функции во время парсинга запроса, с учётом их приоритета и ассоциативности.
 Например, выражение `1 + 2 * 3 + 4` преобразуется в `plus(plus(1, multiply(2, 3)), 4)`.
 
-## Типы данных и движки таблиц {#tipy-dannykh-i-dvizhki-tablits}
+## Типы данных и движки таблиц {#data_types-and-database-table-engines}
 
 Типы данных и движки таблиц в запросе `CREATE` записываются также, как идентификаторы или также как функции. То есть, могут содержать или не содержать список аргументов в круглых скобках. Подробнее смотрите разделы «Типы данных», «Движки таблиц», «CREATE».
 
diff --git a/docs/ru/sql-reference/table-functions/index.md b/docs/ru/sql-reference/table-functions/index.md
index fcd428df5d1..8cf90ba5bd5 100644
--- a/docs/ru/sql-reference/table-functions/index.md
+++ b/docs/ru/sql-reference/table-functions/index.md
@@ -34,4 +34,4 @@ toc_title: "Введение"
 | [hdfs](hdfs.md)       | Создаёт таблицу с движком [HDFS](../../engines/table-engines/integrations/hdfs.md).                                                       |
 | [s3](s3.md)           | Создаёт таблицу с движком [S3](../../engines/table-engines/integrations/s3.md).                                                       |
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/table-functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/jdbc.md b/docs/ru/sql-reference/table-functions/jdbc.md
index 3955846d8db..e0bae8b5415 100644
--- a/docs/ru/sql-reference/table-functions/jdbc.md
+++ b/docs/ru/sql-reference/table-functions/jdbc.md
@@ -35,4 +35,4 @@ FROM jdbc('mysql-dev?datasource_column', 'show databases') a
 INNER JOIN jdbc('self?datasource_column', 'show databases') b ON a.Database = b.name
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/null.md b/docs/ru/sql-reference/table-functions/null.md
index 44fbc111db2..90481e9f6a9 100644
--- a/docs/ru/sql-reference/table-functions/null.md
+++ b/docs/ru/sql-reference/table-functions/null.md
@@ -40,4 +40,4 @@ DROP TABLE IF EXISTS t;
 
 -   [Движок таблиц Null](../../engines/table-engines/special/null.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/null/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/null/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/postgresql.md b/docs/ru/sql-reference/table-functions/postgresql.md
index 76c2ee0fa18..f5c79e5305a 100644
--- a/docs/ru/sql-reference/table-functions/postgresql.md
+++ b/docs/ru/sql-reference/table-functions/postgresql.md
@@ -129,4 +129,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [Движок таблиц PostgreSQL](../../sql-reference/table-functions/postgresql.md)
 -   [Использование PostgreSQL как источника данных для внешнего словаря](../../sql-reference/table-functions/postgresql.md#dicts-external_dicts_dict_sources-postgresql)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/postgresql/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/table-functions/postgresql/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
index 597f145c096..e3cb31fac85 100644
--- a/docs/ru/sql-reference/table-functions/s3.md
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -133,9 +133,33 @@ INSERT INTO FUNCTION s3('https://storage.yandexcloud.net/my-test-bucket-768/test
 SELECT name, value FROM existing_table;
 ```
 
+## Партиционирование при записи данных {#partitioned-write}
+
+Если при добавлении данных в таблицу S3 указать выражение `PARTITION BY`, то для каждого значения ключа партиционирования создается отдельный файл. Это повышает эффективность операций чтения.
+
+**Примеры**
+
+1. При использовании ID партиции в имени ключа создаются отдельные файлы:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES ('x', 2, 3), ('x', 4, 5), ('y', 11, 12), ('y', 13, 14), ('z', 21, 22), ('z', 23, 24);
+```
+В результате данные будут записаны в три файла: `file_x.csv`, `file_y.csv` и `file_z.csv`.
+
+2. При использовании ID партиции в названии бакета создаются файлы в разных бакетах:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24);
+```
+В результате будут созданы три файла в разных бакетах: `my_bucket_1/file.csv`, `my_bucket_10/file.csv` и `my_bucket_20/file.csv`.
+
 **Смотрите также**
 
 -  [Движок таблиц S3](../../engines/table-engines/integrations/s3.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/s3/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/table-functions/s3/) <!--hide-->
 
diff --git a/docs/ru/sql-reference/table-functions/view.md b/docs/ru/sql-reference/table-functions/view.md
index bfd0a891179..498e76917ab 100644
--- a/docs/ru/sql-reference/table-functions/view.md
+++ b/docs/ru/sql-reference/table-functions/view.md
@@ -1,6 +1,6 @@
 ## view {#view}
 
-Преобразовывает подзапрос в таблицу. Функция реализовывает представления (смотрите [CREATE VIEW](https://clickhouse.tech/docs/ru/sql-reference/statements/create/view/#create-view)). Результирующая таблица не хранит данные, а только сохраняет указанный запрос `SELECT`. При чтении из таблицы, ClickHouse выполняет запрос и удаляет все ненужные столбцы из результата.
+Преобразовывает подзапрос в таблицу. Функция реализовывает представления (смотрите [CREATE VIEW](https://clickhouse.com/docs/ru/sql-reference/statements/create/view/#create-view)). Результирующая таблица не хранит данные, а только сохраняет указанный запрос `SELECT`. При чтении из таблицы, ClickHouse выполняет запрос и удаляет все ненужные столбцы из результата.
 
 **Синтаксис**
 
@@ -46,7 +46,7 @@ SELECT * FROM view(SELECT name FROM months);
 └──────────┘
 ```
 
-Вы можете использовать функцию `view` как параметр табличных функций [remote](https://clickhouse.tech/docs/ru/sql-reference/table-functions/remote/#remote-remotesecure) и [cluster](https://clickhouse.tech/docs/ru/sql-reference/table-functions/cluster/#cluster-clusterallreplicas):
+Вы можете использовать функцию `view` как параметр табличных функций [remote](https://clickhouse.com/docs/ru/sql-reference/table-functions/remote/#remote-remotesecure) и [cluster](https://clickhouse.com/docs/ru/sql-reference/table-functions/cluster/#cluster-clusterallreplicas):
 
 ``` sql
 SELECT * FROM remote(`127.0.0.1`, view(SELECT a, b, c FROM table_name));
@@ -58,6 +58,6 @@ SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name));
 
 **Смотрите также**
 
--   [view](https://clickhouse.tech/docs/ru/engines/table-engines/special/view/#table_engines-view)
+-   [view](https://clickhouse.com/docs/ru/engines/table-engines/special/view/#table_engines-view)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/table-functions/view/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/en/sql-reference/table-functions/view/) <!--hide-->
diff --git a/docs/ru/sql-reference/window-functions/index.md b/docs/ru/sql-reference/window-functions/index.md
new file mode 120000
index 00000000000..206505bf0eb
--- /dev/null
+++ b/docs/ru/sql-reference/window-functions/index.md
@@ -0,0 +1 @@
+../../../en/sql-reference/window-functions/index.md
\ No newline at end of file
diff --git a/docs/ru/whats-new/changelog/2020.md b/docs/ru/whats-new/changelog/2020.md
new file mode 120000
index 00000000000..f0fb97311d2
--- /dev/null
+++ b/docs/ru/whats-new/changelog/2020.md
@@ -0,0 +1 @@
+../../../en/whats-new/changelog/2020.md
\ No newline at end of file
diff --git a/docs/ru/whats-new/index.md b/docs/ru/whats-new/index.md
index d8a26423813..f3d6e2839bc 100644
--- a/docs/ru/whats-new/index.md
+++ b/docs/ru/whats-new/index.md
@@ -5,4 +5,4 @@ toc_priority: 82
 
 # Что нового в ClickHouse?
 
-Планы развития вкратце изложены [здесь](extended-roadmap.md), а новости по предыдущим релизам подробно описаны в [журнале изменений](changelog/index.md).
+Планы развития вкратце изложены [здесь](https://github.com/ClickHouse/ClickHouse/issues/17623), а новости по предыдущим релизам подробно описаны в [журнале изменений](changelog/index.md).
diff --git a/docs/ru/whats-new/roadmap.md b/docs/ru/whats-new/roadmap.md
new file mode 120000
index 00000000000..2c383b2ad5d
--- /dev/null
+++ b/docs/ru/whats-new/roadmap.md
@@ -0,0 +1 @@
+../../en/whats-new/roadmap.md
\ No newline at end of file
diff --git a/docs/tools/README.md b/docs/tools/README.md
index 61a2e9a04f2..4ab44b0d945 100644
--- a/docs/tools/README.md
+++ b/docs/tools/README.md
@@ -2,7 +2,7 @@
 
 ClickHouse documentation is built using [build.py](build.py) script that uses [mkdocs](https://www.mkdocs.org) library and it’s dependencies to separately build all version of documentations (all languages in either single and multi page mode) as static HTMLs and then a PDF for each single page version. The results are then put in the correct directory structure. It is recommended to use Python 3.7 to run this script.
 
-[release.sh](release.sh) also pulls static files needed for [official ClickHouse website](https://clickhouse.tech) from [../../website](../../website) folder then pushes to specified GitHub repo to be served via [GitHub Pages](https://pages.github.com).
+[release.sh](release.sh) also pulls static files needed for [official ClickHouse website](https://clickhouse.com) from [../../website](../../website) folder then pushes to specified GitHub repo to be served via [GitHub Pages](https://pages.github.com).
 
 ## How to check if the documentation will look fine? {#how-to-check-if-the-documentation-will-look-fine}
 
@@ -59,4 +59,4 @@ is used.
 At the moment there’s no easy way to do just that, but you can consider:
 
 -   To hit the “Watch” button on top of GitHub web interface to know as early as possible, even during pull request. Alternative to this is `#github-activity` channel of [public ClickHouse Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-qfort0u8-TWqK4wIP0YSdoDE0btKa1w).
--   Some search engines allow to subscribe on specific website changes via email and you can opt-in for that for https://clickhouse.tech.
+-   Some search engines allow to subscribe on specific website changes via email and you can opt-in for that for https://clickhouse.com.
diff --git a/docs/tools/blog.py b/docs/tools/blog.py
index d0f2496f914..bfc8c0908e9 100644
--- a/docs/tools/blog.py
+++ b/docs/tools/blog.py
@@ -51,7 +51,7 @@ def build_for_lang(lang, args):
         if args.htmlproofer:
             plugins.append('htmlproofer')
 
-        website_url = 'https://clickhouse.tech'
+        website_url = 'https://clickhouse.com'
         site_name = site_names.get(lang, site_names['en'])
         blog_nav, post_meta = nav.build_blog_nav(lang, args)
         raw_config = dict(
@@ -62,7 +62,7 @@ def build_for_lang(lang, args):
             strict=True,
             theme=theme_cfg,
             nav=blog_nav,
-            copyright='©2016–2021 Yandex LLC',
+            copyright='©2016–2021 ClickHouse, Inc.',
             use_directory_urls=True,
             repo_name='ClickHouse/ClickHouse',
             repo_url='https://github.com/ClickHouse/ClickHouse/',
diff --git a/docs/tools/build.py b/docs/tools/build.py
index dae61eec87e..aa440ecb5dc 100755
--- a/docs/tools/build.py
+++ b/docs/tools/build.py
@@ -84,7 +84,7 @@ def build_for_lang(lang, args):
         if args.htmlproofer:
             plugins.append('htmlproofer')
 
-        website_url = 'https://clickhouse.tech'
+        website_url = 'https://clickhouse.com'
         site_name = site_names.get(lang, site_names['en']) % ''
         site_name = site_name.replace('  ', ' ')
 
@@ -95,7 +95,7 @@ def build_for_lang(lang, args):
             site_dir=site_dir,
             strict=True,
             theme=theme_cfg,
-            copyright='©2016–2021 Yandex LLC',
+            copyright='©2016–2021 ClickHouse, Inc.',
             use_directory_urls=True,
             repo_name='ClickHouse/ClickHouse',
             repo_url='https://github.com/ClickHouse/ClickHouse/',
@@ -203,6 +203,7 @@ if __name__ == '__main__':
     arg_parser.add_argument('--verbose', action='store_true')
 
     args = arg_parser.parse_args()
+    args.minify = False  # TODO remove
 
     logging.basicConfig(
         level=logging.DEBUG if args.verbose else logging.INFO,
diff --git a/docs/tools/cmake_in_clickhouse_generator.py b/docs/tools/cmake_in_clickhouse_generator.py
index 1414ffc4b9e..8b440823df3 100644
--- a/docs/tools/cmake_in_clickhouse_generator.py
+++ b/docs/tools/cmake_in_clickhouse_generator.py
@@ -155,6 +155,12 @@ def generate_cmake_flags_files() -> None:
         with open(footer_file_name, "r") as footer:
             f.write(footer.read())
 
+        other_languages = ["docs/ja/development/cmake-in-clickhouse.md",
+                           "docs/zh/development/cmake-in-clickhouse.md",
+                           "docs/ru/development/cmake-in-clickhouse.md"]
+
+        for lang in other_languages:
+            os.symlink(output_file_name, os.path.join(root_path, lang))
 
 if __name__ == '__main__':
     generate_cmake_flags_files()
diff --git a/docs/tools/mdx_clickhouse.py b/docs/tools/mdx_clickhouse.py
index 387ade9bbdf..18ecc890b6e 100755
--- a/docs/tools/mdx_clickhouse.py
+++ b/docs/tools/mdx_clickhouse.py
@@ -53,7 +53,7 @@ class ClickHouseLinkMixin(object):
             href = el.get('href') or ''
             is_external = href.startswith('http:') or href.startswith('https:')
             if is_external:
-                if not href.startswith('https://clickhouse.tech'):
+                if not href.startswith('https://clickhouse.com'):
                     el.set('rel', 'external nofollow noreferrer')
             elif single_page:
                 if '#' in href:
@@ -73,12 +73,8 @@ class ClickHouseLinkPattern(ClickHouseLinkMixin, markdown.inlinepatterns.LinkInl
 
 class ClickHousePreprocessor(markdown.util.Processor):
     def run(self, lines):
-        if os.getenv('QLOUD_TOKEN'):
-            for line in lines:
-                if '<!--hide-->' not in line:
-                    yield line
-        else:
-            for line in lines:
+        for line in lines:
+            if '<!--hide-->' not in line:
                 yield line
 
 
diff --git a/docs/tools/package-lock.json b/docs/tools/package-lock.json
new file mode 100644
index 00000000000..98b3f74702f
--- /dev/null
+++ b/docs/tools/package-lock.json
@@ -0,0 +1,7561 @@
+{
+  "name": "build",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.14.5"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
+      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "dev": true
+    },
+    "@babel/core": {
+      "version": "7.15.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz",
+      "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.4",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helpers": "^7.15.4",
+        "@babel/parser": "^7.15.5",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
+        "semver": "^6.3.0",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+          "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
+      "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
+      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz",
+      "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz",
+      "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-member-expression-to-functions": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
+      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "regexpu-core": "^4.7.1"
+      }
+    },
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
+      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz",
+      "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
+      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
+      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
+      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
+      "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
+      "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz",
+      "integrity": "sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-simple-access": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
+      "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "dev": true
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
+      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-wrap-function": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
+      "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
+      "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz",
+      "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
+      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+      "dev": true
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
+      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.15.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz",
+      "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==",
+      "dev": true
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz",
+      "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz",
+      "integrity": "sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.15.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      }
+    },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
+      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz",
+      "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
+      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
+      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
+      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
+      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
+      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
+      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
+      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.14.7",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
+      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
+      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz",
+      "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
+      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
+      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
+      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
+      "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz",
+      "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
+      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
+      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
+      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
+      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz",
+      "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
+      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
+      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
+      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
+      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz",
+      "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.15.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz",
+      "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
+      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
+      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
+      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
+      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
+      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
+      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
+      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
+      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
+      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
+      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
+      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
+      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
+      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
+      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
+      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz",
+      "integrity": "sha512-4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
+        "@babel/plugin-proposal-async-generator-functions": "^7.15.4",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/plugin-proposal-class-static-block": "^7.15.4",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+        "@babel/plugin-proposal-json-strings": "^7.14.5",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-private-methods": "^7.14.5",
+        "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.14.5",
+        "@babel/plugin-transform-async-to-generator": "^7.14.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+        "@babel/plugin-transform-block-scoping": "^7.15.3",
+        "@babel/plugin-transform-classes": "^7.15.4",
+        "@babel/plugin-transform-computed-properties": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
+        "@babel/plugin-transform-dotall-regex": "^7.14.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+        "@babel/plugin-transform-for-of": "^7.15.4",
+        "@babel/plugin-transform-function-name": "^7.14.5",
+        "@babel/plugin-transform-literals": "^7.14.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+        "@babel/plugin-transform-modules-amd": "^7.14.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.15.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.15.4",
+        "@babel/plugin-transform-modules-umd": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
+        "@babel/plugin-transform-new-target": "^7.14.5",
+        "@babel/plugin-transform-object-super": "^7.14.5",
+        "@babel/plugin-transform-parameters": "^7.15.4",
+        "@babel/plugin-transform-property-literals": "^7.14.5",
+        "@babel/plugin-transform-regenerator": "^7.14.5",
+        "@babel/plugin-transform-reserved-words": "^7.14.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.14.6",
+        "@babel/plugin-transform-sticky-regex": "^7.14.5",
+        "@babel/plugin-transform-template-literals": "^7.14.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+        "@babel/plugin-transform-unicode-regex": "^7.14.5",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.15.4",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.2",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "core-js-compat": "^3.16.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/preset-modules": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
+      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
+      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-hoist-variables": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/types": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz",
+      "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@types/json-schema": {
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+      "dev": true
+    },
+    "@types/q": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
+      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
+      "dev": true
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
+    "amphtml-validator": {
+      "version": "1.0.35",
+      "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.35.tgz",
+      "integrity": "sha512-C67JzC5EI6pE2C0sAo/zuCp8ARDl1Vtt6/s0nr+3NuXDNOdkjclZUkaNAd/ZnsEvvYodkXZ6T/uww890IQh9dQ==",
+      "requires": {
+        "colors": "1.4.0",
+        "commander": "7.2.0",
+        "promise": "8.1.0"
+      }
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    },
+    "asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true,
+      "optional": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "autoprefixer": {
+      "version": "9.8.6",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
+      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001109",
+        "colorette": "^1.2.1",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.32",
+        "postcss-value-parser": "^4.1.0"
+      }
+    },
+    "babel-loader": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^1.4.0",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      }
+    },
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
+      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "semver": "^6.1.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz",
+      "integrity": "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "core-js-compat": "^3.14.0"
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
+      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true
+    },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "bootstrap": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz",
+      "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001254",
+        "colorette": "^1.3.0",
+        "electron-to-chromium": "^1.3.830",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.75"
+      }
+    },
+    "buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "^2.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
+    "callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "camelcase": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+    },
+    "caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001255",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz",
+      "integrity": "sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "change-case": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.1.0.tgz",
+      "integrity": "sha512-2AZp7uJZbYEzRPsFoa+ijKdvp9zsrnnt6+yFokfwEpeJm0xuJDVoxiRCAaTzyJND8GJkofo2IcKWaUZ/OECVzw==",
+      "dev": true,
+      "requires": {
+        "camel-case": "^3.0.0",
+        "constant-case": "^2.0.0",
+        "dot-case": "^2.1.0",
+        "header-case": "^1.0.0",
+        "is-lower-case": "^1.1.0",
+        "is-upper-case": "^1.1.0",
+        "lower-case": "^1.1.1",
+        "lower-case-first": "^1.0.0",
+        "no-case": "^2.3.2",
+        "param-case": "^2.1.0",
+        "pascal-case": "^2.0.0",
+        "path-case": "^2.1.0",
+        "sentence-case": "^2.1.0",
+        "snake-case": "^2.1.0",
+        "swap-case": "^1.1.0",
+        "title-case": "^2.1.0",
+        "upper-case": "^1.1.1",
+        "upper-case-first": "^1.1.0"
+      }
+    },
+    "chokidar": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+      "requires": {
+        "source-map": "~0.6.0"
+      }
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      }
+    },
+    "coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.3",
+        "color-string": "^1.6.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "color-string": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
+      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
+      "dev": true,
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "colorette": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
+    },
+    "commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "constant-case": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz",
+      "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=",
+      "dev": true,
+      "requires": {
+        "snake-case": "^2.1.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "core-js-compat": {
+      "version": "3.17.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.2.tgz",
+      "integrity": "sha512-lHnt7A1Oqplebl5i0MrQyFv/yyEzr9p29OjlkcsFRDDgHwwQyVckfRGJ790qzXhkwM8ba4SFHHa2sO+T5f1zGg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.16.8",
+        "semver": "7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        }
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      }
+    },
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true
+    },
+    "css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      }
+    },
+    "css-node-extract": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-node-extract/-/css-node-extract-2.1.3.tgz",
+      "integrity": "sha512-E7CzbC0I4uAs2dI8mPCVe+K37xuja5kjIugOotpwICFL7vzhmFMAPHvS/MF9gFrmv8DDUANsxrgyT/I3OLukcw==",
+      "dev": true,
+      "requires": {
+        "change-case": "^3.0.1",
+        "postcss": "^6.0.14"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        }
+      }
+    },
+    "css-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
+    "css-selector-extract": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/css-selector-extract/-/css-selector-extract-3.3.6.tgz",
+      "integrity": "sha512-bBI8ZJKKyR9iHvxXb4t3E6WTMkis94eINopVg7y2FmmMjLXUVduD7mPEcADi4i9FX4wOypFMFpySX+0keuefxg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^6.0.14"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        }
+      }
+    },
+    "css-tree": {
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "dev": true,
+      "requires": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.6.1"
+      }
+    },
+    "css-what": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+      "dev": true
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
+    },
+    "cssnano": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
+      "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.8",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-preset-default": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
+      "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
+      "dev": true,
+      "requires": {
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.3",
+        "postcss-unique-selectors": "^4.0.1"
+      }
+    },
+    "cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+      "dev": true
+    },
+    "cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true
+    },
+    "cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+      "dev": true
+    },
+    "csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "requires": {
+        "css-tree": "^1.1.2"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.0.14",
+            "source-map": "^0.6.1"
+          }
+        },
+        "mdn-data": {
+          "version": "2.0.14",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+          "dev": true
+        }
+      }
+    },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true
+    },
+    "debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dot-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz",
+      "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "dot-prop": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+      "dev": true,
+      "requires": {
+        "is-obj": "^2.0.0"
+      }
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.832",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.832.tgz",
+      "integrity": "sha512-x7lO8tGoW0CyV53qON4Lb5Rok9ipDelNdBIAiYUZ03dqy4u9vohMM1qV047+s/hiyJiqUWX/3PNwkX3kexX5ig==",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      },
+      "dependencies": {
+        "memory-fs": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+          "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        }
+      }
+    },
+    "entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.18.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
+      "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-string": "^1.0.7",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "requires": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "figgy-pudding": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+      "dev": true
+    },
+    "file-loader": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
+      }
+    },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      }
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+    },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "header-case": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz",
+      "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.3"
+      }
+    },
+    "hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+      "dev": true
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+    },
+    "hsl-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
+      "dev": true
+    },
+    "hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
+      "dev": true
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true
+    },
+    "is-color-stop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+      "dev": true,
+      "requires": {
+        "css-color-names": "^0.0.4",
+        "hex-color-regex": "^1.1.0",
+        "hsl-regex": "^1.0.0",
+        "hsla-regex": "^1.0.0",
+        "rgb-regex": "^1.0.1",
+        "rgba-regex": "^1.0.0"
+      }
+    },
+    "is-core-module": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-lower-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz",
+      "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.0"
+      }
+    },
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-number-object": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-upper-case": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz",
+      "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=",
+      "dev": true,
+      "requires": {
+        "upper-case": "^1.1.0"
+      }
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        }
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lower-case-first": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz",
+      "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.2"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
+      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==",
+      "dev": true
+    },
+    "node-sass-glob-importer": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/node-sass-glob-importer/-/node-sass-glob-importer-5.3.2.tgz",
+      "integrity": "sha512-QTX7KPsISgp55REV6pMH703nzHfWCOEYEQC0cDyTRo7XO6WDvyC0OAzekuQ4gs505IZcxv9KxZ3uPJ5s5H9D3g==",
+      "dev": true,
+      "requires": {
+        "node-sass-magic-importer": "^5.3.2"
+      }
+    },
+    "node-sass-magic-importer": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/node-sass-magic-importer/-/node-sass-magic-importer-5.3.2.tgz",
+      "integrity": "sha512-T3wTUdUoXQE3QN+EsyPpUXRI1Gj1lEsrySQ9Kzlzi15QGKi+uRa9fmvkcSy2y3BKgoj//7Mt9+s+7p0poMpg6Q==",
+      "dev": true,
+      "requires": {
+        "css-node-extract": "^2.1.3",
+        "css-selector-extract": "^3.3.6",
+        "findup-sync": "^3.0.0",
+        "glob": "^7.1.3",
+        "object-hash": "^1.3.1",
+        "postcss-scss": "^2.0.0",
+        "resolve": "^1.10.1"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "normalize-url": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-hash": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
+      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
+      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.2"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "object.values": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.2"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "requires": {
+        "execa": "^0.7.0",
+        "lcid": "^1.0.0",
+        "mem": "^1.1.0"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+    },
+    "pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "pascal-case": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz",
+      "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=",
+      "dev": true,
+      "requires": {
+        "camel-case": "^3.0.0",
+        "upper-case-first": "^1.1.0"
+      }
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "path-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz",
+      "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true,
+      "optional": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "requires": {
+        "pify": "^2.0.0"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        }
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "7.0.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-calc": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "dev": true,
+      "requires": {
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-minify-font-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-params": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-positions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-repeat-style": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-string": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-timing-functions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-unicode": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "dev": true,
+      "requires": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-whitespace": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-scss": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
+      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.6"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      }
+    },
+    "postcss-svgo": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
+      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "promise": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
+      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+      "requires": {
+        "asap": "~2.0.6"
+      }
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "purify-css": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/purify-css/-/purify-css-1.2.5.tgz",
+      "integrity": "sha512-Vy4jRnV2w/kUjTyxzQOKbFkqwUe6RNLuZgIWR/IRQ8nCqRwiFgwC9XiO9+8poq5KL053uWAQnCSbsfihq77zPg==",
+      "requires": {
+        "clean-css": "^4.0.12",
+        "glob": "^7.1.1",
+        "rework": "^1.0.1",
+        "uglify-js": "^3.0.6",
+        "yargs": "^8.0.1"
+      }
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "requires": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "requires": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "regenerate-unicode-properties": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
+    },
+    "regenerator-transform": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true,
+      "optional": true
+    },
+    "repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+    },
+    "resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "requires": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "rework": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
+      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
+      "requires": {
+        "convert-source-map": "^0.3.3",
+        "css": "^2.0.0"
+      }
+    },
+    "rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+      "dev": true
+    },
+    "rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sass": {
+      "version": "1.39.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz",
+      "integrity": "sha512-F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg==",
+      "dev": true,
+      "requires": {
+        "chokidar": ">=3.0.0 <4.0.0"
+      }
+    },
+    "sass-loader": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      }
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+    },
+    "sentence-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz",
+      "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case-first": "^1.1.2"
+      }
+    },
+    "serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      },
+      "dependencies": {
+        "is-arrayish": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+          "dev": true
+        }
+      }
+    },
+    "snake-case": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz",
+      "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "requires": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
+    },
+    "spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
+      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "ssri": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      }
+    },
+    "swap-case": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz",
+      "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "terser": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
+      "dev": true,
+      "requires": {
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^4.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "timers-browserify": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
+    "title-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
+      "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.0.3"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz",
+      "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A=="
+    },
+    "unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "dev": true
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true,
+      "optional": true
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "upper-case-first": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz",
+      "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=",
+      "dev": true,
+      "requires": {
+        "upper-case": "^1.1.1"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      }
+    },
+    "v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "vendors": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+      "dev": true
+    },
+    "vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^3.4.1",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.1"
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true,
+          "optional": true
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        }
+      }
+    },
+    "webpack": {
+      "version": "4.46.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
+      "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.5.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.3",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.3",
+        "watchpack": "^1.7.4",
+        "webpack-sources": "^1.4.1"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz",
+      "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.1.1",
+        "findup-sync": "^3.0.0",
+        "global-modules": "^2.0.0",
+        "import-local": "^2.0.0",
+        "interpret": "^1.4.0",
+        "loader-utils": "^1.4.0",
+        "supports-color": "^6.1.0",
+        "v8-compile-cache": "^2.1.1",
+        "yargs": "^13.3.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "global-modules": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+          "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+          "dev": true,
+          "requires": {
+            "global-prefix": "^3.0.0"
+          }
+        },
+        "global-prefix": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+          "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+          "dev": true,
+          "requires": {
+            "ini": "^1.3.5",
+            "kind-of": "^6.0.2",
+            "which": "^1.3.1"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    },
+    "yargs": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+      "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+      "requires": {
+        "camelcase": "^4.1.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^2.0.0",
+        "read-pkg-up": "^2.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^7.0.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+      "requires": {
+        "camelcase": "^4.1.0"
+      }
+    }
+  }
+}
diff --git a/docs/tools/package.json b/docs/tools/package.json
new file mode 100644
index 00000000000..b366d562dc3
--- /dev/null
+++ b/docs/tools/package.json
@@ -0,0 +1,31 @@
+{
+	"name": "build",
+	"version": "1.0.0",
+	"description": "",
+	"main": "index.js",
+	"scripts": {
+		"build": "NODE_ENV=production webpack --config webpack.config.js",
+		"watch": "NODE_ENV=development webpack --config webpack.config.js"
+	},
+	"author": "",
+	"license": "ISC",
+	"devDependencies": {
+		"@babel/core": "^7.10.2",
+		"@babel/preset-env": "^7.10.2",
+		"autoprefixer": "^9.8.0",
+		"babel-loader": "^8.1.0",
+		"cssnano": "^4.1.10",
+		"file-loader": "^6.0.0",
+		"node-sass-glob-importer": "^5.3.2",
+		"postcss-loader": "^3.0.0",
+		"sass": "^1.26.8",
+		"sass-loader": "^8.0.2",
+		"webpack": "^4.43.0",
+		"webpack-cli": "^3.3.11"
+	},
+	"dependencies": {
+		"amphtml-validator": "^1.0.35",
+		"bootstrap": "^4.4.1",
+		"purify-css": "^1.2.5"
+	}
+}
diff --git a/docs/tools/requirements.txt b/docs/tools/requirements.txt
index 9bb4f57e9e2..975e6949476 100644
--- a/docs/tools/requirements.txt
+++ b/docs/tools/requirements.txt
@@ -12,7 +12,7 @@ htmlmin==0.1.12
 idna==2.10
 Jinja2>=2.11.3
 jinja2-highlight==0.6.1
-jsmin==2.2.2
+jsmin==3.0.0
 livereload==2.6.2
 Markdown==3.3.2
 MarkupSafe==1.1.1
diff --git a/docs/tools/single_page.py b/docs/tools/single_page.py
index a1e650d3ad3..0e82a1acb87 100644
--- a/docs/tools/single_page.py
+++ b/docs/tools/single_page.py
@@ -219,10 +219,12 @@ def build_single_page_version(lang, args, nav, cfg):
                         ]
 
                         logging.info(' '.join(create_pdf_command))
-                        subprocess.check_call(' '.join(create_pdf_command), shell=True)
+                        try:
+                            subprocess.check_call(' '.join(create_pdf_command), shell=True)
+                        except:
+                            pass  # TODO: fix pdf issues
 
         logging.info(f'Finished building single page version for {lang}')
-        
+
         if os.path.exists(single_md_path):
             os.unlink(single_md_path)
-            
\ No newline at end of file
diff --git a/docs/tools/test.py b/docs/tools/test.py
index 526294dbe21..53ed9505acd 100755
--- a/docs/tools/test.py
+++ b/docs/tools/test.py
@@ -8,6 +8,9 @@ import subprocess
 
 
 def test_single_page(input_path, lang):
+    if not (lang == 'en' or lang == 'ru'):
+        return
+
     with open(input_path) as f:
         soup = bs4.BeautifulSoup(
             f,
@@ -33,11 +36,8 @@ def test_single_page(input_path, lang):
                     logging.info('Link to nowhere: %s' % href)
 
         if links_to_nowhere:
-            if lang == 'en' or lang == 'ru':
-                logging.error(f'Found {links_to_nowhere} links to nowhere in {lang}')
-                sys.exit(1)
-            else:
-                logging.warning(f'Found {links_to_nowhere} links to nowhere in {lang}')
+            logging.error(f'Found {links_to_nowhere} links to nowhere in {lang}')
+            sys.exit(1)
 
         if len(anchor_points) <= 10:
             logging.error('Html parsing is probably broken')
diff --git a/docs/tools/webpack.config.js b/docs/tools/webpack.config.js
new file mode 100644
index 00000000000..e0dea964101
--- /dev/null
+++ b/docs/tools/webpack.config.js
@@ -0,0 +1,81 @@
+const path = require('path');
+const jsPath = path.resolve(__dirname, '../../website/src/js');
+const scssPath = path.resolve(__dirname, '../../website/src/scss');
+
+console.log(path.resolve(__dirname, 'node_modules/bootstrap', require('bootstrap/package.json').sass));
+
+module.exports = {
+
+	mode: ('development' === process.env.NODE_ENV) && 'development' || 'production',
+
+	...(('development' === process.env.NODE_ENV) && {
+		watch: true,
+	}),
+
+    entry: [
+		path.resolve(scssPath, 'bootstrap.scss'),
+		path.resolve(scssPath, 'main.scss'),
+		path.resolve(jsPath, 'main.js'),
+	],
+
+    output: {
+        path: path.resolve(__dirname, '../../website'),
+    	filename: 'js/main.js',
+    },
+
+	resolve: {
+		alias: {
+			bootstrap: path.resolve(__dirname, 'node_modules/bootstrap', require('bootstrap/package.json').sass),
+		},
+	},
+
+	module: {
+		rules: [{
+			test: /\.js$/,
+			exclude: /(node_modules)/,
+			use: [{
+				loader: 'babel-loader',
+				options: {
+					presets: ['@babel/preset-env'],
+				},
+			}],
+		}, {
+			test: /\.scss$/,
+			use: [{
+				loader: 'file-loader',
+				options: {
+					sourceMap: true,
+					outputPath: (url, entryPath, context) => {
+						if (0 === entryPath.indexOf(scssPath)) {
+							const outputFile = entryPath.slice(entryPath.lastIndexOf('/') + 1, -5)
+							const outputPath = entryPath.slice(0, entryPath.lastIndexOf('/')).slice(scssPath.length + 1)
+							return `./css/${outputPath}/${outputFile}.css`
+						}
+						return `./css/${url}`
+					},
+				},
+			}, {
+				loader: 'postcss-loader',
+				options: {
+					options: {},
+					plugins: () => ([
+						require('autoprefixer'),
+						('production' === process.env.NODE_ENV) && require('cssnano'),
+					].filter(plugin => plugin)),
+				}
+			}, {
+				loader: 'sass-loader',
+				options: {
+					implementation: require('sass'),
+					implementation: require('sass'),
+					sourceMap: ('development' === process.env.NODE_ENV),
+					sassOptions: {
+						importer: require('node-sass-glob-importer')(),
+						precision: 10,
+					},
+				},
+			}],
+		}],
+	},
+
+};
diff --git a/docs/tools/website.py b/docs/tools/website.py
index f0346de5c94..5e4f48e3441 100644
--- a/docs/tools/website.py
+++ b/docs/tools/website.py
@@ -104,7 +104,7 @@ def adjust_markdown_html(content):
         for p in div.find_all('p'):
             p_class = p.attrs.get('class')
             if is_admonition and p_class and ('admonition-title' in p_class):
-                p.attrs['class'] = p_class + ['alert-heading', 'display-6', 'mb-2']
+                p.attrs['class'] = p_class + ['alert-heading', 'display-4', 'text-reset', 'mb-2']
 
         if is_admonition:
             div.attrs['role'] = 'alert'
@@ -144,6 +144,7 @@ def build_website(args):
             'docs',
             'public',
             'node_modules',
+            'src',
             'templates',
             'locale',
             '.gitkeep'
@@ -181,7 +182,8 @@ def get_css_in(args):
         f"'{args.website_dir}/css/base.css'",
         f"'{args.website_dir}/css/blog.css'",
         f"'{args.website_dir}/css/docs.css'",
-        f"'{args.website_dir}/css/highlight.css'"
+        f"'{args.website_dir}/css/highlight.css'",
+        f"'{args.website_dir}/css/main.css'"
     ]
 
 
@@ -194,7 +196,8 @@ def get_js_in(args):
         f"'{args.website_dir}/js/base.js'",
         f"'{args.website_dir}/js/index.js'",
         f"'{args.website_dir}/js/docsearch.js'",
-        f"'{args.website_dir}/js/docs.js'"
+        f"'{args.website_dir}/js/docs.js'",
+        f"'{args.website_dir}/js/main.js'"
     ]
 
 
@@ -212,10 +215,12 @@ def minify_file(path, css_digest, js_digest):
         content = minify_html(content)
         content = content.replace('base.css?css_digest', f'base.css?{css_digest}')
         content = content.replace('base.js?js_digest', f'base.js?{js_digest}')
-    elif path.endswith('.css'):
-        content = cssmin.cssmin(content)
-    elif path.endswith('.js'):
-        content = jsmin.jsmin(content)
+# TODO: restore cssmin
+#     elif path.endswith('.css'):
+#         content = cssmin.cssmin(content)
+# TODO: restore jsmin    
+#     elif path.endswith('.js'):
+#         content = jsmin.jsmin(content)
     with open(path, 'wb') as f:
         f.write(content.encode('utf-8'))
 
@@ -237,7 +242,7 @@ def minify_website(args):
 
     js_in = get_js_in(args)
     js_out = f'{args.output_dir}/js/base.js'
-    if args.minify:
+    if args.minify and False:  # TODO: return closure
         js_in = [js[1:-1] for js in js_in]
         closure_args = [
             '--js', *js_in, '--js_output_file', js_out,
diff --git a/docs/zh/changelog/index.md b/docs/zh/changelog/index.md
index 14bed16c381..d36a676134e 100644
--- a/docs/zh/changelog/index.md
+++ b/docs/zh/changelog/index.md
@@ -247,7 +247,7 @@ toc_title: "\u53D8\u66F4\u65E5\u5FD7"
 -   更新了clickhouse-test脚本中挂起查询的检查 [#8858](https://github.com/ClickHouse/ClickHouse/pull/8858) ([亚历山大\*卡扎科夫](https://github.com/Akazz))
 -   从存储库中删除了一些无用的文件。 [#8843](https://github.com/ClickHouse/ClickHouse/pull/8843) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
 -   更改类型的数学perftests从 `once` 到 `loop`. [#8783](https://github.com/ClickHouse/ClickHouse/pull/8783) ([尼古拉\*科切托夫](https://github.com/KochetovNicolai))
--   添加码头镜像，它允许为我们的代码库构建交互式代码浏览器HTML报告。 [#8781](https://github.com/ClickHouse/ClickHouse/pull/8781) ([阿利沙平](https://github.com/alesapin)）见 [Woboq代码浏览器](https://clickhouse.tech/codebrowser/html_report///ClickHouse/dbms/index.html)
+-   添加码头镜像，它允许为我们的代码库构建交互式代码浏览器HTML报告。 [#8781](https://github.com/ClickHouse/ClickHouse/pull/8781) ([阿利沙平](https://github.com/alesapin)）见 [Woboq代码浏览器](https://clickhouse.com/codebrowser/html_report///ClickHouse/dbms/index.html)
 -   抑制MSan下的一些测试失败。 [#8780](https://github.com/ClickHouse/ClickHouse/pull/8780) ([Alexander Kuzmenkov](https://github.com/akuzm))
 -   加速 “exception while insert” 测试 此测试通常在具有复盖率的调试版本中超时。 [#8711](https://github.com/ClickHouse/ClickHouse/pull/8711) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
 -   更新 `libcxx` 和 `libcxxabi` 为了主人 在准备 [#9304](https://github.com/ClickHouse/ClickHouse/issues/9304) [#9308](https://github.com/ClickHouse/ClickHouse/pull/9308) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
diff --git a/docs/zh/commercial/cloud.md b/docs/zh/commercial/cloud.md
index 651a1a15ec4..61a4f638bbc 100644
--- a/docs/zh/commercial/cloud.md
+++ b/docs/zh/commercial/cloud.md
@@ -5,49 +5,7 @@ toc_title: 云
 
 # ClickHouse 云服务提供商 {#clickhouse-cloud-service-providers}
 
-!!! info "注意"
-    如果您已经推出具有托管 ClickHouse 服务的公共云，请随时[提交一个 pull request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) 将其添加到以下列表。
+# ClickHouse Cloud Service {#clickhouse-cloud-service}
 
-## Yandex 云 {#yandex-cloud}
-
-[Yandex的 ClickHouse 托管服务](https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) 提供以下主要功能:
-
--   用于 ClickHouse 复制的完全托管的 ZooKeeper 服务 [ClickHouse复制](../engines/table-engines/mergetree-family/replication.md)
--   多种存储类型选择
--   不同可用区副本
--   加密与隔离
--   自动化维护
-
-## Altinity.Cloud {#altinity.cloud}
-
-[Altinity.Cloud](https://altinity.com/cloud-database/) 是针对 Amazon 公共云的完全托管的 ClickHouse-as-a-Service
-
--   在 Amazon 资源上快速部署 ClickHouse 集群
--   轻松进行横向扩展/纵向扩展以及节点的垂直扩展
--   具有公共端点或VPC对等的租户隔离
--   可配置存储类型以及卷配置
--   跨可用区扩展以实现性能和高可用性
--   内置监控和SQL查询编辑器
-
-## 阿里云 {#alibaba-cloud}
-
-[阿里云的 ClickHouse 托管服务](https://www.alibabacloud.com/zh/product/clickhouse) 提供以下主要功能：
-
--   基于阿里飞天分布式系统的高可靠云盘存储引擎
--   按需扩容，无需手动进行数据搬迁
--   支持单节点、单副本、多节点、多副本多种架构，支持冷热数据分层
--   支持访问白名单和一键恢复，多层网络安全防护，云盘加密
--   与云上日志系统、数据库、数据应用工具无缝集成
--   内置监控和数据库管理平台
--   专业的数据库专家技术支持和服务
-
-## 腾讯云 {#tencent-cloud}
-
-[腾讯云的 ClickHouse 托管服务](https://cloud.tencent.com/product/cdwch)提供以下主要功能：
-
--   易于部署和管理, 集成监控与警报服务
--   高可用高扩展
--   通过集群级别的 VPC 保证安全可靠
--   按需定价，无需前期成本或长期承诺
-
-{## [原始文章](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
+!!! info "Info"
+    Detailed public description for ClickHouse cloud services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/zh/commercial/index.md b/docs/zh/commercial/index.md
index 047ee817d7b..5f29e5f21c9 100644
--- a/docs/zh/commercial/index.md
+++ b/docs/zh/commercial/index.md
@@ -6,12 +6,7 @@ toc_title: 简介
 
 # ClickHouse 商业服务 {#clickhouse-commercial-services}
 
-本节是专门从事 ClickHouse 的服务提供商的目录，它们是一些独立的公司，不一定与 Yandex 有关系。
-
 服务类别：
 
 -	[云](../commercial/cloud.md)
 -	[支持](../commercial/support.md)
-
-!!! note "对于服务提供商"
-如果您碰巧是其中之一，可以随时提交一个 pull request，将您的公司添加到对应的章节（如果服务不属于现有的任何目录，也可以添加新的章节）。提交关于文档的 pull request 最简单的方式是点击右上角的“铅笔”编辑按钮。如果您的服务在某些本地市场上有售，请确保在本地化的文档界面中也提及它（或至少在 pull request 请求描述中指出）。
diff --git a/docs/zh/commercial/support.md b/docs/zh/commercial/support.md
index 44b6d1eab8d..a3714c98d44 100644
--- a/docs/zh/commercial/support.md
+++ b/docs/zh/commercial/support.md
@@ -5,17 +5,5 @@ toc_title: 支持
 
 # ClickHouse 商业支持服务提供商 {#clickhouse-commercial-support-service-providers}
 
-!!! info "注意"
-    如果您已经推出 ClickHouse 商业支持服务，请随时[提交一个 pull request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/support.md) 将其添加到以下列表。
-
-## Altinity {#altinity}
-
- Altinity 自从 2017 年开始为企业提供 ClickHouse 支持服务。Altinity 的客户范围包含百强企业到初创企业等。访问 [www.altinity.com](https://www.altinity.com/) 了解更多信息。
-
-## Mafiree {#mafiree}
-
-[服务说明](http://mafiree.com/clickhouse-analytics-services.php)
-
-## MinervaDB {#minervadb}
-
-[服务说明](https://minervadb.com/index.php/clickhouse-consulting-and-support-by-minervadb/)
+!!! info "Info"
+    Detailed public description for ClickHouse support services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/zh/development/adding_test_queries.md b/docs/zh/development/adding_test_queries.md
new file mode 100644
index 00000000000..a494bb5eb44
--- /dev/null
+++ b/docs/zh/development/adding_test_queries.md
@@ -0,0 +1,150 @@
+# 如何将测试查询添加到 ClickHouse CI
+
+ClickHouse有数百个（甚至数千个）功能。 每个提交都由包含数千个测试用例的一组复杂测试进行检查。
+
+核心功能经过了很多的测试，但是ClickHouse CI可以发现一些极端情况和不同的功能组合。
+
+我们看到的大多数错误/回归都发生在测试覆盖率较差的`灰色区域`中。
+
+我们非常有兴趣通过测试涵盖实现生活中使用的大多数可能的场景和功能组合。
+
+## 为什么要添加测试
+
+为什么/何时应将测试用例添加到ClickHouse代码中：
+1) 您使用了一些复杂的场景/功能组合/您有一些可能未被广泛使用的情况
+2) 您会看到更改日志中没有通知的版本之间的某些行为发生了变化
+3) 您只是想帮助提高ClickHouse的质量并确保您使用的功能在未来的版本中不会被破坏
+4) 一旦测试被添加/接受，您可以确保您检查的角落案例永远不会被意外损坏。
+5) 你将成为伟大的开源社区的一份子
+6) 您的名字将出现在`system.contributors`表中！
+7) 你会让世界变得更好。
+
+### 要做的步骤
+
+#### 先决条件
+
+我假设你运行一些Linux机器（你可以在其他操作系统上使用 docker/虚拟机）和任何现代浏览器/互联网连接，并且你有一些基本的Linux和SQL技能。
+
+不需要任何高度专业化的知识（因此您不需要了解 C++ 或了解ClickHouse CI的工作原理）。
+
+#### 准备
+
+1) [create GitHub account](https://github.com/join) (如果你还没有)
+2) [setup git](https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/set-up-git)
+```bash
+# for Ubuntu
+sudo apt-get update
+sudo apt-get install git
+
+git config --global user.name "John Doe" # fill with your name
+git config --global user.email "email@example.com" # fill with your email
+
+```
+3) [fork ClickHouse project](https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/fork-a-repo) - 打开 [https://github.com/ClickHouse/ClickHouse](https://github.com/ClickHouse/ClickHouse) and press fork button in the top right corner:
+   ![fork repo](https://github-images.s3.amazonaws.com/help/bootcamp/Bootcamp-Fork.png)
+
+4) 例如，将代码fork克隆到PC上的某个文件夹, `~/workspace/ClickHouse`
+```
+mkdir ~/workspace && cd ~/workspace
+git clone https://github.com/< your GitHub username>/ClickHouse
+cd ClickHouse
+git remote add upstream https://github.com/ClickHouse/ClickHouse
+```
+
+#### 测试的新分支
+
+1) 从最新的clickhouse master创建一个新分支
+```
+cd ~/workspace/ClickHouse
+git fetch upstream
+git checkout -b name_for_a_branch_with_my_test upstream/master
+```
+
+#### 安装并运行 clickhouse
+
+1) 安装`clickhouse-server` (参考[离线文档](https://clickhouse.com/docs/en/getting-started/install/))
+2) 安装测试配置（它将使用Zookeeper模拟实现并调整一些设置）
+```
+cd ~/workspace/ClickHouse/tests/config
+sudo ./install.sh
+```
+3) 运行clickhouse-server
+```
+sudo systemctl restart clickhouse-server
+```
+
+#### 创建测试文件
+
+
+1) 找到测试的编号 - 在`tests/queries/0_stateless/`中找到编号最大的文件
+
+```sh
+$ cd ~/workspace/ClickHouse
+$ ls tests/queries/0_stateless/[0-9]*.reference | tail -n 1
+tests/queries/0_stateless/01520_client_print_query_id.reference
+```
+目前，测试的最后一个数字是`01520`，所以我的测试将有数字`01521`
+
+2) 使用您测试的功能的下一个编号和名称创建一个SQL文件
+
+```sh
+touch tests/queries/0_stateless/01521_dummy_test.sql
+```
+
+3) 使用您最喜欢的编辑器编辑SQL文件（请参阅下面的创建测试提示）
+```sh
+vim tests/queries/0_stateless/01521_dummy_test.sql
+```
+
+
+4) 运行测试，并将其结果放入参考文件中：
+```
+clickhouse-client -nmT < tests/queries/0_stateless/01521_dummy_test.sql | tee tests/queries/0_stateless/01521_dummy_test.reference
+```
+
+5) 确保一切正确，如果测试输出不正确（例如由于某些错误），请使用文本编辑器调整参考文件。
+
+#### 如何创建一个好的测试
+
+- 测试应该是
+    - 最小 - 仅创建与测试功能相关的表，删除不相关的列和部分查询
+    - 快速 - 不应超过几秒钟（更好的亚秒）
+    - 正确 - 失败则功能不起作用
+        - 确定性的
+    - 隔离/无状态
+        - 不要依赖一些环境的东西
+        - 尽可能不要依赖时间
+- 尝试覆盖极端情况(zeros / Nulls / empty sets / throwing exceptions)
+- 要测试该查询返回错误，您可以在查询后添加特殊注释：`-- { serverError 60 }`或`-- { clientError 20 }`
+- 不要切换数据库（除非必要）
+- 如果需要，您可以在同一节点上创建多个表副本
+- 您可以在需要时使用测试集群定义之一（请参阅 system.clusters）
+- 使用 `number` / `numbers_mt` / `zeros` / `zeros_mt`和类似的查询要在适用时初始化数据
+- 在测试之后和测试之前清理创建的对象（DROP IF EXISTS） - 在有一些脏状态的情况下
+- 优先选择同步操作模式 (mutations, merges)
+- 以`0_stateless`文件夹中的其他SQL文件为例
+- 确保您想要测试的特性/特性组合尚未被现有测试覆盖
+
+#### 测试命名规则
+
+正确地命名测试非常重要，因此可以在clickhouse-test调用中关闭一些测试子集。
+
+| Tester flag| 测试名称中应该包含什么 | 什么时候应该添加标志 |
+|---|---|---|---|
+| `--[no-]zookeeper`| "zookeeper"或"replica" | 测试使用来自ReplicatedMergeTree家族的表 |
+| `--[no-]shard` | "shard"或"distributed"或"global"| 使用到127.0.0.2或类似的连接进行测试 |
+| `--[no-]long` | "long"或"deadlock"或"race" | 测试运行时间超过60秒 |
+
+#### Commit / push / 创建PR.
+
+1) commit & push您的修改
+```sh
+cd ~/workspace/ClickHouse
+git add tests/queries/0_stateless/01521_dummy_test.sql
+git add tests/queries/0_stateless/01521_dummy_test.reference
+git commit # use some nice commit message when possible
+git push origin HEAD
+```
+2) 使用一个在推送过程中显示的链接，创建一个到master的PR
+3) 调整PR标题和内容，在`Changelog category (leave one)`中保留
+   `Build/Testing/Packaging Improvement`，如果需要，请填写其余字段。
diff --git a/docs/zh/development/architecture.md b/docs/zh/development/architecture.md
index 882728a6e2b..dfc66b36730 100644
--- a/docs/zh/development/architecture.md
+++ b/docs/zh/development/architecture.md
@@ -191,4 +191,4 @@ ClickHouse 中的复制是基于表实现的。你可以在同一个服务器上
 
 > ClickHouse 集群由独立的分片组成，每一个分片由多个副本组成。集群不是弹性的，因此在添加新的分片后，数据不会自动在分片之间重新平衡。相反，集群负载将变得不均衡。该实现为你提供了更多控制，对于相对较小的集群，例如只有数十个节点的集群来说是很好的。但是对于我们在生产中使用的具有数百个节点的集群来说，这种方法成为一个重大缺陷。我们应该实现一个表引擎，使得该引擎能够跨集群扩展数据，同时具有动态复制的区域，这些区域能够在集群之间自动拆分和平衡。
 
-[来源文章](https://clickhouse.tech/docs/en/development/architecture/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/architecture/) <!--hide-->
diff --git a/docs/zh/development/browse-code.md b/docs/zh/development/browse-code.md
index fd334dac55f..9cee0a37444 100644
--- a/docs/zh/development/browse-code.md
+++ b/docs/zh/development/browse-code.md
@@ -5,7 +5,7 @@ toc_title: "\u6D4F\u89C8\u6E90\u4EE3\u7801"
 
 # 浏览ClickHouse源代码 {#browse-clickhouse-source-code}
 
-您可以使用 **Woboq** 在线代码浏览器 [点击这里](https://clickhouse.tech/codebrowser/html_report/ClickHouse/src/index.html). 它提供了代码导航和语义突出显示、搜索和索引。 代码快照每天更新。
+您可以使用 **Woboq** 在线代码浏览器 [点击这里](https://clickhouse.com/codebrowser/html_report/ClickHouse/src/index.html). 它提供了代码导航和语义突出显示、搜索和索引。 代码快照每天更新。
 
 此外，您还可以像往常一样浏览源代码 [GitHub](https://github.com/ClickHouse/ClickHouse)
 
diff --git a/docs/zh/development/build-cross-arm.md b/docs/zh/development/build-cross-arm.md
index fa6c9e74b5f..5c70fa9c7dd 100644
--- a/docs/zh/development/build-cross-arm.md
+++ b/docs/zh/development/build-cross-arm.md
@@ -10,7 +10,7 @@ toc_title: "\u5982\u4F55\u5728Linux\u4E0A\u6784\u5EFAClickHouse for AARCH64\uFF0
 
 这是当你有Linux机器，并希望使用它来构建的情况下 `clickhouse` 二进制文件将运行在另一个Linux机器上与AARCH64CPU架构。 这适用于在Linux服务器上运行的持续集成检查。
 
-Aarch64的交叉构建基于 [构建说明](build.md) 先跟着他们
+Aarch64的交叉构建基于 [构建说明](../development/build.md) 先跟着他们
 
 # 安装Clang-8 {#install-clang-8}
 
diff --git a/docs/zh/development/build-cross-osx.md b/docs/zh/development/build-cross-osx.md
index ee3335553d3..d9bc7666546 100644
--- a/docs/zh/development/build-cross-osx.md
+++ b/docs/zh/development/build-cross-osx.md
@@ -1,6 +1,6 @@
 # 如何在Linux中编译Mac OS X ClickHouse {#ru-he-zai-linuxzhong-bian-yi-mac-os-x-clickhouse}
 
-Linux机器也可以编译运行在OS X系统的`clickhouse`二进制包，这可以用于在Linux上跑持续集成测试。如果要在Mac OS X上直接构建ClickHouse，请参考另外一篇指南： https://clickhouse.tech/docs/zh/development/build_osx/
+Linux机器也可以编译运行在OS X系统的`clickhouse`二进制包，这可以用于在Linux上跑持续集成测试。如果要在Mac OS X上直接构建ClickHouse，请参考另外一篇指南： https://clickhouse.com/docs/zh/development/build_osx/
 
 Mac OS X的交叉编译基于以下构建说明，请首先遵循它们。
 
diff --git a/docs/zh/development/build-osx.md b/docs/zh/development/build-osx.md
index c7c386da97e..6706e9b0e4d 100644
--- a/docs/zh/development/build-osx.md
+++ b/docs/zh/development/build-osx.md
@@ -79,4 +79,4 @@ $ sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
 
 可以通过 `ulimit -n` 命令来检查是否生效。
 
-[来源文章](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/zh/development/build.md b/docs/zh/development/build.md
index 01e0740bfa4..a46081d1d4b 100644
--- a/docs/zh/development/build.md
+++ b/docs/zh/development/build.md
@@ -65,4 +65,4 @@ cd ..
 若要创建一个执行文件， 执行 `ninja clickhouse`。
 这个命令会使得 `programs/clickhouse` 文件可执行，您可以使用 `client` 或 `server` 参数运行。
 
-[来源文章](https://clickhouse.tech/docs/en/development/build/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/build/) <!--hide-->
diff --git a/docs/zh/development/continuous-integration.md b/docs/zh/development/continuous-integration.md
new file mode 120000
index 00000000000..f68058a436e
--- /dev/null
+++ b/docs/zh/development/continuous-integration.md
@@ -0,0 +1 @@
+../../en/development/continuous-integration.md
\ No newline at end of file
diff --git a/docs/zh/development/developer-instruction.md b/docs/zh/development/developer-instruction.md
index 04950c11521..56617123d40 100644
--- a/docs/zh/development/developer-instruction.md
+++ b/docs/zh/development/developer-instruction.md
@@ -224,11 +224,11 @@ KDevelop和QTCreator是另外两款适合开发ClickHouse的替代IDE。尽管
 
 # 编写代码 {#bian-xie-dai-ma}
 
-ClickHouse的架构描述可以在此处查看：https://clickhouse.tech/docs/en/development/architecture/
+ClickHouse的架构描述可以在此处查看：https://clickhouse.com/docs/en/development/architecture/
 
-代码风格指引：https://clickhouse.tech/docs/en/development/style/
+代码风格指引：https://clickhouse.com/docs/en/development/style/
 
-编写测试用例：https://clickhouse.tech/docs/en/development/tests/
+编写测试用例：https://clickhouse.com/docs/en/development/tests/
 
 任务列表：https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
diff --git a/docs/zh/development/index.md b/docs/zh/development/index.md
index 187ee1b3e25..d14b0fc8fc7 100644
--- a/docs/zh/development/index.md
+++ b/docs/zh/development/index.md
@@ -1,3 +1,3 @@
 # ClickHouse 开发 {#clickhouse-kai-fa}
 
-[来源文章](https://clickhouse.tech/docs/en/development/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/) <!--hide-->
diff --git a/docs/zh/development/style.md b/docs/zh/development/style.md
index dcbfbc79e33..29287f31077 100644
--- a/docs/zh/development/style.md
+++ b/docs/zh/development/style.md
@@ -823,4 +823,4 @@ function(
       size_t limit)
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/development/style/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/style/) <!--hide-->
diff --git a/docs/zh/development/tests.md b/docs/zh/development/tests.md
new file mode 120000
index 00000000000..c03d36c3916
--- /dev/null
+++ b/docs/zh/development/tests.md
@@ -0,0 +1 @@
+../../en/development/tests.md
\ No newline at end of file
diff --git a/docs/zh/engines/database-engines/index.md b/docs/zh/engines/database-engines/index.md
index 856a7b88d04..10be2e0f041 100644
--- a/docs/zh/engines/database-engines/index.md
+++ b/docs/zh/engines/database-engines/index.md
@@ -26,4 +26,4 @@ toc_title: Introduction
 
 -   [Replicated](../../engines/database-engines/replicated.md)
 
-[来源文章](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/database_engines/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/lazy.md b/docs/zh/engines/database-engines/lazy.md
index 1ba09513492..f5aa3174a24 100644
--- a/docs/zh/engines/database-engines/lazy.md
+++ b/docs/zh/engines/database-engines/lazy.md
@@ -15,4 +15,4 @@ toc_title: Lazy
 CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/database_engines/lazy/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/database_engines/lazy/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/materialize-mysql.md b/docs/zh/engines/database-engines/materialize-mysql.md
index 595da7681d6..1a6bd029295 100644
--- a/docs/zh/engines/database-engines/materialize-mysql.md
+++ b/docs/zh/engines/database-engines/materialize-mysql.md
@@ -194,4 +194,4 @@ SELECT * FROM mysql.test;
 └───┴─────┴──────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/engines/database-engines/materialize-mysql/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/engines/database-engines/materialize-mysql/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/materialized-mysql.md b/docs/zh/engines/database-engines/materialized-mysql.md
new file mode 120000
index 00000000000..02118b85df4
--- /dev/null
+++ b/docs/zh/engines/database-engines/materialized-mysql.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/materialized-mysql.md
\ No newline at end of file
diff --git a/docs/zh/engines/database-engines/mysql.md b/docs/zh/engines/database-engines/mysql.md
index 66a94c94db3..fe9ab8f077d 100644
--- a/docs/zh/engines/database-engines/mysql.md
+++ b/docs/zh/engines/database-engines/mysql.md
@@ -147,4 +147,4 @@ SELECT * FROM mysql_db.mysql_table
 └────────┴───────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/database_engines/mysql/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/database_engines/mysql/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/postgresql.md b/docs/zh/engines/database-engines/postgresql.md
index baecc3e995a..12b8133f404 100644
--- a/docs/zh/engines/database-engines/postgresql.md
+++ b/docs/zh/engines/database-engines/postgresql.md
@@ -135,4 +135,4 @@ DESCRIBE TABLE test_database.test_table;
 └────────┴───────────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/database-engines/postgresql/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/database-engines/postgresql/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/sqlite.md b/docs/zh/engines/database-engines/sqlite.md
new file mode 120000
index 00000000000..776734647c2
--- /dev/null
+++ b/docs/zh/engines/database-engines/sqlite.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/sqlite.md
\ No newline at end of file
diff --git a/docs/zh/engines/table-engines/integrations/ExternalDistributed.md b/docs/zh/engines/table-engines/integrations/ExternalDistributed.md
new file mode 120000
index 00000000000..f843983ad4d
--- /dev/null
+++ b/docs/zh/engines/table-engines/integrations/ExternalDistributed.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/ExternalDistributed.md
\ No newline at end of file
diff --git a/docs/zh/engines/table-engines/integrations/embedded-rocksdb.md b/docs/zh/engines/table-engines/integrations/embedded-rocksdb.md
index 7c04600894e..79ca8f0cd10 100644
--- a/docs/zh/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/zh/engines/table-engines/integrations/embedded-rocksdb.md
@@ -39,4 +39,4 @@ ENGINE = EmbeddedRocksDB
 PRIMARY KEY key
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/hdfs.md b/docs/zh/engines/table-engines/integrations/hdfs.md
index 1a6ba0ba9e9..5948c0fa4b2 100644
--- a/docs/zh/engines/table-engines/integrations/hdfs.md
+++ b/docs/zh/engines/table-engines/integrations/hdfs.md
@@ -205,4 +205,4 @@ CREARE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
 
 -   [虚拟列](../index.md#table_engines-virtual_columns)
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/hdfs/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/hdfs/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/jdbc.md b/docs/zh/engines/table-engines/integrations/jdbc.md
index 4a0ba15ed0d..170d37c64c2 100644
--- a/docs/zh/engines/table-engines/integrations/jdbc.md
+++ b/docs/zh/engines/table-engines/integrations/jdbc.md
@@ -95,4 +95,4 @@ FROM system.numbers
 
 -   [JDBC表函数](../../../sql-reference/table-functions/jdbc.md).
 
-[原始文档](https://clickhouse.tech/docs/en/operations/table_engines/jdbc/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/operations/table_engines/jdbc/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/kafka.md b/docs/zh/engines/table-engines/integrations/kafka.md
index 0118b6795e4..6784b366e85 100644
--- a/docs/zh/engines/table-engines/integrations/kafka.md
+++ b/docs/zh/engines/table-engines/integrations/kafka.md
@@ -132,4 +132,4 @@ Kafka 特性：
 
 有关详细配置选项列表，请参阅 [librdkafka配置参考](https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md)。在 ClickHouse 配置中使用下划线 (`_`) ，并不是使用点 (`.`)。例如，`check.crcs=true` 将是 `<check_crcs>true</check_crcs>`。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/kafka/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/kafka/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/materialized-postgresql.md b/docs/zh/engines/table-engines/integrations/materialized-postgresql.md
new file mode 120000
index 00000000000..c8dcba4bc19
--- /dev/null
+++ b/docs/zh/engines/table-engines/integrations/materialized-postgresql.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/materialized-postgresql.md
\ No newline at end of file
diff --git a/docs/zh/engines/table-engines/integrations/mongodb.md b/docs/zh/engines/table-engines/integrations/mongodb.md
index ff3fdae5b40..a91e81a26ad 100644
--- a/docs/zh/engines/table-engines/integrations/mongodb.md
+++ b/docs/zh/engines/table-engines/integrations/mongodb.md
@@ -54,4 +54,4 @@ SELECT COUNT() FROM mongo_table;
 └─────────┘
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/mysql.md b/docs/zh/engines/table-engines/integrations/mysql.md
index 526e2d6f865..39a7eabda35 100644
--- a/docs/zh/engines/table-engines/integrations/mysql.md
+++ b/docs/zh/engines/table-engines/integrations/mysql.md
@@ -22,4 +22,4 @@ MySQL 引擎可以对存储在远程 MySQL 服务器上的数据执行 `SELECT`
 
 `MySQL` 引擎不支持 [可为空](../../../engines/table-engines/integrations/mysql.md) 数据类型，因此，当从MySQL表中读取数据时，`NULL` 将转换为指定列类型的默认值（通常为0或空字符串）。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/mysql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/mysql/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/odbc.md b/docs/zh/engines/table-engines/integrations/odbc.md
index 58eb2ffe94c..383bf99aed5 100644
--- a/docs/zh/engines/table-engines/integrations/odbc.md
+++ b/docs/zh/engines/table-engines/integrations/odbc.md
@@ -128,4 +128,4 @@ SELECT * FROM odbc_t
 -   [ODBC 外部字典](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBC 表函数](../../../sql-reference/table-functions/odbc.md)
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/odbc/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/odbc/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/postgresql.md b/docs/zh/engines/table-engines/integrations/postgresql.md
index df1e74ce763..17ca59be469 100644
--- a/docs/zh/engines/table-engines/integrations/postgresql.md
+++ b/docs/zh/engines/table-engines/integrations/postgresql.md
@@ -142,4 +142,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 <!-- -   [`postgresql` 表函数](../../../sql-reference/table-functions/postgresql.md) -->
 -   [使用 PostgreSQL 作为外部字典的来源](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[原始文章](https://clickhouse.tech/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/rabbitmq.md b/docs/zh/engines/table-engines/integrations/rabbitmq.md
index a4a5be5f685..74b4e4d1f93 100644
--- a/docs/zh/engines/table-engines/integrations/rabbitmq.md
+++ b/docs/zh/engines/table-engines/integrations/rabbitmq.md
@@ -164,4 +164,4 @@ Exchange 类型的选项:
 -   `_message_id` - 收到的消息的ID；如果在消息发布时被设置，则为非空.
 -   `_timestamp` - 收到的消息的时间戳；如果在消息发布时被设置，则为非空.
 
-[原始文章](https://clickhouse.tech/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/sqlite.md b/docs/zh/engines/table-engines/integrations/sqlite.md
new file mode 120000
index 00000000000..56d0a490f52
--- /dev/null
+++ b/docs/zh/engines/table-engines/integrations/sqlite.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/sqlite.md
\ No newline at end of file
diff --git a/docs/zh/engines/table-engines/log-family/index.md b/docs/zh/engines/table-engines/log-family/index.md
index c45a68b2aae..75c84409aa0 100644
--- a/docs/zh/engines/table-engines/log-family/index.md
+++ b/docs/zh/engines/table-engines/log-family/index.md
@@ -48,4 +48,4 @@ toc_priority: 29
 
 `TinyLog` 引擎是该系列中最简单的引擎并且提供了最少的功能和最低的性能。`TinyLog` 引擎不支持并行读取和并发数据访问，并将每一列存储在不同的文件中。它比其余两种支持并行读取的引擎的读取速度更慢，并且使用了和 `Log` 引擎同样多的描述符。你可以在简单的低负载的情景下使用它。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/log_family/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/log-family/log.md b/docs/zh/engines/table-engines/log-family/log.md
index 5d3ee38d745..c825868bcda 100644
--- a/docs/zh/engines/table-engines/log-family/log.md
+++ b/docs/zh/engines/table-engines/log-family/log.md
@@ -2,4 +2,4 @@
 
 `Log` 与 `TinyLog` 的不同之处在于，«标记» 的小文件与列文件存在一起。这些标记写在每个数据块上，并且包含偏移量，这些偏移量指示从哪里开始读取文件以便跳过指定的行数。这使得可以在多个线程中读取表数据。对于并发数据访问，可以同时执行读取操作，而写入操作则阻塞读取和其它写入。`Log`引擎不支持索引。同样，如果写入表失败，则该表将被破坏，并且从该表读取将返回错误。`Log`引擎适用于临时数据，write-once 表以及测试或演示目的。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/log/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/log/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/log-family/stripelog.md b/docs/zh/engines/table-engines/log-family/stripelog.md
index e10d9afd98d..dbb725d3a72 100644
--- a/docs/zh/engines/table-engines/log-family/stripelog.md
+++ b/docs/zh/engines/table-engines/log-family/stripelog.md
@@ -79,4 +79,4 @@ SELECT * FROM stripe_log_table ORDER BY timestamp
     │ 2019-01-18 14:34:53 │ WARNING      │ The first warning message  │
     └─────────────────────┴──────────────┴────────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/stripelog/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/log-family/tinylog.md b/docs/zh/engines/table-engines/log-family/tinylog.md
index bb67eaa67a5..533e5a89528 100644
--- a/docs/zh/engines/table-engines/log-family/tinylog.md
+++ b/docs/zh/engines/table-engines/log-family/tinylog.md
@@ -10,4 +10,4 @@
 
 在 Yandex.Metrica 中，TinyLog 表用于小批量处理的中间数据。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/tinylog/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 03825a41f95..4fbb55c270b 100644
--- a/docs/zh/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -95,4 +95,4 @@ GROUP BY StartDate
 ORDER BY StartDate;
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/collapsingmergetree.md
index 6fb57dc19d9..09f0d2aee1d 100644
--- a/docs/zh/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -203,4 +203,4 @@ SELECT * FROM UAct FINAL
 
 这种查询数据的方法是非常低效的。不要在大表中使用它。
 
-[原文](https://clickhouse.tech/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
+[原文](https://clickhouse.com/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/zh/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 71249e39ed2..8694fe88027 100644
--- a/docs/zh/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/zh/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -117,4 +117,4 @@ drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 detached
 
 ClickHouse 支持对分区执行这些操作：删除分区，将分区从一个表复制到另一个表，或创建备份。了解分区的所有操作，请参阅 [分区和片段的操作](../../../sql-reference/statements/alter.md#alter_manipulations-with-partitions) 一节。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/zh/engines/table-engines/mergetree-family/graphitemergetree.md
index fa17e0d5c5e..044ea442db3 100644
--- a/docs/zh/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -164,4 +164,4 @@ CH在处理行记录时，会检查 `pattern`节点的规则。每个 `pattern`
 </graphite_rollup>
 ```
 
-[原始文档](https://clickhouse.tech/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/mergetree.md b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
index 45e080fd640..b2e240f4f19 100644
--- a/docs/zh/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
@@ -58,7 +58,7 @@ ORDER BY expr
 
      如果没有使用 `PRIMARY KEY` 显式指定的主键，ClickHouse 会使用排序键作为主键。
 
-     如果不需要排序，可以使用 `ORDER BY tuple()`. 参考 [选择主键](https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#selecting-the-primary-key)
+     如果不需要排序，可以使用 `ORDER BY tuple()`. 参考 [选择主键](https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#selecting-the-primary-key)
 
 - `PARTITION BY` — [分区键](custom-partitioning-key.md) ，可选项。
 
@@ -90,7 +90,7 @@ ORDER BY expr
   - `index_granularity_bytes` — 索引粒度，以字节为单位，默认值: 10Mb。如果想要仅按数据行数限制索引粒度, 请设置为0(不建议)。
   - `min_index_granularity_bytes` - 允许的最小数据粒度，默认值：1024b。该选项用于防止误操作，添加了一个非常低索引粒度的表。参考[数据存储](#mergetree-data-storage)
   - `enable_mixed_granularity_parts` — 是否启用通过 `index_granularity_bytes` 控制索引粒度的大小。在19.11版本之前, 只有 `index_granularity` 配置能够用于限制索引粒度的大小。当从具有很大的行（几十上百兆字节）的表中查询数据时候，`index_granularity_bytes` 配置能够提升ClickHouse的性能。如果您的表里有很大的行，可以开启这项配置来提升`SELECT` 查询的性能。
-  - `use_minimalistic_part_header_in_zookeeper` — ZooKeeper中数据片段存储方式 。如果`use_minimalistic_part_header_in_zookeeper=1` ，ZooKeeper 会存储更少的数据。更多信息参考[服务配置参数]([Server Settings | ClickHouse Documentation](https://clickhouse.tech/docs/zh/operations/server-configuration-parameters/settings/))这章中的 [设置描述](../../../operations/server-configuration-parameters/settings.md#server-settings-use_minimalistic_part_header_in_zookeeper) 。
+  - `use_minimalistic_part_header_in_zookeeper` — ZooKeeper中数据片段存储方式 。如果`use_minimalistic_part_header_in_zookeeper=1` ，ZooKeeper 会存储更少的数据。更多信息参考[服务配置参数]([Server Settings | ClickHouse Documentation](https://clickhouse.com/docs/zh/operations/server-configuration-parameters/settings/))这章中的 [设置描述](../../../operations/server-configuration-parameters/settings.md#server-settings-use_minimalistic_part_header_in_zookeeper) 。
   - `min_merge_bytes_to_use_direct_io` — 使用直接 I/O 来操作磁盘的合并操作时要求的最小数据量。合并数据片段时，ClickHouse 会计算要被合并的所有数据的总存储空间。如果大小超过了 `min_merge_bytes_to_use_direct_io` 设置的字节数，则 ClickHouse 将使用直接 I/O 接口（`O_DIRECT` 选项）对磁盘读写。如果设置 `min_merge_bytes_to_use_direct_io = 0` ，则会禁用直接 I/O。默认值：`10 * 1024 * 1024 * 1024` 字节。
         <a name="mergetree_setting-merge_with_ttl_timeout"></a>
   - `merge_with_ttl_timeout` — TTL合并频率的最小间隔时间，单位：秒。默认值: 86400 (1 天)。
@@ -99,9 +99,9 @@ ORDER BY expr
   - `storage_policy` — 存储策略。 参见 [使用具有多个块的设备进行数据存储](#table_engine-mergetree-multiple-volumes).
   - `min_bytes_for_wide_part`,`min_rows_for_wide_part` 在数据片段中可以使用`Wide`格式进行存储的最小字节数/行数。您可以不设置、只设置一个，或全都设置。参考：[数据存储](#mergetree-data-storage)
   - `max_parts_in_total` - 所有分区中最大块的数量(意义不明)
-  - `max_compress_block_size` - 在数据压缩写入表前，未压缩数据块的最大大小。您可以在全局设置中设置该值(参见[max_compress_block_size](https://clickhouse.tech/docs/zh/operations/settings/settings/#max-compress-block-size))。建表时指定该值会覆盖全局设置。
-  - `min_compress_block_size` - 在数据压缩写入表前，未压缩数据块的最小大小。您可以在全局设置中设置该值(参见[min_compress_block_size](https://clickhouse.tech/docs/zh/operations/settings/settings/#min-compress-block-size))。建表时指定该值会覆盖全局设置。
-  - `max_partitions_to_read` - 一次查询中可访问的分区最大数。您可以在全局设置中设置该值(参见[max_partitions_to_read](https://clickhouse.tech/docs/zh/operations/settings/settings/#max_partitions_to_read))。
+  - `max_compress_block_size` - 在数据压缩写入表前，未压缩数据块的最大大小。您可以在全局设置中设置该值(参见[max_compress_block_size](https://clickhouse.com/docs/zh/operations/settings/settings/#max-compress-block-size))。建表时指定该值会覆盖全局设置。
+  - `min_compress_block_size` - 在数据压缩写入表前，未压缩数据块的最小大小。您可以在全局设置中设置该值(参见[min_compress_block_size](https://clickhouse.com/docs/zh/operations/settings/settings/#min-compress-block-size))。建表时指定该值会覆盖全局设置。
+  - `max_partitions_to_read` - 一次查询中可访问的分区最大数。您可以在全局设置中设置该值(参见[max_partitions_to_read](https://clickhouse.com/docs/zh/operations/settings/settings/#max_partitions_to_read))。
 
 **示例配置**
 
@@ -186,7 +186,7 @@ ClickHouse 会为每个数据片段创建一个索引文件来存储这些标记
 
 ClickHouse 不要求主键唯一，所以您可以插入多条具有相同主键的行。
 
-您可以在`PRIMARY KEY`与`ORDER BY`条件中使用`可为空的`类型的表达式，但强烈建议不要这么做。为了启用这项功能，请打开[allow_nullable_key](https://clickhouse.tech/docs/zh/operations/settings/settings/#allow-nullable-key)，[NULLS_LAST](https://clickhouse.tech/docs/zh/sql-reference/statements/select/order-by/#sorting-of-special-values)规则也适用于`ORDER BY`条件中有NULL值的情况下。
+您可以在`PRIMARY KEY`与`ORDER BY`条件中使用`可为空的`类型的表达式，但强烈建议不要这么做。为了启用这项功能，请打开[allow_nullable_key](https://clickhouse.com/docs/zh/operations/settings/settings/#allow-nullable-key)，[NULLS_LAST](https://clickhouse.com/docs/zh/sql-reference/statements/select/order-by/#sorting-of-special-values)规则也适用于`ORDER BY`条件中有NULL值的情况下。
 
 ### 主键的选择 {#zhu-jian-de-xuan-ze}
 
@@ -543,7 +543,7 @@ MergeTree 系列表引擎可以将数据存储在多个块设备上。这对某
 - 卷 — 相同磁盘的顺序列表 （类似于 [JBOD](https://en.wikipedia.org/wiki/Non-RAID_drive_architectures)）
 - 存储策略 — 卷的集合及他们之间的数据移动规则
 
- 以上名称的信息在Clickhouse中系统表[system.storage_policies](https://clickhouse.tech/docs/zh/operations/system-tables/storage_policies/#system_tables-storage_policies)和[system.disks](https://clickhouse.tech/docs/zh/operations/system-tables/disks/#system_tables-disks)体现。为了应用存储策略，可以在建表时使用`storage_policy`设置。
+ 以上名称的信息在Clickhouse中系统表[system.storage_policies](https://clickhouse.com/docs/zh/operations/system-tables/storage_policies/#system_tables-storage_policies)和[system.disks](https://clickhouse.com/docs/zh/operations/system-tables/disks/#system_tables-disks)体现。为了应用存储策略，可以在建表时使用`storage_policy`设置。
 
 ### 配置 {#table_engine-mergetree-multiple-volumes_configure}
 
@@ -809,4 +809,4 @@ S3磁盘也可以设置冷热存储：
 
 指定了`cold`选项后，本地磁盘剩余空间如果小于`move_factor * disk_size`，或有TTL设置时，数据就会定时迁移至S3了。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/mergetree/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/mergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/replacingmergetree.md
index 75ec4ea8b3d..b6815f62405 100644
--- a/docs/zh/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -58,4 +58,4 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 </details>
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/replication.md b/docs/zh/engines/table-engines/mergetree-family/replication.md
index a4d03e8da36..2e6391c01dd 100644
--- a/docs/zh/engines/table-engines/mergetree-family/replication.md
+++ b/docs/zh/engines/table-engines/mergetree-family/replication.md
@@ -199,4 +199,4 @@ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 
 如果 ZooKeeper 中的数据丢失或损坏，如上所述，你可以通过将数据转移到非复制表来保存数据。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/summingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/summingmergetree.md
index d05e718c59b..e59c3907811 100644
--- a/docs/zh/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/summingmergetree.md
@@ -121,4 +121,4 @@ ClickHouse 会按片段合并数据，以至于不同的数据片段中会包含
 
 对于嵌套数据结构，你无需在列的元组中指定列以进行汇总。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index 8479c92f56f..b81d2206bf4 100644
--- a/docs/zh/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -233,4 +233,4 @@ SELECT * FROM UAct FINAL
 
 这是一个非常低效的方式来选择数据。 不要把它用于数据量大的表。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/buffer.md b/docs/zh/engines/table-engines/special/buffer.md
index 253aba2382a..5c48d54676e 100644
--- a/docs/zh/engines/table-engines/special/buffer.md
+++ b/docs/zh/engines/table-engines/special/buffer.md
@@ -50,4 +50,4 @@ PREWHERE，FINAL 和 SAMPLE 对缓冲表不起作用。这些条件将传递到
 
 请注意，一次插入一行数据是没有意义的，即使对于 Buffer 表也是如此。这将只产生每秒几千行的速度，而插入更大的数据块每秒可以产生超过一百万行（参见 «性能» 部分）。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/buffer/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/dictionary.md b/docs/zh/engines/table-engines/special/dictionary.md
index 4908276ef97..50aa5f917d7 100644
--- a/docs/zh/engines/table-engines/special/dictionary.md
+++ b/docs/zh/engines/table-engines/special/dictionary.md
@@ -98,4 +98,4 @@ LIMIT 1
 
     1 rows in set. Elapsed: 0.006 sec.
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/dictionary/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/dictionary/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/distributed.md b/docs/zh/engines/table-engines/special/distributed.md
index 2ee17c13fae..f24d509f151 100644
--- a/docs/zh/engines/table-engines/special/distributed.md
+++ b/docs/zh/engines/table-engines/special/distributed.md
@@ -117,4 +117,4 @@ SELECT 查询会被发送到所有分片，并且无论数据在分片中如何
 
 启用 max_parallel_replicas 选项后，会在分表的所有副本上并行查询处理。更多信息，请参阅«设置，max_parallel_replicas»部分。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/distributed/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/external-data.md b/docs/zh/engines/table-engines/special/external-data.md
index a07a9cda67e..ed44d7ce3b7 100644
--- a/docs/zh/engines/table-engines/special/external-data.md
+++ b/docs/zh/engines/table-engines/special/external-data.md
@@ -58,4 +58,4 @@ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+count(
 
 对于分布式查询，将临时表发送到所有远程服务器。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/external_data/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/file.md b/docs/zh/engines/table-engines/special/file.md
index 4464dcf198c..ce4a43bba3f 100644
--- a/docs/zh/engines/table-engines/special/file.md
+++ b/docs/zh/engines/table-engines/special/file.md
@@ -70,4 +70,4 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
     -   索引
     -   副本
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/file/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/file/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/generate.md b/docs/zh/engines/table-engines/special/generate.md
index 885ad381d7f..bae981ac468 100644
--- a/docs/zh/engines/table-engines/special/generate.md
+++ b/docs/zh/engines/table-engines/special/generate.md
@@ -54,4 +54,4 @@ SELECT * FROM generate_engine_table LIMIT 3
     -   Indices
     -   Replication
 
-[原始文档](https://clickhouse.tech/docs/en/operations/table_engines/generate/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/operations/table_engines/generate/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/join.md b/docs/zh/engines/table-engines/special/join.md
index 35a50c1a54d..36f5ca6134b 100644
--- a/docs/zh/engines/table-engines/special/join.md
+++ b/docs/zh/engines/table-engines/special/join.md
@@ -112,4 +112,4 @@ SELECT joinGet('id_val_join', 'val', toUInt32(1))
 如果服务器非正常重启，保存在硬盘上的数据块会丢失或被损坏。这种情况下，需要手动删除被损坏的数据文件。
 
 
-[原始文档](https://clickhouse.tech/docs/en/operations/table_engines/join/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/operations/table_engines/join/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/materializedview.md b/docs/zh/engines/table-engines/special/materializedview.md
index 21c4008a158..d4c678839b6 100644
--- a/docs/zh/engines/table-engines/special/materializedview.md
+++ b/docs/zh/engines/table-engines/special/materializedview.md
@@ -2,4 +2,4 @@
 
 物化视图的使用（更多信息请参阅 [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) ）。它需要使用一个不同的引擎来存储数据，这个引擎要在创建物化视图时指定。当从表中读取时，它就会使用该引擎。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/materializedview/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/memory.md b/docs/zh/engines/table-engines/special/memory.md
index becf0f3b04f..2e880934652 100644
--- a/docs/zh/engines/table-engines/special/memory.md
+++ b/docs/zh/engines/table-engines/special/memory.md
@@ -4,4 +4,4 @@ Memory 引擎以未压缩的形式将数据存储在 RAM 中。数据完全以
 
 Memory 引擎是由系统用于临时表进行外部数据的查询（请参阅 «外部数据用于请求处理» 部分），以及用于实现 `GLOBAL IN`（请参见 «IN 运算符» 部分）。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/memory/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/merge.md b/docs/zh/engines/table-engines/special/merge.md
index 839842e108f..c29a600bef6 100644
--- a/docs/zh/engines/table-engines/special/merge.md
+++ b/docs/zh/engines/table-engines/special/merge.md
@@ -60,4 +60,4 @@
 
 如果 `WHERE/PREWHERE` 子句包含了带 `_table` 的条件，并且没有依赖其他的列（如作为表达式谓词链接的一个子项或作为整个的表达式），这些条件的作用会像索引一样。这些条件会在那些可能被读数据的表的表名上执行，并且读操作只会在那些满足了该条件的表上去执行。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/merge/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/null.md b/docs/zh/engines/table-engines/special/null.md
index c9fee734f1a..60b91109abe 100644
--- a/docs/zh/engines/table-engines/special/null.md
+++ b/docs/zh/engines/table-engines/special/null.md
@@ -4,4 +4,4 @@
 
 但是，可以在 Null 类型的表上创建物化视图。写入表的数据将转发到视图中。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/null/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/null/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/set.md b/docs/zh/engines/table-engines/special/set.md
index a4fd0d85bd1..ae522221c14 100644
--- a/docs/zh/engines/table-engines/special/set.md
+++ b/docs/zh/engines/table-engines/special/set.md
@@ -8,4 +8,4 @@
 
 对于强制服务器重启，磁盘上的数据块可能会丢失或损坏。在数据块损坏的情况下，可能需要手动删除包含损坏数据的文件。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/set/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/set/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/url.md b/docs/zh/engines/table-engines/special/url.md
index 9e0b953043e..41dd887d20a 100644
--- a/docs/zh/engines/table-engines/special/url.md
+++ b/docs/zh/engines/table-engines/special/url.md
@@ -68,4 +68,4 @@ SELECT * FROM url_engine_table
     -   索引。
     -   副本。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/url/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/url/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/view.md b/docs/zh/engines/table-engines/special/view.md
index e2dca177e4e..fde72ce85b0 100644
--- a/docs/zh/engines/table-engines/special/view.md
+++ b/docs/zh/engines/table-engines/special/view.md
@@ -2,4 +2,4 @@
 
 用于构建视图（有关更多信息，请参阅 `CREATE VIEW 查询`）。 它不存储数据，仅存储指定的 `SELECT` 查询。 从表中读取时，它会运行此查询（并从查询中删除所有不必要的列）。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/view/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/view/) <!--hide-->
diff --git a/docs/zh/faq/general.md b/docs/zh/faq/general.md
index 68053330405..05dad567195 100644
--- a/docs/zh/faq/general.md
+++ b/docs/zh/faq/general.md
@@ -16,4 +16,4 @@
 
     NLS_LANG=CHINESE_CHINA.ZHS16GBK
 
-[来源文章](https://clickhouse.tech/docs/zh/faq/general/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/faq/general/) <!--hide-->
diff --git a/docs/zh/faq/general/columnar-database.md b/docs/zh/faq/general/columnar-database.md
new file mode 120000
index 00000000000..b7557b62010
--- /dev/null
+++ b/docs/zh/faq/general/columnar-database.md
@@ -0,0 +1 @@
+../../../en/faq/general/columnar-database.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/dbms-naming.md b/docs/zh/faq/general/dbms-naming.md
new file mode 120000
index 00000000000..0df856af0ca
--- /dev/null
+++ b/docs/zh/faq/general/dbms-naming.md
@@ -0,0 +1 @@
+../../../en/faq/general/dbms-naming.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/index.md b/docs/zh/faq/general/index.md
new file mode 120000
index 00000000000..5ff33ccb360
--- /dev/null
+++ b/docs/zh/faq/general/index.md
@@ -0,0 +1 @@
+../../../en/faq/general/index.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/mapreduce.md b/docs/zh/faq/general/mapreduce.md
new file mode 120000
index 00000000000..49b79ad4841
--- /dev/null
+++ b/docs/zh/faq/general/mapreduce.md
@@ -0,0 +1 @@
+../../../en/faq/general/mapreduce.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/ne-tormozit.md b/docs/zh/faq/general/ne-tormozit.md
new file mode 120000
index 00000000000..a8273c56b2d
--- /dev/null
+++ b/docs/zh/faq/general/ne-tormozit.md
@@ -0,0 +1 @@
+../../../en/faq/general/ne-tormozit.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/olap.md b/docs/zh/faq/general/olap.md
new file mode 120000
index 00000000000..99caa8218c8
--- /dev/null
+++ b/docs/zh/faq/general/olap.md
@@ -0,0 +1 @@
+../../../en/faq/general/olap.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/who-is-using-clickhouse.md b/docs/zh/faq/general/who-is-using-clickhouse.md
new file mode 120000
index 00000000000..b4e9782df7e
--- /dev/null
+++ b/docs/zh/faq/general/who-is-using-clickhouse.md
@@ -0,0 +1 @@
+../../../en/faq/general/who-is-using-clickhouse.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/why-clickhouse-is-so-fast.md b/docs/zh/faq/general/why-clickhouse-is-so-fast.md
new file mode 120000
index 00000000000..77b8c3fcd68
--- /dev/null
+++ b/docs/zh/faq/general/why-clickhouse-is-so-fast.md
@@ -0,0 +1 @@
+../../../en/faq/general/why-clickhouse-is-so-fast.md
\ No newline at end of file
diff --git a/docs/zh/faq/integration/file-export.md b/docs/zh/faq/integration/file-export.md
new file mode 120000
index 00000000000..19a5c67148b
--- /dev/null
+++ b/docs/zh/faq/integration/file-export.md
@@ -0,0 +1 @@
+../../../en/faq/integration/file-export.md
\ No newline at end of file
diff --git a/docs/zh/faq/integration/index.md b/docs/zh/faq/integration/index.md
new file mode 120000
index 00000000000..8323d6218a3
--- /dev/null
+++ b/docs/zh/faq/integration/index.md
@@ -0,0 +1 @@
+../../../en/faq/integration/index.md
\ No newline at end of file
diff --git a/docs/zh/faq/integration/json-import.md b/docs/zh/faq/integration/json-import.md
new file mode 120000
index 00000000000..e90f4386602
--- /dev/null
+++ b/docs/zh/faq/integration/json-import.md
@@ -0,0 +1 @@
+../../../en/faq/integration/json-import.md
\ No newline at end of file
diff --git a/docs/zh/faq/integration/oracle-odbc.md b/docs/zh/faq/integration/oracle-odbc.md
new file mode 120000
index 00000000000..47fe6189ee3
--- /dev/null
+++ b/docs/zh/faq/integration/oracle-odbc.md
@@ -0,0 +1 @@
+../../../en/faq/integration/oracle-odbc.md
\ No newline at end of file
diff --git a/docs/zh/faq/operations/delete-old-data.md b/docs/zh/faq/operations/delete-old-data.md
new file mode 120000
index 00000000000..aef26953cd3
--- /dev/null
+++ b/docs/zh/faq/operations/delete-old-data.md
@@ -0,0 +1 @@
+../../../en/faq/operations/delete-old-data.md
\ No newline at end of file
diff --git a/docs/zh/faq/operations/index.md b/docs/zh/faq/operations/index.md
new file mode 120000
index 00000000000..fd141164fdc
--- /dev/null
+++ b/docs/zh/faq/operations/index.md
@@ -0,0 +1 @@
+../../../en/faq/operations/index.md
\ No newline at end of file
diff --git a/docs/zh/faq/operations/production.md b/docs/zh/faq/operations/production.md
new file mode 120000
index 00000000000..8203988975c
--- /dev/null
+++ b/docs/zh/faq/operations/production.md
@@ -0,0 +1 @@
+../../../en/faq/operations/production.md
\ No newline at end of file
diff --git a/docs/zh/faq/use-cases/index.md b/docs/zh/faq/use-cases/index.md
new file mode 120000
index 00000000000..cc545acb000
--- /dev/null
+++ b/docs/zh/faq/use-cases/index.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/index.md
\ No newline at end of file
diff --git a/docs/zh/faq/use-cases/key-value.md b/docs/zh/faq/use-cases/key-value.md
new file mode 120000
index 00000000000..63140458d12
--- /dev/null
+++ b/docs/zh/faq/use-cases/key-value.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/key-value.md
\ No newline at end of file
diff --git a/docs/zh/faq/use-cases/time-series.md b/docs/zh/faq/use-cases/time-series.md
new file mode 120000
index 00000000000..55cbcfc243f
--- /dev/null
+++ b/docs/zh/faq/use-cases/time-series.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/time-series.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/amplab-benchmark.md b/docs/zh/getting-started/example-datasets/amplab-benchmark.md
index 22f2735968b..0feb4f7c371 100644
--- a/docs/zh/getting-started/example-datasets/amplab-benchmark.md
+++ b/docs/zh/getting-started/example-datasets/amplab-benchmark.md
@@ -124,4 +124,4 @@ ORDER BY totalRevenue DESC
 LIMIT 1
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/brown-benchmark.md b/docs/zh/getting-started/example-datasets/brown-benchmark.md
new file mode 120000
index 00000000000..1f6e2be14fa
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/brown-benchmark.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/brown-benchmark.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/cell-towers.md b/docs/zh/getting-started/example-datasets/cell-towers.md
new file mode 120000
index 00000000000..899946803d1
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/cell-towers.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/cell-towers.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/criteo.md b/docs/zh/getting-started/example-datasets/criteo.md
index 40ca1b4a781..ecc643bc576 100644
--- a/docs/zh/getting-started/example-datasets/criteo.md
+++ b/docs/zh/getting-started/example-datasets/criteo.md
@@ -76,4 +76,4 @@ INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int
 DROP TABLE criteo_log;
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/github-events.md b/docs/zh/getting-started/example-datasets/github-events.md
new file mode 120000
index 00000000000..c9649c0a61f
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/github-events.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/github-events.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/index.md b/docs/zh/getting-started/example-datasets/index.md
index acd554ca4da..e85796f6e96 100644
--- a/docs/zh/getting-started/example-datasets/index.md
+++ b/docs/zh/getting-started/example-datasets/index.md
@@ -18,4 +18,4 @@ toc_title: "\u5BFC\u8A00"
 -   [New York Taxi Data](../../getting-started/example-datasets/nyc-taxi.md)
 -   [OnTime](../../getting-started/example-datasets/ontime.md)
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/menus.md b/docs/zh/getting-started/example-datasets/menus.md
new file mode 120000
index 00000000000..d82b3198962
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/menus.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/menus.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/nyc-taxi.md b/docs/zh/getting-started/example-datasets/nyc-taxi.md
index 0e4ff67d6e7..048640f8739 100644
--- a/docs/zh/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/zh/getting-started/example-datasets/nyc-taxi.md
@@ -385,4 +385,4 @@ Q4：0.072秒。
 | 3      | 0.212 | 0.438 | 0.733 | 1.241 |
 | 140    | 0.028 | 0.043 | 0.051 | 0.072 |
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/ontime.md b/docs/zh/getting-started/example-datasets/ontime.md
index 6d888b2196c..897712f195d 100644
--- a/docs/zh/getting-started/example-datasets/ontime.md
+++ b/docs/zh/getting-started/example-datasets/ontime.md
@@ -408,4 +408,4 @@ LIMIT 10;
 -   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
 -   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/opensky.md b/docs/zh/getting-started/example-datasets/opensky.md
new file mode 120000
index 00000000000..4305c0cac3c
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/opensky.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/opensky.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/recipes.md b/docs/zh/getting-started/example-datasets/recipes.md
new file mode 120000
index 00000000000..4fdaa5de5b8
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/recipes.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/recipes.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/star-schema.md b/docs/zh/getting-started/example-datasets/star-schema.md
index 563b7922238..aa2c259d6ad 100644
--- a/docs/zh/getting-started/example-datasets/star-schema.md
+++ b/docs/zh/getting-started/example-datasets/star-schema.md
@@ -365,4 +365,4 @@ ORDER BY
     P_BRAND ASC;
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/uk-price-paid.md b/docs/zh/getting-started/example-datasets/uk-price-paid.md
new file mode 120000
index 00000000000..e48bcf21d7b
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/uk-price-paid.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/uk-price-paid.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/wikistat.md b/docs/zh/getting-started/example-datasets/wikistat.md
index 4320d6b4926..b91b254fcf5 100644
--- a/docs/zh/getting-started/example-datasets/wikistat.md
+++ b/docs/zh/getting-started/example-datasets/wikistat.md
@@ -30,4 +30,4 @@ $ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/page
 $ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/zh/getting-started/index.md b/docs/zh/getting-started/index.md
index c5ec7ded932..f5ce4cbf3b7 100644
--- a/docs/zh/getting-started/index.md
+++ b/docs/zh/getting-started/index.md
@@ -15,4 +15,4 @@ toc_priority: 2
 -   [示例数据集-航班飞行数据](example-datasets/ontime.md) 示例数据，提供了常用的SQL查询场景
 
 
-[来源文章](https://clickhouse.tech/docs/zh/getting_started/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/getting_started/) <!--hide-->
diff --git a/docs/zh/getting-started/install.md b/docs/zh/getting-started/install.md
index 51d6ed198fa..27ed0a40a12 100644
--- a/docs/zh/getting-started/install.md
+++ b/docs/zh/getting-started/install.md
@@ -183,6 +183,6 @@ SELECT 1
 
 **恭喜，系统已经工作了!**
 
-为了继续进行实验，你可以尝试下载测试数据集或查看[教程](https://clickhouse.tech/tutorial.html)。
+为了继续进行实验，你可以尝试下载测试数据集或查看[教程](https://clickhouse.com/tutorial.html)。
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/install/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/install/) <!--hide-->
diff --git a/docs/zh/getting-started/tutorial.md b/docs/zh/getting-started/tutorial.md
index 902064936f5..5f2415e73a5 100644
--- a/docs/zh/getting-started/tutorial.md
+++ b/docs/zh/getting-started/tutorial.md
@@ -659,4 +659,4 @@ INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 
 复制在多主机模式下运行。数据可以加载到任何副本中，然后系统自动将其与其他实例同步。复制是异步的，因此在给定时刻，并非所有副本都可能包含最近插入的数据。至少应该有一个副本允许数据摄入。另一些则会在重新激活后同步数据并修复一致性。请注意，这种方法允许最近插入的数据丢失的可能性很低。
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/zh/guides/apply-catboost-model.md b/docs/zh/guides/apply-catboost-model.md
index ad325dc29db..72f5fa38e84 100644
--- a/docs/zh/guides/apply-catboost-model.md
+++ b/docs/zh/guides/apply-catboost-model.md
@@ -240,4 +240,4 @@ FROM
 !!! note "注"
     查看函数说明 [avg()](../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) 和 [log()](../sql-reference/functions/math-functions.md) 。
 
-[原始文章](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/zh/guides/index.md b/docs/zh/guides/index.md
index 54cb4e1055c..b8b4e7e2d51 100644
--- a/docs/zh/guides/index.md
+++ b/docs/zh/guides/index.md
@@ -13,4 +13,4 @@ toc_title: "\u6982\u8FF0"
 -   [关于简单集群设置的教程](../getting-started/tutorial.md)
 -   [在ClickHouse中应用CatBoost模型](apply-catboost-model.md)
 
-[原始文章](https://clickhouse.tech/docs/en/guides/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/guides/) <!--hide-->
diff --git a/docs/zh/index.md b/docs/zh/index.md
index fb473020f22..8f545b49f13 100644
--- a/docs/zh/index.md
+++ b/docs/zh/index.md
@@ -87,4 +87,4 @@ ClickHouse是一个用于联机分析(OLAP)的列式数据库管理系统(DBMS)
 
 请注意，为了提高CPU效率，查询语言必须是声明型的(SQL或MDX)， 或者至少一个向量(J，K)。 查询应该只包含隐式循环，允许进行优化。
 
-[来源文章](https://clickhouse.tech/docs/zh/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/) <!--hide-->
diff --git a/docs/zh/interfaces/cli.md b/docs/zh/interfaces/cli.md
index 3e15e8547cc..f4ae48cd425 100644
--- a/docs/zh/interfaces/cli.md
+++ b/docs/zh/interfaces/cli.md
@@ -147,4 +147,4 @@ $ clickhouse-client --param_tuple_in_tuple="(10, ('dt', 10))" -q "SELECT * FROM
 </config>
 ```
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/cli/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/cli/) <!--hide-->
diff --git a/docs/zh/interfaces/cpp.md b/docs/zh/interfaces/cpp.md
index 5c88442c2ec..5fd2bc00b67 100644
--- a/docs/zh/interfaces/cpp.md
+++ b/docs/zh/interfaces/cpp.md
@@ -7,4 +7,4 @@ toc_title: C++客户端库
 
 请参考仓库的描述文件[clickhouse-cpp](https://github.com/ClickHouse/clickhouse-cpp)。
 
-[原始文章](https://clickhouse.tech/docs/zh/interfaces/cpp/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/interfaces/cpp/) <!--hide-->
diff --git a/docs/zh/interfaces/formats.md b/docs/zh/interfaces/formats.md
index 6f95c287068..85af2abda6b 100644
--- a/docs/zh/interfaces/formats.md
+++ b/docs/zh/interfaces/formats.md
@@ -23,7 +23,6 @@ ClickHouse可以接受和返回各种格式的数据。受支持的输入格式
 | [CustomSeparated](#format-customseparated)                                              | ✔     | ✔      |
 | [Values](#data-format-values)                                                           | ✔     | ✔      |
 | [Vertical](#vertical)                                                                   | ✗     | ✔      |
-| [VerticalRaw](#verticalraw)                                                             | ✗     | ✔      |
 | [JSON](#json)                                                                           | ✗     | ✔      |
 | [JSONAsString](#jsonasstring)                                                           | ✔     | ✗      |
 | [JSONStrings](#jsonstrings)                                                               | ✗     | ✔      |
@@ -128,9 +127,9 @@ world
 
 数组用方括号包裹、逗号分隔的形式表示(例如`[11,22,33]`)。数组中的数字项按上述规则进行格式化。`日期`和`日期时间`类型用单引号包裹。字符串用单引号包裹，遵循上述转义规则。
 
-[NULL](https://clickhouse.tech/docs/zh/sql-reference/syntax/)将输出为`\N`。
+[NULL](https://clickhouse.com/docs/zh/sql-reference/syntax/)将输出为`\N`。
 
-[Nested](https://clickhouse.tech/docs/zh/sql-reference/data-types/nested-data-structures/nested/)结构的每个元素都表示为数组。
+[Nested](https://clickhouse.com/docs/zh/sql-reference/data-types/nested-data-structures/nested/)结构的每个元素都表示为数组。
 
 示例：
 
@@ -932,7 +931,7 @@ FixedString 被简单地表示为字节序列。
 
 这是 `INSERT INTO t VALUES ...` 中可以使用的格式，但您也可以将其用于查询结果。
 
-另见：[input_format_values_interpret_expressions](https://clickhouse.tech/docs/en/operations/settings/settings/#settings-input_format_values_interpret_expressions)和[input_format_values_deduce_templates_of_expressions](https://clickhouse.tech/docs/en/operations/settings/settings/#settings-input_format_values_deduce_templates_of_expressions)。
+另见：[input_format_values_interpret_expressions](https://clickhouse.com/docs/en/operations/settings/settings/#settings-input_format_values_interpret_expressions)和[input_format_values_deduce_templates_of_expressions](https://clickhouse.com/docs/en/operations/settings/settings/#settings-input_format_values_deduce_templates_of_expressions)。
 
 ## Vertical {#vertical}
 
@@ -951,31 +950,6 @@ SELECT * FROM t_null FORMAT Vertical
 
 该格式仅适用于输出查询结果，但不适用于解析输入(将数据插入到表中)。
 
-## VerticalRaw {#verticalraw}
-
-和 `Vertical` 格式不同点在于，行是不会被转义的。
-这种格式仅仅适用于输出，但不适用于解析输入(将数据插入到表中)。
-
-示例:
-
-    :) SHOW CREATE TABLE geonames FORMAT VerticalRaw;
-    Row 1:
-    ──────
-    statement: CREATE TABLE default.geonames ( geonameid UInt32, date Date DEFAULT CAST('2017-12-08' AS Date)) ENGINE = MergeTree(date, geonameid, 8192)
-
-    :) SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT VerticalRaw;
-    Row 1:
-    ──────
-    test: string with 'quotes' and   with some special
-     characters
-
-和 Vertical 格式相比：
-
-    :) SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT Vertical;
-    Row 1:
-    ──────
-    test: string with \'quotes\' and \t with some special \n characters
-
 ## XML {#xml}
 
 该格式仅适用于输出查询结果，但不适用于解析输入，示例：
@@ -1351,7 +1325,7 @@ $ clickhouse-client --query="SELECT * FROM {some_table} FORMAT ORC" > {filename.
 要与Hadoop交换数据，您可以使用 [HDFS表引擎](../engines/table-engines/integrations/hdfs.md).
 
 ## LineAsString {#lineasstring}
-这种格式下，每行输入数据都会当做一个字符串。这种格式仅适用于仅有一列[String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)类型的列的表。其余列必须设置为[DEFAULT](https://clickhouse.tech/docs/en/sql-reference/statements/create/table/#default)、[MATERIALIZED](https://clickhouse.tech/docs/en/sql-reference/statements/create/table/#materialized)或者被忽略。
+这种格式下，每行输入数据都会当做一个字符串。这种格式仅适用于仅有一列[String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)类型的列的表。其余列必须设置为[DEFAULT](https://clickhouse.com/docs/en/sql-reference/statements/create/table/#default)、[MATERIALIZED](https://clickhouse.com/docs/en/sql-reference/statements/create/table/#materialized)或者被忽略。
 
 ### 示例：
 查询如下：
@@ -1370,14 +1344,14 @@ SELECT * FROM line_as_string;
 ## Regexp {#regexp}
 每一列输入数据根据正则表达式解析。使用`Regexp`格式时，可以使用如下设置：
 
--  `format_regexp`，[String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)类型。包含[re2](https://github.com/google/re2/wiki/Syntax)格式的正则表达式。
-- `format_regexp_escaping_rule`，[String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)类型。支持如下转义规则：
-  - CSV(规则相同于[CSV](https://clickhouse.tech/docs/zh/interfaces/formats/#csv))
-  - JSON(相同于[JSONEachRow](https://clickhouse.tech/docs/zh/interfaces/formats/#jsoneachrow))
-  - Escaped(相同于[TSV](https://clickhouse.tech/docs/zh/interfaces/formats/#tabseparated))
-  - Quoted(相同于[Values](https://clickhouse.tech/docs/zh/interfaces/formats/#data-format-values))
+-  `format_regexp`，[String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)类型。包含[re2](https://github.com/google/re2/wiki/Syntax)格式的正则表达式。
+- `format_regexp_escaping_rule`，[String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)类型。支持如下转义规则：
+  - CSV(规则相同于[CSV](https://clickhouse.com/docs/zh/interfaces/formats/#csv))
+  - JSON(相同于[JSONEachRow](https://clickhouse.com/docs/zh/interfaces/formats/#jsoneachrow))
+  - Escaped(相同于[TSV](https://clickhouse.com/docs/zh/interfaces/formats/#tabseparated))
+  - Quoted(相同于[Values](https://clickhouse.com/docs/zh/interfaces/formats/#data-format-values))
   - Raw(将整个子匹配项进行提取，不转义)
-- `format_regexp_skip_unmatched`，[UInt8](https://clickhouse.tech/docs/zh/sql-reference/data-types/int-uint/)类型。当`format_regexp`表达式没有匹配到结果时是否抛出异常。可为0或1。
+- `format_regexp_skip_unmatched`，[UInt8](https://clickhouse.com/docs/zh/sql-reference/data-types/int-uint/)类型。当`format_regexp`表达式没有匹配到结果时是否抛出异常。可为0或1。
 
 ### 用法 {#usage-1}
 `format_regexp`设置会应用于每一行输入数据。正则表达式的子匹配项数必须等于输入数据期望得到的列数。
@@ -1417,7 +1391,7 @@ SELECT * FROM imp_regex_table;
 
 ## RawBLOB {#rawblob}
 这种格式下，所有输入数据视为一个值。该格式仅适用于仅有一String类型的列的表。输出时，使用二进制格式输出。当输出结果不唯一时，输出是有歧义的，并且不能通过该输出还原原数据。
-下面是`RawBLOB`与[TabSeparatedRaw](https://clickhouse.tech/docs/zh/interfaces/formats/#tabseparatedraw)的对比：
+下面是`RawBLOB`与[TabSeparatedRaw](https://clickhouse.com/docs/zh/interfaces/formats/#tabseparatedraw)的对比：
 
 `RawBloB`:
 
@@ -1431,7 +1405,7 @@ SELECT * FROM imp_regex_table;
 - 每行的值通过制表符分隔。
 - 每行最后的值得后面有换行符。
 
-下面是`RawBLOB`与[RowBinary](https://clickhouse.tech/docs/zh/interfaces/formats/#rowbinary)的对比：
+下面是`RawBLOB`与[RowBinary](https://clickhouse.com/docs/zh/interfaces/formats/#rowbinary)的对比：
 
 `RawBloB`:
 
@@ -1462,8 +1436,8 @@ f9725a22f9191e064120d718e26862a9  -
 格式架构为架构文件名和此文件中消息类型的组合，用冒号分隔,例如 `schemafile.proto:MessageType`.
 如果文件具有格式的标准扩展名(例如, `Protobuf`格式的架构文件标准扩展名为`.proto`),它可以被省略，在这种情况下，格式模式如下所示 `schemafile:MessageType`.
 
-如果您通过[Client](../interfaces/cli.md) 在 [交互模式](https://clickhouse.tech/docs/zh/interfaces/cli/#cli_usage)下输入或输出数据，格式架构中指定的文件名可以使用绝对路径或客户端当前目录的相对路径。
-如果在[批处理模式](https://clickhouse.tech/docs/zh/interfaces/cli/#cli_usage)下使用客户端，则由于安全原因，架构的路径必须使用相对路径。
+如果您通过[Client](../interfaces/cli.md) 在 [交互模式](https://clickhouse.com/docs/zh/interfaces/cli/#cli_usage)下输入或输出数据，格式架构中指定的文件名可以使用绝对路径或客户端当前目录的相对路径。
+如果在[批处理模式](https://clickhouse.com/docs/zh/interfaces/cli/#cli_usage)下使用客户端，则由于安全原因，架构的路径必须使用相对路径。
 
 如果您通过 HTTP接口](../interfaces/http.md)输入或输出数据，格式架构中指定的文件名应该位于服务器设置的[format_schema_path](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-format_schema_path)指定的目录中。
 
@@ -1479,4 +1453,4 @@ f9725a22f9191e064120d718e26862a9  -
 
 
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/formats/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/formats/) <!--hide-->
diff --git a/docs/zh/interfaces/http.md b/docs/zh/interfaces/http.md
index 8ab54293b32..cdce4f2f2e7 100644
--- a/docs/zh/interfaces/http.md
+++ b/docs/zh/interfaces/http.md
@@ -624,4 +624,4 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 * Connection #0 to host localhost left intact
 ```
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/http_interface/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/http_interface/) <!--hide-->
diff --git a/docs/zh/interfaces/index.md b/docs/zh/interfaces/index.md
index 4bc14539896..aa884064abd 100644
--- a/docs/zh/interfaces/index.md
+++ b/docs/zh/interfaces/index.md
@@ -24,4 +24,4 @@ ClickHouse提供了两个网络接口(两个都可以选择包装在TLS中以增
 -   [第三方集成库](../interfaces/third-party/integrations.md)
 -   [可视化UI](../interfaces/third-party/gui.md)
 
-[来源文章](https://clickhouse.tech/docs/en/interfaces/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/interfaces/) <!--hide-->
diff --git a/docs/zh/interfaces/jdbc.md b/docs/zh/interfaces/jdbc.md
index 87d006fe932..ed2fad24714 100644
--- a/docs/zh/interfaces/jdbc.md
+++ b/docs/zh/interfaces/jdbc.md
@@ -10,4 +10,4 @@ toc_title: JDBC驱动
     -   [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
     -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/jdbc/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/jdbc/) <!--hide-->
diff --git a/docs/zh/interfaces/mysql.md b/docs/zh/interfaces/mysql.md
index fa9fc0053a6..c8f24b40f81 100644
--- a/docs/zh/interfaces/mysql.md
+++ b/docs/zh/interfaces/mysql.md
@@ -44,4 +44,4 @@ mysql>
 
 -   某些数据类型以字符串形式发送
 
-[原始文章](https://clickhouse.tech/docs/en/interfaces/mysql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/interfaces/mysql/) <!--hide-->
diff --git a/docs/zh/interfaces/odbc.md b/docs/zh/interfaces/odbc.md
index d0e38f96609..89ba1e30c6a 100644
--- a/docs/zh/interfaces/odbc.md
+++ b/docs/zh/interfaces/odbc.md
@@ -7,4 +7,4 @@ toc_title: ODBC驱动
 
 -   [官方驱动](https://github.com/ClickHouse/clickhouse-odbc)。
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/odbc/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/odbc/) <!--hide-->
diff --git a/docs/zh/interfaces/tcp.md b/docs/zh/interfaces/tcp.md
index 571fd22b758..b43af0e533e 100644
--- a/docs/zh/interfaces/tcp.md
+++ b/docs/zh/interfaces/tcp.md
@@ -7,4 +7,4 @@ toc_title: 原生接口(TCP)
 
 原生接口协议用于[命令行客户端](cli.md)，用于分布式查询处理期间的服务器间通信，以及其他C++ 程序。不幸的是，原生ClickHouse协议还没有正式的规范，但它可以从ClickHouse源代码[从这里开始](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client)或通过拦截和分析TCP流量进行逆向工程。
 
-[原文](https://clickhouse.tech/docs/en/interfaces/tcp/) <!--hide-->
+[原文](https://clickhouse.com/docs/en/interfaces/tcp/) <!--hide-->
diff --git a/docs/zh/interfaces/third-party/client-libraries.md b/docs/zh/interfaces/third-party/client-libraries.md
index e2412f2b8de..3136b928e7b 100644
--- a/docs/zh/interfaces/third-party/client-libraries.md
+++ b/docs/zh/interfaces/third-party/client-libraries.md
@@ -64,4 +64,4 @@ Yandex**没有**维护下面列出的库，也没有做过任何广泛的测试
 -   Haskell
     -   [hdbc-clickhouse](https://github.com/zaneli/hdbc-clickhouse)
 
-[来源文章](https://clickhouse.tech/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/zh/interfaces/third-party/gui.md b/docs/zh/interfaces/third-party/gui.md
index fac6baed6c2..8afd5832e3b 100644
--- a/docs/zh/interfaces/third-party/gui.md
+++ b/docs/zh/interfaces/third-party/gui.md
@@ -72,6 +72,22 @@ ClickHouse Web 界面 [Tabix](https://github.com/tabixio/tabix).
 
     [clickhouse-flamegraph](https://github.com/Slach/clickhouse-flamegraph) 是一个可视化的专业工具`system.trace_log`如[flamegraph](http://www.brendangregg.com/flamegraphs.html).
 
+### DBM {#dbm}
+
+[DBM](https://dbm.incubator.edurt.io/) DBM是一款ClickHouse可视化管理工具!
+
+特征：
+
+-   支持查询历史（分页、全部清除等）
+-   支持选中的sql子句查询(多窗口等)
+-   支持终止查询
+-   支持表管理
+-   支持数据库管理
+-   支持自定义查询
+-   支持多数据源管理（连接测试、监控）
+-   支持监控（处理进程、连接、查询）
+-   支持迁移数据
+
 ## 商业 {#shang-ye}
 
 ### Holistics {#holistics-software}
@@ -99,20 +115,4 @@ ClickHouse Web 界面 [Tabix](https://github.com/tabixio/tabix).
 -   重构。
 -   搜索和导航。
 
-### DBM {#dbm}
-
-[DBM](https://dbm.incubator.edurt.io/) DBM是一款ClickHouse可视化管理工具!
-
-特征：
-
--   支持查询历史（分页、全部清除等）
--   支持选中的sql子句查询(多窗口等)
--   支持终止查询
--   支持表管理
--   支持数据库管理
--   支持自定义查询
--   支持多数据源管理（连接测试、监控）
--   支持监控（处理进程、连接、查询）
--   支持迁移数据
-
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/third-party/gui/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/zh/interfaces/third-party/integrations.md b/docs/zh/interfaces/third-party/integrations.md
index 20dcf47cabd..9908a364c5f 100644
--- a/docs/zh/interfaces/third-party/integrations.md
+++ b/docs/zh/interfaces/third-party/integrations.md
@@ -105,4 +105,4 @@ Yandex**没有**维护下面列出的库，也没有做过任何广泛的测试
     -   [GraphQL](https://github.com/graphql)
         -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
 
-[源文章](https://clickhouse.tech/docs/en/interfaces/third-party/integrations/) <!--hide-->
+[源文章](https://clickhouse.com/docs/en/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/zh/interfaces/third-party/proxy.md b/docs/zh/interfaces/third-party/proxy.md
index a2050863f30..034657a70d2 100644
--- a/docs/zh/interfaces/third-party/proxy.md
+++ b/docs/zh/interfaces/third-party/proxy.md
@@ -41,4 +41,4 @@ toc_title: 第三方代理
 
 使用go语言实现。
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/proxy/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/zh/introduction/adopters.md b/docs/zh/introduction/adopters.md
index 6b9ac7c2ceb..10c3ee697d9 100644
--- a/docs/zh/introduction/adopters.md
+++ b/docs/zh/introduction/adopters.md
@@ -35,7 +35,7 @@ toc_title: "ClickHouse用户"
 | [Exness](https://www.exness.com)                                | 交易             | 指标，日志记录 | —                                                 | —                                                                    | [俄语交谈，2019年5月](https://youtu.be/_rpU-TvSfZ8?t=3215)                                                                                                                                                        |
 | [精灵](https://geniee.co.jp)                                    | 广告网络         | 主要产品       | —                                                 | —                                                                    | [日文博客，2017年7月](https://tech.geniee.co.jp/entry/2017/07/20/160100)                                                                                                                                          |
 | [虎牙](https://www.huya.com/)                                   | 视频流           | 分析           | —                                                 | —                                                                    | [中文幻灯片，2018年10月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf)                                               |
-| [Idealista](https://www.idealista.com)                          | 房地产           | 分析           | —                                                 | —                                                                    | [英文博客文章,四月2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                            |
+| [Idealista](https://www.idealista.com)                          | 房地产           | 分析           | —                                                 | —                                                                    | [英文博客文章,四月2019](https://clickhouse.com/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                            |
 | [Infovista](https://www.infovista.com/)                         | 网络             | 分析           | —                                                 | —                                                                    | [英文幻灯片，十月2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf)                                                                                                 |
 | [InnoGames](https://www.innogames.com)                          | 游戏             | 指标，日志记录 | —                                                 | —                                                                    | [俄文幻灯片，2019年9月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf)                                                                                  |
 | [Integros](https://integros.com)                                | 视频服务平台     | 分析           | —                                                 | —                                                                    | [俄文幻灯片，2019年5月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                               |
@@ -82,4 +82,4 @@ toc_title: "ClickHouse用户"
 | [Crazypanda](https://crazypanda.ru/en/)                         | 游戏             |                | —                                                 | —                                                                    | ClickHouse 社区会议                                                                                                                                                                                               |
 | [FunCorp](https://fun.co/rp)                                    | 游戏             |                | —                                                 | —                                                                    | [文章](https://www.altinity.com/blog/migrating-from-redshift-to-clickhouse)                                                                                                                                       |
 
-[原始文章](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/zh/introduction/distinctive-features.md b/docs/zh/introduction/distinctive-features.md
index f74c98a0c1d..35d46163860 100644
--- a/docs/zh/introduction/distinctive-features.md
+++ b/docs/zh/introduction/distinctive-features.md
@@ -86,4 +86,4 @@ ClickHouse使用SQL查询实现用户帐户管理，并允许[角色的访问控
 2.  缺少高频率，低延迟的修改或删除已存在数据的能力。仅能用于批量删除或修改数据，但这符合 [GDPR](https://gdpr-info.eu)。
 3.  稀疏索引使得ClickHouse不适合通过其键检索单行的点查询。
 
-[来源文章](https://clickhouse.tech/docs/en/introduction/distinctive_features/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/introduction/distinctive_features/) <!--hide-->
diff --git a/docs/zh/introduction/history.md b/docs/zh/introduction/history.md
index 265ade8785b..95d7b1ddc96 100644
--- a/docs/zh/introduction/history.md
+++ b/docs/zh/introduction/history.md
@@ -51,4 +51,4 @@ OLAPServer可以很好的工作在非聚合数据上，但是它有诸多限制
 
 为了消除OLAPServer的这些局限性，解决所有报表使用非聚合数据的问题，我们开发了ClickHouse数据库管理系统。
 
-[来源文章](https://clickhouse.tech/docs/en/introduction/ya_metrika_task/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/introduction/ya_metrika_task/) <!--hide-->
diff --git a/docs/zh/introduction/performance.md b/docs/zh/introduction/performance.md
index 0ae4b9b1e1e..67ad8768205 100644
--- a/docs/zh/introduction/performance.md
+++ b/docs/zh/introduction/performance.md
@@ -5,9 +5,9 @@ toc_title: ClickHouse性能
 
 # 性能 {#performance}
 
-根据Yandex的内部测试结果，ClickHouse表现出了比同类可比较产品更优的性能。你可以在 [这里](https://clickhouse.tech/benchmark/dbms/) 查看具体的测试结果。
+根据Yandex的内部测试结果，ClickHouse表现出了比同类可比较产品更优的性能。你可以在 [这里](https://clickhouse.com/benchmark/dbms/) 查看具体的测试结果。
 
-许多其他的测试也证实这一点。你可以使用互联网搜索到它们，或者你也可以从 [我们收集的部分相关连接](https://clickhouse.tech/#independent-benchmarks) 中查看。
+许多其他的测试也证实这一点。你可以使用互联网搜索到它们，或者你也可以从 [我们收集的部分相关连接](https://clickhouse.com/#independent-benchmarks) 中查看。
 
 ## 单个大查询的吞吐量 {#dan-ge-da-cha-xun-de-tun-tu-liang}
 
@@ -27,4 +27,4 @@ toc_title: ClickHouse性能
 
 我们建议每次写入不少于1000行的批量写入，或每秒不超过一个写入请求。当使用tab-separated格式将一份数据写入到MergeTree表中时，写入速度大约为50到200MB/s。如果您写入的数据每行为1Kb，那么写入的速度为50，000到200，000行每秒。如果您的行更小，那么写入速度将更高。为了提高写入性能，您可以使用多个INSERT进行并行写入，这将带来线性的性能提升。
 
-[来源文章](https://clickhouse.tech/docs/en/introduction/performance/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/introduction/performance/) <!--hide-->
diff --git a/docs/zh/operations/access-rights.md b/docs/zh/operations/access-rights.md
index 97841699d09..ab8b3886a9a 100644
--- a/docs/zh/operations/access-rights.md
+++ b/docs/zh/operations/access-rights.md
@@ -143,4 +143,4 @@ Management queries:
      默认情况，SQL驱动方式的访问权限和账户管理对所有用户都是关闭的。你需要在 `users.xml` 中配置至少一个用户，并且把[权限管理](settings/settings-users.md#access_management-user-setting)的值设置为1。
 
 
-[Original article](https://clickhouse.tech/docs/en/operations/access_rights/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/access_rights/) <!--hide-->
diff --git a/docs/zh/operations/backup.md b/docs/zh/operations/backup.md
index dbaafc8b8a7..165ecdf2a9b 100644
--- a/docs/zh/operations/backup.md
+++ b/docs/zh/operations/backup.md
@@ -38,4 +38,4 @@ ClickHouse允许使用 `ALTER TABLE ... FREEZE PARTITION ...` 查询以创建表
 
 第三方工具可用于自动化此方法: [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup).
 
-[原始文章](https://clickhouse.tech/docs/en/operations/backup/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/zh/operations/caches.md b/docs/zh/operations/caches.md
new file mode 120000
index 00000000000..ab229298e5f
--- /dev/null
+++ b/docs/zh/operations/caches.md
@@ -0,0 +1 @@
+../../en/operations/caches.md
\ No newline at end of file
diff --git a/docs/zh/operations/clickhouse-keeper.md b/docs/zh/operations/clickhouse-keeper.md
new file mode 120000
index 00000000000..528ba82fea4
--- /dev/null
+++ b/docs/zh/operations/clickhouse-keeper.md
@@ -0,0 +1 @@
+../../en/operations/clickhouse-keeper.md
\ No newline at end of file
diff --git a/docs/zh/operations/configuration-files.md b/docs/zh/operations/configuration-files.md
index ae760ee2d5d..9bb13997c31 100644
--- a/docs/zh/operations/configuration-files.md
+++ b/docs/zh/operations/configuration-files.md
@@ -44,4 +44,4 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 
 服务器跟踪配置文件中的更改，以及执行替换和复盖时使用的文件和ZooKeeper节点，并动态重新加载用户和集群的设置。 这意味着您可以在不重新启动服务器的情况下修改群集、用户及其设置。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/configuration_files/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/configuration_files/) <!--hide-->
diff --git a/docs/zh/operations/external-authenticators/index.md b/docs/zh/operations/external-authenticators/index.md
new file mode 120000
index 00000000000..5f656246c9d
--- /dev/null
+++ b/docs/zh/operations/external-authenticators/index.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/index.md
\ No newline at end of file
diff --git a/docs/zh/operations/external-authenticators/kerberos.md b/docs/zh/operations/external-authenticators/kerberos.md
new file mode 120000
index 00000000000..b5a4d557de4
--- /dev/null
+++ b/docs/zh/operations/external-authenticators/kerberos.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/kerberos.md
\ No newline at end of file
diff --git a/docs/zh/operations/external-authenticators/ldap.md b/docs/zh/operations/external-authenticators/ldap.md
new file mode 120000
index 00000000000..a171d0ac05a
--- /dev/null
+++ b/docs/zh/operations/external-authenticators/ldap.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/ldap.md
\ No newline at end of file
diff --git a/docs/zh/operations/index.md b/docs/zh/operations/index.md
index 5139f083ceb..c3f55ac2a11 100644
--- a/docs/zh/operations/index.md
+++ b/docs/zh/operations/index.md
@@ -22,4 +22,4 @@ ClickHouse操作手册由以下主要部分组成：
 -   [设置](../operations/settings/index.md)
 -   [实用工具](../operations/utilities/index.md)
 
-[原文](https://clickhouse.tech/docs/en/operations/) <!--hide-->
+[原文](https://clickhouse.com/docs/en/operations/) <!--hide-->
diff --git a/docs/zh/operations/opentelemetry.md b/docs/zh/operations/opentelemetry.md
new file mode 120000
index 00000000000..a4d96e36a4e
--- /dev/null
+++ b/docs/zh/operations/opentelemetry.md
@@ -0,0 +1 @@
+../../en/operations/opentelemetry.md
\ No newline at end of file
diff --git a/docs/zh/operations/quotas.md b/docs/zh/operations/quotas.md
index 21405ae106f..6bbaf0cb6fd 100644
--- a/docs/zh/operations/quotas.md
+++ b/docs/zh/operations/quotas.md
@@ -102,4 +102,4 @@ For distributed query processing, the accumulated amounts are stored on the requ
 
 服务器重新启动时，将重置配额。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/quotas/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/quotas/) <!--hide-->
diff --git a/docs/zh/operations/server-configuration-parameters/index.md b/docs/zh/operations/server-configuration-parameters/index.md
index 82e698055fa..38ee76ee05d 100644
--- a/docs/zh/operations/server-configuration-parameters/index.md
+++ b/docs/zh/operations/server-configuration-parameters/index.md
@@ -8,4 +8,4 @@ Other settings are described in the «[设置](../settings/index.md#settings)»
 
 在研究设置之前，请阅读 [配置文件](../configuration-files.md#configuration_files) 部分和注意使用替换（的 `incl` 和 `optional` 属性）。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/zh/operations/server-configuration-parameters/settings.md b/docs/zh/operations/server-configuration-parameters/settings.md
index 84d4f601fb0..d31dd5da805 100644
--- a/docs/zh/operations/server-configuration-parameters/settings.md
+++ b/docs/zh/operations/server-configuration-parameters/settings.md
@@ -867,4 +867,4 @@ ZooKeeper中数据部分头的存储方法。
 
 **默认值**: 15.
 
-[原始文章](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/zh/operations/settings/constraints-on-settings.md b/docs/zh/operations/settings/constraints-on-settings.md
index 3b499199fa5..8fb83505e1b 100644
--- a/docs/zh/operations/settings/constraints-on-settings.md
+++ b/docs/zh/operations/settings/constraints-on-settings.md
@@ -72,4 +72,4 @@ Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should n
 
 **注:** 该 `default` 配置文件具有特殊的处理：所有定义的约束 `default` 配置文件成为默认约束，因此它们限制所有用户，直到为这些用户显式复盖它们。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/zh/operations/settings/index.md b/docs/zh/operations/settings/index.md
index 3528be0c641..38ce4c345e5 100644
--- a/docs/zh/operations/settings/index.md
+++ b/docs/zh/operations/settings/index.md
@@ -26,4 +26,4 @@ toc_folder_title: "\u8BBE\u7F6E"
 
 本节不介绍只能在服务器配置文件中进行的设置。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/) <!--hide-->
diff --git a/docs/zh/operations/settings/merge-tree-settings.md b/docs/zh/operations/settings/merge-tree-settings.md
new file mode 120000
index 00000000000..51825e80601
--- /dev/null
+++ b/docs/zh/operations/settings/merge-tree-settings.md
@@ -0,0 +1 @@
+../../../en/operations/settings/merge-tree-settings.md
\ No newline at end of file
diff --git a/docs/zh/operations/settings/permissions-for-queries.md b/docs/zh/operations/settings/permissions-for-queries.md
index aa7bc8c7937..a72500b76d5 100644
--- a/docs/zh/operations/settings/permissions-for-queries.md
+++ b/docs/zh/operations/settings/permissions-for-queries.md
@@ -58,4 +58,4 @@ ClickHouse中的查询可以分为几种类型:
 
 默认值：1
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/zh/operations/settings/query-complexity.md b/docs/zh/operations/settings/query-complexity.md
index 680d5e001e0..77f4a3729e1 100644
--- a/docs/zh/operations/settings/query-complexity.md
+++ b/docs/zh/operations/settings/query-complexity.md
@@ -254,4 +254,4 @@ Possible values:
 Default value: 0.
 
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/query_complexity/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/zh/operations/settings/settings-profiles.md b/docs/zh/operations/settings/settings-profiles.md
index 8eec30d9fc5..77dff88d50b 100644
--- a/docs/zh/operations/settings/settings-profiles.md
+++ b/docs/zh/operations/settings/settings-profiles.md
@@ -78,4 +78,4 @@ SET profile = 'web'
 
 该 `web` 配置文件是一个常规的配置文件，可以使用设置 `SET` 查询或在HTTP查询中使用URL参数。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/settings_profiles/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/zh/operations/settings/settings-users.md b/docs/zh/operations/settings/settings-users.md
index bb630a43e43..ae75dddab58 100644
--- a/docs/zh/operations/settings/settings-users.md
+++ b/docs/zh/operations/settings/settings-users.md
@@ -161,4 +161,4 @@ DNS请求的所有结果都将被缓存，直到服务器重新启动。
 
 该 `filter` 可以是导致任何表达式 [UInt8](../../sql-reference/data-types/int-uint.md)-键入值。 它通常包含比较和逻辑运算符。 从行 `database_name.table1` 其中，不会为此用户返回为0的筛选结果。 过滤是不兼容的 `PREWHERE` 操作和禁用 `WHERE→PREWHERE` 优化。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/settings_users/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/zh/operations/settings/settings.md b/docs/zh/operations/settings/settings.md
index ef4f4f86d01..f8b736ea7c2 100644
--- a/docs/zh/operations/settings/settings.md
+++ b/docs/zh/operations/settings/settings.md
@@ -1252,7 +1252,7 @@ ClickHouse生成异常
 
 默认值：16。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/settings/) <!-- hide -->
 
 ## transform_null_in {#transform_null_in}
 
diff --git a/docs/zh/operations/storing-data.md b/docs/zh/operations/storing-data.md
new file mode 120000
index 00000000000..16722fb5a39
--- /dev/null
+++ b/docs/zh/operations/storing-data.md
@@ -0,0 +1 @@
+../../en/operations/storing-data.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/clusters.md b/docs/zh/operations/system-tables/clusters.md
index 386bdfd539b..e41aa2dd8fc 100644
--- a/docs/zh/operations/system-tables/clusters.md
+++ b/docs/zh/operations/system-tables/clusters.md
@@ -24,4 +24,4 @@
 -   [distributed_replica_error_cap设置](../../operations/settings/settings.md#settings-distributed_replica_error_cap)
 -   [distributed_replica_error_half_life设置](../../operations/settings/settings.md#settings-distributed_replica_error_half_life)
 
-[原文](https://clickhouse.tech/docs/zh/operations/system-tables/clusters) <!--hide-->
+[原文](https://clickhouse.com/docs/zh/operations/system-tables/clusters) <!--hide-->
diff --git a/docs/zh/operations/system-tables/columns.md b/docs/zh/operations/system-tables/columns.md
index b21be98c0dc..9a90561a07b 100644
--- a/docs/zh/operations/system-tables/columns.md
+++ b/docs/zh/operations/system-tables/columns.md
@@ -26,4 +26,4 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 -   `is_in_primary_key` (UInt8) — Flag that indicates whether the column is in the primary key expression.
 -   `is_in_sampling_key` (UInt8) — Flag that indicates whether the column is in the sampling key expression.
 
-[原文](https://clickhouse.tech/docs/zh/operations/system-tables/columns) <!--hide-->
+[原文](https://clickhouse.com/docs/zh/operations/system-tables/columns) <!--hide-->
diff --git a/docs/zh/operations/system-tables/crash-log.md b/docs/zh/operations/system-tables/crash-log.md
new file mode 120000
index 00000000000..d1aa67601bc
--- /dev/null
+++ b/docs/zh/operations/system-tables/crash-log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/crash-log.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/current-roles.md b/docs/zh/operations/system-tables/current-roles.md
new file mode 120000
index 00000000000..b9f1f9d6e9d
--- /dev/null
+++ b/docs/zh/operations/system-tables/current-roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/current-roles.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/data_skipping_indices.md b/docs/zh/operations/system-tables/data_skipping_indices.md
new file mode 120000
index 00000000000..2820987bf69
--- /dev/null
+++ b/docs/zh/operations/system-tables/data_skipping_indices.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/data_skipping_indices.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/distributed_ddl_queue.md b/docs/zh/operations/system-tables/distributed_ddl_queue.md
new file mode 120000
index 00000000000..a9cadc74af2
--- /dev/null
+++ b/docs/zh/operations/system-tables/distributed_ddl_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/distributed_ddl_queue.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/distribution_queue.md b/docs/zh/operations/system-tables/distribution_queue.md
new file mode 120000
index 00000000000..3831b85000c
--- /dev/null
+++ b/docs/zh/operations/system-tables/distribution_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/distribution_queue.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/enabled-roles.md b/docs/zh/operations/system-tables/enabled-roles.md
new file mode 120000
index 00000000000..04ffee25343
--- /dev/null
+++ b/docs/zh/operations/system-tables/enabled-roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/enabled-roles.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/errors.md b/docs/zh/operations/system-tables/errors.md
new file mode 120000
index 00000000000..2bb8c1dff0d
--- /dev/null
+++ b/docs/zh/operations/system-tables/errors.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/errors.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/grants.md b/docs/zh/operations/system-tables/grants.md
new file mode 120000
index 00000000000..ec7f50b118e
--- /dev/null
+++ b/docs/zh/operations/system-tables/grants.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/grants.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/index.md b/docs/zh/operations/system-tables/index.md
index 0e5778e3051..21e0bccc693 100644
--- a/docs/zh/operations/system-tables/index.md
+++ b/docs/zh/operations/system-tables/index.md
@@ -73,4 +73,4 @@ toc_title: "\u7CFB\u7EDF\u8868"
 -   `OSReadBytes`
 -   `OSWriteBytes`
 
-[原始文章](https://clickhouse.tech/docs/en/operations/system-tables/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/system-tables/) <!--hide-->
diff --git a/docs/zh/operations/system-tables/licenses.md b/docs/zh/operations/system-tables/licenses.md
new file mode 120000
index 00000000000..a84b4bbf3e3
--- /dev/null
+++ b/docs/zh/operations/system-tables/licenses.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/licenses.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/opentelemetry_span_log.md b/docs/zh/operations/system-tables/opentelemetry_span_log.md
new file mode 120000
index 00000000000..59aab8cd11d
--- /dev/null
+++ b/docs/zh/operations/system-tables/opentelemetry_span_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/opentelemetry_span_log.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/parts_columns.md b/docs/zh/operations/system-tables/parts_columns.md
new file mode 120000
index 00000000000..f2c7d4dde34
--- /dev/null
+++ b/docs/zh/operations/system-tables/parts_columns.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/parts_columns.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/query_views_log.md b/docs/zh/operations/system-tables/query_views_log.md
new file mode 120000
index 00000000000..f606e4108ca
--- /dev/null
+++ b/docs/zh/operations/system-tables/query_views_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_views_log.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/quota_limits.md b/docs/zh/operations/system-tables/quota_limits.md
new file mode 120000
index 00000000000..3fecf881c92
--- /dev/null
+++ b/docs/zh/operations/system-tables/quota_limits.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quota_limits.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/quota_usage.md b/docs/zh/operations/system-tables/quota_usage.md
new file mode 120000
index 00000000000..c79f1a75033
--- /dev/null
+++ b/docs/zh/operations/system-tables/quota_usage.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quota_usage.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/quotas.md b/docs/zh/operations/system-tables/quotas.md
new file mode 120000
index 00000000000..b6a26bf77f3
--- /dev/null
+++ b/docs/zh/operations/system-tables/quotas.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quotas.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/quotas_usage.md b/docs/zh/operations/system-tables/quotas_usage.md
new file mode 120000
index 00000000000..ba204a4d9c0
--- /dev/null
+++ b/docs/zh/operations/system-tables/quotas_usage.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quotas_usage.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/replicated_fetches.md b/docs/zh/operations/system-tables/replicated_fetches.md
new file mode 120000
index 00000000000..bf4547ebd07
--- /dev/null
+++ b/docs/zh/operations/system-tables/replicated_fetches.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replicated_fetches.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/replication_queue.md b/docs/zh/operations/system-tables/replication_queue.md
new file mode 120000
index 00000000000..cdc452594e6
--- /dev/null
+++ b/docs/zh/operations/system-tables/replication_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replication_queue.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/role-grants.md b/docs/zh/operations/system-tables/role-grants.md
new file mode 120000
index 00000000000..6a25ffa31ce
--- /dev/null
+++ b/docs/zh/operations/system-tables/role-grants.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/role-grants.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/roles.md b/docs/zh/operations/system-tables/roles.md
new file mode 120000
index 00000000000..391bc980a48
--- /dev/null
+++ b/docs/zh/operations/system-tables/roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/roles.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/row_policies.md b/docs/zh/operations/system-tables/row_policies.md
new file mode 120000
index 00000000000..b194161cf1d
--- /dev/null
+++ b/docs/zh/operations/system-tables/row_policies.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/row_policies.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/settings_profile_elements.md b/docs/zh/operations/system-tables/settings_profile_elements.md
new file mode 120000
index 00000000000..3b0e70ead49
--- /dev/null
+++ b/docs/zh/operations/system-tables/settings_profile_elements.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings_profile_elements.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/settings_profiles.md b/docs/zh/operations/system-tables/settings_profiles.md
new file mode 120000
index 00000000000..1c559bf2445
--- /dev/null
+++ b/docs/zh/operations/system-tables/settings_profiles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings_profiles.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/stack_trace.md b/docs/zh/operations/system-tables/stack_trace.md
new file mode 120000
index 00000000000..8dea20028f1
--- /dev/null
+++ b/docs/zh/operations/system-tables/stack_trace.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/stack_trace.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/tables.md b/docs/zh/operations/system-tables/tables.md
index d82911498ad..6a719a92ca0 100644
--- a/docs/zh/operations/system-tables/tables.md
+++ b/docs/zh/operations/system-tables/tables.md
@@ -55,4 +55,4 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 
 `system.tables` 表被用于 `SHOW TABLES` 的查询实现中。
 
-[原文](https://clickhouse.tech/docs/zh/operations/system-tables/tables) <!--hide-->
+[原文](https://clickhouse.com/docs/zh/operations/system-tables/tables) <!--hide-->
diff --git a/docs/zh/operations/system-tables/time_zones.md b/docs/zh/operations/system-tables/time_zones.md
new file mode 120000
index 00000000000..d7b0f07d326
--- /dev/null
+++ b/docs/zh/operations/system-tables/time_zones.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/time_zones.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/users.md b/docs/zh/operations/system-tables/users.md
new file mode 120000
index 00000000000..540c5ac6620
--- /dev/null
+++ b/docs/zh/operations/system-tables/users.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/users.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/zookeeper.md b/docs/zh/operations/system-tables/zookeeper.md
index c25ce498460..70eedc7294e 100644
--- a/docs/zh/operations/system-tables/zookeeper.md
+++ b/docs/zh/operations/system-tables/zookeeper.md
@@ -77,4 +77,4 @@ numChildren:    7
 pzxid:          987021252247
 path:           /clickhouse/tables/01-08/visits/replicas
 ```
-[原文](https://clickhouse.tech/docs/zh/operations/system-tables/zookeeper) <!--hide-->
+[原文](https://clickhouse.com/docs/zh/operations/system-tables/zookeeper) <!--hide-->
diff --git a/docs/zh/operations/system-tables/zookeeper_log.md b/docs/zh/operations/system-tables/zookeeper_log.md
new file mode 120000
index 00000000000..c7db82e978a
--- /dev/null
+++ b/docs/zh/operations/system-tables/zookeeper_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/zookeeper_log.md
\ No newline at end of file
diff --git a/docs/zh/operations/tips.md b/docs/zh/operations/tips.md
index 6b46dbb5285..a4755086941 100644
--- a/docs/zh/operations/tips.md
+++ b/docs/zh/operations/tips.md
@@ -254,4 +254,4 @@ JAVA_OPTS="-Xms{{ '{{' }} cluster.get('xms','128M') {{ '}}' }} \
             -Dzookeeper.root.logger=${ZOO_LOG4J_PROP} $ZOOMAIN $ZOOCFG
     end script
 
-[原始文章](https://clickhouse.tech/docs/en/operations/tips/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/tips/) <!--hide-->
diff --git a/docs/zh/operations/utilities/clickhouse-compressor.md b/docs/zh/operations/utilities/clickhouse-compressor.md
new file mode 120000
index 00000000000..98b1d8c4c7c
--- /dev/null
+++ b/docs/zh/operations/utilities/clickhouse-compressor.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-compressor.md
\ No newline at end of file
diff --git a/docs/zh/operations/utilities/clickhouse-copier.md b/docs/zh/operations/utilities/clickhouse-copier.md
index 3dc29fe16fa..b68390fce04 100644
--- a/docs/zh/operations/utilities/clickhouse-copier.md
+++ b/docs/zh/operations/utilities/clickhouse-copier.md
@@ -168,4 +168,4 @@ clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --base-
 
 `clickhouse-copier` 跟踪更改 `/task/path/description` 并在飞行中应用它们。 例如，如果你改变的值 `max_workers`，运行任务的进程数也会发生变化。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/zh/operations/utilities/clickhouse-format.md b/docs/zh/operations/utilities/clickhouse-format.md
new file mode 120000
index 00000000000..d71a78cd40b
--- /dev/null
+++ b/docs/zh/operations/utilities/clickhouse-format.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-format.md
\ No newline at end of file
diff --git a/docs/zh/operations/utilities/clickhouse-local.md b/docs/zh/operations/utilities/clickhouse-local.md
index 9b0ae841cd6..93df9b589e9 100644
--- a/docs/zh/operations/utilities/clickhouse-local.md
+++ b/docs/zh/operations/utilities/clickhouse-local.md
@@ -98,4 +98,4 @@ Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ...
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/operations/utils/clickhouse-local/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/zh/operations/utilities/clickhouse-obfuscator.md b/docs/zh/operations/utilities/clickhouse-obfuscator.md
new file mode 120000
index 00000000000..06d1df70693
--- /dev/null
+++ b/docs/zh/operations/utilities/clickhouse-obfuscator.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-obfuscator.md
\ No newline at end of file
diff --git a/docs/zh/operations/utilities/index.md b/docs/zh/operations/utilities/index.md
index 0d60fb8bbb9..ab65922c35c 100644
--- a/docs/zh/operations/utilities/index.md
+++ b/docs/zh/operations/utilities/index.md
@@ -4,4 +4,4 @@
 -   [跨集群复制](clickhouse-copier.md) —  在不同集群间复制数据。
 -   [性能测试](clickhouse-benchmark.md) — 连接到Clickhouse服务器，执行性能测试。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/utils/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/utils/) <!--hide-->
diff --git a/docs/zh/operations/utilities/odbc-bridge.md b/docs/zh/operations/utilities/odbc-bridge.md
new file mode 120000
index 00000000000..c5772389199
--- /dev/null
+++ b/docs/zh/operations/utilities/odbc-bridge.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/odbc-bridge.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/combinators.md b/docs/zh/sql-reference/aggregate-functions/combinators.md
index 6d1cd9c775c..9251e446f9e 100644
--- a/docs/zh/sql-reference/aggregate-functions/combinators.md
+++ b/docs/zh/sql-reference/aggregate-functions/combinators.md
@@ -240,4 +240,4 @@ FROM people
 └────────┴───────────────────────────┘
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/agg_functions/combinators/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/agg_functions/combinators/) <!--hide-->
diff --git a/docs/zh/sql-reference/aggregate-functions/index.md b/docs/zh/sql-reference/aggregate-functions/index.md
index 2344c3e6dc0..ee42517db80 100644
--- a/docs/zh/sql-reference/aggregate-functions/index.md
+++ b/docs/zh/sql-reference/aggregate-functions/index.md
@@ -56,4 +56,4 @@ SELECT groupArray(y) FROM t_null_big
 
 在 `groupArray` 生成的数组中不包括 `NULL`。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/agg_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/agg_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/aggregate-functions/parametric-functions.md b/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
index 468e8e9c76e..5de03d1713b 100644
--- a/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
@@ -495,4 +495,4 @@ FROM
 
 和 [sumMap](./reference/summap.md#agg_functions-summap) 基本一致， 除了一个键数组作为参数传递。这在使用高基数key时尤其有用。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/deltasumtimestamp.md b/docs/zh/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
new file mode 120000
index 00000000000..3720d4f7b98
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/intervalLengthSum.md b/docs/zh/sql-reference/aggregate-functions/reference/intervalLengthSum.md
new file mode 120000
index 00000000000..b69019d0cf2
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/intervalLengthSum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/intervalLengthSum.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/zh/sql-reference/aggregate-functions/reference/quantilebfloat16.md
new file mode 120000
index 00000000000..dd4fd12eb40
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/sumcount.md b/docs/zh/sql-reference/aggregate-functions/reference/sumcount.md
new file mode 120000
index 00000000000..9f0299a5fe7
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/sumcount.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumcount.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/sumkahan.md b/docs/zh/sql-reference/aggregate-functions/reference/sumkahan.md
new file mode 120000
index 00000000000..650f8a34d9d
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/sumkahan.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumkahan.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/uniqthetasketch.md b/docs/zh/sql-reference/aggregate-functions/reference/uniqthetasketch.md
new file mode 120000
index 00000000000..ac61a28677f
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/aggregatefunction.md b/docs/zh/sql-reference/data-types/aggregatefunction.md
index 522ecf1b42d..e6e07b02e11 100644
--- a/docs/zh/sql-reference/data-types/aggregatefunction.md
+++ b/docs/zh/sql-reference/data-types/aggregatefunction.md
@@ -60,4 +60,4 @@ SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP
 
 请参阅 [AggregatingMergeTree](../../sql-reference/data-types/aggregatefunction.md) 的说明
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/date32.md b/docs/zh/sql-reference/data-types/date32.md
new file mode 120000
index 00000000000..2c8eca18107
--- /dev/null
+++ b/docs/zh/sql-reference/data-types/date32.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/date32.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/domains/index.md b/docs/zh/sql-reference/data-types/domains/index.md
index 1bcf8d31998..3bfb3707f53 100644
--- a/docs/zh/sql-reference/data-types/domains/index.md
+++ b/docs/zh/sql-reference/data-types/domains/index.md
@@ -29,6 +29,6 @@ Domain类型是特定实现的类型，它总是与某个现存的基础类型
 -   当从其他列或表插入数据时，无法将string类型的值隐式地转换为Domain类型的值。
 -   无法对存储为Domain类型的值添加约束。
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/domains/overview) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/domains/overview) <!--hide-->
 
 
diff --git a/docs/zh/sql-reference/data-types/domains/ipv4.md b/docs/zh/sql-reference/data-types/domains/ipv4.md
index 9ce12025405..2e027baf9b7 100644
--- a/docs/zh/sql-reference/data-types/domains/ipv4.md
+++ b/docs/zh/sql-reference/data-types/domains/ipv4.md
@@ -24,15 +24,15 @@ CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
 在写入与查询时，`IPv4`类型能够识别可读性更加友好的输入输出格式：
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.com', '183.247.232.58')('https://clickhouse.com/docs/en/', '116.106.34.242');
 
 SELECT * FROM hits;
 ```
 
     ┌─url────────────────────────────────┬───────────from─┐
-    │ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
+    │ https://clickhouse.com/docs/en/ │ 116.106.34.242 │
     │ https://wikipedia.org              │ 116.253.40.133 │
-    │ https://clickhouse.tech          │ 183.247.232.58 │
+    │ https://clickhouse.com          │ 183.247.232.58 │
     └────────────────────────────────────┴────────────────┘
 
 同时它提供更为紧凑的二进制存储格式：
@@ -65,4 +65,4 @@ SELECT toTypeName(i), CAST(from as UInt32) as i FROM hits LIMIT 1;
     │ UInt32                           │ 3086477370 │
     └──────────────────────────────────┴────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/domains/ipv4) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/domains/ipv6.md b/docs/zh/sql-reference/data-types/domains/ipv6.md
index 5b1afc2cd39..6545aa61bc2 100644
--- a/docs/zh/sql-reference/data-types/domains/ipv6.md
+++ b/docs/zh/sql-reference/data-types/domains/ipv6.md
@@ -24,14 +24,14 @@ CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
 在写入与查询时，`IPv6`类型能够识别可读性更加友好的输入输出格式：
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.com', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.com/docs/en/', '2a02:e980:1e::1');
 
 SELECT * FROM hits;
 ```
 
     ┌─url────────────────────────────────┬─from──────────────────────────┐
-    │ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-    │ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
+    │ https://clickhouse.com          │ 2001:44c8:129:2632:33:0:252:2 │
+    │ https://clickhouse.com/docs/en/ │ 2a02:e980:1e::1               │
     │ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
     └────────────────────────────────────┴───────────────────────────────┘
 
@@ -65,4 +65,4 @@ SELECT toTypeName(i), CAST(from as FixedString(16)) as i FROM hits LIMIT 1;
     │ FixedString(16)                           │  ��� │
     └───────────────────────────────────────────┴─────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/domains/ipv6) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/fixedstring.md b/docs/zh/sql-reference/data-types/fixedstring.md
index f73259197c8..4e881b790b4 100644
--- a/docs/zh/sql-reference/data-types/fixedstring.md
+++ b/docs/zh/sql-reference/data-types/fixedstring.md
@@ -53,4 +53,4 @@ WHERE a = 'b\0'
 
 请注意，`FixedString(N)`的长度是个常量。仅由空字符组成的字符串，函数[length](../../sql-reference/functions/array-functions.md#array_functions-length)返回值为`N`,而函数[empty](../../sql-reference/functions/string-functions.md#empty)的返回值为`1`。
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/fixedstring/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/fixedstring/) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/geo.md b/docs/zh/sql-reference/data-types/geo.md
new file mode 120000
index 00000000000..e25bc66b201
--- /dev/null
+++ b/docs/zh/sql-reference/data-types/geo.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/geo.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/map.md b/docs/zh/sql-reference/data-types/map.md
new file mode 120000
index 00000000000..20de64e06d7
--- /dev/null
+++ b/docs/zh/sql-reference/data-types/map.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/map.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/multiword-types.md b/docs/zh/sql-reference/data-types/multiword-types.md
new file mode 120000
index 00000000000..aeb86eadd2b
--- /dev/null
+++ b/docs/zh/sql-reference/data-types/multiword-types.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/multiword-types.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/nullable.md b/docs/zh/sql-reference/data-types/nullable.md
index 8e8e9d3b0af..90fb302b713 100644
--- a/docs/zh/sql-reference/data-types/nullable.md
+++ b/docs/zh/sql-reference/data-types/nullable.md
@@ -38,4 +38,4 @@ SELECT x + y FROM t_null
 └────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/nullable/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/nullable/) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/simpleaggregatefunction.md b/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
index 38d7699c176..fc47f2c258a 100644
--- a/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
@@ -38,4 +38,4 @@
 CREATE TABLE simple (id UInt64, val SimpleAggregateFunction(sum, Double)) ENGINE=AggregatingMergeTree ORDER BY id;
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
index 2a890441085..0089dbc1f1c 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
@@ -67,4 +67,4 @@ ClickHouse支持 [等级](external-dicts-dict-structure.md#hierarchical-dict-att
 </dictionary>
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index 190fd74d705..78d4c1ea236 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
@@ -399,4 +399,4 @@ dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
 
 数据存储在一个 `trie`. 它必须完全适合RAM。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
index af944fd9aea..a0bdab9e9ab 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@@ -88,4 +88,4 @@ SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source wher
 ...
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
new file mode 120000
index 00000000000..a8e9c37c515
--- /dev/null
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index cbd88de0038..399224cb8c4 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -627,4 +627,4 @@ SOURCE(REDIS(
 -   `storage_type` – The structure of internal Redis storage using for work with keys. `simple` 适用于简单源和散列单键源, `hash_map` 用于具有两个键的散列源。 不支持具有复杂键的范围源和缓存源。 可以省略，默认值为 `simple`.
 -   `db_index` – The specific numeric index of Redis logical database. May be omitted, default value is 0.
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index 91497a5767a..969e72aa0e2 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -172,4 +172,4 @@ CREATE DICTIONARY somename (
 
 -   [使用外部字典的函数](../../../sql-reference/functions/ext-dict-functions.md).
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
index 843b9a5aa41..ea4f9e192b7 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
@@ -50,4 +50,4 @@ LIFETIME(...) -- Lifetime of dictionary in memory
 -   [结构](external-dicts-dict-structure.md) — Structure of the dictionary . A key and attributes that can be retrieved by this key.
 -   [使用寿命](external-dicts-dict-lifetime.md) — Frequency of dictionary updates.
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts.md
index 1dfea8d21be..609d1c11f56 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts.md
@@ -59,4 +59,4 @@ ClickHouse:
 -   [字典键和字段](external-dicts-dict-structure.md)
 -   [使用外部字典的函数](../../../sql-reference/functions/ext-dict-functions.md)
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/index.md b/docs/zh/sql-reference/dictionaries/index.md
index 092afd5bac1..ea71a1047c3 100644
--- a/docs/zh/sql-reference/dictionaries/index.md
+++ b/docs/zh/sql-reference/dictionaries/index.md
@@ -19,4 +19,4 @@ ClickHouse支持:
 -   [内置字典](internal-dicts.md#internal_dicts) ,这些字典具有特定的 [函数集](../../sql-reference/functions/ym-dict-functions.md).
 -   [插件（外部）字典](external-dictionaries/external-dicts.md#dicts-external-dicts) ,这些字典拥有一个 [函数集](../../sql-reference/functions/ext-dict-functions.md).
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/internal-dicts.md b/docs/zh/sql-reference/dictionaries/internal-dicts.md
index 706288e30ec..5bd09b673eb 100644
--- a/docs/zh/sql-reference/dictionaries/internal-dicts.md
+++ b/docs/zh/sql-reference/dictionaries/internal-dicts.md
@@ -52,4 +52,4 @@ Geobase从文本文件加载。
 
 还有与操作系统标识符和Yandex的工作功能。Metrica搜索引擎，但他们不应该被使用。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/arithmetic-functions.md b/docs/zh/sql-reference/functions/arithmetic-functions.md
index 4cb02c99df4..36934211913 100644
--- a/docs/zh/sql-reference/functions/arithmetic-functions.md
+++ b/docs/zh/sql-reference/functions/arithmetic-functions.md
@@ -80,4 +80,4 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 返回数值的最小公倍数。
 除以零或将最小负数除以-1时抛出异常。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/array-functions.md b/docs/zh/sql-reference/functions/array-functions.md
index 4f6dbc0d87d..2a2b34da7e1 100644
--- a/docs/zh/sql-reference/functions/array-functions.md
+++ b/docs/zh/sql-reference/functions/array-functions.md
@@ -662,4 +662,4 @@ arrayReduce（‘agg_func’，arr1，…） - 将聚合函数`agg_func`应用
 
 返回与源数组大小相同的数组，包含反转源数组的所有元素的结果。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/array_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/array_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/array-join.md b/docs/zh/sql-reference/functions/array-join.md
index b7a4855efa5..2bf3ca17764 100644
--- a/docs/zh/sql-reference/functions/array-join.md
+++ b/docs/zh/sql-reference/functions/array-join.md
@@ -25,4 +25,4 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
     │   3 │ Hello     │ [1,2,3] │
     └─────┴───────────┴─────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/array_join/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/array_join/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/bit-functions.md b/docs/zh/sql-reference/functions/bit-functions.md
index 08a6739c206..dd6958afec1 100644
--- a/docs/zh/sql-reference/functions/bit-functions.md
+++ b/docs/zh/sql-reference/functions/bit-functions.md
@@ -26,4 +26,4 @@
 
 ## bitTestAny(a,b) {#bittestanya-b}
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/bit_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/bit_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/bitmap-functions.md b/docs/zh/sql-reference/functions/bitmap-functions.md
index c4c1b7293f6..2a6314e7727 100644
--- a/docs/zh/sql-reference/functions/bitmap-functions.md
+++ b/docs/zh/sql-reference/functions/bitmap-functions.md
@@ -405,4 +405,4 @@ SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
     │   2 │
     └─────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/comparison-functions.md b/docs/zh/sql-reference/functions/comparison-functions.md
index 8b5d72e64c2..77fed81f267 100644
--- a/docs/zh/sql-reference/functions/comparison-functions.md
+++ b/docs/zh/sql-reference/functions/comparison-functions.md
@@ -32,4 +32,4 @@ toc_title: 比较函数
 
 ## 大于等于, >= 运算符 {#greaterorequals-operator}
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/comparison_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/comparison_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/conditional-functions.md b/docs/zh/sql-reference/functions/conditional-functions.md
index a804f723d6f..ce421138d0e 100644
--- a/docs/zh/sql-reference/functions/conditional-functions.md
+++ b/docs/zh/sql-reference/functions/conditional-functions.md
@@ -192,4 +192,4 @@ FROM LEFT_RIGHT
 └──────┴───────┴──────────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/conditional_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/conditional_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/date-time-functions.md b/docs/zh/sql-reference/functions/date-time-functions.md
index 9f8e7f49d07..1225cf33699 100644
--- a/docs/zh/sql-reference/functions/date-time-functions.md
+++ b/docs/zh/sql-reference/functions/date-time-functions.md
@@ -652,7 +652,7 @@ SELECT formatDateTime(toDate('2010-01-04'), '%g')
 └────────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/date_time_functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/query_language/functions/date_time_functions/) <!--hide-->
 
 ## FROM_UNIXTIME
 
diff --git a/docs/zh/sql-reference/functions/encoding-functions.md b/docs/zh/sql-reference/functions/encoding-functions.md
index e0daab15dd3..f1152965d2d 100644
--- a/docs/zh/sql-reference/functions/encoding-functions.md
+++ b/docs/zh/sql-reference/functions/encoding-functions.md
@@ -91,4 +91,4 @@ SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
 
 接受一个整数。返回一个UInt64类型数组，其中包含一组2的幂列表，其列表中的所有值相加等于这个整数。数组中的数字按升序排列。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/encoding_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/encoding_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/encryption-functions.md b/docs/zh/sql-reference/functions/encryption-functions.md
new file mode 120000
index 00000000000..8d33d60a5ba
--- /dev/null
+++ b/docs/zh/sql-reference/functions/encryption-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/encryption-functions.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/ext-dict-functions.md b/docs/zh/sql-reference/functions/ext-dict-functions.md
index 22ee9641b55..12b9499cb64 100644
--- a/docs/zh/sql-reference/functions/ext-dict-functions.md
+++ b/docs/zh/sql-reference/functions/ext-dict-functions.md
@@ -43,4 +43,4 @@
 
 -   检查字典是否存在指定的`id`。如果不存在，则返回0;如果存在，则返回1。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/files.md b/docs/zh/sql-reference/functions/files.md
new file mode 120000
index 00000000000..df6eac6031e
--- /dev/null
+++ b/docs/zh/sql-reference/functions/files.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/files.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/functions-for-nulls.md b/docs/zh/sql-reference/functions/functions-for-nulls.md
index 0fc563afa4c..b228cbe6f99 100644
--- a/docs/zh/sql-reference/functions/functions-for-nulls.md
+++ b/docs/zh/sql-reference/functions/functions-for-nulls.md
@@ -249,4 +249,4 @@
     │ Nullable(UInt8)            │
     └────────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/geo.md b/docs/zh/sql-reference/functions/geo.md
index d3e7ba0619e..fa8fecb1284 100644
--- a/docs/zh/sql-reference/functions/geo.md
+++ b/docs/zh/sql-reference/functions/geo.md
@@ -219,4 +219,4 @@ SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos
 └─────────────────────────────────────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/geo/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/geo/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/geo/coordinates.md b/docs/zh/sql-reference/functions/geo/coordinates.md
new file mode 120000
index 00000000000..f3f694c50c9
--- /dev/null
+++ b/docs/zh/sql-reference/functions/geo/coordinates.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/coordinates.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/geo/geohash.md b/docs/zh/sql-reference/functions/geo/geohash.md
new file mode 120000
index 00000000000..5b17ac944bb
--- /dev/null
+++ b/docs/zh/sql-reference/functions/geo/geohash.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/geohash.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/geo/h3.md b/docs/zh/sql-reference/functions/geo/h3.md
new file mode 120000
index 00000000000..eb3926f4e3e
--- /dev/null
+++ b/docs/zh/sql-reference/functions/geo/h3.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/h3.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/geo/index.md b/docs/zh/sql-reference/functions/geo/index.md
new file mode 120000
index 00000000000..8eb51e63d5b
--- /dev/null
+++ b/docs/zh/sql-reference/functions/geo/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/index.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/hash-functions.md b/docs/zh/sql-reference/functions/hash-functions.md
index b64456fe644..0800631a807 100644
--- a/docs/zh/sql-reference/functions/hash-functions.md
+++ b/docs/zh/sql-reference/functions/hash-functions.md
@@ -111,4 +111,4 @@ URL的层级与URLHierarchy中的层级相同。 此函数被用于Yandex.Metric
 接受一个String类型的参数。返回UInt64或UInt32。
 有关更多信息，请参见链接：[xxHash](http://cyan4973.github.io/xxHash/)
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/hash_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/hash_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/higher-order-functions.md b/docs/zh/sql-reference/functions/higher-order-functions.md
index fcf3ab3da15..dc5c99ae298 100644
--- a/docs/zh/sql-reference/functions/higher-order-functions.md
+++ b/docs/zh/sql-reference/functions/higher-order-functions.md
@@ -135,4 +135,4 @@ SELECT arrayReverseSort([1, nan, 2, NULL, 3, nan, 4, NULL])
     │ [4,3,2,1,nan,nan,NULL,NULL]                          │
     └──────────────────────────────────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/in-functions.md b/docs/zh/sql-reference/functions/in-functions.md
index 1665bf5650e..bb33658cb68 100644
--- a/docs/zh/sql-reference/functions/in-functions.md
+++ b/docs/zh/sql-reference/functions/in-functions.md
@@ -21,4 +21,4 @@ toc_title: IN 运算符
 ’N’是列索引，从1开始。N必须是正整数常量，并且不大于元组的大小。
 执行该函数没有任何成本。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/functions/in_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/functions/in_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/index.md b/docs/zh/sql-reference/functions/index.md
index 52954c95cff..c5974e55582 100644
--- a/docs/zh/sql-reference/functions/index.md
+++ b/docs/zh/sql-reference/functions/index.md
@@ -69,4 +69,4 @@ ClickHouse中至少存在两种类型的函数 - 常规函数（它们称之为
 
 如果查询中的函数在请求服务器上执行，但您需要在远程服务器上执行它，则可以将其包装在«any»聚合函数中，或将其添加到«GROUP BY»中。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/ip-address-functions.md b/docs/zh/sql-reference/functions/ip-address-functions.md
index d208e0e6939..6428070e704 100644
--- a/docs/zh/sql-reference/functions/ip-address-functions.md
+++ b/docs/zh/sql-reference/functions/ip-address-functions.md
@@ -214,4 +214,4 @@ SELECT
     │ 20010438FFFF000000000000407D1BC1  │ 20010438FFFF000000000000407D1BC1 │
     └───────────────────────────────────┴──────────────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/json-functions.md b/docs/zh/sql-reference/functions/json-functions.md
index 441ec29a289..8459f2ceccc 100644
--- a/docs/zh/sql-reference/functions/json-functions.md
+++ b/docs/zh/sql-reference/functions/json-functions.md
@@ -171,4 +171,4 @@
 
     select JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100, 200.0, 300]'
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/json_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/json_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/logical-functions.md b/docs/zh/sql-reference/functions/logical-functions.md
index cc168dbb1ed..ad72161f3da 100644
--- a/docs/zh/sql-reference/functions/logical-functions.md
+++ b/docs/zh/sql-reference/functions/logical-functions.md
@@ -17,4 +17,4 @@ toc_title: 逻辑函数
 
 ## 异或，`XOR` 运算符 {#xor}
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/logical_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/logical_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/math-functions.md b/docs/zh/sql-reference/functions/math-functions.md
index 6634b095b0d..5458ac37dfd 100644
--- a/docs/zh/sql-reference/functions/math-functions.md
+++ b/docs/zh/sql-reference/functions/math-functions.md
@@ -104,4 +104,4 @@ SELECT erf(3 / sqrt(2))
 
 接受一个数值类型的参数并返回它的10的x次幂（UInt64）。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/math_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/nlp-functions.md b/docs/zh/sql-reference/functions/nlp-functions.md
new file mode 120000
index 00000000000..612039dcb2c
--- /dev/null
+++ b/docs/zh/sql-reference/functions/nlp-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/nlp-functions.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/other-functions.md b/docs/zh/sql-reference/functions/other-functions.md
index c58c4bd1510..2588f623227 100644
--- a/docs/zh/sql-reference/functions/other-functions.md
+++ b/docs/zh/sql-reference/functions/other-functions.md
@@ -631,4 +631,4 @@ ORDER BY k ASC
 
 如果参数不为零则抛出异常。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/other_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/other_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/random-functions.md b/docs/zh/sql-reference/functions/random-functions.md
index f058b98c779..34ff2d9943a 100644
--- a/docs/zh/sql-reference/functions/random-functions.md
+++ b/docs/zh/sql-reference/functions/random-functions.md
@@ -18,4 +18,4 @@
 
 返回一个UInt32类型的随机数字，该函数不同之处在于仅为每个数据块参数一个随机数。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/random_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/random_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/rounding-functions.md b/docs/zh/sql-reference/functions/rounding-functions.md
index c1bf6641135..46f137da995 100644
--- a/docs/zh/sql-reference/functions/rounding-functions.md
+++ b/docs/zh/sql-reference/functions/rounding-functions.md
@@ -83,4 +83,4 @@ SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
 
 接受一个数字，将其向下舍入到指定数组中的元素。如果该值小于数组中的最低边界，则返回最低边界。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/rounding_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/rounding_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/splitting-merging-functions.md b/docs/zh/sql-reference/functions/splitting-merging-functions.md
index a29f4057d55..ade5bae21da 100644
--- a/docs/zh/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/zh/sql-reference/functions/splitting-merging-functions.md
@@ -26,4 +26,4 @@
     │ ['abca','abc']          │
     └─────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/string-functions.md b/docs/zh/sql-reference/functions/string-functions.md
index 1c27176a45e..d4f8d36273d 100644
--- a/docs/zh/sql-reference/functions/string-functions.md
+++ b/docs/zh/sql-reference/functions/string-functions.md
@@ -166,4 +166,4 @@ SELECT format('{} {}', 'Hello', 'World')
 
 返回一个字符串，用于删除任一侧的空白字符。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/string_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/string_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/string-replace-functions.md b/docs/zh/sql-reference/functions/string-replace-functions.md
index 5f89bfb828f..01bb809c78f 100644
--- a/docs/zh/sql-reference/functions/string-replace-functions.md
+++ b/docs/zh/sql-reference/functions/string-replace-functions.md
@@ -76,5 +76,5 @@ SELECT replaceRegexpAll('Hello, World!', '^', 'here: ') AS res
 这个实现与re2::RE2::QuoteMeta略有不同。它以`\0` 转义零字节，而不是`\x00`，并且只转义必需的字符。
 有关详细信息，请参阅链接：[RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
 
diff --git a/docs/zh/sql-reference/functions/string-search-functions.md b/docs/zh/sql-reference/functions/string-search-functions.md
index 2e1e4c784bd..113c34788f7 100644
--- a/docs/zh/sql-reference/functions/string-search-functions.md
+++ b/docs/zh/sql-reference/functions/string-search-functions.md
@@ -119,4 +119,4 @@
 !!! note "注意"
     对于UTF-8，我们使用3-gram。所有这些都不是完全公平的n-gram距离。我们使用2字节哈希来散列n-gram，然后计算这些哈希表之间的（非）对称差异 - 可能会发生冲突。对于UTF-8不区分大小写的格式，我们不使用公平的`tolower`函数 - 我们将每个Unicode字符字节的第5位（从零开始）和字节的第一位归零 - 这适用于拉丁语，主要用于所有西里尔字母。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/string_search_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/string_search_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/tuple-functions.md b/docs/zh/sql-reference/functions/tuple-functions.md
new file mode 120000
index 00000000000..daaf22f11f4
--- /dev/null
+++ b/docs/zh/sql-reference/functions/tuple-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/tuple-functions.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/tuple-map-functions.md b/docs/zh/sql-reference/functions/tuple-map-functions.md
new file mode 120000
index 00000000000..e77338e1118
--- /dev/null
+++ b/docs/zh/sql-reference/functions/tuple-map-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/tuple-map-functions.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/type-conversion-functions.md b/docs/zh/sql-reference/functions/type-conversion-functions.md
index 4c94b2b2f9a..6c8843fe2bd 100644
--- a/docs/zh/sql-reference/functions/type-conversion-functions.md
+++ b/docs/zh/sql-reference/functions/type-conversion-functions.md
@@ -635,4 +635,4 @@ SELECT fromUnixTimestamp64Milli(i64, 'UTC')
 └──────────────────────────────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/url-functions.md b/docs/zh/sql-reference/functions/url-functions.md
index a7b91c773c8..040bd1e6aae 100644
--- a/docs/zh/sql-reference/functions/url-functions.md
+++ b/docs/zh/sql-reference/functions/url-functions.md
@@ -115,4 +115,4 @@ SELECT decodeURLComponent('http://127.0.0.1:8123/?query=SELECT%201%3B') AS Decod
 
 删除URL中名称为’name’的参数。改函数假设参数名称以及参数值经过URL相同的编码。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/url_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/url_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/uuid-functions.md b/docs/zh/sql-reference/functions/uuid-functions.md
index fb7cdcc4eff..99f5c3407ef 100644
--- a/docs/zh/sql-reference/functions/uuid-functions.md
+++ b/docs/zh/sql-reference/functions/uuid-functions.md
@@ -104,4 +104,4 @@ SELECT
 
 -   [dictgetuid](ext-dict-functions.md)
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/uuid_function/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/uuid_function/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/ym-dict-functions.md b/docs/zh/sql-reference/functions/ym-dict-functions.md
index 2f2b2f80d25..f8ac29e6d4c 100644
--- a/docs/zh/sql-reference/functions/ym-dict-functions.md
+++ b/docs/zh/sql-reference/functions/ym-dict-functions.md
@@ -139,4 +139,4 @@ regionToTopContinent(id[, geobase])
 
 `ua` 和 `uk` 都意味着乌克兰。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/index.md b/docs/zh/sql-reference/index.md
index c47c20b9cf9..5e75d670c1d 100644
--- a/docs/zh/sql-reference/index.md
+++ b/docs/zh/sql-reference/index.md
@@ -15,4 +15,4 @@ ClickHouse支持以下形式的查询:
 -   [ALTER](statements/alter.md#query_language_queries_alter)
 -   [其他类型的查询](statements/misc.md)
 
-[原始文档](https://clickhouse.tech/docs/zh/sql-reference/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/zh/sql-reference/) <!--hide-->
diff --git a/docs/zh/sql-reference/operators/index.md b/docs/zh/sql-reference/operators/index.md
index 77aa42755af..2b5555f6c66 100644
--- a/docs/zh/sql-reference/operators/index.md
+++ b/docs/zh/sql-reference/operators/index.md
@@ -260,4 +260,4 @@ WHERE isNotNull(y)
 1 rows in set. Elapsed: 0.002 sec.
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/operators/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/operators/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/alter.md b/docs/zh/sql-reference/statements/alter.md
index 81ef9124e45..db4db707832 100644
--- a/docs/zh/sql-reference/statements/alter.md
+++ b/docs/zh/sql-reference/statements/alter.md
@@ -586,4 +586,4 @@ ALTER SETTINGS PROFILE [IF EXISTS] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/alter/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/query_language/alter/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/alter/column.md b/docs/zh/sql-reference/statements/alter/column.md
new file mode 120000
index 00000000000..e1123d197fe
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/column.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/column.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/constraint.md b/docs/zh/sql-reference/statements/alter/constraint.md
new file mode 120000
index 00000000000..e3b245408d1
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/constraint.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/constraint.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/delete.md b/docs/zh/sql-reference/statements/alter/delete.md
new file mode 120000
index 00000000000..b9d6a233197
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/delete.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/delete.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/index/index.md b/docs/zh/sql-reference/statements/alter/index/index.md
new file mode 120000
index 00000000000..b754fa71b83
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/index/index.md
@@ -0,0 +1 @@
+../../../../../en/sql-reference/statements/alter/index/index.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/order-by.md b/docs/zh/sql-reference/statements/alter/order-by.md
new file mode 120000
index 00000000000..ef5a22dc165
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/order-by.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/order-by.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/partition.md b/docs/zh/sql-reference/statements/alter/partition.md
new file mode 120000
index 00000000000..09a6fa34645
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/partition.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/partition.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/projection.md b/docs/zh/sql-reference/statements/alter/projection.md
new file mode 120000
index 00000000000..b7365ec9fe4
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/projection.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/projection.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/quota.md b/docs/zh/sql-reference/statements/alter/quota.md
new file mode 120000
index 00000000000..c6c477c3b61
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/quota.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/quota.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/role.md b/docs/zh/sql-reference/statements/alter/role.md
new file mode 120000
index 00000000000..ce1f0a94eb3
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/role.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/role.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/row-policy.md b/docs/zh/sql-reference/statements/alter/row-policy.md
new file mode 120000
index 00000000000..09ad2d301f3
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/row-policy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/row-policy.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/sample-by.md b/docs/zh/sql-reference/statements/alter/sample-by.md
new file mode 120000
index 00000000000..fda9d991f40
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/sample-by.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/sample-by.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/setting.md b/docs/zh/sql-reference/statements/alter/setting.md
new file mode 120000
index 00000000000..12fdba11505
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/setting.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/setting.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/settings-profile.md b/docs/zh/sql-reference/statements/alter/settings-profile.md
new file mode 120000
index 00000000000..0e71ac4e831
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/settings-profile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/settings-profile.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/ttl.md b/docs/zh/sql-reference/statements/alter/ttl.md
new file mode 120000
index 00000000000..94a112e7a17
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/ttl.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/ttl.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/update.md b/docs/zh/sql-reference/statements/alter/update.md
new file mode 120000
index 00000000000..fa9be21c070
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/update.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/update.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/user.md b/docs/zh/sql-reference/statements/alter/user.md
new file mode 120000
index 00000000000..9379ef3aaf6
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/user.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/user.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/view.md b/docs/zh/sql-reference/statements/alter/view.md
new file mode 120000
index 00000000000..89bdcee5912
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/view.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/view.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/attach.md b/docs/zh/sql-reference/statements/attach.md
new file mode 120000
index 00000000000..54672449823
--- /dev/null
+++ b/docs/zh/sql-reference/statements/attach.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/attach.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/check-table.md b/docs/zh/sql-reference/statements/check-table.md
new file mode 120000
index 00000000000..1ce3a05c6ea
--- /dev/null
+++ b/docs/zh/sql-reference/statements/check-table.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/check-table.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create.md b/docs/zh/sql-reference/statements/create.md
index 46e82bd1733..21a3e28ebc4 100644
--- a/docs/zh/sql-reference/statements/create.md
+++ b/docs/zh/sql-reference/statements/create.md
@@ -244,7 +244,7 @@ SELECT a, b, c FROM (SELECT ...)
 
 没有单独的删除视图的语法。如果要删除视图，请使用`DROP TABLE`。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/create/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/create/) <!--hide-->
 
 ## CREATE DICTIONARY {#create-dictionary-query}
 
diff --git a/docs/zh/sql-reference/statements/create/dictionary.md b/docs/zh/sql-reference/statements/create/dictionary.md
new file mode 120000
index 00000000000..e9eff6ba066
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/dictionary.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/dictionary.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/function.md b/docs/zh/sql-reference/statements/create/function.md
new file mode 120000
index 00000000000..d41429cb260
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/function.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/function.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/index.md b/docs/zh/sql-reference/statements/create/index.md
index f2b0a90df76..d5d3e814023 100644
--- a/docs/zh/sql-reference/statements/create/index.md
+++ b/docs/zh/sql-reference/statements/create/index.md
@@ -10,4 +10,4 @@ CREATE语法包含以下子集:
 
 -   [DATABASE](../../../sql-reference/statements/create/database.md)
 
-[原始文章](https://clickhouse.tech/docs/zh/sql-reference/statements/create/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/sql-reference/statements/create/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/create/quota.md b/docs/zh/sql-reference/statements/create/quota.md
new file mode 120000
index 00000000000..f941b7bcdad
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/quota.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/quota.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/role.md b/docs/zh/sql-reference/statements/create/role.md
new file mode 120000
index 00000000000..d48b490bb1f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/role.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/role.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/row-policy.md b/docs/zh/sql-reference/statements/create/row-policy.md
new file mode 120000
index 00000000000..383ef88ed1f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/row-policy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/row-policy.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/settings-profile.md b/docs/zh/sql-reference/statements/create/settings-profile.md
new file mode 120000
index 00000000000..093dd9adcde
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/settings-profile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/settings-profile.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/table.md b/docs/zh/sql-reference/statements/create/table.md
new file mode 120000
index 00000000000..61a92816de6
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/table.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/table.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/user.md b/docs/zh/sql-reference/statements/create/user.md
new file mode 120000
index 00000000000..5c4882bede7
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/user.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/user.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/view.md b/docs/zh/sql-reference/statements/create/view.md
index c4e1b96107c..da69860f068 100644
--- a/docs/zh/sql-reference/statements/create/view.md
+++ b/docs/zh/sql-reference/statements/create/view.md
@@ -240,4 +240,4 @@ Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table defa
 - 监视表更改并触发后续选择查询。
 - 使用定期刷新从系统表中查看指标。
 
-[原始文章](https://clickhouse.tech/docs/en/sql-reference/statements/create/view/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/sql-reference/statements/create/view/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/describe-table.md b/docs/zh/sql-reference/statements/describe-table.md
new file mode 120000
index 00000000000..eb76534f3cd
--- /dev/null
+++ b/docs/zh/sql-reference/statements/describe-table.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/describe-table.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/detach.md b/docs/zh/sql-reference/statements/detach.md
new file mode 120000
index 00000000000..19d37ee535a
--- /dev/null
+++ b/docs/zh/sql-reference/statements/detach.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/detach.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/drop.md b/docs/zh/sql-reference/statements/drop.md
index 5738dc72459..c78cb450e19 100644
--- a/docs/zh/sql-reference/statements/drop.md
+++ b/docs/zh/sql-reference/statements/drop.md
@@ -97,4 +97,4 @@ DROP [SETTINGS] PROFILE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
-[原始文章](https://clickhouse.tech/docs/zh/sql-reference/statements/drop/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/sql-reference/statements/drop/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/exists.md b/docs/zh/sql-reference/statements/exists.md
new file mode 120000
index 00000000000..d69e8224fe6
--- /dev/null
+++ b/docs/zh/sql-reference/statements/exists.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/exists.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/explain.md b/docs/zh/sql-reference/statements/explain.md
new file mode 120000
index 00000000000..36f1f2cc9d4
--- /dev/null
+++ b/docs/zh/sql-reference/statements/explain.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/explain.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/grant.md b/docs/zh/sql-reference/statements/grant.md
index cb3952767ac..c55eff4126d 100644
--- a/docs/zh/sql-reference/statements/grant.md
+++ b/docs/zh/sql-reference/statements/grant.md
@@ -471,4 +471,4 @@ GRANT INSERT(x,y) ON db.table TO john
 
 `ADMIN OPTION` 权限允许用户将他们的角色分配给其它用户
 
-[原始文档](https://clickhouse.tech/docs/en/query_language/grant/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/query_language/grant/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/insert-into.md b/docs/zh/sql-reference/statements/insert-into.md
index 3e378c6a589..928107fa2b2 100644
--- a/docs/zh/sql-reference/statements/insert-into.md
+++ b/docs/zh/sql-reference/statements/insert-into.md
@@ -108,4 +108,4 @@ INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
 -   数据总是被实时的写入。
 -   写入的数据已经按照时间排序。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/insert_into/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/insert_into/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/kill.md b/docs/zh/sql-reference/statements/kill.md
new file mode 120000
index 00000000000..1afbc9008f3
--- /dev/null
+++ b/docs/zh/sql-reference/statements/kill.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/kill.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/misc.md b/docs/zh/sql-reference/statements/misc.md
index 5ec589c9e9a..8e7fc4c6bc3 100644
--- a/docs/zh/sql-reference/statements/misc.md
+++ b/docs/zh/sql-reference/statements/misc.md
@@ -376,4 +376,4 @@ USE db
 当前数据库用于搜索表，如果数据库没有在查询中明确定义与表名之前的点。
 使用HTTP协议时无法进行此查询，因为没有会话的概念。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/misc/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/misc/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/optimize.md b/docs/zh/sql-reference/statements/optimize.md
new file mode 120000
index 00000000000..4f47d7273c5
--- /dev/null
+++ b/docs/zh/sql-reference/statements/optimize.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/optimize.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/revoke.md b/docs/zh/sql-reference/statements/revoke.md
index f784b134a3b..16315ae96d4 100644
--- a/docs/zh/sql-reference/statements/revoke.md
+++ b/docs/zh/sql-reference/statements/revoke.md
@@ -45,4 +45,4 @@ GRANT SELECT ON accounts.staff TO mira;
 REVOKE SELECT(wage) ON accounts.staff FROM mira;
 ```
 
-{## [原始文档](https://clickhouse.tech/docs/en/operations/settings/settings/) ##}
+{## [原始文档](https://clickhouse.com/docs/en/operations/settings/settings/) ##}
diff --git a/docs/zh/sql-reference/statements/select/index.md b/docs/zh/sql-reference/statements/select/index.md
index d3de71efc6b..6c8cc361844 100644
--- a/docs/zh/sql-reference/statements/select/index.md
+++ b/docs/zh/sql-reference/statements/select/index.md
@@ -159,4 +159,4 @@ Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of
 
 有关详细信息，请参阅部分 “Settings”. 可以使用外部排序（将临时表保存到磁盘）和外部聚合。
 
-{## [原始文章](https://clickhouse.tech/docs/en/sql-reference/statements/select/) ##}
+{## [原始文章](https://clickhouse.com/docs/en/sql-reference/statements/select/) ##}
diff --git a/docs/zh/sql-reference/statements/select/offset.md b/docs/zh/sql-reference/statements/select/offset.md
new file mode 120000
index 00000000000..b12b5219dec
--- /dev/null
+++ b/docs/zh/sql-reference/statements/select/offset.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/select/offset.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/set-role.md b/docs/zh/sql-reference/statements/set-role.md
new file mode 120000
index 00000000000..a6525622a68
--- /dev/null
+++ b/docs/zh/sql-reference/statements/set-role.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/set-role.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/set.md b/docs/zh/sql-reference/statements/set.md
new file mode 120000
index 00000000000..02e106afc9f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/set.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/set.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/show.md b/docs/zh/sql-reference/statements/show.md
index d9f09855916..85c5744f26b 100644
--- a/docs/zh/sql-reference/statements/show.md
+++ b/docs/zh/sql-reference/statements/show.md
@@ -165,4 +165,4 @@ SHOW CREATE QUOTA [name | CURRENT]
 SHOW CREATE [SETTINGS] PROFILE name
 ```
 
-[原始文档](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/query_language/show/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/system.md b/docs/zh/sql-reference/statements/system.md
index 7f2b7ae1082..9b21ba340a9 100644
--- a/docs/zh/sql-reference/statements/system.md
+++ b/docs/zh/sql-reference/statements/system.md
@@ -280,4 +280,4 @@ SYSTEM RESTART REPLICA [db.]replicated_merge_tree_family_table_name
 
 重置所有 `ReplicatedMergeTree`表的ZooKeeper会话状态。该操作会以Zookeeper为参照，对比当前状态，有需要的情况下将任务添加到ZooKeeper队列。
 
-[原始文档](https://clickhouse.tech/docs/en/query_language/system/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/query_language/system/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/truncate.md b/docs/zh/sql-reference/statements/truncate.md
new file mode 120000
index 00000000000..92fbd705e8f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/truncate.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/truncate.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/use.md b/docs/zh/sql-reference/statements/use.md
new file mode 120000
index 00000000000..7bdbf049326
--- /dev/null
+++ b/docs/zh/sql-reference/statements/use.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/use.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/syntax.md b/docs/zh/sql-reference/syntax.md
index 644dc646726..7721699e699 100644
--- a/docs/zh/sql-reference/syntax.md
+++ b/docs/zh/sql-reference/syntax.md
@@ -54,7 +54,7 @@ ClickHouse支持SQL风格或C语言风格的注释：
 -   集群、数据库、表、分区、列的名称
 -   函数
 -   数据类型
--   [表达式别名](https://clickhouse.tech/docs/zh/sql-reference/syntax/#syntax-expression_aliases)
+-   [表达式别名](https://clickhouse.com/docs/zh/sql-reference/syntax/#syntax-expression_aliases)
 
 变量名可以被括起或不括起，后者是推荐做法。
 
@@ -192,4 +192,4 @@ select查询中，星号可以代替表达式使用。详情请参见“select
 表达式列表是用逗号分隔的一个或多个表达式。
 反过来，函数和运算符可以将表达式作为参数。
 
-[原始文档](https://clickhouse.tech/docs/en/sql_reference/syntax/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/sql_reference/syntax/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/cluster.md b/docs/zh/sql-reference/table-functions/cluster.md
new file mode 120000
index 00000000000..4721debec48
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/cluster.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/cluster.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/dictionary.md b/docs/zh/sql-reference/table-functions/dictionary.md
new file mode 120000
index 00000000000..f9f453831a4
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/dictionary.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/dictionary.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/file.md b/docs/zh/sql-reference/table-functions/file.md
index 84fddada867..dd2b83d292a 100644
--- a/docs/zh/sql-reference/table-functions/file.md
+++ b/docs/zh/sql-reference/table-functions/file.md
@@ -127,6 +127,6 @@ FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
 
 **另请参阅**
 
--   [虚拟列](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [虚拟列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/file/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/file/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/generate.md b/docs/zh/sql-reference/table-functions/generate.md
index b9b02793cf3..b00d1ecf1ab 100644
--- a/docs/zh/sql-reference/table-functions/generate.md
+++ b/docs/zh/sql-reference/table-functions/generate.md
@@ -39,4 +39,4 @@ SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(
 └──────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/generate/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/generate/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/hdfs.md b/docs/zh/sql-reference/table-functions/hdfs.md
index 715d9671dc8..5fc5c0b4c62 100644
--- a/docs/zh/sql-reference/table-functions/hdfs.md
+++ b/docs/zh/sql-reference/table-functions/hdfs.md
@@ -97,6 +97,6 @@ FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name Strin
 
 **另请参阅**
 
--   [虚拟列](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [虚拟列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/hdfs/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/hdfs/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/index.md b/docs/zh/sql-reference/table-functions/index.md
index 20a335de0fc..a04c20c875d 100644
--- a/docs/zh/sql-reference/table-functions/index.md
+++ b/docs/zh/sql-reference/table-functions/index.md
@@ -33,4 +33,4 @@ toc_title: "\u5BFC\u8A00"
 | [odbc](../../sql-reference/table-functions/odbc.md)             | 创建一个ODBC引擎表。 |
 | [hdfs](../../sql-reference/table-functions/hdfs.md)             | 创建一个HDFS引擎表。 |
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/input.md b/docs/zh/sql-reference/table-functions/input.md
index 61bb58d73e2..bfee05eb898 100644
--- a/docs/zh/sql-reference/table-functions/input.md
+++ b/docs/zh/sql-reference/table-functions/input.md
@@ -40,4 +40,4 @@ $ cat data.csv | clickhouse-client --query="INSERT INTO test FORMAT CSV"
 $ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT * FROM input('test_structure') FORMAT CSV"
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/input/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/input/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/jdbc.md b/docs/zh/sql-reference/table-functions/jdbc.md
index 4d95a5ed203..91f494932bd 100644
--- a/docs/zh/sql-reference/table-functions/jdbc.md
+++ b/docs/zh/sql-reference/table-functions/jdbc.md
@@ -35,4 +35,4 @@ FROM jdbc('mysql-dev?datasource_column', 'show databases') a
 INNER JOIN jdbc('self?datasource_column', 'show databases') b ON a.Database = b.name
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/merge.md b/docs/zh/sql-reference/table-functions/merge.md
index 410468b3d8a..e994c77f1b0 100644
--- a/docs/zh/sql-reference/table-functions/merge.md
+++ b/docs/zh/sql-reference/table-functions/merge.md
@@ -9,4 +9,4 @@ toc_title: merge
 
 表结构取自遇到的第一个与正则表达式匹配的表。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/merge/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/mysql.md b/docs/zh/sql-reference/table-functions/mysql.md
index 3ed0001b0a0..f406a6d051e 100644
--- a/docs/zh/sql-reference/table-functions/mysql.md
+++ b/docs/zh/sql-reference/table-functions/mysql.md
@@ -106,4 +106,4 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 -   [该 ‘MySQL’ 表引擎](../../engines/table-engines/integrations/mysql.md)
 -   [使用MySQL作为外部字典的来源](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/mysql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/mysql/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/null.md b/docs/zh/sql-reference/table-functions/null.md
new file mode 120000
index 00000000000..bff05386e28
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/null.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/null.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/numbers.md b/docs/zh/sql-reference/table-functions/numbers.md
index 59a57b157e0..279d2e730ba 100644
--- a/docs/zh/sql-reference/table-functions/numbers.md
+++ b/docs/zh/sql-reference/table-functions/numbers.md
@@ -25,4 +25,4 @@ SELECT * FROM system.numbers LIMIT 10;
 select toDate('2010-01-01') + number as d FROM numbers(365);
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/numbers/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/numbers/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/odbc.md b/docs/zh/sql-reference/table-functions/odbc.md
index dd2826e892f..5a2cd8bb5f0 100644
--- a/docs/zh/sql-reference/table-functions/odbc.md
+++ b/docs/zh/sql-reference/table-functions/odbc.md
@@ -103,4 +103,4 @@ SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
 -   [ODBC外部字典](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBC表引擎](../../engines/table-engines/integrations/odbc.md).
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/postgresql.md b/docs/zh/sql-reference/table-functions/postgresql.md
index df29c2c2891..ec31432b96a 100644
--- a/docs/zh/sql-reference/table-functions/postgresql.md
+++ b/docs/zh/sql-reference/table-functions/postgresql.md
@@ -117,4 +117,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [PostgreSQL 表引擎](../../engines/table-engines/integrations/postgresql.md)
 -   [使用 PostgreSQL 作为外部字典的来源](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[原始文章](https://clickhouse.tech/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/remote.md b/docs/zh/sql-reference/table-functions/remote.md
index dfe81d0bafe..236ce1a7499 100644
--- a/docs/zh/sql-reference/table-functions/remote.md
+++ b/docs/zh/sql-reference/table-functions/remote.md
@@ -101,4 +101,4 @@ INSERT INTO FUNCTION remote('127.0.0.1', currentDatabase(), 'remote_table') VALU
 SELECT * FROM remote_table;
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/remote/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/remote/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/s3.md b/docs/zh/sql-reference/table-functions/s3.md
index c55412f4ddd..06a6719b445 100644
--- a/docs/zh/sql-reference/table-functions/s3.md
+++ b/docs/zh/sql-reference/table-functions/s3.md
@@ -129,4 +129,4 @@ SELECT name, value FROM existing_table;
 
 -   [S3 引擎](../../engines/table-engines/integrations/s3.md)
 
-[原始文章](https://clickhouse.tech/docs/en/sql-reference/table-functions/s3/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/sql-reference/table-functions/s3/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/s3Cluster.md b/docs/zh/sql-reference/table-functions/s3Cluster.md
new file mode 120000
index 00000000000..48e5367084e
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/s3Cluster.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/s3Cluster.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/sqlite.md b/docs/zh/sql-reference/table-functions/sqlite.md
new file mode 120000
index 00000000000..7f203c4d062
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/sqlite.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/sqlite.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/url.md b/docs/zh/sql-reference/table-functions/url.md
index d726cddd748..fe3e3ac25e9 100644
--- a/docs/zh/sql-reference/table-functions/url.md
+++ b/docs/zh/sql-reference/table-functions/url.md
@@ -40,4 +40,4 @@ CREATE TABLE test_table (column1 String, column2 UInt32) ENGINE=Memory;
 INSERT INTO FUNCTION url('http://127.0.0.1:8123/?query=INSERT+INTO+test_table+FORMAT+CSV', 'CSV', 'column1 String, column2 UInt32') VALUES ('http interface', 42);
 SELECT * FROM test_table;
 ```
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/url/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/url/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/view.md b/docs/zh/sql-reference/table-functions/view.md
new file mode 120000
index 00000000000..19a5bf245cd
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/view.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/view.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/window-functions/index.md b/docs/zh/sql-reference/window-functions/index.md
new file mode 120000
index 00000000000..206505bf0eb
--- /dev/null
+++ b/docs/zh/sql-reference/window-functions/index.md
@@ -0,0 +1 @@
+../../../en/sql-reference/window-functions/index.md
\ No newline at end of file
diff --git a/docs/zh/whats-new/changelog/2020.md b/docs/zh/whats-new/changelog/2020.md
new file mode 120000
index 00000000000..f0fb97311d2
--- /dev/null
+++ b/docs/zh/whats-new/changelog/2020.md
@@ -0,0 +1 @@
+../../../en/whats-new/changelog/2020.md
\ No newline at end of file
diff --git a/docs/zh/whats-new/roadmap.md b/docs/zh/whats-new/roadmap.md
index df4b027f7da..3cb9dd6fa2f 100644
--- a/docs/zh/whats-new/roadmap.md
+++ b/docs/zh/whats-new/roadmap.md
@@ -7,4 +7,4 @@ toc_title: Roadmap
 
 `2021年Roadmap`已公布供公开讨论查看[这里](https://github.com/ClickHouse/ClickHouse/issues/17623).
 
-{## [源文章](https://clickhouse.tech/docs/en/roadmap/) ##}
+{## [源文章](https://clickhouse.com/docs/en/roadmap/) ##}
diff --git a/docs/zh/whats-new/security-changelog.md b/docs/zh/whats-new/security-changelog.md
index 9cf0ca0b08c..24f352c6028 100644
--- a/docs/zh/whats-new/security-changelog.md
+++ b/docs/zh/whats-new/security-changelog.md
@@ -71,4 +71,4 @@ deb包中的错误配置可能导致未经授权使用数据库。
 
 作者：英国国家网络安全中心（NCSC）
 
-{## [Original article](https://clickhouse.tech/docs/en/security_changelog/) ##}
+{## [Original article](https://clickhouse.com/docs/en/security_changelog/) ##}
diff --git a/programs/client/CMakeLists.txt b/programs/client/CMakeLists.txt
index 1de5ea88aee..9e774deadf0 100644
--- a/programs/client/CMakeLists.txt
+++ b/programs/client/CMakeLists.txt
@@ -4,6 +4,7 @@ set (CLICKHOUSE_CLIENT_SOURCES
     QueryFuzzer.cpp
     Suggest.cpp
     TestHint.cpp
+    TestTags.cpp
 )
 
 set (CLICKHOUSE_CLIENT_LINK
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 87ae03161a9..89e244f14b4 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -1,4 +1,5 @@
 #include <string>
+
 #include "Common/MemoryTracker.h"
 #include "Columns/ColumnsNumber.h"
 #include "ConnectionParameters.h"
@@ -6,6 +7,7 @@
 #include "QueryFuzzer.h"
 #include "Suggest.h"
 #include "TestHint.h"
+#include "TestTags.h"
 
 #if USE_REPLXX
 #   include <common/ReplxxLineReader.h>
@@ -1031,19 +1033,30 @@ private:
         if (server_exception)
         {
             bool print_stack_trace = config().getBool("stacktrace", false);
-            std::cerr << "Received exception from server (version " << server_version << "):" << std::endl
-                << getExceptionMessage(*server_exception, print_stack_trace, true) << std::endl;
+            fmt::print(stderr, "Received exception from server (version {}):\n{}\n",
+                server_version,
+                getExceptionMessage(*server_exception, print_stack_trace, true));
             if (is_interactive)
-                std::cerr << std::endl;
+            {
+                fmt::print(stderr, "\n");
+            }
+            else
+            {
+                fmt::print(stderr, "(query: {})\n", full_query);
+            }
         }
 
         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", client_exception->message());
             if (is_interactive)
             {
                 fmt::print(stderr, "\n");
             }
+            else
+            {
+                fmt::print(stderr, "(query: {})\n", full_query);
+            }
         }
 
         // A debug check -- at least some exception must be set, if the error
@@ -1067,12 +1080,17 @@ private:
 
         bool echo_query = echo_queries;
 
+        /// Test tags are started with "--" so they are interpreted as comments anyway.
+        /// But if the echo is enabled we have to remove the test tags from `all_queries_text`
+        /// because we don't want test tags to be echoed.
+        size_t test_tags_length = test_mode ? getTestTagsLength(all_queries_text) : 0;
+
         /// Several queries separated by ';'.
         /// INSERT data is ended by the end of line, not ';'.
         /// An exception is VALUES format where we also support semicolon in
         /// addition to end of line.
 
-        const char * this_query_begin = all_queries_text.data();
+        const char * this_query_begin = all_queries_text.data() + test_tags_length;
         const char * all_queries_end = all_queries_text.data() + all_queries_text.size();
 
         while (this_query_begin < all_queries_end)
@@ -1244,13 +1262,17 @@ 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 (query: {}).\n",
+                            test_hint.serverError(),
+                            full_query);
                     }
                     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;
+                        fmt::print(stderr, "Expected server error code: {} but got: {} (query: {}).\n",
+                            test_hint.serverError(),
+                            server_exception->code(),
+                            full_query);
                     }
                 }
 
@@ -1259,13 +1281,17 @@ 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 (query: {}).\n",
+                            test_hint.clientError(),
+                            full_query);
                     }
                     else if (client_exception->code() != test_hint.clientError())
                     {
                         error_matches_hint = false;
-                        fmt::print(
-                            stderr, "Expected client error code '{}' but got '{}'.\n", test_hint.clientError(), client_exception->code());
+                        fmt::print(stderr, "Expected client error code '{}' but got '{}' (query: {}).\n",
+                            test_hint.clientError(),
+                            client_exception->code(),
+                            full_query);
                     }
                 }
 
@@ -1281,13 +1307,17 @@ 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 (query: {}).\n",
+                        test_hint.clientError(),
+                        full_query);
                     error_matches_hint = false;
                 }
 
                 if (test_hint.serverError())
                 {
-                    fmt::print(stderr, "The query succeeded but the server error '{}' was expected.\n", test_hint.serverError());
+                    fmt::print(stderr, "The query succeeded but the server error '{}' was expected (query: {}).\n",
+                        test_hint.serverError(),
+                        full_query);
                     error_matches_hint = false;
                 }
             }
@@ -1912,16 +1942,30 @@ private:
     {
         /// If INSERT data must be sent.
         auto * parsed_insert_query = parsed_query->as<ASTInsertQuery>();
+        /// If query isn't parsed, no information can be got from it.
         if (!parsed_insert_query)
             return;
 
+        /// If data is got from file (maybe compressed file)
         if (parsed_insert_query->infile)
         {
+            /// Get name of this file (path to file)
             const auto & in_file_node = parsed_insert_query->infile->as<ASTLiteral &>();
             const auto in_file = in_file_node.value.safeGet<std::string>();
 
-            auto in_buffer = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromFile>(in_file), chooseCompressionMethod(in_file, ""));
+            std::string compression_method;
+            /// Compression method can be specified in query
+            if (parsed_insert_query->compression)
+            {
+                const auto & compression_method_node = parsed_insert_query->compression->as<ASTLiteral &>();
+                compression_method = compression_method_node.value.safeGet<std::string>();
+            }
 
+            /// Otherwise, it will be detected from file name automatically (by chooseCompressionMethod)
+            /// Buffer for reading from file is created and wrapped with appropriate compression method
+            auto in_buffer = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromFile>(in_file), chooseCompressionMethod(in_file, compression_method));
+
+            /// Now data is ready to be sent on server.
             try
             {
                 sendDataFrom(*in_buffer, sample, columns_description);
@@ -1932,6 +1976,7 @@ private:
                 throw;
             }
         }
+        /// If query already has data to sent
         else if (parsed_insert_query->data)
         {
             /// Send data contained in the query.
@@ -2010,8 +2055,21 @@ private:
         PullingAsyncPipelineExecutor executor(pipeline);
 
         Block block;
-        while (executor.pull(block))
+        while (true)
         {
+            try
+            {
+                if (!executor.pull(block))
+                {
+                    break;
+                }
+            }
+            catch (Exception & e)
+            {
+                e.addMessage(fmt::format("(in query: {})", full_query));
+                throw;
+            }
+
             /// Check if server send Log packet
             receiveLogs();
 
@@ -2307,9 +2365,16 @@ private:
                     const auto & out_file_node = query_with_output->out_file->as<ASTLiteral &>();
                     const auto & out_file = out_file_node.value.safeGet<std::string>();
 
+                    std::string compression_method;
+                    if (query_with_output->compression)
+                    {
+                        const auto & compression_method_node = query_with_output->compression->as<ASTLiteral &>();
+                        compression_method = compression_method_node.value.safeGet<std::string>();
+                    }
+
                     out_file_buf = wrapWriteBufferWithCompressionMethod(
                         std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
-                        chooseCompressionMethod(out_file, ""),
+                        chooseCompressionMethod(out_file, compression_method),
                         /* compression level = */ 3
                     );
 
diff --git a/programs/client/TestTags.cpp b/programs/client/TestTags.cpp
new file mode 100644
index 00000000000..f3cb49cdabd
--- /dev/null
+++ b/programs/client/TestTags.cpp
@@ -0,0 +1,51 @@
+#include "TestTags.h"
+
+#include <cstring>
+
+namespace DB
+{
+
+size_t getTestTagsLength(const String & multiline_query)
+{
+    const String & text = multiline_query;
+    size_t pos = 0;
+    bool first_line = true;
+
+    while (true)
+    {
+        size_t line_start = pos;
+
+        /// Skip spaces.
+        while ((pos != text.length()) && (text[pos] == ' ' || text[pos] == '\t'))
+            ++pos;
+
+        /// Skip comment "--".
+        static constexpr const char comment[] = "--";
+        if (text.compare(pos, strlen(comment), comment) != 0)
+            return line_start;
+        pos += strlen(comment);
+
+        /// Skip the prefix "Tags:" if it's the first line.
+        if (first_line)
+        {
+            while ((pos != text.length()) && (text[pos] == ' ' || text[pos] == '\t'))
+                ++pos;
+
+            static constexpr const char tags_prefix[] = "Tags:";
+            if (text.compare(pos, strlen(tags_prefix), tags_prefix) != 0)
+                return 0;
+            pos += strlen(tags_prefix);
+            first_line = false;
+        }
+
+        /// Skip end-of-line.
+        size_t eol_pos = text.find_first_of("\r\n", pos);
+        if (eol_pos == String::npos)
+            return text.length();
+        bool two_chars_eol = (eol_pos + 1 < text.length()) && ((text[eol_pos + 1] == '\r') || (text[eol_pos + 1] == '\n')) && (text[eol_pos + 1] != text[eol_pos]);
+        size_t eol_length = two_chars_eol ? 2 : 1;
+        pos = eol_pos + eol_length;
+    }
+}
+
+}
diff --git a/programs/client/TestTags.h b/programs/client/TestTags.h
new file mode 100644
index 00000000000..e2e36698cb5
--- /dev/null
+++ b/programs/client/TestTags.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Core/Types.h>
+
+namespace DB
+{
+
+/// Returns the length of a text looking like
+/// -- Tags: x, y, z
+/// -- Tag x: explanation of tag x
+/// -- Tag y: explanation of tag y
+/// -- Tag z: explanation of tag z
+///
+/// at the beginning of a multiline query.
+/// If there are no test tags in the multiline query the function returns 0.
+size_t getTestTagsLength(const String & multiline_query);
+
+}
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
index cf0b6cc76a4..1e8222f8769 100644
--- a/programs/copier/ClusterCopier.cpp
+++ b/programs/copier/ClusterCopier.cpp
@@ -1274,13 +1274,14 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
     auto get_select_query = [&] (const DatabaseAndTableName & from_table, const String & fields, bool enable_splitting, String limit = "")
     {
         String query;
+        query += "WITH " + task_partition.name + " AS partition_key ";
         query += "SELECT " + fields + " FROM " + getQuotedTable(from_table);
 
         if (enable_splitting && experimental_use_sample_offset)
             query += " SAMPLE 1/" + toString(number_of_splits) + " OFFSET " + toString(current_piece_number) + "/" + toString(number_of_splits);
 
         /// TODO: Bad, it is better to rewrite with ASTLiteral(partition_key_field)
-        query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast) + " = (" + task_partition.name + " AS partition_key))";
+        query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast) + " = partition_key)";
 
         if (enable_splitting && !experimental_use_sample_offset)
             query += " AND ( cityHash64(" + primary_key_comma_separated + ") %" + toString(number_of_splits) + " = " + toString(current_piece_number) + " )";
@@ -1851,9 +1852,9 @@ bool ClusterCopier::checkShardHasPartition(const ConnectionTimeouts & timeouts,
     TaskTable & task_table = task_shard.task_table;
 
     WriteBufferFromOwnString ss;
+    ss << "WITH " + partition_quoted_name + " AS partition_key ";
     ss << "SELECT 1 FROM " << getQuotedTable(task_shard.table_read_shard);
-    ss << " WHERE (" << queryToString(task_table.engine_push_partition_key_ast);
-    ss << " = (" + partition_quoted_name << " AS partition_key))";
+    ss << " WHERE (" << queryToString(task_table.engine_push_partition_key_ast) << " = partition_key)";
     if (!task_table.where_condition_str.empty())
         ss << " AND (" << task_table.where_condition_str << ")";
     ss << " LIMIT 1";
@@ -1882,13 +1883,15 @@ bool ClusterCopier::checkPresentPartitionPiecesOnCurrentShard(const ConnectionTi
 
     UNUSED(primary_key_comma_separated);
 
-    std::string query = "SELECT 1 FROM " + getQuotedTable(task_shard.table_read_shard);
+    std::string query;
+
+    query += "WITH " + partition_quoted_name + " AS partition_key ";
+    query += "SELECT 1 FROM " + getQuotedTable(task_shard.table_read_shard);
 
     if (experimental_use_sample_offset)
         query += " SAMPLE 1/" + toString(number_of_splits) + " OFFSET " + toString(current_piece_number) + "/" + toString(number_of_splits);
 
-    query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast)
-                        + " = (" + partition_quoted_name + " AS partition_key))";
+    query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast) + " = partition_key)";
 
     if (!experimental_use_sample_offset)
         query += " AND (cityHash64(" + primary_key_comma_separated + ") % "
@@ -1961,7 +1964,7 @@ UInt64 ClusterCopier::executeQueryOnCluster(
                 }
                 catch (...)
                 {
-                    LOG_WARNING(log, "Seemns like node with address {} is unreachable.", node.host_name);
+                    LOG_WARNING(log, "Node with address {} seems to be unreachable.", node.host_name);
                     continue;
                 }
 
diff --git a/programs/format/Format.cpp b/programs/format/Format.cpp
index 5bf19191353..88d2199d978 100644
--- a/programs/format/Format.cpp
+++ b/programs/format/Format.cpp
@@ -44,6 +44,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
 
     boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
     desc.add_options()
+        ("query", po::value<std::string>(), "query to format")
         ("help,h", "produce help message")
         ("hilite", "add syntax highlight with ANSI terminal escape sequences")
         ("oneline", "format in single line")
@@ -86,8 +87,16 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
         }
 
         String query;
-        ReadBufferFromFileDescriptor in(STDIN_FILENO);
-        readStringUntilEOF(query, in);
+
+        if (options.count("query"))
+        {
+            query = options["query"].as<std::string>();
+        }
+        else
+        {
+            ReadBufferFromFileDescriptor in(STDIN_FILENO);
+            readStringUntilEOF(query, in);
+        }
 
         if (obfuscate)
         {
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index 8013b6cf991..3a40ba077ed 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -962,7 +962,7 @@ namespace
             if (isRunning(pid_file))
             {
                 throw Exception(ErrorCodes::CANNOT_KILL,
-                    "The server process still exists after %zu ms",
+                    "The server process still exists after {} tries (delay: {} ms)",
                     num_kill_check_tries, kill_check_delay_ms);
             }
         }
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 2b1b6185321..02328ca3d79 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -8,11 +8,12 @@
 #include <Poco/NullChannel.h>
 #include <Databases/DatabaseMemory.h>
 #include <Storages/System/attachSystemTables.h>
+#include <Storages/System/attachInformationSchemaTables.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/executeQuery.h>
 #include <Interpreters/loadMetadata.h>
 #include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/UserDefinedObjectsLoader.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
 #include <Interpreters/Session.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
@@ -179,20 +180,18 @@ void LocalServer::tryInitPath()
 }
 
 
-static void attachSystemTables(ContextPtr context)
+static DatabasePtr createMemoryDatabaseIfNotExists(ContextPtr context, const String & database_name)
 {
-    DatabasePtr system_database = DatabaseCatalog::instance().tryGetDatabase(DatabaseCatalog::SYSTEM_DATABASE);
+    DatabasePtr system_database = DatabaseCatalog::instance().tryGetDatabase(database_name);
     if (!system_database)
     {
         /// TODO: add attachTableDelayed into DatabaseMemory to speedup loading
-        system_database = std::make_shared<DatabaseMemory>(DatabaseCatalog::SYSTEM_DATABASE, context);
-        DatabaseCatalog::instance().attachDatabase(DatabaseCatalog::SYSTEM_DATABASE, system_database);
+        system_database = std::make_shared<DatabaseMemory>(database_name, context);
+        DatabaseCatalog::instance().attachDatabase(database_name, system_database);
     }
-
-    attachSystemTablesLocal(*system_database);
+    return system_database;
 }
 
-
 int LocalServer::main(const std::vector<std::string> & /*args*/)
 try
 {
@@ -246,6 +245,8 @@ try
     /// Sets external authenticators config (LDAP, Kerberos).
     global_context->setExternalAuthenticatorsConfig(config());
 
+    global_context->initializeBackgroundExecutors();
+
     setupUsers();
 
     /// Limit on total number of concurrently executing queries.
@@ -294,21 +295,26 @@ try
         fs::create_directories(fs::path(path) / "user_defined/");
         LOG_DEBUG(log, "Loading user defined objects from {}", path);
         Poco::File(path + "user_defined/").createDirectories();
-        UserDefinedObjectsLoader::instance().loadObjects(global_context);
+        UserDefinedSQLObjectsLoader::instance().loadObjects(global_context);
         LOG_DEBUG(log, "Loaded user defined objects.");
 
         LOG_DEBUG(log, "Loading metadata from {}", path);
         fs::create_directories(fs::path(path) / "data/");
         fs::create_directories(fs::path(path) / "metadata/");
         loadMetadataSystem(global_context);
-        attachSystemTables(global_context);
+        attachSystemTablesLocal(*createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::SYSTEM_DATABASE));
+        attachInformationSchema(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::INFORMATION_SCHEMA));
+        attachInformationSchema(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE));
         loadMetadata(global_context);
+        startupSystemTables();
         DatabaseCatalog::instance().loadDatabases();
         LOG_DEBUG(log, "Loaded metadata.");
     }
     else if (!config().has("no-system-tables"))
     {
-        attachSystemTables(global_context);
+        attachSystemTablesLocal(*createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::SYSTEM_DATABASE));
+        attachInformationSchema(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::INFORMATION_SCHEMA));
+        attachInformationSchema(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE));
     }
 
     processQueries();
@@ -393,6 +399,7 @@ void LocalServer::processQueries()
     auto context = session.makeQueryContext();
     context->makeSessionContext(); /// initial_create_query requires a session context to be set.
     context->setCurrentQueryId("");
+
     applyCmdSettings(context);
 
     /// Use the same query_id (and thread group) for all queries
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index c09b4f774fa..5804d28d337 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -14,7 +14,7 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/HelpFormatter.h>
 #include <Poco/Environment.h>
-#include <common/scope_guard.h>
+#include <common/scope_guard_safe.h>
 #include <common/defines.h>
 #include <common/logger_useful.h>
 #include <common/phdr_cache.h>
@@ -45,19 +45,18 @@
 #include <IO/UseSSL.h>
 #include <Interpreters/AsynchronousMetrics.h>
 #include <Interpreters/DDLWorker.h>
+#include <Interpreters/DNSCacheUpdater.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/ExternalModelsLoader.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/loadMetadata.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/DNSCacheUpdater.h>
-#include <Interpreters/ExternalLoaderXMLConfigRepository.h>
-#include <Interpreters/InterserverCredentials.h>
-#include <Interpreters/UserDefinedObjectsLoader.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
 #include <Access/AccessControlManager.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/System/attachSystemTables.h>
+#include <Storages/System/attachInformationSchemaTables.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <Functions/registerFunctions.h>
 #include <TableFunctions/registerTableFunctions.h>
@@ -79,6 +78,8 @@
 #include <Server/PostgreSQLHandlerFactory.h>
 #include <Server/ProtocolServerAdapter.h>
 #include <Server/HTTP/HTTPServer.h>
+#include <Interpreters/AsynchronousInsertQueue.h>
+#include <Compression/CompressionCodecEncrypted.h>
 #include <filesystem>
 
 #if !defined(ARCADIA_BUILD)
@@ -252,7 +253,6 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
-    extern const int INCORRECT_DATA;
     extern const int INVALID_CONFIG_PARAMETER;
     extern const int SYSTEM_ERROR;
     extern const int FAILED_TO_GETPWUID;
@@ -457,40 +457,6 @@ void checkForUsersNotInMainConfig(
     }
 }
 
-static void loadEncryptionKey(const std::string & key_command [[maybe_unused]], Poco::Logger * log)
-{
-#if USE_BASE64 && USE_SSL && USE_INTERNAL_SSL_LIBRARY
-
-    auto process = ShellCommand::execute(key_command);
-
-    std::string b64_key;
-    readStringUntilEOF(b64_key, process->out);
-    process->wait();
-
-    // turbob64 doesn't like whitespace characters in input. Strip
-    // them before decoding.
-    std::erase_if(b64_key, [](char c)
-    {
-        return c == ' ' || c == '\t' || c == '\r' || c == '\n';
-    });
-
-    std::vector<char> buf(b64_key.size());
-    const size_t key_size = tb64dec(reinterpret_cast<const unsigned char *>(b64_key.data()), b64_key.size(),
-                                    reinterpret_cast<unsigned char *>(buf.data()));
-    if (!key_size)
-        throw Exception("Failed to decode encryption key", ErrorCodes::INCORRECT_DATA);
-    else if (key_size < 16)
-        LOG_WARNING(log, "The encryption key should be at least 16 octets long.");
-
-    const std::string_view key = std::string_view(buf.data(), key_size);
-    CompressionCodecEncrypted::setMasterKey(key);
-
-#else
-    LOG_WARNING(log, "Server was built without Base64 or SSL support. Encryption is disabled.");
-#endif
-}
-
-
 [[noreturn]] void forceShutdown()
 {
 #if defined(THREAD_SANITIZER) && defined(OS_LINUX)
@@ -549,6 +515,8 @@ if (ThreadFuzzer::instance().isEffective())
     // ignore `max_thread_pool_size` in configs we fetch from ZK, but oh well.
     GlobalThreadPool::initialize(config().getUInt("max_thread_pool_size", 10000));
 
+    global_context->initializeBackgroundExecutors();
+
     ConnectionCollector::init(global_context, config().getUInt("max_threads_for_connection_collector", 10));
 
     bool has_zookeeper = config().has("zookeeper");
@@ -903,6 +871,8 @@ if (ThreadFuzzer::instance().isEffective())
 
             global_context->updateStorageConfiguration(*config);
             global_context->updateInterserverCredentials(*config);
+
+            CompressionCodecEncrypted::Configuration::instance().tryLoad(*config, "encryption_codecs");
         },
         /* already_loaded = */ false);  /// Reload it right now (initial loading)
 
@@ -943,6 +913,13 @@ if (ThreadFuzzer::instance().isEffective())
     global_context->setDefaultProfiles(config());
     const Settings & settings = global_context->getSettingsRef();
 
+    if (settings.async_insert_threads)
+        global_context->setAsynchronousInsertQueue(std::make_shared<AsynchronousInsertQueue>(
+            global_context,
+            settings.async_insert_threads,
+            settings.async_insert_max_data_size,
+            AsynchronousInsertQueue::Timeout{.busy = settings.async_insert_busy_timeout_ms, .stale = settings.async_insert_stale_timeout_ms}));
+
     /// Size of cache for marks (index of MergeTree family of tables). It is mandatory.
     size_t mark_cache_size = config().getUInt64("mark_cache_size");
     if (!mark_cache_size)
@@ -961,7 +938,7 @@ if (ThreadFuzzer::instance().isEffective())
         global_context->setMMappedFileCache(mmap_cache_size);
 
 #if USE_EMBEDDED_COMPILER
-    constexpr size_t compiled_expression_cache_size_default = 1024 * 1024 * 1024;
+    constexpr size_t compiled_expression_cache_size_default = 1024 * 1024 * 128;
     size_t compiled_expression_cache_size = config().getUInt64("compiled_expression_cache_size", compiled_expression_cache_size_default);
     CompiledExpressionCacheFactory::instance().init(compiled_expression_cache_size);
 #endif
@@ -975,9 +952,9 @@ if (ThreadFuzzer::instance().isEffective())
     global_context->getMergeTreeSettings().sanityCheck(settings);
     global_context->getReplicatedMergeTreeSettings().sanityCheck(settings);
 
-    /// Set up encryption.
-    if (config().has("encryption.key_command"))
-        loadEncryptionKey(config().getString("encryption.key_command"), log);
+
+    /// try set up encryption. There are some errors in config, error will be printed and server wouldn't start.
+    CompressionCodecEncrypted::Configuration::instance().load(config(), "encryption_codecs");
 
     Poco::Timespan keep_alive_timeout(config().getUInt("keep_alive_timeout", 10), 0);
 
@@ -1109,7 +1086,7 @@ if (ThreadFuzzer::instance().isEffective())
     LOG_INFO(log, "Loading user defined objects from {}", path_str);
     try
     {
-        UserDefinedObjectsLoader::instance().loadObjects(global_context);
+        UserDefinedSQLObjectsLoader::instance().loadObjects(global_context);
     }
     catch (...)
     {
@@ -1131,12 +1108,15 @@ if (ThreadFuzzer::instance().isEffective())
         global_context->setSystemZooKeeperLogAfterInitializationIfNeeded();
         /// After the system database is created, attach virtual system tables (in addition to query_log and part_log)
         attachSystemTablesServer(*database_catalog.getSystemDatabase(), has_zookeeper);
+        attachInformationSchema(global_context, *database_catalog.getDatabase(DatabaseCatalog::INFORMATION_SCHEMA));
+        attachInformationSchema(global_context, *database_catalog.getDatabase(DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE));
         /// Firstly remove partially dropped databases, to avoid race with MaterializedMySQLSyncThread,
         /// that may execute DROP before loadMarkedAsDroppedTables() in background,
         /// and so loadMarkedAsDroppedTables() will find it and try to add, and UUID will overlap.
         database_catalog.loadMarkedAsDroppedTables();
         /// Then, load remaining databases
         loadMetadata(global_context, default_database);
+        startupSystemTables();
         database_catalog.loadDatabases();
         /// After loading validate that default database exists
         database_catalog.assertDatabaseExists(default_database);
@@ -1494,6 +1474,17 @@ if (ThreadFuzzer::instance().isEffective())
             throw;
         }
 
+        /// try to load user defined executable functions, throw on error and die
+        try
+        {
+            global_context->loadUserDefinedExecutableFunctions(config());
+        }
+        catch (...)
+        {
+            LOG_ERROR(log, "Caught exception while loading user defined executable functions.");
+            throw;
+        }
+
         if (has_zookeeper && config().has("distributed_ddl"))
         {
             /// DDL worker should be started after all tables were loaded
@@ -1510,7 +1501,7 @@ if (ThreadFuzzer::instance().isEffective())
             server.start();
         LOG_INFO(log, "Ready for connections.");
 
-        SCOPE_EXIT({
+        SCOPE_EXIT_SAFE({
             LOG_DEBUG(log, "Received termination signal.");
             LOG_DEBUG(log, "Waiting for current connections to close.");
 
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 18bb23c6227..bd1c20ffa92 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -194,11 +194,11 @@
         <!-- The following file is used only if ssl_require_client_auth=1 -->
         <ssl_ca_cert_file>/path/to/ssl_ca_cert_file</ssl_ca_cert_file>
 
-        <!-- Default compression algorithm (applied if client doesn't specify another algorithm).
+        <!-- Default compression algorithm (applied if client doesn't specify another algorithm, see result_compression in QueryInfo).
              Supported algorithms: none, deflate, gzip, stream_gzip -->
         <compression>deflate</compression>
 
-        <!-- Default compression level (applied if client doesn't specify another level).
+        <!-- Default compression level (applied if client doesn't specify another level, see result_compression in QueryInfo).
              Supported levels: none, low, medium, high -->
         <compression_level>medium</compression_level>
 
@@ -331,7 +331,7 @@
     <mmap_cache_size>1000</mmap_cache_size>
 
     <!-- Cache size for compiled expressions.-->
-    <compiled_expression_cache_size>1073741824</compiled_expression_cache_size>
+    <compiled_expression_cache_size>134217728</compiled_expression_cache_size>
 
     <!-- Path to data directory, with trailing slash. -->
     <path>/var/lib/clickhouse/</path>
@@ -965,6 +965,14 @@
         <flush_interval_milliseconds>1000</flush_interval_milliseconds>
     </crash_log>
 
+    <!-- Session log. Stores user log in (successful or not) and log out events. -->
+    <session_log>
+        <database>system</database>
+        <table>session_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </session_log>
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
          See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
@@ -995,6 +1003,9 @@
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
+    <!-- Configuration of user defined executable functions -->
+    <user_defined_executable_functions_config>*_function.xml</user_defined_executable_functions_config>
+
     <!-- Uncomment if you want data to be compressed 30-100% better.
          Don't do that if you just started using ClickHouse.
       -->
@@ -1018,10 +1029,28 @@
          defined, or encryption codecs will be disabled otherwise. The
          command is executed through /bin/sh and is expected to write
          a Base64-encoded key to the stdout. -->
-    <encryption>
-        <!-- <key_command>/usr/bin/systemd-ask-password &#45;&#45;id="clickhouse-server" &#45;&#45;timeout=0 "Enter the ClickHouse encryption passphrase:" | base64</key_command> -->
-        <!-- <key_command><![CDATA[IFS=; echo -n >/dev/tty "Enter the ClickHouse encryption passphrase: "; stty=`stty -F /dev/tty -g`; stty -F /dev/tty -echo; read k </dev/tty; stty -F /dev/tty "$stty"; echo -n $k | base64]]></key_command> -->
-    </encryption>
+    <encryption_codecs>
+        <!-- aes_128_gcm_siv -->
+            <!-- Example of getting hex key from env -->
+            <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
+            <!--key_hex from_env="..."></key_hex -->
+
+            <!-- Example of multiple hex keys. They can be imported from env or be written down in config-->
+            <!-- the code should use these keys and throw an exception if their length is not 16 bytes -->
+            <!-- key_hex id="0">...</key_hex -->
+            <!-- key_hex id="1" from_env=".."></key_hex -->
+            <!-- key_hex id="2">...</key_hex -->
+            <!-- current_key_id>2</current_key_id -->
+
+            <!-- Example of getting hex key from config -->
+            <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
+            <!-- key>...</key -->
+
+            <!-- example of adding nonce -->
+            <!-- nonce>...</nonce -->
+
+        <!-- /aes_128_gcm_siv -->
+    </encryption_codecs>
 
     <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
          Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
diff --git a/programs/server/config.yaml.example b/programs/server/config.yaml.example
index 5b2da1d3128..ae4eac49a64 100644
--- a/programs/server/config.yaml.example
+++ b/programs/server/config.yaml.example
@@ -280,7 +280,7 @@ mark_cache_size: 5368709120
 mmap_cache_size: 1000
 
 # Cache size for compiled expressions.
-compiled_expression_cache_size: 1073741824
+compiled_expression_cache_size: 134217728
 
 # Path to data directory, with trailing slash.
 path: /var/lib/clickhouse/
diff --git a/programs/server/users.d/session_log_test.xml b/programs/server/users.d/session_log_test.xml
new file mode 120000
index 00000000000..85377f51630
--- /dev/null
+++ b/programs/server/users.d/session_log_test.xml
@@ -0,0 +1 @@
+../../../tests/config/users.d/session_log_test.xml
\ No newline at end of file
diff --git a/programs/server/ya.make b/programs/server/ya.make
deleted file mode 100644
index 1b99fb31a3f..00000000000
--- a/programs/server/ya.make
+++ /dev/null
@@ -1,22 +0,0 @@
-OWNER(g:clickhouse)
-
-PROGRAM(clickhouse-server)
-
-PEERDIR(
-    clickhouse/base/common
-    clickhouse/base/daemon
-    clickhouse/base/loggers
-    clickhouse/src
-    contrib/libs/poco/NetSSL_OpenSSL
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    clickhouse-server.cpp
-
-    MetricsTransmitter.cpp
-    Server.cpp
-)
-
-END()
diff --git a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
index 95611771b58..ad3a3090de6 100644
--- a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
+++ b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
@@ -15,8 +15,7 @@
 
 namespace fs = std::filesystem;
 
-#define UUID_PATTERN "[\\w]{8}-[\\w]{4}-[\\w]{4}-[\\w]{4}-[\\w]{12}"
-#define EXTRACT_UUID_PATTERN fmt::format(".*/({})/.*", UUID_PATTERN)
+#define EXTRACT_PATH_PATTERN ".*\\/store/(.*)"
 
 
 namespace DB
@@ -32,39 +31,102 @@ namespace ErrorCodes
  * If test-mode option is added, files will be put by given url via PUT request.
  */
 
-void processTableFiles(const fs::path & path, const String & files_prefix, String uuid,
-        WriteBuffer & metadata_buf, std::function<std::shared_ptr<WriteBuffer>(const String &)> create_dst_buf)
+void processFile(const fs::path & file_path, const fs::path & dst_path, bool test_mode, WriteBuffer & metadata_buf)
 {
-    fs::directory_iterator dir_end;
-    auto process_file = [&](const String & file_name, const String & file_path)
+    String remote_path;
+    RE2::FullMatch(file_path.string(), EXTRACT_PATH_PATTERN, &remote_path);
+    bool is_directory = fs::is_directory(file_path);
+
+    writeText(file_path.filename().string(), metadata_buf);
+    writeChar('\t', metadata_buf);
+    writeBoolText(is_directory, metadata_buf);
+    if (!is_directory)
     {
-        auto remote_file_name = files_prefix + "-" + uuid + "-" + file_name;
-        writeText(remote_file_name, metadata_buf);
         writeChar('\t', metadata_buf);
         writeIntText(fs::file_size(file_path), metadata_buf);
-        writeChar('\n', metadata_buf);
+    }
+    writeChar('\n', metadata_buf);
 
-        auto src_buf = createReadBufferFromFileBase(file_path, {}, fs::file_size(file_path));
-        auto dst_buf = create_dst_buf(remote_file_name);
+    if (is_directory)
+        return;
 
-        copyData(*src_buf, *dst_buf);
-        dst_buf->next();
-        dst_buf->finalize();
-    };
+    auto dst_file_path = fs::path(dst_path) / remote_path;
 
-    for (fs::directory_iterator dir_it(path); dir_it != dir_end; ++dir_it)
+    auto src_buf = createReadBufferFromFileBase(file_path, {}, fs::file_size(file_path));
+    std::shared_ptr<WriteBuffer> dst_buf;
+
+    /// test mode for integration tests.
+    if (test_mode)
+        dst_buf = std::make_shared<WriteBufferFromHTTP>(Poco::URI(dst_file_path), Poco::Net::HTTPRequest::HTTP_PUT);
+    else
+        dst_buf = std::make_shared<WriteBufferFromFile>(dst_file_path);
+
+    copyData(*src_buf, *dst_buf);
+    dst_buf->next();
+    dst_buf->finalize();
+};
+
+
+void processTableFiles(const fs::path & data_path, fs::path dst_path, bool test_mode)
+{
+    std::cerr << "Data path: " << data_path << ", destination path: " << dst_path << std::endl;
+
+    String prefix;
+    RE2::FullMatch(data_path.string(), EXTRACT_PATH_PATTERN, &prefix);
+
+    std::shared_ptr<WriteBuffer> root_meta;
+    if (test_mode)
+    {
+        dst_path /= "store";
+        auto files_root = dst_path / prefix;
+        root_meta = std::make_shared<WriteBufferFromHTTP>(Poco::URI(files_root / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
+    }
+    else
+    {
+        dst_path = fs::canonical(dst_path);
+        auto files_root = dst_path / prefix;
+        fs::create_directories(files_root);
+        root_meta = std::make_shared<WriteBufferFromFile>(files_root / ".index");
+    }
+
+    fs::directory_iterator dir_end;
+    for (fs::directory_iterator dir_it(data_path); dir_it != dir_end; ++dir_it)
     {
         if (dir_it->is_directory())
         {
+            processFile(dir_it->path(), dst_path, test_mode, *root_meta);
+
+            String directory_prefix;
+            RE2::FullMatch(dir_it->path().string(), EXTRACT_PATH_PATTERN, &directory_prefix);
+
+            std::shared_ptr<WriteBuffer> directory_meta;
+            if (test_mode)
+            {
+                auto files_root = dst_path / prefix;
+                directory_meta = std::make_shared<WriteBufferFromHTTP>(Poco::URI(dst_path / directory_prefix / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
+            }
+            else
+            {
+                dst_path = fs::canonical(dst_path);
+                auto files_root = dst_path / prefix;
+                fs::create_directories(dst_path / directory_prefix);
+                directory_meta = std::make_shared<WriteBufferFromFile>(dst_path / directory_prefix / ".index");
+            }
+
             fs::directory_iterator files_end;
             for (fs::directory_iterator file_it(dir_it->path()); file_it != files_end; ++file_it)
-                process_file(dir_it->path().filename().string() + "-" + file_it->path().filename().string(), file_it->path());
+                processFile(file_it->path(), dst_path, test_mode, *directory_meta);
+
+            directory_meta->next();
+            directory_meta->finalize();
         }
         else
         {
-            process_file(dir_it->path().filename(), dir_it->path());
+            processFile(dir_it->path(), dst_path, test_mode, *root_meta);
         }
     }
+    root_meta->next();
+    root_meta->finalize();
 }
 }
 
@@ -80,8 +142,7 @@ try
         ("metadata-path", po::value<std::string>(), "Metadata path (select data_paths from system.tables where name='table_name'")
         ("test-mode", "Use test mode, which will put data on given url via PUT")
         ("url", po::value<std::string>(), "Web server url for test mode")
-        ("output-dir", po::value<std::string>(), "Directory to put files in non-test mode")
-        ("files-prefix", po::value<std::string>(), "Prefix for stored files");
+        ("output-dir", po::value<std::string>(), "Directory to put files in non-test mode");
 
     po::parsed_options parsed = po::command_line_parser(argc, argv).options(description).run();
     po::variables_map options;
@@ -94,18 +155,13 @@ try
         exit(0);
     }
 
-    String url, metadata_path, files_prefix;
+    String metadata_path;
 
     if (options.count("metadata-path"))
         metadata_path = options["metadata-path"].as<std::string>();
     else
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "No metadata-path option passed");
 
-    if (options.count("files-prefix"))
-        files_prefix = options["files-prefix"].as<std::string>();
-    else
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No files-prefix option passed");
-
     fs::path fs_path = fs::weakly_canonical(metadata_path);
     if (!fs::exists(fs_path))
     {
@@ -113,27 +169,14 @@ try
         return 1;
     }
 
-    String uuid;
-    if (!RE2::Extract(metadata_path, EXTRACT_UUID_PATTERN, "\\1", &uuid))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot extract uuid for: {}", metadata_path);
-
-    std::shared_ptr<WriteBuffer> metadata_buf;
-    std::function<std::shared_ptr<WriteBuffer>(const String &)> create_dst_buf;
     String root_path;
-
-    if (options.count("test-mode"))
+    auto test_mode = options.contains("test-mode");
+    if (test_mode)
     {
         if (options.count("url"))
-            url = options["url"].as<std::string>();
+            root_path = options["url"].as<std::string>();
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "No url option passed for test mode");
-
-        metadata_buf = std::make_shared<WriteBufferFromHTTP>(Poco::URI(fs::path(url) / (".index-" + uuid)), Poco::Net::HTTPRequest::HTTP_PUT);
-
-        create_dst_buf = [&](const String & remote_file_name)
-        {
-            return std::make_shared<WriteBufferFromHTTP>(Poco::URI(fs::path(url) / remote_file_name), Poco::Net::HTTPRequest::HTTP_PUT);
-        };
     }
     else
     {
@@ -141,17 +184,9 @@ try
             root_path = options["output-dir"].as<std::string>();
         else
             root_path = fs::current_path();
-
-        metadata_buf = std::make_shared<WriteBufferFromFile>(fs::path(root_path) / (".index-" + uuid));
-        create_dst_buf = [&](const String & remote_file_name)
-        {
-            return std::make_shared<WriteBufferFromFile>(fs::path(root_path) / remote_file_name);
-        };
     }
 
-    processTableFiles(fs_path, files_prefix, uuid, *metadata_buf, create_dst_buf);
-    metadata_buf->next();
-    metadata_buf->finalize();
+    processTableFiles(fs_path, root_path, test_mode);
 
     return 0;
 }
diff --git a/programs/ya.make b/programs/ya.make
deleted file mode 100644
index 66a0b076442..00000000000
--- a/programs/ya.make
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER(g:clickhouse)
-
-PROGRAM(clickhouse)
-
-CFLAGS(
-    -DENABLE_CLICKHOUSE_CLIENT
-    -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
-    -DENABLE_CLICKHOUSE_SERVER
-)
-
-PEERDIR(
-    clickhouse/base/daemon
-    clickhouse/base/loggers
-    clickhouse/src
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    main.cpp
-
-    client/Client.cpp
-    client/QueryFuzzer.cpp
-    client/ConnectionParameters.cpp
-    client/Suggest.cpp
-    client/TestHint.cpp
-    extract-from-config/ExtractFromConfig.cpp
-    server/Server.cpp
-    server/MetricsTransmitter.cpp
-)
-
-END()
diff --git a/src/Access/AccessControlManager.h b/src/Access/AccessControlManager.h
index 15079ea61be..79f7073ef69 100644
--- a/src/Access/AccessControlManager.h
+++ b/src/Access/AccessControlManager.h
@@ -143,10 +143,11 @@ public:
 
     std::vector<QuotaUsage> getAllQuotasUsage() const;
 
-    std::shared_ptr<const EnabledSettings> getEnabledSettings(const UUID & user_id,
-                                                              const SettingsProfileElements & settings_from_user,
-                                                              const boost::container::flat_set<UUID> & enabled_roles,
-                                                              const SettingsProfileElements & settings_from_enabled_roles) const;
+    std::shared_ptr<const EnabledSettings> getEnabledSettings(
+        const UUID & user_id,
+        const SettingsProfileElements & settings_from_user,
+        const boost::container::flat_set<UUID> & enabled_roles,
+        const SettingsProfileElements & settings_from_enabled_roles) const;
 
     std::shared_ptr<const SettingsProfilesInfo> getSettingsProfileInfo(const UUID & profile_id);
 
diff --git a/src/Access/AccessType.h b/src/Access/AccessType.h
index 8e6a8be8e36..d031606616d 100644
--- a/src/Access/AccessType.h
+++ b/src/Access/AccessType.h
@@ -72,7 +72,10 @@ enum class AccessType
     M(ALTER_FETCH_PARTITION, "ALTER FETCH PART, FETCH PARTITION", TABLE, ALTER_TABLE) \
     M(ALTER_FREEZE_PARTITION, "FREEZE PARTITION, UNFREEZE", TABLE, ALTER_TABLE) \
     \
+    M(ALTER_DATABASE_SETTINGS, "ALTER DATABASE SETTING, ALTER MODIFY DATABASE SETTING, MODIFY DATABASE SETTING", DATABASE, ALTER_DATABASE) /* allows to execute ALTER MODIFY SETTING */\
+    \
     M(ALTER_TABLE, "", GROUP, ALTER) \
+    M(ALTER_DATABASE, "", GROUP, ALTER) \
     \
     M(ALTER_VIEW_REFRESH, "ALTER LIVE VIEW REFRESH, REFRESH VIEW", VIEW, ALTER_VIEW) \
     M(ALTER_VIEW_MODIFY_QUERY, "ALTER TABLE MODIFY QUERY", VIEW, ALTER_VIEW) \
@@ -143,6 +146,7 @@ enum class AccessType
     M(SYSTEM_RELOAD_SYMBOLS, "RELOAD SYMBOLS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_DICTIONARY, "SYSTEM RELOAD DICTIONARIES, RELOAD DICTIONARY, RELOAD DICTIONARIES", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_MODEL, "SYSTEM RELOAD MODELS, RELOAD MODEL, RELOAD MODELS", GLOBAL, SYSTEM_RELOAD) \
+    M(SYSTEM_RELOAD_FUNCTION, "SYSTEM RELOAD FUNCTIONS, RELOAD FUNCTION, RELOAD FUNCTIONS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_EMBEDDED_DICTIONARIES, "RELOAD EMBEDDED DICTIONARIES", GLOBAL, SYSTEM_RELOAD) /* implicitly enabled by the grant SYSTEM_RELOAD_DICTIONARY ON *.* */\
     M(SYSTEM_RELOAD, "", GROUP, SYSTEM) \
     M(SYSTEM_RESTART_DISK, "SYSTEM RESTART DISK", GLOBAL, SYSTEM) \
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
index 39b57a40e7a..5a615ad8fd6 100644
--- a/src/Access/ContextAccess.cpp
+++ b/src/Access/ContextAccess.cpp
@@ -119,8 +119,10 @@ namespace
         AccessRights res = access;
         res.modifyFlags(modifier);
 
-        /// Anyone has access to the "system" database.
+        /// Anyone has access to the "system" and "information_schema" database.
         res.grant(AccessType::SELECT, DatabaseCatalog::SYSTEM_DATABASE);
+        res.grant(AccessType::SELECT, DatabaseCatalog::INFORMATION_SCHEMA);
+        res.grant(AccessType::SELECT, DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE);
         return res;
     }
 
diff --git a/src/Access/SettingsProfilesInfo.h b/src/Access/SettingsProfilesInfo.h
index d1fba0e9f5f..f554ba8d89e 100644
--- a/src/Access/SettingsProfilesInfo.h
+++ b/src/Access/SettingsProfilesInfo.h
@@ -36,6 +36,16 @@ struct SettingsProfilesInfo
     friend bool operator ==(const SettingsProfilesInfo & lhs, const SettingsProfilesInfo & rhs);
     friend bool operator !=(const SettingsProfilesInfo & lhs, const SettingsProfilesInfo & rhs) { return !(lhs == rhs); }
 
+    Strings getProfileNames() const
+    {
+        Strings result;
+        result.reserve(profiles.size());
+        for (const auto & profile_id : profiles)
+            result.push_back(names_of_profiles.at(profile_id));
+
+        return result;
+    }
+
 private:
     const AccessControlManager & manager;
 };
diff --git a/src/Access/ya.make b/src/Access/ya.make
deleted file mode 100644
index 8a1f96bb870..00000000000
--- a/src/Access/ya.make
+++ /dev/null
@@ -1,54 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    AccessControlManager.cpp
-    AccessEntityIO.cpp
-    AccessRights.cpp
-    AccessRightsElement.cpp
-    AllowedClientHosts.cpp
-    Authentication.cpp
-    ContextAccess.cpp
-    Credentials.cpp
-    DiskAccessStorage.cpp
-    EnabledQuota.cpp
-    EnabledRoles.cpp
-    EnabledRolesInfo.cpp
-    EnabledRowPolicies.cpp
-    EnabledSettings.cpp
-    ExternalAuthenticators.cpp
-    GSSAcceptor.cpp
-    GrantedRoles.cpp
-    IAccessEntity.cpp
-    IAccessStorage.cpp
-    LDAPAccessStorage.cpp
-    LDAPClient.cpp
-    MemoryAccessStorage.cpp
-    MultipleAccessStorage.cpp
-    Quota.cpp
-    QuotaCache.cpp
-    QuotaUsage.cpp
-    ReplicatedAccessStorage.cpp
-    Role.cpp
-    RoleCache.cpp
-    RolesOrUsersSet.cpp
-    RowPolicy.cpp
-    RowPolicyCache.cpp
-    SettingsConstraints.cpp
-    SettingsProfile.cpp
-    SettingsProfileElement.cpp
-    SettingsProfilesCache.cpp
-    SettingsProfilesInfo.cpp
-    User.cpp
-    UsersConfigAccessStorage.cpp
-
-)
-
-END()
diff --git a/src/Access/ya.make.in b/src/Access/ya.make.in
deleted file mode 100644
index 7d91972194d..00000000000
--- a/src/Access/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/AggregateFunctions/AggregateFunctionArray.cpp b/src/AggregateFunctions/AggregateFunctionArray.cpp
index 982180ab50c..3591bea5f9e 100644
--- a/src/AggregateFunctions/AggregateFunctionArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionArray.cpp
@@ -21,6 +21,8 @@ class AggregateFunctionCombinatorArray final : public IAggregateFunctionCombinat
 public:
     String getName() const override { return "Array"; }
 
+    bool supportsNesting() const override { return true; }
+
     DataTypes transformArguments(const DataTypes & arguments) const override
     {
         if (arguments.empty())
diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index ad5c67d88d4..fd8f9faa3f8 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -21,11 +21,9 @@
 namespace DB
 {
 struct Settings;
-template <typename T>
-using DecimalOrVectorCol = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
 
 template <typename T> constexpr bool DecimalOrExtendedInt =
-    IsDecimalNumber<T>
+    is_decimal<T>
     || std::is_same_v<T, Int128>
     || std::is_same_v<T, Int256>
     || std::is_same_v<T, UInt128>
@@ -44,7 +42,7 @@ struct AvgFraction
     /// Invoked only is either Numerator or Denominator are Decimal.
     Float64 NO_SANITIZE_UNDEFINED divideIfAnyDecimal(UInt32 num_scale, UInt32 denom_scale [[maybe_unused]]) const
     {
-        if constexpr (IsDecimalNumber<Numerator> && IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Numerator> && is_decimal<Denominator>)
         {
             // According to the docs, num(S1) / denom(S2) would have scale S1
 
@@ -60,7 +58,7 @@ struct AvgFraction
         /// Numerator is always casted to Float64 to divide correctly if the denominator is not Float64.
         Float64 num_converted;
 
-        if constexpr (IsDecimalNumber<Numerator>)
+        if constexpr (is_decimal<Numerator>)
             num_converted = DecimalUtils::convertTo<Float64>(numerator, num_scale);
         else
             num_converted = static_cast<Float64>(numerator); /// all other types, including extended integral.
@@ -68,7 +66,7 @@ struct AvgFraction
         std::conditional_t<DecimalOrExtendedInt<Denominator>,
             Float64, Denominator> denom_converted;
 
-        if constexpr (IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Denominator>)
             denom_converted = DecimalUtils::convertTo<Float64>(denominator, denom_scale);
         else if constexpr (DecimalOrExtendedInt<Denominator>)
             /// no way to divide Float64 and extended integral type without an explicit cast.
@@ -139,7 +137,7 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        if constexpr (IsDecimalNumber<Numerator> || IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Numerator> || is_decimal<Denominator>)
             assert_cast<ColumnVector<Float64> &>(to).getData().push_back(
                 this->data(place).divideIfAnyDecimal(num_scale, denom_scale));
         else
@@ -222,7 +220,7 @@ private:
 };
 
 template <typename T>
-using AvgFieldType = std::conditional_t<IsDecimalNumber<T>,
+using AvgFieldType = std::conditional_t<is_decimal<T>,
     std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
     NearestFieldType<T>>;
 
@@ -239,7 +237,7 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const final
     {
-        this->data(place).numerator += static_cast<const DecimalOrVectorCol<T> &>(*columns[0]).getData()[row_num];
+        this->data(place).numerator += static_cast<const ColumnVectorOrDecimal<T> &>(*columns[0]).getData()[row_num];
         ++this->data(place).denominator;
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
index 68d48803718..6189ae92ce4 100644
--- a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
+++ b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
@@ -8,7 +8,7 @@ namespace DB
 struct Settings;
 
 template <typename T>
-using AvgWeightedFieldType = std::conditional_t<IsDecimalNumber<T>,
+using AvgWeightedFieldType = std::conditional_t<is_decimal<T>,
     std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
     std::conditional_t<DecimalOrExtendedInt<T>,
         Float64, // no way to do UInt128 * UInt128, better cast to Float64
@@ -34,10 +34,10 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
-        const auto& weights = static_cast<const DecimalOrVectorCol<Weight> &>(*columns[1]);
+        const auto& weights = static_cast<const ColumnVectorOrDecimal<Weight> &>(*columns[1]);
 
         this->data(place).numerator += static_cast<Numerator>(
-            static_cast<const DecimalOrVectorCol<Value> &>(*columns[0]).getData()[row_num]) *
+            static_cast<const ColumnVectorOrDecimal<Value> &>(*columns[0]).getData()[row_num]) *
             static_cast<Numerator>(weights.getData()[row_num]);
 
         this->data(place).denominator += static_cast<Denominator>(weights.getData()[row_num]);
diff --git a/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp b/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp
new file mode 100644
index 00000000000..8569e8f9c8c
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp
@@ -0,0 +1,98 @@
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <Common/ExponentiallySmoothedCounter.h>
+#include <Common/FieldVisitorConvertToNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+
+/** See the comments in ExponentiallySmoothedCounter.h
+  */
+class AggregateFunctionExponentialMovingAverage final
+    : public IAggregateFunctionDataHelper<ExponentiallySmoothedAverage, AggregateFunctionExponentialMovingAverage>
+{
+private:
+    String name;
+    Float64 half_decay;
+
+public:
+    AggregateFunctionExponentialMovingAverage(const DataTypes & argument_types_, const Array & params)
+        : IAggregateFunctionDataHelper<ExponentiallySmoothedAverage, AggregateFunctionExponentialMovingAverage>(argument_types_, params)
+    {
+        if (params.size() != 1)
+            throw Exception{"Aggregate function " + getName() + " requires exactly one parameter: half decay time.",
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+
+        half_decay = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
+    }
+
+    String getName() const override
+    {
+        return "exponentialMovingAverage";
+    }
+
+    DataTypePtr getReturnType() const override
+    {
+        return std::make_shared<DataTypeNumber<Float64>>();
+    }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
+    {
+        const auto & value = columns[0]->getFloat64(row_num);
+        const auto & time = columns[1]->getFloat64(row_num);
+        this->data(place).add(value, time, half_decay);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
+    {
+        this->data(place).merge(this->data(rhs), half_decay);
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
+    {
+        writeBinary(this->data(place).value, buf);
+        writeBinary(this->data(place).time, buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena *) const override
+    {
+        readBinary(this->data(place).value, buf);
+        readBinary(this->data(place).time, buf);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        auto & column = assert_cast<ColumnVector<Float64> &>(to);
+        column.getData().push_back(this->data(place).get(half_decay));
+    }
+};
+
+void registerAggregateFunctionExponentialMovingAverage(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("exponentialMovingAverage",
+        [](const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *) -> AggregateFunctionPtr
+        {
+            assertBinary(name, argument_types);
+            for (const auto & type : argument_types)
+                if (!isNumber(*type))
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Both arguments for aggregate function {} must have numeric type, got {}", name, type->getName());
+            return std::make_shared<AggregateFunctionExponentialMovingAverage>(argument_types, params);
+        });
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index c9dcdb54424..c9a44dba6f2 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -29,6 +29,7 @@ namespace ErrorCodes
 {
     extern const int UNKNOWN_AGGREGATE_FUNCTION;
     extern const int LOGICAL_ERROR;
+    extern const int ILLEGAL_AGGREGATION;
 }
 
 const String & getAggregateFunctionCanonicalNameIfAny(const String & name)
@@ -159,13 +160,32 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
 
     if (AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix(name))
     {
+        const std::string & combinator_name = combinator->getName();
+
         if (combinator->isForInternalUsageOnly())
-            throw Exception("Aggregate function combinator '" + combinator->getName() + "' is only for internal usage", ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION);
+            throw Exception(ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION,
+                "Aggregate function combinator '{}' is only for internal usage",
+                combinator_name);
 
         if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunctionCombinator, combinator->getName());
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunctionCombinator, combinator_name);
+
+        String nested_name = name.substr(0, name.size() - combinator_name.size());
+        /// Nested identical combinators (i.e. uniqCombinedIfIf) is not
+        /// supported (since they even don't work -- silently).
+        ///
+        /// But non-identical does supported and works, for example
+        /// uniqCombinedIfMergeIf, it is useful in case when the underlying
+        /// storage stores AggregateFunction(uniqCombinedIf) and in SELECT you
+        /// need to filter aggregation result based on another column for
+        /// example.
+        if (!combinator->supportsNesting() && nested_name.ends_with(combinator_name))
+        {
+            throw Exception(ErrorCodes::ILLEGAL_AGGREGATION,
+                "Nested identical combinator '{}' is not supported",
+                combinator_name);
+        }
 
-        String nested_name = name.substr(0, name.size() - combinator->getName().size());
         DataTypes nested_types = combinator->transformArguments(argument_types);
         Array nested_parameters = combinator->transformParameters(parameters);
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
index e4eff6be901..3e0f1849545 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
@@ -25,14 +25,14 @@ namespace
 template <typename T, typename LimitNumberOfElements>
 struct MovingSum
 {
-    using Data = MovingSumData<std::conditional_t<IsDecimalNumber<T>, Decimal128, NearestFieldType<T>>>;
+    using Data = MovingSumData<std::conditional_t<is_decimal<T>, Decimal128, NearestFieldType<T>>>;
     using Function = MovingImpl<T, LimitNumberOfElements, Data>;
 };
 
 template <typename T, typename LimitNumberOfElements>
 struct MovingAvg
 {
-    using Data = MovingAvgData<std::conditional_t<IsDecimalNumber<T>, Decimal128, Float64>>;
+    using Data = MovingAvgData<std::conditional_t<is_decimal<T>, Decimal128, Float64>>;
     using Function = MovingImpl<T, LimitNumberOfElements, Data>;
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
index daaa7a69baf..a3b7dc841b6 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
@@ -87,18 +87,10 @@ class MovingImpl final
 public:
     using ResultT = typename Data::Accumulator;
 
-    using ColumnSource = std::conditional_t<IsDecimalNumber<T>,
-        ColumnDecimal<T>,
-        ColumnVector<T>>;
+    using ColumnSource = ColumnVectorOrDecimal<T>;
 
     /// Probably for overflow function in the future.
-    using ColumnResult = std::conditional_t<IsDecimalNumber<ResultT>,
-        ColumnDecimal<ResultT>,
-        ColumnVector<ResultT>>;
-
-    using DataTypeResult = std::conditional_t<IsDecimalNumber<ResultT>,
-        DataTypeDecimal<ResultT>,
-        DataTypeNumber<ResultT>>;
+    using ColumnResult = ColumnVectorOrDecimal<ResultT>;
 
     explicit MovingImpl(const DataTypePtr & data_type_, UInt64 window_size_ = std::numeric_limits<UInt64>::max())
         : IAggregateFunctionDataHelper<Data, MovingImpl<T, Tlimit_num_elems, Data>>({data_type_}, {})
@@ -106,14 +98,7 @@ public:
 
     String getName() const override { return Data::name; }
 
-    DataTypePtr getReturnType() const override
-    {
-        if constexpr (IsDecimalNumber<ResultT>)
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeResult>(
-                DataTypeResult::maxPrecision(), getDecimalScale(*this->argument_types.at(0))));
-        else
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeResult>());
-    }
+    DataTypePtr getReturnType() const override { return std::make_shared<DataTypeArray>(getReturnTypeElement()); }
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
     {
@@ -196,6 +181,18 @@ public:
     {
         return true;
     }
+
+private:
+    auto getReturnTypeElement() const
+    {
+        if constexpr (!is_decimal<ResultT>)
+            return std::make_shared<DataTypeNumber<ResultT>>();
+        else
+        {
+            using Res = DataTypeDecimal<ResultT>;
+            return std::make_shared<Res>(Res::maxPrecision(), getDecimalScale(*this->argument_types.at(0)));
+        }
+    }
 };
 
 #undef AGGREGATE_FUNCTION_MOVING_MAX_ARRAY_SIZE
diff --git a/src/AggregateFunctions/AggregateFunctionIf.cpp b/src/AggregateFunctions/AggregateFunctionIf.cpp
index 5082952f386..4ac6a2dce21 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.cpp
+++ b/src/AggregateFunctions/AggregateFunctionIf.cpp
@@ -10,7 +10,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int ILLEGAL_AGGREGATION;
 }
 
 class AggregateFunctionCombinatorIf final : public IAggregateFunctionCombinator
@@ -37,10 +36,6 @@ public:
         const DataTypes & arguments,
         const Array & params) const override
     {
-        if (nested_function->getName().find(getName()) != String::npos)
-        {
-            throw Exception(ErrorCodes::ILLEGAL_AGGREGATION, "nested function for {0}-combinator must not have {0}-combinator", getName());
-        }
         return std::make_shared<AggregateFunctionIf>(nested_function, arguments, params);
     }
 };
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index e5471b8a727..8fa4b235c2c 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -44,7 +44,7 @@ struct SingleValueDataFixed
 {
 private:
     using Self = SingleValueDataFixed;
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
 
     bool has_value = false; /// We need to remember if at least one value has been passed. This is necessary for AggregateFunctionIf.
     T value;
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.cpp b/src/AggregateFunctions/AggregateFunctionOrFill.cpp
index 3ba20e65e32..7aee0289879 100644
--- a/src/AggregateFunctions/AggregateFunctionOrFill.cpp
+++ b/src/AggregateFunctions/AggregateFunctionOrFill.cpp
@@ -23,6 +23,9 @@ private:
 public:
     explicit AggregateFunctionCombinatorOrFill(Kind kind_) : kind(kind_) {}
 
+    /// Due to aggregate_functions_null_for_empty
+    bool supportsNesting() const override { return true; }
+
     String getName() const override
     {
         return kind == Kind::OrNull ? "OrNull" : "OrDefault";
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index 65d1df9fe77..5ca52f6d73a 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -67,10 +67,10 @@ class AggregateFunctionQuantile final : public IAggregateFunctionDataHelper<Data
     AggregateFunctionQuantile<Value, Data, Name, has_second_arg, FloatReturnType, returns_many>>
 {
 private:
-    using ColVecType = std::conditional_t<IsDecimalNumber<Value>, ColumnDecimal<Value>, ColumnVector<Value>>;
+    using ColVecType = ColumnVectorOrDecimal<Value>;
 
     static constexpr bool returns_float = !(std::is_same_v<FloatReturnType, void>);
-    static_assert(!IsDecimalNumber<Value> || !returns_float);
+    static_assert(!is_decimal<Value> || !returns_float);
 
     QuantileLevels<Float64> levels;
 
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.cpp b/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
new file mode 100644
index 00000000000..7f1196173a7
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
@@ -0,0 +1,72 @@
+#include <AggregateFunctions/AggregateFunctionSparkbar.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+
+
+namespace DB
+{
+
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+template <template <typename, typename> class AggregateFunctionTemplate, typename Data, typename ... TArgs>
+static IAggregateFunction * createWithUIntegerOrTimeType(const std::string & name, const IDataType & argument_type, TArgs && ... args)
+{
+    WhichDataType which(argument_type);
+    if (which.idx == TypeIndex::Date || which.idx == TypeIndex::UInt16) return new AggregateFunctionTemplate<UInt16, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::DateTime || which.idx == TypeIndex::UInt32) return new AggregateFunctionTemplate<UInt32, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt8) return new AggregateFunctionTemplate<UInt8, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt64) return new AggregateFunctionTemplate<UInt64, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt128) return new AggregateFunctionTemplate<UInt128, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt256) return new AggregateFunctionTemplate<UInt256, Data>(std::forward<TArgs>(args)...);
+    throw Exception("The first argument type must be UInt or Date or DateTime for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+}
+
+template <typename ... TArgs>
+AggregateFunctionPtr createAggregateFunctionSparkbarImpl(const std::string & name, const IDataType & x_argument_type, const IDataType & y_argument_type, TArgs ... args)
+{
+    WhichDataType which(y_argument_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) return AggregateFunctionPtr(createWithUIntegerOrTimeType<AggregateFunctionSparkbar, TYPE>(name, x_argument_type, std::forward<TArgs>(args)...));
+    FOR_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+    throw Exception("The second argument type must be numeric for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+}
+
+
+AggregateFunctionPtr createAggregateFunctionSparkbar(const std::string & name, const DataTypes & arguments, const Array & params, const Settings *)
+{
+    assertBinary(name, arguments);
+
+    if (params.size() != 1 && params.size() != 3)
+        throw Exception("The number of params does not match for aggregate function " + name, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    if (params.size() == 3)
+    {
+        if (params.at(1).getType() != arguments[0]->getDefault().getType() || params.at(2).getType() != arguments[0]->getDefault().getType())
+        {
+            throw Exception("The second and third parameters are not the same type as the first arguments for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+    }
+    return createAggregateFunctionSparkbarImpl(name, *arguments[0], *arguments[1], arguments, params);
+}
+
+
+}
+
+void registerAggregateFunctionSparkbar(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("sparkbar", createAggregateFunctionSparkbar);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
new file mode 100644
index 00000000000..51c10d05f6f
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -0,0 +1,309 @@
+#pragma once
+
+#include <DataTypes/DataTypeString.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <common/range.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Columns/ColumnString.h>
+#include <common/logger_useful.h>
+#include <IO/ReadBufferFromString.h>
+#include <Common/HashTable/HashMap.h>
+
+namespace DB
+{
+
+template<typename X, typename Y>
+struct AggregateFunctionSparkbarData
+{
+
+    using Points = HashMap<X, Y>;
+    Points points;
+
+    X min_x = std::numeric_limits<X>::max();
+    X max_x = std::numeric_limits<X>::lowest();
+
+    Y min_y = std::numeric_limits<Y>::max();
+    Y max_y = std::numeric_limits<Y>::lowest();
+
+    void insert(const X & x, const Y & y)
+    {
+        auto result = points.insert({x, y});
+        if (!result.second)
+            result.first->getMapped() += y;
+    }
+
+    void add(X x, Y y)
+    {
+        insert(x, y);
+        min_x = std::min(x, min_x);
+        max_x = std::max(x, max_x);
+        min_y = std::min(y, min_y);
+        max_y = std::max(y, max_y);
+    }
+
+    void merge(const AggregateFunctionSparkbarData & other)
+    {
+        if (other.points.empty())
+            return;
+
+        for (auto & point : other.points)
+            insert(point.getKey(), point.getMapped());
+
+        min_x = std::min(other.min_x, min_x);
+        max_x = std::max(other.max_x, max_x);
+        min_y = std::min(other.min_y, min_y);
+        max_y = std::max(other.max_y, max_y);
+    }
+
+    void serialize(WriteBuffer & buf) const
+    {
+        writeBinary(min_x, buf);
+        writeBinary(max_x, buf);
+        writeBinary(min_y, buf);
+        writeBinary(max_y, buf);
+        writeVarUInt(points.size(), buf);
+
+        for (const auto & elem : points)
+        {
+            writeBinary(elem.getKey(), buf);
+            writeBinary(elem.getMapped(), buf);
+        }
+    }
+
+    void deserialize(ReadBuffer & buf)
+    {
+        readBinary(min_x, buf);
+        readBinary(max_x, buf);
+        readBinary(min_y, buf);
+        readBinary(max_y, buf);
+        size_t size;
+        readVarUInt(size, buf);
+
+        /// TODO Protection against huge size
+        X x;
+        Y y;
+        for (size_t i = 0; i < size; ++i)
+        {
+            readBinary(x, buf);
+            readBinary(y, buf);
+            insert(x, y);
+        }
+    }
+
+};
+
+template<typename X, typename Y>
+class AggregateFunctionSparkbar final
+    : public IAggregateFunctionDataHelper<AggregateFunctionSparkbarData<X, Y>, AggregateFunctionSparkbar<X, Y>>
+{
+
+private:
+    size_t width;
+    X min_x;
+    X max_x;
+
+    String getBar(const UInt8 value) const
+    {
+        // ▁▂▃▄▅▆▇█
+        switch (value)
+        {
+            case 1: return "▁";
+            case 2: return "▂";
+            case 3: return "▃";
+            case 4: return "▄";
+            case 5: return "▅";
+            case 6: return "▆";
+            case 7: return "▇";
+            case 8: return "█";
+        }
+        return " ";
+    }
+
+    /**
+     *  The minimum value of y is rendered as the lowest height "▁",
+     *  the maximum value of y is rendered as the highest height "█", and the middle value will be rendered proportionally.
+     *  If a bucket has no y value, it will be rendered as " ".
+     *  If the actual number of buckets is greater than the specified bucket, it will be compressed by width.
+     *  For example, there are actually 11 buckets, specify 10 buckets, and divide the 11 buckets as follows (11/10):
+     *  0.0-1.1, 1.1-2.2, 2.2-3.3, 3.3-4.4, 4.4-5.5, 5.5-6.6, 6.6-7.7, 7.7-8.8, 8.8-9.9, 9.9-11.
+     *  The y value of the first bucket will be calculated as follows:
+     *  the actual y value of the first position + the actual second position y*0.1, and the remaining y*0.9 is reserved for the next bucket.
+     *  The next bucket will use the last y*0.9 + the actual third position y*0.2, and the remaining y*0.8 will be reserved for the next bucket. And so on.
+     */
+    String render(const AggregateFunctionSparkbarData<X, Y> & data) const
+    {
+        String value;
+        if (data.points.empty() || !width)
+            return value;
+        X local_min_x = data.min_x;
+        X local_max_x = data.max_x;
+        size_t diff_x = local_max_x - local_min_x;
+        if ((diff_x + 1) <= width)
+        {
+            Y min_y = data.min_y;
+            Y max_y = data.max_y;
+            Float64 diff_y = max_y - min_y;
+
+            if (diff_y)
+            {
+                for (size_t i = 0; i <= diff_x; ++i)
+                {
+                    auto it = data.points.find(local_min_x + i);
+                    bool found = it != data.points.end();
+                    value += getBar(found ? static_cast<UInt8>(std::round(((it->getMapped() - min_y) / diff_y) * 7) + 1) : 0);
+                }
+            }
+            else
+            {
+                for (size_t i = 0; i <= diff_x; ++i)
+                    value += getBar(data.points.has(local_min_x + i) ? 1 : 0);
+            }
+        }
+        else
+        {
+            // begin reshapes to width buckets
+            Float64 multiple_d = (diff_x + 1) / static_cast<Float64>(width);
+
+            std::optional<Float64> min_y;
+            std::optional<Float64> max_y;
+
+            std::optional<Float64> new_y;
+            std::vector<std::optional<Float64>> newPoints;
+            newPoints.reserve(width);
+
+            std::pair<size_t, Float64> bound{0, 0.0};
+            size_t cur_bucket_num = 0;
+            // upper bound for bucket
+            auto upperBound = [&](size_t bucket_num)
+            {
+                bound.second = (bucket_num + 1) * multiple_d;
+                bound.first = std::floor(bound.second);
+            };
+            upperBound(cur_bucket_num);
+            for (size_t i = 0; i <= (diff_x + 1); ++i)
+            {
+                if (i == bound.first) // is bound
+                {
+                    Float64 proportion = bound.second - bound.first;
+                    auto it = data.points.find(local_min_x + i);
+                    bool found = (it != data.points.end());
+                    if (found)
+                        new_y = new_y.value_or(0) + it->getMapped() * proportion;
+
+                    if (new_y)
+                    {
+                        Float64 avg_y = new_y.value() / multiple_d;
+
+                        newPoints.emplace_back(avg_y);
+                        // If min_y has no value, or if the avg_y of the current bucket is less than min_y, update it.
+                        if (!min_y || avg_y < min_y)
+                            min_y = avg_y;
+                        if (!max_y || avg_y > max_y)
+                            max_y = avg_y;
+                    }
+                    else
+                    {
+                        newPoints.emplace_back();
+                    }
+
+                    // next bucket
+                    new_y = found ? ((1 - proportion) * it->getMapped()) : std::optional<Float64>();
+                    upperBound(++cur_bucket_num);
+                }
+                else
+                {
+                    auto it = data.points.find(local_min_x + i);
+                    if (it != data.points.end())
+                        new_y = new_y.value_or(0) + it->getMapped();
+                }
+            }
+
+            if (!min_y || !max_y) // No value is set
+                return {};
+
+            Float64 diff_y = max_y.value() - min_y.value();
+
+            auto getBars = [&] (const std::optional<Float64> & point_y)
+            {
+                value += getBar(point_y ? static_cast<UInt8>(std::round(((point_y.value() - min_y.value()) / diff_y) * 7) + 1) : 0);
+            };
+            auto getBarsForConstant = [&] (const std::optional<Float64> & point_y)
+            {
+                value += getBar(point_y ? 1 : 0);
+            };
+
+            if (diff_y)
+                std::for_each(newPoints.begin(), newPoints.end(), getBars);
+            else
+                std::for_each(newPoints.begin(), newPoints.end(), getBarsForConstant);
+        }
+        return value;
+    }
+
+
+public:
+    AggregateFunctionSparkbar(const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionDataHelper<AggregateFunctionSparkbarData<X, Y>, AggregateFunctionSparkbar>(
+        arguments, params)
+    {
+        width = params.at(0).safeGet<UInt64>();
+        if (params.size() == 3)
+        {
+            min_x = params.at(1).safeGet<X>();
+            max_x = params.at(2).safeGet<X>();
+        }
+        else
+        {
+            min_x = std::numeric_limits<X>::min();
+            max_x = std::numeric_limits<X>::max();
+        }
+    }
+
+    String getName() const override
+    {
+        return "sparkbar";
+    }
+
+    DataTypePtr getReturnType() const override
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * /*arena*/) const override
+    {
+        X x = assert_cast<const ColumnVector<X> *>(columns[0])->getData()[row_num];
+        if (min_x <= x && x <= max_x)
+        {
+            Y y = assert_cast<const ColumnVector<Y> *>(columns[1])->getData()[row_num];
+            this->data(place).add(x, y);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * /*arena*/) const override
+    {
+        this->data(place).merge(this->data(rhs));
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
+    {
+        this->data(place).serialize(buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena *) const override
+    {
+        this->data(place).deserialize(buf);
+    }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * /*arena*/) const override
+    {
+        auto & to_column = assert_cast<ColumnString &>(to);
+        const auto & data = this->data(place);
+        const String & value = render(data);
+        to_column.insertData(value.data(), value.size());
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
index e57781fac33..1fd1c1e170b 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
@@ -49,7 +49,7 @@ struct StatFuncOneArg
     using Type1 = T;
     using Type2 = T;
     using ResultType = std::conditional_t<std::is_same_v<T, Float32>, Float32, Float64>;
-    using Data = std::conditional_t<IsDecimalNumber<T>, VarMomentsDecimal<Decimal128, _level>, VarMoments<ResultType, _level>>;
+    using Data = std::conditional_t<is_decimal<T>, VarMomentsDecimal<Decimal128, _level>, VarMoments<ResultType, _level>>;
 
     static constexpr StatisticsFunctionKind kind = _kind;
     static constexpr UInt32 num_args = 1;
@@ -75,8 +75,8 @@ class AggregateFunctionVarianceSimple final
 public:
     using T1 = typename StatFunc::Type1;
     using T2 = typename StatFunc::Type2;
-    using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
-    using ColVecT2 = std::conditional_t<IsDecimalNumber<T2>, ColumnDecimal<T2>, ColumnVector<T2>>;
+    using ColVecT1 = ColumnVectorOrDecimal<T1>;
+    using ColVecT2 = ColumnVectorOrDecimal<T2>;
     using ResultType = typename StatFunc::ResultType;
     using ColVecResult = ColumnVector<ResultType>;
 
@@ -132,7 +132,7 @@ public:
                 static_cast<ResultType>(static_cast<const ColVecT2 &>(*columns[1]).getData()[row_num]));
         else
         {
-            if constexpr (IsDecimalNumber<T1>)
+            if constexpr (is_decimal<T1>)
             {
                 this->data(place).add(static_cast<ResultType>(
                     static_cast<const ColVecT1 &>(*columns[0]).getData()[row_num].value));
@@ -163,7 +163,7 @@ public:
         const auto & data = this->data(place);
         auto & dst = static_cast<ColVecResult &>(to).getData();
 
-        if constexpr (IsDecimalNumber<T1>)
+        if constexpr (is_decimal<T1>)
         {
             if constexpr (StatFunc::kind == StatisticsFunctionKind::varPop)
                 dst.push_back(data.getPopulation(src_scale * 2));
diff --git a/src/AggregateFunctions/AggregateFunctionSum.cpp b/src/AggregateFunctions/AggregateFunctionSum.cpp
index ad4297438bd..6ebd006890b 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSum.cpp
@@ -20,10 +20,9 @@ template <typename T>
 struct SumSimple
 {
     /// @note It uses slow Decimal128 (cause we need such a variant). sumWithOverflow is faster for Decimal32/64
-    using ResultType = std::conditional_t<IsDecimalNumber<T>,
+    using ResultType = std::conditional_t<is_decimal<T>,
                                         std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
                                         NearestFieldType<T>>;
-    // using ResultType = std::conditional_t<IsDecimalNumber<T>, Decimal128, NearestFieldType<T>>;
     using AggregateDataType = AggregateFunctionSumData<ResultType>;
     using Function = AggregateFunctionSum<T, ResultType, AggregateDataType, AggregateFunctionTypeSum>;
 };
@@ -47,7 +46,7 @@ struct SumKahan
 template <typename T> using AggregateFunctionSumSimple = typename SumSimple<T>::Function;
 template <typename T> using AggregateFunctionSumWithOverflow = typename SumSameType<T>::Function;
 template <typename T> using AggregateFunctionSumKahan =
-    std::conditional_t<IsDecimalNumber<T>, typename SumSimple<T>::Function, typename SumKahan<T>::Function>;
+    std::conditional_t<is_decimal<T>, typename SumSimple<T>::Function, typename SumKahan<T>::Function>;
 
 
 template <template <typename> class Function>
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 24c1e514a71..e7f0357f644 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstring>
 #include <memory>
 #include <experimental/type_traits>
 #include <type_traits>
@@ -104,8 +105,8 @@ struct AggregateFunctionSumData
         const auto * end = ptr + count;
 
         if constexpr (
-            (is_integer_v<T> && !is_big_int_v<T>)
-            || (IsDecimalNumber<T> && !std::is_same_v<T, Decimal256> && !std::is_same_v<T, Decimal128>))
+            (is_integer<T> && !is_big_int_v<T>)
+            || (is_decimal<T> && !std::is_same_v<T, Decimal256> && !std::is_same_v<T, Decimal128>))
         {
             /// For integers we can vectorize the operation if we replace the null check using a multiplication (by 0 for null, 1 for not null)
             /// https://quick-bench.com/q/MLTnfTvwC2qZFVeWHfOBR3U7a8I
@@ -123,6 +124,10 @@ struct AggregateFunctionSumData
 
         if constexpr (std::is_floating_point_v<T>)
         {
+            /// For floating point we use a similar trick as above, except that now we  reinterpret the floating point number as an unsigned
+            /// integer of the same size and use a mask instead (0 to discard, 0xFF..FF to keep)
+            static_assert(sizeof(Value) == 4 || sizeof(Value) == 8);
+            typedef typename std::conditional<sizeof(Value) == 4, UInt32, UInt64>::type equivalent_integer;
             constexpr size_t unroll_count = 128 / sizeof(T);
             T partial_sums[unroll_count]{};
 
@@ -132,10 +137,12 @@ struct AggregateFunctionSumData
             {
                 for (size_t i = 0; i < unroll_count; ++i)
                 {
-                    if (!condition_map[i] == add_if_zero)
-                    {
-                        Impl::add(partial_sums[i], ptr[i]);
-                    }
+                    equivalent_integer value;
+                    std::memcpy(&value, &ptr[i], sizeof(Value));
+                    value &= (!condition_map[i] != add_if_zero) - 1;
+                    Value d;
+                    std::memcpy(&d, &value, sizeof(Value));
+                    Impl::add(partial_sums[i], d);
                 }
                 ptr += unroll_count;
                 condition_map += unroll_count;
@@ -334,9 +341,7 @@ class AggregateFunctionSum final : public IAggregateFunctionDataHelper<Data, Agg
 public:
     static constexpr bool DateTime64Supported = false;
 
-    using ResultDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<TResult>, DataTypeNumber<TResult>>;
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
-    using ColVecResult = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<TResult>, ColumnVector<TResult>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
 
     String getName() const override
     {
@@ -361,10 +366,13 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        if constexpr (IsDecimalNumber<T>)
-            return std::make_shared<ResultDataType>(ResultDataType::maxPrecision(), scale);
+        if constexpr (!is_decimal<T>)
+            return std::make_shared<DataTypeNumber<TResult>>();
         else
-            return std::make_shared<ResultDataType>();
+        {
+            using DataType = DataTypeDecimal<TResult>;
+            return std::make_shared<DataType>(DataType::maxPrecision(), scale);
+        }
     }
 
     bool allocatesMemoryInArena() const override { return false; }
@@ -431,8 +439,7 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        auto & column = assert_cast<ColVecResult &>(to);
-        column.getData().push_back(this->data(place).get());
+        castColumnToResult(to).getData().push_back(this->data(place).get());
     }
 
 #if USE_EMBEDDED_COMPILER
@@ -511,6 +518,14 @@ public:
 
 private:
     UInt32 scale;
+
+    static constexpr auto & castColumnToResult(IColumn & to)
+    {
+        if constexpr (is_decimal<T>)
+            return assert_cast<ColumnDecimal<TResult> &>(to);
+        else
+            return assert_cast<ColumnVector<TResult> &>(to);
+    }
 };
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionSumCount.h b/src/AggregateFunctions/AggregateFunctionSumCount.h
index 4a913113ce2..9892c230e1d 100644
--- a/src/AggregateFunctions/AggregateFunctionSumCount.h
+++ b/src/AggregateFunctions/AggregateFunctionSumCount.h
@@ -8,8 +8,6 @@
 namespace DB
 {
 template <typename T>
-using DecimalOrNumberDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<AvgFieldType<T>>, DataTypeNumber<AvgFieldType<T>>>;
-template <typename T>
 class AggregateFunctionSumCount final : public AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionSumCount<T>>
 {
 public:
@@ -20,20 +18,13 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        DataTypes types;
-        if constexpr (IsDecimalNumber<T>)
-            types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>(DecimalOrNumberDataType<T>::maxPrecision(), scale));
-        else
-            types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>());
-
-        types.emplace_back(std::make_shared<DataTypeUInt64>());
-
-        return std::make_shared<DataTypeTuple>(types);
+        auto second_elem = std::make_shared<DataTypeUInt64>();
+        return std::make_shared<DataTypeTuple>(DataTypes{getReturnTypeFirstElement(), std::move(second_elem)});
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const final
     {
-        assert_cast<DecimalOrVectorCol<AvgFieldType<T>> &>((assert_cast<ColumnTuple &>(to)).getColumn(0)).getData().push_back(
+        assert_cast<ColumnVectorOrDecimal<AvgFieldType<T>> &>((assert_cast<ColumnTuple &>(to)).getColumn(0)).getData().push_back(
             this->data(place).numerator);
 
         assert_cast<ColumnUInt64 &>((assert_cast<ColumnTuple &>(to)).getColumn(1)).getData().push_back(
@@ -42,7 +33,7 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const final
     {
-        this->data(place).numerator += static_cast<const DecimalOrVectorCol<T> &>(*columns[0]).getData()[row_num];
+        this->data(place).numerator += static_cast<const ColumnVectorOrDecimal<T> &>(*columns[0]).getData()[row_num];
         ++this->data(place).denominator;
     }
 
@@ -59,6 +50,19 @@ public:
 
 private:
     UInt32 scale;
+
+    auto getReturnTypeFirstElement() const
+    {
+        using FieldType = AvgFieldType<T>;
+
+        if constexpr (!is_decimal<T>)
+            return std::make_shared<DataTypeNumber<FieldType>>();
+        else
+        {
+            using DataType = DataTypeDecimal<FieldType>;
+            return std::make_shared<DataType>(DataType::maxPrecision(), scale);
+        }
+    }
 };
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionSumMap.h b/src/AggregateFunctions/AggregateFunctionSumMap.h
index 03327f76e48..3bc1ff2b61f 100644
--- a/src/AggregateFunctions/AggregateFunctionSumMap.h
+++ b/src/AggregateFunctions/AggregateFunctionSumMap.h
@@ -190,7 +190,7 @@ public:
                     continue;
 
                 decltype(merged_maps.begin()) it;
-                if constexpr (IsDecimalNumber<T>)
+                if constexpr (is_decimal<T>)
                 {
                     // FIXME why is storing NearestFieldType not enough, and we
                     // have to check for decimals again here?
@@ -217,7 +217,7 @@ public:
                     new_values.resize(size);
                     new_values[col] = value;
 
-                    if constexpr (IsDecimalNumber<T>)
+                    if constexpr (is_decimal<T>)
                     {
                         UInt32 scale = static_cast<const ColumnDecimal<T> &>(key_column).getData().getScale();
                         merged_maps.emplace(DecimalField<T>(key, scale), std::move(new_values));
@@ -280,7 +280,7 @@ public:
             for (size_t col = 0; col < values_types.size(); ++col)
                 values_serializations[col]->deserializeBinary(values[col], buf);
 
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 merged_maps[key.get<DecimalField<T>>()] = values;
             else
                 merged_maps[key.get<T>()] = values;
@@ -396,7 +396,7 @@ private:
     using Base = AggregateFunctionMapBase<T, Self, FieldVisitorSum, overflow, tuple_argument, true>;
 
     /// ARCADIA_BUILD disallow unordered_set for big ints for some reason
-    static constexpr const bool allow_hash = !OverBigInt<T>;
+    static constexpr const bool allow_hash = !is_over_big_int<T>;
     using ContainerT = std::conditional_t<allow_hash, std::unordered_set<T>, std::set<T>>;
 
     ContainerT keys_to_keep;
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp b/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
index e137937343b..2b7e0d97372 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
@@ -102,7 +102,7 @@ namespace
             // This range is hardcoded below
             if (precision_param > 20 || precision_param < 12)
                 throw Exception(
-                    "Parameter for aggregate function " + name + " is out or range: [12, 20].", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+                    "Parameter for aggregate function " + name + " is out of range: [12, 20].", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
             precision = precision_param;
         }
 
diff --git a/src/AggregateFunctions/IAggregateFunctionCombinator.h b/src/AggregateFunctions/IAggregateFunctionCombinator.h
index f9953c83a95..37fcfe42c10 100644
--- a/src/AggregateFunctions/IAggregateFunctionCombinator.h
+++ b/src/AggregateFunctions/IAggregateFunctionCombinator.h
@@ -35,6 +35,10 @@ public:
 
     virtual bool isForInternalUsageOnly() const { return false; }
 
+    /** Does combinator supports nesting (of itself, i.e. ArrayArray or IfIf)
+     */
+    virtual bool supportsNesting() const { return false; }
+
     /** From the arguments for combined function (ex: UInt64, UInt8 for sumIf),
       *  get the arguments for nested function (ex: UInt64 for sum).
       * If arguments are not suitable for combined function, throw an exception.
diff --git a/src/AggregateFunctions/QuantileExactWeighted.h b/src/AggregateFunctions/QuantileExactWeighted.h
index 8170c06d0cd..97ad15f7e75 100644
--- a/src/AggregateFunctions/QuantileExactWeighted.h
+++ b/src/AggregateFunctions/QuantileExactWeighted.h
@@ -30,7 +30,7 @@ struct QuantileExactWeighted
     };
 
     using Weight = UInt64;
-    using UnderlyingType = typename NativeType<Value>::Type;
+    using UnderlyingType = NativeType<Value>;
     using Hasher = std::conditional_t<std::is_same_v<Value, Decimal128>, Int128Hash, HashCRC32<UnderlyingType>>;
 
     /// When creating, the hash table must be small.
diff --git a/src/AggregateFunctions/QuantileTDigest.h b/src/AggregateFunctions/QuantileTDigest.h
index b12673bc507..adb02171f72 100644
--- a/src/AggregateFunctions/QuantileTDigest.h
+++ b/src/AggregateFunctions/QuantileTDigest.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <cmath>
+#include <Common/Exception.h>
 #include <Common/RadixSort.h>
 #include <Common/PODArray.h>
+#include <Core/AccurateComparison.h>
 #include <IO/WriteBuffer.h>
 #include <IO/ReadBuffer.h>
 #include <IO/VarInt.h>
@@ -14,8 +16,9 @@ struct Settings;
 
 namespace ErrorCodes
 {
-    extern const int TOO_LARGE_ARRAY_SIZE;
     extern const int CANNOT_PARSE_INPUT_ASSERTION_FAILED;
+    extern const int DECIMAL_OVERFLOW;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
 
@@ -314,7 +317,7 @@ public:
         compress();
 
         if (centroids.size() == 1)
-            return centroids.front().mean;
+            return checkOverflow<ResultType>(centroids.front().mean);
 
         Float64 x = level * count;
         Float64 prev_x = 0;
@@ -333,11 +336,11 @@ public:
                 Float64 right = current_x - 0.5 * (c.count == 1);
 
                 if (x <= left)
-                    return prev_mean;
+                    return checkOverflow<ResultType>(prev_mean);
                 else if (x >= right)
-                    return c.mean;
+                    return checkOverflow<ResultType>(c.mean);
                 else
-                    return interpolate(x, left, prev_mean, right, c.mean);
+                    return checkOverflow<ResultType>(interpolate(x, left, prev_mean, right, c.mean));
             }
 
             sum += c.count;
@@ -346,7 +349,7 @@ public:
             prev_x = current_x;
         }
 
-        return centroids.back().mean;
+        return checkOverflow<ResultType>(centroids.back().mean);
     }
 
     /** Get multiple quantiles (`size` parts).
@@ -438,6 +441,16 @@ public:
     {
         getManyImpl(levels, indices, size, result);
     }
+
+private:
+    template <typename ResultType>
+    static ResultType checkOverflow(Value val)
+    {
+        ResultType result;
+        if (accurate::convertNumeric(val, result))
+            return result;
+        throw DB::Exception("Numeric overflow", ErrorCodes::DECIMAL_OVERFLOW);
+    }
 };
 
 }
diff --git a/src/AggregateFunctions/ReservoirSampler.h b/src/AggregateFunctions/ReservoirSampler.h
index 6c131928cb7..53e64626a77 100644
--- a/src/AggregateFunctions/ReservoirSampler.h
+++ b/src/AggregateFunctions/ReservoirSampler.h
@@ -121,7 +121,7 @@ public:
     {
         if (samples.empty())
         {
-            if (DB::IsDecimalNumber<T>)
+            if (DB::is_decimal<T>)
                 return 0;
             return onEmpty<double>();
         }
@@ -134,7 +134,7 @@ public:
         size_t right_index = left_index + 1;
         if (right_index == samples.size())
         {
-            if constexpr (DB::IsDecimalNumber<T>)
+            if constexpr (DB::is_decimal<T>)
                 return static_cast<double>(samples[left_index].value);
             else
                 return static_cast<double>(samples[left_index]);
@@ -143,7 +143,7 @@ public:
         double left_coef = right_index - index;
         double right_coef = index - left_index;
 
-        if constexpr (DB::IsDecimalNumber<T>)
+        if constexpr (DB::is_decimal<T>)
             return static_cast<double>(samples[left_index].value) * left_coef + static_cast<double>(samples[right_index].value) * right_coef;
         else
             return static_cast<double>(samples[left_index]) * left_coef + static_cast<double>(samples[right_index]) * right_coef;
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 70248d4cfde..5d0af719290 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -50,6 +50,9 @@ void registerAggregateFunctionWelchTTest(AggregateFunctionFactory &);
 void registerAggregateFunctionStudentTTest(AggregateFunctionFactory &);
 void registerAggregateFunctionSingleValueOrNull(AggregateFunctionFactory &);
 void registerAggregateFunctionSequenceNextNode(AggregateFunctionFactory &);
+void registerAggregateFunctionExponentialMovingAverage(AggregateFunctionFactory &);
+void registerAggregateFunctionSparkbar(AggregateFunctionFactory &);
+void registerAggregateFunctionIntervalLengthSum(AggregateFunctionFactory &);
 
 class AggregateFunctionCombinatorFactory;
 void registerAggregateFunctionCombinatorIf(AggregateFunctionCombinatorFactory &);
@@ -65,8 +68,6 @@ void registerAggregateFunctionCombinatorDistinct(AggregateFunctionCombinatorFact
 
 void registerWindowFunctions(AggregateFunctionFactory & factory);
 
-void registerAggregateFunctionIntervalLengthSum(AggregateFunctionFactory &);
-
 void registerAggregateFunctions()
 {
     {
@@ -115,10 +116,11 @@ void registerAggregateFunctions()
         registerAggregateFunctionWelchTTest(factory);
         registerAggregateFunctionStudentTTest(factory);
         registerAggregateFunctionSingleValueOrNull(factory);
+        registerAggregateFunctionIntervalLengthSum(factory);
+        registerAggregateFunctionExponentialMovingAverage(factory);
+        registerAggregateFunctionSparkbar(factory);
 
         registerWindowFunctions(factory);
-
-        registerAggregateFunctionIntervalLengthSum(factory);
     }
 
     {
diff --git a/src/AggregateFunctions/ya.make b/src/AggregateFunctions/ya.make
deleted file mode 100644
index f0374fb69bc..00000000000
--- a/src/AggregateFunctions/ya.make
+++ /dev/null
@@ -1,73 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    AggregateFunctionAggThrow.cpp
-    AggregateFunctionAny.cpp
-    AggregateFunctionArray.cpp
-    AggregateFunctionAvg.cpp
-    AggregateFunctionAvgWeighted.cpp
-    AggregateFunctionBitwise.cpp
-    AggregateFunctionBoundingRatio.cpp
-    AggregateFunctionCategoricalInformationValue.cpp
-    AggregateFunctionCombinatorFactory.cpp
-    AggregateFunctionCount.cpp
-    AggregateFunctionDeltaSum.cpp
-    AggregateFunctionDeltaSumTimestamp.cpp
-    AggregateFunctionDistinct.cpp
-    AggregateFunctionEntropy.cpp
-    AggregateFunctionFactory.cpp
-    AggregateFunctionForEach.cpp
-    AggregateFunctionGroupArray.cpp
-    AggregateFunctionGroupArrayInsertAt.cpp
-    AggregateFunctionGroupArrayMoving.cpp
-    AggregateFunctionGroupUniqArray.cpp
-    AggregateFunctionHistogram.cpp
-    AggregateFunctionIf.cpp
-    AggregateFunctionIntervalLengthSum.cpp
-    AggregateFunctionMLMethod.cpp
-    AggregateFunctionMannWhitney.cpp
-    AggregateFunctionMax.cpp
-    AggregateFunctionMaxIntersections.cpp
-    AggregateFunctionMerge.cpp
-    AggregateFunctionMin.cpp
-    AggregateFunctionNull.cpp
-    AggregateFunctionOrFill.cpp
-    AggregateFunctionQuantile.cpp
-    AggregateFunctionRankCorrelation.cpp
-    AggregateFunctionResample.cpp
-    AggregateFunctionRetention.cpp
-    AggregateFunctionSequenceMatch.cpp
-    AggregateFunctionSequenceNextNode.cpp
-    AggregateFunctionSimpleLinearRegression.cpp
-    AggregateFunctionSimpleState.cpp
-    AggregateFunctionSingleValueOrNull.cpp
-    AggregateFunctionState.cpp
-    AggregateFunctionStatistics.cpp
-    AggregateFunctionStatisticsSimple.cpp
-    AggregateFunctionStudentTTest.cpp
-    AggregateFunctionSum.cpp
-    AggregateFunctionSumCount.cpp
-    AggregateFunctionSumMap.cpp
-    AggregateFunctionTopK.cpp
-    AggregateFunctionUniq.cpp
-    AggregateFunctionUniqCombined.cpp
-    AggregateFunctionUniqUpTo.cpp
-    AggregateFunctionWelchTTest.cpp
-    AggregateFunctionWindowFunnel.cpp
-    IAggregateFunction.cpp
-    UniqCombinedBiasData.cpp
-    UniqVariadicHash.cpp
-    parseAggregateFunctionParameters.cpp
-    registerAggregateFunctions.cpp
-
-)
-
-END()
diff --git a/src/AggregateFunctions/ya.make.in b/src/AggregateFunctions/ya.make.in
deleted file mode 100644
index 78d82238168..00000000000
--- a/src/AggregateFunctions/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | grep -v -F GroupBitmap | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Backups/BackupEntryConcat.cpp b/src/Backups/BackupEntryConcat.cpp
index c6234f68fb2..1075b8be2ec 100644
--- a/src/Backups/BackupEntryConcat.cpp
+++ b/src/Backups/BackupEntryConcat.cpp
@@ -23,6 +23,6 @@ UInt64 BackupEntryConcat::getSize() const
 
 std::unique_ptr<ReadBuffer> BackupEntryConcat::getReadBuffer() const
 {
-    return std::make_unique<ConcatReadBuffer>(first_source->getReadBuffer(), second_source->getReadBuffer());
+    return std::make_unique<ConcatReadBuffer>(*first_source->getReadBuffer(), *second_source->getReadBuffer());
 }
 }
diff --git a/src/Backups/BackupUtils.cpp b/src/Backups/BackupUtils.cpp
index 974ae252829..06673cae371 100644
--- a/src/Backups/BackupUtils.cpp
+++ b/src/Backups/BackupUtils.cpp
@@ -83,9 +83,8 @@ namespace
     /// Replaces elements of types TEMPORARY_TABLE or ALL_TEMPORARY_TABLES with elements of type TABLE or DATABASE.
     void replaceTemporaryTablesWithTemporaryDatabase(Elements & elements)
     {
-        for (size_t i = 0; i != elements.size(); ++i)
+        for (auto & element : elements)
         {
-            auto & element = elements[i];
             switch (element.type)
             {
                 case ElementType::TEMPORARY_TABLE:
diff --git a/src/Backups/renameInCreateQuery.cpp b/src/Backups/renameInCreateQuery.cpp
index a36995654ee..4c78844d266 100644
--- a/src/Backups/renameInCreateQuery.cpp
+++ b/src/Backups/renameInCreateQuery.cpp
@@ -160,26 +160,29 @@ namespace
             if (args.size() <= db_name_index)
                 return;
 
-            String db_name = evaluateConstantExpressionForDatabaseName(args[db_name_index], data.context)->as<ASTLiteral &>().value.safeGet<String>();
+            String name = evaluateConstantExpressionForDatabaseName(args[db_name_index], data.context)->as<ASTLiteral &>().value.safeGet<String>();
 
-            String table_name;
             size_t table_name_index = static_cast<size_t>(-1);
-            size_t dot = String::npos;
-            if (function.name != "Distributed")
-                dot = db_name.find('.');
-            if (dot != String::npos)
-            {
-                table_name = db_name.substr(dot + 1);
-                db_name.resize(dot);
-            }
+
+            QualifiedTableName qualified_name;
+
+            if (function.name == "Distributed")
+                qualified_name.table = name;
             else
+                qualified_name = QualifiedTableName::parseFromString(name);
+
+            if (qualified_name.database.empty())
             {
+                std::swap(qualified_name.database, qualified_name.table);
                 table_name_index = 2;
                 if (args.size() <= table_name_index)
                     return;
-                table_name = evaluateConstantExpressionForDatabaseName(args[table_name_index], data.context)->as<ASTLiteral &>().value.safeGet<String>();
+                qualified_name.table = evaluateConstantExpressionForDatabaseName(args[table_name_index], data.context)->as<ASTLiteral &>().value.safeGet<String>();
             }
 
+            const String & db_name = qualified_name.database;
+            const String & table_name = qualified_name.table;
+
             if (db_name.empty() || table_name.empty())
                 return;
 
diff --git a/src/Backups/ya.make b/src/Backups/ya.make
deleted file mode 100644
index 96217a56ef0..00000000000
--- a/src/Backups/ya.make
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    BackupEntryConcat.cpp
-    BackupEntryFromAppendOnlyFile.cpp
-    BackupEntryFromImmutableFile.cpp
-    BackupEntryFromMemory.cpp
-    BackupEntryFromSmallFile.cpp
-    BackupFactory.cpp
-    BackupInDirectory.cpp
-    BackupRenamingConfig.cpp
-    BackupSettings.cpp
-    BackupUtils.cpp
-    hasCompatibleDataToRestoreTable.cpp
-    renameInCreateQuery.cpp
-
-)
-
-END()
diff --git a/src/Backups/ya.make.in b/src/Backups/ya.make.in
deleted file mode 100644
index 7d91972194d..00000000000
--- a/src/Backups/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Bridge/ya.make b/src/Bridge/ya.make
deleted file mode 100644
index e900bab036e..00000000000
--- a/src/Bridge/ya.make
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    IBridgeHelper.cpp
-    LibraryBridgeHelper.cpp
-
-)
-
-END()
diff --git a/src/Bridge/ya.make.in b/src/Bridge/ya.make.in
deleted file mode 100644
index 7d91972194d..00000000000
--- a/src/Bridge/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40b8526e103..7cc8433e153 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -261,7 +261,7 @@ dbms_target_include_directories (PUBLIC "${ClickHouse_SOURCE_DIR}/src" "${ClickH
 target_include_directories (clickhouse_common_io PUBLIC "${ClickHouse_SOURCE_DIR}/src" "${ClickHouse_BINARY_DIR}/src")
 
 if (USE_EMBEDDED_COMPILER)
-    dbms_target_link_libraries (PRIVATE ${REQUIRED_LLVM_LIBRARIES})
+    dbms_target_link_libraries (PUBLIC ${REQUIRED_LLVM_LIBRARIES})
     dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${LLVM_INCLUDE_DIRS})
 endif ()
 
@@ -349,6 +349,14 @@ dbms_target_link_libraries (
         clickhouse_common_io
 )
 
+if (NOT_UNBUNDLED)
+    dbms_target_link_libraries (
+        PUBLIC
+            boost::circular_buffer
+            boost::heap
+    )
+endif()
+
 target_include_directories(clickhouse_common_io PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/Core/include") # uses some includes from core
 dbms_target_include_directories(PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/Core/include")
 
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 366e61bc8e2..dffac97d8ce 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -130,10 +130,16 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
     }
     catch (Poco::TimeoutException & e)
     {
+        /// disconnect() will reset the socket, get timeouts before.
+        const std::string & message = fmt::format("{} ({}, receive timeout {} ms, send timeout {} ms)",
+            e.displayText(), getDescription(),
+            socket->getReceiveTimeout().totalMilliseconds(),
+            socket->getSendTimeout().totalMilliseconds());
+
         disconnect();
 
         /// Add server address to exception. Also Exception will remember stack trace. It's a pity that more precise exception type is lost.
-        throw NetException(e.displayText() + " (" + getDescription() + ")", ErrorCodes::SOCKET_TIMEOUT);
+        throw NetException(message, ErrorCodes::SOCKET_TIMEOUT);
     }
 }
 
@@ -413,7 +419,12 @@ void Connection::sendQuery(
     if (!connected)
         connect(timeouts);
 
-    TimeoutSetter timeout_setter(*socket, timeouts.send_timeout, timeouts.receive_timeout, true);
+    /// Query is not executed within sendQuery() function.
+    ///
+    /// And what this means that temporary timeout (via TimeoutSetter) is not
+    /// enough, since next query can use timeout from the previous query in this case.
+    socket->setReceiveTimeout(timeouts.receive_timeout);
+    socket->setSendTimeout(timeouts.send_timeout);
 
     if (settings)
     {
diff --git a/src/Client/HedgedConnectionsFactory.cpp b/src/Client/HedgedConnectionsFactory.cpp
index b0c5a3d22f5..5a42cc0d5c4 100644
--- a/src/Client/HedgedConnectionsFactory.cpp
+++ b/src/Client/HedgedConnectionsFactory.cpp
@@ -27,8 +27,8 @@ HedgedConnectionsFactory::HedgedConnectionsFactory(
     : pool(pool_), settings(settings_), timeouts(timeouts_), table_to_check(table_to_check_), log(&Poco::Logger::get("HedgedConnectionsFactory"))
 {
     shuffled_pools = pool->getShuffledPools(settings);
-    for (size_t i = 0; i != shuffled_pools.size(); ++i)
-        replicas.emplace_back(ConnectionEstablisherAsync(shuffled_pools[i].pool, &timeouts, settings, log, table_to_check.get()));
+    for (auto shuffled_pool : shuffled_pools)
+        replicas.emplace_back(ConnectionEstablisherAsync(shuffled_pool.pool, &timeouts, settings, log, table_to_check.get()));
 
     max_tries
         = (settings ? size_t{settings->connections_with_failover_max_tries} : size_t{DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES});
diff --git a/src/Client/ya.make b/src/Client/ya.make
deleted file mode 100644
index 88fa14ad377..00000000000
--- a/src/Client/ya.make
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/NetSSL_OpenSSL
-)
-
-
-SRCS(
-    Connection.cpp
-    ConnectionEstablisher.cpp
-    ConnectionPool.cpp
-    ConnectionPoolWithFailover.cpp
-    HedgedConnections.cpp
-    HedgedConnectionsFactory.cpp
-    IConnections.cpp
-    MultiplexedConnections.cpp
-
-)
-
-END()
diff --git a/src/Client/ya.make.in b/src/Client/ya.make.in
deleted file mode 100644
index ccf46673c66..00000000000
--- a/src/Client/ya.make.in
+++ /dev/null
@@ -1,15 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/NetSSL_OpenSSL
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index c8e0de644b3..004615cef6e 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -506,8 +506,9 @@ static void pushBackAndCreateState(ColumnAggregateFunction::Container & data, Ar
 void ColumnAggregateFunction::insert(const Field & x)
 {
     if (x.getType() != Field::Types::AggregateFunctionState)
-        throw Exception(String("Inserting field of type ") + x.getTypeName() + " into ColumnAggregateFunction. "
-                        "Expected " + Field::Types::toString(Field::Types::AggregateFunctionState), ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Inserting field of type {} into ColumnAggregateFunction. Expected {}",
+            x.getTypeName(), Field::Types::AggregateFunctionState);
 
     const auto & field_name = x.get<const AggregateFunctionStateData &>().name;
     if (type_string != field_name)
diff --git a/src/Columns/ColumnCompressed.h b/src/Columns/ColumnCompressed.h
index 1f916db9d61..92bdca7cd72 100644
--- a/src/Columns/ColumnCompressed.h
+++ b/src/Columns/ColumnCompressed.h
@@ -57,9 +57,13 @@ public:
       */
     static ColumnPtr wrap(ColumnPtr column)
     {
+        /// The order of evaluation of function arguments is unspecified
+        /// and could cause interacting with object in moved-from state
+        const auto size = column->size();
+        const auto bytes = column->allocatedBytes();
         return ColumnCompressed::create(
-            column->size(),
-            column->allocatedBytes(),
+            size,
+            bytes,
             [column = std::move(column)]{ return column; });
     }
 
@@ -124,4 +128,3 @@ private:
 };
 
 }
-
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index d87dd0035a5..ceda12c4b84 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -38,7 +38,7 @@ template class DecimalPaddedPODArray<Decimal128>;
 template class DecimalPaddedPODArray<Decimal256>;
 template class DecimalPaddedPODArray<DateTime64>;
 
-template <typename T>
+template <is_decimal T>
 int ColumnDecimal<T>::compareAt(size_t n, size_t m, const IColumn & rhs_, int) const
 {
     auto & other = static_cast<const Self &>(rhs_);
@@ -50,7 +50,7 @@ int ColumnDecimal<T>::compareAt(size_t n, size_t m, const IColumn & rhs_, int) c
     return decimalLess<T>(b, a, other.scale, scale) ? 1 : (decimalLess<T>(a, b, scale, other.scale) ? -1 : 0);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                      PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                                      int direction, int nan_direction_hint) const
@@ -59,13 +59,13 @@ void ColumnDecimal<T>::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                                          compare_results, direction, nan_direction_hint);
 }
 
-template <typename T>
+template <is_decimal T>
 bool ColumnDecimal<T>::hasEqualValues() const
 {
     return this->template hasEqualValuesImpl<ColumnDecimal<T>>();
 }
 
-template <typename T>
+template <is_decimal T>
 StringRef ColumnDecimal<T>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     auto * pos = arena.allocContinue(sizeof(T), begin);
@@ -73,20 +73,20 @@ StringRef ColumnDecimal<T>::serializeValueIntoArena(size_t n, Arena & arena, cha
     return StringRef(pos, sizeof(T));
 }
 
-template <typename T>
+template <is_decimal T>
 const char * ColumnDecimal<T>::deserializeAndInsertFromArena(const char * pos)
 {
     data.push_back(unalignedLoad<T>(pos));
     return pos + sizeof(T);
 }
 
-template <typename T>
+template <is_decimal T>
 const char * ColumnDecimal<T>::skipSerializedInArena(const char * pos) const
 {
     return pos + sizeof(T);
 }
 
-template <typename T>
+template <is_decimal T>
 UInt64 ColumnDecimal<T>::get64([[maybe_unused]] size_t n) const
 {
     if constexpr (sizeof(T) > sizeof(UInt64))
@@ -95,13 +95,13 @@ UInt64 ColumnDecimal<T>::get64([[maybe_unused]] size_t n) const
         return static_cast<NativeT>(data[n]);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateHashWithValue(size_t n, SipHash & hash) const
 {
     hash.update(data[n].value);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateWeakHash32(WeakHash32 & hash) const
 {
     auto s = data.size();
@@ -122,13 +122,13 @@ void ColumnDecimal<T>::updateWeakHash32(WeakHash32 & hash) const
     }
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateHashFast(SipHash & hash) const
 {
     hash.update(reinterpret_cast<const char *>(data.data()), size() * sizeof(data[0]));
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::getPermutation(bool reverse, size_t limit, int , IColumn::Permutation & res) const
 {
 #if 1 /// TODO: perf test
@@ -147,7 +147,7 @@ void ColumnDecimal<T>::getPermutation(bool reverse, size_t limit, int , IColumn:
     permutation(reverse, limit, res);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updatePermutation(bool reverse, size_t limit, int, IColumn::Permutation & res, EqualRanges & equal_ranges) const
 {
     if (equal_ranges.empty())
@@ -228,7 +228,7 @@ void ColumnDecimal<T>::updatePermutation(bool reverse, size_t limit, int, IColum
     }
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::permute(const IColumn::Permutation & perm, size_t limit) const
 {
     size_t size = limit ? std::min(data.size(), limit) : data.size();
@@ -244,7 +244,7 @@ ColumnPtr ColumnDecimal<T>::permute(const IColumn::Permutation & perm, size_t li
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 MutableColumnPtr ColumnDecimal<T>::cloneResized(size_t size) const
 {
     auto res = this->create(0, scale);
@@ -268,7 +268,7 @@ MutableColumnPtr ColumnDecimal<T>::cloneResized(size_t size) const
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::insertData(const char * src, size_t /*length*/)
 {
     T tmp;
@@ -276,7 +276,7 @@ void ColumnDecimal<T>::insertData(const char * src, size_t /*length*/)
     data.emplace_back(tmp);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::insertRangeFrom(const IColumn & src, size_t start, size_t length)
 {
     const ColumnDecimal & src_vec = assert_cast<const ColumnDecimal &>(src);
@@ -292,7 +292,7 @@ void ColumnDecimal<T>::insertRangeFrom(const IColumn & src, size_t start, size_t
     memcpy(data.data() + old_size, &src_vec.data[start], length * sizeof(data[0]));
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_size_hint) const
 {
     size_t size = data.size();
@@ -321,19 +321,19 @@ ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::expand(const IColumn::Filter & mask, bool inverted)
 {
     expandDataByMask<T>(data, mask, inverted);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::index(const IColumn & indexes, size_t limit) const
 {
     return selectIndexImpl(*this, indexes, limit);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::replicate(const IColumn::Offsets & offsets) const
 {
     size_t size = data.size();
@@ -360,13 +360,13 @@ ColumnPtr ColumnDecimal<T>::replicate(const IColumn::Offsets & offsets) const
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::gather(ColumnGathererStream & gatherer)
 {
     gatherer.gather(*this);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::compress() const
 {
     size_t source_size = data.size() * sizeof(T);
@@ -390,7 +390,7 @@ ColumnPtr ColumnDecimal<T>::compress() const
         });
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::getExtremes(Field & min, Field & max) const
 {
     if (data.empty())
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index d6620a492a3..34cc4751eb9 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -7,6 +7,8 @@
 #include <Core/DecimalFunctions.h>
 #include <Common/typeid_cast.h>
 #include <common/sort.h>
+#include <Core/TypeId.h>
+#include <Core/TypeName.h>
 
 #include <cmath>
 
@@ -59,11 +61,9 @@ extern template class DecimalPaddedPODArray<Decimal256>;
 extern template class DecimalPaddedPODArray<DateTime64>;
 
 /// A ColumnVector for Decimals
-template <typename T>
+template <is_decimal T>
 class ColumnDecimal final : public COWHelper<ColumnVectorHelper, ColumnDecimal<T>>
 {
-    static_assert(IsDecimalNumber<T>);
-
 private:
     using Self = ColumnDecimal;
     friend class COWHelper<ColumnVectorHelper, Self>;
@@ -210,7 +210,12 @@ protected:
     }
 };
 
-template <typename T>
+template <class> class ColumnVector;
+template <class T> struct ColumnVectorOrDecimalT { using Col = ColumnVector<T>; };
+template <is_decimal T> struct ColumnVectorOrDecimalT<T> { using Col = ColumnDecimal<T>; };
+template <class T> using ColumnVectorOrDecimal = typename ColumnVectorOrDecimalT<T>::Col;
+
+template <is_decimal T>
 template <typename Type>
 ColumnPtr ColumnDecimal<T>::indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const
 {
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index 2e50d95826c..c547a380ff3 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -276,7 +276,10 @@ bool ColumnMap::structureEquals(const IColumn & rhs) const
 ColumnPtr ColumnMap::compress() const
 {
     auto compressed = nested->compress();
-    return ColumnCompressed::create(size(), compressed->byteSize(), [compressed = std::move(compressed)]
+    const auto byte_size = compressed->byteSize();
+    /// The order of evaluation of function arguments is unspecified
+    /// and could cause interacting with object in moved-from state
+    return ColumnCompressed::create(size(), byte_size, [compressed = std::move(compressed)]
     {
         return ColumnMap::create(compressed->decompress());
     });
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index 0c39102b988..30f3ad6a132 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -7,6 +7,8 @@
 #include <common/unaligned.h>
 #include <Core/Field.h>
 #include <Common/assert_cast.h>
+#include <Core/TypeId.h>
+#include <Core/TypeName.h>
 
 
 namespace DB
@@ -102,7 +104,7 @@ template <class U> struct CompareHelper<Float64, U> : public FloatCompareHelper<
 template <typename T>
 class ColumnVector final : public COWHelper<ColumnVectorHelper, ColumnVector<T>>
 {
-    static_assert(!IsDecimalNumber<T>);
+    static_assert(!is_decimal<T>);
 
 private:
     using Self = ColumnVector;
diff --git a/src/Columns/MaskOperations.cpp b/src/Columns/MaskOperations.cpp
index 759d0af7127..9499185da30 100644
--- a/src/Columns/MaskOperations.cpp
+++ b/src/Columns/MaskOperations.cpp
@@ -4,6 +4,7 @@
 #include <Columns/ColumnNothing.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnConst.h>
+#include <Columns/ColumnLowCardinality.h>
 #include <algorithm>
 
 namespace DB
@@ -177,19 +178,21 @@ MaskInfo extractMaskFromConstOrNull(
 template <bool inverted>
 MaskInfo extractMaskImpl(
     PaddedPODArray<UInt8> & mask,
-    const ColumnPtr & column,
+    const ColumnPtr & col,
     UInt8 null_value,
     const PaddedPODArray<UInt8> * null_bytemap,
     PaddedPODArray<UInt8> * nulls = nullptr)
 {
+    auto column = col->convertToFullColumnIfLowCardinality();
+
     /// Special implementation for Null and Const columns.
     if (column->onlyNull() || checkAndGetColumn<ColumnConst>(*column))
         return extractMaskFromConstOrNull<inverted>(mask, column, null_value, nulls);
 
-    if (const auto * col = checkAndGetColumn<ColumnNullable>(*column))
+    if (const auto * nullable_column = checkAndGetColumn<ColumnNullable>(*column))
     {
-        const PaddedPODArray<UInt8> & null_map = col->getNullMapData();
-        return extractMaskImpl<inverted>(mask, col->getNestedColumnPtr(), null_value, &null_map, nulls);
+        const PaddedPODArray<UInt8> & null_map = nullable_column->getNullMapData();
+        return extractMaskImpl<inverted>(mask, nullable_column->getNestedColumnPtr(), null_value, &null_map, nulls);
     }
 
     MaskInfo mask_info;
@@ -246,8 +249,8 @@ MaskInfo extractInvertedMask(
 
 void inverseMask(PaddedPODArray<UInt8> & mask, MaskInfo & mask_info)
 {
-    for (size_t i = 0; i != mask.size(); ++i)
-        mask[i] = !mask[i];
+    for (auto & byte : mask)
+        byte = !byte;
     std::swap(mask_info.has_ones, mask_info.has_zeros);
 }
 
@@ -314,3 +317,4 @@ void copyMask(const PaddedPODArray<UInt8> & from, PaddedPODArray<UInt8> & to)
 }
 
 }
+
diff --git a/src/Columns/ya.make b/src/Columns/ya.make
deleted file mode 100644
index d5b5047dc25..00000000000
--- a/src/Columns/ya.make
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/icu/common
-    contrib/libs/icu/i18n
-    contrib/libs/pdqsort
-    contrib/libs/lz4
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/icu
-    contrib/libs/pdqsort
-    contrib/libs/lz4
-)
-
-SRCS(
-    Collator.cpp
-    ColumnAggregateFunction.cpp
-    ColumnArray.cpp
-    ColumnCompressed.cpp
-    ColumnConst.cpp
-    ColumnDecimal.cpp
-    ColumnFixedString.cpp
-    ColumnFunction.cpp
-    ColumnLowCardinality.cpp
-    ColumnMap.cpp
-    ColumnNullable.cpp
-    ColumnString.cpp
-    ColumnTuple.cpp
-    ColumnVector.cpp
-    ColumnsCommon.cpp
-    FilterDescription.cpp
-    IColumn.cpp
-    MaskOperations.cpp
-    getLeastSuperColumn.cpp
-
-)
-
-END()
diff --git a/src/Columns/ya.make.in b/src/Columns/ya.make.in
deleted file mode 100644
index 5d2b0f3d06a..00000000000
--- a/src/Columns/ya.make.in
+++ /dev/null
@@ -1,23 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/icu/common
-    contrib/libs/icu/i18n
-    contrib/libs/pdqsort
-    contrib/libs/lz4
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/icu
-    contrib/libs/pdqsort
-    contrib/libs/lz4
-)
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Common/Config/YAMLParser.cpp b/src/Common/Config/YAMLParser.cpp
index 8d758eefdc0..e7917a0a616 100644
--- a/src/Common/Config/YAMLParser.cpp
+++ b/src/Common/Config/YAMLParser.cpp
@@ -156,7 +156,7 @@ Poco::AutoPtr<Poco::XML::Document> YAMLParser::parse(const String& path)
         throw Exception(ErrorCodes::CANNOT_OPEN_FILE, "Unable to open YAML configuration file {}", path);
     }
     Poco::AutoPtr<Poco::XML::Document> xml = new Document;
-    Poco::AutoPtr<Poco::XML::Element> root_node = xml->createElement("yandex");
+    Poco::AutoPtr<Poco::XML::Element> root_node = xml->createElement("clickhouse");
     xml->appendChild(root_node);
     try
     {
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index d3068519c22..53276f5b196 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -494,7 +494,6 @@
     M(523, UNKNOWN_ROW_POLICY) \
     M(524, ALTER_OF_COLUMN_IS_FORBIDDEN) \
     M(525, INCORRECT_DISK_INDEX) \
-    M(526, UNKNOWN_VOLUME_TYPE) \
     M(527, NO_SUITABLE_FUNCTION_IMPLEMENTATION) \
     M(528, CASSANDRA_INTERNAL_ERROR) \
     M(529, NOT_A_LEADER) \
@@ -587,6 +586,8 @@
     M(616, UNKNOWN_READ_METHOD) \
     M(617, LZ4_ENCODER_FAILED) \
     M(618, LZ4_DECODER_FAILED) \
+    M(619, POSTGRESQL_REPLICATION_INTERNAL_ERROR) \
+    M(620, QUERY_NOT_ALLOWED) \
     \
     M(999, KEEPER_EXCEPTION) \
     M(1000, POCO_EXCEPTION) \
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index 09629b436b2..408cab8b702 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -534,6 +534,13 @@ ExecutionStatus ExecutionStatus::fromCurrentException(const std::string & start_
     return ExecutionStatus(getCurrentExceptionCode(), msg);
 }
 
+ExecutionStatus ExecutionStatus::fromText(const std::string & data)
+{
+    ExecutionStatus status;
+    status.deserializeText(data);
+    return status;
+}
+
 ParsingException::ParsingException() = default;
 ParsingException::ParsingException(const std::string & msg, int code)
     : Exception(msg, code)
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index d04b0f71b9e..3aa06f8c988 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -184,6 +184,8 @@ struct ExecutionStatus
 
     static ExecutionStatus fromCurrentException(const std::string & start_of_message = "");
 
+    static ExecutionStatus fromText(const std::string & data);
+
     std::string serializeText() const;
 
     void deserializeText(const std::string & data);
diff --git a/src/Common/ExponentiallySmoothedCounter.h b/src/Common/ExponentiallySmoothedCounter.h
new file mode 100644
index 00000000000..28d4e5e25c1
--- /dev/null
+++ b/src/Common/ExponentiallySmoothedCounter.h
@@ -0,0 +1,114 @@
+#pragma once
+
+#include <cmath>
+#include <limits>
+
+
+namespace DB
+{
+
+/** https://en.wikipedia.org/wiki/Exponential_smoothing
+  *
+  * Exponentially smoothed average over time is weighted average with weight proportional to negative exponent of the time passed.
+  * For example, the last value is taken with weight 1/2, the value one second ago with weight 1/4, two seconds ago - 1/8, etc.
+  * It can be understood as an average over sliding window, but with different kernel.
+  *
+  * As an advantage, it is easy to update. Instead of collecting values and calculating a series of x1 / 2 + x2 / 4 + x3 / 8...
+  * just calculate x_old / 2 + x_new / 2.
+  *
+  * It is often used for resource usage metrics. For example, "load average" in Linux is exponentially smoothed moving average.
+  * We can use exponentially smoothed counters in query scheduler.
+  */
+struct ExponentiallySmoothedAverage
+{
+    /// The sum. It contains the last value and all previous values scaled accordingly to the difference of their time to the reference time.
+    /// Older values are summed with exponentially smaller coefficients.
+    /// To obtain the average, you have to divide this value to the sum of all coefficients (see 'sumWeights').
+
+    double value = 0;
+
+    /// The point of reference. You can translate the value to a different point of reference (see 'remap').
+    /// You can imagine that the value exponentially decays over time.
+    /// But it is also meaningful to treat the whole counters as constants over time but in another non-linear coordinate system,
+    /// that inflates over time, while the counter itself does not change
+    /// (it continues to be the same physical quantity, but only changes its representation in the "usual" coordinate system).
+
+    /// Recap: the whole counter is one dimensional and it can be represented as a curve formed by two dependent coordinates in 2d plane,
+    /// the space can be represented by (value, time) coordinates, and the curves will be exponentially decaying over time,
+    /// alternatively the space can be represented by (exponentially_adjusted_value, time) and then the curves will be constant over time.
+
+    /// Also useful analogy is the exponential representation of a number: x = a * exp(b) = a * e (where e = exp(b))
+    /// a number x is represented by a curve in 2d plane that can be parametrized by coordinates (a, b) or (a, e).
+
+    double time = 0;
+
+
+    ExponentiallySmoothedAverage()
+    {
+    }
+
+    ExponentiallySmoothedAverage(double current_value, double current_time)
+        : value(current_value), time(current_time)
+    {
+    }
+
+    /// How much value decays after time_passed.
+    static double scale(double time_passed, double half_decay_time)
+    {
+        return exp2(-time_passed / half_decay_time);
+    }
+
+    /// Sum of weights of all values. Divide by it to get the average.
+    static double sumWeights(double half_decay_time)
+    {
+        double k = scale(1.0, half_decay_time);
+        return 1 / (1 - k);
+    }
+
+    /// Obtain the same counter in another point of reference.
+    ExponentiallySmoothedAverage remap(double current_time, double half_decay_time) const
+    {
+        return ExponentiallySmoothedAverage(value * scale(current_time - time, half_decay_time), current_time);
+    }
+
+    /// Merge two counters. It is done by moving to the same point of reference and summing the values.
+    static ExponentiallySmoothedAverage merge(const ExponentiallySmoothedAverage & a, const ExponentiallySmoothedAverage & b, double half_decay_time)
+    {
+        if (a.time > b.time)
+            return ExponentiallySmoothedAverage(a.value + b.remap(a.time, half_decay_time).value, a.time);
+        if (a.time < b.time)
+            return ExponentiallySmoothedAverage(b.value + a.remap(b.time, half_decay_time).value, b.time);
+
+        return ExponentiallySmoothedAverage(a.value + b.value, a.time);
+    }
+
+    void merge(const ExponentiallySmoothedAverage & other, double half_decay_time)
+    {
+        *this = merge(*this, other, half_decay_time);
+    }
+
+    void add(double new_value, double current_time, double half_decay_time)
+    {
+        merge(ExponentiallySmoothedAverage(new_value, current_time), half_decay_time);
+    }
+
+    /// Calculate the average from the sum.
+    double get(double half_decay_time) const
+    {
+        return value / sumWeights(half_decay_time);
+    }
+
+    double get(double current_time, double half_decay_time) const
+    {
+        return remap(current_time, half_decay_time).get(half_decay_time);
+    }
+
+    /// Compare two counters (by moving to the same point of reference and comparing sums).
+    /// You can store the counters in container and sort it without changing the stored values over time.
+    bool less(const ExponentiallySmoothedAverage & other, double half_decay_time) const
+    {
+        return remap(other.time, half_decay_time).value < other.value;
+    }
+};
+
+}
diff --git a/src/Common/ExternalLoaderStatus.cpp b/src/Common/ExternalLoaderStatus.cpp
deleted file mode 100644
index a31b13eb574..00000000000
--- a/src/Common/ExternalLoaderStatus.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Common/ExternalLoaderStatus.h>
-
-namespace DB
-{
-    String toString(ExternalLoaderStatus status)
-    {
-        using Status = ExternalLoaderStatus;
-        switch (status)
-        {
-            case Status::NOT_LOADED: return "NOT_LOADED";
-            case Status::LOADED: return "LOADED";
-            case Status::FAILED: return "FAILED";
-            case Status::LOADING: return "LOADING";
-            case Status::FAILED_AND_RELOADING: return "FAILED_AND_RELOADING";
-            case Status::LOADED_AND_RELOADING: return "LOADED_AND_RELOADING";
-            case Status::NOT_EXIST: return "NOT_EXIST";
-        }
-    __builtin_unreachable();
-    }
-
-    std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
-    {
-        using Status = ExternalLoaderStatus;
-        return std::vector<std::pair<String, Int8>>{
-            {toString(Status::NOT_LOADED), static_cast<Int8>(Status::NOT_LOADED)},
-            {toString(Status::LOADED), static_cast<Int8>(Status::LOADED)},
-            {toString(Status::FAILED), static_cast<Int8>(Status::FAILED)},
-            {toString(Status::LOADING), static_cast<Int8>(Status::LOADING)},
-            {toString(Status::LOADED_AND_RELOADING), static_cast<Int8>(Status::LOADED_AND_RELOADING)},
-            {toString(Status::FAILED_AND_RELOADING), static_cast<Int8>(Status::FAILED_AND_RELOADING)},
-            {toString(Status::NOT_EXIST), static_cast<Int8>(Status::NOT_EXIST)},
-        };
-    }
-
-    std::ostream & operator<<(std::ostream & out, ExternalLoaderStatus status)
-    {
-        return out << toString(status);
-    }
-}
diff --git a/src/Common/ExternalLoaderStatus.h b/src/Common/ExternalLoaderStatus.h
index d8852eb6152..666bb23e75e 100644
--- a/src/Common/ExternalLoaderStatus.h
+++ b/src/Common/ExternalLoaderStatus.h
@@ -1,13 +1,12 @@
 #pragma once
 
 #include <vector>
-#include <utility>
-#include <ostream>
+#include <common/EnumReflection.h>
 #include <common/types.h>
 
 namespace DB
 {
-    enum class ExternalLoaderStatus
+    enum class ExternalLoaderStatus : Int8
     {
         NOT_LOADED, /// Object hasn't been tried to load. This is an initial state.
         LOADED, /// Object has been loaded successfully.
@@ -18,7 +17,14 @@ namespace DB
         NOT_EXIST, /// Object with this name wasn't found in the configuration.
     };
 
-    String toString(ExternalLoaderStatus status);
-    std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues();
-    std::ostream & operator<<(std::ostream & out, ExternalLoaderStatus status);
+    inline std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
+    {
+        std::vector<std::pair<String, Int8>> out;
+        out.reserve(magic_enum::enum_count<ExternalLoaderStatus>());
+
+        for (const auto & [value, str] : magic_enum::enum_entries<ExternalLoaderStatus>())
+            out.emplace_back(std::string{str}, static_cast<Int8>(value));
+
+        return out;
+    }
 }
diff --git a/src/Common/FiberStack.h b/src/Common/FiberStack.h
index c509540cc9e..db825722da5 100644
--- a/src/Common/FiberStack.h
+++ b/src/Common/FiberStack.h
@@ -27,7 +27,12 @@ private:
     size_t stack_size;
     size_t page_size = 0;
 public:
-    static constexpr size_t default_stack_size = 128 * 1024; /// 64KB was not enough for tests
+    /// NOTE: If you see random segfaults in CI and stack starts from boost::context::...fiber...
+    /// probably it worth to try to increase stack size for coroutines.
+    ///
+    /// Current value is just enough for all tests in our CI. It's not selected in some special
+    /// way. We will have 40 pages with 4KB page size.
+    static constexpr size_t default_stack_size = 192 * 1024; /// 64KB was not enough for tests
 
     explicit FiberStack(size_t stack_size_ = default_stack_size) : stack_size(stack_size_)
     {
@@ -43,6 +48,8 @@ public:
         if (MAP_FAILED == vp)
             DB::throwFromErrno(fmt::format("FiberStack: Cannot mmap {}.", ReadableSize(num_bytes)), DB::ErrorCodes::CANNOT_ALLOCATE_MEMORY);
 
+        /// TODO: make reports on illegal guard page access more clear.
+        /// Currently we will see segfault and almost random stacktrace.
         if (-1 == ::mprotect(vp, page_size, PROT_NONE))
         {
             ::munmap(vp, num_bytes);
diff --git a/src/Common/FieldVisitorConvertToNumber.h b/src/Common/FieldVisitorConvertToNumber.h
index 0f099c6215d..4f0a821b288 100644
--- a/src/Common/FieldVisitorConvertToNumber.h
+++ b/src/Common/FieldVisitorConvertToNumber.h
@@ -116,7 +116,7 @@ public:
     template <typename U, typename = std::enable_if_t<is_big_int_v<U>> >
     T operator() (const U & x) const
     {
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
             return static_cast<T>(static_cast<typename T::NativeType>(x));
         else if constexpr (std::is_same_v<T, UInt128>)
             throw Exception("No conversion to old UInt128 from " + demangle(typeid(U).name()), ErrorCodes::NOT_IMPLEMENTED);
diff --git a/src/Common/FileChecker.cpp b/src/Common/FileChecker.cpp
index 173c4bd8a3a..91be58e3e39 100644
--- a/src/Common/FileChecker.cpp
+++ b/src/Common/FileChecker.cpp
@@ -111,7 +111,7 @@ void FileChecker::save() const
         std::unique_ptr<WriteBuffer> out = disk->writeFile(tmp_files_info_path);
 
         /// So complex JSON structure - for compatibility with the old format.
-        writeCString("{\"yandex\":{", *out);
+        writeCString("{\"clickhouse\":{", *out);
 
         auto settings = FormatSettings();
         for (auto it = map.begin(); it != map.end(); ++it)
@@ -153,7 +153,7 @@ void FileChecker::load()
     }
     JSON json(out.str());
 
-    JSON files = json["yandex"];
+    JSON files = json.has("clickhouse") ? json["clickhouse"] : json["yandex"];
     for (const JSON file : files) // NOLINT
         map[unescapeForFileName(file.getName())] = file.getValue()["size"].toUInt();
 }
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index 84e514c1375..669bff15ffb 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -77,7 +77,7 @@ template <typename T>
 inline typename std::enable_if<(sizeof(T) > sizeof(DB::UInt64)), DB::UInt64>::type
 intHashCRC32(const T & x, DB::UInt64 updated_value)
 {
-    auto * begin = reinterpret_cast<const char *>(&x);
+    const auto * begin = reinterpret_cast<const char *>(&x);
     for (size_t i = 0; i < sizeof(T); i += sizeof(UInt64))
     {
         updated_value = intHashCRC32(unalignedLoad<DB::UInt64>(begin), updated_value);
@@ -197,12 +197,8 @@ inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) > sizeof(UInt64)), T> ke
     __builtin_unreachable();
 }
 
-
-template <typename T, typename Enable = void>
-struct DefaultHash;
-
 template <typename T>
-struct DefaultHash<T, std::enable_if_t<!DB::IsDecimalNumber<T>>>
+struct DefaultHash
 {
     size_t operator() (T key) const
     {
@@ -210,8 +206,8 @@ struct DefaultHash<T, std::enable_if_t<!DB::IsDecimalNumber<T>>>
     }
 };
 
-template <typename T>
-struct DefaultHash<T, std::enable_if_t<DB::IsDecimalNumber<T>>>
+template <DB::is_decimal T>
+struct DefaultHash<T>
 {
     size_t operator() (T key) const
     {
diff --git a/src/Common/IntervalKind.cpp b/src/Common/IntervalKind.cpp
index b4acbe23ddd..ee4b67469ce 100644
--- a/src/Common/IntervalKind.cpp
+++ b/src/Common/IntervalKind.cpp
@@ -9,23 +9,6 @@ namespace ErrorCodes
     extern const int SYNTAX_ERROR;
 }
 
-const char * IntervalKind::toString() const
-{
-    switch (kind)
-    {
-        case IntervalKind::Second: return "Second";
-        case IntervalKind::Minute: return "Minute";
-        case IntervalKind::Hour: return "Hour";
-        case IntervalKind::Day: return "Day";
-        case IntervalKind::Week: return "Week";
-        case IntervalKind::Month: return "Month";
-        case IntervalKind::Quarter: return "Quarter";
-        case IntervalKind::Year: return "Year";
-    }
-    __builtin_unreachable();
-}
-
-
 Int32 IntervalKind::toAvgSeconds() const
 {
     switch (kind)
diff --git a/src/Common/IntervalKind.h b/src/Common/IntervalKind.h
index a086d0d2b0c..a837836bed7 100644
--- a/src/Common/IntervalKind.h
+++ b/src/Common/IntervalKind.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <common/types.h>
-
+#include <common/EnumReflection.h>
 
 namespace DB
 {
@@ -24,7 +24,7 @@ struct IntervalKind
     IntervalKind(Kind kind_ = Second) : kind(kind_) {}
     operator Kind() const { return kind; }
 
-    const char * toString() const;
+    constexpr std::string_view toString() const { return magic_enum::enum_name(kind); }
 
     /// Returns number of seconds in one interval.
     /// For `Month`, `Quarter` and `Year` the function returns an average number of seconds.
diff --git a/src/Common/JSONBuilder.h b/src/Common/JSONBuilder.h
index be95323de7d..12a2b129645 100644
--- a/src/Common/JSONBuilder.h
+++ b/src/Common/JSONBuilder.h
@@ -33,7 +33,7 @@ using ItemPtr = std::unique_ptr<IItem>;
 class JSONString : public IItem
 {
 public:
-    explicit JSONString(std::string value_) : value(std::move(value_)) {}
+    JSONString(std::string_view value_) : value(value_) {}
     void format(const FormatSettings & settings, FormatContext & context) override;
 
 private:
@@ -97,6 +97,7 @@ 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, std::string_view value) { add(std::move(key), std::make_unique<JSONString>(value)); }
     void add(std::string key, bool value) { add(std::move(key), std::make_unique<JSONBool>(std::move(value))); }
 
     template <typename T, std::enable_if_t<std::is_arithmetic<T>::value, bool> = true>
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index 50ddcb5a9eb..ad8647d6da4 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -15,7 +15,7 @@
 
 
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
-thread_local bool _memory_tracker_always_throw_logical_error_on_allocation = false;
+thread_local bool memory_tracker_always_throw_logical_error_on_allocation = false;
 #endif
 
 namespace
@@ -173,9 +173,9 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
     }
 
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
-    if (unlikely(_memory_tracker_always_throw_logical_error_on_allocation))
+    if (unlikely(memory_tracker_always_throw_logical_error_on_allocation))
     {
-        _memory_tracker_always_throw_logical_error_on_allocation = false;
+        memory_tracker_always_throw_logical_error_on_allocation = false;
         throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Memory tracker: allocations not allowed.");
     }
 #endif
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index d4de7a2cafa..d6833de544c 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -15,11 +15,11 @@
 /// DENY_ALLOCATIONS_IN_SCOPE in the inner scope. In Release builds these macros do nothing.
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
 #include <common/scope_guard.h>
-extern thread_local bool _memory_tracker_always_throw_logical_error_on_allocation;
+extern thread_local bool memory_tracker_always_throw_logical_error_on_allocation;
 #define ALLOCATIONS_IN_SCOPE_IMPL_CONCAT(n, val) \
-        bool _allocations_flag_prev_val##n = _memory_tracker_always_throw_logical_error_on_allocation; \
-        _memory_tracker_always_throw_logical_error_on_allocation = val; \
-        SCOPE_EXIT({ _memory_tracker_always_throw_logical_error_on_allocation = _allocations_flag_prev_val##n; })
+        bool _allocations_flag_prev_val##n = memory_tracker_always_throw_logical_error_on_allocation; \
+        memory_tracker_always_throw_logical_error_on_allocation = val; \
+        SCOPE_EXIT({ memory_tracker_always_throw_logical_error_on_allocation = _allocations_flag_prev_val##n; })
 #define ALLOCATIONS_IN_SCOPE_IMPL(n, val) ALLOCATIONS_IN_SCOPE_IMPL_CONCAT(n, val)
 #define DENY_ALLOCATIONS_IN_SCOPE ALLOCATIONS_IN_SCOPE_IMPL(__LINE__, true)
 #define ALLOW_ALLOCATIONS_IN_SCOPE ALLOCATIONS_IN_SCOPE_IMPL(__LINE__, false)
@@ -62,8 +62,8 @@ private:
     void logMemoryUsage(Int64 current) const;
 
 public:
-    MemoryTracker(VariableContext level_ = VariableContext::Thread);
-    MemoryTracker(MemoryTracker * parent_, VariableContext level_ = VariableContext::Thread);
+    explicit MemoryTracker(VariableContext level_ = VariableContext::Thread);
+    explicit MemoryTracker(MemoryTracker * parent_, VariableContext level_ = VariableContext::Thread);
 
     ~MemoryTracker();
 
@@ -162,18 +162,18 @@ public:
     struct BlockerInThread
     {
     private:
-        BlockerInThread(const BlockerInThread &) = delete;
-        BlockerInThread & operator=(const BlockerInThread &) = delete;
-
         static thread_local uint64_t counter;
         static thread_local VariableContext level;
 
         VariableContext previous_level;
     public:
         /// level_ - block in level and above
-        BlockerInThread(VariableContext level_ = VariableContext::User);
+        explicit BlockerInThread(VariableContext level_ = VariableContext::User);
         ~BlockerInThread();
 
+        BlockerInThread(const BlockerInThread &) = delete;
+        BlockerInThread & operator=(const BlockerInThread &) = delete;
+
         static bool isBlocked(VariableContext current_level)
         {
             return counter > 0 && current_level >= level;
@@ -195,9 +195,6 @@ public:
     struct LockExceptionInThread
     {
     private:
-        LockExceptionInThread(const LockExceptionInThread &) = delete;
-        LockExceptionInThread & operator=(const LockExceptionInThread &) = delete;
-
         static thread_local uint64_t counter;
         static thread_local VariableContext level;
         static thread_local bool block_fault_injections;
@@ -207,9 +204,12 @@ public:
     public:
         /// level_ - block in level and above
         /// block_fault_injections_ - block in fault injection too
-        LockExceptionInThread(VariableContext level_ = VariableContext::User, bool block_fault_injections_ = true);
+        explicit LockExceptionInThread(VariableContext level_ = VariableContext::User, bool block_fault_injections_ = true);
         ~LockExceptionInThread();
 
+        LockExceptionInThread(const LockExceptionInThread &) = delete;
+        LockExceptionInThread & operator=(const LockExceptionInThread &) = delete;
+
         static bool isBlocked(VariableContext current_level, bool fault_injection)
         {
             return counter > 0 && current_level >= level && (!fault_injection || block_fault_injections);
diff --git a/src/Common/RWLock.h b/src/Common/RWLock.h
index 952c8049a0f..1e4f9b9bd5e 100644
--- a/src/Common/RWLock.h
+++ b/src/Common/RWLock.h
@@ -74,7 +74,6 @@ private:
     using GroupsContainer = std::list<Group>;
     using OwnerQueryIds = std::unordered_map<String, size_t>;
 
-private:
     mutable std::mutex internal_state_mtx;
 
     GroupsContainer readers_queue;
@@ -85,7 +84,6 @@ private:
                                                                   /// or writers_queue.end() otherwise
     OwnerQueryIds owner_queries;
 
-private:
     RWLockImpl() = default;
     void unlock(GroupsContainer::iterator group_it, const String & query_id) noexcept;
     void dropOwnerGroupAndPassOwnership(GroupsContainer::iterator group_it) noexcept;
diff --git a/src/Common/RadixSort.h b/src/Common/RadixSort.h
index b14e71a6720..65ef32f3d81 100644
--- a/src/Common/RadixSort.h
+++ b/src/Common/RadixSort.h
@@ -187,7 +187,7 @@ struct RadixSortIntTraits
 
 template <typename T>
 using RadixSortNumTraits = std::conditional_t<
-    is_integer_v<T>,
+    is_integer<T>,
     std::conditional_t<is_unsigned_v<T>, RadixSortUIntTraits<T>, RadixSortIntTraits<T>>,
     RadixSortFloatTraits<T>>;
 
diff --git a/src/Common/SettingsChanges.cpp b/src/Common/SettingsChanges.cpp
index e7c769ad55a..370b465eba3 100644
--- a/src/Common/SettingsChanges.cpp
+++ b/src/Common/SettingsChanges.cpp
@@ -1,6 +1,5 @@
 #include <Common/SettingsChanges.h>
 
-
 namespace DB
 {
 namespace
diff --git a/src/Common/SettingsChanges.h b/src/Common/SettingsChanges.h
index 734d8ecb227..073af21c6cc 100644
--- a/src/Common/SettingsChanges.h
+++ b/src/Common/SettingsChanges.h
@@ -5,6 +5,9 @@
 
 namespace DB
 {
+
+class IColumn;
+
 struct SettingChange
 {
     String name;
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index 812f888b284..a9d4700490e 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -417,11 +417,7 @@ void StackTrace::toStringEveryLine(std::function<void(const std::string &)> call
 
 std::string StackTrace::toString() const
 {
-    /// Calculation of stack trace text is extremely slow.
-    /// We use simple cache because otherwise the server could be overloaded by trash queries.
-
-    static SimpleCache<decltype(toStringImpl), &toStringImpl> func_cached;
-    return func_cached(frame_pointers, offset, size);
+    return toStringStatic(frame_pointers, offset, size);
 }
 
 std::string StackTrace::toString(void ** frame_pointers_, size_t offset, size_t size)
@@ -432,6 +428,23 @@ std::string StackTrace::toString(void ** frame_pointers_, size_t offset, size_t
     for (size_t i = 0; i < size; ++i)
         frame_pointers_copy[i] = frame_pointers_[i];
 
-    static SimpleCache<decltype(toStringImpl), &toStringImpl> func_cached;
-    return func_cached(frame_pointers_copy, offset, size);
+    return toStringStatic(frame_pointers_copy, offset, size);
+}
+
+static SimpleCache<decltype(toStringImpl), &toStringImpl> & cacheInstance()
+{
+    static SimpleCache<decltype(toStringImpl), &toStringImpl> cache;
+    return cache;
+}
+
+std::string StackTrace::toStringStatic(const StackTrace::FramePointers & frame_pointers, size_t offset, size_t size)
+{
+    /// Calculation of stack trace text is extremely slow.
+    /// We use simple cache because otherwise the server could be overloaded by trash queries.
+    return cacheInstance()(frame_pointers, offset, size);
+}
+
+void StackTrace::dropCache()
+{
+    cacheInstance().drop();
 }
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 8f8c88c29fe..62acb70563f 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -61,6 +61,8 @@ public:
     std::string toString() const;
 
     static std::string toString(void ** frame_pointers, size_t offset, size_t size);
+    static std::string toStringStatic(const FramePointers & frame_pointers, size_t offset, size_t size);
+    static void dropCache();
     static void symbolize(const FramePointers & frame_pointers, size_t offset, size_t size, StackTrace::Frames & frames);
 
     void toStringEveryLine(std::function<void(const std::string &)> callback) const;
diff --git a/src/Common/Stopwatch.h b/src/Common/Stopwatch.h
index a7f5e76d5be..c307f94b19a 100644
--- a/src/Common/Stopwatch.h
+++ b/src/Common/Stopwatch.h
@@ -4,6 +4,7 @@
 #include <common/types.h>
 
 #include <atomic>
+#include <memory>
 
 
 inline UInt64 clock_gettime_ns(clockid_t clock_type = CLOCK_MONOTONIC)
@@ -22,7 +23,7 @@ public:
     /** CLOCK_MONOTONIC works relatively efficient (~15 million calls/sec) and doesn't lead to syscall.
       * Pass CLOCK_MONOTONIC_COARSE, if you need better performance with acceptable cost of several milliseconds of inaccuracy.
       */
-    Stopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { start(); }
+    explicit Stopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { start(); }
 
     void start()                       { start_ns = nanoseconds(); is_running = true; }
     void stop()                        { stop_ns = nanoseconds(); is_running = false; }
@@ -43,11 +44,13 @@ private:
     UInt64 nanoseconds() const { return clock_gettime_ns(clock_type); }
 };
 
+using StopwatchUniquePtr = std::unique_ptr<Stopwatch>;
+
 
 class AtomicStopwatch
 {
 public:
-    AtomicStopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { restart(); }
+    explicit AtomicStopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { restart(); }
 
     void restart()                     { start_ns = nanoseconds(); }
     UInt64 elapsed() const             { return nanoseconds() - start_ns; }
@@ -78,11 +81,11 @@ public:
     {
         AtomicStopwatch * parent = nullptr;
 
-        Lock() {}
+        Lock() = default;
 
-        operator bool() const { return parent != nullptr; }
+        explicit operator bool() const { return parent != nullptr; }
 
-        Lock(AtomicStopwatch * parent_) : parent(parent_) {}
+        explicit Lock(AtomicStopwatch * parent_) : parent(parent_) {}
 
         Lock(Lock &&) = default;
 
diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index a23184c9c0a..2d875b7042d 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -462,12 +462,22 @@ String SymbolIndex::getBuildIDHex() const
     return build_id_hex;
 }
 
-MultiVersion<SymbolIndex>::Version SymbolIndex::instance(bool reload)
+MultiVersion<SymbolIndex> & SymbolIndex::instanceImpl()
 {
     static MultiVersion<SymbolIndex> instance(std::unique_ptr<SymbolIndex>(new SymbolIndex));
-    if (reload)
-        instance.set(std::unique_ptr<SymbolIndex>(new SymbolIndex));
-    return instance.get();
+    return instance;
+}
+
+MultiVersion<SymbolIndex>::Version SymbolIndex::instance()
+{
+    return instanceImpl().get();
+}
+
+void SymbolIndex::reload()
+{
+    instanceImpl().set(std::unique_ptr<SymbolIndex>(new SymbolIndex));
+    /// Also drop stacktrace cache.
+    StackTrace::dropCache();
 }
 
 }
diff --git a/src/Common/SymbolIndex.h b/src/Common/SymbolIndex.h
index 65e446a7fc4..37862987bd2 100644
--- a/src/Common/SymbolIndex.h
+++ b/src/Common/SymbolIndex.h
@@ -22,7 +22,8 @@ protected:
     SymbolIndex() { update(); }
 
 public:
-    static MultiVersion<SymbolIndex>::Version instance(bool reload = false);
+    static MultiVersion<SymbolIndex>::Version instance();
+    static void reload();
 
     struct Symbol
     {
@@ -60,6 +61,7 @@ private:
     Data data;
 
     void update();
+    static MultiVersion<SymbolIndex> & instanceImpl();
 };
 
 }
diff --git a/src/Common/ThreadFuzzer.cpp b/src/Common/ThreadFuzzer.cpp
index a538ba7a49a..896d8ee4e62 100644
--- a/src/Common/ThreadFuzzer.cpp
+++ b/src/Common/ThreadFuzzer.cpp
@@ -31,6 +31,10 @@
         M(int, pthread_mutex_unlock, pthread_mutex_t * arg)
 #endif
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace DB
 {
 
@@ -124,6 +128,9 @@ void ThreadFuzzer::initConfiguration()
 
 bool ThreadFuzzer::isEffective() const
 {
+    if (!isStarted())
+        return false;
+
 #if THREAD_FUZZER_WRAP_PTHREAD
 #    define CHECK_WRAPPER_PARAMS(RET, NAME, ...) \
         if (NAME##_before_yield_probability.load(std::memory_order_relaxed)) \
@@ -155,6 +162,20 @@ bool ThreadFuzzer::isEffective() const
             || (sleep_probability > 0 && sleep_time_us > 0));
 }
 
+void ThreadFuzzer::stop()
+{
+    started.store(false, std::memory_order_relaxed);
+}
+
+void ThreadFuzzer::start()
+{
+    started.store(true, std::memory_order_relaxed);
+}
+
+bool ThreadFuzzer::isStarted()
+{
+    return started.load(std::memory_order_relaxed);
+}
 
 static void injection(
     double yield_probability,
@@ -162,6 +183,10 @@ static void injection(
     double sleep_probability,
     double sleep_time_us [[maybe_unused]])
 {
+    DENY_ALLOCATIONS_IN_SCOPE;
+    if (!ThreadFuzzer::isStarted())
+        return;
+
     if (yield_probability > 0
         && std::bernoulli_distribution(yield_probability)(thread_local_rng))
     {
diff --git a/src/Common/ThreadFuzzer.h b/src/Common/ThreadFuzzer.h
index 1a9e98ca674..743b8c75dc0 100644
--- a/src/Common/ThreadFuzzer.h
+++ b/src/Common/ThreadFuzzer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <cstdint>
-
+#include <atomic>
 
 namespace DB
 {
@@ -54,6 +54,10 @@ public:
 
     bool isEffective() const;
 
+    static void stop();
+    static void start();
+    static bool isStarted();
+
 private:
     uint64_t cpu_time_period_us = 0;
     double yield_probability = 0;
@@ -61,6 +65,8 @@ private:
     double sleep_probability = 0;
     double sleep_time_us = 0;
 
+    inline static std::atomic<bool> started{true};
+
     ThreadFuzzer();
 
     void initConfiguration();
diff --git a/src/Common/ThreadPool.cpp b/src/Common/ThreadPool.cpp
index 4cb1df3ff65..8ad70d85643 100644
--- a/src/Common/ThreadPool.cpp
+++ b/src/Common/ThreadPool.cpp
@@ -3,6 +3,7 @@
 #include <Common/getNumberOfPhysicalCPUCores.h>
 
 #include <cassert>
+#include <iostream>
 #include <type_traits>
 
 #include <Poco/Util/Application.h>
@@ -74,6 +75,8 @@ void ThreadPoolImpl<Thread>::setQueueSize(size_t value)
 {
     std::lock_guard lock(mutex);
     queue_size = value;
+    /// Reserve memory to get rid of allocations
+    jobs.reserve(queue_size);
 }
 
 
@@ -247,7 +250,7 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
 
             if (!jobs.empty())
             {
-                /// std::priority_queue does not provide interface for getting non-const reference to an element
+                /// boost::priority_queue does not provide interface for getting non-const reference to an element
                 /// to prevent us from modifying its priority. We have to use const_cast to force move semantics on JobWithPriority::job.
                 job = std::move(const_cast<Job &>(jobs.top().job));
                 jobs.pop();
@@ -257,6 +260,7 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
                 /// shutdown is true, simply finish the thread.
                 return;
             }
+
         }
 
         if (!need_shutdown)
diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index 1da5d25eef0..5716d02803c 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -8,6 +8,9 @@
 #include <queue>
 #include <list>
 #include <optional>
+#include <atomic>
+
+#include <boost/heap/priority_queue.hpp>
 
 #include <Poco/Event.h>
 #include <Common/ThreadStatus.h>
@@ -103,11 +106,10 @@ private:
         }
     };
 
-    std::priority_queue<JobWithPriority> jobs;
+    boost::heap::priority_queue<JobWithPriority> jobs;
     std::list<Thread> threads;
     std::exception_ptr first_exception;
 
-
     template <typename ReturnType>
     ReturnType scheduleImpl(Job job, int priority, std::optional<uint64_t> wait_microseconds);
 
@@ -156,14 +158,16 @@ public:
 class ThreadFromGlobalPool
 {
 public:
-    ThreadFromGlobalPool() {}
+    ThreadFromGlobalPool() = default;
 
     template <typename Function, typename... Args>
     explicit ThreadFromGlobalPool(Function && func, Args &&... args)
         : state(std::make_shared<Poco::Event>())
+        , thread_id(std::make_shared<std::thread::id>())
     {
         /// NOTE: If this will throw an exception, the destructor won't be called.
         GlobalThreadPool::instance().scheduleOrThrow([
+            thread_id = thread_id,
             state = state,
             func = std::forward<Function>(func),
             args = std::make_tuple(std::forward<Args>(args)...)]() mutable /// mutable is needed to destroy capture
@@ -171,6 +175,8 @@ public:
             auto event = std::move(state);
             SCOPE_EXIT(event->set());
 
+            thread_id = std::make_shared<std::thread::id>(std::this_thread::get_id());
+
             /// This moves are needed to destroy function and arguments before exit.
             /// It will guarantee that after ThreadFromGlobalPool::join all captured params are destroyed.
             auto function = std::move(func);
@@ -193,6 +199,7 @@ public:
         if (joinable())
             abort();
         state = std::move(rhs.state);
+        thread_id = std::move(rhs.thread_id);
         return *this;
     }
 
@@ -220,12 +227,18 @@ public:
 
     bool joinable() const
     {
-        return state != nullptr;
+        if (!state)
+            return false;
+        /// Thread cannot join itself.
+        if (*thread_id == std::this_thread::get_id())
+            return false;
+        return true;
     }
 
 private:
     /// The state used in this object and inside the thread job.
     std::shared_ptr<Poco::Event> state;
+    std::shared_ptr<std::thread::id> thread_id;
 };
 
 
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 81c6b8eb1c3..0c777623fc7 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -221,7 +221,6 @@ MainThreadStatus & MainThreadStatus::getInstance()
     return thread_status;
 }
 MainThreadStatus::MainThreadStatus()
-    : ThreadStatus()
 {
     main_thread = current_thread;
 }
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index bfbfea03aae..27dfdad7cdd 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -10,6 +10,7 @@
 #include <common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/Stopwatch.h>
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
 #include <unistd.h>
@@ -277,6 +278,8 @@ public:
 
     void setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_);
 
+    UInt32 getSessionUptime() const { return session_uptime.elapsedSeconds(); }
+
 private:
     friend class EphemeralNodeHolder;
 
@@ -307,6 +310,8 @@ private:
 
     Poco::Logger * log = nullptr;
     std::shared_ptr<DB::ZooKeeperLog> zk_log;
+
+    AtomicStopwatch session_uptime;
 };
 
 
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.h b/src/Common/ZooKeeper/ZooKeeperCommon.h
index 16190aa25d3..a51ca9a487e 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.h
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.h
@@ -30,6 +30,8 @@ struct ZooKeeperResponse : virtual Response
     XID xid = 0;
     int64_t zxid = 0;
 
+    ZooKeeperResponse() = default;
+    ZooKeeperResponse(const ZooKeeperResponse &) = default;
     virtual ~ZooKeeperResponse() override = default;
     virtual void readImpl(ReadBuffer &) = 0;
     virtual void writeImpl(WriteBuffer &) const = 0;
diff --git a/src/Common/examples/int_hashes_perf.cpp b/src/Common/examples/int_hashes_perf.cpp
index 8a32f8f536e..c648c7c0cf2 100644
--- a/src/Common/examples/int_hashes_perf.cpp
+++ b/src/Common/examples/int_hashes_perf.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #if defined (OS_LINUX)
 #   include <sched.h>
 #endif
diff --git a/src/Common/parseAddress.cpp b/src/Common/parseAddress.cpp
index c99c08896ab..e02b5d16db7 100644
--- a/src/Common/parseAddress.cpp
+++ b/src/Common/parseAddress.cpp
@@ -43,7 +43,7 @@ std::pair<std::string, UInt16> parseAddress(const std::string & str, UInt16 defa
 
         UInt16 port_number;
         ReadBufferFromMemory port_buf(port, end - port);
-        if (!tryReadText<UInt16>(port_number, port_buf) || !port_buf.eof())
+        if (!tryReadText(port_number, port_buf) || !port_buf.eof())
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Illegal port passed to function parseAddress: {}", port);
diff --git a/src/Common/setThreadName.cpp b/src/Common/setThreadName.cpp
index 9e45c62a9c9..958404b9ad1 100644
--- a/src/Common/setThreadName.cpp
+++ b/src/Common/setThreadName.cpp
@@ -22,6 +22,10 @@ namespace ErrorCodes
 }
 
 
+/// Cache thread_name to avoid prctl(PR_GET_NAME) for query_log/text_log
+static thread_local std::string thread_name;
+
+
 void setThreadName(const char * name)
 {
 #ifndef NDEBUG
@@ -40,24 +44,29 @@ void setThreadName(const char * name)
     if (0 != prctl(PR_SET_NAME, name, 0, 0, 0))
 #endif
         DB::throwFromErrno("Cannot set thread name with prctl(PR_SET_NAME, ...)", DB::ErrorCodes::PTHREAD_ERROR);
+
+    thread_name = name;
 }
 
-std::string getThreadName()
+const std::string & getThreadName()
 {
-    std::string name(16, '\0');
+    if (!thread_name.empty())
+        return thread_name;
+
+    thread_name.resize(16);
 
 #if defined(__APPLE__) || defined(OS_SUNOS)
-    if (pthread_getname_np(pthread_self(), name.data(), name.size()))
+    if (pthread_getname_np(pthread_self(), thread_name.data(), thread_name.size()))
         throw DB::Exception("Cannot get thread name with pthread_getname_np()", DB::ErrorCodes::PTHREAD_ERROR);
 #elif defined(__FreeBSD__)
 // TODO: make test. freebsd will have this function soon https://freshbsd.org/commit/freebsd/r337983
-//    if (pthread_get_name_np(pthread_self(), name.data(), name.size()))
+//    if (pthread_get_name_np(pthread_self(), thread_name.data(), thread_name.size()))
 //        throw DB::Exception("Cannot get thread name with pthread_get_name_np()", DB::ErrorCodes::PTHREAD_ERROR);
 #else
-    if (0 != prctl(PR_GET_NAME, name.data(), 0, 0, 0))
+    if (0 != prctl(PR_GET_NAME, thread_name.data(), 0, 0, 0))
         DB::throwFromErrno("Cannot get thread name with prctl(PR_GET_NAME)", DB::ErrorCodes::PTHREAD_ERROR);
 #endif
 
-    name.resize(std::strlen(name.data()));
-    return name;
+    thread_name.resize(std::strlen(thread_name.data()));
+    return thread_name;
 }
diff --git a/src/Common/setThreadName.h b/src/Common/setThreadName.h
index cdcb6b46914..ea988885db2 100644
--- a/src/Common/setThreadName.h
+++ b/src/Common/setThreadName.h
@@ -7,4 +7,4 @@
   */
 void setThreadName(const char * name);
 
-std::string getThreadName();
+const std::string & getThreadName();
diff --git a/src/Common/tests/gtest_wide_integer.cpp b/src/Common/tests/gtest_wide_integer.cpp
index 0cdbcb29c02..d1876a7b9a6 100644
--- a/src/Common/tests/gtest_wide_integer.cpp
+++ b/src/Common/tests/gtest_wide_integer.cpp
@@ -13,22 +13,22 @@
 
 static_assert(is_signed_v<Int128>);
 static_assert(!is_unsigned_v<Int128>);
-static_assert(is_integer_v<Int128>);
+static_assert(is_integer<Int128>);
 static_assert(sizeof(Int128) == 16);
 
 static_assert(is_signed_v<Int256>);
 static_assert(!is_unsigned_v<Int256>);
-static_assert(is_integer_v<Int256>);
+static_assert(is_integer<Int256>);
 static_assert(sizeof(Int256) == 32);
 
 static_assert(!is_signed_v<UInt128>);
 static_assert(is_unsigned_v<UInt128>);
-static_assert(is_integer_v<UInt128>);
+static_assert(is_integer<UInt128>);
 static_assert(sizeof(UInt128) == 16);
 
 static_assert(!is_signed_v<UInt256>);
 static_assert(is_unsigned_v<UInt256>);
-static_assert(is_integer_v<UInt256>);
+static_assert(is_integer<UInt256>);
 static_assert(sizeof(UInt256) == 32);
 
 
diff --git a/src/Common/ya.make b/src/Common/ya.make
deleted file mode 100644
index bf9d3627661..00000000000
--- a/src/Common/ya.make
+++ /dev/null
@@ -1,134 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL (
-    GLOBAL clickhouse/src
-    contrib/libs/libcpuid
-    contrib/libs/libunwind/include
-    GLOBAL contrib/restricted/dragonbox
-)
-
-PEERDIR(
-    clickhouse/base/common
-    clickhouse/base/pcg-random
-    clickhouse/base/widechar_width
-    contrib/libs/libcpuid
-    contrib/libs/openssl
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/re2
-    contrib/restricted/dragonbox
-)
-
-INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/yandex/ya.make.versions.inc)
-
-
-SRCS(
-    ActionLock.cpp
-    AlignedBuffer.cpp
-    Allocator.cpp
-    ClickHouseRevision.cpp
-    Config/AbstractConfigurationComparison.cpp
-    Config/ConfigProcessor.cpp
-    Config/ConfigReloader.cpp
-    Config/YAMLParser.cpp
-    Config/configReadClient.cpp
-    CurrentMemoryTracker.cpp
-    CurrentMetrics.cpp
-    CurrentThread.cpp
-    DNSResolver.cpp
-    Dwarf.cpp
-    Elf.cpp
-    Epoll.cpp
-    ErrorCodes.cpp
-    Exception.cpp
-    ExternalLoaderStatus.cpp
-    FieldVisitorDump.cpp
-    FieldVisitorHash.cpp
-    FieldVisitorSum.cpp
-    FieldVisitorToString.cpp
-    FieldVisitorWriteBinary.cpp
-    FileChecker.cpp
-    IO.cpp
-    IPv6ToBinary.cpp
-    IntervalKind.cpp
-    JSONBuilder.cpp
-    Macros.cpp
-    MemoryStatisticsOS.cpp
-    MemoryTracker.cpp
-    OpenSSLHelpers.cpp
-    OptimizedRegularExpression.cpp
-    PODArray.cpp
-    PipeFDs.cpp
-    ProcfsMetricsProvider.cpp
-    ProfileEvents.cpp
-    ProgressIndication.cpp
-    QueryProfiler.cpp
-    RWLock.cpp
-    RemoteHostFilter.cpp
-    SensitiveDataMasker.cpp
-    SettingsChanges.cpp
-    SharedLibrary.cpp
-    ShellCommand.cpp
-    StackTrace.cpp
-    StatusFile.cpp
-    StatusInfo.cpp
-    Stopwatch.cpp
-    StringUtils/StringUtils.cpp
-    StudentTTest.cpp
-    SymbolIndex.cpp
-    TLDListsHolder.cpp
-    TaskStatsInfoGetter.cpp
-    TerminalSize.cpp
-    ThreadFuzzer.cpp
-    ThreadPool.cpp
-    ThreadProfileEvents.cpp
-    ThreadStatus.cpp
-    Throttler.cpp
-    TimerDescriptor.cpp
-    TraceCollector.cpp
-    UTF8Helpers.cpp
-    UnicodeBar.cpp
-    VersionNumber.cpp
-    WeakHash.cpp
-    ZooKeeper/IKeeper.cpp
-    ZooKeeper/TestKeeper.cpp
-    ZooKeeper/ZooKeeper.cpp
-    ZooKeeper/ZooKeeperCommon.cpp
-    ZooKeeper/ZooKeeperConstants.cpp
-    ZooKeeper/ZooKeeperIO.cpp
-    ZooKeeper/ZooKeeperImpl.cpp
-    ZooKeeper/ZooKeeperNodeCache.cpp
-    checkStackSize.cpp
-    clearPasswordFromCommandLine.cpp
-    clickhouse_malloc.cpp
-    createHardLink.cpp
-    escapeForFileName.cpp
-    filesystemHelpers.cpp
-    formatIPv6.cpp
-    formatReadable.cpp
-    getExecutablePath.cpp
-    getHashOfLoadedBinary.cpp
-    getMappedArea.cpp
-    getMultipleKeysFromConfig.cpp
-    getNumberOfPhysicalCPUCores.cpp
-    hasLinuxCapability.cpp
-    hex.cpp
-    isLocalAddress.cpp
-    isValidUTF8.cpp
-    malloc.cpp
-    new_delete.cpp
-    parseAddress.cpp
-    parseGlobs.cpp
-    parseRemoteDescription.cpp
-    quoteString.cpp
-    randomSeed.cpp
-    remapExecutable.cpp
-    renameat2.cpp
-    setThreadName.cpp
-    thread_local_rng.cpp
-
-)
-
-END()
diff --git a/src/Common/ya.make.in b/src/Common/ya.make.in
deleted file mode 100644
index 9fd6c4b4708..00000000000
--- a/src/Common/ya.make.in
+++ /dev/null
@@ -1,30 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL (
-    GLOBAL clickhouse/src
-    contrib/libs/libcpuid
-    contrib/libs/libunwind/include
-    GLOBAL contrib/restricted/dragonbox
-)
-
-PEERDIR(
-    clickhouse/base/common
-    clickhouse/base/pcg-random
-    clickhouse/base/widechar_width
-    contrib/libs/libcpuid
-    contrib/libs/openssl
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/re2
-    contrib/restricted/dragonbox
-)
-
-INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/yandex/ya.make.versions.inc)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index 3f96cfa8ff8..57b5a41c6f7 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index 6b921fb9c0a..d35411d6266 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -1,214 +1,553 @@
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
 #endif
+#include "Common/Exception.h"
+#include "common/types.h"
+#include "IO/VarInt.h"
 #include <Compression/CompressionFactory.h>
-#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
-
 #include <Compression/CompressionCodecEncrypted.h>
+#include <Poco/Logger.h>
+#include <common/logger_useful.h>
+#include <Common/ErrorCodes.h>
+
+// This depends on BoringSSL-specific API, notably <openssl/aead.h>.
+#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
 #include <Parsers/ASTLiteral.h>
-#include <cassert>
 #include <openssl/digest.h> // Y_IGNORE
 #include <openssl/err.h>
-#include <openssl/hkdf.h> // Y_IGNORE
-#include <string_view>
+#include <boost/algorithm/hex.hpp>
+#include <openssl/aead.h> // Y_IGNORE
+#endif
 
+// Common part for both parts (with SSL and without)
 namespace DB
 {
-    namespace ErrorCodes
+
+namespace ErrorCodes
+{
+    extern const int OPENSSL_ERROR;
+}
+
+namespace
+{
+
+/// Get string name for method. Return empty string for undefined Method
+String getMethodName(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        extern const int ILLEGAL_CODEC_PARAMETER;
-        extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
-        extern const int NO_ELEMENTS_IN_CONFIG;
-        extern const int OPENSSL_ERROR;
+        return "AES_128_GCM_SIV";
     }
-
-    void CompressionCodecEncrypted::setMasterKey(const std::string_view & master_key)
+    else if (Method == AES_256_GCM_SIV)
     {
-        keys.emplace(master_key);
+        return "AES_256_GCM_SIV";
     }
-
-    CompressionCodecEncrypted::KeyHolder::KeyHolder(const std::string_view & master_key)
+    else
     {
-        // Derive a key from it.
-        keygen_key = deriveKey(master_key);
-
-        // EVP_AEAD_CTX is not stateful so we can create an
-        // instance now.
-        EVP_AEAD_CTX_zero(&ctx);
-        const int ok = EVP_AEAD_CTX_init(&ctx, EVP_aead_aes_128_gcm(),
-                                         reinterpret_cast<const uint8_t*>(keygen_key.data()), keygen_key.size(),
-                                         16 /* tag size */, nullptr);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+        return "";
     }
+}
 
-    CompressionCodecEncrypted::KeyHolder::~KeyHolder()
+/// Get method code (used for codec, to understand which one we are using)
+uint8_t getMethodCode(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        EVP_AEAD_CTX_cleanup(&ctx);
+        return uint8_t(CompressionMethodByte::AES_128_GCM_SIV);
     }
-
-    const CompressionCodecEncrypted::KeyHolder & CompressionCodecEncrypted::getKeys()
+    else if (Method == AES_256_GCM_SIV)
     {
-        if (keys)
-            return *keys;
-        else
-            throw Exception("There is no configuration for encryption in the server config",
-                            ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+        return uint8_t(CompressionMethodByte::AES_256_GCM_SIV);
     }
-
-    CompressionCodecEncrypted::CompressionCodecEncrypted(const std::string_view & cipher)
+    else
     {
-        setCodecDescription("Encrypted", {std::make_shared<ASTLiteral>(cipher)});
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    uint8_t CompressionCodecEncrypted::getMethodByte() const
+} // end of namespace
+
+} // end of namespace DB
+
+#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
+    extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+    extern const int INCORRECT_DATA;
+}
+
+namespace
+{
+constexpr size_t tag_size        = 16;   /// AES-GCM-SIV always uses a tag of 16 bytes length
+constexpr size_t key_id_max_size = 8;    /// Max size of varint.
+constexpr size_t nonce_max_size  = 13;   /// Nonce size and one byte to show if nonce in in text
+
+/// Get encryption/decryption algorithms.
+auto getMethod(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        return static_cast<uint8_t>(CompressionMethodByte::Encrypted);
+        return EVP_aead_aes_128_gcm_siv;
     }
-
-    void CompressionCodecEncrypted::updateHash(SipHash & hash) const
+    else if (Method == AES_256_GCM_SIV)
     {
-        getCodecDesc()->updateTreeHash(hash);
+        return EVP_aead_aes_256_gcm_siv;
     }
-
-    UInt32 CompressionCodecEncrypted::getMaxCompressedDataSize(UInt32 uncompressed_size) const
+    else
     {
-        // The GCM mode is a stream cipher. No paddings are
-        // involved. There will be a tag at the end of ciphertext (16
-        // octets).
-        return uncompressed_size + 16;
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    UInt32 CompressionCodecEncrypted::doCompressData(const char * source, UInt32 source_size, char * dest) const
+/// Find out key size for each algorithm
+UInt64 methodKeySize(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        // Generate an IV out of the data block and the key-generation
-        // key. It is completely deterministic, but does not leak any
-        // information about the data block except for equivalence of
-        // identical blocks (under the same master key). The IV will
-        // be used as an authentication tag. The ciphertext and the
-        // tag will be written directly in the dest buffer.
-        const std::string_view plaintext = std::string_view(source, source_size);
-
-        encrypt(plaintext, dest);
-        return source_size + 16;
+        return 16;
     }
-
-    void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size [[maybe_unused]]) const
+    else if (Method == AES_256_GCM_SIV)
     {
-        // Extract the IV from the encrypted data block. Decrypt the
-        // block with the extracted IV, and compare the tag. Throw an
-        // exception if tags don't match.
-        const std::string_view ciphertext_and_tag = std::string_view(source, source_size);
-        assert(ciphertext_and_tag.size() == uncompressed_size + 16);
-
-        decrypt(ciphertext_and_tag, dest);
+        return 32;
     }
-
-    std::string CompressionCodecEncrypted::lastErrorString()
+    else
     {
-        std::array<char, 1024> buffer;
-        ERR_error_string_n(ERR_get_error(), buffer.data(), buffer.size());
-        return std::string(buffer.data());
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    std::string CompressionCodecEncrypted::deriveKey(const std::string_view & master_key)
+std::string lastErrorString()
+{
+    std::array<char, 1024> buffer;
+    ERR_error_string_n(ERR_get_error(), buffer.data(), buffer.size());
+    return std::string(buffer.data());
+}
+
+/// Encrypt plaintext with particular algorithm and put result into ciphertext_and_tag.
+/// This function get key and nonce and encrypt text with their help.
+/// If something went wrong (can't init context or can't encrypt data) it throws exception.
+/// It returns length of encrypted text.
+size_t encrypt(const std::string_view & plaintext, char * ciphertext_and_tag, EncryptionMethod method, const String & key, const String & nonce)
+{
+    /// Init context for encryption, using key.
+    EVP_AEAD_CTX encrypt_ctx;
+    EVP_AEAD_CTX_zero(&encrypt_ctx);
+    const int ok_init = EVP_AEAD_CTX_init(&encrypt_ctx, getMethod(method)(),
+                                            reinterpret_cast<const uint8_t*>(key.data()), key.size(),
+                                            16 /* tag size */, nullptr);
+    if (!ok_init)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    /// encrypt data using context and given nonce.
+    size_t out_len;
+    const int ok_open = EVP_AEAD_CTX_seal(&encrypt_ctx,
+                                            reinterpret_cast<uint8_t *>(ciphertext_and_tag),
+                                            &out_len, plaintext.size() + 16,
+                                            reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
+                                            reinterpret_cast<const uint8_t *>(plaintext.data()), plaintext.size(),
+                                            nullptr, 0);
+    if (!ok_open)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    return out_len;
+}
+
+/// Encrypt plaintext with particular algorithm and put result into ciphertext_and_tag.
+/// This function get key and nonce and encrypt text with their help.
+/// If something went wrong (can't init context or can't encrypt data) it throws exception.
+/// It returns length of encrypted text.
+size_t decrypt(const std::string_view & ciphertext, char * plaintext, EncryptionMethod method, const String & key, const String & nonce)
+{
+    /// Init context for decryption with given key.
+    EVP_AEAD_CTX decrypt_ctx;
+    EVP_AEAD_CTX_zero(&decrypt_ctx);
+
+    const int ok_init = EVP_AEAD_CTX_init(&decrypt_ctx, getMethod(method)(),
+                                          reinterpret_cast<const uint8_t*>(key.data()), key.size(),
+                                          16 /* tag size */, nullptr);
+    if (!ok_init)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    /// decrypt data using given nonce
+    size_t out_len;
+    const int ok_open = EVP_AEAD_CTX_open(&decrypt_ctx,
+                                          reinterpret_cast<uint8_t *>(plaintext),
+                                          &out_len, ciphertext.size(),
+                                          reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
+                                          reinterpret_cast<const uint8_t *>(ciphertext.data()), ciphertext.size(),
+                                          nullptr, 0);
+    if (!ok_open)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    return out_len;
+}
+
+/// Register codec in factory
+void registerEncryptionCodec(CompressionCodecFactory & factory, EncryptionMethod Method)
+{
+    const auto method_code = getMethodCode(Method); /// Codec need to know its code
+    factory.registerCompressionCodec(getMethodName(Method), method_code, [&, Method](const ASTPtr & arguments) -> CompressionCodecPtr
     {
-        std::string_view salt(""); // No salt: derive keys in a deterministic manner.
-        std::string_view info("Codec Encrypted('AES-128-GCM-SIV') key generation key");
-        std::array<char, 32> result;
-
-        const int ok = HKDF(reinterpret_cast<uint8_t *>(result.data()), result.size(),
-                            EVP_sha256(),
-                            reinterpret_cast<const uint8_t *>(master_key.data()), master_key.size(),
-                            reinterpret_cast<const uint8_t *>(salt.data()), salt.size(),
-                            reinterpret_cast<const uint8_t *>(info.data()), info.size());
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        return std::string(result.data(), 16);
-    }
-
-    void CompressionCodecEncrypted::encrypt(const std::string_view & plaintext, char * ciphertext_and_tag)
-    {
-        // Fixed nonce. Yes this is unrecommended, but we have to live
-        // with it.
-        std::string_view nonce("\0\0\0\0\0\0\0\0\0\0\0\0", 12);
-
-        size_t out_len;
-        const int ok = EVP_AEAD_CTX_seal(&getKeys().ctx,
-                                         reinterpret_cast<uint8_t *>(ciphertext_and_tag),
-                                         &out_len, plaintext.size() + 16,
-                                         reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
-                                         reinterpret_cast<const uint8_t *>(plaintext.data()), plaintext.size(),
-                                         nullptr, 0);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        assert(out_len == plaintext.size() + 16);
-    }
-
-    void CompressionCodecEncrypted::decrypt(const std::string_view & ciphertext, char * plaintext)
-    {
-        std::string_view nonce("\0\0\0\0\0\0\0\0\0\0\0\0", 12);
-
-        size_t out_len;
-        const int ok = EVP_AEAD_CTX_open(&getKeys().ctx,
-                                         reinterpret_cast<uint8_t *>(plaintext),
-                                         &out_len, ciphertext.size(),
-                                         reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
-                                         reinterpret_cast<const uint8_t *>(ciphertext.data()), ciphertext.size(),
-                                         nullptr, 0);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        assert(out_len == ciphertext.size() - 16);
-    }
-
-    void registerCodecEncrypted(CompressionCodecFactory & factory)
-    {
-        const auto method_code = uint8_t(CompressionMethodByte::Encrypted);
-        factory.registerCompressionCodec("Encrypted", method_code, [&](const ASTPtr & arguments) -> CompressionCodecPtr
+        if (arguments)
         {
-            if (arguments)
-            {
-                if (arguments->children.size() != 1)
-                    throw Exception("Codec Encrypted() must have 1 parameter, given " +
-                                    std::to_string(arguments->children.size()),
-                                    ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
+            if (!arguments->children.empty())
+                throw Exception("Codec " + getMethodName(Method) + " must not have parameters, given " +
+                                std::to_string(arguments->children.size()),
+                                ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
+        }
+        return std::make_shared<CompressionCodecEncrypted>(Method);
+    });
+}
 
-                const auto children = arguments->children;
-                const auto * literal = children[0]->as<ASTLiteral>();
-                if (!literal)
-                    throw Exception("Wrong argument for codec Encrypted(). Expected a string literal",
-                                    ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
-
-                const String cipher = literal->value.safeGet<String>();
-                if (cipher == "AES-128-GCM-SIV")
-                    return std::make_shared<CompressionCodecEncrypted>(cipher);
-                else
-                    throw Exception("Cipher '" + cipher + "' is not supported",
-                                    ErrorCodes::ILLEGAL_CODEC_PARAMETER);
-            }
-            else
-            {
-                /* The factory is asking us to construct the codec
-                 * only from the method code. How can that be
-                 * possible? For now we only support a single cipher
-                 * so it's not really a problem, but if we were to
-                 * support more ciphers it would be catastrophic. */
-                return std::make_shared<CompressionCodecEncrypted>("AES-128-GCM-SIV");
-            }
-        });
+String unhexKey(const String & hex)
+{
+    try
+    {
+        return boost::algorithm::unhex(hex);
     }
+    catch (const std::exception &)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot read key_hex, check for valid characters [0-9a-fA-F] and length");
+    }
+}
+
+/// Firstly, write a byte, which shows if the nonce will be put in text (if it was defined in config)
+/// Secondly, write nonce in text (this step depends from first step)
+/// return new position to write
+inline char* writeNonce(const String& nonce, char* dest)
+{
+    /// If nonce consists of nul bytes, it shouldn't be in dest. Zero byte is the only byte that should be written.
+    /// Otherwise, 1 is written and data from nonce is copied
+    if (nonce != String("\0\0\0\0\0\0\0\0\0\0\0\0", 12))
+    {
+        *dest = 1;
+        ++dest;
+        size_t copied_symbols = nonce.copy(dest, nonce.size());
+        if (copied_symbols != nonce.size())
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Can't copy nonce into destination. Count of copied symbols {}, need to copy {}", copied_symbols, nonce.size());
+        dest += copied_symbols;
+        return dest;
+    }
+    else
+    {
+        *dest = 0;
+        return ++dest;
+    }
+}
+
+/// Firstly, read a byte, which shows if the nonce will be put in text (if it was defined in config)
+/// Secondly, read nonce in text (this step depends from first step)
+/// return new position to read
+inline const char* readNonce(String& nonce, const char* source)
+{
+    /// If first is zero byte: move source and set zero-bytes nonce
+    if (!*source)
+    {
+        nonce = {"\0\0\0\0\0\0\0\0\0\0\0\0", 12};
+        return ++source;
+    }
+    /// Move to next byte. Nonce will begin from there
+    ++source;
+
+    /// Otherwise, use data from source in nonce
+    nonce = {source, 12};
+    source += 12;
+    return source;
+}
+
+}
+
+CompressionCodecEncrypted::Configuration & CompressionCodecEncrypted::Configuration::instance()
+{
+    static CompressionCodecEncrypted::Configuration ret;
+    return ret;
+}
+
+void CompressionCodecEncrypted::Configuration::loadImpl(
+    const Poco::Util::AbstractConfiguration & config, const String & config_prefix, EncryptionMethod method, std::unique_ptr<Params> & new_params)
+{
+    // if method is not smaller than MAX_ENCRYPTION_METHOD it is incorrect
+    if (method >= MAX_ENCRYPTION_METHOD)
+        throw Exception("Wrong argument for loading configurations.", ErrorCodes::BAD_ARGUMENTS);
+
+    /// Scan all keys in config and add them into storage. If key is in hex, transform it.
+    /// Remember key ID for each key, because it will be used in encryption/decryption
+    Strings config_keys;
+    config.keys(config_prefix, config_keys);
+    for (const std::string & config_key : config_keys)
+    {
+        String key;
+        UInt64 key_id;
+
+        if ((config_key == "key") || config_key.starts_with("key["))
+        {
+            key = config.getString(config_prefix + "." + config_key, "");
+            key_id = config.getUInt64(config_prefix + "." + config_key + "[@id]", 0);
+        }
+        else if ((config_key == "key_hex") || config_key.starts_with("key_hex["))
+        {
+            key = unhexKey(config.getString(config_prefix + "." + config_key, ""));
+            key_id = config.getUInt64(config_prefix + "." + config_key + "[@id]", 0);
+        }
+        else
+            continue;
+
+        /// For each key its id should be unique.
+        if (new_params->keys_storage[method].contains(key_id))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Multiple keys have the same ID {}", key_id);
+
+        /// Check size of key. Its length depends on encryption algorithm.
+        if (key.size() != methodKeySize(method))
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Got an encryption key with unexpected size {}, the size should be {}",
+                key.size(), methodKeySize(method));
+
+        new_params->keys_storage[method][key_id] = key;
+    }
+
+    /// Check that we have at least one key for this method (otherwise it is incorrect to use it).
+    if (new_params->keys_storage[method].empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No keys, an encryption needs keys to work");
+
+    /// Try to find which key will be used for encryption. If there is no current_key,
+    /// first key will be used for encryption (its index equals to zero).
+    new_params->current_key_id[method] = config.getUInt64(config_prefix + ".current_key_id", 0);
+
+    /// Check that we have current key. Otherwise config is incorrect.
+    if (!new_params->keys_storage[method].contains(new_params->current_key_id[method]))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not found a key with the current ID {}", new_params->current_key_id[method]);
+
+    /// Read nonce (in hex or in string). Its length should be 12 bytes.
+    if (config.has(config_prefix + ".nonce_hex"))
+        new_params->nonce[method] = unhexKey(config.getString(config_prefix + ".nonce_hex"));
+    else
+        new_params->nonce[method] = config.getString(config_prefix + ".nonce", "");
+
+    if (new_params->nonce[method].size() != 12 && !new_params->nonce[method].empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Got nonce with unexpected size {}, the size should be 12", new_params->nonce[method].size());
+}
+
+bool CompressionCodecEncrypted::Configuration::tryLoad(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    /// Try to create new parameters and fill them from config.
+    /// If there will be some errors, print their message to notify user that
+    /// something went wrong and new parameters are not available
+    try
+    {
+        load(config, config_prefix);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        return false;
+    }
+    return true;
+}
+
+void CompressionCodecEncrypted::Configuration::load(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    /// Try to create new parameters and fill them from config.
+    /// If there will be some errors, throw error
+    std::unique_ptr<Params> new_params(new Params);
+    if (config.has(config_prefix + ".aes_128_gcm_siv"))
+    {
+        loadImpl(config, config_prefix + ".aes_128_gcm_siv", AES_128_GCM_SIV, new_params);
+    }
+    if (config.has(config_prefix + ".aes_256_gcm_siv"))
+    {
+        loadImpl(config, config_prefix + ".aes_256_gcm_siv", AES_256_GCM_SIV, new_params);
+    }
+
+    params.set(std::move(new_params));
+}
+
+void CompressionCodecEncrypted::Configuration::getCurrentKeyAndNonce(EncryptionMethod method, UInt64 & current_key_id, String &current_key, String & nonce) const
+{
+    /// It parameters were not set, throw exception
+    if (!params.get())
+        throw Exception("Empty params in CompressionCodecEncrypted configuration", ErrorCodes::BAD_ARGUMENTS);
+
+    /// Save parameters in variable, because they can always change.
+    /// As this function not atomic, we should be certain that we get information from one particular version for correct work.
+    const auto current_params = params.get();
+    current_key_id = current_params->current_key_id[method];
+
+    /// As parameters can be created empty, we need to check that this key is available.
+    if (current_params->keys_storage[method].contains(current_key_id))
+        current_key = current_params->keys_storage[method].at(current_key_id);
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no current_key {} in config. Please, put it in config and reload.", current_key_id);
+
+    /// If there is no nonce in config, we need to generate particular one,
+    /// because all encryptions should have nonce and random nonce generation will lead to cases
+    /// when nonce after config reload (nonce is not defined in config) will differ from previously generated one.
+    /// This will lead to data loss.
+    nonce = current_params->nonce[method];
+    if (nonce.empty())
+        nonce = {"\0\0\0\0\0\0\0\0\0\0\0\0", 12};
+}
+
+String CompressionCodecEncrypted::Configuration::getKey(EncryptionMethod method, const UInt64 & key_id) const
+{
+    String key;
+    /// See description of previous finction, logic is the same.
+    if (!params.get())
+        throw Exception("Empty params in CompressionCodecEncrypted configuration", ErrorCodes::BAD_ARGUMENTS);
+
+    const auto current_params = params.get();
+
+    /// check if there is current key in storage
+    if (current_params->keys_storage[method].contains(key_id))
+        key = current_params->keys_storage[method].at(key_id);
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no key {} in config", key_id);
+
+    return key;
+}
+
+
+CompressionCodecEncrypted::CompressionCodecEncrypted(EncryptionMethod Method): encryption_method(Method)
+{
+    setCodecDescription(getMethodName(encryption_method));
+}
+
+uint8_t CompressionCodecEncrypted::getMethodByte() const
+{
+    return getMethodCode(encryption_method);
+}
+
+void CompressionCodecEncrypted::updateHash(SipHash & hash) const
+{
+    getCodecDesc()->updateTreeHash(hash);
+}
+
+UInt32 CompressionCodecEncrypted::getMaxCompressedDataSize(UInt32 uncompressed_size) const
+{
+    // The GCM mode is a stream cipher. No paddings are
+    // involved. There will be a tag at the end of ciphertext (16
+    // octets). Also it has not more than 8 bytes for key_id in the beginning
+    // KeyID is followed by byte, that shows if nonce was set in config (and also will be put into data)
+    // and 12 bytes nonce or this byte will be equal to zero and no nonce will follow it.
+    return uncompressed_size + tag_size + key_id_max_size + nonce_max_size;
+}
+
+UInt32 CompressionCodecEncrypted::doCompressData(const char * source, UInt32 source_size, char * dest) const
+{
+    // Generate an IV out of the data block and the key-generation
+    // key. It is completely deterministic, but does not leak any
+    // information about the data block except for equivalence of
+    // identical blocks (under the same key).
+
+    const std::string_view plaintext = std::string_view(source, source_size);
+
+    /// Get key and nonce for encryption
+    UInt64 current_key_id;
+    String current_key, nonce;
+    Configuration::instance().getCurrentKeyAndNonce(encryption_method, current_key_id, current_key, nonce);
+
+    /// Write current key id to support multiple keys.
+    /// (key id in the beginning will help to decrypt data after changing current key)
+    char* ciphertext_with_nonce = writeVarUInt(current_key_id, dest);
+    size_t keyid_size = ciphertext_with_nonce - dest;
+
+    /// write nonce in data. This will help to read data even after changing nonce in config
+    /// If there were no nonce in data, one zero byte will be written
+    char* ciphertext = writeNonce(nonce, ciphertext_with_nonce);
+    UInt64 nonce_size = ciphertext - ciphertext_with_nonce;
+
+    // The IV will be used as an authentication tag. The ciphertext and the
+    // tag will be written directly in the dest buffer.
+    size_t out_len = encrypt(plaintext, ciphertext, encryption_method, current_key, nonce);
+
+    /// Length of encrypted text should be equal to text length plus tag_size (which was added by algorithm).
+    if (out_len != source_size + tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't encrypt data, length after encryption {} is wrong, expected {}", out_len, source_size + tag_size);
+
+    return out_len + keyid_size + nonce_size;
+}
+
+void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+{
+    /// The key is needed for decrypting. That's why it is read at the beginning of process.
+    UInt64 key_id;
+    const char * ciphertext_with_nonce = readVarUInt(key_id, source, source_size);
+
+    /// Size of text should be decreased by key_size, because key_size bytes were not participating in encryption process.
+    size_t keyid_size = ciphertext_with_nonce - source;
+    String nonce;
+    String key = Configuration::instance().getKey(encryption_method, key_id);
+
+    /// try to read nonce from file (if it was set while encrypting)
+    const char * ciphertext = readNonce(nonce, ciphertext_with_nonce);
+
+    /// Size of text should be decreased by nonce_size, because nonce_size bytes were not participating in encryption process.
+    UInt64 nonce_size = ciphertext - ciphertext_with_nonce;
+
+    /// Count text size (nonce and key_id was read from source)
+    size_t ciphertext_size = source_size - keyid_size - nonce_size;
+    if (ciphertext_size != uncompressed_size + tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't decrypt data, uncompressed_size {} is wrong, expected {}", uncompressed_size, ciphertext_size - tag_size);
+
+
+    size_t out_len = decrypt({ciphertext, ciphertext_size}, dest, encryption_method, key, nonce);
+    if (out_len != ciphertext_size - tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't decrypt data, out length after decryption {} is wrong, expected {}", out_len, ciphertext_size - tag_size);
+}
+
 }
 
 #else /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
 
 namespace DB
 {
-    void registerCodecEncrypted(CompressionCodecFactory &)
-    {
-    }
+
+namespace
+{
+
+/// Register codec in factory
+void registerEncryptionCodec(CompressionCodecFactory & factory, EncryptionMethod Method)
+{
+    auto throw_no_ssl = [](const ASTPtr &) -> CompressionCodecPtr { throw Exception(ErrorCodes::OPENSSL_ERROR, "Server was built without SSL support. Encryption is disabled."); };
+    const auto method_code = getMethodCode(Method); /// Codec need to know its code
+    factory.registerCompressionCodec(getMethodName(Method), method_code, throw_no_ssl);
+}
+
+}
+
+CompressionCodecEncrypted::Configuration & CompressionCodecEncrypted::Configuration::instance()
+{
+    static CompressionCodecEncrypted::Configuration ret;
+    return ret;
+}
+
+/// if encryption is disabled.
+bool CompressionCodecEncrypted::Configuration::tryLoad(const Poco::Util::AbstractConfiguration & config [[maybe_unused]], const String & config_prefix [[maybe_unused]])
+{
+    return false;
+}
+
+/// if encryption is disabled, print warning about this.
+void CompressionCodecEncrypted::Configuration::load(const Poco::Util::AbstractConfiguration & config [[maybe_unused]], const String & config_prefix [[maybe_unused]])
+{
+    LOG_WARNING(&Poco::Logger::get("CompressionCodecEncrypted"), "Server was built without SSL support. Encryption is disabled.");
+}
+
 }
 
 #endif /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
+
+namespace DB
+{
+/// Register codecs for all algorithms
+void registerCodecEncrypted(CompressionCodecFactory & factory)
+{
+    registerEncryptionCodec(factory, AES_128_GCM_SIV);
+    registerEncryptionCodec(factory, AES_256_GCM_SIV);
+}
+}
diff --git a/src/Compression/CompressionCodecEncrypted.h b/src/Compression/CompressionCodecEncrypted.h
index cef9b2e6072..7869e4d7194 100644
--- a/src/Compression/CompressionCodecEncrypted.h
+++ b/src/Compression/CompressionCodecEncrypted.h
@@ -1,109 +1,138 @@
 #pragma once
 
-// This depends on BoringSSL-specific API, notably <openssl/aead.h>.
-#include <Common/config.h>
-#if USE_SSL && USE_INTERNAL_SSL_LIBRARY && !defined(ARCADIA_BUILD)
-
+#if !defined(ARCADIA_BUILD)
+#include <string_view>
+#include <unordered_map>
+#include <common/types.h>
 #include <Compression/ICompressionCodec.h>
-#include <boost/noncopyable.hpp>
-#include <openssl/aead.h> // Y_IGNORE
-#include <optional>
+#include <Poco/Util/LayeredConfiguration.h>
+#include <Common/MultiVersion.h>
 
 namespace DB
 {
-    /** This codec encrypts and decrypts blocks with AES-128 in
-      * GCM-SIV mode (RFC-8452), which is the only cipher currently
-      * supported. Although it is implemented as a compression codec
-      * it doesn't actually compress data. In fact encrypted data will
-      * no longer be compressible in any meaningful way. This means if
-      * you want to apply both compression and encryption to your
-      * columns, you need to put this codec at the end of the chain
-      * like "column Int32 Codec(Delta, LZ4,
-      * Encrypted('AES-128-GCM-SIV'))".
-      *
-      * The key is obtained by executing a command specified in the
-      * configuration file at startup, and if it doesn't specify a
-      * command the codec refuses to process any data. The command is
-      * expected to write a Base64-encoded key of any length, and we
-      * apply HKDF-SHA-256 to derive a 128-bit key-generation key
-      * (only the first half of the result is used). We then encrypt
-      * blocks in AES-128-GCM-SIV with a universally fixed nonce (12
-      * repeated NUL characters).
-      *
-      * This construct has a weakness due to the nonce being fixed at
-      * all times: when the same data block is encrypted twice, the
-      * resulting ciphertext will be exactly the same. We have to live
-      * with this weakness because ciphertext must be deterministic,
-      * as otherwise our engines like ReplicatedMergeTree cannot
-      * deduplicate data blocks.
-      */
-    class CompressionCodecEncrypted : public ICompressionCodec
+
+/// Now we have two algorithms.
+enum EncryptionMethod
+{
+    AES_128_GCM_SIV,
+    AES_256_GCM_SIV,
+    MAX_ENCRYPTION_METHOD
+};
+
+/** This codec encrypts and decrypts blocks with AES-128 in
+    * GCM-SIV mode (RFC-8452), which is the only cipher currently
+    * supported. Although it is implemented as a compression codec
+    * it doesn't actually compress data. In fact encrypted data will
+    * no longer be compressible in any meaningful way. This means if
+    * you want to apply both compression and encryption to your
+    * columns, you need to put this codec at the end of the chain
+    * like "column Int32 Codec(Delta, LZ4,
+    * AES_128_GCM_SIV)".
+    *
+    * The key is obtained by executing a command specified in the
+    * configuration file at startup, and if it doesn't specify a
+    * command the codec refuses to process any data. The command is
+    * expected to write a Base64-encoded key of any length, and we
+    * apply HKDF-SHA-256 to derive a 128-bit key-generation key
+    * (only the first half of the result is used). We then encrypt
+    * blocks in AES-128-GCM-SIV with a universally fixed nonce (12
+    * repeated NUL characters).
+    *
+    * This construct has a weakness due to the nonce being fixed at
+    * all times: when the same data block is encrypted twice, the
+    * resulting ciphertext will be exactly the same. We have to live
+    * with this weakness because ciphertext must be deterministic,
+    * as otherwise our engines like ReplicatedMergeTree cannot
+    * deduplicate data blocks.
+    */
+class CompressionCodecEncrypted : public ICompressionCodec
+{
+public:
+    /** If a key is available, the server is supposed to
+        * invoke this static method at the startup. The codec will
+        * refuse to compress or decompress any data until that. The
+        * key can be an arbitrary octet string, but it is
+        * recommended that the key is at least 16 octets long.
+        *
+        * Note that the key is currently not guarded by a
+        * mutex. This method should be invoked no more than once.
+        */
+    explicit CompressionCodecEncrypted(EncryptionMethod Method);
+
+    /**
+        * This is utility class. It holds information about encryption configuration.
+        */
+    class Configuration
     {
     public:
-        /** If a master key is available, the server is supposed to
-          * invoke this static method at the startup. The codec will
-          * refuse to compress or decompress any data until that. The
-          * key can be an arbitrary octet string, but it is
-          * recommended that the key is at least 16 octets long.
-          *
-          * Note that the master key is currently not guarded by a
-          * mutex. This method should be invoked no more than once.
-          */
-        static void setMasterKey(const std::string_view & master_key);
+        /// Configuration should be singleton. Instance method
+        static Configuration & instance();
 
-        explicit CompressionCodecEncrypted(const std::string_view & cipher);
+        /// Try to load data from config.
+        bool tryLoad(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 
-        uint8_t getMethodByte() const override;
-        void updateHash(SipHash & hash) const override;
+        /// Load data and throw exception if something went wrong.
+        void load(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 
-        bool isCompression() const override
-        {
-            return false;
-        }
-
-        bool isGenericCompression() const override
-        {
-            return false;
-        }
-
-        bool isPostProcessing() const override
-        {
-            return true;
-        }
-
-    protected:
-        UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
-
-        UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
-        void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+        /// Get current key and nonce (they will be set in variables, which are pass in this function).
+        /// All data sets at the same time to prevent situations,
+        /// when config changes and key and nonce are read from different versions
+        /// If nonce is empty, it will return 12 null bytes.
+        void getCurrentKeyAndNonce(EncryptionMethod method, UInt64 & current_key_id, String & current_key, String & nonce) const;
 
+        /// Same as getCurrentKeyAndNonce. It is used to get key. (need for correct decryption, that is why nonce is not necessary)
+        String getKey(EncryptionMethod method, const UInt64 & key_id) const;
     private:
-        static std::string lastErrorString();
-        static std::string deriveKey(const std::string_view & master_key);
-        static void encrypt(const std::string_view & plaintext, char * ciphertext_and_tag);
-        static void decrypt(const std::string_view & ciphertext_and_tag, char * plaintext);
-
-        /** A private class that holds keys derived from the master
-          * key.
-          */
-        struct KeyHolder : private boost::noncopyable
+        /// struct Params consists of:
+        /// 1) hash-table of keys and their ids
+        /// 2) current key for encryption
+        /// 3) nonce for encryption
+        /// All this parameters have MAX_ENCRYPTION_METHOD count of versions,
+        /// because all algorithms can be described in config and used for different tables.
+        struct Params
         {
-            explicit KeyHolder(const std::string_view & master_key);
-            ~KeyHolder();
-
-            std::string keygen_key;
-            EVP_AEAD_CTX ctx;
+            std::unordered_map<UInt64, String> keys_storage[MAX_ENCRYPTION_METHOD];
+            UInt64 current_key_id[MAX_ENCRYPTION_METHOD] = {0, 0};
+            String nonce[MAX_ENCRYPTION_METHOD];
         };
 
-        static const KeyHolder & getKeys();
+        // used to read data from config and create Params
+        static void loadImpl(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, EncryptionMethod method, std::unique_ptr<Params>& new_params);
 
-        static inline std::optional<KeyHolder> keys;
+        MultiVersion<Params> params;
     };
 
-    inline CompressionCodecPtr getCompressionCodecEncrypted(const std::string_view & master_key)
+    uint8_t getMethodByte() const override;
+    void updateHash(SipHash & hash) const override;
+
+    bool isCompression() const override
     {
-        return std::make_shared<CompressionCodecEncrypted>(master_key);
+        return false;
     }
+
+    bool isGenericCompression() const override
+    {
+        return false;
+    }
+
+    bool isEncryption() const override
+    {
+        return true;
+    }
+protected:
+    UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
+
+    /// Encrypt data with chosen method.
+    /// Throws exception if encryption is impossible or size of encrypted text is incorrect
+    UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
+
+    /// Decrypt data with chosen method
+    /// Throws exception if decryption is impossible or size of decrypted text is incorrect
+    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+private:
+    EncryptionMethod encryption_method;
+};
+
 }
 
-#endif /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
+#endif /* NOT Arcadia_build */
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 1276ac911f1..317116712cb 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
diff --git a/src/Compression/CompressionFactoryAdditions.cpp b/src/Compression/CompressionFactoryAdditions.cpp
index bff294d1ea5..9e0353e6711 100644
--- a/src/Compression/CompressionFactoryAdditions.cpp
+++ b/src/Compression/CompressionFactoryAdditions.cpp
@@ -62,7 +62,7 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
         bool is_compression = false;
         bool has_none = false;
         std::optional<size_t> generic_compression_codec_pos;
-        std::set<size_t> post_processing_codecs;
+        std::set<size_t> encryption_codecs;
 
         bool can_substitute_codec_arguments = true;
         for (size_t i = 0, size = func->arguments->children.size(); i < size; ++i)
@@ -141,8 +141,8 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
             if (!generic_compression_codec_pos && result_codec->isGenericCompression())
                 generic_compression_codec_pos = i;
 
-            if (result_codec->isPostProcessing())
-                post_processing_codecs.insert(i);
+            if (result_codec->isEncryption())
+                encryption_codecs.insert(i);
         }
 
         String codec_description = queryToString(codecs_descriptions);
@@ -157,8 +157,8 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
 
             /// Allow to explicitly specify single NONE codec if user don't want any compression.
             /// But applying other transformations solely without compression (e.g. Delta) does not make sense.
-            /// It's okay to apply post-processing codecs solely without anything else.
-            if (!is_compression && !has_none && post_processing_codecs.size() != codecs_descriptions->children.size())
+            /// It's okay to apply encryption codecs solely without anything else.
+            if (!is_compression && !has_none && encryption_codecs.size() != codecs_descriptions->children.size())
                 throw Exception(
                     "Compression codec " + codec_description
                         + " does not compress anything."
@@ -168,10 +168,10 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
                           " (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).",
                     ErrorCodes::BAD_ARGUMENTS);
 
-            /// It does not make sense to apply any non-post-processing codecs
-            /// after post-processing one.
-            if (!post_processing_codecs.empty() &&
-                *post_processing_codecs.begin() != codecs_descriptions->children.size() - post_processing_codecs.size())
+            /// It does not make sense to apply any non-encryption codecs
+            /// after encryption one.
+            if (!encryption_codecs.empty() &&
+                *encryption_codecs.begin() != codecs_descriptions->children.size() - encryption_codecs.size())
                 throw Exception("The combination of compression codecs " + codec_description + " is meaningless,"
                                 " because it does not make sense to apply any non-post-processing codecs after"
                                 " post-processing ones. (Note: you can enable setting 'allow_suspicious_codecs'"
@@ -180,7 +180,7 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
             /// It does not make sense to apply any transformations after generic compression algorithm
             /// So, generic compression can be only one and only at the end.
             if (generic_compression_codec_pos &&
-                *generic_compression_codec_pos != codecs_descriptions->children.size() - 1 - post_processing_codecs.size())
+                *generic_compression_codec_pos != codecs_descriptions->children.size() - 1 - encryption_codecs.size())
                 throw Exception("The combination of compression codecs " + codec_description + " is meaningless,"
                     " because it does not make sense to apply any transformations after generic compression algorithm."
                     " (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).", ErrorCodes::BAD_ARGUMENTS);
diff --git a/src/Compression/CompressionInfo.h b/src/Compression/CompressionInfo.h
index 869c7110d62..bbe8315f3ea 100644
--- a/src/Compression/CompressionInfo.h
+++ b/src/Compression/CompressionInfo.h
@@ -35,15 +35,16 @@ namespace DB
 
 enum class CompressionMethodByte : uint8_t
 {
-    NONE     = 0x02,
-    LZ4      = 0x82,
-    ZSTD     = 0x90,
-    Multiple = 0x91,
-    Delta    = 0x92,
-    T64      = 0x93,
-    DoubleDelta = 0x94,
-    Gorilla     = 0x95,
-    Encrypted   = 0x96,
+    NONE            = 0x02,
+    LZ4             = 0x82,
+    ZSTD            = 0x90,
+    Multiple        = 0x91,
+    Delta           = 0x92,
+    T64             = 0x93,
+    DoubleDelta     = 0x94,
+    Gorilla         = 0x95,
+    AES_128_GCM_SIV = 0x96,
+    AES_256_GCM_SIV = 0x97
 };
 
 }
diff --git a/src/Compression/ICompressionCodec.h b/src/Compression/ICompressionCodec.h
index 3f603087f2b..7a401186be3 100644
--- a/src/Compression/ICompressionCodec.h
+++ b/src/Compression/ICompressionCodec.h
@@ -76,7 +76,7 @@ public:
     virtual bool isGenericCompression() const = 0;
 
     /// If it is a post-processing codec such as encryption. Usually it does not make sense to apply non-post-processing codecs after this.
-    virtual bool isPostProcessing() const { return false; }
+    virtual bool isEncryption() const { return false; }
 
     /// It is a codec available only for evaluation purposes and not meant to be used in production.
     /// It will not be allowed to use unless the user will turn off the safety switch.
diff --git a/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp b/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
index 6211fd4b9cc..9e4d4a3241f 100644
--- a/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
+++ b/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
@@ -1,49 +1,301 @@
+#include <cstddef>
+#include <cstdint>
 #include <iostream>
+#include <memory>
 #include <string>
 
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionCodecEncrypted.h>
 #include <IO/BufferWithOwnMemory.h>
+#include <Poco/DOM/AutoPtr.h>
+#include <Poco/DOM/Document.h>
+#include <Poco/DOM/Element.h>
+#include <Poco/DOM/Text.h>
+#include <Poco/NumericString.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Poco/Util/XMLConfiguration.h>
+#include "Common/Exception.h"
 
-namespace DB
+inline DB::CompressionCodecPtr getCompressionCodecEncrypted(DB::EncryptionMethod Method)
 {
-    CompressionCodecPtr getCompressionCodecEncrypted(const std::string_view & master_key);
+    return std::make_shared<DB::CompressionCodecEncrypted>(Method);
 }
 
-constexpr size_t key_size = 20;
-
-struct AuxiliaryRandomData
+namespace
 {
-    char key[key_size];
-    size_t decompressed_size;
+
+using namespace Poco;
+using namespace Poco::XML;
+
+/*
+Fuzzing data consists of:
+    first byte:
+        1) length of nonce is in data (for correct work with wrong data from user)
+        2) length of key is in data (for correct work with wrong data from user)
+        3) is 128 turn on
+        4) multiple keys for 128
+        5) is 256 turn on
+        6) multiple keys for 256
+        7) nonce is set
+        8) current_key is set
+
+    read_key() will cosist of following steps:
+        if (2):
+            read 4 byte to know size
+            if multiple_keys:
+                read id
+        else:
+            size is chosen correctly according to algorithm
+
+        read size_bytes as a key
+
+    next bytes will have information in this order:
+        if (3):
+            if (4):
+                read count
+                for i in range(count):
+                    read_key()
+            else:
+                read_key()
+            if (7):
+                read_nonce (simillar to read_key)
+            if (8):
+                set current_key
+
+        same for AES_256_GCM_SIV with (5) and (6) instead of (3) and (4)
+
+    This class read data and generate xml documentation.
+*/
+class XMLGenerator
+{
+public:
+    XMLGenerator(const uint8_t * data, size_t& size);
+
+    /// Try to generate config from input data using algorithm, which is described before class declaration
+    void generate();
+
+    /// Size of part, which was used on generating config
+    size_t keySize() const;
+
+    /// Get config
+    const Poco::AutoPtr<Poco::Util::XMLConfiguration>& getResult() const;
+
+    /// If something happened in generator, it will be true
+    bool hasError() const;
+private:
+    /// generate algorithm section with key and nonce
+    bool generateAlgorithmKeys(AutoPtr<Poco::XML::Element>& document_root, std::string name,
+                               uint8_t mask_for_algo, uint8_t mask_for_multiple_keys);
+
+    /// move on count bytes stream and increase counter
+    /// returns false if some errors occuried
+    bool next(ssize_t count=1);
+
+    /// Create a key from data
+    ssize_t generateKey(std::string name, bool multiple=false);
+
+    const uint8_t * data;
+
+    size_t start_size;
+    size_t keys_size;
+
+    AutoPtr<Poco::XML::Document> xml_document;
+    AutoPtr<Poco::XML::Element> algo;
+    AutoPtr<Poco::Util::XMLConfiguration> conf;
+
+    uint8_t first_byte;
+
+    bool error;
 };
 
+XMLGenerator::XMLGenerator(const uint8_t * Data, size_t& Size): data(Data), start_size(Size),
+                          conf(new Poco::Util::XMLConfiguration()), error(false) {}
+
+size_t XMLGenerator::keySize() const { return keys_size; }
+
+const Poco::AutoPtr<Poco::Util::XMLConfiguration>& XMLGenerator::getResult() const { return conf; }
+
+bool XMLGenerator::hasError() const { return error; }
+
+bool XMLGenerator::next(ssize_t count)
+{
+    /// If negative step - something went wrong
+    if (count == -1)
+    {
+        error = true;
+        return false;
+    }
+
+    /// move data and increase counter
+    keys_size += count;
+
+    /// If get after eof
+    if (keys_size >= start_size)
+    {
+        error = true;
+        return false;
+    }
+    data += count;
+
+    return true;
+}
+
+/*
+<Key>key</key>
+or
+<key id=..>key</key>
+*/
+ssize_t XMLGenerator::generateKey(std::string name, bool multiple)
+{
+    /// set traditional key size for algorithms
+    uint64_t size = 0;
+    if (name == "aes_128_gcm_siv")
+        size = 16;
+    if (name == "aes_256_gcm_siv")
+        size = 32;
+
+    /// try to read size from data
+    if (first_byte & 0x40)
+    {
+        size = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return -1;
+    }
+    /// if it is not defined, leave
+    if (!size)
+        return -1;
+
+    AutoPtr<Poco::XML::Element> key_holder;
+    if (multiple)
+    {
+        /// multiple keys have ids.
+        uint64_t id = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return -1;
+
+        key_holder = xml_document->createElement("key[id=" + std::to_string(id) + "]");
+
+    }
+    else
+    {
+        key_holder = xml_document->createElement("key");
+    }
+    AutoPtr<Text> key(xml_document->createTextNode(std::string(data, data + size)));
+    key_holder->appendChild(key);
+    algo->appendChild(key_holder);
+
+    if (!next(size))
+        return -1;
+    return size;
+}
+
+bool XMLGenerator::generateAlgorithmKeys(
+    AutoPtr<Poco::XML::Element>& document_root, std::string name, uint8_t mask_for_algo, uint8_t mask_for_multiple_keys)
+{
+    /// check if algorithm is enabled, then add multiple keys or single key
+    if (first_byte & mask_for_algo)
+    {
+        algo = xml_document->createElement(name);
+        document_root->appendChild(algo);
+
+        if (first_byte & mask_for_multiple_keys)
+        {
+            uint64_t count = *(reinterpret_cast<const uint64_t*>(data));
+            if (!next(8))
+                return false;
+
+            for (size_t i = 0; i < count; ++i)
+            {
+                if (!next(generateKey(name)))
+                    return false;
+            }
+        }
+        else
+        {
+            if (!next(generateKey(name)))
+                return false;
+        }
+    }
+
+    /// add nonce
+    if (first_byte & 0x02)
+    {
+        uint64_t nonce_size = 12;
+        if (first_byte & 0x80)
+        {
+            nonce_size = *(reinterpret_cast<const uint64_t*>(data));
+            if (!next(8))
+                return false;
+        }
+
+        AutoPtr<Poco::XML::Element> nonce_holder(xml_document->createElement("nonce"));
+        AutoPtr<Text> nonce(xml_document->createTextNode(std::string(data, data + nonce_size)));
+        nonce_holder->appendChild(nonce);
+        algo->appendChild(nonce_holder);
+    }
+
+    /// add current key id
+    if (first_byte & 0x01)
+    {
+        uint64_t current_key = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return false;
+
+        AutoPtr<Poco::XML::Element> cur_key_holder(xml_document->createElement("nonce"));
+        AutoPtr<Text> cur_key(xml_document->createTextNode(std::to_string(current_key)));
+        cur_key_holder->appendChild(cur_key);
+        algo->appendChild(cur_key_holder);
+    }
+
+    return true;
+}
+
+void XMLGenerator::generate()
+{
+    AutoPtr<Poco::XML::Element> document_root(xml_document->createElement("encryption_codecs"));
+    xml_document->appendChild(document_root);
+
+    /// read first byte for parsing
+    first_byte = *data;
+    if (!next())
+        return;
+
+    if (!generateAlgorithmKeys(document_root, "aes_128_gmc_siv", 0x20, 0x10))
+        return;
+    if (!generateAlgorithmKeys(document_root, "aes_256_gmc_siv", 0x08, 0x04))
+        return;
+
+    conf->load(xml_document);
+}
+
+}
+
+
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 try
 {
-    if (size < sizeof(AuxiliaryRandomData))
+    XMLGenerator generator(data, size);
+
+    generator.generate();
+    if (generator.hasError())
         return 0;
 
-    const auto * p = reinterpret_cast<const AuxiliaryRandomData *>(data);
+    auto config = generator.getResult();
+    auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM_SIV);
+    auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM_SIV);
+    DB::CompressionCodecEncrypted::Configuration::instance().tryLoad(*config, "");
 
-    std::string key = std::string(p->key, key_size);
-    auto codec = DB::getCompressionCodecEncrypted(key);
+    size_t data_size = size - generator.keySize();
 
-    size_t output_buffer_size = p->decompressed_size % 65536;
-    size -= sizeof(AuxiliaryRandomData);
-    data += sizeof(AuxiliaryRandomData) / sizeof(uint8_t);
-
-    std::string input = std::string(reinterpret_cast<const char*>(data), size);
-    fmt::print(stderr, "Using input {} of size {}, output size is {}. \n", input, size, output_buffer_size);
-
-    if (output_buffer_size < size)
-        return 0;
+    std::string input = std::string(reinterpret_cast<const char*>(data), data_size);
+    fmt::print(stderr, "Using input {} of size {}, output size is {}. \n", input, data_size, input.size() - 31);
 
     DB::Memory<> memory;
-    memory.resize(output_buffer_size + codec->getAdditionalSizeAtTheEndOfBuffer());
-
-    codec->doDecompressData(reinterpret_cast<const char *>(data), size, memory.data(), output_buffer_size);
+    memory.resize(input.size() + codec_128->getAdditionalSizeAtTheEndOfBuffer());
+    codec_128->doDecompressData(input.data(), input.size(), memory.data(), input.size() - 31);
 
+    memory.resize(input.size() + codec_128->getAdditionalSizeAtTheEndOfBuffer());
+    codec_256->doDecompressData(input.data(), input.size(), memory.data(), input.size() - 31);
     return 0;
 }
 catch (...)
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 6ba2d3457ea..dc0334c3c0c 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -685,7 +685,7 @@ auto SequentialGenerator = [](auto stride = 1)
 template <typename T>
 using uniform_distribution =
 typename std::conditional_t<std::is_floating_point_v<T>, std::uniform_real_distribution<T>,
-        typename std::conditional_t<is_integer_v<T>, std::uniform_int_distribution<T>, void>>;
+        typename std::conditional_t<is_integer<T>, std::uniform_int_distribution<T>, void>>;
 
 
 template <typename T = Int32>
diff --git a/src/Compression/ya.make b/src/Compression/ya.make
deleted file mode 100644
index 8ba48696225..00000000000
--- a/src/Compression/ya.make
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/lz4
-    contrib/libs/zstd/include
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/lz4
-    contrib/libs/zstd
-)
-
-
-SRCS(
-    CachedCompressedReadBuffer.cpp
-    CheckingCompressedReadBuffer.cpp
-    CompressedReadBuffer.cpp
-    CompressedReadBufferBase.cpp
-    CompressedReadBufferFromFile.cpp
-    CompressedWriteBuffer.cpp
-    CompressionCodecDelta.cpp
-    CompressionCodecDoubleDelta.cpp
-    CompressionCodecEncrypted.cpp
-    CompressionCodecGorilla.cpp
-    CompressionCodecLZ4.cpp
-    CompressionCodecMultiple.cpp
-    CompressionCodecNone.cpp
-    CompressionCodecT64.cpp
-    CompressionCodecZSTD.cpp
-    CompressionFactory.cpp
-    CompressionFactoryAdditions.cpp
-    ICompressionCodec.cpp
-    LZ4_decompress_faster.cpp
-    getCompressionCodecForFile.cpp
-
-)
-
-END()
diff --git a/src/Compression/ya.make.in b/src/Compression/ya.make.in
deleted file mode 100644
index ec4bf556901..00000000000
--- a/src/Compression/ya.make.in
+++ /dev/null
@@ -1,21 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/lz4
-    contrib/libs/zstd/include
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/lz4
-    contrib/libs/zstd
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Coordination/Changelog.cpp b/src/Coordination/Changelog.cpp
index 3be4502d13c..967e94c390c 100644
--- a/src/Coordination/Changelog.cpp
+++ b/src/Coordination/Changelog.cpp
@@ -2,6 +2,7 @@
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromFile.h>
+#include <IO/ZstdDeflatingAppendableWriteBuffer.h>
 #include <filesystem>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
@@ -10,6 +11,7 @@
 #include <Common/SipHash.h>
 #include <common/logger_useful.h>
 
+
 namespace DB
 {
 
@@ -17,6 +19,7 @@ namespace ErrorCodes
 {
     extern const int CHECKSUM_DOESNT_MATCH;
     extern const int CORRUPTED_DATA;
+    extern const int UNSUPPORTED_METHOD;
     extern const int UNKNOWN_FORMAT_VERSION;
     extern const int LOGICAL_ERROR;
 }
@@ -29,7 +32,7 @@ constexpr auto DEFAULT_PREFIX = "changelog";
 std::string formatChangelogPath(const std::string & prefix, const ChangelogFileDescription & name)
 {
     std::filesystem::path path(prefix);
-    path /= std::filesystem::path(name.prefix + "_" + std::to_string(name.from_log_index) + "_" + std::to_string(name.to_log_index) + ".bin");
+    path /= std::filesystem::path(name.prefix + "_" + std::to_string(name.from_log_index) + "_" + std::to_string(name.to_log_index) + "." + name.extension);
     return path;
 }
 
@@ -46,6 +49,7 @@ ChangelogFileDescription getChangelogFileDescription(const std::string & path_st
     result.prefix = filename_parts[0];
     result.from_log_index = parse<uint64_t>(filename_parts[1]);
     result.to_log_index = parse<uint64_t>(filename_parts[2]);
+    result.extension = path.extension();
     result.path = path_str;
     return result;
 }
@@ -75,52 +79,53 @@ class ChangelogWriter
 public:
     ChangelogWriter(const std::string & filepath_, WriteMode mode, uint64_t start_index_)
         : filepath(filepath_)
-        , plain_buf(filepath, DBMS_DEFAULT_BUFFER_SIZE, mode == WriteMode::Rewrite ? -1 : (O_APPEND | O_CREAT | O_WRONLY))
+        , file_buf(filepath, DBMS_DEFAULT_BUFFER_SIZE, mode == WriteMode::Rewrite ? -1 : (O_APPEND | O_CREAT | O_WRONLY))
         , start_index(start_index_)
-    {}
-
-
-    off_t appendRecord(ChangelogRecord && record)
     {
-        off_t result = plain_buf.count();
-        writeIntBinary(computeRecordChecksum(record), plain_buf);
-
-        writeIntBinary(record.header.version, plain_buf);
-        writeIntBinary(record.header.index, plain_buf);
-        writeIntBinary(record.header.term, plain_buf);
-        writeIntBinary(record.header.value_type, plain_buf);
-        writeIntBinary(record.header.blob_size, plain_buf);
-
-        if (record.header.blob_size != 0)
-            plain_buf.write(reinterpret_cast<char *>(record.blob->data_begin()), record.blob->size());
-
-        entries_written++;
-
-        return result;
+        auto compression_method = chooseCompressionMethod(filepath_, "");
+        if (compression_method != CompressionMethod::Zstd && compression_method != CompressionMethod::None)
+        {
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Unsupported coordination log serialization format {}", toContentEncodingName(compression_method));
+        }
+        else if (compression_method == CompressionMethod::Zstd)
+        {
+            compressed_buffer = std::make_unique<ZstdDeflatingAppendableWriteBuffer>(file_buf, /* compression level = */ 3, /* append_to_existing_stream = */ mode == WriteMode::Append);
+        }
+        else
+        {
+            /// no compression, only file buffer
+        }
     }
 
-    void truncateToLength(off_t new_length)
+
+    void appendRecord(ChangelogRecord && record)
     {
-        plain_buf.next();
-        plain_buf.truncate(new_length);
-        plain_buf.seek(new_length, SEEK_SET);
+        writeIntBinary(computeRecordChecksum(record), getBuffer());
+
+        writeIntBinary(record.header.version, getBuffer());
+        writeIntBinary(record.header.index, getBuffer());
+        writeIntBinary(record.header.term, getBuffer());
+        writeIntBinary(record.header.value_type, getBuffer());
+        writeIntBinary(record.header.blob_size, getBuffer());
+
+        if (record.header.blob_size != 0)
+            getBuffer().write(reinterpret_cast<char *>(record.blob->data_begin()), record.blob->size());
     }
 
     void flush(bool force_fsync)
     {
-        plain_buf.next();
+        if (compressed_buffer)
+        {
+            /// Flush compressed data to WriteBufferFromFile working_buffer
+            compressed_buffer->next();
+        }
+
+        /// Flush working buffer to file system
+        file_buf.next();
+
+        /// Fsync file system if needed
         if (force_fsync)
-            plain_buf.sync();
-    }
-
-    uint64_t getEntriesWritten() const
-    {
-        return entries_written;
-    }
-
-    void setEntriesWritten(uint64_t entries_written_)
-    {
-        entries_written = entries_written_;
+            file_buf.sync();
     }
 
     uint64_t getStartIndex() const
@@ -128,15 +133,17 @@ public:
         return start_index;
     }
 
-    void setStartIndex(uint64_t start_index_)
+private:
+    WriteBuffer & getBuffer()
     {
-        start_index = start_index_;
+        if (compressed_buffer)
+            return *compressed_buffer;
+        return file_buf;
     }
 
-private:
     std::string filepath;
-    WriteBufferFromFile plain_buf;
-    uint64_t entries_written = 0;
+    WriteBufferFromFile file_buf;
+    std::unique_ptr<WriteBuffer> compressed_buffer;
     uint64_t start_index;
 };
 
@@ -167,30 +174,32 @@ class ChangelogReader
 public:
     explicit ChangelogReader(const std::string & filepath_)
         : filepath(filepath_)
-        , read_buf(filepath)
-    {}
+    {
+        auto compression_method = chooseCompressionMethod(filepath, "");
+        auto read_buffer_from_file = std::make_unique<ReadBufferFromFile>(filepath);
+        read_buf = wrapReadBufferWithCompressionMethod(std::move(read_buffer_from_file), compression_method);
+    }
 
     /// start_log_index -- all entries with index < start_log_index will be skipped, but accounted into total_entries_read_from_log
-    ChangelogReadResult readChangelog(IndexToLogEntry & logs, uint64_t start_log_index, IndexToOffset & index_to_offset, Poco::Logger * log)
+    ChangelogReadResult readChangelog(IndexToLogEntry & logs, uint64_t start_log_index, Poco::Logger * log)
     {
-        uint64_t previous_index = 0;
         ChangelogReadResult result{};
         try
         {
-            while (!read_buf.eof())
+            while (!read_buf->eof())
             {
-                result.last_position = read_buf.count();
+                result.last_position = read_buf->count();
                 /// Read checksum
                 Checksum record_checksum;
-                readIntBinary(record_checksum, read_buf);
+                readIntBinary(record_checksum, *read_buf);
 
                 /// Read header
                 ChangelogRecord record;
-                readIntBinary(record.header.version, read_buf);
-                readIntBinary(record.header.index, read_buf);
-                readIntBinary(record.header.term, read_buf);
-                readIntBinary(record.header.value_type, read_buf);
-                readIntBinary(record.header.blob_size, read_buf);
+                readIntBinary(record.header.version, *read_buf);
+                readIntBinary(record.header.index, *read_buf);
+                readIntBinary(record.header.term, *read_buf);
+                readIntBinary(record.header.value_type, *read_buf);
+                readIntBinary(record.header.blob_size, *read_buf);
 
                 if (record.header.version > CURRENT_CHANGELOG_VERSION)
                     throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unsupported changelog version {} on path {}", record.header.version, filepath);
@@ -200,18 +209,12 @@ public:
                 {
                     auto buffer = nuraft::buffer::alloc(record.header.blob_size);
                     auto * buffer_begin = reinterpret_cast<char *>(buffer->data_begin());
-                    read_buf.readStrict(buffer_begin, record.header.blob_size);
+                    read_buf->readStrict(buffer_begin, record.header.blob_size);
                     record.blob = buffer;
                 }
                 else
                     record.blob = nullptr;
 
-                /// Check changelog integrity
-                if (previous_index != 0 && previous_index + 1 != record.header.index)
-                    throw Exception(ErrorCodes::CORRUPTED_DATA, "Previous log entry {}, next log entry {}, seems like some entries skipped", previous_index, record.header.index);
-
-                previous_index = record.header.index;
-
                 /// Compare checksums
                 Checksum checksum = computeRecordChecksum(record);
                 if (checksum != record_checksum)
@@ -223,7 +226,7 @@ public:
 
                 /// Check for duplicated changelog ids
                 if (logs.count(record.header.index) != 0)
-                    throw Exception(ErrorCodes::CORRUPTED_DATA, "Duplicated index id {} in log {}", record.header.index, filepath);
+                    std::erase_if(logs, [record] (const auto & item) { return item.first >= record.header.index; });
 
                 result.total_entries_read_from_log += 1;
 
@@ -238,7 +241,6 @@ public:
 
                 /// Put it into in memory structure
                 logs.emplace(record.header.index, log_entry);
-                index_to_offset[record.header.index] = result.last_position;
                 result.last_read_index = record.header.index;
 
                 if (result.total_entries_read_from_log % 50000 == 0)
@@ -266,18 +268,20 @@ public:
 
 private:
     std::string filepath;
-    ReadBufferFromFile read_buf;
+    std::unique_ptr<ReadBuffer> read_buf;
 };
 
 Changelog::Changelog(
     const std::string & changelogs_dir_,
     uint64_t rotate_interval_,
     bool force_sync_,
-    Poco::Logger * log_)
+    Poco::Logger * log_,
+    bool compress_logs_)
     : changelogs_dir(changelogs_dir_)
     , rotate_interval(rotate_interval_)
     , force_sync(force_sync_)
     , log(log_)
+    , compress_logs(compress_logs_)
 {
     /// Load all files in changelog directory
     namespace fs = std::filesystem;
@@ -339,10 +343,15 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
                 }
             }
 
-
             ChangelogReader reader(changelog_description.path);
-            last_log_read_result = reader.readChangelog(logs, start_to_read_from, index_to_start_pos, log);
+            last_log_read_result = reader.readChangelog(logs, start_to_read_from, log);
+            last_log_read_result->log_start_index = changelog_description.from_log_index;
 
+            if (last_log_read_result->error)
+            {
+                last_log_is_not_complete = true;
+                break;
+            }
             /// Otherwise we have already initialized it
             if (min_log_id == 0)
                 min_log_id = last_log_read_result->first_read_index;
@@ -350,13 +359,11 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
             if (last_log_read_result->last_read_index != 0)
                 max_log_id = last_log_read_result->last_read_index;
 
-            last_log_read_result->log_start_index = changelog_description.from_log_index;
-
             /// How many entries we have in the last changelog
             uint64_t expected_entries_in_log = changelog_description.expectedEntriesCountInLog();
 
-            /// May happen after truncate, crash or simply unfinished log
-            if (last_log_read_result->total_entries_read_from_log < expected_entries_in_log)
+            /// Unfinished log
+            if (last_log_read_result->error || last_log_read_result->total_entries_read_from_log < expected_entries_in_log)
             {
                 last_log_is_not_complete = true;
                 break;
@@ -376,19 +383,29 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
     else if (last_log_is_not_complete) /// if it's complete just start new one
     {
         assert(last_log_read_result != std::nullopt);
+        assert(!existing_changelogs.empty());
+
         /// Actually they shouldn't exist, but to be sure we remove them
         removeAllLogsAfter(last_log_read_result->log_start_index);
 
-        assert(!existing_changelogs.empty());
+        /// This log, even if it finished with error shouldn't be removed
+        assert(existing_changelogs.find(last_log_read_result->log_start_index) != existing_changelogs.end());
         assert(existing_changelogs.find(last_log_read_result->log_start_index)->first == existing_changelogs.rbegin()->first);
 
-        /// Continue to write into incomplete existing log
+        /// Continue to write into incomplete existing log if it doesn't finished with error
         auto description = existing_changelogs[last_log_read_result->log_start_index];
 
-        if (last_log_read_result->error)
-            initWriter(description, last_log_read_result->total_entries_read_from_log,  /* truncate_to_offset = */ last_log_read_result->last_position);
+        if (last_log_read_result->last_read_index == 0 || last_log_read_result->error) /// If it's broken log then remove it
+        {
+            LOG_INFO(log, "Removing log {} because it's empty or read finished with error", description.path);
+            std::filesystem::remove(description.path);
+            existing_changelogs.erase(last_log_read_result->log_start_index);
+            std::erase_if(logs, [last_log_read_result] (const auto & item) { return item.first >= last_log_read_result->log_start_index; });
+        }
         else
-            initWriter(description, last_log_read_result->total_entries_read_from_log);
+        {
+            initWriter(description);
+        }
     }
 
     /// Start new log if we don't initialize writer from previous log. All logs can be "complete".
@@ -397,33 +414,32 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
 }
 
 
-void Changelog::initWriter(const ChangelogFileDescription & description, uint64_t entries_already_written, std::optional<uint64_t> truncate_to_offset)
+void Changelog::initWriter(const ChangelogFileDescription & description)
 {
     if (description.expectedEntriesCountInLog() != rotate_interval)
         LOG_TRACE(log, "Looks like rotate_logs_interval was changed, current {}, expected entries in last log {}", rotate_interval, description.expectedEntriesCountInLog());
 
     LOG_TRACE(log, "Continue to write into {}", description.path);
     current_writer = std::make_unique<ChangelogWriter>(description.path, WriteMode::Append, description.from_log_index);
-    current_writer->setEntriesWritten(entries_already_written);
-
-    if (truncate_to_offset)
-    {
-        LOG_WARNING(log, "Changelog {} contain broken enties, truncating all broken log entries", description.path);
-        current_writer->truncateToLength(*truncate_to_offset);
-    }
 }
 
-void Changelog::removeAllLogsAfter(uint64_t start_to_remove_from_id)
+void Changelog::removeAllLogsAfter(uint64_t remove_after_log_start_index)
 {
-    auto start_to_remove_from = existing_changelogs.upper_bound(start_to_remove_from_id);
+    auto start_to_remove_from_itr = existing_changelogs.upper_bound(remove_after_log_start_index);
+    if (start_to_remove_from_itr == existing_changelogs.end())
+        return;
+
+    size_t start_to_remove_from_log_id = start_to_remove_from_itr->first;
 
     /// All subsequent logs shouldn't exist. But they may exist if we crashed after writeAt started. Remove them.
-    for (auto itr = start_to_remove_from; itr != existing_changelogs.end();)
+    for (auto itr = start_to_remove_from_itr; itr != existing_changelogs.end();)
     {
         LOG_WARNING(log, "Removing changelog {}, because it's goes after broken changelog entry", itr->second.path);
         std::filesystem::remove(itr->second.path);
         itr = existing_changelogs.erase(itr);
     }
+
+    std::erase_if(logs, [start_to_remove_from_log_id] (const auto & item) { return item.first >= start_to_remove_from_log_id; });
 }
 
 void Changelog::removeAllLogs()
@@ -435,6 +451,7 @@ void Changelog::removeAllLogs()
         std::filesystem::remove(itr->second.path);
         itr = existing_changelogs.erase(itr);
     }
+    logs.clear();
 }
 
 void Changelog::rotate(uint64_t new_start_log_index)
@@ -447,6 +464,10 @@ void Changelog::rotate(uint64_t new_start_log_index)
     new_description.prefix = DEFAULT_PREFIX;
     new_description.from_log_index = new_start_log_index;
     new_description.to_log_index = new_start_log_index + rotate_interval - 1;
+    new_description.extension = "bin";
+
+    if (compress_logs)
+        new_description.extension += "." + toContentEncodingName(CompressionMethod::Zstd);
 
     new_description.path = formatChangelogPath(changelogs_dir, new_description);
 
@@ -482,24 +503,18 @@ void Changelog::appendEntry(uint64_t index, const LogEntryPtr & log_entry)
         min_log_id = index;
 
     const auto & current_changelog_description = existing_changelogs[current_writer->getStartIndex()];
-    const bool log_is_complete = current_writer->getEntriesWritten() == current_changelog_description.expectedEntriesCountInLog();
+    const bool log_is_complete = index - current_writer->getStartIndex() == current_changelog_description.expectedEntriesCountInLog();
 
     if (log_is_complete)
         rotate(index);
 
-    const auto offset = current_writer->appendRecord(buildRecord(index, log_entry));
-    if (!index_to_start_pos.try_emplace(index, offset).second)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Record with index {} already exists", index);
-
+    current_writer->appendRecord(buildRecord(index, log_entry));
     logs[index] = makeClone(log_entry);
     max_log_id = index;
 }
 
 void Changelog::writeAt(uint64_t index, const LogEntryPtr & log_entry)
 {
-    if (index_to_start_pos.count(index) == 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot write at index {} because changelog doesn't contain it", index);
-
     /// This write_at require to overwrite everything in this file and also in previous file(s)
     const bool go_to_previous_file = index < current_writer->getStartIndex();
 
@@ -516,14 +531,7 @@ void Changelog::writeAt(uint64_t index, const LogEntryPtr & log_entry)
 
         /// Initialize writer from this log file
         current_writer = std::make_unique<ChangelogWriter>(description.path, WriteMode::Append, index_changelog->first);
-        current_writer->setEntriesWritten(description.to_log_index - description.from_log_index + 1);
-    }
 
-    /// Truncate current file
-    current_writer->truncateToLength(index_to_start_pos[index]);
-
-    if (go_to_previous_file)
-    {
         /// Remove all subsequent files if overwritten something in previous one
         auto to_remove_itr = existing_changelogs.upper_bound(index);
         for (auto itr = to_remove_itr; itr != existing_changelogs.end();)
@@ -533,20 +541,9 @@ void Changelog::writeAt(uint64_t index, const LogEntryPtr & log_entry)
         }
     }
 
-    auto entries_written = current_writer->getEntriesWritten();
     /// Remove redundant logs from memory
     /// Everything >= index must be removed
-    for (uint64_t i = index; ; ++i)
-    {
-        auto log_itr = logs.find(i);
-        if (log_itr == logs.end())
-            break;
-
-        logs.erase(log_itr);
-        index_to_start_pos.erase(i);
-        entries_written--;
-    }
-    current_writer->setEntriesWritten(entries_written);
+    std::erase_if(logs, [index] (const auto & item) { return item.first >= index; });
 
     /// Now we can actually override entry at index
     appendEntry(index, log_entry);
@@ -579,7 +576,6 @@ void Changelog::compact(uint64_t up_to_log_index)
             }
 
             LOG_INFO(log, "Removing changelog {} because of compaction", itr->second.path);
-            std::erase_if(index_to_start_pos, [right_index = itr->second.to_log_index] (const auto & item) { return item.first <= right_index; });
             std::filesystem::remove(itr->second.path);
             itr = existing_changelogs.erase(itr);
         }
diff --git a/src/Coordination/Changelog.h b/src/Coordination/Changelog.h
index 1dfec0edb46..87ec359cd3c 100644
--- a/src/Coordination/Changelog.h
+++ b/src/Coordination/Changelog.h
@@ -5,7 +5,7 @@
 #include <optional>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/HashingWriteBuffer.h>
-#include <Compression/CompressedWriteBuffer.h>
+#include <IO/CompressionMethod.h>
 #include <Disks/IDisk.h>
 
 namespace DB
@@ -25,9 +25,10 @@ enum class ChangelogVersion : uint8_t
 {
     V0 = 0,
     V1 = 1, /// with 64 bit buffer header
+    V2 = 2, /// with compression and duplicate records
 };
 
-static constexpr auto CURRENT_CHANGELOG_VERSION = ChangelogVersion::V1;
+static constexpr auto CURRENT_CHANGELOG_VERSION = ChangelogVersion::V2;
 
 struct ChangelogRecordHeader
 {
@@ -52,6 +53,7 @@ struct ChangelogFileDescription
     std::string prefix;
     uint64_t from_log_index;
     uint64_t to_log_index;
+    std::string extension;
 
     std::string path;
 
@@ -71,7 +73,8 @@ class Changelog
 {
 
 public:
-    Changelog(const std::string & changelogs_dir_, uint64_t rotate_interval_, bool force_sync_, Poco::Logger * log_);
+    Changelog(const std::string & changelogs_dir_, uint64_t rotate_interval_,
+            bool force_sync_, Poco::Logger * log_, bool compress_logs_ = true);
 
     /// Read changelog from files on changelogs_dir_ skipping all entries before from_log_index
     /// Truncate broken entries, remove files after broken entries.
@@ -130,25 +133,24 @@ private:
     void rotate(uint64_t new_start_log_index);
 
     /// Remove all changelogs from disk with start_index bigger than start_to_remove_from_id
-    void removeAllLogsAfter(uint64_t start_to_remove_from_id);
+    void removeAllLogsAfter(uint64_t remove_after_log_start_index);
     /// Remove all logs from disk
     void removeAllLogs();
     /// Init writer for existing log with some entries already written
-    void initWriter(const ChangelogFileDescription & description, uint64_t entries_already_written, std::optional<uint64_t> truncate_to_offset = {});
+    void initWriter(const ChangelogFileDescription & description);
 
 private:
     const std::string changelogs_dir;
     const uint64_t rotate_interval;
     const bool force_sync;
     Poco::Logger * log;
+    bool compress_logs;
 
     /// Currently existing changelogs
     std::map<uint64_t, ChangelogFileDescription> existing_changelogs;
 
     /// Current writer for changelog file
     std::unique_ptr<ChangelogWriter> current_writer;
-    /// Mapping log_id -> binary offset in log file
-    IndexToOffset index_to_start_pos;
     /// Mapping log_id -> log_entry
     IndexToLogEntry logs;
     /// Start log_id which exists in all "active" logs
diff --git a/src/Coordination/CoordinationSettings.h b/src/Coordination/CoordinationSettings.h
index 2d8da8806cd..8b0d036ec8e 100644
--- a/src/Coordination/CoordinationSettings.h
+++ b/src/Coordination/CoordinationSettings.h
@@ -11,6 +11,7 @@ namespace DB
 
 struct Settings;
 
+
 /** These settings represent fine tunes for internal details of Coordination storages
   * and should not be changed by the user without a reason.
   */
@@ -34,7 +35,8 @@ struct Settings;
     M(UInt64, fresh_log_gap, 200, "When node became fresh", 0) \
     M(UInt64, max_requests_batch_size, 100, "Max size of batch in requests count before it will be sent to RAFT", 0) \
     M(Bool, quorum_reads, false, "Execute read requests as writes through whole RAFT consesus with similar speed", 0) \
-    M(Bool, force_sync, true, "Call fsync on each change in RAFT changelog", 0)
+    M(Bool, force_sync, true, "Call fsync on each change in RAFT changelog", 0) \
+    M(Bool, compress_logs, true, "Write compressed coordination logs in ZSTD format", 0)
 
 DECLARE_SETTINGS_TRAITS(CoordinationSettingsTraits, LIST_OF_COORDINATION_SETTINGS)
 
diff --git a/src/Coordination/KeeperLogStore.cpp b/src/Coordination/KeeperLogStore.cpp
index 3896cf9b6fd..7e08449306e 100644
--- a/src/Coordination/KeeperLogStore.cpp
+++ b/src/Coordination/KeeperLogStore.cpp
@@ -1,11 +1,12 @@
 #include <Coordination/KeeperLogStore.h>
+#include <IO/CompressionMethod.h>
 
 namespace DB
 {
 
-KeeperLogStore::KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_)
+KeeperLogStore::KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_, bool compress_logs_)
     : log(&Poco::Logger::get("KeeperLogStore"))
-    , changelog(changelogs_path, rotate_interval_, force_sync_, log)
+    , changelog(changelogs_path, rotate_interval_, force_sync_, log, compress_logs_)
 {
     if (force_sync_)
         LOG_INFO(log, "force_sync enabled");
diff --git a/src/Coordination/KeeperLogStore.h b/src/Coordination/KeeperLogStore.h
index d8ac8330c05..d9f17c57342 100644
--- a/src/Coordination/KeeperLogStore.h
+++ b/src/Coordination/KeeperLogStore.h
@@ -13,7 +13,7 @@ namespace DB
 class KeeperLogStore : public nuraft::log_store
 {
 public:
-    KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_);
+    KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_, bool compress_logs_);
 
     /// Read log storage from filesystem starting from last_commited_log_index
     void init(uint64_t last_commited_log_index, uint64_t logs_to_keep);
diff --git a/src/Coordination/KeeperStateManager.cpp b/src/Coordination/KeeperStateManager.cpp
index d54752ec168..db8a24607a5 100644
--- a/src/Coordination/KeeperStateManager.cpp
+++ b/src/Coordination/KeeperStateManager.cpp
@@ -34,7 +34,7 @@ KeeperStateManager::KeeperStateManager(int server_id_, const std::string & host,
     : my_server_id(server_id_)
     , my_port(port)
     , secure(false)
-    , log_store(nuraft::cs_new<KeeperLogStore>(logs_path, 5000, false))
+    , log_store(nuraft::cs_new<KeeperLogStore>(logs_path, 5000, false, false))
     , cluster_config(nuraft::cs_new<nuraft::cluster_config>())
 {
     auto peer_config = nuraft::cs_new<nuraft::srv_config>(my_server_id, host + ":" + std::to_string(port));
@@ -51,7 +51,7 @@ KeeperStateManager::KeeperStateManager(
     , secure(config.getBool(config_prefix + ".raft_configuration.secure", false))
     , log_store(nuraft::cs_new<KeeperLogStore>(
                     getLogsPathFromConfig(config_prefix, config, standalone_keeper),
-                    coordination_settings->rotate_log_storage_interval, coordination_settings->force_sync))
+                    coordination_settings->rotate_log_storage_interval, coordination_settings->force_sync, coordination_settings->compress_logs))
     , cluster_config(nuraft::cs_new<nuraft::cluster_config>())
 {
 
diff --git a/src/Coordination/ZooKeeperDataReader.cpp b/src/Coordination/ZooKeeperDataReader.cpp
index cf644110786..4f71274291b 100644
--- a/src/Coordination/ZooKeeperDataReader.cpp
+++ b/src/Coordination/ZooKeeperDataReader.cpp
@@ -339,6 +339,9 @@ Coordination::ZooKeeperRequestPtr deserializeCheckVersionTxn(ReadBuffer & in)
     Coordination::read(result->path, in);
     Coordination::read(result->version, in);
     result->restored_from_zookeeper_log = true;
+    /// It stores version + 1 (which should be, not for request)
+    result->version -= 1;
+
     return result;
 }
 
@@ -572,12 +575,24 @@ void deserializeLogsAndApplyToStorage(KeeperStorage & storage, const std::string
 
     LOG_INFO(log, "Totally have {} logs", existing_logs.size());
 
-    for (auto [zxid, log_path] : existing_logs)
+    std::vector<std::string> stored_files;
+    for (auto it = existing_logs.rbegin(); it != existing_logs.rend(); ++it)
     {
-        if (zxid > storage.zxid)
-            deserializeLogAndApplyToStorage(storage, log_path, log);
-        else
-            LOG_INFO(log, "Skipping log {}, it's ZXID {} is smaller than storages ZXID {}", log_path, zxid, storage.zxid);
+        if (it->first >= storage.zxid)
+        {
+            stored_files.emplace_back(it->second);
+        }
+        else if (it->first < storage.zxid)
+        {
+            /// add the last logfile that is less than the zxid
+            stored_files.emplace_back(it->second);
+            break;
+        }
+    }
+
+    for (auto it = stored_files.rbegin(); it != stored_files.rend(); ++it)
+    {
+        deserializeLogAndApplyToStorage(storage, *it, log);
     }
 }
 
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index f12646ccb74..256afe56d36 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -53,14 +53,23 @@ struct ChangelogDirTest
     }
 };
 
-TEST(CoordinationTest, BuildTest)
+struct CompressionParam
+{
+    bool enable_compression;
+    std::string extension;
+};
+
+class CoordinationTest : public ::testing::TestWithParam<CompressionParam>
+{};
+
+TEST_P(CoordinationTest, BuildTest)
 {
     DB::InMemoryLogStore store;
     DB::SummingStateMachine machine;
     EXPECT_EQ(1, 1);
 }
 
-TEST(CoordinationTest, BufferSerde)
+TEST_P(CoordinationTest, BufferSerde)
 {
     Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Get);
     request->xid = 3;
@@ -173,7 +182,7 @@ nuraft::ptr<nuraft::buffer> getBuffer(int64_t number)
 }
 
 
-TEST(CoordinationTest, TestSummingRaft1)
+TEST_P(CoordinationTest, TestSummingRaft1)
 {
     ChangelogDirTest test("./logs");
     SummingRaftServer s1(1, "localhost", 44444, "./logs");
@@ -204,10 +213,11 @@ DB::LogEntryPtr getLogEntry(const std::string & s, size_t term)
     return nuraft::cs_new<nuraft::log_entry>(term, bufwriter.getBuffer());
 }
 
-TEST(CoordinationTest, ChangelogTestSimple)
+TEST_P(CoordinationTest, ChangelogTestSimple)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
     auto entry = getLogEntry("hello world", 77);
     changelog.append(entry);
@@ -220,17 +230,19 @@ TEST(CoordinationTest, ChangelogTestSimple)
     EXPECT_EQ(changelog.log_entries(1, 2)->size(), 1);
 }
 
-TEST(CoordinationTest, ChangelogTestFile)
+
+TEST_P(CoordinationTest, ChangelogTestFile)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
     auto entry = getLogEntry("hello world", 77);
     changelog.append(entry);
     changelog.end_of_append_batch(0, 0);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
     for (const auto & p : fs::directory_iterator("./logs"))
-        EXPECT_EQ(p.path(), "./logs/changelog_1_5.bin");
+        EXPECT_EQ(p.path(), "./logs/changelog_1_5.bin" + params.extension);
 
     changelog.append(entry);
     changelog.append(entry);
@@ -239,14 +251,15 @@ TEST(CoordinationTest, ChangelogTestFile)
     changelog.append(entry);
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 }
 
-TEST(CoordinationTest, ChangelogReadWrite)
+TEST_P(CoordinationTest, ChangelogReadWrite)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 1000, true);
+    DB::KeeperLogStore changelog("./logs", 1000, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 10; ++i)
     {
@@ -256,7 +269,8 @@ TEST(CoordinationTest, ChangelogReadWrite)
     changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog.size(), 10);
-    DB::KeeperLogStore changelog_reader("./logs", 1000, true);
+
+    DB::KeeperLogStore changelog_reader("./logs", 1000, true, params.enable_compression);
     changelog_reader.init(1, 0);
     EXPECT_EQ(changelog_reader.size(), 10);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), changelog.last_entry()->get_term());
@@ -272,10 +286,11 @@ TEST(CoordinationTest, ChangelogReadWrite)
     EXPECT_EQ(10, entries_from_range->size());
 }
 
-TEST(CoordinationTest, ChangelogWriteAt)
+TEST_P(CoordinationTest, ChangelogWriteAt)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 1000, true);
+    DB::KeeperLogStore changelog("./logs", 1000, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 10; ++i)
     {
@@ -295,7 +310,7 @@ TEST(CoordinationTest, ChangelogWriteAt)
     EXPECT_EQ(changelog.entry_at(7)->get_term(), 77);
     EXPECT_EQ(changelog.next_slot(), 8);
 
-    DB::KeeperLogStore changelog_reader("./logs", 1000, true);
+    DB::KeeperLogStore changelog_reader("./logs", 1000, true, params.enable_compression);
     changelog_reader.init(1, 0);
 
     EXPECT_EQ(changelog_reader.size(), changelog.size());
@@ -305,10 +320,11 @@ TEST(CoordinationTest, ChangelogWriteAt)
 }
 
 
-TEST(CoordinationTest, ChangelogTestAppendAfterRead)
+TEST_P(CoordinationTest, ChangelogTestAppendAfterRead)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 7; ++i)
     {
@@ -318,10 +334,10 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
     changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog.size(), 7);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader("./logs", 5, true, params.enable_compression);
     changelog_reader.init(1, 0);
 
     EXPECT_EQ(changelog_reader.size(), 7);
@@ -332,8 +348,8 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
     }
     changelog_reader.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog_reader.size(), 10);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
     size_t logs_count = 0;
     for (const auto & _ [[maybe_unused]]: fs::directory_iterator("./logs"))
@@ -345,9 +361,9 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
     changelog_reader.append(entry);
     changelog_reader.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog_reader.size(), 11);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
     logs_count = 0;
     for (const auto & _ [[maybe_unused]]: fs::directory_iterator("./logs"))
@@ -356,10 +372,11 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
     EXPECT_EQ(logs_count, 3);
 }
 
-TEST(CoordinationTest, ChangelogTestCompaction)
+TEST_P(CoordinationTest, ChangelogTestCompaction)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 3; ++i)
@@ -377,7 +394,7 @@ TEST(CoordinationTest, ChangelogTestCompaction)
     EXPECT_EQ(changelog.start_index(), 3);
     EXPECT_EQ(changelog.next_slot(), 4);
     EXPECT_EQ(changelog.last_entry()->get_term(), 20);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
 
     auto e1 = getLogEntry("hello world", 30);
     changelog.append(e1);
@@ -389,20 +406,20 @@ TEST(CoordinationTest, ChangelogTestCompaction)
     changelog.append(e4);
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
     changelog.compact(6);
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
     EXPECT_EQ(changelog.size(), 1);
     EXPECT_EQ(changelog.start_index(), 7);
     EXPECT_EQ(changelog.next_slot(), 8);
     EXPECT_EQ(changelog.last_entry()->get_term(), 60);
     /// And we able to read it
-    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader("./logs", 5, true, params.enable_compression);
     changelog_reader.init(7, 0);
 
     EXPECT_EQ(changelog_reader.size(), 1);
@@ -411,10 +428,11 @@ TEST(CoordinationTest, ChangelogTestCompaction)
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 60);
 }
 
-TEST(CoordinationTest, ChangelogTestBatchOperations)
+TEST_P(CoordinationTest, ChangelogTestBatchOperations)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 100, true);
+    DB::KeeperLogStore changelog("./logs", 100, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 10; ++i)
     {
@@ -427,7 +445,7 @@ TEST(CoordinationTest, ChangelogTestBatchOperations)
 
     auto entries = changelog.pack(1, 5);
 
-    DB::KeeperLogStore apply_changelog("./logs", 100, true);
+    DB::KeeperLogStore apply_changelog("./logs", 100, true, params.enable_compression);
     apply_changelog.init(1, 0);
 
     for (size_t i = 0; i < 10; ++i)
@@ -455,10 +473,11 @@ TEST(CoordinationTest, ChangelogTestBatchOperations)
     EXPECT_EQ(apply_changelog.entry_at(12)->get_term(), 40);
 }
 
-TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
+TEST_P(CoordinationTest, ChangelogTestBatchOperationsEmpty)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 100, true);
+    DB::KeeperLogStore changelog("./logs", 100, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 10; ++i)
     {
@@ -472,7 +491,7 @@ TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
     auto entries = changelog.pack(5, 5);
 
     ChangelogDirTest test1("./logs1");
-    DB::KeeperLogStore changelog_new("./logs1", 100, true);
+    DB::KeeperLogStore changelog_new("./logs1", 100, true, params.enable_compression);
     changelog_new.init(1, 0);
     EXPECT_EQ(changelog_new.size(), 0);
 
@@ -494,15 +513,16 @@ TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
     EXPECT_EQ(changelog_new.start_index(), 5);
     EXPECT_EQ(changelog_new.next_slot(), 11);
 
-    DB::KeeperLogStore changelog_reader("./logs1", 100, true);
+    DB::KeeperLogStore changelog_reader("./logs1", 100, true, params.enable_compression);
     changelog_reader.init(5, 0);
 }
 
 
-TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
+TEST_P(CoordinationTest, ChangelogTestWriteAtPreviousFile)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 33; ++i)
@@ -512,13 +532,13 @@ TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
     EXPECT_EQ(changelog.size(), 33);
 
@@ -530,16 +550,16 @@ TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
     EXPECT_EQ(changelog.next_slot(), 8);
     EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_read("./logs", 5, true);
+    DB::KeeperLogStore changelog_read("./logs", 5, true, params.enable_compression);
     changelog_read.init(1, 0);
     EXPECT_EQ(changelog_read.size(), 7);
     EXPECT_EQ(changelog_read.start_index(), 1);
@@ -547,10 +567,11 @@ TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
     EXPECT_EQ(changelog_read.last_entry()->get_term(), 5555);
 }
 
-TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
+TEST_P(CoordinationTest, ChangelogTestWriteAtFileBorder)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 33; ++i)
@@ -560,13 +581,13 @@ TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
     EXPECT_EQ(changelog.size(), 33);
 
@@ -578,16 +599,16 @@ TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
     EXPECT_EQ(changelog.next_slot(), 12);
     EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_read("./logs", 5, true);
+    DB::KeeperLogStore changelog_read("./logs", 5, true, params.enable_compression);
     changelog_read.init(1, 0);
     EXPECT_EQ(changelog_read.size(), 11);
     EXPECT_EQ(changelog_read.start_index(), 1);
@@ -595,10 +616,11 @@ TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
     EXPECT_EQ(changelog_read.last_entry()->get_term(), 5555);
 }
 
-TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
+TEST_P(CoordinationTest, ChangelogTestWriteAtAllFiles)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 33; ++i)
@@ -608,13 +630,13 @@ TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
     EXPECT_EQ(changelog.size(), 33);
 
@@ -626,20 +648,21 @@ TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
     EXPECT_EQ(changelog.next_slot(), 2);
     EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 }
 
-TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
+TEST_P(CoordinationTest, ChangelogTestStartNewLogAfterRead)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 35; ++i)
@@ -649,17 +672,17 @@ TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
     }
     changelog.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog.size(), 35);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_36_40.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_36_40.bin" + params.extension));
 
 
-    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader("./logs", 5, true, params.enable_compression);
     changelog_reader.init(1, 0);
 
     auto entry = getLogEntry("36_hello_world", 360);
@@ -667,22 +690,23 @@ TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
     changelog_reader.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog_reader.size(), 36);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_36_40.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_36_40.bin" + params.extension));
 }
 
 
-TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
+TEST_P(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
 
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 35; ++i)
@@ -692,32 +716,32 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
     }
     changelog.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog.size(), 35);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
-    DB::WriteBufferFromFile plain_buf("./logs/changelog_11_15.bin", DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    DB::WriteBufferFromFile plain_buf("./logs/changelog_11_15.bin" + params.extension, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
     plain_buf.truncate(0);
 
-    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader("./logs", 5, true, params.enable_compression);
     changelog_reader.init(1, 0);
     changelog_reader.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog_reader.size(), 10);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 90);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
     auto entry = getLogEntry("h", 7777);
     changelog_reader.append(entry);
@@ -725,26 +749,27 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
     EXPECT_EQ(changelog_reader.size(), 11);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 7777);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_reader2("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader2("./logs", 5, true, params.enable_compression);
     changelog_reader2.init(1, 0);
     EXPECT_EQ(changelog_reader2.size(), 11);
     EXPECT_EQ(changelog_reader2.last_entry()->get_term(), 7777);
 }
 
-TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
+TEST_P(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
 
-    DB::KeeperLogStore changelog("./logs", 20, true);
+    DB::KeeperLogStore changelog("./logs", 20, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 35; ++i)
@@ -754,37 +779,37 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin" + params.extension));
 
-    DB::WriteBufferFromFile plain_buf("./logs/changelog_1_20.bin", DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    DB::WriteBufferFromFile plain_buf("./logs/changelog_1_20.bin" + params.extension, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
     plain_buf.truncate(140);
 
-    DB::KeeperLogStore changelog_reader("./logs", 20, true);
+    DB::KeeperLogStore changelog_reader("./logs", 20, true, params.enable_compression);
     changelog_reader.init(1, 0);
 
-    EXPECT_EQ(changelog_reader.size(), 2);
-    EXPECT_EQ(changelog_reader.last_entry()->get_term(), 450);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin"));
+    EXPECT_EQ(changelog_reader.size(), 0);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin" + params.extension));
     auto entry = getLogEntry("hello_world", 7777);
     changelog_reader.append(entry);
     changelog_reader.end_of_append_batch(0, 0);
-    EXPECT_EQ(changelog_reader.size(), 3);
+    EXPECT_EQ(changelog_reader.size(), 1);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 7777);
 
 
-    DB::KeeperLogStore changelog_reader2("./logs", 20, true);
+    DB::KeeperLogStore changelog_reader2("./logs", 1, true, params.enable_compression);
     changelog_reader2.init(1, 0);
-    EXPECT_EQ(changelog_reader2.size(), 3);
+    EXPECT_EQ(changelog_reader2.size(), 1);
     EXPECT_EQ(changelog_reader2.last_entry()->get_term(), 7777);
 }
 
-TEST(CoordinationTest, ChangelogTestLostFiles)
+TEST_P(CoordinationTest, ChangelogTestLostFiles)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
 
-    DB::KeeperLogStore changelog("./logs", 20, true);
+    DB::KeeperLogStore changelog("./logs", 20, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 35; ++i)
@@ -794,19 +819,19 @@ TEST(CoordinationTest, ChangelogTestLostFiles)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin" + params.extension));
 
-    fs::remove("./logs/changelog_1_20.bin");
+    fs::remove("./logs/changelog_1_20.bin" + params.extension);
 
-    DB::KeeperLogStore changelog_reader("./logs", 20, true);
+    DB::KeeperLogStore changelog_reader("./logs", 20, true, params.enable_compression);
     /// It should print error message, but still able to start
     changelog_reader.init(5, 0);
-    EXPECT_FALSE(fs::exists("./logs/changelog_1_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin" + params.extension));
 }
 
-TEST(CoordinationTest, SnapshotableHashMapSimple)
+TEST_P(CoordinationTest, SnapshotableHashMapSimple)
 {
     DB::SnapshotableHashTable<int> hello;
     EXPECT_TRUE(hello.insert("hello", 5));
@@ -821,7 +846,7 @@ TEST(CoordinationTest, SnapshotableHashMapSimple)
     EXPECT_EQ(hello.size(), 0);
 }
 
-TEST(CoordinationTest, SnapshotableHashMapTrySnapshot)
+TEST_P(CoordinationTest, SnapshotableHashMapTrySnapshot)
 {
     DB::SnapshotableHashTable<int> map_snp;
     EXPECT_TRUE(map_snp.insert("/hello", 7));
@@ -907,7 +932,7 @@ void addNode(DB::KeeperStorage & storage, const std::string & path, const std::s
     storage.container.insertOrReplace(path, node);
 }
 
-TEST(CoordinationTest, TestStorageSnapshotSimple)
+TEST_P(CoordinationTest, TestStorageSnapshotSimple)
 {
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
@@ -954,7 +979,7 @@ TEST(CoordinationTest, TestStorageSnapshotSimple)
     EXPECT_EQ(restored_storage->session_and_timeout.size(), 2);
 }
 
-TEST(CoordinationTest, TestStorageSnapshotMoreWrites)
+TEST_P(CoordinationTest, TestStorageSnapshotMoreWrites)
 {
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
@@ -994,7 +1019,7 @@ TEST(CoordinationTest, TestStorageSnapshotMoreWrites)
 }
 
 
-TEST(CoordinationTest, TestStorageSnapshotManySnapshots)
+TEST_P(CoordinationTest, TestStorageSnapshotManySnapshots)
 {
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
@@ -1032,7 +1057,7 @@ TEST(CoordinationTest, TestStorageSnapshotManySnapshots)
     }
 }
 
-TEST(CoordinationTest, TestStorageSnapshotMode)
+TEST_P(CoordinationTest, TestStorageSnapshotMode)
 {
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
@@ -1083,7 +1108,7 @@ TEST(CoordinationTest, TestStorageSnapshotMode)
 
 }
 
-TEST(CoordinationTest, TestStorageSnapshotBroken)
+TEST_P(CoordinationTest, TestStorageSnapshotBroken)
 {
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
@@ -1121,7 +1146,7 @@ nuraft::ptr<nuraft::log_entry> getLogEntryFromZKRequest(size_t term, int64_t ses
     return nuraft::cs_new<nuraft::log_entry>(term, buffer);
 }
 
-void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint64_t total_logs)
+void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint64_t total_logs, bool enable_compression)
 {
     using namespace Coordination;
     using namespace DB;
@@ -1133,7 +1158,7 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
     SnapshotsQueue snapshots_queue{1};
     auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings);
     state_machine->init();
-    DB::KeeperLogStore changelog("./logs", settings->rotate_log_storage_interval, true);
+    DB::KeeperLogStore changelog("./logs", settings->rotate_log_storage_interval, true, enable_compression);
     changelog.init(state_machine->last_commit_index() + 1, settings->reserved_log_items);
     for (size_t i = 1; i < total_logs + 1; ++i)
     {
@@ -1173,7 +1198,7 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
     restore_machine->init();
     EXPECT_EQ(restore_machine->last_commit_index(), total_logs - total_logs % settings->snapshot_distance);
 
-    DB::KeeperLogStore restore_changelog("./logs", settings->rotate_log_storage_interval, true);
+    DB::KeeperLogStore restore_changelog("./logs", settings->rotate_log_storage_interval, true, enable_compression);
     restore_changelog.init(restore_machine->last_commit_index() + 1, settings->reserved_log_items);
 
     EXPECT_EQ(restore_changelog.size(), std::min(settings->reserved_log_items + total_logs % settings->snapshot_distance, total_logs));
@@ -1199,77 +1224,78 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
     }
 }
 
-TEST(CoordinationTest, TestStateMachineAndLogStore)
+TEST_P(CoordinationTest, TestStateMachineAndLogStore)
 {
     using namespace Coordination;
     using namespace DB;
+    auto params = GetParam();
 
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 37);
+        testLogAndStateMachine(settings, 37, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 11);
+        testLogAndStateMachine(settings, 11, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 40);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 20;
         settings->rotate_log_storage_interval = 30;
-        testLogAndStateMachine(settings, 40);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 0;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 40);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 1;
         settings->reserved_log_items = 1;
         settings->rotate_log_storage_interval = 32;
-        testLogAndStateMachine(settings, 32);
+        testLogAndStateMachine(settings, 32, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 7;
         settings->rotate_log_storage_interval = 1;
-        testLogAndStateMachine(settings, 33);
+        testLogAndStateMachine(settings, 33, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 37;
         settings->reserved_log_items = 1000;
         settings->rotate_log_storage_interval = 5000;
-        testLogAndStateMachine(settings, 33);
+        testLogAndStateMachine(settings, 33, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 37;
         settings->reserved_log_items = 1000;
         settings->rotate_log_storage_interval = 5000;
-        testLogAndStateMachine(settings, 45);
+        testLogAndStateMachine(settings, 45, params.enable_compression);
     }
 }
 
-TEST(CoordinationTest, TestEphemeralNodeRemove)
+TEST_P(CoordinationTest, TestEphemeralNodeRemove)
 {
     using namespace Coordination;
     using namespace DB;
@@ -1300,12 +1326,13 @@ TEST(CoordinationTest, TestEphemeralNodeRemove)
 }
 
 
-TEST(CoordinationTest, TestRotateIntervalChanges)
+TEST_P(CoordinationTest, TestRotateIntervalChanges)
 {
     using namespace Coordination;
+    auto params = GetParam();
     ChangelogDirTest snapshots("./logs");
     {
-        DB::KeeperLogStore changelog("./logs", 100, true);
+        DB::KeeperLogStore changelog("./logs", 100, true, params.enable_compression);
 
         changelog.init(0, 3);
         for (size_t i = 1; i < 55; ++i)
@@ -1319,9 +1346,9 @@ TEST(CoordinationTest, TestRotateIntervalChanges)
     }
 
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_100.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_100.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_1("./logs", 10, true);
+    DB::KeeperLogStore changelog_1("./logs", 10, true, params.enable_compression);
     changelog_1.init(0, 50);
     for (size_t i = 0; i < 55; ++i)
     {
@@ -1332,10 +1359,10 @@ TEST(CoordinationTest, TestRotateIntervalChanges)
         changelog_1.end_of_append_batch(0, 0);
     }
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_100.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_101_110.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_100.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_101_110.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_2("./logs", 7, true);
+    DB::KeeperLogStore changelog_2("./logs", 7, true, params.enable_compression);
     changelog_2.init(98, 55);
 
     for (size_t i = 0; i < 17; ++i)
@@ -1349,13 +1376,13 @@ TEST(CoordinationTest, TestRotateIntervalChanges)
 
     changelog_2.compact(105);
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_1_100.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_101_110.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_111_117.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_118_124.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_125_131.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_1_100.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_101_110.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_111_117.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_118_124.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_125_131.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_3("./logs", 5, true);
+    DB::KeeperLogStore changelog_3("./logs", 5, true, params.enable_compression);
     changelog_3.init(116, 3);
     for (size_t i = 0; i < 17; ++i)
     {
@@ -1367,17 +1394,17 @@ TEST(CoordinationTest, TestRotateIntervalChanges)
     }
 
     changelog_3.compact(125);
-    EXPECT_FALSE(fs::exists("./logs/changelog_101_110.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_111_117.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_118_124.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_101_110.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_111_117.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_118_124.bin" + params.extension));
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_125_131.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_132_136.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_137_141.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_142_146.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_125_131.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_132_136.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_137_141.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_142_146.bin" + params.extension));
 }
 
-TEST(CoordinationTest, TestSessionExpiryQueue)
+TEST_P(CoordinationTest, TestSessionExpiryQueue)
 {
     using namespace Coordination;
     SessionExpiryQueue queue(500);
@@ -1395,6 +1422,56 @@ TEST(CoordinationTest, TestSessionExpiryQueue)
 }
 
 
+TEST_P(CoordinationTest, TestCompressedLogsMultipleRewrite)
+{
+    using namespace Coordination;
+    auto test_params = GetParam();
+    ChangelogDirTest snapshots("./logs");
+    DB::KeeperLogStore changelog("./logs", 100, true, test_params.enable_compression);
+
+    changelog.init(0, 3);
+    for (size_t i = 1; i < 55; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog.append(entry);
+        changelog.end_of_append_batch(0, 0);
+    }
+
+
+    DB::KeeperLogStore changelog1("./logs", 100, true, test_params.enable_compression);
+    changelog1.init(0, 3);
+    for (size_t i = 55; i < 70; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog1.append(entry);
+        changelog1.end_of_append_batch(0, 0);
+    }
+
+    DB::KeeperLogStore changelog2("./logs", 100, true, test_params.enable_compression);
+    changelog2.init(0, 3);
+    for (size_t i = 70; i < 80; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog2.append(entry);
+        changelog2.end_of_append_batch(0, 0);
+    }
+
+}
+
+INSTANTIATE_TEST_SUITE_P(CoordinationTestSuite,
+    CoordinationTest,
+    ::testing::ValuesIn(std::initializer_list<CompressionParam>{
+            CompressionParam{true, ".zstd"},
+            CompressionParam{false, ""}
+    })
+);
+
 int main(int argc, char ** argv)
 {
     Poco::AutoPtr<Poco::ConsoleChannel> channel(new Poco::ConsoleChannel(std::cerr));
diff --git a/src/Coordination/ya.make b/src/Coordination/ya.make
deleted file mode 100644
index f3eae68806c..00000000000
--- a/src/Coordination/ya.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-SRCS(
-)
-
-END()
diff --git a/src/Coordination/ya.make.in b/src/Coordination/ya.make.in
deleted file mode 100644
index ba5f8bcbea4..00000000000
--- a/src/Coordination/ya.make.in
+++ /dev/null
@@ -1,12 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-SRCS(
-)
-
-END()
diff --git a/src/Core/AccurateComparison.h b/src/Core/AccurateComparison.h
index 29088cbf1b5..0f4a2bb2d1f 100644
--- a/src/Core/AccurateComparison.h
+++ b/src/Core/AccurateComparison.h
@@ -33,7 +33,7 @@ bool lessOp(A a, B b)
         return false;
 
     /// int vs int
-    if constexpr (is_integer_v<A> && is_integer_v<B>)
+    if constexpr (is_integer<A> && is_integer<B>)
     {
         /// same signedness
         if constexpr (is_signed_v<A> == is_signed_v<B>)
@@ -49,7 +49,7 @@ bool lessOp(A a, B b)
     }
 
     /// int vs float
-    if constexpr (is_integer_v<A> && std::is_floating_point_v<B>)
+    if constexpr (is_integer<A> && std::is_floating_point_v<B>)
     {
         if constexpr (sizeof(A) <= 4)
             return static_cast<double>(a) < static_cast<double>(b);
@@ -57,7 +57,7 @@ bool lessOp(A a, B b)
         return DecomposedFloat<B>(b).greater(a);
     }
 
-    if constexpr (std::is_floating_point_v<A> && is_integer_v<B>)
+    if constexpr (std::is_floating_point_v<A> && is_integer<B>)
     {
         if constexpr (sizeof(B) <= 4)
             return static_cast<double>(a) < static_cast<double>(b);
@@ -65,8 +65,8 @@ bool lessOp(A a, B b)
         return DecomposedFloat<A>(a).less(b);
     }
 
-    static_assert(is_integer_v<A> || std::is_floating_point_v<A>);
-    static_assert(is_integer_v<B> || std::is_floating_point_v<B>);
+    static_assert(is_integer<A> || std::is_floating_point_v<A>);
+    static_assert(is_integer<B> || std::is_floating_point_v<B>);
     __builtin_unreachable();
 }
 
@@ -109,7 +109,7 @@ bool equalsOp(A a, B b)
         return false;
 
     /// int vs int
-    if constexpr (is_integer_v<A> && is_integer_v<B>)
+    if constexpr (is_integer<A> && is_integer<B>)
     {
         /// same signedness
         if constexpr (is_signed_v<A> == is_signed_v<B>)
@@ -125,7 +125,7 @@ bool equalsOp(A a, B b)
     }
 
     /// int vs float
-    if constexpr (is_integer_v<A> && std::is_floating_point_v<B>)
+    if constexpr (is_integer<A> && std::is_floating_point_v<B>)
     {
         if constexpr (sizeof(A) <= 4)
             return static_cast<double>(a) == static_cast<double>(b);
@@ -133,7 +133,7 @@ bool equalsOp(A a, B b)
         return DecomposedFloat<B>(b).equals(a);
     }
 
-    if constexpr (std::is_floating_point_v<A> && is_integer_v<B>)
+    if constexpr (std::is_floating_point_v<A> && is_integer<B>)
     {
         if constexpr (sizeof(B) <= 4)
             return static_cast<double>(a) == static_cast<double>(b);
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index ddfd62c2efb..a59ac60155e 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -695,4 +695,16 @@ void Block::updateHash(SipHash & hash) const
             col.column->updateHashWithValue(row_no, hash);
 }
 
+
+ColumnPtr getColumnFromBlock(const Block & block, const NameAndTypePair & column)
+{
+    auto current_column = block.getByName(column.getNameInStorage()).column;
+    current_column = current_column->decompress();
+
+    if (column.isSubcolumn())
+        return column.getTypeInStorage()->getSubcolumn(column.getSubcolumnName(), *current_column);
+
+    return current_column;
+}
+
 }
diff --git a/src/Core/Block.h b/src/Core/Block.h
index 14f82cecd8d..a7e3cee194b 100644
--- a/src/Core/Block.h
+++ b/src/Core/Block.h
@@ -192,4 +192,8 @@ void assertCompatibleHeader(const Block & actual, const Block & desired, const s
 /// Calculate difference in structure of blocks and write description into output strings. NOTE It doesn't compare values of constant columns.
 void getBlocksDifference(const Block & lhs, const Block & rhs, std::string & out_lhs_diff, std::string & out_rhs_diff);
 
+/// Helps in-memory storages to extract columns from block.
+/// Properly handles cases, when column is a subcolumn and when it is compressed.
+ColumnPtr getColumnFromBlock(const Block & block, const NameAndTypePair & column);
+
 }
diff --git a/src/Core/DecimalComparison.h b/src/Core/DecimalComparison.h
index 5b017cd4634..cf2c43d61bd 100644
--- a/src/Core/DecimalComparison.h
+++ b/src/Core/DecimalComparison.h
@@ -47,21 +47,21 @@ template <> struct ConstructDecInt<32> { using Type = Int256; };
 template <typename T, typename U>
 struct DecCompareInt
 {
-    using Type = typename ConstructDecInt<(!IsDecimalNumber<U> || sizeof(T) > sizeof(U)) ? sizeof(T) : sizeof(U)>::Type;
+    using Type = typename ConstructDecInt<(!is_decimal<U> || sizeof(T) > sizeof(U)) ? sizeof(T) : sizeof(U)>::Type;
     using TypeA = Type;
     using TypeB = Type;
 };
 
 ///
 template <typename A, typename B, template <typename, typename> typename Operation, bool _check_overflow = true,
-    bool _actual = IsDecimalNumber<A> || IsDecimalNumber<B>>
+    bool _actual = is_decimal<A> || is_decimal<B>>
 class DecimalComparison
 {
 public:
     using CompareInt = typename DecCompareInt<A, B>::Type;
     using Op = Operation<CompareInt, CompareInt>;
-    using ColVecA = std::conditional_t<IsDecimalNumber<A>, ColumnDecimal<A>, ColumnVector<A>>;
-    using ColVecB = std::conditional_t<IsDecimalNumber<B>, ColumnDecimal<B>, ColumnVector<B>>;
+    using ColVecA = ColumnVectorOrDecimal<A>;
+    using ColVecB = ColumnVectorOrDecimal<B>;
 
     using ArrayA = typename ColVecA::Container;
     using ArrayB = typename ColVecB::Container;
@@ -116,7 +116,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<IsDecimalNumber<T> && IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<is_decimal<T> && is_decimal<U>, Shift>
     getScales(const DataTypePtr & left_type, const DataTypePtr & right_type)
     {
         const DataTypeDecimalBase<T> * decimal0 = checkDecimalBase<T>(*left_type);
@@ -138,7 +138,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<IsDecimalNumber<T> && !IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<is_decimal<T> && !is_decimal<U>, Shift>
     getScales(const DataTypePtr & left_type, const DataTypePtr &)
     {
         Shift shift;
@@ -149,7 +149,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<!IsDecimalNumber<T> && IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<!is_decimal<T> && is_decimal<U>, Shift>
     getScales(const DataTypePtr &, const DataTypePtr & right_type)
     {
         Shift shift;
@@ -222,13 +222,13 @@ private:
     static NO_INLINE UInt8 apply(A a, B b, CompareInt scale [[maybe_unused]])
     {
         CompareInt x;
-        if constexpr (IsDecimalNumber<A>)
+        if constexpr (is_decimal<A>)
             x = a.value;
         else
             x = a;
 
         CompareInt y;
-        if constexpr (IsDecimalNumber<B>)
+        if constexpr (is_decimal<B>)
             y = b.value;
         else
             y = b;
diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h
index 0e399210088..8f8e6b304cb 100644
--- a/src/Core/DecimalFunctions.h
+++ b/src/Core/DecimalFunctions.h
@@ -223,16 +223,16 @@ inline typename DecimalType::NativeType getFractionalPart(const DecimalType & de
 template <typename To, typename DecimalType, typename ReturnType>
 ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
 {
-    using NativeT = typename DecimalType::NativeType;
-    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+    using DecimalNativeType = typename DecimalType::NativeType;
+    static constexpr bool throw_exception = std::is_void_v<ReturnType>;
 
     if constexpr (std::is_floating_point_v<To>)
     {
-        result = static_cast<To>(decimal.value) / static_cast<To>(scaleMultiplier<NativeT>(scale));
+        result = static_cast<To>(decimal.value) / static_cast<To>(scaleMultiplier<DecimalNativeType>(scale));
     }
-    else if constexpr (is_integer_v<To> && (sizeof(To) >= sizeof(NativeT)))
+    else if constexpr (is_integer<To> && (sizeof(To) >= sizeof(DecimalNativeType)))
     {
-        NativeT whole = getWholePart(decimal, scale);
+        DecimalNativeType whole = getWholePart(decimal, scale);
 
         if constexpr (is_unsigned_v<To>)
         {
@@ -247,15 +247,14 @@ ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
 
         result = static_cast<To>(whole);
     }
-    else if constexpr (is_integer_v<To>)
+    else if constexpr (is_integer<To>)
     {
-        using ToNativeT = typename NativeType<To>::Type;
-        using CastTo = std::conditional_t<(is_big_int_v<NativeT> && std::is_same_v<ToNativeT, UInt8>), uint8_t, ToNativeT>;
+        using CastTo = std::conditional_t<(is_big_int_v<DecimalNativeType> && std::is_same_v<To, UInt8>), uint8_t, To>;
 
-        const NativeT whole = getWholePart(decimal, scale);
+        const DecimalNativeType whole = getWholePart(decimal, scale);
 
-        static const constexpr CastTo min_to = std::numeric_limits<ToNativeT>::min();
-        static const constexpr CastTo max_to = std::numeric_limits<ToNativeT>::max();
+        static const constexpr CastTo min_to = std::numeric_limits<To>::min();
+        static const constexpr CastTo max_to = std::numeric_limits<To>::max();
 
         if (whole < min_to || whole > max_to)
         {
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index 8244a0fc815..ce5c9098399 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -128,5 +128,8 @@
 /// Default limit on recursion depth of recursive descend parser.
 #define DBMS_DEFAULT_MAX_PARSER_DEPTH 1000
 
+/// Default limit on query size.
+#define DBMS_DEFAULT_MAX_QUERY_SIZE 262144
+
 /// Max depth of hierarchical dictionary
 #define DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH 1000
diff --git a/src/Core/Field.cpp b/src/Core/Field.cpp
index ae26ddf87c6..a85b7cff46e 100644
--- a/src/Core/Field.cpp
+++ b/src/Core/Field.cpp
@@ -487,11 +487,11 @@ template bool decimalLessOrEqual<DateTime64>(DateTime64 x, DateTime64 y, UInt32
 inline void writeText(const Null & x, WriteBuffer & buf)
 {
     if (x.isNegativeInfinity())
-        writeText(std::string("-Inf"), buf);
+        writeText("-Inf", buf);
     if (x.isPositiveInfinity())
-        writeText(std::string("+Inf"), buf);
+        writeText("+Inf", buf);
     else
-        writeText(std::string("NULL"), buf);
+        writeText("NULL", buf);
 }
 
 String toString(const Field & x)
diff --git a/src/Core/Field.h b/src/Core/Field.h
index 170c948893a..d66674805d1 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -14,7 +14,7 @@
 #include <Core/UUID.h>
 #include <common/DayNum.h>
 #include <common/strong_typedef.h>
-
+#include <common/EnumReflection.h>
 
 namespace DB
 {
@@ -283,33 +283,6 @@ public:
             Map = 26,
             UUID = 27,
         };
-
-        static const char * toString(Which which)
-        {
-            switch (which)
-            {
-                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";
-                case Tuple:   return "Tuple";
-                case Map:     return "Map";
-                case Decimal32:  return "Decimal32";
-                case Decimal64:  return "Decimal64";
-                case Decimal128: return "Decimal128";
-                case Decimal256: return "Decimal256";
-                case AggregateFunctionState: return "AggregateFunctionState";
-            }
-
-            throw Exception("Bad type of Field", ErrorCodes::BAD_TYPE_OF_FIELD);
-        }
     };
 
 
@@ -417,7 +390,8 @@ public:
 
 
     Types::Which getType() const { return which; }
-    const char * getTypeName() const { return Types::toString(which); }
+
+    constexpr std::string_view getTypeName() const { return magic_enum::enum_name(which); }
 
     bool isNull() const { return which == Types::Null; }
     template <typename T>
@@ -808,7 +782,8 @@ NearestFieldType<std::decay_t<T>> & Field::get()
     constexpr Field::Types::Which target = TypeToEnum<StoredType>::value;
     if (target != which
            && (!isInt64OrUInt64FieldType(target) || !isInt64OrUInt64FieldType(which)))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid Field get from type {} to type {}", Types::toString(which), Types::toString(target));
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Invalid Field get from type {} to type {}", which, target);
 #endif
 
     StoredType * MAY_ALIAS ptr = reinterpret_cast<StoredType *>(&storage);
@@ -821,8 +796,11 @@ template <typename T>
 auto & Field::safeGet()
 {
     const Types::Which requested = TypeToEnum<NearestFieldType<std::decay_t<T>>>::value;
+
     if (which != requested)
-        throw Exception("Bad get: has " + std::string(getTypeName()) + ", requested " + std::string(Types::toString(requested)), ErrorCodes::BAD_GET);
+        throw Exception(ErrorCodes::BAD_GET,
+            "Bad get: has {}, requested {}", getTypeName(), requested);
+
     return get<T>();
 }
 
@@ -859,12 +837,6 @@ T safeGet(Field & field)
     return field.template safeGet<T>();
 }
 
-template <> inline constexpr const char * TypeName<Array> = "Array";
-template <> inline constexpr const char * TypeName<Tuple> = "Tuple";
-template <> inline constexpr const char * TypeName<Map> = "Map";
-template <> inline constexpr const char * TypeName<AggregateFunctionStateData> = "AggregateFunctionState";
-
-
 template <typename T>
 Field::Field(T && rhs, enable_if_not_field_or_bool_or_stringlike_t<T>) //-V730
 {
diff --git a/src/Core/NamesAndTypes.h b/src/Core/NamesAndTypes.h
index 0c871f08d8b..58b5189db63 100644
--- a/src/Core/NamesAndTypes.h
+++ b/src/Core/NamesAndTypes.h
@@ -28,7 +28,7 @@ public:
     String getSubcolumnName() const;
 
     bool isSubcolumn() const { return subcolumn_delimiter_position != std::nullopt; }
-    DataTypePtr getTypeInStorage() const { return type_in_storage; }
+    const DataTypePtr & getTypeInStorage() const { return type_in_storage; }
 
     bool operator<(const NameAndTypePair & rhs) const
     {
diff --git a/src/Core/PostgreSQL/Connection.cpp b/src/Core/PostgreSQL/Connection.cpp
index e5c61c19963..8e127afb1db 100644
--- a/src/Core/PostgreSQL/Connection.cpp
+++ b/src/Core/PostgreSQL/Connection.cpp
@@ -1,9 +1,9 @@
 #include "Connection.h"
 
 #if USE_LIBPQXX
-
 #include <common/logger_useful.h>
 
+
 namespace postgres
 {
 
@@ -42,7 +42,6 @@ void Connection::execWithRetry(const std::function<void(pqxx::nontransaction &)>
 pqxx::connection & Connection::getRef()
 {
     connect();
-    assert(connection != nullptr);
     return *connection;
 }
 
diff --git a/src/Core/PostgreSQL/PoolWithFailover.cpp b/src/Core/PostgreSQL/PoolWithFailover.cpp
index b8b8e78396c..3addb511c3b 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.cpp
+++ b/src/Core/PostgreSQL/PoolWithFailover.cpp
@@ -5,6 +5,8 @@
 #include "Utils.h"
 #include <Common/parseRemoteDescription.h>
 #include <Common/Exception.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
 
 namespace DB
 {
@@ -18,7 +20,7 @@ namespace postgres
 {
 
 PoolWithFailover::PoolWithFailover(
-        const Poco::Util::AbstractConfiguration & config, const String & config_prefix,
+        const DB::ExternalDataSourcesConfigurationByPriority & configurations_by_priority,
         size_t pool_size, size_t pool_wait_timeout_, size_t max_tries_)
         : pool_wait_timeout(pool_wait_timeout_)
         , max_tries(max_tries_)
@@ -26,45 +28,19 @@ PoolWithFailover::PoolWithFailover(
     LOG_TRACE(&Poco::Logger::get("PostgreSQLConnectionPool"), "PostgreSQL connection pool size: {}, connection wait timeout: {}, max failover tries: {}",
               pool_size, pool_wait_timeout, max_tries_);
 
-    auto db = config.getString(config_prefix + ".db", "");
-    auto host = config.getString(config_prefix + ".host", "");
-    auto port = config.getUInt(config_prefix + ".port", 0);
-    auto user = config.getString(config_prefix + ".user", "");
-    auto password = config.getString(config_prefix + ".password", "");
-
-    if (config.has(config_prefix + ".replica"))
+    for (const auto & [priority, configurations] : configurations_by_priority)
     {
-        Poco::Util::AbstractConfiguration::Keys config_keys;
-        config.keys(config_prefix, config_keys);
-
-        for (const auto & config_key : config_keys)
+        for (const auto & replica_configuration : configurations)
         {
-            if (config_key.starts_with("replica"))
-            {
-                std::string replica_name = config_prefix + "." + config_key;
-                size_t priority = config.getInt(replica_name + ".priority", 0);
-
-                auto replica_host = config.getString(replica_name + ".host", host);
-                auto replica_port = config.getUInt(replica_name + ".port", port);
-                auto replica_user = config.getString(replica_name + ".user", user);
-                auto replica_password = config.getString(replica_name + ".password", password);
-
-                auto connection_string = formatConnectionString(db, replica_host, replica_port, replica_user, replica_password).first;
-                replicas_with_priority[priority].emplace_back(connection_string, pool_size);
-            }
+            auto connection_string = formatConnectionString(replica_configuration.database,
+                replica_configuration.host, replica_configuration.port, replica_configuration.username, replica_configuration.password).first;
+            replicas_with_priority[priority].emplace_back(connection_string, pool_size, getConnectionForLog(replica_configuration.host, replica_configuration.port));
         }
     }
-    else
-    {
-        auto connection_string = formatConnectionString(db, host, port, user, password).first;
-        replicas_with_priority[0].emplace_back(connection_string, pool_size);
-    }
 }
 
 PoolWithFailover::PoolWithFailover(
-        const std::string & database,
-        const RemoteDescription & addresses,
-        const std::string & user, const std::string & password,
+        const DB::StoragePostgreSQLConfiguration & configuration,
         size_t pool_size, size_t pool_wait_timeout_, size_t max_tries_)
     : pool_wait_timeout(pool_wait_timeout_)
     , max_tries(max_tries_)
@@ -73,11 +49,11 @@ PoolWithFailover::PoolWithFailover(
               pool_size, pool_wait_timeout, max_tries_);
 
     /// Replicas have the same priority, but traversed replicas are moved to the end of the queue.
-    for (const auto & [host, port] : addresses)
+    for (const auto & [host, port] : configuration.addresses)
     {
         LOG_DEBUG(&Poco::Logger::get("PostgreSQLPoolWithFailover"), "Adding address host: {}, port: {} to connection pool", host, port);
-        auto connection_string = formatConnectionString(database, host, port, user, password).first;
-        replicas_with_priority[0].emplace_back(connection_string, pool_size);
+        auto connection_string = formatConnectionString(configuration.database, host, port, configuration.username, configuration.password).first;
+        replicas_with_priority[0].emplace_back(connection_string, pool_size, getConnectionForLog(host, port));
     }
 }
 
@@ -85,6 +61,7 @@ ConnectionHolderPtr PoolWithFailover::get()
 {
     std::lock_guard lock(mutex);
 
+    DB::WriteBufferFromOwnString error_message;
     for (size_t try_idx = 0; try_idx < max_tries; ++try_idx)
     {
         for (auto & priority : replicas_with_priority)
@@ -115,6 +92,7 @@ ConnectionHolderPtr PoolWithFailover::get()
                 catch (const pqxx::broken_connection & pqxx_error)
                 {
                     LOG_ERROR(log, "Connection error: {}", pqxx_error.what());
+                    error_message << "Try " << try_idx + 1 << ". Connection to `" << replica.name_for_log << "` failed: " << pqxx_error.what() << "\n";
 
                     replica.pool->returnObject(std::move(connection));
                     continue;
@@ -136,7 +114,7 @@ ConnectionHolderPtr PoolWithFailover::get()
         }
     }
 
-    throw DB::Exception(DB::ErrorCodes::POSTGRESQL_CONNECTION_FAILURE, "Unable to connect to any of the replicas");
+    throw DB::Exception(DB::ErrorCodes::POSTGRESQL_CONNECTION_FAILURE, error_message.str());
 }
 }
 
diff --git a/src/Core/PostgreSQL/PoolWithFailover.h b/src/Core/PostgreSQL/PoolWithFailover.h
index 9150262e242..9d491625a0b 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.h
+++ b/src/Core/PostgreSQL/PoolWithFailover.h
@@ -11,6 +11,7 @@
 #include <mutex>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <common/logger_useful.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace postgres
@@ -27,17 +28,13 @@ public:
     static constexpr inline auto POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES = 5;
 
     PoolWithFailover(
-        const Poco::Util::AbstractConfiguration & config,
-        const std::string & config_prefix,
+        const DB::ExternalDataSourcesConfigurationByPriority & configurations_by_priority,
         size_t pool_size = POSTGRESQL_POOL_DEFAULT_SIZE,
         size_t pool_wait_timeout = POSTGRESQL_POOL_WAIT_TIMEOUT,
         size_t max_tries_ = POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
 
     PoolWithFailover(
-        const std::string & database,
-        const RemoteDescription & addresses,
-        const std::string & user,
-        const std::string & password,
+        const DB::StoragePostgreSQLConfiguration & configuration,
         size_t pool_size = POSTGRESQL_POOL_DEFAULT_SIZE,
         size_t pool_wait_timeout = POSTGRESQL_POOL_WAIT_TIMEOUT,
         size_t max_tries_ = POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
@@ -51,9 +48,10 @@ private:
     {
         String connection_string;
         PoolPtr pool;
+        String name_for_log;
 
-        PoolHolder(const String & connection_string_, size_t pool_size)
-            : connection_string(connection_string_), pool(std::make_shared<Pool>(pool_size)) {}
+        PoolHolder(const String & connection_string_, size_t pool_size, const String & name_for_log_)
+            : connection_string(connection_string_), pool(std::make_shared<Pool>(pool_size)), name_for_log(name_for_log_) {}
     };
 
     /// Highest priority is 0, the bigger the number in map, the less the priority
diff --git a/src/Core/PostgreSQL/Utils.cpp b/src/Core/PostgreSQL/Utils.cpp
index ebfdacd0fea..60b13218202 100644
--- a/src/Core/PostgreSQL/Utils.cpp
+++ b/src/Core/PostgreSQL/Utils.cpp
@@ -3,6 +3,7 @@
 #if USE_LIBPQXX
 
 #include <IO/Operators.h>
+#include <IO/WriteHelpers.h>
 
 namespace postgres
 {
@@ -19,6 +20,21 @@ ConnectionInfo formatConnectionString(String dbname, String host, UInt16 port, S
     return std::make_pair(out.str(), host + ':' + DB::toString(port));
 }
 
+String getConnectionForLog(const String & host, UInt16 port)
+{
+    return host + ":" + DB::toString(port);
+}
+
+String formatNameForLogs(const String & postgres_database_name, const String & postgres_table_name)
+{
+    /// Logger for StorageMaterializedPostgreSQL - both db and table names.
+    /// Logger for PostgreSQLReplicationHandler and Consumer - either both db and table names or only db name.
+    assert(!postgres_database_name.empty());
+    if (postgres_table_name.empty())
+        return postgres_database_name;
+    return postgres_database_name + '.' + postgres_table_name;
+}
+
 }
 
 #endif
diff --git a/src/Core/PostgreSQL/Utils.h b/src/Core/PostgreSQL/Utils.h
index 4a58fcffb9a..c80089d5741 100644
--- a/src/Core/PostgreSQL/Utils.h
+++ b/src/Core/PostgreSQL/Utils.h
@@ -19,7 +19,13 @@ namespace pqxx
 
 namespace postgres
 {
+
 ConnectionInfo formatConnectionString(String dbname, String host, UInt16 port, String user, String password);
+
+String getConnectionForLog(const String & host, UInt16 port);
+
+String formatNameForLogs(const String & postgres_database_name, const String & postgres_table_name);
+
 }
 
 #endif
diff --git a/src/Core/PostgreSQLProtocol.h b/src/Core/PostgreSQLProtocol.h
index aef0ed6ab25..2b92258394e 100644
--- a/src/Core/PostgreSQLProtocol.h
+++ b/src/Core/PostgreSQLProtocol.h
@@ -900,8 +900,7 @@ public:
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address)
     {
-        Authentication::Type user_auth_type = session.getAuthenticationType(user_name);
-
+        const Authentication::Type user_auth_type = session.getAuthenticationTypeOrLogInFailure(user_name);
         if (type_to_method.find(user_auth_type) != type_to_method.end())
         {
             type_to_method[user_auth_type]->authenticate(user_name, session, mt, address);
diff --git a/src/Core/QualifiedTableName.h b/src/Core/QualifiedTableName.h
index 453d55d85c7..c1cb9b27d15 100644
--- a/src/Core/QualifiedTableName.h
+++ b/src/Core/QualifiedTableName.h
@@ -2,11 +2,20 @@
 
 #include <string>
 #include <tuple>
+#include <optional>
+#include <Common/Exception.h>
 #include <Common/SipHash.h>
+#include <Common/quoteString.h>
+#include <fmt/format.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int SYNTAX_ERROR;
+}
+
 //TODO replace with StorageID
 struct QualifiedTableName
 {
@@ -30,6 +39,46 @@ struct QualifiedTableName
         hash_state.update(table.data(), table.size());
         return hash_state.get64();
     }
+
+    /// NOTE: It's different from compound identifier parsing and does not support escaping and dots in name.
+    /// Usually it's better to use ParserIdentifier instead,
+    /// but we parse DDL dictionary name (and similar things) this way for historical reasons.
+    static std::optional<QualifiedTableName> tryParseFromString(const String & maybe_qualified_name)
+    {
+        if (maybe_qualified_name.empty())
+            return {};
+
+        /// Do not allow dot at the beginning and at the end
+        auto pos = maybe_qualified_name.find('.');
+        if (pos == 0 || pos == (maybe_qualified_name.size() - 1))
+            return {};
+
+        QualifiedTableName name;
+        if (pos == std::string::npos)
+        {
+            name.table = std::move(maybe_qualified_name);
+        }
+        else if (maybe_qualified_name.find('.', pos + 1) != std::string::npos)
+        {
+            /// Do not allow multiple dots
+            return {};
+        }
+        else
+        {
+            name.database = maybe_qualified_name.substr(0, pos);
+            name.table = maybe_qualified_name.substr(pos + 1);
+        }
+
+        return name;
+    }
+
+    static QualifiedTableName parseFromString(const String & maybe_qualified_name)
+    {
+        auto name = tryParseFromString(maybe_qualified_name);
+        if (!name)
+            throw Exception(ErrorCodes::SYNTAX_ERROR, "Invalid qualified name: {}", maybe_qualified_name);
+        return *name;
+    }
 };
 
 }
@@ -47,5 +96,23 @@ template <> struct hash<DB::QualifiedTableName>
         return qualified_table.hash();
     }
 };
-
 }
+
+namespace fmt
+{
+    template <>
+    struct formatter<DB::QualifiedTableName>
+    {
+        constexpr auto parse(format_parse_context & ctx)
+        {
+            return ctx.begin();
+        }
+
+        template <typename FormatContext>
+        auto format(const DB::QualifiedTableName & name, FormatContext & ctx)
+        {
+            return format_to(ctx.out(), "{}.{}", DB::backQuoteIfNeed(name.database), DB::backQuoteIfNeed(name.table));
+        }
+    };
+}
+
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 887964bb233..a728ba636ad 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -48,7 +48,7 @@ class IColumn;
     M(MaxThreads, max_alter_threads, 0, "The maximum number of threads to execute the ALTER requests. By default, it is determined automatically.", 0) \
     M(UInt64, max_read_buffer_size, DBMS_DEFAULT_BUFFER_SIZE, "The maximum size of the buffer to read from the filesystem.", 0) \
     M(UInt64, max_distributed_connections, 1024, "The maximum number of connections for distributed processing of one query (should be greater than max_threads).", 0) \
-    M(UInt64, max_query_size, 262144, "Which part of the query can be read into RAM for parsing (the remaining data for INSERT, if any, is read later)", 0) \
+    M(UInt64, max_query_size, DBMS_DEFAULT_MAX_QUERY_SIZE, "Which part of the query can be read into RAM for parsing (the remaining data for INSERT, if any, is read later)", 0) \
     M(UInt64, interactive_delay, 100000, "The interval in microseconds to check if the request is cancelled, and to send progress info.", 0) \
     M(Seconds, connect_timeout, DBMS_DEFAULT_CONNECT_TIMEOUT_SEC, "Connection timeout if there are no replicas.", 0) \
     M(Milliseconds, connect_timeout_with_failover_ms, DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_MS, "Connection timeout for selecting first healthy replica.", 0) \
@@ -70,8 +70,8 @@ class IColumn;
     M(UInt64, idle_connection_timeout, 3600, "Close idle TCP connections after specified number of seconds.", 0) \
     M(UInt64, distributed_connections_pool_size, DBMS_DEFAULT_DISTRIBUTED_CONNECTIONS_POOL_SIZE, "Maximum number of connections with one remote server in the pool.", 0) \
     M(UInt64, connections_with_failover_max_tries, DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES, "The maximum number of attempts to connect to replicas.", 0) \
-    M(UInt64, s3_min_upload_part_size, 512*1024*1024, "The minimum size of part to upload during multipart upload to S3.", 0) \
-    M(UInt64, s3_max_single_part_upload_size, 64*1024*1024, "The maximum size of object to upload using singlepart upload to S3.", 0) \
+    M(UInt64, s3_min_upload_part_size, 32*1024*1024, "The minimum size of part to upload during multipart upload to S3.", 0) \
+    M(UInt64, s3_max_single_part_upload_size, 32*1024*1024, "The maximum size of object to upload using singlepart upload to S3.", 0) \
     M(UInt64, s3_max_single_read_retries, 4, "The maximum number of retries during single S3 read.", 0) \
     M(UInt64, s3_max_redirects, 10, "Max number of S3 redirects hops allowed.", 0) \
     M(UInt64, s3_max_connections, 1024, "The maximum number of connections per server.", 0) \
@@ -386,6 +386,7 @@ class IColumn;
     M(Bool, low_cardinality_allow_in_native_format, true, "Use LowCardinality type in Native format. Otherwise, convert LowCardinality columns to ordinary for select query, and convert ordinary columns to required LowCardinality for insert query.", 0) \
     M(Bool, cancel_http_readonly_queries_on_client_close, false, "Cancel HTTP readonly queries when a client closes the connection without waiting for response.", 0) \
     M(Bool, external_table_functions_use_nulls, true, "If it is set to true, external table functions will implicitly use Nullable type if needed. Otherwise NULLs will be substituted with default values. Currently supported only by 'mysql', 'postgresql' and 'odbc' table functions.", 0) \
+    M(Bool, external_table_strict_query, false, "If it is set to true, transforming expression to local filter is forbidden for queries to external tables.", 0) \
     \
     M(Bool, allow_hyperscan, true, "Allow functions that use Hyperscan library. Disable to avoid potentially long compilation times and excessive resource usage.", 0) \
     M(UInt64, max_hyperscan_regexp_length, 0, "Max length of regexp than can be used in hyperscan multi-match functions. Zero means unlimited.", 0) \
@@ -455,7 +456,7 @@ class IColumn;
     M(Bool, allow_non_metadata_alters, true, "Allow to execute alters which affects not only tables metadata, but also data on disk", 0) \
     M(Bool, enable_global_with_statement, true, "Propagate WITH statements to UNION queries and all subqueries", 0) \
     M(Bool, aggregate_functions_null_for_empty, false, "Rewrite all aggregate functions in a query, adding -OrNull suffix to them", 0) \
-    M(Bool, optimize_fuse_sum_count_avg, false, "Fuse aggregate functions sum(), avg(), count() with identical arguments into one sumCount() call, if the query has at least two different functions", 0) \
+    M(Bool, optimize_syntax_fuse_functions, false, "Fuse aggregate functions (`sum, avg, count` with identical arguments into one `sumCount`, quantile-family functions with the same argument into `quantiles*(...)[...]`)", 0) \
     M(Bool, flatten_nested, true, "If true, columns of type Nested will be flatten to separate array columns instead of one array of tuples", 0) \
     M(Bool, asterisk_include_materialized_columns, false, "Include MATERIALIZED columns for wildcard query", 0) \
     M(Bool, asterisk_include_alias_columns, false, "Include ALIAS columns for wildcard query", 0) \
@@ -466,6 +467,7 @@ class IColumn;
     M(Bool, force_optimize_projection, false, "If projection optimization is enabled, SELECT queries need to use projection", 0) \
     M(Bool, async_socket_for_remote, true, "Asynchronously read from socket executing remote query", 0) \
     M(Bool, insert_null_as_default, true, "Insert DEFAULT values instead of NULL in INSERT SELECT (UNION ALL)", 0) \
+    M(Bool, describe_include_subcolumns, false, "If true, subcolumns of all table columns will be included into result of DESCRIBE query", 0) \
     \
     M(Bool, optimize_rewrite_sum_if_to_count_if, true, "Rewrite sumIf() and sum(if()) function countIf() function when logically equivalent", 0) \
     M(UInt64, insert_shard_id, 0, "If non zero, when insert into a distributed table, the data will be inserted into the shard `insert_shard_id` synchronously. Possible values range from 1 to `shards_number` of corresponding distributed table", 0) \
@@ -499,13 +501,24 @@ class IColumn;
     M(UInt64, offset, 0, "Offset on read rows from the most 'end' result for select query", 0) \
     \
     M(UInt64, function_range_max_elements_in_block, 500000000, "Maximum number of values generated by function 'range' per block of data (sum of array sizes for every row in a block, see also 'max_block_size' and 'min_insert_block_size_rows'). It is a safety threshold.", 0) \
-    M(ShortCircuitFunctionEvaluation, short_circuit_function_evaluation, ShortCircuitFunctionEvaluation::ENABLE, "Setting for short-circuit function evaluation configuration. Possible values: 'enable', 'disable', 'force_enable'", 0) \
+    M(ShortCircuitFunctionEvaluation, short_circuit_function_evaluation, ShortCircuitFunctionEvaluation::ENABLE, "Setting for short-circuit function evaluation configuration. Possible values: 'enable' - use short-circuit function evaluation for functions that are suitable for it, 'disable' - disable short-circuit function evaluation, 'force_enable' - use short-circuit function evaluation for all functions.", 0) \
     \
     M(String, local_filesystem_read_method, "pread", "Method of reading data from local filesystem, one of: read, pread, mmap, pread_threadpool.", 0) \
     M(Bool, local_filesystem_read_prefetch, false, "Should use prefetching when reading data from local filesystem.", 0) \
     M(Bool, remote_filesystem_read_prefetch, true, "Should use prefetching when reading data from remote filesystem.", 0) \
     M(Int64, read_priority, 0, "Priority to read data from local filesystem. Only supported for 'pread_threadpool' method.", 0) \
     \
+    M(UInt64, async_insert_threads, 16, "Maximum number of threads to actually parse and insert data in background. Zero means asynchronous mode is disabled", 0) \
+    M(Bool, async_insert, false, "If true, data from INSERT query is stored in queue and later flushed to table in background. Makes sense only for inserts via HTTP protocol. If wait_for_async_insert is false, INSERT query is processed almost instantly, otherwise client will wait until data will be flushed to table", 0) \
+    M(Bool, wait_for_async_insert, true, "If true wait for processing of asynchronous insertion", 0) \
+    M(Seconds, wait_for_async_insert_timeout, DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC, "Timeout for waiting for processing asynchronous insertion", 0) \
+    M(UInt64, async_insert_max_data_size, 100000, "Maximum size in bytes of unparsed data collected per query before being inserted", 0) \
+    M(Milliseconds, async_insert_busy_timeout_ms, 200, "Maximum time to wait before dumping collected data per query since the first data appeared", 0) \
+    M(Milliseconds, async_insert_stale_timeout_ms, 0, "Maximum time to wait before dumping collected data per query since the last data appeared. Zero means no timeout at all", 0) \
+    \
+    M(Int64, remote_fs_read_backoff_threshold, 10000, "Max wait time when trying to read data for remote disk", 0) \
+    M(Int64, remote_fs_read_backoff_max_tries, 5, "Max attempts to read with backoff", 0) \
+    \
     /** Experimental functions */ \
     M(Bool, allow_experimental_funnel_functions, false, "Enable experimental functions for funnel analysis.", 0) \
     M(Bool, allow_experimental_nlp_functions, false, "Enable experimental functions for natural language processing.", 0) \
@@ -521,6 +534,7 @@ class IColumn;
     M(HandleKafkaErrorMode, handle_kafka_error_mode, HandleKafkaErrorMode::DEFAULT, "Obsolete setting, does nothing.", 0) \
     M(Bool, database_replicated_ddl_output, true, "Obsolete setting, does nothing.", 0) \
     M(UInt64, replication_alter_columns_timeout, 60, "Obsolete setting, does nothing.", 0) \
+    M(Bool, optimize_fuse_sum_count_avg, false, "Obsolete, use optimize_syntax_fuse_functions", 0) \
     /** The section above is for obsolete settings. Do not add anything there. */
 
 
@@ -573,6 +587,7 @@ class IColumn;
     M(String, output_format_avro_codec, "", "Compression codec used for output. Possible values: 'null', 'deflate', 'snappy'.", 0) \
     M(UInt64, output_format_avro_sync_interval, 16 * 1024, "Sync interval in bytes.", 0) \
     M(Bool, output_format_tsv_crlf_end_of_line, false, "If it is set true, end of line in TSV format will be \\r\\n instead of \\n.", 0) \
+    M(String, output_format_csv_null_representation, "\\N", "Custom NULL representation in CSV format", 0) \
     M(String, output_format_tsv_null_representation, "\\N", "Custom NULL representation in TSV format", 0) \
     M(Bool, output_format_decimal_trailing_zeros, false, "Output trailing zeros when printing Decimal values. E.g. 1.230000 instead of 1.23.", 0) \
     \
@@ -600,6 +615,7 @@ class IColumn;
     M(Bool, output_format_write_statistics, true, "Write statistics about read rows, bytes, time elapsed in suitable output formats.", 0) \
     M(Bool, output_format_pretty_row_numbers, false, "Add row numbers before each row for pretty output format", 0) \
     M(Bool, insert_distributed_one_random_shard, false, "If setting is enabled, inserting into distributed table will choose a random shard to write when there is no sharding key", 0) \
+    \
     M(Bool, cross_to_inner_join_rewrite, true, "Use inner join instead of comma/cross join if possible", 0) \
     \
     M(Bool, output_format_arrow_low_cardinality_as_dictionary, false, "Enable output LowCardinality type as Dictionary Arrow type", 0) \
diff --git a/src/Core/TypeId.h b/src/Core/TypeId.h
new file mode 100644
index 00000000000..3218db10778
--- /dev/null
+++ b/src/Core/TypeId.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include <Core/Types.h>
+
+namespace DB
+{
+/**
+ * Obtain TypeIndex value from real type if possible.
+ *
+ * Returns TypeIndex::Nothing if type was not present in TypeIndex;
+ * Returns TypeIndex element otherwise.
+ *
+ * @example TypeId<UInt8> == TypeIndex::UInt8
+ * @example TypeId<MySuperType> == TypeIndex::Nothing
+ */
+template <class T> inline constexpr TypeIndex TypeId = TypeIndex::Nothing;
+
+template <TypeIndex index> struct ReverseTypeIdT : std::false_type {};
+
+/**
+ * Obtain real type from TypeIndex if possible.
+ *
+ * Returns a type alias if is corresponds to TypeIndex value.
+ * Yields a compiler error otherwise.
+ *
+ * @example ReverseTypeId<TypeIndex::UInt8> == UInt8
+ */
+template <TypeIndex index> using ReverseTypeId = typename ReverseTypeIdT<index>::T;
+template <TypeIndex index> constexpr bool HasReverseTypeId = ReverseTypeIdT<index>::value;
+
+#define TYPEID_MAP(_A) \
+    template <> inline constexpr TypeIndex TypeId<_A> = TypeIndex::_A; \
+    template <> struct ReverseTypeIdT<TypeIndex::_A> : std::true_type { using T = _A; };
+
+TYPEID_MAP(UInt8)
+TYPEID_MAP(UInt16)
+TYPEID_MAP(UInt32)
+TYPEID_MAP(UInt64)
+TYPEID_MAP(UInt128)
+TYPEID_MAP(UInt256)
+TYPEID_MAP(Int8)
+TYPEID_MAP(Int16)
+TYPEID_MAP(Int32)
+TYPEID_MAP(Int64)
+TYPEID_MAP(Int128)
+TYPEID_MAP(Int256)
+TYPEID_MAP(Float32)
+TYPEID_MAP(Float64)
+TYPEID_MAP(UUID)
+
+TYPEID_MAP(Decimal32)
+TYPEID_MAP(Decimal64)
+TYPEID_MAP(Decimal128)
+TYPEID_MAP(Decimal256)
+TYPEID_MAP(DateTime64)
+
+TYPEID_MAP(String)
+
+struct Array;
+TYPEID_MAP(Array)
+}
diff --git a/src/Core/TypeName.h b/src/Core/TypeName.h
new file mode 100644
index 00000000000..1f2c9d8b3fe
--- /dev/null
+++ b/src/Core/TypeName.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <Core/Types.h>
+
+namespace DB
+{
+struct Array;
+struct Tuple;
+struct Map;
+struct AggregateFunctionStateData;
+
+template <class T> constexpr const char * TypeName = "";
+
+template <> inline constexpr const char * TypeName<UInt8> = "UInt8";
+template <> inline constexpr const char * TypeName<UInt16> = "UInt16";
+template <> inline constexpr const char * TypeName<UInt32> = "UInt32";
+template <> inline constexpr const char * TypeName<UInt64> = "UInt64";
+template <> inline constexpr const char * TypeName<UInt128> = "UInt128";
+template <> inline constexpr const char * TypeName<UInt256> = "UInt256";
+template <> inline constexpr const char * TypeName<Int8> = "Int8";
+template <> inline constexpr const char * TypeName<Int16> = "Int16";
+template <> inline constexpr const char * TypeName<Int32> = "Int32";
+template <> inline constexpr const char * TypeName<Int64> = "Int64";
+template <> inline constexpr const char * TypeName<Int128> = "Int128";
+template <> inline constexpr const char * TypeName<Int256> = "Int256";
+template <> inline constexpr const char * TypeName<Float32> = "Float32";
+template <> inline constexpr const char * TypeName<Float64> = "Float64";
+template <> inline constexpr const char * TypeName<String> = "String";
+template <> inline constexpr const char * TypeName<UUID> = "UUID";
+template <> inline constexpr const char * TypeName<Decimal32> = "Decimal32";
+template <> inline constexpr const char * TypeName<Decimal64> = "Decimal64";
+template <> inline constexpr const char * TypeName<Decimal128> = "Decimal128";
+template <> inline constexpr const char * TypeName<Decimal256> = "Decimal256";
+template <> inline constexpr const char * TypeName<DateTime64> = "DateTime64";
+template <> inline constexpr 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";
+}
diff --git a/src/Core/Types.h b/src/Core/Types.h
index e59173faf96..e3ff386fe53 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <common/strong_typedef.h>
-#include <common/extended_types.h>
+#include <common/Decimal.h>
 #include <common/defines.h>
 
 
@@ -99,254 +99,6 @@ using Int256 = ::Int256;
 
 STRONG_TYPEDEF(UInt128, UUID)
 
-
-template <typename T> constexpr const char * TypeName = "";
-
-template <> inline constexpr const char * TypeName<UInt8> = "UInt8";
-template <> inline constexpr const char * TypeName<UInt16> = "UInt16";
-template <> inline constexpr const char * TypeName<UInt32> = "UInt32";
-template <> inline constexpr const char * TypeName<UInt64> = "UInt64";
-template <> inline constexpr const char * TypeName<UInt128> = "UInt128";
-template <> inline constexpr const char * TypeName<UInt256> = "UInt256";
-template <> inline constexpr const char * TypeName<Int8> = "Int8";
-template <> inline constexpr const char * TypeName<Int16> = "Int16";
-template <> inline constexpr const char * TypeName<Int32> = "Int32";
-template <> inline constexpr const char * TypeName<Int64> = "Int64";
-template <> inline constexpr const char * TypeName<Int128> = "Int128";
-template <> inline constexpr const char * TypeName<Int256> = "Int256";
-template <> inline constexpr const char * TypeName<Float32> = "Float32";
-template <> inline constexpr const char * TypeName<Float64> = "Float64";
-template <> inline constexpr const char * TypeName<String> = "String";
-template <> inline constexpr const char * TypeName<UUID> = "UUID";
-
-/// TODO Try to remove it.
-template <typename T> constexpr TypeIndex TypeId = TypeIndex::Nothing;
-template <> inline constexpr TypeIndex TypeId<UInt8> = TypeIndex::UInt8;
-template <> inline constexpr TypeIndex TypeId<UInt16> = TypeIndex::UInt16;
-template <> inline constexpr TypeIndex TypeId<UInt32> = TypeIndex::UInt32;
-template <> inline constexpr TypeIndex TypeId<UInt64> = TypeIndex::UInt64;
-template <> inline constexpr TypeIndex TypeId<UInt128> = TypeIndex::UInt128;
-template <> inline constexpr TypeIndex TypeId<UInt256> = TypeIndex::UInt256;
-template <> inline constexpr TypeIndex TypeId<Int8> = TypeIndex::Int8;
-template <> inline constexpr TypeIndex TypeId<Int16> = TypeIndex::Int16;
-template <> inline constexpr TypeIndex TypeId<Int32> = TypeIndex::Int32;
-template <> inline constexpr TypeIndex TypeId<Int64> = TypeIndex::Int64;
-template <> inline constexpr TypeIndex TypeId<Int128> = TypeIndex::Int128;
-template <> inline constexpr TypeIndex TypeId<Int256> = TypeIndex::Int256;
-template <> inline constexpr TypeIndex TypeId<Float32> = TypeIndex::Float32;
-template <> inline constexpr TypeIndex TypeId<Float64> = TypeIndex::Float64;
-template <> inline constexpr TypeIndex TypeId<UUID> = TypeIndex::UUID;
-
-
 /// Not a data type in database, defined just for convenience.
 using Strings = std::vector<String>;
-
-/// Own FieldType for Decimal.
-/// It is only a "storage" for decimal. To perform operations, you also have to provide a scale (number of digits after point).
-template <typename T>
-struct Decimal
-{
-    using NativeType = T;
-
-    Decimal() = default;
-    Decimal(Decimal<T> &&) = default;
-    Decimal(const Decimal<T> &) = default;
-
-    Decimal(const T & value_)
-    :   value(value_)
-    {}
-
-    template <typename U>
-    Decimal(const Decimal<U> & x)
-    :   value(x.value)
-    {}
-
-    constexpr Decimal<T> & operator = (Decimal<T> &&) = default;
-    constexpr Decimal<T> & operator = (const Decimal<T> &) = default;
-
-    operator T () const { return value; }
-
-    template <typename U>
-    U convertTo() const
-    {
-        /// no IsDecimalNumber defined yet
-        if constexpr (std::is_same_v<U, Decimal<Int32>> ||
-                      std::is_same_v<U, Decimal<Int64>> ||
-                      std::is_same_v<U, Decimal<Int128>> ||
-                      std::is_same_v<U, Decimal<Int256>>)
-        {
-            return convertTo<typename U::NativeType>();
-        }
-        else
-            return static_cast<U>(value);
-    }
-
-    const Decimal<T> & operator += (const T & x) { value += x; return *this; }
-    const Decimal<T> & operator -= (const T & x) { value -= x; return *this; }
-    const Decimal<T> & operator *= (const T & x) { value *= x; return *this; }
-    const Decimal<T> & operator /= (const T & x) { value /= x; return *this; }
-    const Decimal<T> & operator %= (const T & x) { value %= x; return *this; }
-
-    template <typename U> const Decimal<T> & operator += (const Decimal<U> & x) { value += x.value; return *this; }
-    template <typename U> const Decimal<T> & operator -= (const Decimal<U> & x) { value -= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator *= (const Decimal<U> & x) { value *= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator /= (const Decimal<U> & x) { value /= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator %= (const Decimal<U> & x) { value %= x.value; return *this; }
-
-    /// This is to avoid UB for sumWithOverflow()
-    void NO_SANITIZE_UNDEFINED addOverflow(const T & x) { value += x; }
-
-    T value;
-};
-
-template <typename T> inline bool operator< (const Decimal<T> & x, const Decimal<T> & y) { return x.value < y.value; }
-template <typename T> inline bool operator> (const Decimal<T> & x, const Decimal<T> & y) { return x.value > y.value; }
-template <typename T> inline bool operator<= (const Decimal<T> & x, const Decimal<T> & y) { return x.value <= y.value; }
-template <typename T> inline bool operator>= (const Decimal<T> & x, const Decimal<T> & y) { return x.value >= y.value; }
-template <typename T> inline bool operator== (const Decimal<T> & x, const Decimal<T> & y) { return x.value == y.value; }
-template <typename T> inline bool operator!= (const Decimal<T> & x, const Decimal<T> & y) { return x.value != y.value; }
-
-template <typename T> inline Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y) { return x.value + y.value; }
-template <typename T> inline Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y) { return x.value - y.value; }
-template <typename T> inline Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y) { return x.value * y.value; }
-template <typename T> inline Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
-template <typename T> inline Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
-
-using Decimal32 = Decimal<Int32>;
-using Decimal64 = Decimal<Int64>;
-using Decimal128 = Decimal<Int128>;
-using Decimal256 = Decimal<Int256>;
-
-// Distinguishable type to allow function resolution/deduction based on value type,
-// but also relatively easy to convert to/from Decimal64.
-class DateTime64 : public Decimal64
-{
-public:
-    using Base = Decimal64;
-    using Base::Base;
-
-    DateTime64(const Base & v)
-        : Base(v)
-    {}
-};
-
-template <> inline constexpr const char * TypeName<Decimal32> = "Decimal32";
-template <> inline constexpr const char * TypeName<Decimal64> = "Decimal64";
-template <> inline constexpr const char * TypeName<Decimal128> = "Decimal128";
-template <> inline constexpr const char * TypeName<Decimal256> = "Decimal256";
-template <> inline constexpr const char * TypeName<DateTime64> = "DateTime64";
-
-template <> inline constexpr TypeIndex TypeId<Decimal32> = TypeIndex::Decimal32;
-template <> inline constexpr TypeIndex TypeId<Decimal64> = TypeIndex::Decimal64;
-template <> inline constexpr TypeIndex TypeId<Decimal128> = TypeIndex::Decimal128;
-template <> inline constexpr TypeIndex TypeId<Decimal256> = TypeIndex::Decimal256;
-template <> inline constexpr TypeIndex TypeId<DateTime64> = TypeIndex::DateTime64;
-
-template <typename T> constexpr bool IsDecimalNumber = false;
-template <> inline constexpr bool IsDecimalNumber<Decimal32> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal64> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal128> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal256> = true;
-template <> inline constexpr bool IsDecimalNumber<DateTime64> = true;
-
-template <typename T> struct NativeType { using Type = T; };
-template <> struct NativeType<Decimal32> { using Type = Int32; };
-template <> struct NativeType<Decimal64> { using Type = Int64; };
-template <> struct NativeType<Decimal128> { using Type = Int128; };
-template <> struct NativeType<Decimal256> { using Type = Int256; };
-template <> struct NativeType<DateTime64> { using Type = Int64; };
-
-template <typename T> constexpr bool OverBigInt = false;
-template <> inline constexpr bool OverBigInt<Int128> = true;
-template <> inline constexpr bool OverBigInt<UInt128> = true;
-template <> inline constexpr bool OverBigInt<Int256> = true;
-template <> inline constexpr bool OverBigInt<UInt256> = true;
-template <> inline constexpr bool OverBigInt<Decimal128> = true;
-template <> inline constexpr bool OverBigInt<Decimal256> = true;
-
-inline constexpr const char * getTypeName(TypeIndex idx)
-{
-    switch (idx)
-    {
-        case TypeIndex::Nothing:    return "Nothing";
-        case TypeIndex::UInt8:      return "UInt8";
-        case TypeIndex::UInt16:     return "UInt16";
-        case TypeIndex::UInt32:     return "UInt32";
-        case TypeIndex::UInt64:     return "UInt64";
-        case TypeIndex::UInt128:    return "UInt128";
-        case TypeIndex::UInt256:    return "UInt256";
-        case TypeIndex::Int8:       return "Int8";
-        case TypeIndex::Int16:      return "Int16";
-        case TypeIndex::Int32:      return "Int32";
-        case TypeIndex::Int64:      return "Int64";
-        case TypeIndex::Int128:     return "Int128";
-        case TypeIndex::Int256:     return "Int256";
-        case TypeIndex::Float32:    return "Float32";
-        case TypeIndex::Float64:    return "Float64";
-        case TypeIndex::Date:       return "Date";
-        case TypeIndex::Date32:     return "Date32";
-        case TypeIndex::DateTime:   return "DateTime";
-        case TypeIndex::DateTime64: return "DateTime64";
-        case TypeIndex::String:     return "String";
-        case TypeIndex::FixedString: return "FixedString";
-        case TypeIndex::Enum8:      return "Enum8";
-        case TypeIndex::Enum16:     return "Enum16";
-        case TypeIndex::Decimal32:  return "Decimal32";
-        case TypeIndex::Decimal64:  return "Decimal64";
-        case TypeIndex::Decimal128: return "Decimal128";
-        case TypeIndex::Decimal256: return "Decimal256";
-        case TypeIndex::UUID:       return "UUID";
-        case TypeIndex::Array:      return "Array";
-        case TypeIndex::Tuple:      return "Tuple";
-        case TypeIndex::Set:        return "Set";
-        case TypeIndex::Interval:   return "Interval";
-        case TypeIndex::Nullable:   return "Nullable";
-        case TypeIndex::Function:   return "Function";
-        case TypeIndex::AggregateFunction: return "AggregateFunction";
-        case TypeIndex::LowCardinality: return "LowCardinality";
-        case TypeIndex::Map:        return "Map";
-    }
-
-    __builtin_unreachable();
-}
-
-}
-
-/// Specialization of `std::hash` for the Decimal<T> types.
-namespace std
-{
-    template <typename T>
-    struct hash<DB::Decimal<T>> { size_t operator()(const DB::Decimal<T> & x) const { return hash<T>()(x.value); } };
-
-    template <>
-    struct hash<DB::Decimal128>
-    {
-        size_t operator()(const DB::Decimal128 & x) const
-        {
-            return std::hash<DB::Int64>()(x.value >> 64)
-                ^ std::hash<DB::Int64>()(x.value & std::numeric_limits<DB::UInt64>::max());
-        }
-    };
-
-    template <>
-    struct hash<DB::DateTime64>
-    {
-        size_t operator()(const DB::DateTime64 & x) const
-        {
-            return std::hash<std::decay_t<decltype(x)>::NativeType>()(x);
-        }
-    };
-
-
-    template <>
-    struct hash<DB::Decimal256>
-    {
-        size_t operator()(const DB::Decimal256 & x) const
-        {
-            // temp solution
-            static constexpr DB::UInt64 max_uint_mask = std::numeric_limits<DB::UInt64>::max();
-            return std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value >> 64 & max_uint_mask))
-                ^ std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value & max_uint_mask));
-        }
-    };
 }
diff --git a/src/Core/callOnTypeIndex.h b/src/Core/callOnTypeIndex.h
index d3348466369..2634578f325 100644
--- a/src/Core/callOnTypeIndex.h
+++ b/src/Core/callOnTypeIndex.h
@@ -164,7 +164,7 @@ class DataTypeDateTime;
 class DataTypeDateTime64;
 template <typename T> class DataTypeEnum;
 template <typename T> class DataTypeNumber;
-template <typename T> class DataTypeDecimal;
+template <is_decimal T> class DataTypeDecimal;
 
 
 template <typename T, typename F, typename... ExtraArgs>
diff --git a/src/Core/ya.make b/src/Core/ya.make
deleted file mode 100644
index 2362f88e5f6..00000000000
--- a/src/Core/ya.make
+++ /dev/null
@@ -1,51 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/sparsehash
-    contrib/restricted/boost/libs
-)
-
-
-SRCS(
-    BackgroundSchedulePool.cpp
-    BaseSettings.cpp
-    Block.cpp
-    BlockInfo.cpp
-    ColumnWithTypeAndName.cpp
-    ExternalResultDescription.cpp
-    ExternalTable.cpp
-    Field.cpp
-    MySQL/Authentication.cpp
-    MySQL/IMySQLReadPacket.cpp
-    MySQL/IMySQLWritePacket.cpp
-    MySQL/MySQLClient.cpp
-    MySQL/MySQLGtid.cpp
-    MySQL/MySQLReplication.cpp
-    MySQL/PacketEndpoint.cpp
-    MySQL/PacketsConnection.cpp
-    MySQL/PacketsGeneric.cpp
-    MySQL/PacketsProtocolText.cpp
-    MySQL/PacketsReplication.cpp
-    NamesAndTypes.cpp
-    PostgreSQL/Connection.cpp
-    PostgreSQL/PoolWithFailover.cpp
-    PostgreSQL/Utils.cpp
-    PostgreSQL/insertPostgreSQLValue.cpp
-    PostgreSQLProtocol.cpp
-    QueryProcessingStage.cpp
-    ServerUUID.cpp
-    Settings.cpp
-    SettingsEnums.cpp
-    SettingsFields.cpp
-    SettingsQuirks.cpp
-    SortDescription.cpp
-    UUID.cpp
-    iostream_debug_helpers.cpp
-
-)
-
-END()
diff --git a/src/Core/ya.make.in b/src/Core/ya.make.in
deleted file mode 100644
index 2938fb13e9a..00000000000
--- a/src/Core/ya.make.in
+++ /dev/null
@@ -1,16 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/sparsehash
-    contrib/restricted/boost/libs
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/DataStreams/CountingBlockOutputStream.h b/src/DataStreams/CountingBlockOutputStream.h
index c7247b39945..a5a624ccdd2 100644
--- a/src/DataStreams/CountingBlockOutputStream.h
+++ b/src/DataStreams/CountingBlockOutputStream.h
@@ -9,11 +9,10 @@ namespace DB
 
 
 /// Proxy class which counts number of written block, rows, bytes
-class CountingBlockOutputStream : public IBlockOutputStream
+class CountingBlockOutputStream final : public IBlockOutputStream
 {
 public:
-    CountingBlockOutputStream(const BlockOutputStreamPtr & stream_)
-        : stream(stream_) {}
+    explicit CountingBlockOutputStream(const BlockOutputStreamPtr & stream_) : stream(stream_) {}
 
     void setProgressCallback(const ProgressCallback & callback)
     {
diff --git a/src/DataStreams/IBlockInputStream.h b/src/DataStreams/IBlockInputStream.h
index 8b3e2512e47..0e77ba81779 100644
--- a/src/DataStreams/IBlockInputStream.h
+++ b/src/DataStreams/IBlockInputStream.h
@@ -37,7 +37,7 @@ class IBlockInputStream : public TypePromotion<IBlockInputStream>
 
 public:
     IBlockInputStream() { info.parent = this; }
-    virtual ~IBlockInputStream() {}
+    virtual ~IBlockInputStream() = default;
 
     IBlockInputStream(const IBlockInputStream &) = delete;
     IBlockInputStream & operator=(const IBlockInputStream &) = delete;
diff --git a/src/DataStreams/IBlockOutputStream.h b/src/DataStreams/IBlockOutputStream.h
index 79c13b6fa47..65ebd90769d 100644
--- a/src/DataStreams/IBlockOutputStream.h
+++ b/src/DataStreams/IBlockOutputStream.h
@@ -21,7 +21,7 @@ struct Progress;
 class IBlockOutputStream : private boost::noncopyable
 {
 public:
-    IBlockOutputStream() {}
+    IBlockOutputStream() = default;
 
     /** Get data structure of the stream in a form of "header" block (it is also called "sample block").
       * Header block contains column names, data types, columns of size 0. Constant columns must have corresponding values.
diff --git a/src/DataStreams/RemoteQueryExecutor.cpp b/src/DataStreams/RemoteQueryExecutor.cpp
index a64c4409cc9..3c78fddfd39 100644
--- a/src/DataStreams/RemoteQueryExecutor.cpp
+++ b/src/DataStreams/RemoteQueryExecutor.cpp
@@ -208,6 +208,12 @@ void RemoteQueryExecutor::sendQuery()
     auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
     ClientInfo modified_client_info = context->getClientInfo();
     modified_client_info.query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+    /// Set initial_query_id to query_id for the clickhouse-benchmark.
+    ///
+    /// (since first query of clickhouse-benchmark will be issued as SECONDARY_QUERY,
+    ///  due to it executes queries via RemoteBlockInputStream)
+    if (modified_client_info.initial_query_id.empty())
+        modified_client_info.initial_query_id = query_id;
     if (CurrentThread::isInitialized())
     {
         modified_client_info.client_trace_context = CurrentThread::get().thread_trace_context;
diff --git a/src/DataStreams/ShellCommandSource.h b/src/DataStreams/ShellCommandSource.h
index befdbc796ba..21d0acaf81a 100644
--- a/src/DataStreams/ShellCommandSource.h
+++ b/src/DataStreams/ShellCommandSource.h
@@ -52,14 +52,12 @@ public:
         const std::string & format,
         const Block & sample_block,
         std::unique_ptr<ShellCommand> && command_,
-        Poco::Logger * log_,
         std::vector<SendDataTask> && send_data_tasks = {},
         const ShellCommandSourceConfiguration & configuration_ = {},
         std::shared_ptr<ProcessPool> process_pool_ = nullptr)
         : SourceWithProgress(sample_block)
         , command(std::move(command_))
         , configuration(configuration_)
-        , log(log_)
         , process_pool(process_pool_)
     {
         for (auto && send_data_task : send_data_tasks)
@@ -133,7 +131,6 @@ protected:
         }
         catch (...)
         {
-            tryLogCurrentException(log);
             command = nullptr;
             throw;
         }
@@ -176,8 +173,6 @@ private:
 
     size_t current_read_rows = 0;
 
-    Poco::Logger * log;
-
     std::shared_ptr<ProcessPool> process_pool;
 
     QueryPipeline pipeline;
diff --git a/src/DataStreams/ya.make b/src/DataStreams/ya.make
deleted file mode 100644
index 7f16e2360c9..00000000000
--- a/src/DataStreams/ya.make
+++ /dev/null
@@ -1,59 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/MongoDB
-    contrib/restricted/boost/libs
-)
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-    AddingDefaultBlockOutputStream.cpp
-    AsynchronousBlockInputStream.cpp
-    BlockIO.cpp
-    BlockStreamProfileInfo.cpp
-    CheckConstraintsBlockOutputStream.cpp
-    ColumnGathererStream.cpp
-    ConnectionCollector.cpp
-    ConvertingBlockInputStream.cpp
-    CountingBlockOutputStream.cpp
-    DistinctSortedBlockInputStream.cpp
-    ExecutionSpeedLimits.cpp
-    ExpressionBlockInputStream.cpp
-    IBlockInputStream.cpp
-    ITTLAlgorithm.cpp
-    InternalTextLogsRowOutputStream.cpp
-    MaterializingBlockInputStream.cpp
-    MongoDBSource.cpp
-    NativeBlockInputStream.cpp
-    NativeBlockOutputStream.cpp
-    PushingToViewsBlockOutputStream.cpp
-    RemoteBlockInputStream.cpp
-    RemoteBlockOutputStream.cpp
-    RemoteQueryExecutor.cpp
-    RemoteQueryExecutorReadContext.cpp
-    SQLiteSource.cpp
-    SizeLimits.cpp
-    SquashingBlockInputStream.cpp
-    SquashingBlockOutputStream.cpp
-    SquashingTransform.cpp
-    TTLAggregationAlgorithm.cpp
-    TTLBlockInputStream.cpp
-    TTLCalcInputStream.cpp
-    TTLColumnAlgorithm.cpp
-    TTLDeleteAlgorithm.cpp
-    TTLUpdateInfoAlgorithm.cpp
-    copyData.cpp
-    finalizeBlock.cpp
-    formatBlock.cpp
-    materializeBlock.cpp
-    narrowBlockInputStreams.cpp
-
-)
-
-END()
diff --git a/src/DataStreams/ya.make.in b/src/DataStreams/ya.make.in
deleted file mode 100644
index 6969f644307..00000000000
--- a/src/DataStreams/ya.make.in
+++ /dev/null
@@ -1,18 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/MongoDB
-    contrib/restricted/boost/libs
-)
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -P 'tests|PostgreSQL' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/DataTypes/DataTypeDecimalBase.cpp b/src/DataTypes/DataTypeDecimalBase.cpp
index 683710b8880..f4c28088c48 100644
--- a/src/DataTypes/DataTypeDecimalBase.cpp
+++ b/src/DataTypes/DataTypeDecimalBase.cpp
@@ -28,19 +28,19 @@ bool decimalCheckArithmeticOverflow(ContextPtr context)
     return context->getSettingsRef().decimal_check_overflow;
 }
 
-template <typename T>
+template <is_decimal T>
 Field DataTypeDecimalBase<T>::getDefault() const
 {
     return DecimalField(T(0), scale);
 }
 
-template <typename T>
+template <is_decimal T>
 MutableColumnPtr DataTypeDecimalBase<T>::createColumn() const
 {
     return ColumnType::create(0, scale);
 }
 
-template <typename T>
+template <is_decimal T>
 T DataTypeDecimalBase<T>::getScaleMultiplier(UInt32 scale_)
 {
     return DecimalUtils::scaleMultiplier<typename T::NativeType>(scale_);
diff --git a/src/DataTypes/DataTypeDecimalBase.h b/src/DataTypes/DataTypeDecimalBase.h
index aea837f890f..c0585095eeb 100644
--- a/src/DataTypes/DataTypeDecimalBase.h
+++ b/src/DataTypes/DataTypeDecimalBase.h
@@ -53,11 +53,9 @@ inline UInt32 leastDecimalPrecisionFor(TypeIndex int_type)
 /// Operation between two decimals leads to Decimal(P, S), where
 ///     P is one of (9, 18, 38, 76); equals to the maximum precision for the biggest underlying type of operands.
 ///     S is maximum scale of operands. The allowed valuas are [0, precision]
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimalBase : public IDataType
 {
-    static_assert(IsDecimalNumber<T>);
-
 public:
     using FieldType = T;
     using ColumnType = ColumnDecimal<T>;
diff --git a/src/DataTypes/DataTypeEnum.cpp b/src/DataTypes/DataTypeEnum.cpp
index 89fc2b0c0fd..c86dd9d0b33 100644
--- a/src/DataTypes/DataTypeEnum.cpp
+++ b/src/DataTypes/DataTypeEnum.cpp
@@ -134,7 +134,8 @@ Field DataTypeEnum<Type>::castToName(const Field & value_or_name) const
         return this->getNameForValue(static_cast<Type>(value)).toString();
     }
     else
-        throw Exception(String("DataTypeEnum: Unsupported type of field ") + value_or_name.getTypeName(), ErrorCodes::BAD_TYPE_OF_FIELD);
+        throw Exception(ErrorCodes::BAD_TYPE_OF_FIELD,
+            "DataTypeEnum: Unsupported type of field {}", value_or_name.getTypeName());
 }
 
 template <typename Type>
@@ -153,7 +154,8 @@ Field DataTypeEnum<Type>::castToValue(const Field & value_or_name) const
         return value;
     }
     else
-        throw Exception(String("DataTypeEnum: Unsupported type of field ") + value_or_name.getTypeName(), ErrorCodes::BAD_TYPE_OF_FIELD);
+        throw Exception(ErrorCodes::BAD_TYPE_OF_FIELD,
+            "DataTypeEnum: Unsupported type of field {}", value_or_name.getTypeName());
 }
 
 
diff --git a/src/DataTypes/DataTypeInterval.h b/src/DataTypes/DataTypeInterval.h
index a44fd686b61..9ef6237ec41 100644
--- a/src/DataTypes/DataTypeInterval.h
+++ b/src/DataTypes/DataTypeInterval.h
@@ -27,7 +27,7 @@ public:
 
     DataTypeInterval(IntervalKind kind_) : kind(kind_) {}
 
-    std::string doGetName() const override { return std::string("Interval") + kind.toString(); }
+    std::string doGetName() const override { return fmt::format("Interval{}", kind.toString()); }
     const char * getFamilyName() const override { return "Interval"; }
     TypeIndex getTypeId() const override { return TypeIndex::Interval; }
 
diff --git a/src/DataTypes/DataTypeNumberBase.cpp b/src/DataTypes/DataTypeNumberBase.cpp
index 12d1989a9d6..a73d591654a 100644
--- a/src/DataTypes/DataTypeNumberBase.cpp
+++ b/src/DataTypes/DataTypeNumberBase.cpp
@@ -28,13 +28,13 @@ MutableColumnPtr DataTypeNumberBase<T>::createColumn() const
 template <typename T>
 bool DataTypeNumberBase<T>::isValueRepresentedByInteger() const
 {
-    return is_integer_v<T>;
+    return is_integer<T>;
 }
 
 template <typename T>
 bool DataTypeNumberBase<T>::isValueRepresentedByUnsignedInteger() const
 {
-    return is_integer_v<T> && is_unsigned_v<T>;
+    return is_integer<T> && is_unsigned_v<T>;
 }
 
 
diff --git a/src/DataTypes/DataTypesDecimal.cpp b/src/DataTypes/DataTypesDecimal.cpp
index cecfcea8dac..9f7320197c8 100644
--- a/src/DataTypes/DataTypesDecimal.cpp
+++ b/src/DataTypes/DataTypesDecimal.cpp
@@ -25,14 +25,14 @@ namespace ErrorCodes
 }
 
 
-template <typename T>
+template <is_decimal T>
 std::string DataTypeDecimal<T>::doGetName() const
 {
     return fmt::format("Decimal({}, {})", this->precision, this->scale);
 }
 
 
-template <typename T>
+template <is_decimal T>
 bool DataTypeDecimal<T>::equals(const IDataType & rhs) const
 {
     if (auto * ptype = typeid_cast<const DataTypeDecimal<T> *>(&rhs))
@@ -40,14 +40,14 @@ bool DataTypeDecimal<T>::equals(const IDataType & rhs) const
     return false;
 }
 
-template <typename T>
+template <is_decimal T>
 DataTypePtr DataTypeDecimal<T>::promoteNumericType() const
 {
     using PromotedType = DataTypeDecimal<Decimal128>;
     return std::make_shared<PromotedType>(PromotedType::maxPrecision(), this->scale);
 }
 
-template <typename T>
+template <is_decimal T>
 T DataTypeDecimal<T>::parseFromString(const String & str) const
 {
     ReadBufferFromMemory buf(str.data(), str.size());
@@ -61,7 +61,7 @@ T DataTypeDecimal<T>::parseFromString(const String & str) const
     return x;
 }
 
-template <typename T>
+template <is_decimal T>
 SerializationPtr DataTypeDecimal<T>::doGetDefaultSerialization() const
 {
     return std::make_shared<SerializationDecimal<T>>(this->precision, this->scale);
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index f08bdb80d41..7352ba4d8a5 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -24,11 +24,10 @@ namespace ErrorCodes
 /// Operation between two decimals leads to Decimal(P, S), where
 ///     P is one of (9, 18, 38, 76); equals to the maximum precision for the biggest underlying type of operands.
 ///     S is maximum scale of operands. The allowed valuas are [0, precision]
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimal final : public DataTypeDecimalBase<T>
 {
     using Base = DataTypeDecimalBase<T>;
-    static_assert(IsDecimalNumber<T>);
 
 public:
     using typename Base::FieldType;
@@ -48,6 +47,11 @@ public:
     SerializationPtr doGetDefaultSerialization() const override;
 };
 
+using DataTypeDecimal32 = DataTypeDecimal<Decimal32>;
+using DataTypeDecimal64 = DataTypeDecimal<Decimal64>;
+using DataTypeDecimal128 = DataTypeDecimal<Decimal128>;
+using DataTypeDecimal256 = DataTypeDecimal<Decimal256>;
+
 template <typename T>
 inline const DataTypeDecimal<T> * checkDecimal(const IDataType & data_type)
 {
diff --git a/src/DataTypes/IDataType.cpp b/src/DataTypes/IDataType.cpp
index 4b727a49861..93bb1757a4d 100644
--- a/src/DataTypes/IDataType.cpp
+++ b/src/DataTypes/IDataType.cpp
@@ -87,23 +87,38 @@ ColumnPtr IDataType::getSubcolumn(const String & subcolumn_name, const IColumn &
     throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
 }
 
-Names IDataType::getSubcolumnNames() const
+void IDataType::forEachSubcolumn(const SubcolumnCallback & callback) const
 {
-    NameSet res;
-    getDefaultSerialization()->enumerateStreams([&res, this](const ISerialization::SubstreamPath & substream_path)
+    NameSet set;
+    getDefaultSerialization()->enumerateStreams([&, this](const ISerialization::SubstreamPath & substream_path)
     {
         ISerialization::SubstreamPath new_path;
         /// Iterate over path to try to get intermediate subcolumns for complex nested types.
         for (const auto & elem : substream_path)
         {
             new_path.push_back(elem);
-            auto subcolumn_name = ISerialization::getSubcolumnNameForStream(new_path);
-            if (!subcolumn_name.empty() && tryGetSubcolumnType(subcolumn_name))
-                res.insert(subcolumn_name);
+            auto name = ISerialization::getSubcolumnNameForStream(new_path);
+            auto type = tryGetSubcolumnType(name);
+
+            /// Subcolumn names may repeat among several substream paths.
+            if (!name.empty() && type && !set.count(name))
+            {
+                callback(name, type, substream_path);
+                set.insert(name);
+            }
         }
     });
+}
 
-    return Names(std::make_move_iterator(res.begin()), std::make_move_iterator(res.end()));
+Names IDataType::getSubcolumnNames() const
+{
+    Names res;
+    forEachSubcolumn([&](const auto & name, const auto &, const auto &)
+    {
+        res.push_back(name);
+    });
+
+    return res;
 }
 
 void IDataType::insertDefaultInto(IColumn & column) const
@@ -145,7 +160,7 @@ SerializationPtr IDataType::getSerialization(const NameAndTypePair & column, con
             return subcolumn_type.getSerialization(column.name, callback);
         };
 
-        auto type_in_storage = column.getTypeInStorage();
+        const auto & type_in_storage = column.getTypeInStorage();
         return type_in_storage->getSubcolumnSerialization(column.getSubcolumnName(), base_serialization_getter);
     }
 
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index 9d943769c0a..360bf9f16e0 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -4,7 +4,7 @@
 #include <Common/COW.h>
 #include <boost/noncopyable.hpp>
 #include <Core/Names.h>
-#include <Core/Types.h>
+#include <Core/TypeId.h>
 #include <DataTypes/DataTypeCustom.h>
 
 
@@ -80,6 +80,9 @@ public:
     virtual DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const;
     DataTypePtr getSubcolumnType(const String & subcolumn_name) const;
     virtual ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const;
+
+    using SubcolumnCallback = std::function<void(const String &, const DataTypePtr &, const ISerialization::SubstreamPath &)>;
+    void forEachSubcolumn(const SubcolumnCallback & callback) const;
     Names getSubcolumnNames() const;
 
     /// Returns default serialization of data type.
@@ -384,6 +387,12 @@ inline bool isUInt8(const T & data_type)
     return WhichDataType(data_type).isUInt8();
 }
 
+template <typename T>
+inline bool isUInt64(const T & data_type)
+{
+    return WhichDataType(data_type).isUInt64();
+}
+
 template <typename T>
 inline bool isUnsignedInteger(const T & data_type)
 {
@@ -490,7 +499,7 @@ template <typename DataType> constexpr bool IsDataTypeDateOrDateTime = false;
 
 template <typename DataType> constexpr bool IsDataTypeDecimalOrNumber = IsDataTypeDecimal<DataType> || IsDataTypeNumber<DataType>;
 
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimal;
 
 template <typename T>
@@ -501,7 +510,7 @@ class DataTypeDate32;
 class DataTypeDateTime;
 class DataTypeDateTime64;
 
-template <typename T> constexpr bool IsDataTypeDecimal<DataTypeDecimal<T>> = true;
+template <is_decimal T> constexpr bool IsDataTypeDecimal<DataTypeDecimal<T>> = true;
 template <> inline constexpr bool IsDataTypeDecimal<DataTypeDateTime64> = true;
 
 template <typename T> constexpr bool IsDataTypeNumber<DataTypeNumber<T>> = true;
diff --git a/src/DataTypes/NumberTraits.h b/src/DataTypes/NumberTraits.h
index 3216149c647..e63c5bcdcb7 100644
--- a/src/DataTypes/NumberTraits.h
+++ b/src/DataTypes/NumberTraits.h
@@ -172,14 +172,14 @@ template <typename A, typename B>
 struct ResultOfIf
 {
     static constexpr bool has_float = std::is_floating_point_v<A> || std::is_floating_point_v<B>;
-    static constexpr bool has_integer = is_integer_v<A> || is_integer_v<B>;
+    static constexpr bool has_integer = is_integer<A> || is_integer<B>;
     static constexpr bool has_signed = is_signed_v<A> || is_signed_v<B>;
     static constexpr bool has_unsigned = !is_signed_v<A> || !is_signed_v<B>;
     static constexpr bool has_big_int = is_big_int_v<A> || is_big_int_v<B>;
 
     static constexpr size_t max_size_of_unsigned_integer = max(is_signed_v<A> ? 0 : sizeof(A), is_signed_v<B> ? 0 : sizeof(B));
     static constexpr size_t max_size_of_signed_integer = max(is_signed_v<A> ? sizeof(A) : 0, is_signed_v<B> ? sizeof(B) : 0);
-    static constexpr size_t max_size_of_integer = max(is_integer_v<A> ? sizeof(A) : 0, is_integer_v<B> ? sizeof(B) : 0);
+    static constexpr size_t max_size_of_integer = max(is_integer<A> ? sizeof(A) : 0, is_integer<B> ? sizeof(B) : 0);
     static constexpr size_t max_size_of_float = max(std::is_floating_point_v<A> ? sizeof(A) : 0, std::is_floating_point_v<B> ? sizeof(B) : 0);
 
     using ConstructedType = typename Construct<has_signed, has_float,
@@ -190,9 +190,9 @@ struct ResultOfIf
 
     using Type =
         std::conditional_t<std::is_same_v<A, B>, A,
-        std::conditional_t<IsDecimalNumber<A> && IsDecimalNumber<B>,
+        std::conditional_t<is_decimal<A> && is_decimal<B>,
             std::conditional_t<(sizeof(A) > sizeof(B)), A, B>,
-        std::conditional_t<!IsDecimalNumber<A> && !IsDecimalNumber<B>,
+        std::conditional_t<!is_decimal<A> && !is_decimal<B>,
             ConstructedType, Error>>>;
 };
 
diff --git a/src/DataTypes/Serializations/SerializationNullable.cpp b/src/DataTypes/Serializations/SerializationNullable.cpp
index 4de2b08c043..b607d5871d6 100644
--- a/src/DataTypes/Serializations/SerializationNullable.cpp
+++ b/src/DataTypes/Serializations/SerializationNullable.cpp
@@ -327,7 +327,7 @@ void SerializationNullable::serializeTextCSV(const IColumn & column, size_t row_
     const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
 
     if (col.isNullAt(row_num))
-        writeCString("\\N", ostr);
+        writeString(settings.csv.null_representation, ostr);
     else
         nested->serializeTextCSV(col.getNestedColumn(), row_num, ostr, settings);
 }
diff --git a/src/DataTypes/Serializations/SerializationNumber.cpp b/src/DataTypes/Serializations/SerializationNumber.cpp
index 347db5d0aa5..7e8e99f76d0 100644
--- a/src/DataTypes/Serializations/SerializationNumber.cpp
+++ b/src/DataTypes/Serializations/SerializationNumber.cpp
@@ -25,7 +25,7 @@ void SerializationNumber<T>::deserializeText(IColumn & column, ReadBuffer & istr
 {
     T x;
 
-    if constexpr (is_integer_v<T> && is_arithmetic_v<T>)
+    if constexpr (is_integer<T> && is_arithmetic_v<T>)
         readIntTextUnsafe(x, istr);
     else
         readText(x, istr);
diff --git a/src/DataTypes/registerDataTypeDateTime.cpp b/src/DataTypes/registerDataTypeDateTime.cpp
index 815948c6531..6d5f6c42799 100644
--- a/src/DataTypes/registerDataTypeDateTime.cpp
+++ b/src/DataTypes/registerDataTypeDateTime.cpp
@@ -26,10 +26,8 @@ String getExceptionMessage(
     const String & message, size_t argument_index, const char * argument_name,
     const std::string & context_data_type_name, Field::Types::Which field_type)
 {
-    return std::string("Parameter #") + std::to_string(argument_index) + " '"
-           + argument_name + "' for " + context_data_type_name
-           + message
-           + ", expected: " + Field::Types::toString(field_type) + " literal.";
+    return fmt::format("Parameter #{} '{}' for {}{}, expected {} literal",
+        argument_index, argument_name, context_data_type_name, message, field_type);
 }
 
 template <typename T, ArgumentKind Kind>
@@ -49,7 +47,7 @@ getArgument(const ASTPtr & arguments, size_t argument_index, const char * argume
         else
         {
             if (argument && argument->value.getType() != field_type)
-                throw Exception(getExceptionMessage(String(" has wrong type: ") + argument->value.getTypeName(),
+                throw Exception(getExceptionMessage(fmt::format(" has wrong type: {}", argument->value.getTypeName()),
                     argument_index, argument_name, context_data_type_name, field_type), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
             else
                 throw Exception(getExceptionMessage(" is missing", argument_index, argument_name, context_data_type_name, field_type),
diff --git a/src/DataTypes/ya.make b/src/DataTypes/ya.make
deleted file mode 100644
index ab34e467795..00000000000
--- a/src/DataTypes/ya.make
+++ /dev/null
@@ -1,74 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    clickhouse/src/Formats
-)
-
-
-SRCS(
-    DataTypeAggregateFunction.cpp
-    DataTypeArray.cpp
-    DataTypeCustomGeo.cpp
-    DataTypeCustomIPv4AndIPv6.cpp
-    DataTypeCustomSimpleAggregateFunction.cpp
-    DataTypeDate.cpp
-    DataTypeDate32.cpp
-    DataTypeDateTime.cpp
-    DataTypeDateTime64.cpp
-    DataTypeDecimalBase.cpp
-    DataTypeEnum.cpp
-    DataTypeFactory.cpp
-    DataTypeFixedString.cpp
-    DataTypeFunction.cpp
-    DataTypeInterval.cpp
-    DataTypeLowCardinality.cpp
-    DataTypeLowCardinalityHelpers.cpp
-    DataTypeMap.cpp
-    DataTypeNested.cpp
-    DataTypeNothing.cpp
-    DataTypeNullable.cpp
-    DataTypeNumberBase.cpp
-    DataTypeString.cpp
-    DataTypeTuple.cpp
-    DataTypeUUID.cpp
-    DataTypesDecimal.cpp
-    DataTypesNumber.cpp
-    EnumValues.cpp
-    FieldToDataType.cpp
-    IDataType.cpp
-    NestedUtils.cpp
-    Serializations/ISerialization.cpp
-    Serializations/SerializationAggregateFunction.cpp
-    Serializations/SerializationArray.cpp
-    Serializations/SerializationCustomSimpleText.cpp
-    Serializations/SerializationDate.cpp
-    Serializations/SerializationDate32.cpp
-    Serializations/SerializationDateTime.cpp
-    Serializations/SerializationDateTime64.cpp
-    Serializations/SerializationDecimal.cpp
-    Serializations/SerializationDecimalBase.cpp
-    Serializations/SerializationEnum.cpp
-    Serializations/SerializationFixedString.cpp
-    Serializations/SerializationIP.cpp
-    Serializations/SerializationLowCardinality.cpp
-    Serializations/SerializationMap.cpp
-    Serializations/SerializationNothing.cpp
-    Serializations/SerializationNullable.cpp
-    Serializations/SerializationNumber.cpp
-    Serializations/SerializationString.cpp
-    Serializations/SerializationTuple.cpp
-    Serializations/SerializationTupleElement.cpp
-    Serializations/SerializationUUID.cpp
-    Serializations/SerializationWrapper.cpp
-    convertMySQLDataType.cpp
-    getLeastSupertype.cpp
-    getMostSubtype.cpp
-    registerDataTypeDateTime.cpp
-
-)
-
-END()
diff --git a/src/DataTypes/ya.make.in b/src/DataTypes/ya.make.in
deleted file mode 100644
index 91a24812170..00000000000
--- a/src/DataTypes/ya.make.in
+++ /dev/null
@@ -1,15 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    clickhouse/src/Formats
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Databases/DDLDependencyVisitor.cpp b/src/Databases/DDLDependencyVisitor.cpp
new file mode 100644
index 00000000000..0399ec59b16
--- /dev/null
+++ b/src/Databases/DDLDependencyVisitor.cpp
@@ -0,0 +1,103 @@
+#include <Databases/DDLDependencyVisitor.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Dictionaries/getDictionaryConfigurationFromAST.h>
+#include <Poco/String.h>
+
+namespace DB
+{
+
+void DDLDependencyVisitor::visit(const ASTPtr & ast, Data & data)
+{
+    /// Looking for functions in column default expressions and dictionary source definition
+    if (const auto * function = ast->as<ASTFunction>())
+        visit(*function, data);
+    else if (const auto * dict_source = ast->as<ASTFunctionWithKeyValueArguments>())
+        visit(*dict_source, data);
+}
+
+bool DDLDependencyVisitor::needChildVisit(const ASTPtr & node, const ASTPtr & /*child*/)
+{
+    return !node->as<ASTStorage>();
+}
+
+void DDLDependencyVisitor::visit(const ASTFunction & function, Data & data)
+{
+    if (function.name == "joinGet" ||
+        function.name == "dictHas" ||
+        function.name == "dictIsIn" ||
+        function.name.starts_with("dictGet"))
+    {
+        extractTableNameFromArgument(function, data, 0);
+    }
+    else if (Poco::toLower(function.name) == "in")
+    {
+        extractTableNameFromArgument(function, data, 1);
+    }
+
+}
+
+void DDLDependencyVisitor::visit(const ASTFunctionWithKeyValueArguments & dict_source, Data & data)
+{
+    if (dict_source.name != "clickhouse")
+        return;
+    if (!dict_source.elements)
+        return;
+
+    auto config = getDictionaryConfigurationFromAST(data.create_query->as<ASTCreateQuery &>(), data.global_context);
+    auto info = getInfoIfClickHouseDictionarySource(config, data.global_context);
+
+    if (!info || !info->is_local)
+        return;
+
+    if (info->table_name.database.empty())
+        info->table_name.database = data.default_database;
+    data.dependencies.emplace(std::move(info->table_name));
+}
+
+
+void DDLDependencyVisitor::extractTableNameFromArgument(const ASTFunction & function, Data & data, size_t arg_idx)
+{
+    /// Just ignore incorrect arguments, proper exception will be thrown later
+    if (!function.arguments || function.arguments->children.size() <= arg_idx)
+        return;
+
+    QualifiedTableName qualified_name;
+
+    const auto * arg = function.arguments->as<ASTExpressionList>()->children[arg_idx].get();
+    if (const auto * literal = arg->as<ASTLiteral>())
+    {
+        if (literal->value.getType() != Field::Types::String)
+            return;
+
+        auto maybe_qualified_name = QualifiedTableName::tryParseFromString(literal->value.get<String>());
+        /// Just return if name if invalid
+        if (!maybe_qualified_name)
+            return;
+
+        qualified_name = std::move(*maybe_qualified_name);
+    }
+    else if (const auto * identifier = arg->as<ASTIdentifier>())
+    {
+        auto table_identifier = identifier->createTable();
+        /// Just return if table identified is invalid
+        if (!table_identifier)
+            return;
+
+        qualified_name.database = table_identifier->getDatabaseName();
+        qualified_name.table = table_identifier->shortName();
+    }
+    else
+    {
+        assert(false);
+        return;
+    }
+
+    if (qualified_name.database.empty())
+        qualified_name.database = data.default_database;
+    data.dependencies.emplace(std::move(qualified_name));
+}
+
+}
diff --git a/src/Databases/DDLDependencyVisitor.h b/src/Databases/DDLDependencyVisitor.h
new file mode 100644
index 00000000000..c0b39d70b08
--- /dev/null
+++ b/src/Databases/DDLDependencyVisitor.h
@@ -0,0 +1,42 @@
+#pragma once
+#include <Core/QualifiedTableName.h>
+#include <Parsers/IAST_fwd.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+namespace DB
+{
+
+class ASTFunction;
+class ASTFunctionWithKeyValueArguments;
+
+/// Visits ASTCreateQuery and extracts names of table (or dictionary) dependencies
+/// from column default expressions (joinGet, dictGet, etc)
+/// or dictionary source (for dictionaries from local ClickHouse table).
+/// Does not validate AST, works a best-effort way.
+class DDLDependencyVisitor
+{
+public:
+    struct Data
+    {
+        using TableNamesSet = std::set<QualifiedTableName>;
+        String default_database;
+        TableNamesSet dependencies;
+        ContextPtr global_context;
+        ASTPtr create_query;
+    };
+
+    using Visitor = ConstInDepthNodeVisitor<DDLDependencyVisitor, true>;
+
+    static void visit(const ASTPtr & ast, Data & data);
+    static bool needChildVisit(const ASTPtr & node, const ASTPtr & child);
+
+private:
+    static void visit(const ASTFunction & function, Data & data);
+    static void visit(const ASTFunctionWithKeyValueArguments & dict_source, Data & data);
+
+    static void extractTableNameFromArgument(const ASTFunction & function, Data & data, size_t arg_idx);
+};
+
+using TableLoadingDependenciesVisitor = DDLDependencyVisitor::Visitor;
+
+}
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index 2dbcd652004..5c75f6f1036 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -416,40 +416,49 @@ UUID DatabaseAtomic::tryGetTableUUID(const String & table_name) const
     return UUIDHelpers::Nil;
 }
 
-void DatabaseAtomic::loadStoredObjects(
-    ContextMutablePtr local_context, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables)
+void DatabaseAtomic::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool force_restore, bool /*force_attach*/)
 {
+    if (!force_restore)
+        return;
+
     /// Recreate symlinks to table data dirs in case of force restore, because some of them may be broken
-    if (has_force_restore_data_flag)
+    for (const auto & table_path : fs::directory_iterator(path_to_table_symlinks))
     {
-        for (const auto & table_path : fs::directory_iterator(path_to_table_symlinks))
+        if (!fs::is_symlink(table_path))
         {
-            if (!fs::is_symlink(table_path))
-            {
-                throw Exception(ErrorCodes::ABORTED,
-                    "'{}' is not a symlink. Atomic database should contains only symlinks.", std::string(table_path.path()));
-            }
-
-            fs::remove(table_path);
-        }
-    }
-
-    DatabaseOrdinary::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach, skip_startup_tables);
-
-    if (has_force_restore_data_flag)
-    {
-        NameToPathMap table_names;
-        {
-            std::lock_guard lock{mutex};
-            table_names = table_name_to_path;
+            throw Exception(ErrorCodes::ABORTED,
+                "'{}' is not a symlink. Atomic database should contains only symlinks.", std::string(table_path.path()));
         }
 
-        fs::create_directories(path_to_table_symlinks);
-        for (const auto & table : table_names)
-            tryCreateSymlink(table.first, table.second, true);
+        fs::remove(table_path);
     }
 }
 
+void DatabaseAtomic::loadStoredObjects(
+    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+{
+    beforeLoadingMetadata(local_context, force_restore, force_attach);
+    DatabaseOrdinary::loadStoredObjects(local_context, force_restore, force_attach, skip_startup_tables);
+}
+
+void DatabaseAtomic::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+{
+    DatabaseOrdinary::startupTables(thread_pool, force_restore, force_attach);
+
+    if (!force_restore)
+        return;
+
+    NameToPathMap table_names;
+    {
+        std::lock_guard lock{mutex};
+        table_names = table_name_to_path;
+    }
+
+    fs::create_directories(path_to_table_symlinks);
+    for (const auto & table : table_names)
+        tryCreateSymlink(table.first, table.second, true);
+}
+
 void DatabaseAtomic::tryCreateSymlink(const String & table_name, const String & actual_data_path, bool if_data_path_exist)
 {
     try
diff --git a/src/Databases/DatabaseAtomic.h b/src/Databases/DatabaseAtomic.h
index 8be009cd6ca..1fe13f8b27f 100644
--- a/src/Databases/DatabaseAtomic.h
+++ b/src/Databases/DatabaseAtomic.h
@@ -47,7 +47,11 @@ public:
 
     DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
-    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+
+    void beforeLoadingMetadata(ContextMutablePtr context, bool force_restore, bool force_attach) override;
+
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
 
     /// Atomic database cannot be detached if there is detached table which still in use
     void assertCanBeDetached(bool cleanup) override;
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 75a3b9c9e1e..731af1458bf 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -13,6 +13,7 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/formatAST.h>
 #include <Common/Macros.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <filesystem>
 
 #if !defined(ARCADIA_BUILD)
@@ -38,6 +39,7 @@
 #include <Databases/PostgreSQL/DatabasePostgreSQL.h> // Y_IGNORE
 #include <Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h>
 #include <Storages/PostgreSQL/MaterializedPostgreSQLSettings.h>
+#include <Storages/StoragePostgreSQL.h>
 #endif
 
 #if USE_SQLITE
@@ -103,13 +105,20 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
     const String & engine_name = engine_define->engine->name;
     const UUID & uuid = create.uuid;
 
+    static const std::unordered_set<std::string_view> database_engines{"Ordinary", "Atomic", "Memory",
+        "Dictionary", "Lazy", "Replicated", "MySQL", "MaterializeMySQL", "MaterializedMySQL",
+        "PostgreSQL", "MaterializedPostgreSQL", "SQLite"};
+
+    if (!database_engines.contains(engine_name))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Database engine name `{}` does not exist", engine_name);
+
     static const std::unordered_set<std::string_view> engines_with_arguments{"MySQL", "MaterializeMySQL", "MaterializedMySQL",
         "Lazy", "Replicated", "PostgreSQL", "MaterializedPostgreSQL", "SQLite"};
 
     bool engine_may_have_arguments = engines_with_arguments.contains(engine_name);
 
     if (engine_define->engine->arguments && !engine_may_have_arguments)
-        throw Exception("Database engine " + engine_name + " cannot have arguments", ErrorCodes::BAD_ARGUMENTS);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Database engine `{}` cannot have arguments", engine_name);
 
     bool has_unexpected_element = engine_define->engine->parameters || engine_define->partition_by ||
                                   engine_define->primary_key || engine_define->order_by ||
@@ -117,8 +126,8 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
     bool may_have_settings = endsWith(engine_name, "MySQL") || engine_name == "Replicated" || engine_name == "MaterializedPostgreSQL";
 
     if (has_unexpected_element || (!may_have_settings && engine_define->settings))
-        throw Exception("Database engine " + engine_name + " cannot have parameters, primary_key, order_by, sample_by, settings",
-                        ErrorCodes::UNKNOWN_ELEMENT_IN_AST);
+        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_AST,
+                        "Database engine `{}` cannot have parameters, primary_key, order_by, sample_by, settings", engine_name);
 
     if (engine_name == "Ordinary")
         return std::make_shared<DatabaseOrdinary>(database_name, metadata_path, context);
@@ -134,40 +143,66 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
     else if (engine_name == "MySQL" || engine_name == "MaterializeMySQL" || engine_name == "MaterializedMySQL")
     {
         const ASTFunction * engine = engine_define->engine;
-        if (!engine->arguments || engine->arguments->children.size() != 4)
-            throw Exception(
-                engine_name + " Database require mysql_hostname, mysql_database_name, mysql_username, mysql_password arguments.",
-                ErrorCodes::BAD_ARGUMENTS);
+        if (!engine->arguments)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
 
+        StorageMySQLConfiguration configuration;
         ASTs & arguments = engine->arguments->children;
-        arguments[1] = evaluateConstantExpressionOrIdentifierAsLiteral(arguments[1], context);
 
-        const auto & host_port = safeGetLiteralValue<String>(arguments[0], engine_name);
-        const auto & mysql_database_name = safeGetLiteralValue<String>(arguments[1], engine_name);
-        const auto & mysql_user_name = safeGetLiteralValue<String>(arguments[2], engine_name);
-        const auto & mysql_user_password = safeGetLiteralValue<String>(arguments[3], engine_name);
+        if (auto named_collection = getExternalDataSourceConfiguration(arguments, context, true))
+        {
+            auto [common_configuration, storage_specific_args] = named_collection.value();
+
+            configuration.set(common_configuration);
+            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
+
+            if (!storage_specific_args.empty())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "MySQL database require mysql_hostname, mysql_database_name, mysql_username, mysql_password arguments.");
+        }
+        else
+        {
+            if (arguments.size() != 4)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "MySQL database require mysql_hostname, mysql_database_name, mysql_username, mysql_password arguments.");
+
+
+            arguments[1] = evaluateConstantExpressionOrIdentifierAsLiteral(arguments[1], context);
+            const auto & host_port = safeGetLiteralValue<String>(arguments[0], engine_name);
+
+            if (engine_name == "MySQL")
+            {
+                size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+                configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
+            }
+            else
+            {
+                const auto & [remote_host, remote_port] = parseAddress(host_port, 3306);
+                configuration.host = remote_host;
+                configuration.port = remote_port;
+            }
+
+            configuration.database = safeGetLiteralValue<String>(arguments[1], engine_name);
+            configuration.username = safeGetLiteralValue<String>(arguments[2], engine_name);
+            configuration.password = safeGetLiteralValue<String>(arguments[3], engine_name);
+        }
 
         try
         {
             if (engine_name == "MySQL")
             {
                 auto mysql_database_settings = std::make_unique<ConnectionMySQLSettings>();
-                /// Split into replicas if needed.
-                size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-                auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
-                auto mysql_pool = mysqlxx::PoolWithFailover(mysql_database_name, addresses, mysql_user_name, mysql_user_password);
+                auto mysql_pool = mysqlxx::PoolWithFailover(configuration.database, configuration.addresses, configuration.username, configuration.password);
 
                 mysql_database_settings->loadFromQueryContext(context);
                 mysql_database_settings->loadFromQuery(*engine_define); /// higher priority
 
                 return std::make_shared<DatabaseMySQL>(
-                    context, database_name, metadata_path, engine_define, mysql_database_name, std::move(mysql_database_settings), std::move(mysql_pool));
+                    context, database_name, metadata_path, engine_define, configuration.database, std::move(mysql_database_settings), std::move(mysql_pool));
             }
 
-            const auto & [remote_host_name, remote_port] = parseAddress(host_port, 3306);
-            MySQLClient client(remote_host_name, remote_port, mysql_user_name, mysql_user_password);
-            auto mysql_pool = mysqlxx::Pool(mysql_database_name, remote_host_name, mysql_user_name, mysql_user_password, remote_port);
-
+            MySQLClient client(configuration.host, configuration.port, configuration.username, configuration.password);
+            auto mysql_pool = mysqlxx::Pool(configuration.database, configuration.host, configuration.username, configuration.password, configuration.port);
 
             auto materialize_mode_settings = std::make_unique<MaterializedMySQLSettings>();
 
@@ -176,12 +211,12 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
 
             if (create.uuid == UUIDHelpers::Nil)
                 return std::make_shared<DatabaseMaterializedMySQL<DatabaseOrdinary>>(
-                    context, database_name, metadata_path, uuid, mysql_database_name, std::move(mysql_pool), std::move(client)
-                    , std::move(materialize_mode_settings));
+                    context, database_name, metadata_path, uuid, configuration.database, std::move(mysql_pool),
+                    std::move(client), std::move(materialize_mode_settings));
             else
                 return std::make_shared<DatabaseMaterializedMySQL<DatabaseAtomic>>(
-                    context, database_name, metadata_path, uuid, mysql_database_name, std::move(mysql_pool), std::move(client)
-                    , std::move(materialize_mode_settings));
+                    context, database_name, metadata_path, uuid, configuration.database, std::move(mysql_pool),
+                    std::move(client), std::move(materialize_mode_settings));
         }
         catch (...)
         {
@@ -235,77 +270,109 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
     else if (engine_name == "PostgreSQL")
     {
         const ASTFunction * engine = engine_define->engine;
-
-        if (!engine->arguments || engine->arguments->children.size() < 4 || engine->arguments->children.size() > 6)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                            "{} Database require `host:port`, `database_name`, `username`, `password` [, `schema` = "", `use_table_cache` = 0].",
-                            engine_name);
+        if (!engine->arguments)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
 
         ASTs & engine_args = engine->arguments->children;
+        auto use_table_cache = false;
+        StoragePostgreSQLConfiguration configuration;
 
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+        if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context, true))
+        {
+            auto [common_configuration, storage_specific_args] = named_collection.value();
 
-        const auto & host_port = safeGetLiteralValue<String>(engine_args[0], engine_name);
-        const auto & postgres_database_name = safeGetLiteralValue<String>(engine_args[1], engine_name);
-        const auto & username = safeGetLiteralValue<String>(engine_args[2], engine_name);
-        const auto & password = safeGetLiteralValue<String>(engine_args[3], engine_name);
+            configuration.set(common_configuration);
+            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
 
-        String schema;
-        if (engine->arguments->children.size() >= 5)
-            schema = safeGetLiteralValue<String>(engine_args[4], engine_name);
+            for (const auto & [arg_name, arg_value] : storage_specific_args)
+            {
+                if (arg_name == "use_table_cache")
+                    use_table_cache = true;
+                else
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Unexpected key-value argument."
+                            "Got: {}, but expected one of:"
+                            "host, port, username, password, database, schema, use_table_cache.", arg_name);
+            }
+        }
+        else
+        {
+            if (engine_args.size() < 4 || engine_args.size() > 6)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "PostgreSQL Database require `host:port`, `database_name`, `username`, `password`"
+                                "[, `schema` = "", `use_table_cache` = 0");
 
-        auto use_table_cache = 0;
-        if (engine->arguments->children.size() >= 6)
+            for (auto & engine_arg : engine_args)
+                engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+
+            const auto & host_port = safeGetLiteralValue<String>(engine_args[0], engine_name);
+            size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+
+            configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
+            configuration.database = safeGetLiteralValue<String>(engine_args[1], engine_name);
+            configuration.username = safeGetLiteralValue<String>(engine_args[2], engine_name);
+            configuration.password = safeGetLiteralValue<String>(engine_args[3], engine_name);
+
+            if (engine_args.size() >= 5)
+                configuration.schema = safeGetLiteralValue<String>(engine_args[4], engine_name);
+        }
+
+        if (engine_args.size() >= 6)
             use_table_cache = safeGetLiteralValue<UInt8>(engine_args[5], engine_name);
 
-        /// 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<postgres::PoolWithFailover>(
-            postgres_database_name,
-            addresses,
-            username, password,
+        auto pool = std::make_shared<postgres::PoolWithFailover>(configuration,
             context->getSettingsRef().postgresql_connection_pool_size,
             context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
         return std::make_shared<DatabasePostgreSQL>(
-            context, metadata_path, engine_define, database_name, postgres_database_name, schema, connection_pool, use_table_cache);
+            context, metadata_path, engine_define, database_name, configuration, pool, use_table_cache);
     }
     else if (engine_name == "MaterializedPostgreSQL")
     {
         const ASTFunction * engine = engine_define->engine;
-
-        if (!engine->arguments || engine->arguments->children.size() != 4)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                            "{} Database require `host:port`, `database_name`, `username`, `password`.",
-                            engine_name);
-        }
+        if (!engine->arguments)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
 
         ASTs & engine_args = engine->arguments->children;
+        StoragePostgreSQLConfiguration configuration;
 
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+        if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context, true))
+        {
+            auto [common_configuration, storage_specific_args] = named_collection.value();
+            configuration.set(common_configuration);
 
-        const auto & host_port = safeGetLiteralValue<String>(engine_args[0], engine_name);
-        const auto & postgres_database_name = safeGetLiteralValue<String>(engine_args[1], engine_name);
-        const auto & username = safeGetLiteralValue<String>(engine_args[2], engine_name);
-        const auto & password = safeGetLiteralValue<String>(engine_args[3], engine_name);
+            if (!storage_specific_args.empty())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "MaterializedPostgreSQL Database requires only `host`, `port`, `database_name`, `username`, `password`.");
+        }
+        else
+        {
+            if (engine_args.size() != 4)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "MaterializedPostgreSQL Database require `host:port`, `database_name`, `username`, `password`.");
 
-        auto parsed_host_port = parseAddress(host_port, 5432);
-        auto connection_info = postgres::formatConnectionString(postgres_database_name, parsed_host_port.first, parsed_host_port.second, username, password);
+            for (auto & engine_arg : engine_args)
+                engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+
+            auto parsed_host_port = parseAddress(safeGetLiteralValue<String>(engine_args[0], engine_name), 5432);
+
+            configuration.host = parsed_host_port.first;
+            configuration.port = parsed_host_port.second;
+            configuration.database = safeGetLiteralValue<String>(engine_args[1], engine_name);
+            configuration.username = safeGetLiteralValue<String>(engine_args[2], engine_name);
+            configuration.password = safeGetLiteralValue<String>(engine_args[3], engine_name);
+        }
+
+        auto connection_info = postgres::formatConnectionString(
+            configuration.database, configuration.host, configuration.port, configuration.username, configuration.password);
 
         auto postgresql_replica_settings = std::make_unique<MaterializedPostgreSQLSettings>();
-
         if (engine_define->settings)
             postgresql_replica_settings->loadFromQuery(*engine_define);
 
         return std::make_shared<DatabaseMaterializedPostgreSQL>(
-                context, metadata_path, uuid, engine_define, create.attach,
-                database_name, postgres_database_name, connection_info,
+                context, metadata_path, uuid, create.attach,
+                database_name, configuration.database, connection_info,
                 std::move(postgresql_replica_settings));
     }
 
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index 7e0e1b7aa43..384c5ff47dd 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -36,7 +36,7 @@ DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_,
 
 
 void DatabaseLazy::loadStoredObjects(
-    ContextMutablePtr local_context, bool /* has_force_restore_data_flag */, bool /*force_attach*/, bool /* skip_startup_tables */)
+    ContextMutablePtr local_context, bool /* force_restore */, bool /*force_attach*/, bool /* skip_startup_tables */)
 {
     iterateMetadataFiles(local_context, [this](const String & file_name)
     {
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index bc79a49b2fe..45c816c2e76 100644
--- a/src/Databases/DatabaseLazy.h
+++ b/src/Databases/DatabaseLazy.h
@@ -26,7 +26,7 @@ public:
 
     bool canContainDistributedTables() const override { return false; }
 
-    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
 
     void createTable(
         ContextPtr context,
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index c0af027e027..0ca1de09dd1 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -42,12 +42,17 @@ void DatabaseMemory::dropTable(
     try
     {
         table->drop();
-        fs::path table_data_dir{getTableDataPath(table_name)};
-        if (fs::exists(table_data_dir))
-            fs::remove_all(table_data_dir);
+        if (table->storesDataOnDisk())
+        {
+            assert(database_name != DatabaseCatalog::TEMPORARY_DATABASE);
+            fs::path table_data_dir{getTableDataPath(table_name)};
+            if (fs::exists(table_data_dir))
+                fs::remove_all(table_data_dir);
+        }
     }
     catch (...)
     {
+        assert(database_name != DatabaseCatalog::TEMPORARY_DATABASE);
         attachTableUnlocked(table_name, table, lock);
         throw;
     }
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 620e560b64c..e941e18625d 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -46,7 +46,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     const String & database_name,
     const String & table_data_path_relative,
     ContextMutablePtr context,
-    bool has_force_restore_data_flag)
+    bool force_restore)
 {
     ast_create_query.attach = true;
     ast_create_query.database = database_name;
@@ -88,7 +88,7 @@ std::pair<String, StoragePtr> createTableFromAST(
             context->getGlobalContext(),
             columns,
             constraints,
-            has_force_restore_data_flag)
+            force_restore)
     };
 }
 
@@ -699,4 +699,55 @@ ASTPtr DatabaseOnDisk::getCreateQueryFromMetadata(const String & database_metada
     return ast;
 }
 
+void DatabaseOnDisk::modifySettingsMetadata(const SettingsChanges & settings_changes, ContextPtr query_context)
+{
+    std::lock_guard lock(modify_settings_mutex);
+
+    auto create_query = getCreateDatabaseQuery()->clone();
+    auto * create = create_query->as<ASTCreateQuery>();
+    auto * settings = create->storage->settings;
+    if (settings)
+    {
+        auto & storage_settings = settings->changes;
+        for (const auto & change : settings_changes)
+        {
+            auto it = std::find_if(storage_settings.begin(), storage_settings.end(),
+                                   [&](const auto & prev){ return prev.name == change.name; });
+            if (it != storage_settings.end())
+                it->value = change.value;
+            else
+                storage_settings.push_back(change);
+        }
+    }
+    else
+    {
+        auto storage_settings = std::make_shared<ASTSetQuery>();
+        storage_settings->is_standalone = false;
+        storage_settings->changes = settings_changes;
+        create->storage->set(create->storage->settings, storage_settings->clone());
+    }
+
+    create->attach = true;
+    create->if_not_exists = false;
+
+    WriteBufferFromOwnString statement_buf;
+    formatAST(*create, statement_buf, false);
+    writeChar('\n', statement_buf);
+    String statement = statement_buf.str();
+
+    String database_name_escaped = escapeForFileName(database_name);
+    fs::path metadata_root_path = fs::canonical(query_context->getGlobalContext()->getPath());
+    fs::path metadata_file_tmp_path = fs::path(metadata_root_path) / "metadata" / (database_name_escaped + ".sql.tmp");
+    fs::path metadata_file_path = fs::path(metadata_root_path) / "metadata" / (database_name_escaped + ".sql");
+
+    WriteBufferFromFile out(metadata_file_tmp_path, statement.size(), O_WRONLY | O_CREAT | O_EXCL);
+    writeString(statement, out);
+
+    out.next();
+    if (getContext()->getSettingsRef().fsync_metadata)
+        out.sync();
+    out.close();
+
+    fs::rename(metadata_file_tmp_path, metadata_file_path);
+}
 }
diff --git a/src/Databases/DatabaseOnDisk.h b/src/Databases/DatabaseOnDisk.h
index e7dda7cb36b..dce82c2b441 100644
--- a/src/Databases/DatabaseOnDisk.h
+++ b/src/Databases/DatabaseOnDisk.h
@@ -16,7 +16,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     const String & database_name,
     const String & table_data_path_relative,
     ContextMutablePtr context,
-    bool has_force_restore_data_flag);
+    bool force_restore);
 
 /** Get the string with the table definition based on the CREATE query.
   * It is an ATTACH query that you can execute to create a table from the correspondent database.
@@ -74,6 +74,8 @@ public:
     void checkMetadataFilenameAvailability(const String & to_table_name) const;
     void checkMetadataFilenameAvailabilityUnlocked(const String & to_table_name, std::unique_lock<std::mutex> &) const;
 
+    void modifySettingsMetadata(const SettingsChanges & settings_changes, ContextPtr query_context);
+
 protected:
     static constexpr const char * create_suffix = ".tmp";
     static constexpr const char * drop_suffix = ".tmp_drop";
@@ -97,6 +99,9 @@ protected:
 
     const String metadata_path;
     const String data_path;
+
+    /// For alter settings.
+    std::mutex modify_settings_mutex;
 };
 
 }
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index bfe5de4c95f..1bdb273c9fb 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -4,6 +4,8 @@
 #include <Databases/DatabaseOnDisk.h>
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabasesCommon.h>
+#include <Databases/DDLDependencyVisitor.h>
+#include <Databases/TablesLoader.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
@@ -27,8 +29,6 @@ namespace fs = std::filesystem;
 
 namespace DB
 {
-static constexpr size_t PRINT_MESSAGE_EACH_N_OBJECTS = 256;
-static constexpr size_t PRINT_MESSAGE_EACH_N_SECONDS = 5;
 static constexpr size_t METADATA_FILE_BUFFER_SIZE = 32768;
 
 namespace
@@ -39,7 +39,7 @@ namespace
         DatabaseOrdinary & database,
         const String & database_name,
         const String & metadata_path,
-        bool has_force_restore_data_flag)
+        bool force_restore)
     {
         try
         {
@@ -48,7 +48,7 @@ namespace
                 database_name,
                 database.getTableDataPath(query),
                 context,
-                has_force_restore_data_flag);
+                force_restore);
 
             database.attachTable(table_name, table, database.getTableDataPath(query));
         }
@@ -60,15 +60,6 @@ namespace
             throw;
         }
     }
-
-    void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch)
-    {
-        if (processed % PRINT_MESSAGE_EACH_N_OBJECTS == 0 || watch.compareAndRestart(PRINT_MESSAGE_EACH_N_SECONDS))
-        {
-            LOG_INFO(log, "{}%", processed * 100.0 / total);
-            watch.restart();
-        }
-    }
 }
 
 
@@ -84,20 +75,88 @@ DatabaseOrdinary::DatabaseOrdinary(
 }
 
 void DatabaseOrdinary::loadStoredObjects(
-    ContextMutablePtr local_context, bool has_force_restore_data_flag, bool /*force_attach*/, bool skip_startup_tables)
+    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
 {
     /** Tables load faster if they are loaded in sorted (by name) order.
       * Otherwise (for the ext4 filesystem), `DirectoryIterator` iterates through them in some order,
       *  which does not correspond to order tables creation and does not correspond to order of their location on disk.
       */
-    using FileNames = std::map<std::string, ASTPtr>;
-    std::mutex file_names_mutex;
-    FileNames file_names;
 
-    size_t total_dictionaries = 0;
+    ParsedTablesMetadata metadata;
+    loadTablesMetadata(local_context, metadata);
 
-    auto process_metadata = [&file_names, &total_dictionaries, &file_names_mutex, this](
-                                const String & file_name)
+    size_t total_tables = metadata.parsed_tables.size() - metadata.total_dictionaries;
+
+    AtomicStopwatch watch;
+    std::atomic<size_t> dictionaries_processed{0};
+    std::atomic<size_t> tables_processed{0};
+
+    ThreadPool pool;
+
+    /// We must attach dictionaries before attaching tables
+    /// because while we're attaching tables we may need to have some dictionaries attached
+    /// (for example, dictionaries can be used in the default expressions for some tables).
+    /// On the other hand we can attach any dictionary (even sourced from ClickHouse table)
+    /// without having any tables attached. It is so because attaching of a dictionary means
+    /// loading of its config only, it doesn't involve loading the dictionary itself.
+
+    /// Attach dictionaries.
+    for (const auto & name_with_path_and_query : metadata.parsed_tables)
+    {
+        const auto & name = name_with_path_and_query.first;
+        const auto & path = name_with_path_and_query.second.path;
+        const auto & ast = name_with_path_and_query.second.ast;
+        const auto & create_query = ast->as<const ASTCreateQuery &>();
+
+        if (create_query.is_dictionary)
+        {
+            pool.scheduleOrThrowOnError([&]()
+            {
+                loadTableFromMetadata(local_context, path, name, ast, force_restore);
+
+                /// Messages, so that it's not boring to wait for the server to load for a long time.
+                logAboutProgress(log, ++dictionaries_processed, metadata.total_dictionaries, watch);
+            });
+        }
+    }
+
+    pool.wait();
+
+    /// Attach tables.
+    for (const auto & name_with_path_and_query : metadata.parsed_tables)
+    {
+        const auto & name = name_with_path_and_query.first;
+        const auto & path = name_with_path_and_query.second.path;
+        const auto & ast = name_with_path_and_query.second.ast;
+        const auto & create_query = ast->as<const ASTCreateQuery &>();
+
+        if (!create_query.is_dictionary)
+        {
+            pool.scheduleOrThrowOnError([&]()
+            {
+                loadTableFromMetadata(local_context, path, name, ast, force_restore);
+
+                /// Messages, so that it's not boring to wait for the server to load for a long time.
+                logAboutProgress(log, ++tables_processed, total_tables, watch);
+            });
+        }
+    }
+
+    pool.wait();
+
+    if (!skip_startup_tables)
+    {
+        /// After all tables was basically initialized, startup them.
+        startupTables(pool, force_restore, force_attach);
+    }
+}
+
+void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTablesMetadata & metadata)
+{
+    size_t prev_tables_count = metadata.parsed_tables.size();
+    size_t prev_total_dictionaries = metadata.total_dictionaries;
+
+    auto process_metadata = [&metadata, this](const String & file_name)
     {
         fs::path path(getMetadataPath());
         fs::path file_path(file_name);
@@ -122,9 +181,29 @@ void DatabaseOrdinary::loadStoredObjects(
                     return;
                 }
 
-                std::lock_guard lock{file_names_mutex};
-                file_names[file_name] = ast;
-                total_dictionaries += create_query->is_dictionary;
+                TableLoadingDependenciesVisitor::Data data;
+                data.default_database = metadata.default_database;
+                data.create_query = ast;
+                data.global_context = getContext();
+                TableLoadingDependenciesVisitor visitor{data};
+                visitor.visit(ast);
+                QualifiedTableName qualified_name{database_name, create_query->table};
+
+                std::lock_guard lock{metadata.mutex};
+                metadata.parsed_tables[qualified_name] = ParsedTableMetadata{full_path.string(), ast};
+                if (data.dependencies.empty())
+                {
+                    metadata.independent_database_objects.emplace_back(std::move(qualified_name));
+                }
+                else
+                {
+                    for (const auto & dependency : data.dependencies)
+                    {
+                        metadata.dependencies_info[dependency].dependent_database_objects.push_back(qualified_name);
+                        ++metadata.dependencies_info[qualified_name].dependencies_count;
+                    }
+                }
+                metadata.total_dictionaries += create_query->is_dictionary;
             }
         }
         catch (Exception & e)
@@ -136,86 +215,29 @@ void DatabaseOrdinary::loadStoredObjects(
 
     iterateMetadataFiles(local_context, process_metadata);
 
-    size_t total_tables = file_names.size() - total_dictionaries;
+    size_t objects_in_database = metadata.parsed_tables.size() - prev_tables_count;
+    size_t dictionaries_in_database = metadata.total_dictionaries - prev_total_dictionaries;
+    size_t tables_in_database = objects_in_database - dictionaries_in_database;
 
-    LOG_INFO(log, "Total {} tables and {} dictionaries.", total_tables, total_dictionaries);
-
-    AtomicStopwatch watch;
-    std::atomic<size_t> tables_processed{0};
-
-    ThreadPool pool;
-
-    /// We must attach dictionaries before attaching tables
-    /// because while we're attaching tables we may need to have some dictionaries attached
-    /// (for example, dictionaries can be used in the default expressions for some tables).
-    /// On the other hand we can attach any dictionary (even sourced from ClickHouse table)
-    /// without having any tables attached. It is so because attaching of a dictionary means
-    /// loading of its config only, it doesn't involve loading the dictionary itself.
-
-    /// Attach dictionaries.
-    for (const auto & name_with_query : file_names)
-    {
-        const auto & create_query = name_with_query.second->as<const ASTCreateQuery &>();
-
-        if (create_query.is_dictionary)
-        {
-            pool.scheduleOrThrowOnError([&]()
-            {
-                tryAttachTable(
-                    local_context,
-                    create_query,
-                    *this,
-                    database_name,
-                    getMetadataPath() + name_with_query.first,
-                    has_force_restore_data_flag);
-
-                /// Messages, so that it's not boring to wait for the server to load for a long time.
-                logAboutProgress(log, ++tables_processed, total_tables, watch);
-            });
-        }
-    }
-
-    pool.wait();
-
-    /// Attach tables.
-    for (const auto & name_with_query : file_names)
-    {
-        const auto & create_query = name_with_query.second->as<const ASTCreateQuery &>();
-
-        if (!create_query.is_dictionary)
-        {
-            pool.scheduleOrThrowOnError([&]()
-            {
-                tryAttachTable(
-                    local_context,
-                    create_query,
-                    *this,
-                    database_name,
-                    getMetadataPath() + name_with_query.first,
-                    has_force_restore_data_flag);
-
-                /// Messages, so that it's not boring to wait for the server to load for a long time.
-                logAboutProgress(log, ++tables_processed, total_tables, watch);
-            });
-        }
-    }
-
-    pool.wait();
-
-    if (!skip_startup_tables)
-    {
-        /// After all tables was basically initialized, startup them.
-        startupTablesImpl(pool);
-    }
+    LOG_INFO(log, "Metadata processed, database {} has {} tables and {} dictionaries in total.",
+             database_name, tables_in_database, dictionaries_in_database);
 }
 
-void DatabaseOrdinary::startupTables()
+void DatabaseOrdinary::loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast, bool force_restore)
 {
-    ThreadPool pool;
-    startupTablesImpl(pool);
+    assert(name.database == database_name);
+    const auto & create_query = ast->as<const ASTCreateQuery &>();
+
+    tryAttachTable(
+        local_context,
+        create_query,
+        *this,
+        name.database,
+        file_path,
+        force_restore);
 }
 
-void DatabaseOrdinary::startupTablesImpl(ThreadPool & thread_pool)
+void DatabaseOrdinary::startupTables(ThreadPool & thread_pool, bool /*force_restore*/, bool /*force_attach*/)
 {
     LOG_INFO(log, "Starting up tables.");
 
@@ -240,6 +262,7 @@ void DatabaseOrdinary::startupTablesImpl(ThreadPool & thread_pool)
     }
     catch (...)
     {
+        /// We have to wait for jobs to finish here, because job function has reference to variables on the stack of current thread.
         thread_pool.wait();
         throw;
     }
diff --git a/src/Databases/DatabaseOrdinary.h b/src/Databases/DatabaseOrdinary.h
index 7832377ccae..982be2024ce 100644
--- a/src/Databases/DatabaseOrdinary.h
+++ b/src/Databases/DatabaseOrdinary.h
@@ -16,13 +16,20 @@ class DatabaseOrdinary : public DatabaseOnDisk
 public:
     DatabaseOrdinary(const String & name_, const String & metadata_path_, ContextPtr context);
     DatabaseOrdinary(
-        const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context_);
+        const String & name_, const String & metadata_path_, const String & data_path_,
+        const String & logger, ContextPtr context_);
 
     String getEngineName() const override { return "Ordinary"; }
 
-    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
 
-    void startupTables() override;
+    bool supportsLoadingInTopologicalOrder() const override { return true; }
+
+    void loadTablesMetadata(ContextPtr context, ParsedTablesMetadata & metadata) override;
+
+    void loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast, bool force_restore) override;
+
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
 
     void alterTable(
         ContextPtr context,
@@ -36,8 +43,6 @@ protected:
         const String & table_metadata_path,
         const String & statement,
         ContextPtr query_context);
-
-    void startupTablesImpl(ThreadPool & thread_pool);
 };
 
 }
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index da03eb6aba6..c2ff002ea36 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -305,13 +305,21 @@ void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPt
     createEmptyLogEntry(current_zookeeper);
 }
 
-void DatabaseReplicated::loadStoredObjects(
-    ContextMutablePtr local_context, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables)
+void DatabaseReplicated::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool /*force_restore*/, bool force_attach)
 {
     tryConnectToZooKeeperAndInitDatabase(force_attach);
+}
 
-    DatabaseAtomic::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach, skip_startup_tables);
+void DatabaseReplicated::loadStoredObjects(
+    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+{
+    beforeLoadingMetadata(local_context, force_restore, force_attach);
+    DatabaseAtomic::loadStoredObjects(local_context, force_restore, force_attach, skip_startup_tables);
+}
 
+void DatabaseReplicated::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+{
+    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
     ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, getContext());
     ddl_worker->startup();
 }
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index 1e0daeed07e..60526a1e5b0 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -57,7 +57,12 @@ public:
 
     void drop(ContextPtr /*context*/) override;
 
-    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+
+    void beforeLoadingMetadata(ContextMutablePtr context, bool force_restore, bool force_attach) override;
+
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+
     void shutdown() override;
 
     friend struct DatabaseReplicatedTask;
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index bd9605dca71..e1ba359bbfc 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -5,6 +5,7 @@
 #include <Storages/IStorage_fwd.h>
 #include <Interpreters/Context_fwd.h>
 #include <Common/Exception.h>
+#include <Common/ThreadPool.h>
 #include <Core/UUID.h>
 
 #include <ctime>
@@ -24,12 +25,17 @@ struct IndicesDescription;
 struct StorageInMemoryMetadata;
 struct StorageID;
 class ASTCreateQuery;
+class AlterCommands;
+class SettingsChanges;
 using DictionariesWithID = std::vector<std::pair<String, UUID>>;
+struct ParsedTablesMetadata;
+struct QualifiedTableName;
 
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
     extern const int CANNOT_GET_CREATE_TABLE_QUERY;
+    extern const int LOGICAL_ERROR;
 }
 
 class IDatabaseTablesIterator
@@ -125,13 +131,32 @@ public:
     /// You can call only once, right after the object is created.
     virtual void loadStoredObjects(
         ContextMutablePtr /*context*/,
-        bool /*has_force_restore_data_flag*/,
+        bool /*force_restore*/,
         bool /*force_attach*/ = false,
         bool /* skip_startup_tables */ = false)
     {
     }
 
-    virtual void startupTables() {}
+    virtual bool supportsLoadingInTopologicalOrder() const { return false; }
+
+    virtual void beforeLoadingMetadata(
+        ContextMutablePtr /*context*/,
+        bool /*force_restore*/,
+        bool /*force_attach*/)
+    {
+    }
+
+    virtual void loadTablesMetadata(ContextPtr /*local_context*/, ParsedTablesMetadata & /*metadata*/)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
+    }
+
+    virtual void loadTableFromMetadata(ContextMutablePtr /*local_context*/, const String & /*file_path*/, const QualifiedTableName & /*name*/, const ASTPtr & /*ast*/, bool /*force_restore*/)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
+    }
+
+    virtual void startupTables(ThreadPool & /*thread_pool*/, bool /*force_restore*/, bool /*force_attach*/) {}
 
     /// Check the existence of the table.
     virtual bool isTableExist(const String & name, ContextPtr context) const = 0;
@@ -280,6 +305,13 @@ public:
     /// Delete data and metadata stored inside the database, if exists.
     virtual void drop(ContextPtr /*context*/) {}
 
+    virtual void applySettingsChanges(const SettingsChanges &, ContextPtr)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Database engine {} either does not support settings, or does not support altering settings",
+                        getEngineName());
+    }
+
     virtual ~IDatabase() = default;
 
 protected:
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
index 0d81a4e1a98..2b4649c275a 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
@@ -94,10 +94,10 @@ void DatabaseMaterializedMySQL<Base>::setException(const std::exception_ptr & ex
 }
 
 template <typename Base>
-void DatabaseMaterializedMySQL<Base>::loadStoredObjects(
-    ContextMutablePtr context_, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables)
+void DatabaseMaterializedMySQL<Base>::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
 {
-    Base::loadStoredObjects(context_, has_force_restore_data_flag, force_attach, skip_startup_tables);
+    Base::startupTables(thread_pool, force_restore, force_attach);
+
     if (!force_attach)
         materialize_thread.assertMySQLAvailable();
 
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.h b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
index 292edc97878..ac32607a22c 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.h
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
@@ -43,7 +43,7 @@ protected:
 public:
     String getEngineName() const override { return "MaterializedMySQL"; }
 
-    void loadStoredObjects(ContextMutablePtr context_, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables) override;
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
 
     void createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query) override;
 
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
index 53495aa3cb1..5a51704e98b 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
@@ -233,7 +233,8 @@ void MaterializedMySQLSyncThread::stopSynchronization()
     if (!sync_quit && background_thread_pool)
     {
         sync_quit = true;
-        background_thread_pool->join();
+        if (background_thread_pool->joinable())
+            background_thread_pool->join();
         client.disconnect();
     }
 }
@@ -247,7 +248,7 @@ void MaterializedMySQLSyncThread::assertMySQLAvailable()
 {
     try
     {
-        checkMySQLVariables(pool.get(), getContext()->getSettingsRef());
+        checkMySQLVariables(pool.get(/* wait_timeout= */ UINT64_MAX), getContext()->getSettingsRef());
     }
     catch (const mysqlxx::ConnectionFailed & e)
     {
@@ -729,7 +730,7 @@ void MaterializedMySQLSyncThread::onEvent(Buffers & buffers, const BinlogEventPt
         {
             /// Some behaviors(such as changing the value of "binlog_checksum") rotate the binlog file.
             /// To ensure that the synchronization continues, we need to handle these events
-            metadata.fetchMasterVariablesValue(pool.get());
+            metadata.fetchMasterVariablesValue(pool.get(/* wait_timeout= */ UINT64_MAX));
             client.setBinlogChecksum(metadata.binlog_checksum);
         }
         else if (receive_event->header.type != HEARTBEAT_EVENT)
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
index 218dda94d31..8fb75473d15 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
@@ -5,45 +5,47 @@
 #include <Storages/PostgreSQL/StorageMaterializedPostgreSQL.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 
+#include <common/logger_useful.h>
+#include <Common/Macros.h>
+#include <Core/UUID.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabaseAtomic.h>
 #include <Storages/StoragePostgreSQL.h>
+#include <Storages/AlterCommands.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
+#include <Interpreters/InterpreterAlterQuery.h>
 #include <Common/escapeForFileName.h>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/File.h>
-#include <Common/Macros.h>
-#include <common/logger_useful.h>
-
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int NOT_IMPLEMENTED;
     extern const int LOGICAL_ERROR;
+    extern const int QUERY_NOT_ALLOWED;
+    extern const int UNKNOWN_TABLE;
+    extern const int BAD_ARGUMENTS;
 }
 
 DatabaseMaterializedPostgreSQL::DatabaseMaterializedPostgreSQL(
         ContextPtr context_,
         const String & metadata_path_,
         UUID uuid_,
-        const ASTStorage * database_engine_define_,
         bool is_attach_,
         const String & database_name_,
         const String & postgres_database_name,
         const postgres::ConnectionInfo & connection_info_,
         std::unique_ptr<MaterializedPostgreSQLSettings> settings_)
     : DatabaseAtomic(database_name_, metadata_path_, uuid_, "DatabaseMaterializedPostgreSQL (" + database_name_ + ")", context_)
-    , database_engine_define(database_engine_define_->clone())
     , is_attach(is_attach_)
     , remote_database_name(postgres_database_name)
     , connection_info(connection_info_)
@@ -64,11 +66,10 @@ void DatabaseMaterializedPostgreSQL::startSynchronization()
             *settings,
             /* is_materialized_postgresql_database = */ true);
 
-    postgres::Connection connection(connection_info);
     NameSet tables_to_replicate;
     try
     {
-        tables_to_replicate = replication_handler->fetchRequiredTables(connection);
+        tables_to_replicate = replication_handler->fetchRequiredTables();
     }
     catch (...)
     {
@@ -87,12 +88,12 @@ void DatabaseMaterializedPostgreSQL::startSynchronization()
         if (storage)
         {
             /// Nested table was already created and synchronized.
-            storage = StorageMaterializedPostgreSQL::create(storage, getContext());
+            storage = StorageMaterializedPostgreSQL::create(storage, getContext(), remote_database_name, table_name);
         }
         else
         {
             /// Nested table does not exist and will be created by replication thread.
-            storage = StorageMaterializedPostgreSQL::create(StorageID(database_name, table_name), getContext());
+            storage = StorageMaterializedPostgreSQL::create(StorageID(database_name, table_name), getContext(), remote_database_name, table_name);
         }
 
         /// Cache MaterializedPostgreSQL wrapper over nested table.
@@ -107,11 +108,9 @@ void DatabaseMaterializedPostgreSQL::startSynchronization()
 }
 
 
-void DatabaseMaterializedPostgreSQL::loadStoredObjects(
-    ContextMutablePtr local_context, bool has_force_restore_data_flag, bool force_attach, bool skip_startup_tables)
+void DatabaseMaterializedPostgreSQL::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
 {
-    DatabaseAtomic::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach, skip_startup_tables);
-
+    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
     try
     {
         startSynchronization();
@@ -126,6 +125,41 @@ void DatabaseMaterializedPostgreSQL::loadStoredObjects(
 }
 
 
+void DatabaseMaterializedPostgreSQL::applySettingsChanges(const SettingsChanges & settings_changes, ContextPtr query_context)
+{
+    std::lock_guard lock(handler_mutex);
+    bool need_update_on_disk = false;
+
+    for (const auto & change : settings_changes)
+    {
+        if (!settings->has(change.name))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Database engine {} does not support setting `{}`", getEngineName(), change.name);
+
+        if ((change.name == "materialized_postgresql_tables_list"))
+        {
+            if (!query_context->isInternalQuery())
+                throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "Changing setting `{}` is not allowed", change.name);
+
+            need_update_on_disk = true;
+        }
+        else if ((change.name == "materialized_postgresql_allow_automatic_update") || (change.name == "materialized_postgresql_max_block_size"))
+        {
+            replication_handler->setSetting(change);
+            need_update_on_disk = true;
+        }
+        else
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown setting");
+        }
+
+        settings->applyChange(change);
+    }
+
+    if (need_update_on_disk)
+        DatabaseOnDisk::modifySettingsMetadata(settings_changes, query_context);
+}
+
+
 StoragePtr DatabaseMaterializedPostgreSQL::tryGetTable(const String & name, ContextPtr local_context) const
 {
     /// In otder to define which table access is needed - to MaterializedPostgreSQL table (only in case of SELECT queries) or
@@ -153,6 +187,64 @@ StoragePtr DatabaseMaterializedPostgreSQL::tryGetTable(const String & name, Cont
 }
 
 
+/// `except` is not empty in case it is detach and it will contain only one table name - name of detached table.
+/// In case we have a user defined setting `materialized_postgresql_tables_list`, then list of tables is always taken there.
+/// Otherwise we traverse materialized storages to find out the list.
+String DatabaseMaterializedPostgreSQL::getFormattedTablesList(const String & except) const
+{
+    String tables_list;
+    for (const auto & table : materialized_tables)
+    {
+        if (table.first == except)
+            continue;
+
+        if (!tables_list.empty())
+            tables_list += ',';
+
+        tables_list += table.first;
+    }
+    return tables_list;
+}
+
+
+ASTPtr DatabaseMaterializedPostgreSQL::getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const
+{
+    if (!local_context->hasQueryContext())
+        return DatabaseAtomic::getCreateTableQueryImpl(table_name, local_context, throw_on_error);
+
+    std::lock_guard lock(handler_mutex);
+
+    auto storage = StorageMaterializedPostgreSQL::create(StorageID(database_name, table_name), getContext(), remote_database_name, table_name);
+    auto ast_storage = replication_handler->getCreateNestedTableQuery(storage.get(), table_name);
+    assert_cast<ASTCreateQuery *>(ast_storage.get())->uuid = UUIDHelpers::generateV4();
+    return ast_storage;
+}
+
+
+ASTPtr DatabaseMaterializedPostgreSQL::createAlterSettingsQuery(const SettingChange & new_setting)
+{
+    auto set = std::make_shared<ASTSetQuery>();
+    set->is_standalone = false;
+    set->changes = {new_setting};
+
+    auto command = std::make_shared<ASTAlterCommand>();
+    command->type = ASTAlterCommand::Type::MODIFY_DATABASE_SETTING;
+    command->settings_changes = std::move(set);
+
+    auto command_list = std::make_shared<ASTExpressionList>();
+    command_list->children.push_back(command);
+
+    auto query = std::make_shared<ASTAlterQuery>();
+    auto * alter = query->as<ASTAlterQuery>();
+
+    alter->alter_object = ASTAlterQuery::AlterObjectType::DATABASE;
+    alter->database = database_name;
+    alter->set(alter->command_list, command_list);
+
+    return query;
+}
+
+
 void DatabaseMaterializedPostgreSQL::createTable(ContextPtr local_context, const String & table_name, const StoragePtr & table, const ASTPtr & query)
 {
     /// Create table query can only be called from replication thread.
@@ -162,8 +254,123 @@ void DatabaseMaterializedPostgreSQL::createTable(ContextPtr local_context, const
         return;
     }
 
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-        "Create table query allowed only for ReplacingMergeTree engine and from synchronization thread");
+    const auto & create = query->as<ASTCreateQuery>();
+    if (!create->attach)
+        throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "CREATE TABLE is not allowed for database engine {}. Use ATTACH TABLE instead", getEngineName());
+
+    /// Create ReplacingMergeTree table.
+    auto query_copy = query->clone();
+    auto * create_query = assert_cast<ASTCreateQuery *>(query_copy.get());
+    create_query->attach = false;
+    create_query->attach_short_syntax = false;
+    DatabaseAtomic::createTable(StorageMaterializedPostgreSQL::makeNestedTableContext(local_context), table_name, table, query_copy);
+
+    /// Attach MaterializedPostgreSQL table.
+    attachTable(table_name, table, {});
+}
+
+
+void DatabaseMaterializedPostgreSQL::attachTable(const String & table_name, const StoragePtr & table, const String & relative_table_path)
+{
+    /// If there is query context then we need to attach materialized storage.
+    /// If there is no query context then we need to attach internal storage from atomic database.
+    if (CurrentThread::isInitialized() && CurrentThread::get().getQueryContext())
+    {
+        auto current_context = Context::createCopy(getContext()->getGlobalContext());
+        current_context->setInternalQuery(true);
+
+        /// We just came from createTable() and created nested table there. Add assert.
+        auto nested_table = DatabaseAtomic::tryGetTable(table_name, current_context);
+        assert(nested_table != nullptr);
+
+        try
+        {
+            auto tables_to_replicate = settings->materialized_postgresql_tables_list.value;
+            if (tables_to_replicate.empty())
+                tables_to_replicate = getFormattedTablesList();
+
+            /// tables_to_replicate can be empty if postgres database had no tables when this database was created.
+            SettingChange new_setting("materialized_postgresql_tables_list", tables_to_replicate.empty() ? table_name : (tables_to_replicate + "," + table_name));
+            auto alter_query = createAlterSettingsQuery(new_setting);
+
+            InterpreterAlterQuery(alter_query, current_context).execute();
+
+            auto storage = StorageMaterializedPostgreSQL::create(table, getContext(), remote_database_name, table_name);
+            materialized_tables[table_name] = storage;
+
+            std::lock_guard lock(handler_mutex);
+            replication_handler->addTableToReplication(dynamic_cast<StorageMaterializedPostgreSQL *>(storage.get()), table_name);
+        }
+        catch (...)
+        {
+            /// This is a failed attach table. Remove already created nested table.
+            DatabaseAtomic::dropTable(current_context, table_name, true);
+            throw;
+        }
+    }
+    else
+    {
+        DatabaseAtomic::attachTable(table_name, table, relative_table_path);
+    }
+}
+
+
+StoragePtr DatabaseMaterializedPostgreSQL::detachTable(const String & table_name)
+{
+    /// If there is query context then we need to detach materialized storage.
+    /// If there is no query context then we need to detach internal storage from atomic database.
+    if (CurrentThread::isInitialized() && CurrentThread::get().getQueryContext())
+    {
+        auto & table_to_delete = materialized_tables[table_name];
+        if (!table_to_delete)
+            throw Exception(ErrorCodes::UNKNOWN_TABLE, "Materialized table `{}` does not exist", table_name);
+
+        auto tables_to_replicate = getFormattedTablesList(table_name);
+
+        /// tables_to_replicate can be empty if postgres database had no tables when this database was created.
+        SettingChange new_setting("materialized_postgresql_tables_list", tables_to_replicate);
+        auto alter_query = createAlterSettingsQuery(new_setting);
+
+        {
+            auto current_context = Context::createCopy(getContext()->getGlobalContext());
+            current_context->setInternalQuery(true);
+            InterpreterAlterQuery(alter_query, current_context).execute();
+        }
+
+        auto nested = table_to_delete->as<StorageMaterializedPostgreSQL>()->getNested();
+        if (!nested)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Inner table `{}` does not exist", table_name);
+
+        std::lock_guard lock(handler_mutex);
+        replication_handler->removeTableFromReplication(table_name);
+
+        try
+        {
+            auto current_context = Context::createCopy(getContext()->getGlobalContext());
+            current_context->makeQueryContext();
+            DatabaseAtomic::dropTable(current_context, table_name, true);
+        }
+        catch (Exception & e)
+        {
+            /// We already removed this table from replication and adding it back will be an overkill..
+            /// TODO: this is bad, we leave a table lying somewhere not dropped, and if user will want
+            /// to move it back into replication, he will fail to do so because there is undropped nested with the same name.
+            /// This can also happen if we crash after removing table from replication and before dropping nested.
+            /// As a solution, we could drop a table if it already exists and add a fresh one instead for these two cases.
+            /// TODO: sounds good.
+            materialized_tables.erase(table_name);
+
+            e.addMessage("while removing table `" + table_name + "` from replication");
+            throw;
+        }
+
+        materialized_tables.erase(table_name);
+        return nullptr;
+    }
+    else
+    {
+        return DatabaseAtomic::detachTable(table_name);
+    }
 }
 
 
@@ -176,6 +383,7 @@ void DatabaseMaterializedPostgreSQL::shutdown()
 
 void DatabaseMaterializedPostgreSQL::stopReplication()
 {
+    std::lock_guard lock(handler_mutex);
     if (replication_handler)
         replication_handler->shutdown();
 
@@ -193,6 +401,7 @@ void DatabaseMaterializedPostgreSQL::dropTable(ContextPtr local_context, const S
 
 void DatabaseMaterializedPostgreSQL::drop(ContextPtr local_context)
 {
+    std::lock_guard lock(handler_mutex);
     if (replication_handler)
         replication_handler->shutdownFinal();
 
@@ -207,7 +416,6 @@ DatabaseTablesIteratorPtr DatabaseMaterializedPostgreSQL::getTablesIterator(
     return DatabaseAtomic::getTablesIterator(StorageMaterializedPostgreSQL::makeNestedTableContext(local_context), filter_by_table_name);
 }
 
-
 }
 
 #endif
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
index 915bf44f1f2..5770187ad09 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
@@ -32,7 +32,6 @@ public:
         ContextPtr context_,
         const String & metadata_path_,
         UUID uuid_,
-        const ASTStorage * database_engine_define_,
         bool is_attach_,
         const String & database_name_,
         const String & postgres_database_name,
@@ -43,14 +42,18 @@ public:
 
     String getMetadataPath() const override { return metadata_path; }
 
-    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach, bool skip_startup_tables) override;
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
 
     DatabaseTablesIteratorPtr
     getTablesIterator(ContextPtr context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const override;
 
     StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
-    void createTable(ContextPtr context, const String & name, const StoragePtr & table, const ASTPtr & query) override;
+    void createTable(ContextPtr context, const String & table_name, const StoragePtr & table, const ASTPtr & query) override;
+
+    void attachTable(const String & table_name, const StoragePtr & table, const String & relative_table_path) override;
+
+    StoragePtr detachTable(const String & table_name) override;
 
     void dropTable(ContextPtr local_context, const String & name, bool no_delay) override;
 
@@ -58,12 +61,22 @@ public:
 
     void stopReplication();
 
+    void applySettingsChanges(const SettingsChanges & settings_changes, ContextPtr query_context) override;
+
     void shutdown() override;
 
+    String getPostgreSQLDatabaseName() const { return remote_database_name; }
+
+protected:
+    ASTPtr getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const override;
+
 private:
     void startSynchronization();
 
-    ASTPtr database_engine_define;
+    ASTPtr createAlterSettingsQuery(const SettingChange & new_setting);
+
+    String getFormattedTablesList(const String & except = {}) const;
+
     bool is_attach;
     String remote_database_name;
     postgres::ConnectionInfo connection_info;
@@ -72,6 +85,7 @@ private:
     std::shared_ptr<PostgreSQLReplicationHandler> replication_handler;
     std::map<std::string, StoragePtr> materialized_tables;
     mutable std::mutex tables_mutex;
+    mutable std::mutex handler_mutex;
 };
 
 }
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index 8dad3aa3a5c..f17ee2a8e17 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -39,16 +39,14 @@ DatabasePostgreSQL::DatabasePostgreSQL(
         const String & metadata_path_,
         const ASTStorage * database_engine_define_,
         const String & dbname_,
-        const String & postgres_dbname_,
-        const String & postgres_schema_,
+        const StoragePostgreSQLConfiguration & configuration_,
         postgres::PoolWithFailoverPtr pool_,
         bool cache_tables_)
     : IDatabase(dbname_)
     , WithContext(context_->getGlobalContext())
     , metadata_path(metadata_path_)
     , database_engine_define(database_engine_define_->clone())
-    , postgres_dbname(postgres_dbname_)
-    , postgres_schema(postgres_schema_)
+    , configuration(configuration_)
     , pool(std::move(pool_))
     , cache_tables(cache_tables_)
 {
@@ -59,17 +57,17 @@ DatabasePostgreSQL::DatabasePostgreSQL(
 
 String DatabasePostgreSQL::getTableNameForLogs(const String & table_name) const
 {
-    if (postgres_schema.empty())
-        return fmt::format("{}.{}", postgres_dbname, table_name);
-    return fmt::format("{}.{}.{}", postgres_dbname, postgres_schema, table_name);
+    if (configuration.schema.empty())
+        return fmt::format("{}.{}", configuration.database, table_name);
+    return fmt::format("{}.{}.{}", configuration.database, configuration.schema, table_name);
 }
 
 
 String DatabasePostgreSQL::formatTableName(const String & table_name) const
 {
-    if (postgres_schema.empty())
+    if (configuration.schema.empty())
         return doubleQuoteString(table_name);
-    return fmt::format("{}.{}", doubleQuoteString(postgres_schema), doubleQuoteString(table_name));
+    return fmt::format("{}.{}", doubleQuoteString(configuration.schema), doubleQuoteString(table_name));
 }
 
 
@@ -78,7 +76,7 @@ bool DatabasePostgreSQL::empty() const
     std::lock_guard<std::mutex> lock(mutex);
 
     auto connection_holder = pool->get();
-    auto tables_list = fetchPostgreSQLTablesList(connection_holder->get(), postgres_schema);
+    auto tables_list = fetchPostgreSQLTablesList(connection_holder->get(), configuration.schema);
 
     for (const auto & table_name : tables_list)
         if (!detached_or_dropped.count(table_name))
@@ -94,7 +92,7 @@ DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(ContextPtr local
 
     Tables tables;
     auto connection_holder = pool->get();
-    auto table_names = fetchPostgreSQLTablesList(connection_holder->get(), postgres_schema);
+    auto table_names = fetchPostgreSQLTablesList(connection_holder->get(), configuration.schema);
 
     for (const auto & table_name : table_names)
         if (!detached_or_dropped.count(table_name))
@@ -125,7 +123,7 @@ bool DatabasePostgreSQL::checkPostgresTable(const String & table_name) const
                     "WHERE schemaname != 'pg_catalog' AND {} "
                     "AND tablename = '{}'",
                     formatTableName(table_name),
-                    (postgres_schema.empty() ? "schemaname != 'information_schema'" : "schemaname = " + quoteString(postgres_schema)),
+                    (configuration.schema.empty() ? "schemaname != 'information_schema'" : "schemaname = " + quoteString(configuration.schema)),
                     formatTableName(table_name)));
     }
     catch (pqxx::undefined_table const &)
@@ -179,7 +177,7 @@ StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr,
 
         auto storage = StoragePostgreSQL::create(
                 StorageID(database_name, table_name), pool, table_name,
-                ColumnsDescription{*columns}, ConstraintsDescription{}, String{}, postgres_schema);
+                ColumnsDescription{*columns}, ConstraintsDescription{}, String{}, configuration.schema, configuration.on_conflict);
 
         if (cache_tables)
             cached_tables[table_name] = storage;
@@ -306,7 +304,7 @@ void DatabasePostgreSQL::removeOutdatedTables()
 {
     std::lock_guard<std::mutex> lock{mutex};
     auto connection_holder = pool->get();
-    auto actual_tables = fetchPostgreSQLTablesList(connection_holder->get(), postgres_schema);
+    auto actual_tables = fetchPostgreSQLTablesList(connection_holder->get(), configuration.schema);
 
     if (cache_tables)
     {
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index 629f9eadf2d..0f66a6c7b90 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -10,7 +10,7 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
-
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 namespace DB
 {
@@ -32,8 +32,7 @@ public:
         const String & metadata_path_,
         const ASTStorage * database_engine_define,
         const String & dbname_,
-        const String & postgres_dbname_,
-        const String & postgres_schema_,
+        const StoragePostgreSQLConfiguration & configuration,
         postgres::PoolWithFailoverPtr pool_,
         bool cache_tables_);
 
@@ -70,8 +69,7 @@ protected:
 private:
     String metadata_path;
     ASTPtr database_engine_define;
-    String postgres_dbname;
-    String postgres_schema;
+    StoragePostgreSQLConfiguration configuration;
     postgres::PoolWithFailoverPtr pool;
     const bool cache_tables;
 
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
index 1b77947264e..0495dd8723a 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
@@ -290,12 +290,20 @@ PostgreSQLTableStructure fetchPostgreSQLTableStructure(
         pqxx::ReplicationTransaction & tx, const String & postgres_table_name, bool use_nulls,
         bool with_primary_key, bool with_replica_identity_index);
 
+template
+PostgreSQLTableStructure fetchPostgreSQLTableStructure(
+        pqxx::nontransaction & tx, const String & postgres_table_name, bool use_nulls,
+        bool with_primary_key, bool with_replica_identity_index);
+
 template
 std::unordered_set<std::string> fetchPostgreSQLTablesList(pqxx::work & tx, const String & postgres_schema);
 
 template
 std::unordered_set<std::string> fetchPostgreSQLTablesList(pqxx::ReadTransaction & tx, const String & postgres_schema);
 
+template
+std::unordered_set<std::string> fetchPostgreSQLTablesList(pqxx::nontransaction & tx, const String & postgres_schema);
+
 }
 
 #endif
diff --git a/src/Databases/TablesLoader.cpp b/src/Databases/TablesLoader.cpp
new file mode 100644
index 00000000000..48d751b5795
--- /dev/null
+++ b/src/Databases/TablesLoader.cpp
@@ -0,0 +1,255 @@
+#include <Databases/TablesLoader.h>
+#include <Databases/IDatabase.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExternalDictionariesLoader.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <common/logger_useful.h>
+#include <Common/ThreadPool.h>
+#include <numeric>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INFINITE_LOOP;
+    extern const int LOGICAL_ERROR;
+}
+
+static constexpr size_t PRINT_MESSAGE_EACH_N_OBJECTS = 256;
+static constexpr size_t PRINT_MESSAGE_EACH_N_SECONDS = 5;
+
+
+void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch)
+{
+    if (processed % PRINT_MESSAGE_EACH_N_OBJECTS == 0 || watch.compareAndRestart(PRINT_MESSAGE_EACH_N_SECONDS))
+    {
+        LOG_INFO(log, "{}%", processed * 100.0 / total);
+        watch.restart();
+    }
+}
+
+TablesLoader::TablesLoader(ContextMutablePtr global_context_, Databases databases_, bool force_restore_, bool force_attach_)
+: global_context(global_context_)
+, databases(std::move(databases_))
+, force_restore(force_restore_)
+, force_attach(force_attach_)
+{
+    metadata.default_database = global_context->getCurrentDatabase();
+    log = &Poco::Logger::get("TablesLoader");
+}
+
+
+void TablesLoader::loadTables()
+{
+    bool need_resolve_dependencies = !global_context->getConfigRef().has("ignore_table_dependencies_on_metadata_loading");
+
+    /// Load all Lazy, MySQl, PostgreSQL, SQLite, etc databases first.
+    for (auto & database : databases)
+    {
+        if (need_resolve_dependencies && database.second->supportsLoadingInTopologicalOrder())
+            databases_to_load.push_back(database.first);
+        else
+            database.second->loadStoredObjects(global_context, force_restore, force_attach, true);
+    }
+
+    if (databases_to_load.empty())
+        return;
+
+    /// Read and parse metadata from Ordinary, Atomic, Materialized*, Replicated, etc databases. Build dependency graph.
+    for (auto & database_name : databases_to_load)
+    {
+        databases[database_name]->beforeLoadingMetadata(global_context, force_restore, force_attach);
+        databases[database_name]->loadTablesMetadata(global_context, metadata);
+    }
+
+    LOG_INFO(log, "Parsed metadata of {} tables in {} databases in {} sec",
+             metadata.parsed_tables.size(), databases_to_load.size(), stopwatch.elapsedSeconds());
+
+    stopwatch.restart();
+
+    logDependencyGraph();
+
+    /// Some tables were loaded by database with loadStoredObjects(...). Remove them from graph if necessary.
+    removeUnresolvableDependencies();
+
+    loadTablesInTopologicalOrder(pool);
+}
+
+void TablesLoader::startupTables()
+{
+    /// Startup tables after all tables are loaded. Background tasks (merges, mutations, etc) may slow down data parts loading.
+    for (auto & database : databases)
+        database.second->startupTables(pool, force_restore, force_attach);
+}
+
+
+void TablesLoader::removeUnresolvableDependencies()
+{
+    auto need_exclude_dependency = [this](const QualifiedTableName & dependency_name, const DependenciesInfo & info)
+    {
+        /// Table exists and will be loaded
+        if (metadata.parsed_tables.contains(dependency_name))
+            return false;
+        /// Table exists and it's already loaded
+        if (DatabaseCatalog::instance().isTableExist(StorageID(dependency_name.database, dependency_name.table), global_context))
+            return true;
+        /// It's XML dictionary. It was loaded before tables and DDL dictionaries.
+        if (dependency_name.database == metadata.default_database &&
+            global_context->getExternalDictionariesLoader().has(dependency_name.table))
+            return true;
+
+        /// Some tables depends on table "dependency_name", but there is no such table in DatabaseCatalog and we don't have its metadata.
+        /// We will ignore it and try to load dependent tables without "dependency_name"
+        /// (but most likely dependent tables will fail to load).
+        LOG_WARNING(log, "Tables {} depend on {}, but seems like the it does not exist. Will ignore it and try to load existing tables",
+                    fmt::join(info.dependent_database_objects, ", "), dependency_name);
+
+        if (info.dependencies_count)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} does not exist, but we have seen its AST and found {} dependencies."
+                                                       "It's a bug", dependency_name, info.dependencies_count);
+        if (info.dependent_database_objects.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} does not have dependencies and dependent tables as it expected to."
+                                                       "It's a bug", dependency_name);
+
+        return true;
+    };
+
+    auto table_it = metadata.dependencies_info.begin();
+    while (table_it != metadata.dependencies_info.end())
+    {
+        auto & info = table_it->second;
+        if (need_exclude_dependency(table_it->first, info))
+            table_it = removeResolvedDependency(table_it, metadata.independent_database_objects);
+        else
+            ++table_it;
+    }
+}
+
+void TablesLoader::loadTablesInTopologicalOrder(ThreadPool & pool)
+{
+    /// Load independent tables in parallel.
+    /// Then remove loaded tables from dependency graph, find tables/dictionaries that do not have unresolved dependencies anymore,
+    /// move them to the list of independent tables and load.
+    /// Repeat until we have some tables to load.
+    /// If we do not, then either all objects are loaded or there is cyclic dependency.
+    /// Complexity: O(V + E)
+    size_t level = 0;
+    do
+    {
+        assert(metadata.parsed_tables.size() == tables_processed + metadata.independent_database_objects.size() + getNumberOfTablesWithDependencies());
+        logDependencyGraph();
+
+        startLoadingIndependentTables(pool, level);
+
+        TableNames new_independent_database_objects;
+        for (const auto & table_name : metadata.independent_database_objects)
+        {
+            auto info_it = metadata.dependencies_info.find(table_name);
+            if (info_it == metadata.dependencies_info.end())
+            {
+                /// No tables depend on table_name and it was not even added to dependencies_info
+                continue;
+            }
+            removeResolvedDependency(info_it, new_independent_database_objects);
+        }
+
+        pool.wait();
+
+        metadata.independent_database_objects = std::move(new_independent_database_objects);
+        ++level;
+    } while (!metadata.independent_database_objects.empty());
+
+    checkCyclicDependencies();
+}
+
+DependenciesInfosIter TablesLoader::removeResolvedDependency(const DependenciesInfosIter & info_it, TableNames & independent_database_objects)
+{
+    auto & info = info_it->second;
+    if (info.dependencies_count)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} is in list of independent tables, but dependencies count is {}."
+                                                   "It's a bug", info_it->first, info.dependencies_count);
+    if (info.dependent_database_objects.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} does not have dependent tables. It's a bug", info_it->first);
+
+    /// Decrement number of dependencies for each dependent table
+    for (auto & dependent_table : info.dependent_database_objects)
+    {
+        auto & dependent_info = metadata.dependencies_info[dependent_table];
+        auto & dependencies_count = dependent_info.dependencies_count;
+        if (dependencies_count == 0)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to decrement 0 dependencies counter for {}. It's a bug", dependent_table);
+        --dependencies_count;
+        if (dependencies_count == 0)
+        {
+            independent_database_objects.push_back(dependent_table);
+            if (dependent_info.dependent_database_objects.empty())
+                metadata.dependencies_info.erase(dependent_table);
+        }
+    }
+
+    return metadata.dependencies_info.erase(info_it);
+}
+
+void TablesLoader::startLoadingIndependentTables(ThreadPool & pool, size_t level)
+{
+    size_t total_tables = metadata.parsed_tables.size();
+
+    LOG_INFO(log, "Loading {} tables with {} dependency level", metadata.independent_database_objects.size(), level);
+
+    for (const auto & table_name : metadata.independent_database_objects)
+    {
+        pool.scheduleOrThrowOnError([this, total_tables, &table_name]()
+        {
+            const auto & path_and_query = metadata.parsed_tables[table_name];
+            databases[table_name.database]->loadTableFromMetadata(global_context, path_and_query.path, table_name, path_and_query.ast, force_restore);
+            logAboutProgress(log, ++tables_processed, total_tables, stopwatch);
+        });
+    }
+}
+
+size_t TablesLoader::getNumberOfTablesWithDependencies() const
+{
+    size_t number_of_tables_with_dependencies = 0;
+    for (const auto & info : metadata.dependencies_info)
+        if (info.second.dependencies_count)
+            ++number_of_tables_with_dependencies;
+    return number_of_tables_with_dependencies;
+}
+
+void TablesLoader::checkCyclicDependencies() const
+{
+    /// Loading is finished if all dependencies are resolved
+    if (metadata.dependencies_info.empty())
+        return;
+
+    for (const auto & info : metadata.dependencies_info)
+    {
+        LOG_WARNING(log, "Cannot resolve dependencies: Table {} have {} dependencies and {} dependent tables. List of dependent tables: {}",
+                    info.first, info.second.dependencies_count,
+                    info.second.dependent_database_objects.size(), fmt::join(info.second.dependent_database_objects, ", "));
+        assert(info.second.dependencies_count == 0);
+    }
+
+    throw Exception(ErrorCodes::INFINITE_LOOP, "Cannot attach {} tables due to cyclic dependencies. "
+                                               "See server log for details.", metadata.dependencies_info.size());
+}
+
+void TablesLoader::logDependencyGraph() const
+{
+    LOG_TEST(log, "Have {} independent tables: {}",
+              metadata.independent_database_objects.size(),
+              fmt::join(metadata.independent_database_objects, ", "));
+    for (const auto & dependencies : metadata.dependencies_info)
+    {
+        LOG_TEST(log,
+            "Table {} have {} dependencies and {} dependent tables. List of dependent tables: {}",
+            dependencies.first,
+            dependencies.second.dependencies_count,
+            dependencies.second.dependent_database_objects.size(),
+            fmt::join(dependencies.second.dependent_database_objects, ", "));
+    }
+}
+
+}
diff --git a/src/Databases/TablesLoader.h b/src/Databases/TablesLoader.h
new file mode 100644
index 00000000000..12f6c2e86a5
--- /dev/null
+++ b/src/Databases/TablesLoader.h
@@ -0,0 +1,112 @@
+#pragma once
+#include <Core/Types.h>
+#include <Core/QualifiedTableName.h>
+#include <Parsers/IAST_fwd.h>
+#include <Interpreters/Context_fwd.h>
+#include <Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
+#include <map>
+#include <unordered_map>
+#include <unordered_set>
+#include <mutex>
+
+namespace Poco
+{
+    class Logger;
+}
+
+class AtomicStopwatch;
+
+namespace DB
+{
+
+void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch);
+
+
+class IDatabase;
+using DatabasePtr = std::shared_ptr<IDatabase>;
+
+struct ParsedTableMetadata
+{
+    String path;
+    ASTPtr ast;
+};
+
+using ParsedMetadata = std::map<QualifiedTableName, ParsedTableMetadata>;
+using TableNames = std::vector<QualifiedTableName>;
+
+struct DependenciesInfo
+{
+    /// How many dependencies this table have
+    size_t dependencies_count = 0;
+    /// List of tables/dictionaries which depend on this table/dictionary
+    TableNames dependent_database_objects;
+};
+
+using DependenciesInfos = std::unordered_map<QualifiedTableName, DependenciesInfo>;
+using DependenciesInfosIter = std::unordered_map<QualifiedTableName, DependenciesInfo>::iterator;
+
+struct ParsedTablesMetadata
+{
+    String default_database;
+
+    std::mutex mutex;
+    ParsedMetadata parsed_tables;
+
+    /// For logging
+    size_t total_dictionaries = 0;
+
+    /// List of tables/dictionaries that do not have any dependencies and can be loaded
+    TableNames independent_database_objects;
+
+    /// Actually it contains two different maps (with, probably, intersecting keys):
+    /// 1. table/dictionary name -> number of dependencies
+    /// 2. table/dictionary name -> dependent tables/dictionaries list (adjacency list of dependencies graph).
+    /// If table A depends on table B, then there is an edge B --> A, i.e. dependencies_info[B].dependent_database_objects contains A.
+    /// And dependencies_info[C].dependencies_count is a number of incoming edges for vertex C (how many tables we have to load before C).
+    DependenciesInfos dependencies_info;
+};
+
+/// Loads tables (and dictionaries) from specified databases
+/// taking into account dependencies between them.
+class TablesLoader
+{
+public:
+    using Databases = std::map<String, DatabasePtr>;
+
+    TablesLoader(ContextMutablePtr global_context_, Databases databases_, bool force_restore_ = false, bool force_attach_ = false);
+    TablesLoader() = delete;
+
+    void loadTables();
+    void startupTables();
+
+private:
+    ContextMutablePtr global_context;
+    Databases databases;
+    bool force_restore;
+    bool force_attach;
+
+    Strings databases_to_load;
+    ParsedTablesMetadata metadata;
+    Poco::Logger * log;
+    std::atomic<size_t> tables_processed{0};
+    AtomicStopwatch stopwatch;
+
+    ThreadPool pool;
+
+    void removeUnresolvableDependencies();
+
+    void loadTablesInTopologicalOrder(ThreadPool & pool);
+
+    DependenciesInfosIter removeResolvedDependency(const DependenciesInfosIter & info_it, TableNames & independent_database_objects);
+
+    void startLoadingIndependentTables(ThreadPool & pool, size_t level);
+
+    void checkCyclicDependencies() const;
+
+    size_t getNumberOfTablesWithDependencies() const;
+
+    void logDependencyGraph() const;
+};
+
+}
diff --git a/src/Databases/ya.make b/src/Databases/ya.make
deleted file mode 100644
index 34f47a5edf0..00000000000
--- a/src/Databases/ya.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    DatabaseAtomic.cpp
-    DatabaseDictionary.cpp
-    DatabaseFactory.cpp
-    DatabaseLazy.cpp
-    DatabaseMemory.cpp
-    DatabaseOnDisk.cpp
-    DatabaseOrdinary.cpp
-    DatabaseReplicated.cpp
-    DatabaseReplicatedSettings.cpp
-    DatabaseReplicatedWorker.cpp
-    DatabasesCommon.cpp
-    MySQL/ConnectionMySQLSettings.cpp
-    MySQL/DatabaseMaterializedMySQL.cpp
-    MySQL/DatabaseMySQL.cpp
-    MySQL/FetchTablesColumnsList.cpp
-    MySQL/MaterializeMetadata.cpp
-    MySQL/MaterializedMySQLSettings.cpp
-    MySQL/MaterializedMySQLSyncThread.cpp
-    SQLite/DatabaseSQLite.cpp
-    SQLite/SQLiteUtils.cpp
-    SQLite/fetchSQLiteTableStructure.cpp
-
-)
-
-END()
diff --git a/src/Databases/ya.make.in b/src/Databases/ya.make.in
deleted file mode 100644
index cb8b23b43af..00000000000
--- a/src/Databases/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F examples | grep -v -F 'PostgreSQL' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 0c04d87c959..4ed3b74226e 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -240,8 +240,7 @@ public:
     using ColumnType =
         std::conditional_t<std::is_same_v<DictionaryAttributeType, Array>, ColumnArray,
             std::conditional_t<std::is_same_v<DictionaryAttributeType, String>, ColumnString,
-                std::conditional_t<IsDecimalNumber<DictionaryAttributeType>, ColumnDecimal<DictionaryAttributeType>,
-                    ColumnVector<DictionaryAttributeType>>>>;
+                ColumnVectorOrDecimal<DictionaryAttributeType>>>;
 
     using ColumnPtr = typename ColumnType::MutablePtr;
 
@@ -267,7 +266,7 @@ public:
         {
             return ColumnType::create(size);
         }
-        else if constexpr (IsDecimalNumber<DictionaryAttributeType>)
+        else if constexpr (is_decimal<DictionaryAttributeType>)
         {
             auto nested_type = removeNullable(dictionary_attribute.type);
             auto scale = getDecimalScale(*nested_type);
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 97c1b98a823..82ab58a8c61 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -19,84 +19,37 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNKNOWN_TYPE;
-    extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int TYPE_MISMATCH;
     extern const int BAD_ARGUMENTS;
 }
 
 namespace
 {
-    DictionaryTypedSpecialAttribute makeDictionaryTypedSpecialAttribute(
-        const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, const std::string & default_type)
-    {
-        const auto name = config.getString(config_prefix + ".name", "");
-        const auto expression = config.getString(config_prefix + ".expression", "");
+DictionaryTypedSpecialAttribute makeDictionaryTypedSpecialAttribute(
+    const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, const std::string & default_type)
+{
+    const auto name = config.getString(config_prefix + ".name", "");
+    const auto expression = config.getString(config_prefix + ".expression", "");
 
-        if (name.empty() && !expression.empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty");
-
-        const auto type_name = config.getString(config_prefix + ".type", default_type);
-        return DictionaryTypedSpecialAttribute{std::move(name), std::move(expression), DataTypeFactory::instance().get(type_name)};
-    }
+    if (name.empty() && !expression.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty");
 
+    const auto type_name = config.getString(config_prefix + ".type", default_type);
+    return DictionaryTypedSpecialAttribute{std::move(name), std::move(expression), DataTypeFactory::instance().get(type_name)};
 }
 
-
-AttributeUnderlyingType getAttributeUnderlyingType(const DataTypePtr & type)
+std::optional<AttributeUnderlyingType> maybeGetAttributeUnderlyingType(TypeIndex index)
 {
-    auto type_index = type->getTypeId();
-
-    switch (type_index)
+    switch (index) /// Special cases which do not map TypeIndex::T -> AttributeUnderlyingType::T
     {
-        case TypeIndex::UInt8:          return AttributeUnderlyingType::UInt8;
-        case TypeIndex::UInt16:         return AttributeUnderlyingType::UInt16;
-        case TypeIndex::UInt32:         return AttributeUnderlyingType::UInt32;
-        case TypeIndex::UInt64:         return AttributeUnderlyingType::UInt64;
-        case TypeIndex::UInt128:        return AttributeUnderlyingType::UInt128;
-        case TypeIndex::UInt256:        return AttributeUnderlyingType::UInt256;
-
-        case TypeIndex::Int8:           return AttributeUnderlyingType::Int8;
-        case TypeIndex::Int16:          return AttributeUnderlyingType::Int16;
-        case TypeIndex::Int32:          return AttributeUnderlyingType::Int32;
-        case TypeIndex::Int64:          return AttributeUnderlyingType::Int64;
-        case TypeIndex::Int128:         return AttributeUnderlyingType::Int128;
-        case TypeIndex::Int256:         return AttributeUnderlyingType::Int256;
-
-        case TypeIndex::Float32:        return AttributeUnderlyingType::Float32;
-        case TypeIndex::Float64:        return AttributeUnderlyingType::Float64;
-
-        case TypeIndex::Decimal32:      return AttributeUnderlyingType::Decimal32;
-        case TypeIndex::Decimal64:      return AttributeUnderlyingType::Decimal64;
-        case TypeIndex::Decimal128:     return AttributeUnderlyingType::Decimal128;
-        case TypeIndex::Decimal256:     return AttributeUnderlyingType::Decimal256;
-
-        case TypeIndex::Date:           return AttributeUnderlyingType::UInt16;
-        case TypeIndex::DateTime:       return AttributeUnderlyingType::UInt32;
-        case TypeIndex::DateTime64:     return AttributeUnderlyingType::UInt64;
-
-        case TypeIndex::UUID:           return AttributeUnderlyingType::UUID;
-
-        case TypeIndex::String:         return AttributeUnderlyingType::String;
-
-        case TypeIndex::Array:          return AttributeUnderlyingType::Array;
-
+        case TypeIndex::Date:       return AttributeUnderlyingType::UInt16;
+        case TypeIndex::DateTime:   return AttributeUnderlyingType::UInt32;
+        case TypeIndex::DateTime64: return AttributeUnderlyingType::UInt64;
         default: break;
     }
 
-    throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type {} for dictionary attribute", type->getName());
+    return magic_enum::enum_cast<AttributeUnderlyingType>(static_cast<TypeIndexUnderlying>(index));
 }
-
-
-std::string toString(AttributeUnderlyingType type)
-{
-    switch (type)
-    {
-#define M(TYPE) case AttributeUnderlyingType::TYPE: return #TYPE;
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
-    }
-
-    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Unknown dictionary attribute type {}", toString(static_cast<int>(type)));
 }
 
 
@@ -152,7 +105,7 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
             if (id && attribute.underlying_type != AttributeUnderlyingType::UInt64)
                 throw Exception(ErrorCodes::TYPE_MISMATCH,
                     "Hierarchical attribute type for dictionary with simple key must be UInt64. Actual {}",
-                    toString(attribute.underlying_type));
+                    attribute.underlying_type);
 
             else if (key)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary with complex key does not support hierarchy");
@@ -342,7 +295,12 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         bool is_nullable = initial_type->isNullable();
 
         auto non_nullable_type = removeNullable(initial_type);
-        const auto underlying_type = getAttributeUnderlyingType(non_nullable_type);
+
+        const auto underlying_type_opt = maybeGetAttributeUnderlyingType(non_nullable_type->getTypeId());
+
+        if (!underlying_type_opt)
+            throw Exception(ErrorCodes::UNKNOWN_TYPE,
+                "Unknown type {} for dictionary attribute", non_nullable_type->getName());
 
         const auto expression = config.getString(prefix + "expression", "");
         if (!expression.empty())
@@ -391,7 +349,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
 
         res_attributes.emplace_back(DictionaryAttribute{
             name,
-            underlying_type,
+            *underlying_type_opt,
             initial_type,
             initial_type_serialization,
             expression,
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 6ab849d1d89..6daba422e92 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -11,53 +11,37 @@
 #include <IO/ReadBufferFromString.h>
 #include <DataTypes/IDataType.h>
 #include <Interpreters/IExternalLoadable.h>
+#include <common/EnumReflection.h>
+#include <Core/TypeId.h>
 
 #if defined(__GNUC__)
     /// GCC mistakenly warns about the names in enum class.
     #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-
-#define FOR_ATTRIBUTE_TYPES(M) \
-    M(UInt8) \
-    M(UInt16) \
-    M(UInt32) \
-    M(UInt64) \
-    M(UInt128) \
-    M(UInt256) \
-    M(Int8) \
-    M(Int16) \
-    M(Int32) \
-    M(Int64) \
-    M(Int128) \
-    M(Int256) \
-    M(Float32) \
-    M(Float64) \
-    M(Decimal32) \
-    M(Decimal64) \
-    M(Decimal128) \
-    M(Decimal256) \
-    M(UUID) \
-    M(String) \
-    M(Array) \
-
-
 namespace DB
 {
+using TypeIndexUnderlying = magic_enum::underlying_type_t<TypeIndex>;
 
-enum class AttributeUnderlyingType
+// We need to be able to map TypeIndex -> AttributeUnderlyingType and AttributeUnderlyingType -> real type
+// The first can be done by defining AttributeUnderlyingType enum values to TypeIndex values and then performing
+// a enum_cast.
+// The second can be achieved by using ReverseTypeId
+#define map_item(__T) __T = static_cast<TypeIndexUnderlying>(TypeIndex::__T)
+
+enum class AttributeUnderlyingType : TypeIndexUnderlying
 {
-#define M(TYPE) TYPE,
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
+    map_item(Int8), map_item(Int16), map_item(Int32), map_item(Int64), map_item(Int128), map_item(Int256),
+    map_item(UInt8), map_item(UInt16), map_item(UInt32), map_item(UInt64), map_item(UInt128), map_item(UInt256),
+    map_item(Float32), map_item(Float64),
+    map_item(Decimal32), map_item(Decimal64), map_item(Decimal128), map_item(Decimal256),
+
+    map_item(UUID), map_item(String), map_item(Array)
 };
 
+#undef map_item
 
-AttributeUnderlyingType getAttributeUnderlyingType(const std::string & type);
-
-std::string toString(AttributeUnderlyingType type);
-
-/// Min and max lifetimes for a dictionary or it's entry
+/// Min and max lifetimes for a dictionary or its entry
 using DictionaryLifetime = ExternalLoadableLifetime;
 
 /** Holds the description of a single dictionary attribute:
@@ -85,24 +69,23 @@ struct DictionaryAttribute final
     const bool is_nullable;
 };
 
-template <typename Type>
+template <AttributeUnderlyingType type>
 struct DictionaryAttributeType
 {
-    using AttributeType = Type;
+    /// Converts @c type to it underlying type e.g. AttributeUnderlyingType::UInt8 -> UInt8
+    using AttributeType = ReverseTypeId<
+        static_cast<TypeIndex>(
+            static_cast<TypeIndexUnderlying>(type))>;
 };
 
 template <typename F>
-void callOnDictionaryAttributeType(AttributeUnderlyingType type, F && func)
+constexpr void callOnDictionaryAttributeType(AttributeUnderlyingType type, F && func)
 {
-    switch (type)
+    static_for<AttributeUnderlyingType>([type, func = std::forward<F>(func)](auto other)
     {
-#define M(TYPE) \
-        case AttributeUnderlyingType::TYPE: \
-            func(DictionaryAttributeType<TYPE>()); \
-            break;
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
-    }
+        if (type == other)
+            func(DictionaryAttributeType<other>{});
+    });
 };
 
 struct DictionarySpecialAttribute final
diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index a274e820e65..0a6708416a3 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -72,7 +72,7 @@ Pipe ExecutableDictionarySource::loadAll()
     ShellCommand::Config config(configuration.command);
     auto process = ShellCommand::execute(config);
 
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), log));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process)));
     return pipe;
 }
 
@@ -91,7 +91,7 @@ Pipe ExecutableDictionarySource::loadUpdatedAll()
     LOG_TRACE(log, "loadUpdatedAll {}", command_with_update_field);
     ShellCommand::Config config(command_with_update_field);
     auto process = ShellCommand::execute(config);
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), log));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process)));
     return pipe;
 }
 
@@ -120,13 +120,20 @@ Pipe ExecutableDictionarySource::getStreamForBlock(const Block & block)
     ShellCommandSource::SendDataTask task = {[process_in, block, this]()
     {
         auto & out = *process_in;
+
+        if (configuration.send_chunk_header)
+        {
+            writeText(block.rows(), out);
+            writeChar('\n', out);
+        }
+
         auto output_stream = context->getOutputStream(configuration.format, out, block.cloneEmpty());
         formatBlock(output_stream, block);
         out.close();
     }};
     std::vector<ShellCommandSource::SendDataTask> tasks = {std::move(task)};
 
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), log, std::move(tasks)));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), std::move(tasks)));
 
     if (configuration.implicit_key)
         pipe.addTransform(std::make_shared<TransformWithAdditionalColumns>(block, pipe.getHeader()));
@@ -188,7 +195,8 @@ void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
             .format = config.getString(settings_config_prefix + ".format"),
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
             .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
-            .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false)
+            .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false),
+            .send_chunk_header = config.getBool(settings_config_prefix + ".send_chunk_header", false)
         };
 
         return std::make_unique<ExecutableDictionarySource>(dict_struct, configuration, sample_block, context);
diff --git a/src/Dictionaries/ExecutableDictionarySource.h b/src/Dictionaries/ExecutableDictionarySource.h
index 3133bc12b09..5b20deceb28 100644
--- a/src/Dictionaries/ExecutableDictionarySource.h
+++ b/src/Dictionaries/ExecutableDictionarySource.h
@@ -19,13 +19,15 @@ public:
 
     struct Configuration
     {
-        const std::string command;
-        const std::string format;
-        const std::string update_field;
-        const UInt64 update_lag;
+        std::string command;
+        std::string format;
+        std::string update_field;
+        UInt64 update_lag;
         /// Implicit key means that the source script will return only values,
         /// and the correspondence to the requested keys is determined implicitly - by the order of rows in the result.
-        const bool implicit_key;
+        bool implicit_key;
+        /// Send number_of_rows\n before sending chunk to process
+        bool send_chunk_header;
     };
 
     ExecutableDictionarySource(
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
index c5d081bb3e6..c5ae4803fd4 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -100,7 +100,7 @@ Pipe ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
         config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, configuration.command_termination_timeout };
         auto shell_command = ShellCommand::execute(config);
         return shell_command;
-    }, configuration.max_command_execution_time * 10000);
+    }, configuration.max_command_execution_time * 1000);
 
     if (!result)
         throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
@@ -112,6 +112,13 @@ Pipe ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
     ShellCommandSource::SendDataTask task = [process_in, block, this]() mutable
     {
         auto & out = *process_in;
+
+        if (configuration.send_chunk_header)
+        {
+            writeText(block.rows(), out);
+            writeChar('\n', out);
+        }
+
         auto output_stream = context->getOutputStream(configuration.format, out, block.cloneEmpty());
         formatBlock(output_stream, block);
     };
@@ -120,7 +127,7 @@ Pipe ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
     ShellCommandSourceConfiguration command_configuration;
     command_configuration.read_fixed_number_of_rows = true;
     command_configuration.number_of_rows_to_read = rows_to_read;
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), log, std::move(tasks), command_configuration, process_pool));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), std::move(tasks), command_configuration, process_pool));
 
     if (configuration.implicit_key)
         pipe.addTransform(std::make_shared<TransformWithAdditionalColumns>(block, pipe.getHeader()));
@@ -190,6 +197,7 @@ void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
             .command_termination_timeout = config.getUInt64(settings_config_prefix + ".command_termination_timeout", 10),
             .max_command_execution_time = max_command_execution_time,
             .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false),
+            .send_chunk_header = config.getBool(settings_config_prefix + ".send_chunk_header", false)
         };
 
         return std::make_unique<ExecutablePoolDictionarySource>(dict_struct, configuration, sample_block, context);
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.h b/src/Dictionaries/ExecutablePoolDictionarySource.h
index b80122fb56f..2ccb4ce4b8d 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.h
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.h
@@ -27,14 +27,16 @@ class ExecutablePoolDictionarySource final : public IDictionarySource
 public:
     struct Configuration
     {
-        const String command;
-        const String format;
-        const size_t pool_size;
-        const size_t command_termination_timeout;
-        const size_t max_command_execution_time;
+        String command;
+        String format;
+        size_t pool_size;
+        size_t command_termination_timeout;
+        size_t max_command_execution_time;
         /// Implicit key means that the source script will return only values,
         /// and the correspondence to the requested keys is determined implicitly - by the order of rows in the result.
-        const bool implicit_key;
+        bool implicit_key;
+        /// Send number_of_rows\n before sending chunk to process
+        bool send_chunk_header;
     };
 
     ExecutablePoolDictionarySource(
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index d7778cc0022..a62fb4a788e 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -1,22 +1,17 @@
 #pragma once
 
-
 #include <Core/Names.h>
-#include <DataStreams/IBlockStream_fwd.h>
 #include <Interpreters/IExternalLoadable.h>
 #include <Interpreters/StorageID.h>
-#include <Poco/Util/XMLConfiguration.h>
-#include <Common/PODArray.h>
-#include <common/StringRef.h>
-#include "IDictionarySource.h"
+#include <Columns/ColumnsNumber.h>
+#include <Dictionaries/IDictionarySource.h>
 #include <Dictionaries/DictionaryStructure.h>
 #include <DataTypes/IDataType.h>
-#include <Columns/ColumnsNumber.h>
 
-#include <chrono>
 #include <memory>
 #include <mutex>
 
+
 namespace DB
 {
 namespace ErrorCodes
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
index 23ea9bc00e2..b811a50121b 100644
--- a/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -2,6 +2,8 @@
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
+#include <Storages/ExternalDataSourceConfiguration.h>
+
 
 namespace DB
 {
@@ -13,19 +15,34 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
         const Poco::Util::AbstractConfiguration & config,
         const std::string & root_config_prefix,
         Block & sample_block,
-        ContextPtr,
+        ContextPtr context,
         const std::string & /* default_database */,
         bool /* created_from_ddl */)
     {
         const auto config_prefix = root_config_prefix + ".mongodb";
+        ExternalDataSourceConfiguration configuration;
+        auto named_collection = getExternalDataSourceConfiguration(config, config_prefix, context);
+        if (named_collection)
+        {
+            configuration = *named_collection;
+        }
+        else
+        {
+            configuration.host = config.getString(config_prefix + ".host", "");
+            configuration.port = config.getUInt(config_prefix + ".port", 0);
+            configuration.username = config.getString(config_prefix + ".user", "");
+            configuration.password = config.getString(config_prefix + ".password", "");
+            configuration.database = config.getString(config_prefix + ".db", "");
+        }
+
         return std::make_unique<MongoDBDictionarySource>(dict_struct,
             config.getString(config_prefix + ".uri", ""),
-            config.getString(config_prefix + ".host", ""),
-            config.getUInt(config_prefix + ".port", 0),
-            config.getString(config_prefix + ".user", ""),
-            config.getString(config_prefix + ".password", ""),
+            configuration.host,
+            configuration.port,
+            configuration.username,
+            configuration.password,
             config.getString(config_prefix + ".method", ""),
-            config.getString(config_prefix + ".db", ""),
+            configuration.database,
             config.getString(config_prefix + ".collection"),
             sample_block);
     };
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index bd53c1e60a7..c740cc7548c 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -12,6 +12,8 @@
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Processors/Pipe.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
+
 
 namespace DB
 {
@@ -32,38 +34,49 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
                                    [[maybe_unused]] const std::string & config_prefix,
                                    [[maybe_unused]] Block & sample_block,
                                    [[maybe_unused]] ContextPtr global_context,
-                                 const std::string & /* default_database */,
-                                 bool /* created_from_ddl */) -> DictionarySourcePtr {
+                                   const std::string & /* default_database */,
+                                   [[maybe_unused]] bool created_from_ddl) -> DictionarySourcePtr {
 #if USE_MYSQL
-        StreamSettings mysql_input_stream_settings(global_context->getSettingsRef()
-            , config.getBool(config_prefix + ".mysql.close_connection", false) || config.getBool(config_prefix + ".mysql.share_connection", false)
-            , false
-            , config.getBool(config_prefix + ".mysql.fail_on_connection_loss", false) ? 1 : default_num_tries_on_connection_loss);
+        StreamSettings mysql_input_stream_settings(
+            global_context->getSettingsRef(),
+            config.getBool(config_prefix + ".mysql.close_connection", false) || config.getBool(config_prefix + ".mysql.share_connection", false),
+            false,
+            config.getBool(config_prefix + ".mysql.fail_on_connection_loss", false) ? 1 : default_num_tries_on_connection_loss);
 
         auto settings_config_prefix = config_prefix + ".mysql";
+        std::shared_ptr<mysqlxx::PoolWithFailover> pool;
+        ExternalDataSourceConfiguration configuration;
+        auto named_collection = created_from_ddl ? getExternalDataSourceConfiguration(config, settings_config_prefix, global_context) : std::nullopt;
+        if (named_collection)
+        {
+            configuration = *named_collection;
+            std::vector<std::pair<String, UInt16>> addresses{std::make_pair(configuration.host, configuration.port)};
+            pool = std::make_shared<mysqlxx::PoolWithFailover>(configuration.database, addresses, configuration.username, configuration.password);
+        }
+        else
+        {
+            configuration.database = config.getString(settings_config_prefix + ".db", "");
+            configuration.table = config.getString(settings_config_prefix + ".table", "");
+            pool = std::make_shared<mysqlxx::PoolWithFailover>(mysqlxx::PoolFactory::instance().get(config, settings_config_prefix));
+        }
 
-        auto table = config.getString(settings_config_prefix + ".table", "");
-        auto where = config.getString(settings_config_prefix + ".where", "");
         auto query = config.getString(settings_config_prefix + ".query", "");
-
-        if (query.empty() && table.empty())
+        if (query.empty() && configuration.table.empty())
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "MySQL dictionary source configuration must contain table or query field");
 
-        MySQLDictionarySource::Configuration configuration
+        MySQLDictionarySource::Configuration dictionary_configuration
         {
-            .db = config.getString(settings_config_prefix + ".db", ""),
-            .table = table,
+            .db = configuration.database,
+            .table = configuration.table,
             .query = query,
-            .where = where,
+            .where = config.getString(settings_config_prefix + ".where", ""),
             .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
             .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
             .dont_check_update_time = config.getBool(settings_config_prefix + ".dont_check_update_time", false)
         };
 
-        auto pool = std::make_shared<mysqlxx::PoolWithFailover>(mysqlxx::PoolFactory::instance().get(config, settings_config_prefix));
-
-        return std::make_unique<MySQLDictionarySource>(dict_struct, configuration, std::move(pool), sample_block, mysql_input_stream_settings);
+        return std::make_unique<MySQLDictionarySource>(dict_struct, dictionary_configuration, std::move(pool), sample_block, mysql_input_stream_settings);
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
             "Dictionary source of type `mysql` is disabled because ClickHouse was built without mysql support.");
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index 3fe9e899cd9..56b75f024ad 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -1,6 +1,7 @@
 #include "PostgreSQLDictionarySource.h"
 
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Core/QualifiedTableName.h>
 #include "DictionarySourceFactory.h"
 #include "registerDictionaries.h"
 
@@ -10,6 +11,7 @@
 #include <DataStreams/PostgreSQLSource.h>
 #include "readInvalidateQuery.h"
 #include <Interpreters/Context.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #endif
 
 
@@ -29,19 +31,13 @@ namespace
 {
     ExternalQueryBuilder makeExternalQueryBuilder(const DictionaryStructure & dict_struct, const String & schema, const String & table, const String & query, const String & where)
     {
-        auto schema_value = schema;
-        auto table_value = table;
+        QualifiedTableName qualified_name{schema, table};
+
+        if (qualified_name.database.empty() && !qualified_name.table.empty())
+            qualified_name = QualifiedTableName::parseFromString(qualified_name.table);
 
-        if (schema_value.empty())
-        {
-            if (auto pos = table_value.find('.'); pos != std::string::npos)
-            {
-                schema_value = table_value.substr(0, pos);
-                table_value = table_value.substr(pos + 1);
-            }
-        }
         /// Do not need db because it is already in a connection string.
-        return {dict_struct, "", schema_value, table_value, query, where, IdentifierQuotingStyle::DoubleQuotes};
+        return {dict_struct, "", qualified_name.database, qualified_name.table, query, where, IdentifierQuotingStyle::DoubleQuotes};
     }
 }
 
@@ -182,22 +178,24 @@ void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 ContextPtr global_context,
+                                 ContextPtr context,
                                  const std::string & /* default_database */,
                                  bool /* created_from_ddl */) -> DictionarySourcePtr
     {
 #if USE_LIBPQXX
         const auto settings_config_prefix = config_prefix + ".postgresql";
-        auto pool = std::make_shared<postgres::PoolWithFailover>(
-                    config, settings_config_prefix,
-                    global_context->getSettingsRef().postgresql_connection_pool_size,
-                    global_context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
-        PostgreSQLDictionarySource::Configuration configuration
+        auto configuration = getExternalDataSourceConfigurationByPriority(config, settings_config_prefix, context);
+        auto pool = std::make_shared<postgres::PoolWithFailover>(
+                    configuration.replicas_configurations,
+                    context->getSettingsRef().postgresql_connection_pool_size,
+                    context->getSettingsRef().postgresql_connection_pool_wait_timeout);
+
+        PostgreSQLDictionarySource::Configuration dictionary_configuration
         {
-            .db = config.getString(fmt::format("{}.db", settings_config_prefix), ""),
-            .schema = config.getString(fmt::format("{}.schema", settings_config_prefix), ""),
-            .table = config.getString(fmt::format("{}.table", settings_config_prefix), ""),
+            .db = configuration.database,
+            .schema = configuration.schema,
+            .table = configuration.table,
             .query = config.getString(fmt::format("{}.query", settings_config_prefix), ""),
             .where = config.getString(fmt::format("{}.where", settings_config_prefix), ""),
             .invalidate_query = config.getString(fmt::format("{}.invalidate_query", settings_config_prefix), ""),
@@ -205,13 +203,13 @@ void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
             .update_lag = config.getUInt64(fmt::format("{}.update_lag", settings_config_prefix), 1)
         };
 
-        return std::make_unique<PostgreSQLDictionarySource>(dict_struct, configuration, pool, sample_block);
+        return std::make_unique<PostgreSQLDictionarySource>(dict_struct, dictionary_configuration, pool, sample_block);
 #else
         (void)dict_struct;
         (void)config;
         (void)config_prefix;
         (void)sample_block;
-        (void)global_context;
+        (void)context;
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
             "Dictionary source of type `postgresql` is disabled because ClickHouse was built without postgresql support.");
 #endif
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 9fc7e92634b..bf7526580c0 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -38,29 +38,22 @@ namespace
                                                   const std::string & where_,
                                                   IXDBCBridgeHelper & bridge_)
     {
-        std::string schema = schema_;
-        std::string table = table_;
+        QualifiedTableName qualified_name{schema_, table_};
 
         if (bridge_.isSchemaAllowed())
         {
-            if (schema.empty())
-            {
-                if (auto pos = table.find('.'); pos != std::string::npos)
-                {
-                    schema = table.substr(0, pos);
-                    table = table.substr(pos + 1);
-                }
-            }
+            if (qualified_name.database.empty())
+                qualified_name = QualifiedTableName::parseFromString(qualified_name.table);
         }
         else
         {
-            if (!schema.empty())
+            if (!qualified_name.database.empty())
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Dictionary source of type {} specifies a schema but schema is not supported by {}-driver",
                     bridge_.getName());
         }
 
-        return {dict_struct_, db_, schema, table, query_, where_, bridge_.getIdentifierQuotingStyle()};
+        return {dict_struct_, db_, qualified_name.database, qualified_name.table, query_, where_, bridge_.getIdentifierQuotingStyle()};
     }
 }
 
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index c8cb2611651..341a89bfc06 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -4,7 +4,6 @@
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/Text.h>
-#include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/queryToString.h>
@@ -16,6 +15,8 @@
 #include <Parsers/ASTDictionaryAttributeDeclaration.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Functions/FunctionFactory.h>
+#include <Common/isLocalAddress.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -27,12 +28,14 @@ namespace ErrorCodes
     extern const int INCORRECT_DICTIONARY_DEFINITION;
 }
 
+
 /// There are a lot of code, but it's very simple and straightforward
-/// We just convert
+/// We just perform conversion.
 namespace
 {
 
 using NamesToTypeNames = std::unordered_map<std::string, std::string>;
+
 /// Get value from field and convert it to string.
 /// Also remove quotes from strings.
 String getFieldAsString(const Field & field)
@@ -45,8 +48,8 @@ String getFieldAsString(const Field & field)
 
 using namespace Poco;
 using namespace Poco::XML;
-/*
- * Transforms next definition
+
+/* Transforms next definition
  *  LIFETIME(MIN 10, MAX 100)
  * to the next configuration
  *  <lifetime>
@@ -75,8 +78,7 @@ void buildLifetimeConfiguration(
     }
 }
 
-/*
- * Transforms next definition
+/* Transforms next definition
  *  LAYOUT(FLAT())
  * to the next configuration
  *  <layout>
@@ -103,6 +105,7 @@ void buildLayoutConfiguration(
     layout_element->appendChild(layout_type_element);
 
     if (layout->parameters)
+    {
         for (const auto & param : layout->parameters->children)
         {
             const ASTPair * pair = param->as<ASTPair>();
@@ -135,10 +138,11 @@ void buildLayoutConfiguration(
             layout_type_parameter_element->appendChild(value_to_append);
             layout_type_element->appendChild(layout_type_parameter_element);
         }
+    }
 }
 
-/*
- * Transforms next definition
+
+/* Transforms next definition
  *  RANGE(MIN StartDate, MAX EndDate)
  * to the next configuration
  *  <range_min><name>StartDate</name></range_min>
@@ -181,9 +185,9 @@ Names getPrimaryKeyColumns(const ASTExpressionList * primary_key)
     Names result;
     const auto & children = primary_key->children;
 
-    for (size_t index = 0; index != children.size(); ++index)
+    for (const auto & child : children)
     {
-        const ASTIdentifier * key_part = children[index]->as<const ASTIdentifier>();
+        const ASTIdentifier * key_part = child->as<const ASTIdentifier>();
         result.push_back(key_part->name());
     }
     return result;
@@ -215,8 +219,7 @@ void buildAttributeExpressionIfNeeded(
     }
 }
 
-/**
-  * Transofrms single dictionary attribute to configuration
+/** Transofrms single dictionary attribute to configuration
   *  third_column UInt8 DEFAULT 2 EXPRESSION rand() % 100 * 77
   * to
   *  <attribute>
@@ -280,8 +283,7 @@ void buildSingleAttribute(
 }
 
 
-/**
-  * Transforms
+/** Transforms
   *   PRIMARY KEY Attr1 ,..., AttrN
   * to the next configuration
   *  <id><name>Attr1</name></id>
@@ -368,8 +370,7 @@ void buildPrimaryKeyConfiguration(
 }
 
 
-/**
-  * Transforms list of ASTDictionaryAttributeDeclarations to list of dictionary attributes
+/** Transforms list of ASTDictionaryAttributeDeclarations to list of dictionary attributes
   */
 NamesToTypeNames buildDictionaryAttributesConfiguration(
     AutoPtr<Document> doc,
@@ -402,9 +403,9 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
     ContextPtr context)
 {
     const auto & children = ast_expr_list->children;
-    for (size_t i = 0; i != children.size(); ++i)
+    for (const auto & child : children)
     {
-        const ASTPair * pair = children[i]->as<const ASTPair>();
+        const ASTPair * pair = child->as<const ASTPair>();
         AutoPtr<Element> current_xml_element(doc->createElement(pair->first));
         root->appendChild(current_xml_element);
 
@@ -576,4 +577,28 @@ getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextPtr conte
     return conf;
 }
 
+std::optional<ClickHouseDictionarySourceInfo>
+getInfoIfClickHouseDictionarySource(DictionaryConfigurationPtr & config, ContextPtr global_context)
+{
+    ClickHouseDictionarySourceInfo info;
+
+    String host = config->getString("dictionary.source.clickhouse.host", "");
+    UInt16 port = config->getUInt("dictionary.source.clickhouse.port", 0);
+    String database = config->getString("dictionary.source.clickhouse.db", "");
+    String table = config->getString("dictionary.source.clickhouse.table", "");
+    bool secure = config->getBool("dictionary.source.clickhouse.secure", false);
+
+    if (host.empty() || port == 0 || table.empty())
+        return {};
+
+    info.table_name = {database, table};
+
+    UInt16 default_port = secure ? global_context->getTCPPortSecure().value_or(0) : global_context->getTCPPort();
+    if (!isLocalAddress({host, port}, default_port))
+        return info;
+
+    info.is_local = true;
+    return info;
+}
+
 }
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.h b/src/Dictionaries/getDictionaryConfigurationFromAST.h
index b464fdf1d8c..ec44b9815ff 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.h
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.h
@@ -15,4 +15,13 @@ using DictionaryConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfigurati
 DictionaryConfigurationPtr
 getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextPtr context, const std::string & database_ = "");
 
+struct ClickHouseDictionarySourceInfo
+{
+    QualifiedTableName table_name;
+    bool is_local = false;
+};
+
+std::optional<ClickHouseDictionarySourceInfo>
+getInfoIfClickHouseDictionarySource(DictionaryConfigurationPtr & config, ContextPtr global_context);
+
 }
diff --git a/src/Dictionaries/ya.make b/src/Dictionaries/ya.make
deleted file mode 100644
index 6498367bb6a..00000000000
--- a/src/Dictionaries/ya.make
+++ /dev/null
@@ -1,72 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/Data
-    contrib/libs/poco/MongoDB
-    contrib/libs/poco/Redis
-    contrib/libs/sparsehash
-    contrib/restricted/abseil-cpp
-)
-
-IF (USE_ODBC)
-    PEERDIR(contrib/libs/poco/Data/ODBC)
-ENDIF ()
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-    CacheDictionary.cpp
-    CacheDictionaryUpdateQueue.cpp
-    CassandraDictionarySource.cpp
-    CassandraHelpers.cpp
-    CassandraSource.cpp
-    ClickHouseDictionarySource.cpp
-    DictionaryFactory.cpp
-    DictionaryHelpers.cpp
-    DictionarySource.cpp
-    DictionarySourceBase.cpp
-    DictionarySourceFactory.cpp
-    DictionarySourceHelpers.cpp
-    DictionaryStructure.cpp
-    DirectDictionary.cpp
-    Embedded/GeoDictionariesLoader.cpp
-    Embedded/GeodataProviders/HierarchiesProvider.cpp
-    Embedded/GeodataProviders/HierarchyFormatReader.cpp
-    Embedded/GeodataProviders/NamesFormatReader.cpp
-    Embedded/GeodataProviders/NamesProvider.cpp
-    Embedded/RegionsHierarchies.cpp
-    Embedded/RegionsHierarchy.cpp
-    Embedded/RegionsNames.cpp
-    ExecutableDictionarySource.cpp
-    ExecutablePoolDictionarySource.cpp
-    ExternalQueryBuilder.cpp
-    FileDictionarySource.cpp
-    FlatDictionary.cpp
-    HTTPDictionarySource.cpp
-    HashedDictionary.cpp
-    HierarchyDictionariesUtils.cpp
-    IPAddressDictionary.cpp
-    LibraryDictionarySource.cpp
-    MongoDBDictionarySource.cpp
-    MySQLDictionarySource.cpp
-    PolygonDictionary.cpp
-    PolygonDictionaryImplementations.cpp
-    PolygonDictionaryUtils.cpp
-    RangeHashedDictionary.cpp
-    RedisDictionarySource.cpp
-    RedisSource.cpp
-    XDBCDictionarySource.cpp
-    getDictionaryConfigurationFromAST.cpp
-    readInvalidateQuery.cpp
-    registerCacheDictionaries.cpp
-    registerDictionaries.cpp
-    writeParenthesisedString.cpp
-
-)
-
-END()
diff --git a/src/Dictionaries/ya.make.in b/src/Dictionaries/ya.make.in
deleted file mode 100644
index 051696a18ed..00000000000
--- a/src/Dictionaries/ya.make.in
+++ /dev/null
@@ -1,25 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/Data
-    contrib/libs/poco/MongoDB
-    contrib/libs/poco/Redis
-    contrib/libs/sparsehash
-    contrib/restricted/abseil-cpp
-)
-
-IF (USE_ODBC)
-    PEERDIR(contrib/libs/poco/Data/ODBC)
-ENDIF ()
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -P 'tests|PostgreSQL' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 5958b29b23b..9d7988ddfc3 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -1,32 +1,21 @@
 #include "DiskWebServer.h"
 
 #include <common/logger_useful.h>
-
 #include <Common/escapeForFileName.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
+
+#include <Disks/IDiskRemote.h>
+#include <Disks/ReadIndirectBufferFromRemoteFS.h>
 #include <Disks/ReadIndirectBufferFromWebServer.h>
+
+#include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/SeekAvoidingReadBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
-#include <Disks/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IDiskRemote.h>
-#include <Access/AccessControlManager.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+
 #include <Poco/Exception.h>
 
-#include <re2/re2.h>
-
-
-#define UUID_PATTERN "[\\w]{8}-[\\w]{4}-[\\w]{4}-[\\w]{4}-[\\w]{12}"
-#define EXTRACT_UUID_PATTERN fmt::format(".*/({})/.*", UUID_PATTERN)
-
-#define DIRECTORY_FILE_PATTERN(prefix) fmt::format("{}-({})-(\\w+)-(.*)", prefix, UUID_PATTERN)
-#define ROOT_FILE_PATTERN(prefix) fmt::format("{}-({})-(\\w+\\.\\w+)", prefix, UUID_PATTERN)
-
-#define MATCH_DIRECTORY_FILE_PATTERN fmt::format(".*/({})/(\\w+)/(.*)", UUID_PATTERN)
-#define MATCH_DIRECTORY_PATTERN fmt::format(".*/({})/(\\w+)/", UUID_PATTERN)
-#define MATCH_ROOT_FILE_PATTERN fmt::format(".*/({})/(\\w+\\.\\w+)", UUID_PATTERN)
-
 
 namespace DB
 {
@@ -34,87 +23,85 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int DIRECTORY_DOESNT_EXIST;
     extern const int NETWORK_ERROR;
-    extern const int NOT_IMPLEMENTED;
 }
 
 
-void DiskWebServer::Metadata::initialize(const String & uri_with_path, const String & files_prefix, const String & table_uuid, ContextPtr context) const
+void DiskWebServer::initialize(const String & uri_path) const
 {
-    ReadWriteBufferFromHTTP metadata_buf(Poco::URI(fs::path(uri_with_path) / (".index-" + table_uuid)),
-                                         Poco::Net::HTTPRequest::HTTP_GET,
-                                         ReadWriteBufferFromHTTP::OutStreamCallback(),
-                                         ConnectionTimeouts::getHTTPTimeouts(context));
-    String uuid, directory, file, remote_file_name;
-    size_t file_size;
-
-    while (!metadata_buf.eof())
+    std::vector<String> directories_to_load;
+    LOG_TRACE(log, "Loading metadata for directory: {}", uri_path);
+    try
     {
-        readText(remote_file_name, metadata_buf);
-        assertChar('\t', metadata_buf);
-        readIntText(file_size, metadata_buf);
-        assertChar('\n', metadata_buf);
-        LOG_DEBUG(&Poco::Logger::get("DiskWeb"), "Read file: {}, size: {}", remote_file_name, file_size);
+        ReadWriteBufferFromHTTP metadata_buf(Poco::URI(fs::path(uri_path) / ".index"),
+                                            Poco::Net::HTTPRequest::HTTP_GET,
+                                            ReadWriteBufferFromHTTP::OutStreamCallback(),
+                                            ConnectionTimeouts::getHTTPTimeouts(getContext()));
+        String file_name;
+        FileData file_data{};
 
-        /*
-         * URI/   {prefix}-{uuid}-all_x_x_x-{file}
-         *        ...
-         *        {prefix}-{uuid}-format_version.txt
-         *        {prefix}-{uuid}-detached-{file}
-         *        ...
-        **/
-        if (RE2::FullMatch(remote_file_name, DIRECTORY_FILE_PATTERN(files_prefix), &uuid, &directory, &file))
+        String dir_name = fs::path(uri_path.substr(url.size())) / "";
+        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding directory: {}", dir_name);
+
+        while (!metadata_buf.eof())
         {
-            if (uuid != table_uuid)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected uuid: {}, expected: {}", uuid, table_uuid);
+            readText(file_name, metadata_buf);
+            assertChar('\t', metadata_buf);
 
-            tables_data[uuid][directory].emplace(std::make_pair(file, file_size));
-        }
-        else if (RE2::FullMatch(remote_file_name, ROOT_FILE_PATTERN(files_prefix), &uuid, &file))
-        {
-            if (uuid != table_uuid)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected uuid: {}, expected: {}", uuid, table_uuid);
+            bool is_directory;
+            readBoolText(is_directory, metadata_buf);
+            if (!is_directory)
+            {
+                assertChar('\t', metadata_buf);
+                readIntText(file_data.size, metadata_buf);
+            }
+            assertChar('\n', metadata_buf);
 
-            tables_data[uuid][file].emplace(std::make_pair(file, file_size));
+            file_data.type = is_directory ? FileType::Directory : FileType::File;
+            String file_path = fs::path(uri_path) / file_name;
+            if (file_data.type == FileType::Directory)
+            {
+                directories_to_load.push_back(file_path);
+                // file_path = fs::path(file_path) / "";
+            }
+
+            file_path = file_path.substr(url.size());
+            files.emplace(std::make_pair(file_path, file_data));
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding file: {}, size: {}", file_path, file_data.size);
         }
-        else
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected file: {}", remote_file_name);
+
+        files.emplace(std::make_pair(dir_name, FileData({ .type = FileType::Directory })));
     }
+    catch (Exception & e)
+    {
+        e.addMessage("while loading disk metadata");
+        throw;
+    }
+
+    for (const auto & directory_path : directories_to_load)
+        initialize(directory_path);
 }
 
 
-template <typename Directory>
-class DiskWebDirectoryIterator final : public IDiskDirectoryIterator
+class DiskWebServerDirectoryIterator final : public IDiskDirectoryIterator
 {
 public:
-
-    DiskWebDirectoryIterator(Directory & directory_, const String & directory_root_)
-        : directory(directory_), iter(directory.begin()), directory_root(directory_root_)
-    {
-    }
+    explicit DiskWebServerDirectoryIterator(std::vector<fs::path> && dir_file_paths_)
+        : dir_file_paths(std::move(dir_file_paths_)), iter(dir_file_paths.begin()) {}
 
     void next() override { ++iter; }
 
-    bool isValid() const override
-    {
-        return iter != directory.end();
-    }
+    bool isValid() const override { return iter != dir_file_paths.end(); }
 
-    String path() const override
-    {
-        return fs::path(directory_root) / name();
-    }
+    String path() const override { return iter->string(); }
 
-    String name() const override
-    {
-        return iter->first;
-    }
+    String name() const override { return iter->filename(); }
 
 private:
-    Directory & directory;
-    typename Directory::iterator iter;
-    const String directory_root;
+    std::vector<fs::path> dir_file_paths;
+    std::vector<fs::path>::iterator iter;
 };
 
 
@@ -125,204 +112,156 @@ public:
             const String & uri_,
             RemoteMetadata metadata_,
             ContextPtr context_,
-            size_t max_read_tries_,
-            size_t buf_size_)
+            size_t buf_size_,
+            size_t backoff_threshold_,
+            size_t max_tries_)
         : ReadIndirectBufferFromRemoteFS<ReadIndirectBufferFromWebServer>(metadata_)
         , uri(uri_)
         , context(context_)
-        , max_read_tries(max_read_tries_)
         , buf_size(buf_size_)
+        , backoff_threshold(backoff_threshold_)
+        , max_tries(max_tries_)
     {
     }
 
     std::unique_ptr<ReadIndirectBufferFromWebServer> createReadBuffer(const String & path) override
     {
-        return std::make_unique<ReadIndirectBufferFromWebServer>(fs::path(uri) / path, context, max_read_tries, buf_size);
+        return std::make_unique<ReadIndirectBufferFromWebServer>(fs::path(uri) / path, context, buf_size, backoff_threshold, max_tries);
     }
 
 private:
     String uri;
     ContextPtr context;
-    size_t max_read_tries;
     size_t buf_size;
-};
-
-
-class WriteBufferFromNothing : public WriteBufferFromFile
-{
-public:
-    WriteBufferFromNothing() : WriteBufferFromFile("/dev/null") {}
-
-    void sync() override {}
+    size_t backoff_threshold;
+    size_t max_tries;
 };
 
 
 DiskWebServer::DiskWebServer(
             const String & disk_name_,
-            const String & uri_,
-            const String & metadata_path_,
+            const String & url_,
             ContextPtr context_,
-            SettingsPtr settings_)
+            size_t min_bytes_for_seek_)
         : WithContext(context_->getGlobalContext())
         , log(&Poco::Logger::get("DiskWeb"))
-        , uri(uri_)
+        , url(url_)
         , name(disk_name_)
-        , metadata_path(metadata_path_)
-        , settings(std::move(settings_))
+        , min_bytes_for_seek(min_bytes_for_seek_)
 {
 }
 
 
-String DiskWebServer::getFileName(const String & path) const
+bool DiskWebServer::exists(const String & path) const
 {
-    String result;
+    LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Checking existence of path: {}", path);
 
-    if (RE2::FullMatch(path, MATCH_DIRECTORY_FILE_PATTERN)
-        && RE2::Extract(path, MATCH_DIRECTORY_FILE_PATTERN, fmt::format(R"({}-\1-\2-\3)", settings->files_prefix), &result))
-        return result;
-
-    if (RE2::FullMatch(path, MATCH_ROOT_FILE_PATTERN)
-        && RE2::Extract(path, MATCH_ROOT_FILE_PATTERN, fmt::format(R"({}-\1-\2)", settings->files_prefix), &result))
-        return result;
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected file: {}", path);
-}
-
-
-bool DiskWebServer::findFileInMetadata(const String & path, File & file_info) const
-{
-    String table_uuid, directory_name, file_name;
-
-    if (RE2::FullMatch(path, MATCH_DIRECTORY_FILE_PATTERN, &table_uuid, &directory_name, &file_name)
-       || RE2::FullMatch(path, MATCH_ROOT_FILE_PATTERN, &table_uuid, &file_name)
-       || RE2::FullMatch(path, MATCH_DIRECTORY_PATTERN, &table_uuid, &directory_name))
-    {
-        if (directory_name.empty())
-            directory_name = file_name;
-
-        if (!metadata.tables_data.count(table_uuid))
-            return false;
-
-        if (!metadata.tables_data[table_uuid].count(directory_name))
-            return false;
-
-        if (file_name.empty())
-            return true;
-
-        const auto & files = metadata.tables_data[table_uuid][directory_name];
-        auto file = files.find(file_name);
-        if (file == files.end())
-            return false;
-
-        file_info = File(file->first, file->second);
+    if (files.find(path) != files.end())
         return true;
+
+    if (path.ends_with(MergeTreeData::FORMAT_VERSION_FILE_NAME) && files.find(fs::path(path).parent_path() / "") == files.end())
+    {
+        try
+        {
+            initialize(fs::path(url) / fs::path(path).parent_path());
+            return files.find(path) != files.end();
+        }
+        catch (...)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return false;
+        }
     }
 
     return false;
 }
 
 
-bool DiskWebServer::exists(const String & path) const
-{
-    LOG_DEBUG(log, "Checking existence of file: {}", path);
-
-    File file;
-    return findFileInMetadata(path, file);
-}
-
-
 std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & path, const ReadSettings & read_settings, size_t) const
 {
+    LOG_TRACE(log, "Read from path: {}", path);
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
 
-    File file;
-    if (!findFileInMetadata(path, file))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "File {} not found", path);
+    auto fs_path = fs::path(url) / path;
+    auto remote_path = fs_path.parent_path() / (escapeForFileName(fs_path.stem()) + fs_path.extension().string());
+    remote_path = remote_path.string().substr(url.size());
 
-    auto file_name = escapeForFileName(fs::path(path).stem()) + fs::path(path).extension().string();
-    auto remote_path = fs::path(path).parent_path() / file_name;
-    LOG_DEBUG(log, "Read from file by path: {}", remote_path.string());
+    RemoteMetadata meta(path, remote_path);
+    meta.remote_fs_objects.emplace_back(std::make_pair(remote_path, iter->second.size));
 
-    RemoteMetadata meta(uri, remote_path);
-    meta.remote_fs_objects.emplace_back(std::make_pair(getFileName(remote_path), file.size));
-
-    auto reader = std::make_unique<ReadBufferFromWebServer>(uri, meta, getContext(), settings->max_read_tries, read_settings.remote_fs_buffer_size);
-    return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), settings->min_bytes_for_seek);
-}
-
-
-std::unique_ptr<WriteBufferFromFileBase> DiskWebServer::writeFile(const String & path, size_t, WriteMode)
-{
-    if (path.ends_with("format_version.txt"))
-        return std::make_unique<WriteBufferFromNothing>();
-
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    auto reader = std::make_unique<ReadBufferFromWebServer>(url, meta, getContext(),
+        read_settings.remote_fs_buffer_size, read_settings.remote_fs_backoff_threshold, read_settings.remote_fs_backoff_max_tries);
+    return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), min_bytes_for_seek);
 }
 
 
 DiskDirectoryIteratorPtr DiskWebServer::iterateDirectory(const String & path)
 {
-    LOG_DEBUG(log, "Iterate directory: {}", path);
-    String uuid;
-
-    if (RE2::FullMatch(path, ".*/store/"))
-        return std::make_unique<DiskWebDirectoryIterator<UUIDDirectoryListing>>(metadata.tables_data, path);
-
-    if (!RE2::Extract(path, EXTRACT_UUID_PATTERN, "\\1", &uuid))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot extract uuid for: {}", path);
-
-    /// Do not throw if it is not a query, but disk load.
-    bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
-
-    try
+    std::vector<fs::path> dir_file_paths;
+    if (files.find(path) == files.end())
     {
-        if (!metadata.tables_data.count(uuid))
-            metadata.initialize(uri, settings->files_prefix, uuid, getContext());
-    }
-    catch (const Poco::Exception &)
-    {
-        const auto message = getCurrentExceptionMessage(false);
-        if (can_throw)
+        try
         {
-            throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+            initialize(fs::path(url) / path);
         }
+        catch (...)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
 
-        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
-        /// Empty iterator.
-        return std::make_unique<DiskWebDirectoryIterator<RootDirectoryListing>>(metadata.tables_data[""], path);
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
+        }
     }
 
-    String directory_name;
-    if (RE2::FullMatch(path, MATCH_DIRECTORY_PATTERN, &uuid, &directory_name))
-    {
-        if (metadata.tables_data[uuid].contains(directory_name))
-            return std::make_unique<DiskWebDirectoryIterator<DirectoryListing>>(metadata.tables_data[uuid][directory_name], path);
-        if (can_throw)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Directory {} does not exist. (uuid: {})", directory_name, uuid);
-        return std::make_unique<DiskWebDirectoryIterator<RootDirectoryListing>>(metadata.tables_data[""], path); /// Empty directory.
-    }
+    if (files.find(path) == files.end())
+        throw Exception("Directory '" + path + "' does not exist", ErrorCodes::DIRECTORY_DOESNT_EXIST);
 
-    return std::make_unique<DiskWebDirectoryIterator<RootDirectoryListing>>(metadata.tables_data[uuid], path);
+    for (const auto & file : files)
+        if (parentPath(file.first) == path)
+            dir_file_paths.emplace_back(file.first);
+
+    LOG_TRACE(log, "Iterate directory {} with {} files", path, dir_file_paths.size());
+    return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
 }
 
 
 size_t DiskWebServer::getFileSize(const String & path) const
 {
-    File file;
-    if (!findFileInMetadata(path, file))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "File {} not found", path);
-    return file.size;
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
+
+    return iter->second.size;
 }
 
 
 bool DiskWebServer::isFile(const String & path) const
 {
-    return RE2::FullMatch(path, ".*/\\w+.\\w+");
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
+
+    return iter->second.type == FileType::File;
 }
 
 
 bool DiskWebServer::isDirectory(const String & path) const
 {
-    return RE2::FullMatch(path, ".*/\\w+");
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
+
+    return iter->second.type == FileType::Directory;
 }
 
 
@@ -337,15 +276,16 @@ void registerDiskWebServer(DiskFactory & factory)
         String uri{config.getString(config_prefix + ".endpoint")};
         if (!uri.ends_with('/'))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "URI must end with '/', but '{}' doesn't.", uri);
+        try
+        {
+            Poco::URI poco_uri(uri);
+        }
+        catch (const Poco::Exception & e)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad URI: `{}`. Error: {}", uri, e.what());
+        }
 
-        auto settings = std::make_unique<DiskWebServerSettings>(
-            context->getGlobalContext()->getSettingsRef().http_max_single_read_retries,
-            config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
-            config.getString(config_prefix + ".files_prefix", disk_name));
-
-        String metadata_path = fs::path(context->getPath()) / "disks" / disk_name / "";
-
-        return std::make_shared<DiskWebServer>(disk_name, uri, metadata_path, context, std::move(settings));
+        return std::make_shared<DiskWebServer>(disk_name, uri, context, config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024));
     };
 
     factory.registerDiskType("web", creator);
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index ccf780796e7..29bc12d8794 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -13,31 +13,14 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-struct DiskWebServerSettings
-{
-    /// Number of read attempts before throw that network is unreachable.
-    size_t max_read_tries;
-    /// Passed to SeekAvoidingReadBuffer.
-    size_t min_bytes_for_seek;
-    String files_prefix;
-
-    DiskWebServerSettings(size_t max_read_tries_, size_t min_bytes_for_seek_, String files_prefix_)
-        : max_read_tries(max_read_tries_) , min_bytes_for_seek(min_bytes_for_seek_), files_prefix(files_prefix_) {}
-};
-
-
 /*
- * Quick ready test - you can try this disk, by using these queries (disk has two tables) and this endpoint:
- *
- *  ATTACH TABLE contributors UUID 'a563f7d8-fb00-4d50-a563-f7d8fb007d50' (good_person_name String) engine=MergeTree() order by good_person_name settings storage_policy='web';
- *  ATTACH TABLE test UUID '11c7a2f9-a949-4c88-91c7-a2f9a949ec88' (a Int32) engine=MergeTree() order by a settings storage_policy='web';
+ * Quick ready test: ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS storage_policy='web';
  *
  *   <storage_configuration>
  *       <disks>
  *           <web>
  *               <type>web</type>
- *               <endpoint>https://clickhouse-datasets.s3.yandex.net/kssenii-static-files-disk-test/kssenii-disk-tests/test1/</endpoint>
- *               <files_prefix>data</files_prefix>
+ *               <endpoint>https://clickhouse-datasets.s3.yandex.net/disk-with-static-files-tests/test-hits/</endpoint>
  *           </web>
  *       </disks>
  *       <policies>
@@ -51,64 +34,29 @@ struct DiskWebServerSettings
  *       </policies>
  *   </storage_configuration>
  *
+ * If query fails with `DB:Exception Unreachable URL` -- may help to adjust settings: http_connection_timeout, http_receive_timeout, keep_alive_timeout.
+ *
  * To get files for upload run:
- * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir> --files-prefix data
+ * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>
  * (--metadata-path can be found in query: `select data_paths from system.tables where name='<table_name>';`)
  *
+ * When loading files by <endpoint> they must be loaded into <endpoint>/store/ path, but config must conrain only <endpoint>.
+ *
  * If url is not reachable on disk load when server is starting up tables, then all errors are caught.
  * If in this case there were errors, tables can be reloaded (become visible) via detach table table_name -> attach table table_name.
  * If metadata was successfully loaded at server startup, then tables are available straight away.
 **/
 class DiskWebServer : public IDisk, WithContext
 {
-using SettingsPtr = std::unique_ptr<DiskWebServerSettings>;
 
 public:
     DiskWebServer(const String & disk_name_,
-                  const String & files_root_path_uri_,
-                  const String & metadata_path_,
+                  const String & url_,
                   ContextPtr context,
-                  SettingsPtr settings_);
-
-    struct File
-    {
-        String name;
-        size_t size;
-        File(const String & name_ = "", const size_t size_ = 0) : name(name_), size(size_) {}
-    };
-
-    using Directory = std::unordered_map<String, size_t>;
-
-    /* Each root directory contains either directories like
-     * all_x_x_x/{file}, detached/, etc, or root files like format_version.txt.
-     */
-    using RootDirectory = std::unordered_map<String, Directory>;
-
-    /* Each table is attached via ATTACH TABLE table UUID <uuid> <def>.
-     * Then there is a mapping: {table uuid} -> {root directory}
-     */
-    using TableDirectories = std::unordered_map<String, RootDirectory>;
-
-    struct Metadata
-    {
-        /// Fetch meta only when required.
-        mutable TableDirectories tables_data;
-
-        Metadata() = default;
-
-        void initialize(const String & uri_with_path, const String & files_prefix, const String & uuid, ContextPtr context) const;
-    };
-
-    using UUIDDirectoryListing = std::unordered_map<String, RootDirectory>;
-    using RootDirectoryListing = std::unordered_map<String, Directory>;
-    using DirectoryListing = std::unordered_map<String, size_t>;
-
-    bool findFileInMetadata(const String & path, File & file_info) const;
+                  size_t min_bytes_for_seek_);
 
     bool supportZeroCopyReplication() const override { return false; }
 
-    String getFileName(const String & path) const;
-
     DiskType getType() const override { return DiskType::WebServer; }
 
     bool isRemote() const override { return true; }
@@ -121,7 +69,7 @@ public:
 
     const String & getName() const final override { return name; }
 
-    const String & getPath() const final override { return metadata_path; }
+    const String & getPath() const final override { return url; }
 
     bool isReadOnly() const override { return true; }
 
@@ -151,7 +99,10 @@ public:
 
     /// Write and modification part
 
-    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String &, size_t, WriteMode) override;
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String &, size_t, WriteMode) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
 
     void moveFile(const String &, const String &) override
     {
@@ -224,13 +175,28 @@ public:
     void createHardLink(const String &, const String &) override {}
 
 private:
+    void initialize(const String & uri_path) const;
+
+    enum class FileType
+    {
+        File,
+        Directory
+    };
+
+    struct FileData
+    {
+        FileType type{};
+        size_t size = 0;
+    };
+
+    using Files = std::unordered_map<String, FileData>; /// file path -> file data
+    mutable Files files;
 
     Poco::Logger * log;
-    String uri, name;
-    const String metadata_path;
-    SettingsPtr settings;
+    String url;
+    String name;
 
-    Metadata metadata;
+    size_t min_bytes_for_seek;
 };
 
 }
diff --git a/src/Disks/IStoragePolicy.h b/src/Disks/IStoragePolicy.h
index 16f3b21a41c..f113cf5f120 100644
--- a/src/Disks/IStoragePolicy.h
+++ b/src/Disks/IStoragePolicy.h
@@ -17,6 +17,7 @@ class IDisk;
 using DiskPtr = std::shared_ptr<IDisk>;
 using Disks = std::vector<DiskPtr>;
 class IReservation;
+using ReservationSharedPtr = std::shared_ptr<IReservation>;
 using ReservationPtr = std::unique_ptr<IReservation>;
 using Reservations = std::vector<ReservationPtr>;
 
diff --git a/src/Disks/IVolume.cpp b/src/Disks/IVolume.cpp
index ac277d962ed..c135dade128 100644
--- a/src/Disks/IVolume.cpp
+++ b/src/Disks/IVolume.cpp
@@ -12,23 +12,6 @@ namespace ErrorCodes
     extern const int NO_ELEMENTS_IN_CONFIG;
     extern const int INCONSISTENT_RESERVATIONS;
     extern const int NO_RESERVATIONS_PROVIDED;
-    extern const int UNKNOWN_VOLUME_TYPE;
-}
-
-String volumeTypeToString(VolumeType type)
-{
-    switch (type)
-    {
-        case VolumeType::JBOD:
-            return "JBOD";
-        case VolumeType::RAID1:
-            return "RAID1";
-        case VolumeType::SINGLE_DISK:
-            return "SINGLE_DISK";
-        case VolumeType::UNKNOWN:
-            return "UNKNOWN";
-    }
-    throw Exception("Unknown volume type, please add it to DB::volumeTypeToString", ErrorCodes::UNKNOWN_VOLUME_TYPE);
 }
 
 IVolume::IVolume(
diff --git a/src/Disks/IVolume.h b/src/Disks/IVolume.h
index c040d9d58e1..d26ddea787d 100644
--- a/src/Disks/IVolume.h
+++ b/src/Disks/IVolume.h
@@ -16,8 +16,6 @@ enum class VolumeType
     UNKNOWN
 };
 
-String volumeTypeToString(VolumeType t);
-
 class IVolume;
 using VolumePtr = std::shared_ptr<IVolume>;
 using Volumes = std::vector<VolumePtr>;
diff --git a/src/Disks/ReadIndirectBufferFromWebServer.cpp b/src/Disks/ReadIndirectBufferFromWebServer.cpp
index 89644e12e8c..809e6d67107 100644
--- a/src/Disks/ReadIndirectBufferFromWebServer.cpp
+++ b/src/Disks/ReadIndirectBufferFromWebServer.cpp
@@ -1,9 +1,12 @@
 #include "ReadIndirectBufferFromWebServer.h"
 
 #include <common/logger_useful.h>
+#include <common/sleep.h>
 #include <Core/Types.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/ConnectionTimeoutsContext.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
 #include <thread>
 
 
@@ -17,17 +20,18 @@ namespace ErrorCodes
     extern const int NETWORK_ERROR;
 }
 
+static const auto WAIT_MS = 10;
 
-ReadIndirectBufferFromWebServer::ReadIndirectBufferFromWebServer(const String & url_,
-                                                                 ContextPtr context_,
-                                                                 size_t max_read_tries_,
-                                                                 size_t buf_size_)
+
+ReadIndirectBufferFromWebServer::ReadIndirectBufferFromWebServer(
+    const String & url_, ContextPtr context_, size_t buf_size_, size_t backoff_threshold_, size_t max_tries_)
     : BufferWithOwnMemory<SeekableReadBuffer>(buf_size_)
     , log(&Poco::Logger::get("ReadIndirectBufferFromWebServer"))
     , context(context_)
     , url(url_)
     , buf_size(buf_size_)
-    , max_read_tries(max_read_tries_)
+    , backoff_threshold_ms(backoff_threshold_)
+    , max_tries(max_tries_)
 {
 }
 
@@ -38,13 +42,20 @@ std::unique_ptr<ReadBuffer> ReadIndirectBufferFromWebServer::initialize()
 
     ReadWriteBufferFromHTTP::HTTPHeaderEntries headers;
     headers.emplace_back(std::make_pair("Range", fmt::format("bytes={}-", offset)));
+    const auto & settings = context->getSettingsRef();
     LOG_DEBUG(log, "Reading from offset: {}", offset);
+    const auto & config = context->getConfigRef();
+    Poco::Timespan http_keep_alive_timeout{config.getUInt("keep_alive_timeout", 20), 0};
 
     return std::make_unique<ReadWriteBufferFromHTTP>(
         uri,
         Poco::Net::HTTPRequest::HTTP_GET,
         ReadWriteBufferFromHTTP::OutStreamCallback(),
-        ConnectionTimeouts::getHTTPTimeouts(context),
+        ConnectionTimeouts(std::max(Poco::Timespan(settings.http_connection_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
+                           settings.http_send_timeout,
+                           std::max(Poco::Timespan(settings.http_receive_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
+                           settings.tcp_keep_alive_timeout,
+                           http_keep_alive_timeout),
         0,
         Poco::Net::HTTPBasicCredentials{},
         buf_size,
@@ -55,6 +66,7 @@ std::unique_ptr<ReadBuffer> ReadIndirectBufferFromWebServer::initialize()
 bool ReadIndirectBufferFromWebServer::nextImpl()
 {
     bool next_result = false, successful_read = false;
+    UInt16 milliseconds_to_wait = WAIT_MS;
 
     if (impl)
     {
@@ -62,40 +74,42 @@ bool ReadIndirectBufferFromWebServer::nextImpl()
         impl->position() = position();
         assert(!impl->hasPendingData());
     }
-    else
+
+    WriteBufferFromOwnString error_msg;
+    for (size_t i = 0; (i < max_tries) && !successful_read && !next_result; ++i)
     {
-        try
+        while (milliseconds_to_wait < backoff_threshold_ms)
         {
-            impl = initialize();
-        }
-        catch (const Poco::Exception & e)
-        {
-            throw Exception(ErrorCodes::NETWORK_ERROR, "Unreachable url: {}. Error: {}", url, e.what());
-        }
+            try
+            {
+                if (!impl)
+                {
+                    impl = initialize();
+                    next_result = impl->hasPendingData();
+                    if (next_result)
+                        break;
+                }
 
-        next_result = impl->hasPendingData();
-    }
+                next_result = impl->next();
+                successful_read = true;
+                break;
+            }
+            catch (const Poco::Exception & e)
+            {
+                LOG_WARNING(log, "Read attempt failed for url: {}. Error: {}", url, e.what());
+                error_msg << fmt::format("Error: {}\n", e.what());
 
-    for (size_t try_num = 0; (try_num < max_read_tries) && !next_result; ++try_num)
-    {
-        try
-        {
-            next_result = impl->next();
-            successful_read = true;
-            break;
-        }
-        catch (const Exception & e)
-        {
-            LOG_WARNING(log, "Read attempt {}/{} failed from {}. ({})", try_num, max_read_tries, url, e.message());
-
-            impl.reset();
-            impl = initialize();
-            next_result = impl->hasPendingData();
+                sleepForMilliseconds(milliseconds_to_wait);
+                milliseconds_to_wait *= 2;
+                impl.reset();
+            }
         }
+        milliseconds_to_wait = WAIT_MS;
     }
 
     if (!successful_read)
-        throw Exception(ErrorCodes::NETWORK_ERROR, "All read attempts ({}) failed for uri: {}", max_read_tries, url);
+        throw Exception(ErrorCodes::NETWORK_ERROR,
+                        "All read attempts failed for url: {}. Reason:\n{}", url, error_msg.str());
 
     if (next_result)
     {
diff --git a/src/Disks/ReadIndirectBufferFromWebServer.h b/src/Disks/ReadIndirectBufferFromWebServer.h
index 9a3dcff52f4..04bb155f83b 100644
--- a/src/Disks/ReadIndirectBufferFromWebServer.h
+++ b/src/Disks/ReadIndirectBufferFromWebServer.h
@@ -18,8 +18,8 @@ class ReadIndirectBufferFromWebServer : public BufferWithOwnMemory<SeekableReadB
 public:
     explicit ReadIndirectBufferFromWebServer(const String & url_,
                                              ContextPtr context_,
-                                             size_t max_read_tries_,
-                                             size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE);
+                                             size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE,
+                                             size_t backoff_threshold_ = 10000, size_t max_tries_ = 4);
 
     bool nextImpl() override;
 
@@ -34,11 +34,14 @@ private:
     ContextPtr context;
 
     const String url;
-    size_t buf_size, max_read_tries;
+    size_t buf_size;
 
     std::unique_ptr<ReadBuffer> impl;
 
     off_t offset = 0;
+
+    size_t backoff_threshold_ms;
+    size_t max_tries;
 };
 
 }
diff --git a/src/Disks/S3/ya.make b/src/Disks/S3/ya.make
deleted file mode 100644
index f4df540168d..00000000000
--- a/src/Disks/S3/ya.make
+++ /dev/null
@@ -1,17 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    DiskS3.cpp
-    registerDiskS3.cpp
-    ProxyListConfiguration.cpp
-    ProxyResolverConfiguration.cpp
-)
-
-END()
diff --git a/src/Disks/ya.make b/src/Disks/ya.make
deleted file mode 100644
index 3f57930f717..00000000000
--- a/src/Disks/ya.make
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-SRCS(
-    DiskCacheWrapper.cpp
-    DiskDecorator.cpp
-    DiskEncrypted.cpp
-    DiskFactory.cpp
-    DiskLocal.cpp
-    DiskMemory.cpp
-    DiskRestartProxy.cpp
-    DiskSelector.cpp
-    DiskWebServer.cpp
-    IDisk.cpp
-    IDiskRemote.cpp
-    IVolume.cpp
-    LocalDirectorySyncGuard.cpp
-    ReadIndirectBufferFromRemoteFS.cpp
-    ReadIndirectBufferFromWebServer.cpp
-    SingleDiskVolume.cpp
-    StoragePolicy.cpp
-    TemporaryFileOnDisk.cpp
-    VolumeJBOD.cpp
-    VolumeRAID1.cpp
-    WriteIndirectBufferFromRemoteFS.cpp
-    createVolume.cpp
-    registerDisks.cpp
-
-)
-
-END()
diff --git a/src/Disks/ya.make.in b/src/Disks/ya.make.in
deleted file mode 100644
index 303a2118784..00000000000
--- a/src/Disks/ya.make.in
+++ /dev/null
@@ -1,13 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | grep -v -P 'S3|HDFS' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index a014f85d45f..d9ae718dbd9 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -60,6 +60,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.csv.delimiter = settings.format_csv_delimiter;
     format_settings.csv.empty_as_default = settings.input_format_defaults_for_omitted_fields;
     format_settings.csv.input_format_enum_as_number = settings.input_format_csv_enum_as_number;
+    format_settings.csv.null_representation = settings.output_format_csv_null_representation;
     format_settings.csv.unquoted_null_literal_as_null = settings.input_format_csv_unquoted_null_literal_as_null;
     format_settings.csv.input_format_arrays_as_nested_csv = settings.input_format_csv_arrays_as_nested_csv;
     format_settings.custom.escaping_rule = settings.format_custom_escaping_rule;
@@ -439,6 +440,18 @@ bool FormatFactory::checkIfFormatIsColumnOriented(const String & name)
     return target.is_column_oriented;
 }
 
+bool FormatFactory::isInputFormat(const String & name) const
+{
+    auto it = dict.find(name);
+    return it != dict.end() && (it->second.input_creator || it->second.input_processor_creator);
+}
+
+bool FormatFactory::isOutputFormat(const String & name) const
+{
+    auto it = dict.find(name);
+    return it != dict.end() && (it->second.output_creator || it->second.output_processor_creator);
+}
+
 FormatFactory & FormatFactory::instance()
 {
     static FormatFactory ret;
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index e935eb4d761..7ff72387509 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -187,6 +187,9 @@ public:
         return dict;
     }
 
+    bool isInputFormat(const String & name) const;
+    bool isOutputFormat(const String & name) const;
+
 private:
     FormatsDictionary dict;
 
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index 3e1e00584c0..3a274f99a5c 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -76,6 +76,7 @@ struct FormatSettings
         bool crlf_end_of_line = false;
         bool input_format_enum_as_number = false;
         bool input_format_arrays_as_nested_csv = false;
+        String null_representation = "\\N";
     } csv;
 
     struct Custom
diff --git a/src/Formats/registerFormats.cpp b/src/Formats/registerFormats.cpp
index 2cb524f2d9b..de479c07bae 100644
--- a/src/Formats/registerFormats.cpp
+++ b/src/Formats/registerFormats.cpp
@@ -121,15 +121,14 @@ void registerFormats()
     registerInputFormatProcessorRawBLOB(factory);
     registerOutputFormatProcessorRawBLOB(factory);
 
-#if !defined(ARCADIA_BUILD)
     registerInputFormatProcessorORC(factory);
     registerOutputFormatProcessorORC(factory);
     registerInputFormatProcessorParquet(factory);
     registerOutputFormatProcessorParquet(factory);
+#if !defined(ARCADIA_BUILD)
     registerInputFormatProcessorAvro(factory);
     registerOutputFormatProcessorAvro(factory);
 #endif
-
     registerInputFormatProcessorArrow(factory);
     registerOutputFormatProcessorArrow(factory);
 
diff --git a/src/Formats/ya.make b/src/Formats/ya.make
deleted file mode 100644
index 90184350359..00000000000
--- a/src/Formats/ya.make
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/protobuf
-    contrib/libs/protoc
-)
-
-
-SRCS(
-    FormatFactory.cpp
-    FormatSchemaInfo.cpp
-    JSONEachRowUtils.cpp
-    MySQLSource.cpp
-    NativeFormat.cpp
-    NullFormat.cpp
-    ParsedTemplateFormatString.cpp
-    ProtobufReader.cpp
-    ProtobufSchemas.cpp
-    ProtobufSerializer.cpp
-    ProtobufWriter.cpp
-    registerFormats.cpp
-    verbosePrintString.cpp
-
-)
-
-END()
diff --git a/src/Formats/ya.make.in b/src/Formats/ya.make.in
deleted file mode 100644
index 9a257d7846e..00000000000
--- a/src/Formats/ya.make.in
+++ /dev/null
@@ -1,16 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/protobuf
-    contrib/libs/protoc
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index f10e15c1574..c53ffa7d59d 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -72,6 +72,7 @@ struct DivideIntegralImpl
 {
     using ResultType = typename NumberTraits::ResultOfIntegerDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -81,7 +82,7 @@ struct DivideIntegralImpl
 
         /// Otherwise overflow may occur due to integer promotion. Example: int8_t(-1) / uint64_t(2).
         /// NOTE: overflow is still possible when dividing large signed number to large unsigned number or vice-versa. But it's less harmful.
-        if constexpr (is_integer_v<A> && is_integer_v<B> && (is_signed_v<A> || is_signed_v<B>))
+        if constexpr (is_integer<A> && is_integer<B> && (is_signed_v<A> || is_signed_v<B>))
         {
             using SignedCastA = make_signed_t<CastA>;
             using SignedCastB = std::conditional_t<sizeof(A) <= sizeof(B), make_signed_t<CastB>, SignedCastA>;
@@ -126,6 +127,7 @@ struct ModuloImpl
     using IntegerBType = typename NumberTraits::ToInteger<B>::Type;
 
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index a30a40cc52b..69f9f212334 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -15,11 +15,13 @@
 #include <DataTypes/DataTypeInterval.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/Native.h>
 #include <DataTypes/NumberTraits.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include "Core/DecimalFunctions.h"
@@ -33,6 +35,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
+#include <Common/TypeList.h>
 #include <common/map.h>
 
 #if !defined(ARCADIA_BUILD)
@@ -183,20 +186,15 @@ namespace impl_
 
 enum class OpCase { Vector, LeftConstant, RightConstant };
 
-template <class T>
-inline constexpr const auto & undec(const T & x)
-{
-    if constexpr (IsDecimalNumber<T>)
-        return x.value;
-    else
-        return x;
-}
+constexpr const auto & undec(const auto & x) { return x; }
+constexpr const auto & undec(const is_decimal auto & x) { return x.value; }
 
 template <typename A, typename B, typename Op, typename OpResultType = typename Op::ResultType>
 struct BinaryOperation
 {
     using ResultType = OpResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
     static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
@@ -213,6 +211,71 @@ struct BinaryOperation
     static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
 };
 
+template <typename B, typename Op>
+struct StringIntegerOperationImpl
+{
+    static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = true;
+
+    template <OpCase op_case>
+    static void NO_INLINE processFixedString(const UInt8 * __restrict in_vec, const UInt64 n, const B * __restrict b, ColumnFixedString::Chars & out_vec, size_t size)
+    {
+        size_t prev_offset = 0;
+        out_vec.reserve(n * size);
+        for (size_t i = 0; i < size; ++i)
+        {
+            if constexpr (op_case == OpCase::LeftConstant)
+            {
+                Op::apply(&in_vec[0], &in_vec[n], b[i], out_vec);
+            }
+            else
+            {
+                size_t new_offset = prev_offset + n;
+
+                if constexpr (op_case == OpCase::Vector)
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[i], out_vec);
+                }
+                else
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[0], out_vec);
+                }
+                prev_offset = new_offset;
+            }
+        }
+    }
+
+
+    template <OpCase op_case>
+    static void NO_INLINE processString(const UInt8 * __restrict in_vec, const UInt64 * __restrict in_offsets, const B * __restrict b, ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets, size_t size)
+    {
+        size_t prev_offset = 0;
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            if constexpr (op_case == OpCase::LeftConstant)
+            {
+                Op::apply(&in_vec[0], &in_vec[in_offsets[0] - 1], b[i], out_vec, out_offsets);
+            }
+            else
+            {
+                size_t new_offset = in_offsets[i];
+
+                if constexpr (op_case == OpCase::Vector)
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset - 1], b[i], out_vec, out_offsets);
+                }
+                else
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset - 1], b[0], out_vec, out_offsets);
+                }
+
+                prev_offset = new_offset;
+            }
+        }
+    }
+};
+
 template <typename Op>
 struct FixedStringOperationImpl
 {
@@ -301,19 +364,17 @@ struct DecimalBinaryOperation
 {
 private:
     using ResultType = OpResultType; // e.g. Decimal32
-    using NativeResultType = typename NativeType<ResultType>::Type; // e.g. UInt32 for Decimal32
+    using NativeResultType = NativeType<ResultType>; // e.g. UInt32 for Decimal32
 
-    using ResultContainerType = typename std::conditional_t<IsDecimalNumber<ResultType>,
-        ColumnDecimal<ResultType>,
-        ColumnVector<ResultType>>::Container;
+    using ResultContainerType = typename ColumnVectorOrDecimal<ResultType>::Container;
 
 public:
-    template <OpCase op_case, bool is_decimal_a, bool is_decimal_b, class A, class B>
-    static void NO_INLINE process(const A & a, const B & b, ResultContainerType & c,
+    template <OpCase op_case, bool is_decimal_a, bool is_decimal_b>
+    static void NO_INLINE process(const auto & a, const auto & b, ResultContainerType & c,
         NativeResultType scale_a, NativeResultType scale_b)
     {
-        if constexpr (op_case == OpCase::LeftConstant) static_assert(!IsDecimalNumber<A>);
-        if constexpr (op_case == OpCase::RightConstant) static_assert(!IsDecimalNumber<B>);
+        if constexpr (op_case == OpCase::LeftConstant) static_assert(!is_decimal<decltype(a)>);
+        if constexpr (op_case == OpCase::RightConstant) static_assert(!is_decimal<decltype(b)>);
 
         size_t size;
 
@@ -383,10 +444,8 @@ public:
 
     template <bool is_decimal_a, bool is_decimal_b, class A, class B>
     static ResultType process(A a, B b, NativeResultType scale_a, NativeResultType scale_b)
+        requires(!is_decimal<A> && !is_decimal<B>)
     {
-        static_assert(!IsDecimalNumber<A>);
-        static_assert(!IsDecimalNumber<B>);
-
         if constexpr (is_division && is_decimal_b)
             return applyScaledDiv<is_decimal_a>(a, b, scale_a);
         else if constexpr (is_plus_minus_compare)
@@ -516,83 +575,34 @@ class FunctionBinaryArithmetic : public IFunction
     ContextPtr context;
     bool check_decimal_overflow = true;
 
-    template <typename F>
-    static bool castType(const IDataType * type, F && f)
+    static bool castType(const IDataType * type, auto && f)
     {
-        return castTypeToEither<
-            DataTypeUInt8,
-            DataTypeUInt16,
-            DataTypeUInt32,
-            DataTypeUInt64,
-            DataTypeUInt128,
-            DataTypeUInt256,
-            DataTypeInt8,
-            DataTypeInt16,
-            DataTypeInt32,
-            DataTypeInt64,
-            DataTypeInt128,
-            DataTypeInt256,
-            DataTypeFloat32,
-            DataTypeFloat64,
-            DataTypeDate,
-            DataTypeDateTime,
-            DataTypeDecimal<Decimal32>,
-            DataTypeDecimal<Decimal64>,
-            DataTypeDecimal<Decimal128>,
-            DataTypeDecimal<Decimal256>,
-            DataTypeFixedString
-        >(type, std::forward<F>(f));
-    }
+        using Types = TypeList<
+            DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256,
+            DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64, DataTypeInt128, DataTypeInt256,
+            DataTypeDecimal32, DataTypeDecimal64, DataTypeDecimal128, DataTypeDecimal256,
+            DataTypeDate, DataTypeDateTime,
+            DataTypeFixedString, DataTypeString>;
 
-    template <typename F>
-    static bool castTypeNoFloats(const IDataType * type, F && f)
-    {
-        return castTypeToEither<
-            DataTypeUInt8,
-            DataTypeUInt16,
-            DataTypeUInt32,
-            DataTypeUInt64,
-            DataTypeUInt128,
-            DataTypeUInt256,
-            DataTypeInt8,
-            DataTypeInt16,
-            DataTypeInt32,
-            DataTypeInt64,
-            DataTypeInt128,
-            DataTypeInt256,
-            DataTypeDate,
-            DataTypeDateTime,
-            DataTypeDecimal<Decimal32>,
-            DataTypeDecimal<Decimal64>,
-            DataTypeDecimal<Decimal128>,
-            DataTypeDecimal<Decimal256>,
-            DataTypeFixedString
-        >(type, std::forward<F>(f));
+        using Floats = TypeList<DataTypeFloat32, DataTypeFloat64>;
+
+        using ValidTypes = std::conditional_t<valid_on_float_arguments,
+            typename TypeListConcat<Types, Floats>::Type,
+            Types>;
+
+        return castTypeToEitherTL<ValidTypes>(type, std::forward<decltype(f)>(f));
     }
 
     template <typename F>
     static bool castBothTypes(const IDataType * left, const IDataType * right, F && f)
     {
-        if constexpr (valid_on_float_arguments)
+        return castType(left, [&](const auto & left_)
         {
-            return castType(left, [&](const auto & left_)
+            return castType(right, [&](const auto & right_)
             {
-                return castType(right, [&](const auto & right_)
-                {
-                    return f(left_, right_);
-                });
+                return f(left_, right_);
             });
-        }
-        else
-        {
-            return castTypeNoFloats(left, [&](const auto & left_)
-            {
-                return castTypeNoFloats(right, [&](const auto & right_)
-                {
-                    return f(left_, right_);
-                });
-            });
-        }
+        });
     }
 
     static FunctionOverloadResolverPtr
@@ -632,7 +642,9 @@ class FunctionBinaryArithmetic : public IFunction
         std::string function_name;
         if (interval_data_type)
         {
-            function_name = String(is_plus ? "add" : "subtract") + interval_data_type->getKind().toString() + 's';
+            function_name = fmt::format("{}{}s",
+                is_plus ? "add" : "subtract",
+                interval_data_type->getKind().toString());
         }
         else
         {
@@ -785,23 +797,22 @@ class FunctionBinaryArithmetic : public IFunction
         return function->execute(new_arguments, result_type, input_rows_count);
     }
 
-    template <typename T, typename ResultDataType, typename CC, typename C>
-    static auto helperGetOrConvert(const CC & col_const, const C & col)
+    template <typename T, typename ResultDataType>
+    static auto helperGetOrConvert(const auto & col_const, const auto & col)
     {
         using ResultType = typename ResultDataType::FieldType;
-        using NativeResultType = typename NativeType<ResultType>::Type;
+        using NativeResultType = NativeType<ResultType>;
 
-        if constexpr (IsFloatingPoint<ResultDataType> && IsDecimalNumber<T>)
+        if constexpr (IsFloatingPoint<ResultDataType> && is_decimal<T>)
             return DecimalUtils::convertTo<NativeResultType>(col_const->template getValue<T>(), col.getScale());
-        else if constexpr (IsDecimalNumber<T>)
+        else if constexpr (is_decimal<T>)
             return col_const->template getValue<T>().value;
         else
             return col_const->template getValue<T>();
     }
 
-    template <OpCase op_case, bool left_decimal, bool right_decimal, typename OpImpl, typename OpImplCheck,
-              typename L, typename R, typename VR, typename SA, typename SB>
-    void helperInvokeEither(const L& left, const R& right, VR& vec_res, SA scale_a, SB scale_b) const
+    template <OpCase op_case, bool left_decimal, bool right_decimal, typename OpImpl, typename OpImplCheck>
+    void helperInvokeEither(const auto& left, const auto& right, auto& vec_res, auto scale_a, auto scale_b) const
     {
         if (check_decimal_overflow)
             OpImplCheck::template process<op_case, left_decimal, right_decimal>(left, right, vec_res, scale_a, scale_b);
@@ -809,27 +820,25 @@ class FunctionBinaryArithmetic : public IFunction
             OpImpl::template process<op_case, left_decimal, right_decimal>(left, right, vec_res, scale_a, scale_b);
     }
 
-    template <class LeftDataType, class RightDataType, class ResultDataType,
-              class L, class R, class CL, class CR>
+    template <class LeftDataType, class RightDataType, class ResultDataType>
     ColumnPtr executeNumericWithDecimal(
-        const L & left, const R & right,
+        const auto & left, const auto & right,
         const ColumnConst * const col_left_const, const ColumnConst * const col_right_const,
-        const CL * const col_left, const CR * const col_right,
+        const auto * const col_left, const auto * const col_right,
         size_t col_left_size) const
     {
         using T0 = typename LeftDataType::FieldType;
         using T1 = typename RightDataType::FieldType;
         using ResultType = typename ResultDataType::FieldType;
 
-        using NativeResultType = typename NativeType<ResultType>::Type;
+        using NativeResultType = NativeType<ResultType>;
         using OpImpl = DecimalBinaryOperation<Op, ResultType, false>;
         using OpImplCheck = DecimalBinaryOperation<Op, ResultType, true>;
 
-        using ColVecResult = std::conditional_t<IsDecimalNumber<ResultType>,
-            ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+        using ColVecResult = ColumnVectorOrDecimal<ResultType>;
 
-        static constexpr const bool left_is_decimal = IsDecimalNumber<T0>;
-        static constexpr const bool right_is_decimal = IsDecimalNumber<T1>;
+        static constexpr const bool left_is_decimal = is_decimal<T0>;
+        static constexpr const bool right_is_decimal = is_decimal<T1>;
         static constexpr const bool result_is_decimal = IsDataTypeDecimal<ResultDataType>;
 
         typename ColVecResult::MutablePtr col_res = nullptr;
@@ -1012,19 +1021,33 @@ public:
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
 
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> ||
-                          std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr ((std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeString, LeftDataType>) ||
+                (std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, RightDataType>))
             {
-                if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
-                    return false;
-                else if constexpr (std::is_same_v<LeftDataType, RightDataType>)
+                if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> &&
+                              std::is_same_v<DataTypeFixedString, RightDataType>)
                 {
-                    if (left.getN() == right.getN())
+                    if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                        return false;
+                    else
                     {
-                        type_res = std::make_shared<LeftDataType>(left.getN());
-                        return true;
+                        if (left.getN() == right.getN())
+                        {
+                            type_res = std::make_shared<LeftDataType>(left.getN());
+                            return true;
+                        }
                     }
                 }
+
+                if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
+                    return false;
+                else if constexpr (!IsIntegral<RightDataType>)
+                    return false;
+                else if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType>)
+                    type_res = std::make_shared<LeftDataType>(left.getN());
+                else
+                    type_res = std::make_shared<DataTypeString>();
+                return true;
             }
             else
             {
@@ -1161,6 +1184,106 @@ public:
         return nullptr;
     }
 
+
+    template <typename LeftColumnType, typename A, typename B>
+    ColumnPtr executeStringInteger(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
+    {
+        using LeftDataType = std::decay_t<decltype(left)>;
+        using RightDataType = std::decay_t<decltype(right)>;
+
+        const auto * const col_left_raw = arguments[0].column.get();
+        const auto * const col_right_raw = arguments[1].column.get();
+        using T1 = typename RightDataType::FieldType;
+
+        using ColVecT1 = ColumnVector<T1>;
+        const ColVecT1 * const col_right = checkAndGetColumn<ColVecT1>(col_right_raw);
+        const ColumnConst * const col_right_const = checkAndGetColumnConst<ColVecT1>(col_right_raw);
+
+        using OpImpl = StringIntegerOperationImpl<T1, Op<LeftDataType, T1>>;
+
+        const ColumnConst * const col_left_const = checkAndGetColumnConst<LeftColumnType>(col_left_raw);
+
+        const auto * col_left = col_left_const ? checkAndGetColumn<LeftColumnType>(col_left_const->getDataColumn())
+                                               : checkAndGetColumn<LeftColumnType>(col_left_raw);
+
+        if (!col_left)
+            return nullptr;
+
+        const typename LeftColumnType::Chars & in_vec = col_left->getChars();
+
+        typename LeftColumnType::MutablePtr col_res;
+        if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            col_res = LeftColumnType::create(col_left->getN());
+        else
+            col_res = LeftColumnType::create();
+
+        typename LeftColumnType::Chars & out_vec = col_res->getChars();
+
+        if (col_left_const && col_right_const)
+        {
+            const T1 value = col_right_const->template getValue<T1>();
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::Vector>(in_vec.data(), col_left->getN(), &value, out_vec, 1);
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                OpImpl::template processString<OpCase::Vector>(in_vec.data(), col_left->getOffsets().data(), &value, out_vec, out_offsets, 1);
+            }
+
+            return ColumnConst::create(std::move(col_res), col_left->size());
+        }
+        else if (!col_left_const && !col_right_const && col_right)
+        {
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::Vector>(in_vec.data(), col_left->getN(), col_right->getData().data(), out_vec, col_left->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_left->size());
+                OpImpl::template processString<OpCase::Vector>(
+                    in_vec.data(), col_left->getOffsets().data(), col_right->getData().data(), out_vec, out_offsets, col_left->size());
+            }
+        }
+        else if (col_left_const && col_right)
+        {
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::LeftConstant>(
+                    in_vec.data(), col_left->getN(), col_right->getData().data(), out_vec, col_right->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_right->size());
+                OpImpl::template processString<OpCase::LeftConstant>(
+                    in_vec.data(), col_left->getOffsets().data(), col_right->getData().data(), out_vec, out_offsets, col_right->size());
+            }
+        }
+        else if (col_right_const)
+        {
+            const T1 value = col_right_const->template getValue<T1>();
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::RightConstant>(in_vec.data(), col_left->getN(), &value, out_vec, col_left->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_left->size());
+                OpImpl::template processString<OpCase::RightConstant>(
+                    in_vec.data(), col_left->getOffsets().data(), &value, out_vec, out_offsets, col_left->size());
+            }
+        }
+        else
+            return nullptr;
+
+        return col_res;
+    }
+
     template <typename A, typename B>
     ColumnPtr executeNumeric(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
     {
@@ -1176,9 +1299,9 @@ public:
             using T0 = typename LeftDataType::FieldType;
             using T1 = typename RightDataType::FieldType;
             using ResultType = typename ResultDataType::FieldType;
-            using ColVecT0 = std::conditional_t<IsDecimalNumber<T0>, ColumnDecimal<T0>, ColumnVector<T0>>;
-            using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
-            using ColVecResult = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+            using ColVecT0 = ColumnVectorOrDecimal<T0>;
+            using ColVecT1 = ColumnVectorOrDecimal<T1>;
+            using ColVecResult = ColumnVectorOrDecimal<ResultType>;
 
             const auto * const col_left_raw = arguments[0].column.get();
             const auto * const col_right_raw = arguments[1].column.get();
@@ -1287,13 +1410,28 @@ public:
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
 
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> ||
-                std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr ((std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeString, LeftDataType>) ||
+                          (std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, RightDataType>))
             {
-                if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> &&
+                              std::is_same_v<DataTypeFixedString, RightDataType>)
+                {
+                    if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                        return false;
+                    else
+                        return (res = executeFixedString(arguments)) != nullptr;
+                }
+
+                if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
                     return false;
-                else
-                    return (res = executeFixedString(arguments)) != nullptr;
+                else if constexpr (!IsIntegral<RightDataType>)
+                    return false;
+                else if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType>)
+                {
+                    return (res = executeStringInteger<ColumnFixedString>(arguments, left, right)) != nullptr;
+                }
+                else if constexpr (std::is_same_v<DataTypeString, LeftDataType>)
+                    return (res = executeStringInteger<ColumnString>(arguments, left, right)) != nullptr;
             }
             else
                 return (res = executeNumeric(arguments, left, right)) != nullptr;
@@ -1323,7 +1461,7 @@ public:
         {
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, LeftDataType> || std::is_same_v<DataTypeString, RightDataType>)
                 return false;
             else
             {
@@ -1343,7 +1481,7 @@ public:
         {
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
-            if constexpr (!std::is_same_v<DataTypeFixedString, LeftDataType> && !std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr (!std::is_same_v<DataTypeFixedString, LeftDataType> && !std::is_same_v<DataTypeFixedString, RightDataType> && !std::is_same_v<DataTypeString, LeftDataType> && !std::is_same_v<DataTypeString, RightDataType>)
             {
                 using ResultDataType = typename BinaryOperationTraits<Op, LeftDataType, RightDataType>::ResultDataType;
                 using OpSpec = Op<typename LeftDataType::FieldType, typename RightDataType::FieldType>;
diff --git a/src/Functions/uptime.cpp b/src/Functions/FunctionConstantBase.h
similarity index 50%
rename from src/Functions/uptime.cpp
rename to src/Functions/FunctionConstantBase.h
index bb767101fea..35096a9942f 100644
--- a/src/Functions/uptime.cpp
+++ b/src/Functions/FunctionConstantBase.h
@@ -1,30 +1,35 @@
+#pragma once
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Context.h>
 
 
 namespace DB
 {
 
-/** Returns server uptime in seconds.
-  */
-class FunctionUptime : public IFunction
+/// Base class for constant functions
+template<typename Derived, typename T, typename ColumnT>
+class FunctionConstantBase : public IFunction
 {
 public:
-    static constexpr auto name = "uptime";
-    static FunctionPtr create(ContextPtr context)
+
+    /// For server-level constants (uptime(), version(), etc)
+    explicit FunctionConstantBase(ContextPtr context, T && constant_value_)
+        : is_distributed(context->isDistributed())
+        , constant_value(std::forward<T>(constant_value_))
     {
-        return std::make_shared<FunctionUptime>(context->isDistributed(), context->getUptimeSeconds());
     }
 
-    explicit FunctionUptime(bool is_distributed_, time_t uptime_) : is_distributed(is_distributed_), uptime(uptime_)
+    /// For real constants (pi(), e(), etc)
+    explicit FunctionConstantBase(const T & constant_value_)
+        : is_distributed(false)
+        , constant_value(constant_value_)
     {
     }
 
     String getName() const override
     {
-        return name;
+        return Derived::name;
     }
 
     size_t getNumberOfArguments() const override
@@ -34,29 +39,26 @@ public:
 
     DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
     {
-        return std::make_shared<DataTypeUInt32>();
+        return std::make_shared<ColumnT>();
     }
 
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return true; }
+
+    /// Some functions may return different values on different shards/replicas, so it's not constant for distributed query
     bool isSuitableForConstantFolding() const override { return !is_distributed; }
 
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
-        return DataTypeUInt32().createColumnConst(input_rows_count, static_cast<UInt64>(uptime));
+        return ColumnT().createColumnConst(input_rows_count, constant_value);
     }
 
 private:
     bool is_distributed;
-    time_t uptime;
+    const T constant_value;
 };
 
-
-void registerFunctionUptime(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionUptime>();
 }
 
-}
diff --git a/src/Functions/FunctionHelpers.h b/src/Functions/FunctionHelpers.h
index 5fc8a06681a..15711621075 100644
--- a/src/Functions/FunctionHelpers.h
+++ b/src/Functions/FunctionHelpers.h
@@ -68,13 +68,13 @@ const ColumnConst * checkAndGetColumnConstStringOrFixedString(const IColumn * co
 
 /// Transform anything to Field.
 template <typename T>
-inline std::enable_if_t<!IsDecimalNumber<T>, Field> toField(const T & x)
+Field toField(const T & x)
 {
     return Field(NearestFieldType<T>(x));
 }
 
-template <typename T>
-inline std::enable_if_t<IsDecimalNumber<T>, Field> toField(const T & x, UInt32 scale)
+template <is_decimal T>
+Field toField(const T & x, UInt32 scale)
 {
     return Field(NearestFieldType<T>(x, scale));
 }
diff --git a/src/Functions/FunctionJoinGet.cpp b/src/Functions/FunctionJoinGet.cpp
index ee173607437..f0dff0ac7e4 100644
--- a/src/Functions/FunctionJoinGet.cpp
+++ b/src/Functions/FunctionJoinGet.cpp
@@ -48,22 +48,11 @@ getJoin(const ColumnsWithTypeAndName & arguments, ContextPtr context)
             "Illegal type " + arguments[0].type->getName() + " of first argument of function joinGet, expected a const string.",
             ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-    size_t dot = join_name.find('.');
-    String database_name;
-    if (dot == String::npos)
-    {
-        database_name = context->getCurrentDatabase();
-        dot = 0;
-    }
-    else
-    {
-        database_name = join_name.substr(0, dot);
-        ++dot;
-    }
-    String table_name = join_name.substr(dot);
-    if (table_name.empty())
-        throw Exception("joinGet does not allow empty table name", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-    auto table = DatabaseCatalog::instance().getTable({database_name, table_name}, std::const_pointer_cast<Context>(context));
+    auto qualified_name = QualifiedTableName::parseFromString(join_name);
+    if (qualified_name.database.empty())
+        qualified_name.database = context->getCurrentDatabase();
+
+    auto table = DatabaseCatalog::instance().getTable({qualified_name.database, qualified_name.table}, std::const_pointer_cast<Context>(context));
     auto storage_join = std::dynamic_pointer_cast<StorageJoin>(table);
     if (!storage_join)
         throw Exception("Table " + join_name + " should have engine StorageJoin", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
diff --git a/src/Functions/FunctionMathConstFloat64.h b/src/Functions/FunctionMathConstFloat64.h
deleted file mode 100644
index 1d866b3dcd8..00000000000
--- a/src/Functions/FunctionMathConstFloat64.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <DataTypes/DataTypesNumber.h>
-#include <Columns/ColumnsNumber.h>
-#include <Functions/IFunction.h>
-
-
-namespace DB
-{
-
-template <typename Impl>
-class FunctionMathConstFloat64 : public IFunction
-{
-public:
-    static constexpr auto name = Impl::name;
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMathConstFloat64>(); }
-
-private:
-    String getName() const override { return name; }
-
-    size_t getNumberOfArguments() const override { return 0; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeFloat64>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        return result_type->createColumnConst(input_rows_count, Impl::value);
-    }
-};
-
-}
diff --git a/src/Functions/FunctionMathUnary.h b/src/Functions/FunctionMathUnary.h
index 0c840bae2a3..85a024d3762 100644
--- a/src/Functions/FunctionMathUnary.h
+++ b/src/Functions/FunctionMathUnary.h
@@ -150,7 +150,7 @@ private:
             using Types = std::decay_t<decltype(types)>;
             using Type = typename Types::RightType;
             using ReturnType = std::conditional_t<Impl::always_returns_float64 || !std::is_floating_point_v<Type>, Float64, Type>;
-            using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+            using ColVecType = ColumnVectorOrDecimal<Type>;
 
             const auto col_vec = checkAndGetColumn<ColVecType>(col.column.get());
             return (res = execute<Type, ReturnType>(col_vec)) != nullptr;
diff --git a/src/Functions/FunctionUnaryArithmetic.h b/src/Functions/FunctionUnaryArithmetic.h
index f85eff3f3dd..31227b5b126 100644
--- a/src/Functions/FunctionUnaryArithmetic.h
+++ b/src/Functions/FunctionUnaryArithmetic.h
@@ -38,8 +38,8 @@ template <typename A, typename Op>
 struct UnaryOperationImpl
 {
     using ResultType = typename Op::ResultType;
-    using ColVecA = std::conditional_t<IsDecimalNumber<A>, ColumnDecimal<A>, ColumnVector<A>>;
-    using ColVecC = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+    using ColVecA = ColumnVectorOrDecimal<A>;
+    using ColVecC = ColumnVectorOrDecimal<ResultType>;
     using ArrayA = typename ColVecA::Container;
     using ArrayC = typename ColVecC::Container;
 
diff --git a/src/Functions/FunctionsBitmap.h b/src/Functions/FunctionsBitmap.h
index 3d63ea42d28..775a39f4d08 100644
--- a/src/Functions/FunctionsBitmap.h
+++ b/src/Functions/FunctionsBitmap.h
@@ -1077,6 +1077,11 @@ struct BitmapAndnotImpl
     }
 };
 
+struct NameBitmapAnd
+{
+    static constexpr auto name = "bitmapAnd";
+};
+
 template <template <typename> class Impl, typename Name>
 class FunctionBitmap : public IFunction
 {
@@ -1176,10 +1181,16 @@ private:
             const AggregateDataPtr data_ptr_0 = is_column_const[0] ? container0[0] : container0[i];
             const AggregateDataPtr data_ptr_1 = is_column_const[1] ? container1[0] : container1[i];
 
-            col_to->insertFrom(data_ptr_0);
+            // bitmapAnd(RoaringBitMap, SmallSet) is slower than bitmapAnd(SmallSet, RoaringBitMap), so we can exchange the position of two arguments for the speed
+            auto * bm_1 = reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(data_ptr_0);
+            auto * bm_2 = reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(data_ptr_1);
+
+            // check the name of operation (bitmapAnd) and check if it is the situation mentioned above
+            auto need_exchange = (name == NameBitmapAnd::name) && bm_1->rbs.isLarge() && bm_2->rbs.isSmall();
+            col_to->insertFrom(need_exchange ? data_ptr_1 : data_ptr_0);
             AggregateFunctionGroupBitmapData<T> & bitmap_data_1 = *reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(col_to->getData()[i]);
             const AggregateFunctionGroupBitmapData<T> & bitmap_data_2
-                = *reinterpret_cast<const AggregateFunctionGroupBitmapData<T> *>(data_ptr_1);
+                = *reinterpret_cast<const AggregateFunctionGroupBitmapData<T> *>(need_exchange ? data_ptr_0 : data_ptr_1);
             Impl<T>::apply(bitmap_data_1, bitmap_data_2);
         }
         return col_to;
@@ -1237,10 +1248,6 @@ using FunctionBitmapAndnotCardinality = FunctionBitmapCardinality<BitmapAndnotCa
 using FunctionBitmapHasAll = FunctionBitmapCardinality<BitmapHasAllImpl, NameBitmapHasAll, UInt8>;
 using FunctionBitmapHasAny = FunctionBitmapCardinality<BitmapHasAnyImpl, NameBitmapHasAny, UInt8>;
 
-struct NameBitmapAnd
-{
-    static constexpr auto name = "bitmapAnd";
-};
 struct NameBitmapOr
 {
     static constexpr auto name = "bitmapOr";
diff --git a/src/Functions/FunctionsCodingIP.cpp b/src/Functions/FunctionsCodingIP.cpp
index 1a217217787..3a1b04a4790 100644
--- a/src/Functions/FunctionsCodingIP.cpp
+++ b/src/Functions/FunctionsCodingIP.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnFixedString.h>
diff --git a/src/Functions/FunctionsConsistentHashing.h b/src/Functions/FunctionsConsistentHashing.h
index e946e05e4cc..5e41303d822 100644
--- a/src/Functions/FunctionsConsistentHashing.h
+++ b/src/Functions/FunctionsConsistentHashing.h
@@ -106,8 +106,9 @@ private:
         else if (buckets_field.getType() == Field::Types::UInt64)
             num_buckets = checkBucketsRange(buckets_field.get<UInt64>());
         else
-            throw Exception("Illegal type " + String(buckets_field.getTypeName()) + " of the second argument of function " + getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of the second argument of function {}",
+                buckets_field.getTypeName(), getName());
 
         const auto & hash_col = arguments[0].column;
         const IDataType * hash_type = arguments[0].type.get();
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 75432c7c0d1..6ba2c7e02a5 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -764,7 +764,7 @@ template <typename FromDataType, typename Name>
 struct ConvertImpl<FromDataType, std::enable_if_t<!std::is_same_v<FromDataType, DataTypeString>, DataTypeString>, Name, ConvertDefaultBehaviorTag>
 {
     using FromFieldType = typename FromDataType::FieldType;
-    using ColVecType = std::conditional_t<IsDecimalNumber<FromFieldType>, ColumnDecimal<FromFieldType>, ColumnVector<FromFieldType>>;
+    using ColVecType = ColumnVectorOrDecimal<FromFieldType>;
 
     static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
     {
@@ -1699,9 +1699,9 @@ private:
                 using RightT = typename RightDataType::FieldType;
 
                 static constexpr bool bad_left =
-                    IsDecimalNumber<LeftT> || std::is_floating_point_v<LeftT> || is_big_int_v<LeftT> || is_signed_v<LeftT>;
+                    is_decimal<LeftT> || std::is_floating_point_v<LeftT> || is_big_int_v<LeftT> || is_signed_v<LeftT>;
                 static constexpr bool bad_right =
-                    IsDecimalNumber<RightT> || std::is_floating_point_v<RightT> || is_big_int_v<RightT> || is_signed_v<RightT>;
+                    is_decimal<RightT> || std::is_floating_point_v<RightT> || is_big_int_v<RightT> || is_signed_v<RightT>;
 
                 /// Disallow int vs UUID conversion (but support int vs UInt128 conversion)
                 if constexpr ((bad_left && std::is_same_v<RightDataType, DataTypeUUID>) ||
@@ -2585,8 +2585,9 @@ private:
                 }
                 else
                 {
-                    throw Exception{"Conversion from " + std::string(getTypeName(from_type_index)) + " to " + to_type->getName() + " is not supported",
-                        ErrorCodes::CANNOT_CONVERT_TYPE};
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
+                        "Conversion from {} to {} is not supported",
+                        from_type_index, to_type->getName());
                 }
             }
 
@@ -2695,8 +2696,9 @@ private:
                     return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
                 }
                 else
-                    throw Exception{"Conversion from " + std::string(getTypeName(type_index)) + " to " + to_type->getName() + " is not supported",
-                        ErrorCodes::CANNOT_CONVERT_TYPE};
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
+                        "Conversion from {} to {} is not supported",
+                        type_index, to_type->getName());
             }
 
             return result_column;
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 4c6f1485813..10f0fc99a45 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -635,7 +635,7 @@ private:
     template <typename FromType>
     ColumnPtr executeType(const ColumnsWithTypeAndName & arguments) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(arguments[0].column.get()))
         {
@@ -762,7 +762,7 @@ private:
     template <typename FromType, bool first>
     void executeIntType(const IColumn * column, typename ColumnVector<ToType>::Container & vec_to) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(column))
         {
@@ -819,7 +819,7 @@ private:
     template <typename FromType, bool first>
     void executeBigIntType(const IColumn * column, typename ColumnVector<ToType>::Container & vec_to) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(column))
         {
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
index df17a39812b..68a29615fa8 100644
--- a/src/Functions/FunctionsJSON.h
+++ b/src/Functions/FunctionsJSON.h
@@ -522,7 +522,7 @@ public:
             else if (!accurate::convertNumeric(element.getDouble(), value))
                 return false;
         }
-        else if (element.isBool() && is_integer_v<NumberType> && convert_bool_to_integer)
+        else if (element.isBool() && is_integer<NumberType> && convert_bool_to_integer)
         {
             value = static_cast<NumberType>(element.getBool());
         }
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index 7b57426d751..3474790b8b3 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -315,11 +315,11 @@ template <typename T, RoundingMode rounding_mode, ScaleMode scale_mode>
 struct FloatRoundingImpl
 {
 private:
-    static_assert(!IsDecimalNumber<T>);
+    static_assert(!is_decimal<T>);
 
     using Op = FloatRoundingComputation<T, rounding_mode, scale_mode>;
     using Data = std::array<T, Op::data_count>;
-    using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColumnType = ColumnVector<T>;
     using Container = typename ColumnType::Container;
 
 public:
@@ -413,12 +413,10 @@ public:
 };
 
 
-template <typename T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
+template <is_decimal T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
 class DecimalRoundingImpl
 {
 private:
-    static_assert(IsDecimalNumber<T>);
-
     using NativeType = typename T::NativeType;
     using Op = IntegerRoundingComputation<NativeType, rounding_mode, ScaleMode::Negative, tie_breaking_mode>;
     using Container = typename ColumnDecimal<T>::Container;
@@ -453,15 +451,16 @@ public:
 /** Select the appropriate processing algorithm depending on the scale.
   */
 template <typename T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
-class Dispatcher
+struct Dispatcher
 {
     template <ScaleMode scale_mode>
     using FunctionRoundingImpl = std::conditional_t<std::is_floating_point_v<T>,
         FloatRoundingImpl<T, rounding_mode, scale_mode>,
         IntegerRoundingImpl<T, rounding_mode, scale_mode, tie_breaking_mode>>;
 
-    static ColumnPtr apply(const ColumnVector<T> * col, Scale scale_arg)
+    static ColumnPtr apply(const IColumn * col_general, Scale scale_arg)
     {
+        const auto * const col = checkAndGetColumn<ColumnVector<T>>(col_general);
         auto col_res = ColumnVector<T>::create();
 
         typename ColumnVector<T>::Container & vec_res = col_res->getData();
@@ -488,9 +487,15 @@ class Dispatcher
 
         return col_res;
     }
+};
 
-    static ColumnPtr apply(const ColumnDecimal<T> * col, Scale scale_arg)
+template <is_decimal T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
+struct Dispatcher<T, rounding_mode, tie_breaking_mode>
+{
+public:
+    static ColumnPtr apply(const IColumn * col_general, Scale scale_arg)
     {
+        const auto * const col = checkAndGetColumn<ColumnDecimal<T>>(col_general);
         const typename ColumnDecimal<T>::Container & vec_src = col->getData();
 
         auto col_res = ColumnDecimal<T>::create(vec_src.size(), vec_src.getScale());
@@ -501,15 +506,6 @@ class Dispatcher
 
         return col_res;
     }
-
-public:
-    static ColumnPtr apply(const IColumn * column, Scale scale_arg)
-    {
-        if constexpr (is_arithmetic_v<T>)
-            return apply(checkAndGetColumn<ColumnVector<T>>(column), scale_arg);
-        else if constexpr (IsDecimalNumber<T>)
-            return apply(checkAndGetColumn<ColumnDecimal<T>>(column), scale_arg);
-    }
 };
 
 /** A template for functions that round the value of an input parameter of type
diff --git a/src/Functions/GCDLCMImpl.h b/src/Functions/GCDLCMImpl.h
index f13a6dc3f95..722dacfe2f1 100644
--- a/src/Functions/GCDLCMImpl.h
+++ b/src/Functions/GCDLCMImpl.h
@@ -25,6 +25,7 @@ struct GCDLCMImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index fd59cbd19aa..e452c8a5418 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -34,7 +34,7 @@ void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<T> & sink)
 template <typename T, typename U>
 void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<U> & sink)
 {
-    using NativeU = typename NativeType<U>::Type;
+    using NativeU = NativeType<U>;
 
     sink.elements.resize(sink.current_offset + slice.size);
     for (size_t i = 0; i < slice.size; ++i)
@@ -42,9 +42,9 @@ void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<U> & sink)
         const auto & src = slice.data[i];
         auto & dst = sink.elements[sink.current_offset];
 
-        if constexpr (OverBigInt<T> || OverBigInt<U>)
+        if constexpr (is_over_big_int<T> || is_over_big_int<U>)
         {
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 dst = static_cast<NativeU>(src.value);
             else
                 dst = static_cast<NativeU>(src);
@@ -99,7 +99,7 @@ inline ALWAYS_INLINE void writeSlice(const NumericArraySlice<T> & slice, Generic
 {
     for (size_t i = 0; i < slice.size; ++i)
     {
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
         {
             DecimalField field(T(slice.data[i]), 0); /// TODO: Decimal scale
             sink.elements.insert(field);
@@ -558,9 +558,9 @@ bool sliceEqualElements(const NumericArraySlice<T> & first [[maybe_unused]],
                         size_t second_ind [[maybe_unused]])
 {
     /// TODO: Decimal scale
-    if constexpr (IsDecimalNumber<T> && IsDecimalNumber<U>)
+    if constexpr (is_decimal<T> && is_decimal<U>)
         return accurate::equalsOp(first.data[first_ind].value, second.data[second_ind].value);
-    else if constexpr (IsDecimalNumber<T> || IsDecimalNumber<U>)
+    else if constexpr (is_decimal<T> || is_decimal<U>)
         return false;
     else
         return accurate::equalsOp(first.data[first_ind], second.data[second_ind]);
@@ -588,7 +588,7 @@ bool insliceEqualElements(const NumericArraySlice<T> & first [[maybe_unused]],
                           size_t first_ind [[maybe_unused]],
                           size_t second_ind [[maybe_unused]])
 {
-    if constexpr (IsDecimalNumber<T>)
+    if constexpr (is_decimal<T>)
         return accurate::equalsOp(first.data[first_ind].value, first.data[second_ind].value);
     else
         return accurate::equalsOp(first.data[first_ind], first.data[second_ind]);
diff --git a/src/Functions/GatherUtils/Sinks.h b/src/Functions/GatherUtils/Sinks.h
index fb1792585ae..e801ba9990c 100644
--- a/src/Functions/GatherUtils/Sinks.h
+++ b/src/Functions/GatherUtils/Sinks.h
@@ -36,7 +36,7 @@ struct NullableValueSource;
 template <typename T>
 struct NumericArraySink : public ArraySinkImpl<NumericArraySink<T>>
 {
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
     using CompatibleArraySource = NumericArraySource<T>;
     using CompatibleValueSource = NumericValueSource<T>;
 
diff --git a/src/Functions/GatherUtils/Sources.h b/src/Functions/GatherUtils/Sources.h
index 86b590646dc..c8014d3e855 100644
--- a/src/Functions/GatherUtils/Sources.h
+++ b/src/Functions/GatherUtils/Sources.h
@@ -39,7 +39,7 @@ template <typename ArraySink> struct NullableArraySink;
 template <typename T>
 struct NumericArraySource : public ArraySourceImpl<NumericArraySource<T>>
 {
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
     using Slice = NumericArraySlice<T>;
     using Column = ColumnArray;
 
@@ -720,7 +720,7 @@ template <typename T>
 struct NumericValueSource : ValueSourceImpl<NumericValueSource<T>>
 {
     using Slice = NumericValueSlice<T>;
-    using Column = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using Column = ColumnVectorOrDecimal<T>;
 
     using SinkType = NumericArraySink<T>;
 
diff --git a/src/Functions/GatherUtils/createArraySink.cpp b/src/Functions/GatherUtils/createArraySink.cpp
index 90983c9c25c..c2f2530a318 100644
--- a/src/Functions/GatherUtils/createArraySink.cpp
+++ b/src/Functions/GatherUtils/createArraySink.cpp
@@ -18,7 +18,7 @@ struct ArraySinkCreator<Type, Types...>
 {
     static std::unique_ptr<IArraySink> create(IColumn & values, ColumnArray::Offsets & offsets, size_t column_size)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         IColumn * not_null_values = &values;
         bool is_nullable = false;
diff --git a/src/Functions/GatherUtils/createArraySource.cpp b/src/Functions/GatherUtils/createArraySource.cpp
index d98a72e456f..ae672aa16af 100644
--- a/src/Functions/GatherUtils/createArraySource.cpp
+++ b/src/Functions/GatherUtils/createArraySource.cpp
@@ -18,7 +18,7 @@ struct ArraySourceCreator<Type, Types...>
 {
     static std::unique_ptr<IArraySource> create(const ColumnArray & col, const NullMap * null_map, bool is_const, size_t total_rows)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         if (typeid_cast<const ColVecType *>(&col.getData()))
         {
diff --git a/src/Functions/GatherUtils/createValueSource.cpp b/src/Functions/GatherUtils/createValueSource.cpp
index 4f538b95369..29c36f2728e 100644
--- a/src/Functions/GatherUtils/createValueSource.cpp
+++ b/src/Functions/GatherUtils/createValueSource.cpp
@@ -18,7 +18,7 @@ struct ValueSourceCreator<Type, Types...>
 {
     static std::unique_ptr<IValueSource> create(const IColumn & col, const NullMap * null_map, bool is_const, size_t total_rows)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         if (auto column_vector = typeid_cast<const ColVecType *>(&col))
         {
diff --git a/src/Functions/GregorianDate.h b/src/Functions/GregorianDate.h
index 5f179483b53..765e8cc2aa3 100644
--- a/src/Functions/GregorianDate.h
+++ b/src/Functions/GregorianDate.h
@@ -38,14 +38,13 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
-        GregorianDate(T mjd);
+        GregorianDate(is_integer auto mjd);
 
         /** Convert to Modified Julian Day. The type T is an integral type
           * which should be at least 32 bits wide, and should preferably
           * signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
+        template <is_integer T>
         T toModifiedJulianDay() const;
 
         /** Write the date in text form 'YYYY-MM-DD' to a buffer.
@@ -90,14 +89,13 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
-        OrdinalDate(T mjd);
+        OrdinalDate(is_integer auto mjd);
 
         /** Convert to Modified Julian Day. The type T is an integral
           * type which should be at least 32 bits wide, and should
           * preferably be signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
+        template <is_integer T>
         T toModifiedJulianDay() const noexcept;
 
         YearT year() const noexcept
@@ -259,8 +257,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
-    GregorianDate<YearT>::GregorianDate(T mjd)
+    GregorianDate<YearT>::GregorianDate(is_integer auto mjd)
     {
         const OrdinalDate<YearT> ord(mjd);
         const MonthDay md(gd::is_leap_year(ord.year()), ord.dayOfYear());
@@ -270,7 +267,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
+    template <is_integer T>
     T GregorianDate<YearT>::toModifiedJulianDay() const
     {
         const MonthDay md(month_, day_of_month_);
@@ -332,8 +329,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
-    OrdinalDate<YearT>::OrdinalDate(T mjd)
+    OrdinalDate<YearT>::OrdinalDate(is_integer auto mjd)
     {
         const auto a         = mjd + 678575;
         const auto quad_cent = gd::div(a, 146097);
@@ -348,7 +344,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
+    template <is_integer T>
     T OrdinalDate<YearT>::toModifiedJulianDay() const noexcept
     {
         const auto y = year_ - 1;
diff --git a/src/Functions/TargetSpecific.h b/src/Functions/TargetSpecific.h
index e6d3fe6d665..f8e850dc36d 100644
--- a/src/Functions/TargetSpecific.h
+++ b/src/Functions/TargetSpecific.h
@@ -106,7 +106,7 @@ String toString(TargetArch arch);
 /* Clang shows warning when there aren't any objects to apply pragma.
  * To prevent this warning we define this function inside every macros with pragmas.
  */
-#   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void __dummy_function_definition();
+#   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void _dummy_function_definition();
 #else
 #   define BEGIN_AVX512F_SPECIFIC_CODE \
         _Pragma("GCC push_options") \
diff --git a/src/Functions/abs.cpp b/src/Functions/abs.cpp
index 10664f7b421..21d92e25d75 100644
--- a/src/Functions/abs.cpp
+++ b/src/Functions/abs.cpp
@@ -9,18 +9,19 @@ namespace DB
 template <typename A>
 struct AbsImpl
 {
-    using ResultType = std::conditional_t<IsDecimalNumber<A>, A, typename NumberTraits::ResultOfAbs<A>::Type>;
+    using ResultType = std::conditional_t<is_decimal<A>, A, typename NumberTraits::ResultOfAbs<A>::Type>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
-        if constexpr (IsDecimalNumber<A>)
+        if constexpr (is_decimal<A>)
             return a < A(0) ? A(-a) : a;
         else if constexpr (is_big_int_v<A> && is_signed_v<A>)
             return (a < 0) ? -a : a;
-        else if constexpr (is_integer_v<A> && is_signed_v<A>)
+        else if constexpr (is_integer<A> && is_signed_v<A>)
             return a < 0 ? static_cast<ResultType>(~a) + 1 : static_cast<ResultType>(a);
-        else if constexpr (is_integer_v<A> && is_unsigned_v<A>)
+        else if constexpr (is_integer<A> && is_unsigned_v<A>)
             return static_cast<ResultType>(a);
         else if constexpr (std::is_floating_point_v<A>)
             return static_cast<ResultType>(std::abs(a));
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index 3d40dfe83ea..dec673af727 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -71,7 +71,7 @@ struct ArrayAggregateResultImpl<ArrayElement, AggregateOperation::sum>
         std::conditional_t<std::is_same_v<ArrayElement, UInt128>, UInt128,
         std::conditional_t<std::is_same_v<ArrayElement, Int256>, Int256,
         std::conditional_t<std::is_same_v<ArrayElement, UInt256>, UInt256,
-        std::conditional_t<IsDecimalNumber<ArrayElement>, Decimal128,
+        std::conditional_t<is_decimal<ArrayElement>, Decimal128,
         std::conditional_t<std::is_floating_point_v<ArrayElement>, Float64,
         std::conditional_t<std::is_signed_v<ArrayElement>, Int64,
             UInt64>>>>>>>;
@@ -135,8 +135,8 @@ struct ArrayAggregateImpl
     static NO_SANITIZE_UNDEFINED bool executeType(const ColumnPtr & mapped, const ColumnArray::Offsets & offsets, ColumnPtr & res_ptr)
     {
         using ResultType = ArrayAggregateResult<Element, aggregate_operation>;
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResultType = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResultType = ColumnVectorOrDecimal<ResultType>;
 
         /// For average and product of array we return Float64 as result, but we want to keep precision
         /// so we convert to Float64 as last step, but intermediate value is represented as result of sum operation
@@ -160,7 +160,7 @@ struct ArrayAggregateImpl
             const auto & data = checkAndGetColumn<ColVecType>(&column_const->getDataColumn())->getData();
 
             typename ColVecResultType::MutablePtr res_column;
-            if constexpr (IsDecimalNumber<Element>)
+            if constexpr (is_decimal<Element>)
                 res_column = ColVecResultType::create(offsets.size(), data.getScale());
             else
                 res_column = ColVecResultType::create(offsets.size());
@@ -183,7 +183,7 @@ struct ArrayAggregateImpl
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::average)
                 {
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         res[i] = DecimalUtils::convertTo<ResultType>(x, data.getScale());
                     }
@@ -197,7 +197,7 @@ struct ArrayAggregateImpl
                     size_t array_size = offsets[i] - pos;
                     AggregationType product = x;
 
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         using T = decltype(x.value);
                         T x_val = x.value;
@@ -235,7 +235,7 @@ struct ArrayAggregateImpl
         const auto & data = column->getData();
 
         typename ColVecResultType::MutablePtr res_column;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_column = ColVecResultType::create(offsets.size(), data.getScale());
         else
             res_column = ColVecResultType::create(offsets.size());
@@ -250,7 +250,7 @@ struct ArrayAggregateImpl
             /// Array is empty
             if (offsets[i] == pos)
             {
-                if constexpr (IsDecimalNumber<AggregationType>)
+                if constexpr (is_decimal<AggregationType>)
                     res[i] = aggregate_value.value;
                 else
                     res[i] = aggregate_value;
@@ -286,7 +286,7 @@ struct ArrayAggregateImpl
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::product)
                 {
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         using AggregateValueDecimalUnderlyingValue = decltype(aggregate_value.value);
                         AggregateValueDecimalUnderlyingValue current_aggregate_value = aggregate_value.value;
@@ -306,7 +306,7 @@ struct ArrayAggregateImpl
 
             if constexpr (aggregate_operation == AggregateOperation::average)
             {
-                if constexpr (IsDecimalNumber<Element>)
+                if constexpr (is_decimal<Element>)
                 {
                     aggregate_value = aggregate_value / AggregationType(count);
                     res[i] = DecimalUtils::convertTo<ResultType>(aggregate_value, data.getScale());
@@ -316,7 +316,7 @@ struct ArrayAggregateImpl
                     res[i] = static_cast<ResultType>(aggregate_value) / count;
                 }
             }
-            else if constexpr (aggregate_operation == AggregateOperation::product && IsDecimalNumber<Element>)
+            else if constexpr (aggregate_operation == AggregateOperation::product && is_decimal<Element>)
             {
                 auto result_scale = data.getScale() * count;
 
diff --git a/src/Functions/array/arrayCompact.cpp b/src/Functions/array/arrayCompact.cpp
index e0f73207da8..7914b9a154e 100644
--- a/src/Functions/array/arrayCompact.cpp
+++ b/src/Functions/array/arrayCompact.cpp
@@ -16,7 +16,6 @@ namespace ErrorCodes
 
 struct ArrayCompactImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -29,7 +28,7 @@ struct ArrayCompactImpl
     template <typename T>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColVecType = ColumnVectorOrDecimal<T>;
 
         const ColVecType * src_values_column = checkAndGetColumn<ColVecType>(mapped.get());
 
@@ -40,7 +39,7 @@ struct ArrayCompactImpl
         const typename ColVecType::Container & src_values = src_values_column->getData();
 
         typename ColVecType::MutablePtr res_values_column;
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
             res_values_column = ColVecType::create(src_values.size(), src_values.getScale());
         else
             res_values_column = ColVecType::create(src_values.size());
@@ -129,6 +128,7 @@ struct ArrayCompactImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (!(executeType< UInt8 >(mapped, array, res) ||
             executeType< UInt16>(mapped, array, res) ||
             executeType< UInt32>(mapped, array, res) ||
diff --git a/src/Functions/array/arrayCumSum.cpp b/src/Functions/array/arrayCumSum.cpp
index 9a6eafb8822..da8ef3d7852 100644
--- a/src/Functions/array/arrayCumSum.cpp
+++ b/src/Functions/array/arrayCumSum.cpp
@@ -83,8 +83,8 @@ struct ArrayCumSumImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -99,7 +99,7 @@ struct ArrayCumSumImpl
             const IColumn::Offsets & offsets = array.getOffsets();
 
             typename ColVecResult::MutablePtr res_nested;
-            if constexpr (IsDecimalNumber<Element>)
+            if constexpr (is_decimal<Element>)
             {
                 const typename ColVecType::Container & data =
                     checkAndGetColumn<ColVecType>(&column_const->getDataColumn())->getData();
@@ -119,7 +119,7 @@ struct ArrayCumSumImpl
         const IColumn::Offsets & offsets = array.getOffsets();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
diff --git a/src/Functions/array/arrayCumSumNonNegative.cpp b/src/Functions/array/arrayCumSumNonNegative.cpp
index 288422c1c9c..c40df27c1cc 100644
--- a/src/Functions/array/arrayCumSumNonNegative.cpp
+++ b/src/Functions/array/arrayCumSumNonNegative.cpp
@@ -19,7 +19,6 @@ namespace ErrorCodes
   */
 struct ArrayCumSumNonNegativeImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -71,8 +70,8 @@ struct ArrayCumSumNonNegativeImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -83,7 +82,7 @@ struct ArrayCumSumNonNegativeImpl
         const typename ColVecType::Container & data = column->getData();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
@@ -100,6 +99,7 @@ struct ArrayCumSumNonNegativeImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (executeType< UInt8 , UInt64>(mapped, array, res) ||
             executeType< UInt16, UInt64>(mapped, array, res) ||
             executeType< UInt32, UInt64>(mapped, array, res) ||
diff --git a/src/Functions/array/arrayDifference.cpp b/src/Functions/array/arrayDifference.cpp
index 7d11c6e89c8..97243f2cf74 100644
--- a/src/Functions/array/arrayDifference.cpp
+++ b/src/Functions/array/arrayDifference.cpp
@@ -20,7 +20,6 @@ namespace ErrorCodes
   */
 struct ArrayDifferenceImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -65,7 +64,7 @@ struct ArrayDifferenceImpl
             {
                 Element curr = src[pos];
 
-                if constexpr (IsDecimalNumber<Element>)
+                if constexpr (is_decimal<Element>)
                 {
                     using ResultNativeType = typename Result::NativeType;
 
@@ -93,8 +92,8 @@ struct ArrayDifferenceImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -105,7 +104,7 @@ struct ArrayDifferenceImpl
         const typename ColVecType::Container & data = column->getData();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
@@ -129,6 +128,7 @@ struct ArrayDifferenceImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (executeType< UInt8 ,  Int16>(mapped, array, res) ||
             executeType< UInt16,  Int32>(mapped, array, res) ||
             executeType< UInt32,  Int64>(mapped, array, res) ||
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index a4cdc601d84..887203ae58e 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -904,7 +904,7 @@ bool FunctionArrayElement::matchKeyToIndexString(
 template <typename FromType, typename ToType>
 static constexpr bool areConvertibleTypes =
     std::is_same_v<FromType, ToType>
-        || (is_integer_v<FromType> && is_integer_v<ToType>
+        || (is_integer<FromType> && is_integer<ToType>
             && std::is_convertible_v<FromType, ToType>);
 
 template <typename F>
diff --git a/src/Functions/array/arrayIndex.h b/src/Functions/array/arrayIndex.h
index 137f3a2ec78..c231ddbb373 100644
--- a/src/Functions/array/arrayIndex.h
+++ b/src/Functions/array/arrayIndex.h
@@ -3,10 +3,12 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnMap.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnsNumber.h>
@@ -373,23 +375,108 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[0].get());
+        auto first_argument_type = arguments[0].type;
+        auto second_argument_type = arguments[1].type;
 
-        if (!array_type)
-            throw Exception("First argument for function " + getName() + " must be an array.",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(first_argument_type.get());
+        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(first_argument_type.get());
 
-        if (!arguments[1]->onlyNull() && !allowArguments(array_type->getNestedType(), arguments[1]))
+        DataTypePtr inner_type;
+
+        /// If map is first argument only has(map_column, key) function is supported
+        if constexpr (std::is_same_v<ConcreteAction, HasAction>)
+        {
+            if (!array_type && !map_type)
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "First argument for function {} must be an array or map.",
+                    getName());
+
+            inner_type = map_type ? map_type->getKeyType() : array_type->getNestedType();
+        }
+        else
+        {
+            if (!array_type)
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "First argument for function {} must be an array.",
+                    getName());
+
+            inner_type = array_type->getNestedType();
+        }
+
+        if (!second_argument_type->onlyNull() && !allowArguments(inner_type, second_argument_type))
+        {
+            const char * first_argument_type_name = map_type ? "map" : "array";
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Types of array and 2nd argument of function `{}` must be identical up to nullability, cardinality, "
+                "Types of {} and 2nd argument of function `{}` must be identical up to nullability, cardinality, "
                 "numeric types, or Enum and numeric type. Passed: {} and {}.",
-                getName(), arguments[0]->getName(), arguments[1]->getName());
+                first_argument_type_name,
+                getName(),
+                first_argument_type->getName(),
+                second_argument_type->getName());
+        }
 
         return std::make_shared<DataTypeNumber<ResultType>>();
     }
 
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    {
+        if constexpr (std::is_same_v<ConcreteAction, HasAction>)
+        {
+            if (isMap(arguments[0].type))
+            {
+                auto non_const_map_column = arguments[0].column->convertToFullColumnIfConst();
+
+                const auto & map_column = assert_cast<const ColumnMap &>(*non_const_map_column);
+                const auto & map_array_column = map_column.getNestedColumn();
+                auto offsets = map_array_column.getOffsetsPtr();
+                auto keys = map_column.getNestedData().getColumnPtr(0);
+                auto array_column = ColumnArray::create(std::move(keys), std::move(offsets));
+
+                const auto & type_map = assert_cast<const DataTypeMap &>(*arguments[0].type);
+                auto array_type = std::make_shared<DataTypeArray>(type_map.getKeyType());
+
+                auto arguments_copy = arguments;
+                arguments_copy[0].column = std::move(array_column);
+                arguments_copy[0].type = std::move(array_type);
+                arguments_copy[0].name = arguments[0].name;
+
+                return executeArrayImpl(arguments_copy, result_type);
+            }
+        }
+
+        return executeArrayImpl(arguments, result_type);
+    }
+
+private:
+    using ResultType = typename ConcreteAction::ResultType;
+    using ResultColumnType = ColumnVector<ResultType>;
+    using ResultColumnPtr = decltype(ResultColumnType::create());
+
+    using NullMaps = std::pair<const NullMap *, const NullMap *>;
+
+    struct ExecutionData
+    {
+        const IColumn& left;
+        const IColumn& right;
+        const ColumnArray::Offsets& offsets;
+        ColumnPtr result_column;
+        NullMaps maps;
+        ResultColumnPtr result { ResultColumnType::create() };
+
+        inline void moveResult() { result_column = std::move(result); }
+    };
+
+    static inline bool allowArguments(const DataTypePtr & inner_type, const DataTypePtr & arg)
+    {
+        auto inner_type_decayed = removeNullable(removeLowCardinality(inner_type));
+        auto arg_decayed = removeNullable(removeLowCardinality(arg));
+
+        return ((isNativeNumber(inner_type_decayed) || isEnum(inner_type_decayed)) && isNativeNumber(arg_decayed))
+            || getLeastSupertype({inner_type_decayed, arg_decayed});
+    }
+
     /**
       * If one or both arguments passed to this function are nullable,
       * we create a new column that contains non-nullable arguments:
@@ -404,7 +491,7 @@ public:
       * (they are vectors of Fields, which may represent the NULL value),
       * they do not require any preprocessing.
       */
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeArrayImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
     {
         const ColumnPtr & ptr = arguments[0].column;
 
@@ -419,11 +506,13 @@ public:
         if (col_array)
             nullable = checkAndGetColumn<ColumnNullable>(col_array->getData());
 
-        auto & arg_column = arguments[1].column;
+        const auto & arg_column = arguments[1].column;
         const ColumnNullable * arg_nullable = checkAndGetColumn<ColumnNullable>(*arg_column);
 
         if (!nullable && !arg_nullable)
+        {
             return executeOnNonNullable(arguments, result_type);
+        }
         else
         {
             /**
@@ -483,34 +572,6 @@ public:
         }
     }
 
-private:
-    using ResultType = typename ConcreteAction::ResultType;
-    using ResultColumnType = ColumnVector<ResultType>;
-    using ResultColumnPtr = decltype(ResultColumnType::create());
-
-    using NullMaps = std::pair<const NullMap *, const NullMap *>;
-
-    struct ExecutionData
-    {
-        const IColumn& left;
-        const IColumn& right;
-        const ColumnArray::Offsets& offsets;
-        ColumnPtr result_column;
-        NullMaps maps;
-        ResultColumnPtr result { ResultColumnType::create() };
-
-        inline void moveResult() { result_column = std::move(result); }
-    };
-
-    static inline bool allowArguments(const DataTypePtr & array_inner_type, const DataTypePtr & arg)
-    {
-        auto inner_type_decayed = removeNullable(removeLowCardinality(array_inner_type));
-        auto arg_decayed = removeNullable(removeLowCardinality(arg));
-
-        return ((isNativeNumber(inner_type_decayed) || isEnum(inner_type_decayed)) && isNativeNumber(arg_decayed))
-            || getLeastSupertype({inner_type_decayed, arg_decayed});
-    }
-
 #define INTEGRAL_TPL_PACK UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64
 
     ColumnPtr executeOnNonNullable(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 3bb2cdb9093..1a10d7281e6 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -231,12 +231,10 @@ private:
                             key = col_fixed->getDataAt(offset + j).toString();
                         else if (const auto * col_str = checkAndGetColumn<ColumnString>(arg.key_column.get()))
                             key = col_str->getDataAt(offset + j).toString();
-                        else
-                            // should not happen
-                            throw Exception(
-                                "Expected String or FixedString, got " + std::string(getTypeName(arg.key_column->getDataType()))
-                                    + " in " + getName(),
-                                ErrorCodes::LOGICAL_ERROR);
+                        else // should not happen
+                            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Expected String or FixedString, got {} in {}",
+                                arg.key_column->getDataType(), getName());
                     }
                     else
                     {
diff --git a/src/Functions/bitAnd.cpp b/src/Functions/bitAnd.cpp
index aa4b7593c79..63f92839638 100644
--- a/src/Functions/bitAnd.cpp
+++ b/src/Functions/bitAnd.cpp
@@ -17,6 +17,7 @@ struct BitAndImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr const bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/bitBoolMaskAnd.cpp b/src/Functions/bitBoolMaskAnd.cpp
index 9b0ea85f3fd..ec208615363 100644
--- a/src/Functions/bitBoolMaskAnd.cpp
+++ b/src/Functions/bitBoolMaskAnd.cpp
@@ -22,6 +22,7 @@ struct BitBoolMaskAndImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply([[maybe_unused]] A left, [[maybe_unused]] B right)
diff --git a/src/Functions/bitBoolMaskOr.cpp b/src/Functions/bitBoolMaskOr.cpp
index d68a54924d0..595417d04b4 100644
--- a/src/Functions/bitBoolMaskOr.cpp
+++ b/src/Functions/bitBoolMaskOr.cpp
@@ -22,6 +22,7 @@ struct BitBoolMaskOrImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply([[maybe_unused]] A left, [[maybe_unused]] B right)
diff --git a/src/Functions/bitCount.cpp b/src/Functions/bitCount.cpp
index 2890b1a8253..de6e9917647 100644
--- a/src/Functions/bitCount.cpp
+++ b/src/Functions/bitCount.cpp
@@ -14,6 +14,7 @@ struct BitCountImpl
 {
     using ResultType = UInt8;
     static constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A a)
     {
diff --git a/src/Functions/bitNot.cpp b/src/Functions/bitNot.cpp
index 050d8dc3e3d..3e1e69fccc2 100644
--- a/src/Functions/bitNot.cpp
+++ b/src/Functions/bitNot.cpp
@@ -18,6 +18,7 @@ struct BitNotImpl
 {
     using ResultType = typename NumberTraits::ResultOfBitNot<A>::Type;
     static const constexpr bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A a)
     {
diff --git a/src/Functions/bitOr.cpp b/src/Functions/bitOr.cpp
index adf2244bc0a..65847e93b8b 100644
--- a/src/Functions/bitOr.cpp
+++ b/src/Functions/bitOr.cpp
@@ -16,6 +16,7 @@ struct BitOrImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr const bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/bitRotateLeft.cpp b/src/Functions/bitRotateLeft.cpp
index 9962ac174fd..2cddb93e333 100644
--- a/src/Functions/bitRotateLeft.cpp
+++ b/src/Functions/bitRotateLeft.cpp
@@ -17,6 +17,7 @@ struct BitRotateLeftImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitRotateRight.cpp b/src/Functions/bitRotateRight.cpp
index 8352f2f92bc..66664c4ab8d 100644
--- a/src/Functions/bitRotateRight.cpp
+++ b/src/Functions/bitRotateRight.cpp
@@ -17,6 +17,7 @@ struct BitRotateRightImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitShiftLeft.cpp b/src/Functions/bitShiftLeft.cpp
index 96e0fbe6d6f..60e61753d53 100644
--- a/src/Functions/bitShiftLeft.cpp
+++ b/src/Functions/bitShiftLeft.cpp
@@ -17,6 +17,7 @@ struct BitShiftLeftImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = true;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
@@ -29,6 +30,118 @@ struct BitShiftLeftImpl
             return static_cast<Result>(a) << static_cast<Result>(b);
     }
 
+    /// For String
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftLeft is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(end - pos) * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.push_back(0);
+                out_offsets.push_back(out_offsets.back() + 1);
+                return;
+            }
+
+            size_t shift_left_bits = b % word_size;
+            size_t shift_left_bytes = b / word_size;
+
+            const UInt8 * begin = pos;
+
+            const size_t old_size = out_vec.size();
+            size_t length;
+            if (shift_left_bits)
+                length = end + shift_left_bytes - begin + 1; /// Moving to the left here will make a redundant byte to store the overflowing bits in the front
+            else
+                length = end + shift_left_bytes - begin;
+
+            const size_t new_size = old_size + length + 1;
+            out_vec.resize(new_size);
+            out_vec[old_size + length] = 0;
+
+            UInt8 * op_pointer = const_cast<UInt8 *>(begin);
+            UInt8 * out = out_vec.data() + old_size;
+
+            UInt8 previous = 0;
+            while (op_pointer < end)
+            {
+                if (shift_left_bits)
+                {
+                    /// The left b bit of the right byte is moved to the right b bit of this byte
+                    *out = UInt8(UInt8(*(op_pointer) >> (8 - shift_left_bits)) | previous);
+                    previous = *op_pointer << shift_left_bits;
+                }
+                else
+                {
+                    *out = *op_pointer;
+                }
+                op_pointer++;
+                out++;
+            }
+            if (shift_left_bits)
+            {
+                *out = *(op_pointer - 1) << shift_left_bits;
+                out++;
+            }
+
+            for (size_t i = 0; i < shift_left_bytes; ++i)
+                *(out + i) = 0;
+
+            out_offsets.push_back(new_size);
+        }
+    }
+
+    /// For FixedString
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnFixedString::Chars & out_vec)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftLeft is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            size_t n = end - pos;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(n) * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.resize_fill(out_vec.size() + n);
+                return;
+            }
+
+            size_t shift_left_bytes = b / word_size;
+            size_t shift_left_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+
+            const size_t old_size = out_vec.size();
+            const size_t new_size = old_size + n;
+
+            out_vec.resize(new_size);
+
+            UInt8 * op_pointer = const_cast<UInt8 *>(begin + shift_left_bytes);
+            UInt8 * out = out_vec.data() + old_size;
+
+            while (op_pointer < end)
+            {
+                *out = *op_pointer << shift_left_bits;
+                if (op_pointer + 1 < end)
+                {
+                    /// The left b bit of the right byte is moved to the right b bit of this byte
+                    *out = UInt8(UInt8(*(op_pointer + 1) >> (8 - shift_left_bits)) | *out);
+                }
+                op_pointer++;
+                out++;
+            }
+
+            for (size_t i = 0; i < shift_left_bytes; ++i)
+                *(out + i) = 0;
+        }
+    }
+
 #if USE_EMBEDDED_COMPILER
     static constexpr bool compilable = true;
 
diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index 37c3908f8de..f3e16e4ed62 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -1,5 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
+#include <Common/hex.h>
 
 namespace DB
 {
@@ -17,6 +18,7 @@ struct BitShiftRightImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = true;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
@@ -29,6 +31,95 @@ struct BitShiftRightImpl
             return static_cast<Result>(a) >> static_cast<Result>(b);
     }
 
+    static inline NO_SANITIZE_UNDEFINED void bitShiftRightForBytes(const UInt8 * op_pointer, const UInt8 * begin, UInt8 * out, const size_t shift_right_bits)
+    {
+        while (op_pointer > begin)
+        {
+            op_pointer--;
+            out--;
+            *out = *op_pointer >> shift_right_bits;
+            if (op_pointer - 1 >= begin)
+            {
+                /// The right b bit of the left byte is moved to the left b bit of this byte
+                *out = UInt8(UInt8(*(op_pointer - 1) << (8 - shift_right_bits)) | *out);
+            }
+        }
+    }
+
+    /// For String
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftRight is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(end - pos) * word_size) || b < 0)
+            {
+                /// insert default value
+                out_vec.push_back(0);
+                out_offsets.push_back(out_offsets.back() + 1);
+                return;
+            }
+
+            size_t shift_right_bytes = b / word_size;
+            size_t shift_right_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+            const UInt8 * shift_right_end = end - shift_right_bytes;
+
+            const size_t old_size = out_vec.size();
+            size_t length = shift_right_end - begin;
+            const size_t new_size = old_size + length + 1;
+            out_vec.resize(new_size);
+            out_vec[old_size + length] = 0;
+
+            /// We start from the byte on the right and shift right shift_right_bits bit by byte
+            UInt8 * op_pointer = const_cast<UInt8 *>(shift_right_end);
+            UInt8 * out = out_vec.data() + old_size + length;
+            bitShiftRightForBytes(op_pointer, begin, out, shift_right_bits);
+            out_offsets.push_back(new_size);
+        }
+    }
+
+    /// For FixedString
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnFixedString::Chars & out_vec)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftRight is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            size_t n = end - pos;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(n) * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.resize_fill(out_vec.size() + n);
+                return;
+            }
+
+            size_t shift_right_bytes = b / word_size;
+            size_t shift_right_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+            const UInt8 * shift_right_end = end - shift_right_bytes;
+
+            const size_t old_size = out_vec.size();
+            const size_t new_size = old_size + n;
+
+            /// Fill 0 to the left
+            out_vec.resize_fill(out_vec.size() + old_size + shift_right_bytes);
+            out_vec.resize(new_size);
+
+            /// We start from the byte on the right and shift right shift_right_bits bit by byte
+            UInt8 * op_pointer = const_cast<UInt8 *>(shift_right_end);
+            UInt8 * out = out_vec.data() + new_size;
+            bitShiftRightForBytes(op_pointer, begin, out, shift_right_bits);
+        }
+    }
+
 #if USE_EMBEDDED_COMPILER
     static constexpr bool compilable = true;
 
@@ -41,6 +132,7 @@ struct BitShiftRightImpl
 #endif
 };
 
+
 struct NameBitShiftRight { static constexpr auto name = "bitShiftRight"; };
 using FunctionBitShiftRight = BinaryArithmeticOverloadResolver<BitShiftRightImpl, NameBitShiftRight, true, false>;
 
diff --git a/src/Functions/bitSwapLastTwo.cpp b/src/Functions/bitSwapLastTwo.cpp
index 4103511085d..566e6a47352 100644
--- a/src/Functions/bitSwapLastTwo.cpp
+++ b/src/Functions/bitSwapLastTwo.cpp
@@ -20,6 +20,7 @@ struct BitSwapLastTwoImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType NO_SANITIZE_UNDEFINED apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/bitTest.cpp b/src/Functions/bitTest.cpp
index b7e9a84c6c1..9c12268d2ef 100644
--- a/src/Functions/bitTest.cpp
+++ b/src/Functions/bitTest.cpp
@@ -18,6 +18,7 @@ struct BitTestImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     NO_SANITIZE_UNDEFINED static inline Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitWrapperFunc.cpp b/src/Functions/bitWrapperFunc.cpp
index 8395865d554..f47ffbfe883 100644
--- a/src/Functions/bitWrapperFunc.cpp
+++ b/src/Functions/bitWrapperFunc.cpp
@@ -20,12 +20,13 @@ struct BitWrapperFuncImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType NO_SANITIZE_UNDEFINED apply(A a [[maybe_unused]])
     {
         // Should be a logical error, but this function is callable from SQL.
         // Need to investigate this.
-        if constexpr (!is_integer_v<A>)
+        if constexpr (!is_integer<A>)
             throw DB::Exception("It's a bug! Only integer types are supported by __bitWrapperFunc.", ErrorCodes::BAD_ARGUMENTS);
         return a == 0 ? static_cast<ResultType>(0b10) : static_cast<ResultType >(0b1);
     }
diff --git a/src/Functions/bitXor.cpp b/src/Functions/bitXor.cpp
index d8901c6c9ff..8f3b6a1f9ca 100644
--- a/src/Functions/bitXor.cpp
+++ b/src/Functions/bitXor.cpp
@@ -16,6 +16,7 @@ struct BitXorImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/buildId.cpp b/src/Functions/buildId.cpp
deleted file mode 100644
index 047bddeed9b..00000000000
--- a/src/Functions/buildId.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#if defined(__ELF__) && !defined(__FreeBSD__)
-
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypeString.h>
-#include <Common/SymbolIndex.h>
-#include <Core/Field.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-namespace
-{
-
-/** buildId() - returns the compiler build id of the running binary.
-  */
-class FunctionBuildId : public IFunction
-{
-public:
-    static constexpr auto name = "buildId";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionBuildId>(context->isDistributed());
-    }
-
-    explicit FunctionBuildId(bool is_distributed_) : is_distributed(is_distributed_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    bool isDeterministic() const override { return false; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
-    {
-        return false;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeString().createColumnConst(input_rows_count, SymbolIndex::instance()->getBuildIDHex());
-    }
-
-private:
-    bool is_distributed;
-};
-
-}
-
-void registerFunctionBuildId(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionBuildId>();
-}
-
-}
-
-#else
-
-namespace DB
-{
-class FunctionFactory;
-void registerFunctionBuildId(FunctionFactory &) {}
-}
-
-#endif
diff --git a/src/Functions/castTypeToEither.h b/src/Functions/castTypeToEither.h
index bff4047768d..572c97841e1 100644
--- a/src/Functions/castTypeToEither.h
+++ b/src/Functions/castTypeToEither.h
@@ -5,6 +5,20 @@
 namespace DB
 {
 
+namespace detail
+{
+template <typename Typelist, size_t ...I>
+static bool castTypeToEither(const auto * type, auto && f, std::index_sequence<I...>)
+{
+    return (
+        (typeid_cast<const typename Typelist::template At<I> *>(type)
+            ? std::forward<decltype(f)>(f)(
+                *typeid_cast<const typename Typelist::template At<I> *>(type))
+            : false)
+        || ...);
+}
+}
+
 template <typename... Ts, typename T, typename F>
 static bool castTypeToEither(const T * type, F && f)
 {
@@ -12,4 +26,12 @@ static bool castTypeToEither(const T * type, F && f)
     return ((typeid_cast<const Ts *>(type) ? f(*typeid_cast<const Ts *>(type)) : false) || ...);
 }
 
+/// Use Common/TypeList as template argument
+template <class Typelist>
+static constexpr bool castTypeToEitherTL(const auto * type, auto && f)
+{
+    return detail::castTypeToEither<Typelist>(
+            type, std::forward<decltype(f)>(f),
+            std::make_index_sequence<Typelist::size>());
+}
 }
diff --git a/src/Functions/countDigits.cpp b/src/Functions/countDigits.cpp
index 673fb291cb7..47877f042b9 100644
--- a/src/Functions/countDigits.cpp
+++ b/src/Functions/countDigits.cpp
@@ -61,7 +61,7 @@ public:
         {
             using Types = std::decay_t<decltype(types)>;
             using Type = typename Types::RightType;
-            using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+            using ColVecType = ColumnVectorOrDecimal<Type>;
 
             if (const ColVecType * col_vec = checkAndGetColumn<ColVecType>(src_column.column.get()))
             {
@@ -84,7 +84,7 @@ private:
     template <typename T, typename ColVecType>
     static void execute(const ColVecType & col, ColumnUInt8 & result_column, size_t rows_count)
     {
-        using NativeT = typename NativeType<T>::Type;
+        using NativeT = NativeType<T>;
 
         const auto & src_data = col.getData();
         auto & dst_data = result_column.getData();
@@ -92,7 +92,7 @@ private:
 
         for (size_t i = 0; i < rows_count; ++i)
         {
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 dst_data[i] = digits<NativeT>(src_data[i].value);
             else
                 dst_data[i] = digits<NativeT>(src_data[i]);
@@ -102,7 +102,7 @@ private:
     template <typename T>
     static UInt32 digits(T value)
     {
-        static_assert(!IsDecimalNumber<T>);
+        static_assert(!is_decimal<T>);
         using DivT = std::conditional_t<is_signed_v<T>, Int32, UInt32>;
 
         UInt32 res = 0;
diff --git a/src/Functions/divide.cpp b/src/Functions/divide.cpp
index aa36e23d344..7b8fcf94313 100644
--- a/src/Functions/divide.cpp
+++ b/src/Functions/divide.cpp
@@ -13,6 +13,7 @@ struct DivideFloatingImpl
 {
     using ResultType = typename NumberTraits::ResultOfFloatingPointDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/e.cpp b/src/Functions/e.cpp
deleted file mode 100644
index c43bb7d572a..00000000000
--- a/src/Functions/e.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionMathConstFloat64.h>
-
-namespace DB
-{
-namespace
-{
-
-struct EImpl
-{
-    static constexpr auto name = "e";
-    static constexpr double value = 2.7182818284590452353602874713526624977572470;
-};
-
-using FunctionE = FunctionMathConstFloat64<EImpl>;
-
-}
-
-void registerFunctionE(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionE>();
-}
-
-}
diff --git a/src/Functions/greatest.cpp b/src/Functions/greatest.cpp
index 9fda95db01f..75837a409e9 100644
--- a/src/Functions/greatest.cpp
+++ b/src/Functions/greatest.cpp
@@ -12,6 +12,7 @@ struct GreatestBaseImpl
 {
     using ResultType = NumberTraits::ResultOfGreatest<A, B>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -42,6 +43,7 @@ struct GreatestSpecialImpl
 {
     using ResultType = make_unsigned_t<A>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/h3GetFaces.cpp b/src/Functions/h3GetFaces.cpp
new file mode 100644
index 00000000000..1a1b7dd06ae
--- /dev/null
+++ b/src/Functions/h3GetFaces.cpp
@@ -0,0 +1,105 @@
+#if !defined(ARCADIA_BUILD)
+#    include "config_functions.h"
+#endif
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <common/range.h>
+
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+class FunctionH3GetFaces : public IFunction
+{
+public:
+    static constexpr auto name = "h3GetFaces";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetFaces>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt8>());
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * column = checkAndGetColumn<ColumnUInt64>(arguments[0].column.get());
+        const auto & data = column->getData();
+
+        auto result_column_data = ColumnUInt8::create();
+        auto & result_data = result_column_data->getData();
+
+        auto result_column_offsets = ColumnArray::ColumnOffsets::create();
+        auto & result_offsets = result_column_offsets->getData();
+        result_offsets.resize(input_rows_count);
+
+        auto current_offset = 0;
+        std::vector<int> faces;
+
+        for (size_t row = 0; row < input_rows_count; row++)
+        {
+            int max_faces = maxFaceCount(data[row]);
+
+            faces.resize(max_faces);
+
+            // function name h3GetFaces (v3.x) changed to getIcosahedronFaces (v4.0.0).
+            getIcosahedronFaces(data[row], faces.data());
+
+            for (int i = 0; i < max_faces; i++)
+            {
+                // valid icosahedron faces are represented by integers 0-19
+                if (faces[i] >= 0 && faces[i] <= 19)
+                {
+                    ++current_offset;
+                    result_data.emplace_back(faces[i]);
+                }
+            }
+
+            result_offsets[row] = current_offset;
+            faces.clear();
+        }
+
+        return ColumnArray::create(std::move(result_column_data), std::move(result_column_offsets));
+    }
+};
+
+}
+
+void registerFunctionH3GetFaces(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3GetFaces>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3IsPentagon.cpp b/src/Functions/h3IsPentagon.cpp
new file mode 100644
index 00000000000..2a7950cd18e
--- /dev/null
+++ b/src/Functions/h3IsPentagon.cpp
@@ -0,0 +1,79 @@
+#if !defined(ARCADIA_BUILD)
+#    include "config_functions.h"
+#endif
+
+#if USE_H3
+
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <common/range.h>
+
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+class FunctionH3IsPentagon : public IFunction
+{
+public:
+    static constexpr auto name = "h3IsPentagon";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3IsPentagon>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * column = checkAndGetColumn<ColumnUInt64>(arguments[0].column.get());
+        const auto & data = column->getData();
+
+        auto dst = ColumnVector<UInt8>::create();
+        auto & dst_data = dst->getData();
+        dst_data.resize(input_rows_count);
+
+        for (size_t row = 0 ; row < input_rows_count ; row++)
+        {
+            UInt8 res = isPentagon(data[row]);
+            dst_data[row] = res;
+        }
+        return dst;
+    }
+};
+
+}
+
+void registerFunctionH3IsPentagon(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3IsPentagon>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3ResIsClassIII.cpp b/src/Functions/h3ResIsClassIII.cpp
new file mode 100644
index 00000000000..044e6d565ac
--- /dev/null
+++ b/src/Functions/h3ResIsClassIII.cpp
@@ -0,0 +1,79 @@
+#if !defined(ARCADIA_BUILD)
+#    include "config_functions.h"
+#endif
+
+#if USE_H3
+
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <common/range.h>
+
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+class FunctionH3ResIsClassIII : public IFunction
+{
+public:
+    static constexpr auto name = "h3ResIsClassIII";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3ResIsClassIII>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * column = checkAndGetColumn<ColumnUInt64>(arguments[0].column.get());
+        const auto & data = column->getData();
+
+        auto dst = ColumnVector<UInt8>::create();
+        auto & dst_data = dst->getData();
+        dst_data.resize(input_rows_count);
+
+        for (size_t row = 0 ; row < input_rows_count ; row++)
+        {
+            UInt8 res = isResClassIII(data[row]);
+            dst_data[row] = res;
+        }
+        return dst;
+    }
+};
+
+}
+
+void registerFunctionH3ResIsClassIII(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3ResIsClassIII>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3ToGeoBoundary.cpp b/src/Functions/h3ToGeoBoundary.cpp
new file mode 100644
index 00000000000..c55a24acff6
--- /dev/null
+++ b/src/Functions/h3ToGeoBoundary.cpp
@@ -0,0 +1,96 @@
+#if !defined(ARCADIA_BUILD)
+#    include "config_functions.h"
+#endif
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int INCORRECT_DATA;
+}
+
+class FunctionH3ToGeoBoundary : public IFunction
+{
+public:
+    static constexpr auto name = "h3ToGeoBoundary";
+    String getName() const override { return name; }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3ToGeoBoundary>(); }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto & arg = arguments[0];
+        if (!isUInt64(arg))
+        {
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+        }
+
+        return std::make_shared<DataTypeArray>(
+            std::make_shared<DataTypeTuple>(
+                DataTypes{std::make_shared<DataTypeFloat64>(), std::make_shared<DataTypeFloat64>()}));
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * col_hindex = arguments[0].column.get();
+
+        auto latitude = ColumnFloat64::create();
+        auto longitude = ColumnFloat64::create();
+        auto offsets = DataTypeNumber<IColumn::Offset>().createColumn();
+        offsets->reserve(input_rows_count);
+        IColumn::Offset current_offset = 0;
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            H3Index h3index = col_hindex->getUInt(row);
+            CellBoundary boundary{};
+
+            auto err = cellToBoundary(h3index, &boundary);
+            if (err)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect H3 index: {}, error: {}", h3index, err);
+
+            for (int vert = 0; vert < boundary.numVerts; ++vert)
+            {
+                latitude->insert(radsToDegs(boundary.verts[vert].lat));
+                longitude->insert(radsToDegs(boundary.verts[vert].lng));
+            }
+
+            current_offset += boundary.numVerts;
+            offsets->insert(current_offset);
+        }
+
+        return ColumnArray::create(
+            ColumnTuple::create(Columns{std::move(latitude), std::move(longitude)}),
+            std::move(offsets));
+    }
+};
+
+void registerFunctionH3ToGeoBoundary(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3ToGeoBoundary>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/hostName.cpp b/src/Functions/hostName.cpp
deleted file mode 100644
index 2739b37e175..00000000000
--- a/src/Functions/hostName.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypeString.h>
-#include <Common/DNSResolver.h>
-#include <Core/Field.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-namespace
-{
-
-/// Get the host name. Is is constant on single server, but is not constant in distributed queries.
-class FunctionHostName : public IFunction
-{
-public:
-    static constexpr auto name = "hostName";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionHostName>(context->isDistributed());
-    }
-
-    explicit FunctionHostName(bool is_distributed_) : is_distributed(is_distributed_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    bool isDeterministic() const override { return false; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    bool isDeterministicInScopeOfQuery() const override
-    {
-        return true;
-    }
-
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        return result_type->createColumnConst(input_rows_count, DNSResolver::instance().getHostName());
-    }
-private:
-    bool is_distributed;
-};
-
-}
-
-void registerFunctionHostName(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionHostName>();
-    factory.registerAlias("hostname", "hostName");
-}
-
-}
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index ea7e1303d27..953aff3568e 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -221,7 +221,7 @@ private:
     template <typename T0, typename T1>
     static UInt32 decimalScale(const ColumnsWithTypeAndName & arguments [[maybe_unused]])
     {
-        if constexpr (IsDecimalNumber<T0> && IsDecimalNumber<T1>)
+        if constexpr (is_decimal<T0> && is_decimal<T1>)
         {
             UInt32 left_scale = getDecimalScale(*arguments[1].type);
             UInt32 right_scale = getDecimalScale(*arguments[2].type);
@@ -416,8 +416,8 @@ private:
     ColumnPtr executeTyped(
         const ColumnUInt8 * cond_col, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
-        using ColVecT0 = std::conditional_t<IsDecimalNumber<T0>, ColumnDecimal<T0>, ColumnVector<T0>>;
-        using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
+        using ColVecT0 = ColumnVectorOrDecimal<T0>;
+        using ColVecT1 = ColumnVectorOrDecimal<T1>;
 
         const IColumn * col_left_untyped = arguments[1].column.get();
 
diff --git a/src/Functions/intDiv.cpp b/src/Functions/intDiv.cpp
index 14df8af66ca..6b77b2890d4 100644
--- a/src/Functions/intDiv.cpp
+++ b/src/Functions/intDiv.cpp
@@ -23,6 +23,7 @@ struct DivideIntegralByConstantImpl
     using Op = DivideIntegralImpl<A, B>;
     using ResultType = typename Op::ResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
     static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
diff --git a/src/Functions/intDivOrZero.cpp b/src/Functions/intDivOrZero.cpp
index e44d53244cb..d1b3429abfb 100644
--- a/src/Functions/intDivOrZero.cpp
+++ b/src/Functions/intDivOrZero.cpp
@@ -10,6 +10,7 @@ struct DivideIntegralOrZeroImpl
 {
     using ResultType = typename NumberTraits::ResultOfIntegerDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/intExp10.cpp b/src/Functions/intExp10.cpp
index daf87e717e9..9eca25fd79b 100644
--- a/src/Functions/intExp10.cpp
+++ b/src/Functions/intExp10.cpp
@@ -18,6 +18,7 @@ struct IntExp10Impl
 {
     using ResultType = UInt64;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/intExp2.cpp b/src/Functions/intExp2.cpp
index d09f51a1269..59b829bbad8 100644
--- a/src/Functions/intExp2.cpp
+++ b/src/Functions/intExp2.cpp
@@ -19,6 +19,7 @@ struct IntExp2Impl
 {
     using ResultType = UInt64;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/isDecimalOverflow.cpp b/src/Functions/isDecimalOverflow.cpp
index 2c45a633686..9962d4b7314 100644
--- a/src/Functions/isDecimalOverflow.cpp
+++ b/src/Functions/isDecimalOverflow.cpp
@@ -128,10 +128,9 @@ private:
             dst_data[i] = outOfDigits<T>(src_data[i], precision);
     }
 
-    template <typename T>
+    template <is_decimal T>
     static bool outOfDigits(T dec, UInt32 precision)
     {
-        static_assert(IsDecimalNumber<T>);
         using NativeT = typename T::NativeType;
 
         if (precision > DecimalUtils::max_precision<T>)
diff --git a/src/Functions/least.cpp b/src/Functions/least.cpp
index 6ba7989a344..b7fe2b302ff 100644
--- a/src/Functions/least.cpp
+++ b/src/Functions/least.cpp
@@ -12,6 +12,7 @@ struct LeastBaseImpl
 {
     using ResultType = NumberTraits::ResultOfLeast<A, B>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -42,6 +43,7 @@ struct LeastSpecialImpl
 {
     using ResultType = std::make_signed_t<A>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index c1c639cb6f9..5517dced3e0 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -155,61 +155,25 @@ public:
         return NameMapContains::name;
     }
 
-    size_t getNumberOfArguments() const override { return 2; }
+    size_t getNumberOfArguments() const override { return impl.getNumberOfArguments(); }
 
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
+    {
+        return impl.isSuitableForShortCircuitArgumentsExecution(arguments);
+    }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        if (arguments.size() != 2)
-            throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
-                + toString(arguments.size()) + ", should be 2",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-
-        if (!map_type)
-            throw Exception{"First argument for function " + getName() + " must be a map",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        auto key_type = map_type->getKeyType();
-
-        if (!(isNumber(arguments[1].type) && isNumber(key_type))
-            && key_type->getName() != arguments[1].type->getName())
-            throw Exception{"Second argument for function " + getName() + " must be a " + key_type->getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        return std::make_shared<DataTypeUInt8>();
+        return impl.getReturnTypeImpl(arguments);
     }
 
-    bool useDefaultImplementationForConstants() const override { return true; }
-
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        bool is_const = isColumnConst(*arguments[0].column);
-        const ColumnMap * col_map = is_const ? checkAndGetColumnConstData<ColumnMap>(arguments[0].column.get()) : checkAndGetColumn<ColumnMap>(arguments[0].column.get());
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-        if (!col_map || !map_type)
-            throw Exception{"First argument for function " + getName() + " must be a map", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        auto key_type = map_type->getKeyType();
-        const auto & nested_column = col_map->getNestedColumn();
-        const auto & keys_data = col_map->getNestedData().getColumn(0);
-
-        /// Prepare arguments to call arrayIndex for check has the array element.
-        ColumnPtr column_array = ColumnArray::create(keys_data.getPtr(), nested_column.getOffsetsPtr());
-        ColumnsWithTypeAndName new_arguments =
-        {
-            {
-                is_const ? ColumnConst::create(std::move(column_array), keys_data.size()) : std::move(column_array),
-                std::make_shared<DataTypeArray>(key_type),
-                ""
-            },
-            arguments[1]
-        };
-
-        return FunctionArrayIndex<HasAction, NameMapContains>().executeImpl(new_arguments, result_type, input_rows_count);
+        return impl.executeImpl(arguments, result_type, input_rows_count);
     }
+
+private:
+    FunctionArrayIndex<HasAction, NameMapContains> impl;
 };
 
 
diff --git a/src/Functions/mathConstants.cpp b/src/Functions/mathConstants.cpp
new file mode 100644
index 00000000000..ecc2f8c48b5
--- /dev/null
+++ b/src/Functions/mathConstants.cpp
@@ -0,0 +1,47 @@
+#include <Functions/FunctionConstantBase.h>
+#include <DataTypes/DataTypesNumber.h>
+
+namespace DB
+{
+
+namespace
+{
+    template <typename Impl>
+    class FunctionMathConstFloat64 : public FunctionConstantBase<FunctionMathConstFloat64<Impl>, Float64, DataTypeFloat64>
+    {
+    public:
+        static constexpr auto name = Impl::name;
+        static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMathConstFloat64>(); }
+        FunctionMathConstFloat64() : FunctionConstantBase<FunctionMathConstFloat64<Impl>, Float64, DataTypeFloat64>(Impl::value) {}
+    };
+
+
+    struct EImpl
+    {
+        static constexpr char name[] = "e";
+        static constexpr double value = 2.7182818284590452353602874713526624977572470;
+    };
+
+    using FunctionE = FunctionMathConstFloat64<EImpl>;
+
+
+    struct PiImpl
+    {
+        static constexpr char name[] = "pi";
+        static constexpr double value = 3.1415926535897932384626433832795028841971693;
+    };
+
+    using FunctionPi = FunctionMathConstFloat64<PiImpl>;
+}
+
+void registerFunctionE(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionE>();
+}
+
+void registerFunctionPi(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPi>(FunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/Functions/minus.cpp b/src/Functions/minus.cpp
index 0ce90f3544d..a5853a22f34 100644
--- a/src/Functions/minus.cpp
+++ b/src/Functions/minus.cpp
@@ -10,6 +10,7 @@ struct MinusImpl
 {
     using ResultType = typename NumberTraits::ResultOfSubtraction<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a, B b)
diff --git a/src/Functions/modulo.cpp b/src/Functions/modulo.cpp
index 115f7a23443..e53f8d16a17 100644
--- a/src/Functions/modulo.cpp
+++ b/src/Functions/modulo.cpp
@@ -27,6 +27,7 @@ struct ModuloByConstantImpl
     using Op = ModuloImpl<A, B>;
     using ResultType = typename Op::ResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
     static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
diff --git a/src/Functions/moduloOrZero.cpp b/src/Functions/moduloOrZero.cpp
index 4143266518a..ca55ccc79fd 100644
--- a/src/Functions/moduloOrZero.cpp
+++ b/src/Functions/moduloOrZero.cpp
@@ -12,6 +12,7 @@ struct ModuloOrZeroImpl
 {
     using ResultType = typename NumberTraits::ResultOfModulo<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/multiply.cpp b/src/Functions/multiply.cpp
index 52ab8decbf7..68c12397b8d 100644
--- a/src/Functions/multiply.cpp
+++ b/src/Functions/multiply.cpp
@@ -11,6 +11,7 @@ struct MultiplyImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a, B b)
diff --git a/src/Functions/negate.cpp b/src/Functions/negate.cpp
index de3995927d3..17a9cbfe055 100644
--- a/src/Functions/negate.cpp
+++ b/src/Functions/negate.cpp
@@ -8,8 +8,9 @@ namespace DB
 template <typename A>
 struct NegateImpl
 {
-    using ResultType = std::conditional_t<IsDecimalNumber<A>, A, typename NumberTraits::ResultOfNegate<A>::Type>;
+    using ResultType = std::conditional_t<is_decimal<A>, A, typename NumberTraits::ResultOfNegate<A>::Type>;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
diff --git a/src/Functions/pi.cpp b/src/Functions/pi.cpp
deleted file mode 100644
index efa536c7314..00000000000
--- a/src/Functions/pi.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionMathConstFloat64.h>
-
-namespace DB
-{
-namespace
-{
-
-struct PiImpl
-{
-    static constexpr auto name = "pi";
-    static constexpr double value = 3.1415926535897932384626433832795028841971693;
-};
-
-using FunctionPi = FunctionMathConstFloat64<PiImpl>;
-
-}
-
-void registerFunctionPi(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionPi>(FunctionFactory::CaseInsensitive);
-}
-
-}
diff --git a/src/Functions/plus.cpp b/src/Functions/plus.cpp
index 0a63741ea3b..41e5a025cd5 100644
--- a/src/Functions/plus.cpp
+++ b/src/Functions/plus.cpp
@@ -10,6 +10,7 @@ struct PlusImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
     static const constexpr bool is_commutative = true;
 
     template <typename Result = ResultType>
diff --git a/src/Functions/registerFunctionsGeo.cpp b/src/Functions/registerFunctionsGeo.cpp
index eb881870446..a86ff18ec65 100644
--- a/src/Functions/registerFunctionsGeo.cpp
+++ b/src/Functions/registerFunctionsGeo.cpp
@@ -29,6 +29,7 @@ void registerFunctionSvg(FunctionFactory & factory);
 #if USE_H3
 void registerFunctionGeoToH3(FunctionFactory &);
 void registerFunctionH3ToGeo(FunctionFactory &);
+void registerFunctionH3ToGeoBoundary(FunctionFactory &);
 void registerFunctionH3EdgeAngle(FunctionFactory &);
 void registerFunctionH3EdgeLengthM(FunctionFactory &);
 void registerFunctionH3GetResolution(FunctionFactory &);
@@ -41,6 +42,9 @@ void registerFunctionH3IndexesAreNeighbors(FunctionFactory &);
 void registerFunctionStringToH3(FunctionFactory &);
 void registerFunctionH3ToString(FunctionFactory &);
 void registerFunctionH3HexAreaM2(FunctionFactory &);
+void registerFunctionH3ResIsClassIII(FunctionFactory &);
+void registerFunctionH3IsPentagon(FunctionFactory &);
+void registerFunctionH3GetFaces(FunctionFactory &);
 #endif
 
 #if USE_S2_GEOMETRY
@@ -81,6 +85,7 @@ void registerFunctionsGeo(FunctionFactory & factory)
 #if USE_H3
     registerFunctionGeoToH3(factory);
     registerFunctionH3ToGeo(factory);
+    registerFunctionH3ToGeoBoundary(factory);
     registerFunctionH3EdgeAngle(factory);
     registerFunctionH3EdgeLengthM(factory);
     registerFunctionH3GetResolution(factory);
@@ -93,6 +98,9 @@ void registerFunctionsGeo(FunctionFactory & factory)
     registerFunctionStringToH3(factory);
     registerFunctionH3ToString(factory);
     registerFunctionH3HexAreaM2(factory);
+    registerFunctionH3ResIsClassIII(factory);
+    registerFunctionH3IsPentagon(factory);
+    registerFunctionH3GetFaces(factory);
 #endif
 
 #if USE_S2_GEOMETRY
diff --git a/src/Functions/registerFunctionsMiscellaneous.cpp b/src/Functions/registerFunctionsMiscellaneous.cpp
index 04561203c67..dfd986c5f82 100644
--- a/src/Functions/registerFunctionsMiscellaneous.cpp
+++ b/src/Functions/registerFunctionsMiscellaneous.cpp
@@ -80,6 +80,7 @@ void registerFunctionIsIPAddressContainedIn(FunctionFactory &);
 void registerFunctionQueryID(FunctionFactory & factory);
 void registerFunctionInitialQueryID(FunctionFactory & factory);
 void registerFunctionServerUUID(FunctionFactory &);
+void registerFunctionZooKeeperSessionUptime(FunctionFactory &);
 
 #if USE_ICU
 void registerFunctionConvertCharset(FunctionFactory &);
@@ -160,6 +161,7 @@ void registerFunctionsMiscellaneous(FunctionFactory & factory)
     registerFunctionQueryID(factory);
     registerFunctionInitialQueryID(factory);
     registerFunctionServerUUID(factory);
+    registerFunctionZooKeeperSessionUptime(factory);
 
 #if USE_ICU
     registerFunctionConvertCharset(factory);
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index 0aba61e44cb..d5e3e8b7368 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -217,7 +217,7 @@ public:
                     using From = typename FromType::FieldType;
                     using To = typename ToType::FieldType;
 
-                    using FromColumnType = std::conditional_t<IsDecimalNumber<From>, ColumnDecimal<From>, ColumnVector<From>>;
+                    using FromColumnType = ColumnVectorOrDecimal<From>;
 
                     const auto * column_from = assert_cast<const FromColumnType*>(arguments[0].column.get());
 
diff --git a/src/Functions/roundAge.cpp b/src/Functions/roundAge.cpp
index 08ac941c2df..54e34dc7266 100644
--- a/src/Functions/roundAge.cpp
+++ b/src/Functions/roundAge.cpp
@@ -11,6 +11,7 @@ struct RoundAgeImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A x)
     {
diff --git a/src/Functions/roundDuration.cpp b/src/Functions/roundDuration.cpp
index dec3427a7e1..40018753d5e 100644
--- a/src/Functions/roundDuration.cpp
+++ b/src/Functions/roundDuration.cpp
@@ -11,6 +11,7 @@ struct RoundDurationImpl
 {
     using ResultType = UInt16;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A x)
     {
diff --git a/src/Functions/roundToExp2.cpp b/src/Functions/roundToExp2.cpp
index 8f467aa9281..33cfdaf1349 100644
--- a/src/Functions/roundToExp2.cpp
+++ b/src/Functions/roundToExp2.cpp
@@ -64,6 +64,7 @@ struct RoundToExp2Impl
 {
     using ResultType = T;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline T apply(T x)
     {
diff --git a/src/Functions/s2RectAdd.cpp b/src/Functions/s2RectAdd.cpp
index 90578567da2..d9b12ce22a3 100644
--- a/src/Functions/s2RectAdd.cpp
+++ b/src/Functions/s2RectAdd.cpp
@@ -41,7 +41,7 @@ public:
         return name;
     }
 
-    size_t getNumberOfArguments() const override { return 4; }
+    size_t getNumberOfArguments() const override { return 3; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
diff --git a/src/Functions/s2RectContains.cpp b/src/Functions/s2RectContains.cpp
index 5f556c3ec14..27fed9e2031 100644
--- a/src/Functions/s2RectContains.cpp
+++ b/src/Functions/s2RectContains.cpp
@@ -41,7 +41,7 @@ public:
         return name;
     }
 
-    size_t getNumberOfArguments() const override { return 4; }
+    size_t getNumberOfArguments() const override { return 3; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
diff --git a/src/Functions/serverConstants.cpp b/src/Functions/serverConstants.cpp
new file mode 100644
index 00000000000..6808e6607cf
--- /dev/null
+++ b/src/Functions/serverConstants.cpp
@@ -0,0 +1,144 @@
+#include <Functions/FunctionConstantBase.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Core/ServerUUID.h>
+#include <Common/SymbolIndex.h>
+#include <Common/DNSResolver.h>
+#include <common/DateLUT.h>
+
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config_version.h>
+#endif
+
+
+namespace DB
+{
+namespace
+{
+
+#if defined(__ELF__) && !defined(__FreeBSD__)
+    /// buildId() - returns the compiler build id of the running binary.
+    class FunctionBuildId : public FunctionConstantBase<FunctionBuildId, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "buildId";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionBuildId>(context); }
+        explicit FunctionBuildId(ContextPtr context) : FunctionConstantBase(context, SymbolIndex::instance()->getBuildIDHex()) {}
+    };
+#endif
+
+
+    /// Get the host name. Is is constant on single server, but is not constant in distributed queries.
+    class FunctionHostName : public FunctionConstantBase<FunctionHostName, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "hostName";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionHostName>(context); }
+        explicit FunctionHostName(ContextPtr context) : FunctionConstantBase(context, DNSResolver::instance().getHostName()) {}
+    };
+
+
+    class FunctionServerUUID : public FunctionConstantBase<FunctionServerUUID, UUID, DataTypeUUID>
+    {
+    public:
+        static constexpr auto name = "serverUUID";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionServerUUID>(context); }
+        explicit FunctionServerUUID(ContextPtr context) : FunctionConstantBase(context, ServerUUID::get()) {}
+    };
+
+
+    class FunctionTcpPort : public FunctionConstantBase<FunctionTcpPort, UInt16, DataTypeUInt16>
+    {
+    public:
+        static constexpr auto name = "tcpPort";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionTcpPort>(context); }
+        explicit FunctionTcpPort(ContextPtr context) : FunctionConstantBase(context, context->getTCPPort()) {}
+    };
+
+
+    /// Returns the server time zone.
+    class FunctionTimezone : public FunctionConstantBase<FunctionTimezone, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "timezone";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionTimezone>(context); }
+        explicit FunctionTimezone(ContextPtr context) : FunctionConstantBase(context, String{DateLUT::instance().getTimeZone()}) {}
+    };
+
+
+    /// Returns server uptime in seconds.
+    class FunctionUptime : public FunctionConstantBase<FunctionUptime, UInt32, DataTypeUInt32>
+    {
+    public:
+        static constexpr auto name = "uptime";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionUptime>(context); }
+        explicit FunctionUptime(ContextPtr context) : FunctionConstantBase(context, context->getUptimeSeconds()) {}
+    };
+
+
+    /// version() - returns the current version as a string.
+    class FunctionVersion : public FunctionConstantBase<FunctionVersion, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "version";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionVersion>(context); }
+        explicit FunctionVersion(ContextPtr context) : FunctionConstantBase(context, VERSION_STRING) {}
+    };
+
+    class FunctionZooKeeperSessionUptime : public FunctionConstantBase<FunctionZooKeeperSessionUptime, UInt32, DataTypeUInt32>
+    {
+    public:
+        static constexpr auto name = "zookeeperSessionUptime";
+        explicit FunctionZooKeeperSessionUptime(ContextPtr context) : FunctionConstantBase(context, context->getZooKeeperSessionUptime()) {}
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionZooKeeperSessionUptime>(context); }
+    };
+}
+
+
+void registerFunctionBuildId([[maybe_unused]] FunctionFactory & factory)
+{
+#if defined(__ELF__) && !defined(__FreeBSD__)
+    factory.registerFunction<FunctionBuildId>();
+#endif
+}
+
+void registerFunctionHostName(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionHostName>();
+    factory.registerAlias("hostname", "hostName");
+}
+
+void registerFunctionServerUUID(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionServerUUID>();
+}
+
+void registerFunctionTcpPort(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTcpPort>();
+}
+
+void registerFunctionTimezone(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTimezone>();
+    factory.registerAlias("timeZone", "timezone");
+}
+
+void registerFunctionUptime(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionUptime>();
+}
+
+void registerFunctionVersion(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionVersion>(FunctionFactory::CaseInsensitive);
+}
+
+void registerFunctionZooKeeperSessionUptime(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionZooKeeperSessionUptime>();
+}
+
+}
+
diff --git a/src/Functions/serverUUID.cpp b/src/Functions/serverUUID.cpp
deleted file mode 100644
index 4b70b1576ac..00000000000
--- a/src/Functions/serverUUID.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <Core/ServerUUID.h>
-#include <DataTypes/DataTypeUUID.h>
-#include <Functions/FunctionFactory.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-
-namespace
-{
-
-class FunctionServerUUID : public IFunction
-    {
-    public:
-        static constexpr auto name = "serverUUID";
-
-        static FunctionPtr create(ContextPtr context)
-        {
-            return std::make_shared<FunctionServerUUID>(context->isDistributed(), ServerUUID::get());
-        }
-
-        explicit FunctionServerUUID(bool is_distributed_, UUID server_uuid_)
-            : is_distributed(is_distributed_), server_uuid(server_uuid_)
-        {
-        }
-
-        String getName() const override { return name; }
-
-        size_t getNumberOfArguments() const override { return 0; }
-
-        DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeUUID>(); }
-
-        bool isDeterministic() const override { return false; }
-
-        bool isDeterministicInScopeOfQuery() const override { return true; }
-
-        bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo &) const override { return false; }
-
-        ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-        {
-            return DataTypeUUID().createColumnConst(input_rows_count, server_uuid);
-        }
-
-    private:
-        bool is_distributed;
-        const UUID server_uuid;
-    };
-
-}
-
-void registerFunctionServerUUID(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionServerUUID>();
-}
-
-}
-
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index 8e2964c1859..67c56ba0206 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -10,10 +10,11 @@ struct SignImpl
 {
     using ResultType = Int8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
-        if constexpr (IsDecimalNumber<A> || std::is_floating_point_v<A>)
+        if constexpr (is_decimal<A> || std::is_floating_point_v<A>)
             return a < A(0) ? -1 : a == A(0) ? 0 : 1;
         else if constexpr (is_signed_v<A>)
             return a < 0 ? -1 : a == 0 ? 0 : 1;
diff --git a/src/Functions/tcpPort.cpp b/src/Functions/tcpPort.cpp
deleted file mode 100644
index 10b89faa1be..00000000000
--- a/src/Functions/tcpPort.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <DataTypes/DataTypesNumber.h>
-#include <Functions/FunctionFactory.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-
-namespace
-{
-
-class FunctionTcpPort : public IFunction
-{
-public:
-    static constexpr auto name = "tcpPort";
-
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionTcpPort>(context->isDistributed(), context->getTCPPort());
-    }
-
-    explicit FunctionTcpPort(bool is_distributed_, UInt16 port_) : is_distributed(is_distributed_), port(port_)
-    {
-    }
-
-    String getName() const override { return name; }
-
-    size_t getNumberOfArguments() const override { return 0; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeUInt16>(); }
-
-    bool isDeterministic() const override { return false; }
-
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeUInt16().createColumnConst(input_rows_count, port);
-    }
-
-private:
-    bool is_distributed;
-    const UInt64 port;
-};
-
-}
-
-void registerFunctionTcpPort(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionTcpPort>();
-}
-
-}
diff --git a/src/Functions/timezone.cpp b/src/Functions/timezone.cpp
deleted file mode 100644
index 3b2319c22ca..00000000000
--- a/src/Functions/timezone.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <common/DateLUT.h>
-#include <Core/Field.h>
-#include <DataTypes/DataTypeString.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-namespace
-{
-
-/** Returns the server time zone.
-  */
-class FunctionTimezone : public IFunction
-{
-public:
-    static constexpr auto name = "timezone";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionTimezone>(context->isDistributed());
-    }
-
-    explicit FunctionTimezone(bool is_distributed_) : is_distributed(is_distributed_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    bool isDeterministic() const override { return false; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeString().createColumnConst(input_rows_count, DateLUT::instance().getTimeZone());
-    }
-private:
-    bool is_distributed;
-};
-
-}
-
-void registerFunctionTimezone(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionTimezone>();
-    factory.registerAlias("timeZone", "timezone");
-}
-
-}
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index 5d8d76975a0..2ad7585fad3 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -261,10 +261,10 @@ public:
                         + ". This argument is optional and must be a constant string with timezone name",
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
             if (first_argument_is_date && result_type_is_date)
-                throw Exception(
-                    "The timezone argument of function " + getName() + " with interval type " + interval_type->getKind().toString()
-                        + " is allowed only when the 1st argument has the type DateTime",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "The timezone argument of function {} with interval type {} is allowed only when the 1st argument "
+                    "has the type DateTime",
+                        getName(), interval_type->getKind().toString());
         };
 
         if (arguments.size() == 2)
diff --git a/src/Functions/version.cpp b/src/Functions/version.cpp
deleted file mode 100644
index 81e40655eef..00000000000
--- a/src/Functions/version.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypeString.h>
-#include <Core/Field.h>
-#include <Interpreters/Context.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
-
-namespace DB
-{
-
-/** version() - returns the current version as a string.
-  */
-class FunctionVersion : public IFunction
-{
-public:
-    static constexpr auto name = "version";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionVersion>(context->isDistributed());
-    }
-
-    explicit FunctionVersion(bool is_distributed_) : is_distributed(is_distributed_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    bool isDeterministic() const override { return false; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeString().createColumnConst(input_rows_count, VERSION_STRING);
-    }
-private:
-    bool is_distributed;
-};
-
-
-void registerFunctionVersion(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionVersion>(FunctionFactory::CaseInsensitive);
-}
-
-}
diff --git a/src/Functions/ya.make b/src/Functions/ya.make
deleted file mode 100644
index fbfff751314..00000000000
--- a/src/Functions/ya.make
+++ /dev/null
@@ -1,594 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-CFLAGS(
-    -DUSE_SSL -DUSE_XXHASH
-)
-
-ADDINCL(
-    library/cpp/consistent_hashing
-    contrib/libs/farmhash
-    contrib/libs/h3/h3lib/include
-    contrib/libs/hyperscan/src
-    contrib/libs/libdivide
-    contrib/libs/rapidjson/include
-    contrib/libs/xxhash
-    GLOBAL contrib/restricted/murmurhash
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    clickhouse/src/Parsers
-    clickhouse/src/Dictionaries
-    contrib/libs/farmhash
-    contrib/libs/fastops/fastops
-    contrib/libs/h3
-    contrib/libs/hyperscan
-    contrib/libs/icu
-    contrib/libs/libdivide
-    contrib/libs/metrohash
-    contrib/libs/rapidjson
-    contrib/libs/xxhash
-    contrib/restricted/murmurhash
-    library/cpp/consistent_hashing
-)
-
-# "Arcadia" build is slightly deficient. It lacks many libraries that we need.
-
-SRCS(
-    CRC.cpp
-    CastOverloadResolver.cpp
-    DateOrDateTimeFunctionsConvertion.cpp
-    FunctionChar.cpp
-    FunctionFQDN.cpp
-    FunctionFactory.cpp
-    FunctionFile.cpp
-    FunctionHelpers.cpp
-    FunctionJoinGet.cpp
-    FunctionSQLJSON.cpp
-    FunctionsAES.cpp
-    FunctionsBinaryRepr.cpp
-    FunctionsBitToArray.cpp
-    FunctionsCodingIP.cpp
-    FunctionsCodingUUID.cpp
-    FunctionsConversion.cpp
-    FunctionsEmbeddedDictionaries.cpp
-    FunctionsExternalDictionaries.cpp
-    FunctionsExternalModels.cpp
-    FunctionsHashing.cpp
-    FunctionsJSON.cpp
-    FunctionsLogical.cpp
-    FunctionsRandom.cpp
-    FunctionsRound.cpp
-    FunctionsStringArray.cpp
-    FunctionsStringHash.cpp
-    FunctionsStringSimilarity.cpp
-    GatherUtils/concat.cpp
-    GatherUtils/createArraySink.cpp
-    GatherUtils/createArraySource.cpp
-    GatherUtils/createValueSource.cpp
-    GatherUtils/has_all.cpp
-    GatherUtils/has_any.cpp
-    GatherUtils/has_substr.cpp
-    GatherUtils/push.cpp
-    GatherUtils/resizeConstantSize.cpp
-    GatherUtils/resizeDynamicSize.cpp
-    GatherUtils/sliceDynamicOffsetBounded.cpp
-    GatherUtils/sliceDynamicOffsetUnbounded.cpp
-    GatherUtils/sliceFromLeftConstantOffsetBounded.cpp
-    GatherUtils/sliceFromLeftConstantOffsetUnbounded.cpp
-    GatherUtils/sliceFromRightConstantOffsetBounded.cpp
-    GatherUtils/sliceFromRightConstantOffsetUnbounded.cpp
-    GeoHash.cpp
-    IFunction.cpp
-    JSONPath/Parsers/ParserJSONPath.cpp
-    JSONPath/Parsers/ParserJSONPathMemberAccess.cpp
-    JSONPath/Parsers/ParserJSONPathQuery.cpp
-    JSONPath/Parsers/ParserJSONPathRange.cpp
-    JSONPath/Parsers/ParserJSONPathRoot.cpp
-    JSONPath/Parsers/ParserJSONPathStar.cpp
-    TargetSpecific.cpp
-    URL/URLHierarchy.cpp
-    URL/URLPathHierarchy.cpp
-    URL/basename.cpp
-    URL/cutFragment.cpp
-    URL/cutQueryString.cpp
-    URL/cutQueryStringAndFragment.cpp
-    URL/cutToFirstSignificantSubdomain.cpp
-    URL/cutToFirstSignificantSubdomainCustom.cpp
-    URL/cutURLParameter.cpp
-    URL/cutWWW.cpp
-    URL/decodeURLComponent.cpp
-    URL/domain.cpp
-    URL/domainWithoutWWW.cpp
-    URL/extractURLParameter.cpp
-    URL/extractURLParameterNames.cpp
-    URL/extractURLParameters.cpp
-    URL/firstSignificantSubdomain.cpp
-    URL/firstSignificantSubdomainCustom.cpp
-    URL/fragment.cpp
-    URL/netloc.cpp
-    URL/path.cpp
-    URL/pathFull.cpp
-    URL/port.cpp
-    URL/protocol.cpp
-    URL/queryString.cpp
-    URL/queryStringAndFragment.cpp
-    URL/registerFunctionsURL.cpp
-    URL/tldLookup.generated.cpp
-    URL/topLevelDomain.cpp
-    abs.cpp
-    acos.cpp
-    acosh.cpp
-    addDays.cpp
-    addHours.cpp
-    addMinutes.cpp
-    addMonths.cpp
-    addQuarters.cpp
-    addSeconds.cpp
-    addWeeks.cpp
-    addYears.cpp
-    addressToLine.cpp
-    addressToSymbol.cpp
-    aes_decrypt_mysql.cpp
-    aes_encrypt_mysql.cpp
-    appendTrailingCharIfAbsent.cpp
-    array/array.cpp
-    array/arrayAUC.cpp
-    array/arrayAggregation.cpp
-    array/arrayAll.cpp
-    array/arrayCompact.cpp
-    array/arrayConcat.cpp
-    array/arrayCount.cpp
-    array/arrayCumSum.cpp
-    array/arrayCumSumNonNegative.cpp
-    array/arrayDifference.cpp
-    array/arrayDistinct.cpp
-    array/arrayElement.cpp
-    array/arrayEnumerate.cpp
-    array/arrayEnumerateDense.cpp
-    array/arrayEnumerateDenseRanked.cpp
-    array/arrayEnumerateRanked.cpp
-    array/arrayEnumerateUniq.cpp
-    array/arrayEnumerateUniqRanked.cpp
-    array/arrayExists.cpp
-    array/arrayFill.cpp
-    array/arrayFilter.cpp
-    array/arrayFirst.cpp
-    array/arrayFirstIndex.cpp
-    array/arrayFlatten.cpp
-    array/arrayIntersect.cpp
-    array/arrayJoin.cpp
-    array/arrayMap.cpp
-    array/arrayPopBack.cpp
-    array/arrayPopFront.cpp
-    array/arrayPushBack.cpp
-    array/arrayPushFront.cpp
-    array/arrayReduce.cpp
-    array/arrayReduceInRanges.cpp
-    array/arrayResize.cpp
-    array/arrayReverse.cpp
-    array/arraySlice.cpp
-    array/arraySort.cpp
-    array/arraySplit.cpp
-    array/arrayUniq.cpp
-    array/arrayWithConstant.cpp
-    array/arrayZip.cpp
-    array/countEqual.cpp
-    array/emptyArray.cpp
-    array/emptyArrayToSingle.cpp
-    array/has.cpp
-    array/hasAll.cpp
-    array/hasAny.cpp
-    array/hasSubstr.cpp
-    array/indexOf.cpp
-    array/length.cpp
-    array/mapOp.cpp
-    array/mapPopulateSeries.cpp
-    array/range.cpp
-    array/registerFunctionsArray.cpp
-    asin.cpp
-    asinh.cpp
-    assumeNotNull.cpp
-    atan.cpp
-    atan2.cpp
-    atanh.cpp
-    bar.cpp
-    base64Decode.cpp
-    base64Encode.cpp
-    bitAnd.cpp
-    bitBoolMaskAnd.cpp
-    bitBoolMaskOr.cpp
-    bitCount.cpp
-    bitHammingDistance.cpp
-    bitNot.cpp
-    bitOr.cpp
-    bitRotateLeft.cpp
-    bitRotateRight.cpp
-    bitShiftLeft.cpp
-    bitShiftRight.cpp
-    bitSwapLastTwo.cpp
-    bitTest.cpp
-    bitTestAll.cpp
-    bitTestAny.cpp
-    bitWrapperFunc.cpp
-    bitXor.cpp
-    blockNumber.cpp
-    blockSerializedSize.cpp
-    blockSize.cpp
-    buildId.cpp
-    byteSize.cpp
-    caseWithExpression.cpp
-    cbrt.cpp
-    coalesce.cpp
-    concat.cpp
-    connectionId.cpp
-    convertCharset.cpp
-    cos.cpp
-    cosh.cpp
-    countDigits.cpp
-    countMatches.cpp
-    countSubstrings.cpp
-    countSubstringsCaseInsensitive.cpp
-    countSubstringsCaseInsensitiveUTF8.cpp
-    currentDatabase.cpp
-    currentProfiles.cpp
-    currentRoles.cpp
-    currentUser.cpp
-    dateDiff.cpp
-    dateName.cpp
-    date_trunc.cpp
-    decodeXMLComponent.cpp
-    decrypt.cpp
-    defaultValueOfArgumentType.cpp
-    defaultValueOfTypeName.cpp
-    demange.cpp
-    divide.cpp
-    divide/divide.cpp
-    divide/divideImpl.cpp
-    dumpColumnStructure.cpp
-    e.cpp
-    empty.cpp
-    encodeXMLComponent.cpp
-    encrypt.cpp
-    endsWith.cpp
-    equals.cpp
-    erf.cpp
-    erfc.cpp
-    errorCodeToName.cpp
-    evalMLMethod.cpp
-    exp.cpp
-    exp10.cpp
-    exp2.cpp
-    extract.cpp
-    extractAllGroupsHorizontal.cpp
-    extractAllGroupsVertical.cpp
-    extractGroups.cpp
-    extractTextFromHTML.cpp
-    extractTimeZoneFromFunctionArguments.cpp
-    filesystem.cpp
-    finalizeAggregation.cpp
-    formatDateTime.cpp
-    formatReadableQuantity.cpp
-    formatReadableSize.cpp
-    formatReadableTimeDelta.cpp
-    formatRow.cpp
-    formatString.cpp
-    fromModifiedJulianDay.cpp
-    fromUnixTimestamp64Micro.cpp
-    fromUnixTimestamp64Milli.cpp
-    fromUnixTimestamp64Nano.cpp
-    fuzzBits.cpp
-    gcd.cpp
-    generateUUIDv4.cpp
-    geoToH3.cpp
-    geoToS2.cpp
-    geohashDecode.cpp
-    geohashEncode.cpp
-    geohashesInBox.cpp
-    getMacro.cpp
-    getScalar.cpp
-    getServerPort.cpp
-    getSetting.cpp
-    getSizeOfEnumType.cpp
-    globalVariable.cpp
-    greatCircleDistance.cpp
-    greater.cpp
-    greaterOrEquals.cpp
-    greatest.cpp
-    h3EdgeAngle.cpp
-    h3EdgeLengthM.cpp
-    h3GetBaseCell.cpp
-    h3GetResolution.cpp
-    h3HexAreaM2.cpp
-    h3IndexesAreNeighbors.cpp
-    h3IsValid.cpp
-    h3ToChildren.cpp
-    h3ToParent.cpp
-    h3ToString.cpp
-    h3kRing.cpp
-    h3toGeo.cpp
-    hasColumnInTable.cpp
-    hasThreadFuzzer.cpp
-    hasToken.cpp
-    hasTokenCaseInsensitive.cpp
-    hostName.cpp
-    hyperscanRegexpChecker.cpp
-    hypot.cpp
-    identity.cpp
-    if.cpp
-    ifNotFinite.cpp
-    ifNull.cpp
-    ignore.cpp
-    ilike.cpp
-    in.cpp
-    indexHint.cpp
-    initialQueryID.cpp
-    initializeAggregation.cpp
-    intDiv.cpp
-    intDivOrZero.cpp
-    intExp10.cpp
-    intExp2.cpp
-    isConstant.cpp
-    isDecimalOverflow.cpp
-    isFinite.cpp
-    isIPAddressContainedIn.cpp
-    isInfinite.cpp
-    isNaN.cpp
-    isNotNull.cpp
-    isNull.cpp
-    isValidUTF8.cpp
-    isZeroOrNull.cpp
-    jumpConsistentHash.cpp
-    lcm.cpp
-    least.cpp
-    lemmatize.cpp
-    lengthUTF8.cpp
-    less.cpp
-    lessOrEquals.cpp
-    lgamma.cpp
-    like.cpp
-    log.cpp
-    log10.cpp
-    log1p.cpp
-    log2.cpp
-    logTrace.cpp
-    lowCardinalityIndices.cpp
-    lowCardinalityKeys.cpp
-    lower.cpp
-    lowerUTF8.cpp
-    map.cpp
-    match.cpp
-    materialize.cpp
-    minus.cpp
-    modulo.cpp
-    moduloOrZero.cpp
-    multiFuzzyMatchAllIndices.cpp
-    multiFuzzyMatchAny.cpp
-    multiFuzzyMatchAnyIndex.cpp
-    multiIf.cpp
-    multiMatchAllIndices.cpp
-    multiMatchAny.cpp
-    multiMatchAnyIndex.cpp
-    multiSearchAllPositions.cpp
-    multiSearchAllPositionsCaseInsensitive.cpp
-    multiSearchAllPositionsCaseInsensitiveUTF8.cpp
-    multiSearchAllPositionsUTF8.cpp
-    multiSearchAny.cpp
-    multiSearchAnyCaseInsensitive.cpp
-    multiSearchAnyCaseInsensitiveUTF8.cpp
-    multiSearchAnyUTF8.cpp
-    multiSearchFirstIndex.cpp
-    multiSearchFirstIndexCaseInsensitive.cpp
-    multiSearchFirstIndexCaseInsensitiveUTF8.cpp
-    multiSearchFirstIndexUTF8.cpp
-    multiSearchFirstPosition.cpp
-    multiSearchFirstPositionCaseInsensitive.cpp
-    multiSearchFirstPositionCaseInsensitiveUTF8.cpp
-    multiSearchFirstPositionUTF8.cpp
-    multiply.cpp
-    negate.cpp
-    neighbor.cpp
-    normalizeQuery.cpp
-    normalizedQueryHash.cpp
-    notEmpty.cpp
-    notEquals.cpp
-    notILike.cpp
-    notLike.cpp
-    now.cpp
-    now64.cpp
-    nullIf.cpp
-    padString.cpp
-    partitionId.cpp
-    pi.cpp
-    plus.cpp
-    pointInEllipses.cpp
-    pointInPolygon.cpp
-    polygonArea.cpp
-    polygonConvexHull.cpp
-    polygonPerimeter.cpp
-    polygonsDistance.cpp
-    polygonsEquals.cpp
-    polygonsIntersection.cpp
-    polygonsSymDifference.cpp
-    polygonsUnion.cpp
-    polygonsWithin.cpp
-    position.cpp
-    positionCaseInsensitive.cpp
-    positionCaseInsensitiveUTF8.cpp
-    positionUTF8.cpp
-    pow.cpp
-    queryID.cpp
-    rand.cpp
-    rand64.cpp
-    randConstant.cpp
-    randomFixedString.cpp
-    randomPrintableASCII.cpp
-    randomString.cpp
-    randomStringUTF8.cpp
-    readWkt.cpp
-    regexpQuoteMeta.cpp
-    registerFunctions.cpp
-    registerFunctionsArithmetic.cpp
-    registerFunctionsComparison.cpp
-    registerFunctionsConditional.cpp
-    registerFunctionsConsistentHashing.cpp
-    registerFunctionsDateTime.cpp
-    registerFunctionsFormatting.cpp
-    registerFunctionsGeo.cpp
-    registerFunctionsHigherOrder.cpp
-    registerFunctionsIntrospection.cpp
-    registerFunctionsMath.cpp
-    registerFunctionsMiscellaneous.cpp
-    registerFunctionsNull.cpp
-    registerFunctionsRandom.cpp
-    registerFunctionsReinterpret.cpp
-    registerFunctionsSnowflake.cpp
-    registerFunctionsString.cpp
-    registerFunctionsStringRegexp.cpp
-    registerFunctionsStringSearch.cpp
-    registerFunctionsTuple.cpp
-    registerFunctionsUnixTimestamp64.cpp
-    registerFunctionsVisitParam.cpp
-    reinterpretAs.cpp
-    repeat.cpp
-    replaceAll.cpp
-    replaceOne.cpp
-    replaceRegexpAll.cpp
-    replaceRegexpOne.cpp
-    replicate.cpp
-    reverse.cpp
-    reverseUTF8.cpp
-    roundAge.cpp
-    roundDuration.cpp
-    roundToExp2.cpp
-    rowNumberInAllBlocks.cpp
-    rowNumberInBlock.cpp
-    runningAccumulate.cpp
-    runningConcurrency.cpp
-    runningDifference.cpp
-    runningDifferenceStartingWithFirstValue.cpp
-    s2CapContains.cpp
-    s2CapUnion.cpp
-    s2CellsIntersect.cpp
-    s2GetNeighbors.cpp
-    s2RectAdd.cpp
-    s2RectContains.cpp
-    s2RectIntersection.cpp
-    s2RectUnion.cpp
-    s2ToGeo.cpp
-    serverUUID.cpp
-    sigmoid.cpp
-    sign.cpp
-    sin.cpp
-    sinh.cpp
-    sleep.cpp
-    sleepEachRow.cpp
-    snowflake.cpp
-    sqrt.cpp
-    startsWith.cpp
-    stem.cpp
-    stringCutToZero.cpp
-    stringToH3.cpp
-    substring.cpp
-    subtractDays.cpp
-    subtractHours.cpp
-    subtractMinutes.cpp
-    subtractMonths.cpp
-    subtractQuarters.cpp
-    subtractSeconds.cpp
-    subtractWeeks.cpp
-    subtractYears.cpp
-    svg.cpp
-    synonyms.cpp
-    tan.cpp
-    tanh.cpp
-    tcpPort.cpp
-    tgamma.cpp
-    throwIf.cpp
-    tid.cpp
-    timeSlot.cpp
-    timeSlots.cpp
-    timezone.cpp
-    timezoneOf.cpp
-    timezoneOffset.cpp
-    toColumnTypeName.cpp
-    toCustomWeek.cpp
-    toDayOfMonth.cpp
-    toDayOfWeek.cpp
-    toDayOfYear.cpp
-    toFixedString.cpp
-    toHour.cpp
-    toISOWeek.cpp
-    toISOYear.cpp
-    toJSONString.cpp
-    toLowCardinality.cpp
-    toMinute.cpp
-    toModifiedJulianDay.cpp
-    toMonday.cpp
-    toMonth.cpp
-    toNullable.cpp
-    toQuarter.cpp
-    toRelativeDayNum.cpp
-    toRelativeHourNum.cpp
-    toRelativeMinuteNum.cpp
-    toRelativeMonthNum.cpp
-    toRelativeQuarterNum.cpp
-    toRelativeSecondNum.cpp
-    toRelativeWeekNum.cpp
-    toRelativeYearNum.cpp
-    toSecond.cpp
-    toStartOfDay.cpp
-    toStartOfFifteenMinutes.cpp
-    toStartOfFiveMinute.cpp
-    toStartOfHour.cpp
-    toStartOfISOYear.cpp
-    toStartOfInterval.cpp
-    toStartOfMinute.cpp
-    toStartOfMonth.cpp
-    toStartOfQuarter.cpp
-    toStartOfSecond.cpp
-    toStartOfTenMinutes.cpp
-    toStartOfYear.cpp
-    toTime.cpp
-    toTimezone.cpp
-    toTypeName.cpp
-    toUnixTimestamp64Micro.cpp
-    toUnixTimestamp64Milli.cpp
-    toUnixTimestamp64Nano.cpp
-    toValidUTF8.cpp
-    toYYYYMM.cpp
-    toYYYYMMDD.cpp
-    toYYYYMMDDhhmmss.cpp
-    toYear.cpp
-    today.cpp
-    transform.cpp
-    trap.cpp
-    trim.cpp
-    tryBase64Decode.cpp
-    tuple.cpp
-    tupleElement.cpp
-    tupleHammingDistance.cpp
-    tupleToNameValuePairs.cpp
-    upper.cpp
-    upperUTF8.cpp
-    uptime.cpp
-    validateNestedArraySizes.cpp
-    version.cpp
-    visibleWidth.cpp
-    visitParamExtractBool.cpp
-    visitParamExtractFloat.cpp
-    visitParamExtractInt.cpp
-    visitParamExtractRaw.cpp
-    visitParamExtractString.cpp
-    visitParamExtractUInt.cpp
-    visitParamHas.cpp
-    wkt.cpp
-    yandexConsistentHash.cpp
-    yesterday.cpp
-
-)
-
-END()
diff --git a/src/Functions/ya.make.in b/src/Functions/ya.make.in
deleted file mode 100644
index b21bf64304a..00000000000
--- a/src/Functions/ya.make.in
+++ /dev/null
@@ -1,43 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-CFLAGS(
-    -DUSE_SSL -DUSE_XXHASH
-)
-
-ADDINCL(
-    library/cpp/consistent_hashing
-    contrib/libs/farmhash
-    contrib/libs/h3/h3lib/include
-    contrib/libs/hyperscan/src
-    contrib/libs/libdivide
-    contrib/libs/rapidjson/include
-    contrib/libs/xxhash
-    GLOBAL contrib/restricted/murmurhash
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    clickhouse/src/Parsers
-    clickhouse/src/Dictionaries
-    contrib/libs/farmhash
-    contrib/libs/fastops/fastops
-    contrib/libs/h3
-    contrib/libs/hyperscan
-    contrib/libs/icu
-    contrib/libs/libdivide
-    contrib/libs/metrohash
-    contrib/libs/rapidjson
-    contrib/libs/xxhash
-    contrib/restricted/murmurhash
-    library/cpp/consistent_hashing
-)
-
-# "Arcadia" build is slightly deficient. It lacks many libraries that we need.
-
-SRCS(
-<? find . -name '*.cpp' | grep -i -v -P 'tests|Bitmap|abtesting' | grep -v -F examples  | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/IO/ConcatReadBuffer.h b/src/IO/ConcatReadBuffer.h
index 943d1fb3252..4ef8d04d4c9 100644
--- a/src/IO/ConcatReadBuffer.h
+++ b/src/IO/ConcatReadBuffer.h
@@ -8,17 +8,37 @@
 namespace DB
 {
 
-/** Reads from the concatenation of multiple ReadBuffers
-  */
+/// Reads from the concatenation of multiple ReadBuffer's
 class ConcatReadBuffer : public ReadBuffer
 {
 public:
-    using ReadBuffers = std::vector<ReadBuffer *>;
+    using Buffers = std::vector<std::unique_ptr<ReadBuffer>>;
+
+    ConcatReadBuffer() : ReadBuffer(nullptr, 0), current(buffers.end())
+    {
+    }
+
+    explicit ConcatReadBuffer(Buffers && buffers_) : ReadBuffer(nullptr, 0), buffers(std::move(buffers_)), current(buffers.begin())
+    {
+        assert(!buffers.empty());
+    }
+
+    ConcatReadBuffer(ReadBuffer & buf1, ReadBuffer & buf2) : ConcatReadBuffer()
+    {
+        appendBuffer(wrapReadBufferReference(buf1));
+        appendBuffer(wrapReadBufferReference(buf2));
+    }
+
+    void appendBuffer(std::unique_ptr<ReadBuffer> buffer)
+    {
+        assert(!count());
+        buffers.push_back(std::move(buffer));
+        current = buffers.begin();
+    }
 
 protected:
-    ReadBuffers buffers;
-    bool own_buffers = false;
-    ReadBuffers::iterator current;
+    Buffers buffers;
+    Buffers::iterator current;
 
     bool nextImpl() override
     {
@@ -55,41 +75,6 @@ protected:
         working_buffer = Buffer((*current)->position(), (*current)->buffer().end());
         return true;
     }
-
-public:
-    explicit ConcatReadBuffer(const ReadBuffers & buffers_) : ReadBuffer(nullptr, 0), buffers(buffers_), current(buffers.begin())
-    {
-        assert(!buffers.empty());
-    }
-
-    ConcatReadBuffer(ReadBuffer & buf1, ReadBuffer & buf2) : ConcatReadBuffer(ReadBuffers{&buf1, &buf2}) {}
-
-    ConcatReadBuffer(std::vector<std::unique_ptr<ReadBuffer>> buffers_) : ReadBuffer(nullptr, 0)
-    {
-        own_buffers = true;
-        buffers.reserve(buffers_.size());
-        for (auto & buffer : buffers_)
-            buffers.emplace_back(buffer.release());
-        current = buffers.begin();
-    }
-
-    ConcatReadBuffer(std::unique_ptr<ReadBuffer> buf1, std::unique_ptr<ReadBuffer> buf2) : ReadBuffer(nullptr, 0)
-    {
-        own_buffers = true;
-        buffers.reserve(2);
-        buffers.emplace_back(buf1.release());
-        buffers.emplace_back(buf2.release());
-        current = buffers.begin();
-    }
-
-    ~ConcatReadBuffer() override
-    {
-        if (own_buffers)
-        {
-            for (auto * buffer : buffers)
-                delete buffer;
-        }
-    }
 };
 
 }
diff --git a/src/IO/FileEncryptionCommon.cpp b/src/IO/FileEncryptionCommon.cpp
index 134c446c102..13d8acb8c7b 100644
--- a/src/IO/FileEncryptionCommon.cpp
+++ b/src/IO/FileEncryptionCommon.cpp
@@ -253,8 +253,8 @@ InitVector InitVector::random()
     std::mt19937 gen{rd()};
     std::uniform_int_distribution<UInt128::base_type> dis;
     UInt128 counter;
-    for (size_t i = 0; i != std::size(counter.items); ++i)
-        counter.items[i] = dis(gen);
+    for (auto & i : counter.items)
+        i = dis(gen);
     return InitVector{counter};
 }
 
diff --git a/src/IO/Operators.h b/src/IO/Operators.h
index 9f83e656106..114ab692dc3 100644
--- a/src/IO/Operators.h
+++ b/src/IO/Operators.h
@@ -41,16 +41,8 @@ struct QuoteManipReadBuffer          : std::reference_wrapper<ReadBuffer> { usin
 struct DoubleQuoteManipReadBuffer    : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 struct BinaryManipReadBuffer         : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 
-
-template <typename T>     WriteBuffer & operator<< (WriteBuffer & buf, const T & x)        { writeText(x, buf);     return buf; }
-/// If you do not use the manipulators, the string is displayed without an escape, as is.
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const String & x)   { writeString(x, buf);   return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const std::string_view & x)   { writeString(StringRef(x), buf);   return buf; }
-template <> inline WriteBuffer & operator<< (WriteBuffer & buf, const StringRef & x) { writeString(x, buf); return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const char & x)     { writeChar(x, buf);     return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const pcg32_fast & x) { PcgSerializer::serializePcg32(x, buf); return buf; }
-
-inline WriteBuffer & operator<< (WriteBuffer & buf, const char * x)     { writeCString(x, buf); return buf; }
+inline WriteBuffer & operator<<(WriteBuffer & buf, const auto & x) { writeText(x, buf); return buf; }
+inline WriteBuffer & operator<<(WriteBuffer & buf, const pcg32_fast & x) { PcgSerializer::serializePcg32(x, buf); return buf; }
 
 inline EscapeManipWriteBuffer      operator<< (WriteBuffer & buf, EscapeManip)      { return buf; }
 inline QuoteManipWriteBuffer       operator<< (WriteBuffer & buf, QuoteManip)       { return buf; }
@@ -62,10 +54,10 @@ template <typename T> WriteBuffer & operator<< (QuoteManipWriteBuffer buf,
 template <typename T> WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf,   const T & x) { writeDoubleQuoted(x, buf.get()); return buf; }
 template <typename T> WriteBuffer & operator<< (BinaryManipWriteBuffer buf,        const T & x) { writeBinary(x, buf.get());       return buf; }
 
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const String & x)           { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const std::string_view & x) { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const StringRef & x)        { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const char * x)             { writeEscapedString(x, strlen(x), buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const String & x)   { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, std::string_view x) { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, StringRef x)        { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const char * x)     { writeEscapedString(x, strlen(x), buf); return buf; }
 
 inline WriteBuffer & operator<< (QuoteManipWriteBuffer buf,       const char * x) { writeAnyQuotedString<'\''>(x, x + strlen(x), buf.get()); return buf; }
 inline WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf, const char * x) { writeAnyQuotedString<'"'>(x, x + strlen(x), buf.get()); return buf; }
diff --git a/src/IO/ReadBuffer.h b/src/IO/ReadBuffer.h
index 60072907a72..609065feb7e 100644
--- a/src/IO/ReadBuffer.h
+++ b/src/IO/ReadBuffer.h
@@ -258,5 +258,33 @@ inline std::unique_ptr<ReadBuffer> wrapReadBufferReference(ReadBuffer & buf)
     return std::make_unique<ReadBufferWrapper>(buf);
 }
 
+inline std::unique_ptr<ReadBuffer> wrapReadBufferPointer(ReadBufferPtr ptr)
+{
+    class ReadBufferWrapper : public ReadBuffer
+    {
+        public:
+            explicit ReadBufferWrapper(ReadBufferPtr ptr_) : ReadBuffer(ptr_->position(), 0), ptr(ptr_)
+            {
+                working_buffer = Buffer(ptr->position(), ptr->buffer().end());
+            }
+
+        private:
+            ReadBufferPtr ptr;
+
+            bool nextImpl() override
+            {
+                ptr->position() = position();
+
+                if (!ptr->next())
+                    return false;
+
+                working_buffer = ptr->buffer();
+
+                return true;
+            }
+    };
+
+    return std::make_unique<ReadBufferWrapper>(ptr);
+}
 
 }
diff --git a/src/IO/ReadBufferFromFileDescriptor.cpp b/src/IO/ReadBufferFromFileDescriptor.cpp
index 7e539f94d39..3d981a48979 100644
--- a/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -11,6 +11,10 @@
 #include <sys/stat.h>
 
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace ProfileEvents
 {
     extern const Event ReadBufferFromFileDescriptorRead;
diff --git a/src/IO/ReadBufferFromPocoSocket.cpp b/src/IO/ReadBufferFromPocoSocket.cpp
index 50e0fad0265..527b68e623a 100644
--- a/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/src/IO/ReadBufferFromPocoSocket.cpp
@@ -54,7 +54,9 @@ bool ReadBufferFromPocoSocket::nextImpl()
     }
     catch (const Poco::TimeoutException &)
     {
-        throw NetException("Timeout exceeded while reading from socket (" + peer_address.toString() + ")", ErrorCodes::SOCKET_TIMEOUT);
+        throw NetException(fmt::format("Timeout exceeded while reading from socket ({}, {} ms)",
+            peer_address.toString(),
+            socket.impl()->getReceiveTimeout().totalMilliseconds()), ErrorCodes::SOCKET_TIMEOUT);
     }
     catch (const Poco::IOException & e)
     {
diff --git a/src/IO/ReadBufferFromString.h b/src/IO/ReadBufferFromString.h
index fac1b230a2c..09646e9b41f 100644
--- a/src/IO/ReadBufferFromString.h
+++ b/src/IO/ReadBufferFromString.h
@@ -2,18 +2,17 @@
 
 #include <IO/ReadBufferFromMemory.h>
 
-
 namespace DB
 {
 
-/** Allows to read from std::string-like object.
-  */
+/// Allows to read from std::string-like object.
 class ReadBufferFromString : public ReadBufferFromMemory
 {
 public:
     /// std::string or something similar
     template <typename S>
-    ReadBufferFromString(const S & s) : ReadBufferFromMemory(s.data(), s.size()) {}
-};
+    explicit ReadBufferFromString(const S & s) : ReadBufferFromMemory(s.data(), s.size()) {}
 
+    explicit ReadBufferFromString(std::string_view s) : ReadBufferFromMemory(s.data(), s.size()) {}
+};
 }
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index f985070788c..08bc8b08ee9 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -13,6 +13,7 @@
 #include <common/LocalDateTime.h>
 #include <common/StringRef.h>
 #include <common/arithmeticOverflow.h>
+#include <common/unit.h>
 
 #include <Core/Types.h>
 #include <Core/DecimalFunctions.h>
@@ -35,10 +36,7 @@
 
 #include <double-conversion/double-conversion.h>
 
-
-/// 1 GiB
-#define DEFAULT_MAX_STRING_SIZE (1ULL << 30)
-
+static constexpr auto DEFAULT_MAX_STRING_SIZE = 1_GiB;
 
 namespace DB
 {
@@ -163,14 +161,22 @@ void assertEOF(ReadBuffer & buf);
 
 [[noreturn]] void throwAtAssertionFailed(const char * s, ReadBuffer & buf);
 
+inline bool checkChar(char c, ReadBuffer & buf)  // -V1071
+{
+    char a;
+    if (!buf.peek(a) || a != c)
+        return false;
+    buf.ignore();
+    return true;
+}
+
 inline void assertChar(char symbol, ReadBuffer & buf)
 {
-    if (buf.eof() || *buf.position() != symbol)
+    if (!checkChar(symbol, buf))
     {
         char err[2] = {symbol, '\0'};
         throwAtAssertionFailed(err, buf);
     }
-    ++buf.position();
 }
 
 inline void assertString(const String & s, ReadBuffer & buf)
@@ -184,14 +190,6 @@ inline bool checkString(const String & s, ReadBuffer & buf)
     return checkString(s.c_str(), buf);
 }
 
-inline bool checkChar(char c, ReadBuffer & buf)  // -V1071
-{
-    if (buf.eof() || *buf.position() != c)
-        return false;
-    ++buf.position();
-    return true;
-}
-
 bool checkStringCaseInsensitive(const char * s, ReadBuffer & buf);
 inline bool checkStringCaseInsensitive(const String & s, ReadBuffer & buf)
 {
@@ -333,12 +331,24 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
 
                     if (buf.count() - initial_pos + 1 >= std::numeric_limits<T>::max_digits10)
                     {
-                        T signed_res = res;
-                        if (common::mulOverflow<T>(signed_res, 10, signed_res)
-                            || common::addOverflow<T>(signed_res, (*buf.position() - '0'), signed_res))
-                            return ReturnType(false);
+                        if (negative)
+                        {
+                            T signed_res = -res;
+                            if (common::mulOverflow<T>(signed_res, 10, signed_res) ||
+                                common::subOverflow<T>(signed_res, (*buf.position() - '0'), signed_res))
+                                return ReturnType(false);
 
-                        res = signed_res;
+                            res = -static_cast<UnsignedT>(signed_res);
+                        }
+                        else
+                        {
+                            T signed_res = res;
+                            if (common::mulOverflow<T>(signed_res, 10, signed_res) ||
+                                common::addOverflow<T>(signed_res, (*buf.position() - '0'), signed_res))
+                                return ReturnType(false);
+
+                            res = signed_res;
+                        }
                         break;
                     }
                 }
@@ -368,7 +378,7 @@ end:
         {
             if constexpr (check_overflow == ReadIntTextCheckOverflow::CHECK_OVERFLOW)
             {
-                if (common::mulOverflow<T>(x, -1, x))
+                if (common::mulOverflow<UnsignedT, Int8, T>(res, -1, x))
                     return ReturnType(false);
             }
             else
@@ -382,7 +392,7 @@ end:
 template <ReadIntTextCheckOverflow check_overflow = ReadIntTextCheckOverflow::DO_NOT_CHECK_OVERFLOW, typename T>
 void readIntText(T & x, ReadBuffer & buf)
 {
-    if constexpr (IsDecimalNumber<T>)
+    if constexpr (is_decimal<T>)
     {
         readIntText<check_overflow>(x.value, buf);
     }
@@ -930,23 +940,22 @@ readBinaryBigEndian(T & x, ReadBuffer & buf)    /// Assuming little endian archi
 
 
 /// Generic methods to read value in text tab-separated format.
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-readText(T & x, ReadBuffer & buf) { readIntText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, bool>
-tryReadText(T & x, ReadBuffer & buf) { return tryReadIntText(x, buf); }
+inline void readText(is_integer auto & x, ReadBuffer & buf)
+{
+    if constexpr (std::is_same_v<decltype(x), bool &>)
+        readBoolText(x, buf);
+    else
+        readIntText(x, buf);
+}
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, void>
-readText(T & x, ReadBuffer & buf) { readFloatText(x, buf); }
+inline bool tryReadText(is_integer auto & x, ReadBuffer & buf)
+{
+    return tryReadIntText(x, buf);
+}
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, bool>
-tryReadText(T & x, ReadBuffer & buf) { return tryReadFloatText(x, buf); }
+inline void readText(is_floating_point auto & x, ReadBuffer & buf) { readFloatText(x, buf); }
 
-inline void readText(bool & x, ReadBuffer & buf) { readBoolText(x, buf); }
 inline void readText(String & x, ReadBuffer & buf) { readEscapedString(x, buf); }
 inline void readText(LocalDate & x, ReadBuffer & buf) { readDateText(x, buf); }
 inline void readText(LocalDateTime & x, ReadBuffer & buf) { readDateTimeText(x, buf); }
@@ -1155,12 +1164,10 @@ inline bool tryParse(T & res, const char * data, size_t size)
 }
 
 template <typename T>
-inline std::enable_if_t<!is_integer_v<T>, void>
-readTextWithSizeSuffix(T & x, ReadBuffer & buf) { readText(x, buf); }
+inline void readTextWithSizeSuffix(T & x, ReadBuffer & buf) { readText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-readTextWithSizeSuffix(T & x, ReadBuffer & buf)
+template <is_integer T>
+inline void readTextWithSizeSuffix(T & x, ReadBuffer & buf)
 {
     readIntText(x, buf);
     if (buf.eof())
diff --git a/src/IO/ReadSettings.cpp b/src/IO/ReadSettings.cpp
deleted file mode 100644
index 52a04f6a465..00000000000
--- a/src/IO/ReadSettings.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <IO/ReadSettings.h>
-#include <Common/Exception.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_READ_METHOD;
-}
-
-const char * toString(ReadMethod read_method)
-{
-    switch (read_method)
-    {
-#define CASE_READ_METHOD(NAME) case ReadMethod::NAME: return #NAME;
-    FOR_EACH_READ_METHOD(CASE_READ_METHOD)
-#undef CASE_READ_METHOD
-    }
-    __builtin_unreachable();
-}
-
-ReadMethod parseReadMethod(const std::string & name)
-{
-#define CASE_READ_METHOD(NAME) if (name == #NAME) return ReadMethod::NAME;
-    FOR_EACH_READ_METHOD(CASE_READ_METHOD)
-#undef CASE_READ_METHOD
-    throw Exception(ErrorCodes::UNKNOWN_READ_METHOD, "Unknown read method '{}'", name);
-}
-
-}
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
index 76a8a692f48..379b7bc2216 100644
--- a/src/IO/ReadSettings.h
+++ b/src/IO/ReadSettings.h
@@ -4,47 +4,45 @@
 #include <string>
 #include <Core/Defines.h>
 
-
 namespace DB
 {
-
-#define FOR_EACH_READ_METHOD(M) \
-    /** Simple synchronous reads with 'read'. \
-        Can use direct IO after specified size. Can use prefetch by asking OS to perform readahead. */ \
-    M(read) \
-    \
-    /** Simple synchronous reads with 'pread'. \
-        In contrast to 'read', shares single file descriptor from multiple threads. \
-        Can use direct IO after specified size. Can use prefetch by asking OS to perform readahead. */ \
-    M(pread) \
-    \
-    /** Use mmap after specified size or simple synchronous reads with 'pread'. \
-        Can use prefetch by asking OS to perform readahead. */ \
-    M(mmap) \
-    \
-    /** Checks if data is in page cache with 'preadv2' on modern Linux kernels. \
-        If data is in page cache, read from the same thread. \
-        If not, offload IO to separate threadpool. \
-        Can do prefetch with double buffering. \
-        Can use specified priorities and limit the number of concurrent reads. */ \
-    M(pread_threadpool) \
-    \
-    /** It's using asynchronous reader with fake backend that in fact synchronous. \
-        Only used for testing purposes. */ \
-    M(pread_fake_async) \
-
-
 enum class ReadMethod
 {
-#define DEFINE_READ_METHOD(NAME) NAME,
-    FOR_EACH_READ_METHOD(DEFINE_READ_METHOD)
-#undef DEFINE_READ_METHOD
+    /**
+     * Simple synchronous reads with 'read'.
+     * Can use direct IO after specified size.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    read,
+
+    /**
+     * Simple synchronous reads with 'pread'.
+     * In contrast to 'read', shares single file descriptor from multiple threads.
+     * Can use direct IO after specified size.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    pread,
+
+    /**
+     * Use mmap after specified size or simple synchronous reads with 'pread'.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    mmap,
+
+    /**
+     * Checks if data is in page cache with 'preadv2' on modern Linux kernels.
+     * If data is in page cache, read from the same thread.
+     * If not, offload IO to separate threadpool.
+     * Can do prefetch with double buffering.
+     * Can use specified priorities and limit the number of concurrent reads.
+     */
+    pread_threadpool,
+
+    /// Use asynchronous reader with fake backend that in fact synchronous.
+    /// @attention Use only for testing purposes.
+    pread_fake_async
 };
 
-const char * toString(ReadMethod read_method);
-ReadMethod parseReadMethod(const std::string & name);
-
-
 class MMappedFileCache;
 
 struct ReadSettings
@@ -68,6 +66,9 @@ struct ReadSettings
     /// For 'pread_threadpool' method. Lower is more priority.
     size_t priority = 0;
 
+    size_t remote_fs_backoff_threshold = 10000;
+    size_t remote_fs_backoff_max_tries = 4;
+
     ReadSettings adjustBufferSize(size_t file_size) const
     {
         ReadSettings res = *this;
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index ff06d6777e7..bb73a116ea4 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -280,7 +280,7 @@ protected:
 
         auto credentials_view = credentials_doc.View();
         access_key = credentials_view.GetString("AccessKeyId");
-        LOG_ERROR(logger, "Successfully pulled credentials from EC2MetadataService with access key {}.", access_key);
+        LOG_TRACE(logger, "Successfully pulled credentials from EC2MetadataService with access key {}.", access_key);
 
         secret_key = credentials_view.GetString("SecretAccessKey");
         token = credentials_view.GetString("Token");
diff --git a/src/IO/WriteBufferFromFile.cpp b/src/IO/WriteBufferFromFile.cpp
index 67cd7ba27d6..270882d0774 100644
--- a/src/IO/WriteBufferFromFile.cpp
+++ b/src/IO/WriteBufferFromFile.cpp
@@ -32,7 +32,7 @@ WriteBufferFromFile::WriteBufferFromFile(
     mode_t mode,
     char * existing_memory,
     size_t alignment)
-    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment), file_name(file_name_)
+    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment, file_name_)
 {
     ProfileEvents::increment(ProfileEvents::FileOpen);
 
@@ -65,9 +65,7 @@ WriteBufferFromFile::WriteBufferFromFile(
     size_t buf_size,
     char * existing_memory,
     size_t alignment)
-    :
-    WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment),
-    file_name(original_file_name.empty() ? "(fd = " + toString(fd_) + ")" : original_file_name)
+    : WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment, original_file_name)
 {
     fd_ = -1;
 }
diff --git a/src/IO/WriteBufferFromFile.h b/src/IO/WriteBufferFromFile.h
index b7d58638113..584a0221f1a 100644
--- a/src/IO/WriteBufferFromFile.h
+++ b/src/IO/WriteBufferFromFile.h
@@ -25,7 +25,6 @@ namespace DB
 class WriteBufferFromFile : public WriteBufferFromFileDescriptor
 {
 protected:
-    std::string file_name;
     CurrentMetrics::Increment metric_increment{CurrentMetrics::OpenFileForWrite};
 
 public:
diff --git a/src/IO/WriteBufferFromFileDescriptor.cpp b/src/IO/WriteBufferFromFileDescriptor.cpp
index cd265653bb9..38aaa945362 100644
--- a/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -61,7 +61,12 @@ void WriteBufferFromFileDescriptor::nextImpl()
         if ((-1 == res || 0 == res) && errno != EINTR)
         {
             ProfileEvents::increment(ProfileEvents::WriteBufferFromFileDescriptorWriteFailed);
-            throwFromErrnoWithPath("Cannot write to file " + getFileName(), getFileName(),
+
+            /// Don't use getFileName() here because this method can be called from destructor
+            String error_file_name = file_name;
+            if (error_file_name.empty())
+                error_file_name = "(fd = " + toString(fd) + ")";
+            throwFromErrnoWithPath("Cannot write to file " + error_file_name, error_file_name,
                                    ErrorCodes::CANNOT_WRITE_TO_FILE_DESCRIPTOR);
         }
 
@@ -73,20 +78,20 @@ void WriteBufferFromFileDescriptor::nextImpl()
     ProfileEvents::increment(ProfileEvents::WriteBufferFromFileDescriptorWriteBytes, bytes_written);
 }
 
-
-/// Name or some description of file.
-std::string WriteBufferFromFileDescriptor::getFileName() const
-{
-    return "(fd = " + toString(fd) + ")";
-}
-
-
+/// NOTE: This class can be used as a very low-level building block, for example
+/// in trace collector. In such places allocations of memory can be dangerous,
+/// so don't allocate anything in this constructor.
 WriteBufferFromFileDescriptor::WriteBufferFromFileDescriptor(
     int fd_,
     size_t buf_size,
     char * existing_memory,
-    size_t alignment)
-    : WriteBufferFromFileBase(buf_size, existing_memory, alignment), fd(fd_) {}
+    size_t alignment,
+    std::string file_name_)
+    : WriteBufferFromFileBase(buf_size, existing_memory, alignment)
+    , fd(fd_)
+    , file_name(std::move(file_name_))
+{
+}
 
 
 WriteBufferFromFileDescriptor::~WriteBufferFromFileDescriptor()
@@ -115,7 +120,7 @@ void WriteBufferFromFileDescriptor::sync()
 }
 
 
-off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence)
+off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence) // NOLINT
 {
     off_t res = lseek(fd, offset, whence);
     if (-1 == res)
@@ -125,7 +130,7 @@ off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence)
 }
 
 
-void WriteBufferFromFileDescriptor::truncate(off_t length)
+void WriteBufferFromFileDescriptor::truncate(off_t length) // NOLINT
 {
     int res = ftruncate(fd, length);
     if (-1 == res)
@@ -133,7 +138,7 @@ void WriteBufferFromFileDescriptor::truncate(off_t length)
 }
 
 
-off_t WriteBufferFromFileDescriptor::size()
+off_t WriteBufferFromFileDescriptor::size() const
 {
     struct stat buf;
     int res = fstat(fd, &buf);
@@ -142,4 +147,13 @@ off_t WriteBufferFromFileDescriptor::size()
     return buf.st_size;
 }
 
+std::string WriteBufferFromFileDescriptor::getFileName() const
+{
+    if (file_name.empty())
+        return "(fd = " + toString(fd) + ")";
+
+    return file_name;
+}
+
+
 }
diff --git a/src/IO/WriteBufferFromFileDescriptor.h b/src/IO/WriteBufferFromFileDescriptor.h
index 18c0ac64f63..cad45067548 100644
--- a/src/IO/WriteBufferFromFileDescriptor.h
+++ b/src/IO/WriteBufferFromFileDescriptor.h
@@ -13,17 +13,17 @@ class WriteBufferFromFileDescriptor : public WriteBufferFromFileBase
 protected:
     int fd;
 
+    /// If file has name contains filename, otherwise contains string "(fd=...)"
+    std::string file_name;
+
     void nextImpl() override;
-
-    /// Name or some description of file.
-    std::string getFileName() const override;
-
 public:
     WriteBufferFromFileDescriptor(
         int fd_ = -1,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         char * existing_memory = nullptr,
-        size_t alignment = 0);
+        size_t alignment = 0,
+        std::string file_name_ = "");
 
     /** Could be used before initialization if needed 'fd' was not passed to constructor.
       * It's not possible to change 'fd' during work.
@@ -42,10 +42,15 @@ public:
 
     void sync() override;
 
-    off_t seek(off_t offset, int whence);
-    void truncate(off_t length);
+    /// clang-tidy wants these methods to be const, but
+    /// they are not const semantically
+    off_t seek(off_t offset, int whence); // NOLINT
+    void truncate(off_t length); // NOLINT
 
-    off_t size();
+    /// Name or some description of file.
+    std::string getFileName() const override;
+
+    off_t size() const;
 };
 
 }
diff --git a/src/IO/WriteBufferFromPocoSocket.cpp b/src/IO/WriteBufferFromPocoSocket.cpp
index a0e4de4c831..79c8952f5a3 100644
--- a/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/src/IO/WriteBufferFromPocoSocket.cpp
@@ -57,7 +57,9 @@ void WriteBufferFromPocoSocket::nextImpl()
         }
         catch (const Poco::TimeoutException &)
         {
-            throw NetException("Timeout exceeded while writing to socket (" + peer_address.toString() + ")", ErrorCodes::SOCKET_TIMEOUT);
+            throw NetException(fmt::format("Timeout exceeded while writing to socket ({}, {} ms)",
+                peer_address.toString(),
+                socket.impl()->getSendTimeout().totalMilliseconds()), ErrorCodes::SOCKET_TIMEOUT);
         }
         catch (const Poco::IOException & e)
         {
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index 6a0050b061f..e5395e33df1 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -5,6 +5,7 @@
 #include <limits>
 #include <algorithm>
 #include <iterator>
+#include <concepts>
 
 #include <pcg-random/pcg_random.hpp>
 
@@ -14,6 +15,7 @@
 #include <common/find_symbols.h>
 #include <common/StringRef.h>
 #include <common/DecomposedFloat.h>
+#include <common/EnumReflection.h>
 
 #include <Core/DecimalFunctions.h>
 #include <Core/Types.h>
@@ -183,11 +185,16 @@ inline void writeString(const char * data, size_t size, WriteBuffer & buf)
     buf.write(data, size);
 }
 
-inline void writeString(const StringRef & ref, WriteBuffer & buf)
+// Otherwise StringRef and string_view overloads are ambiguous when passing string literal. Prefer std::string_view
+void writeString(std::same_as<StringRef> auto ref, WriteBuffer & buf)
 {
     writeString(ref.data, ref.size, buf);
 }
 
+inline void writeString(std::string_view ref, WriteBuffer & buf)
+{
+    writeString(ref.data(), ref.size(), buf);
+}
 
 /** Writes a C-string without creating a temporary object. If the string is a literal, then `strlen` is executed at the compilation stage.
   * Use when the string is a literal.
@@ -372,7 +379,7 @@ void writeJSONNumber(T x, WriteBuffer & ostr, const FormatSettings & settings)
 {
     bool is_finite = isFinite(x);
 
-    const bool need_quote = (is_integer_v<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
+    const bool need_quote = (is_integer<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
         || (settings.json.quote_denormals && !is_finite);
 
     if (need_quote)
@@ -876,24 +883,22 @@ inline void writeBinary(const LocalDateTime & x, WriteBuffer & buf) { writePODBi
 inline void writeBinary(const UUID & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 
 /// Methods for outputting the value in text form for a tab-separated format.
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-writeText(const T & x, WriteBuffer & buf) { writeIntText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, void>
-writeText(const T & x, WriteBuffer & buf) { writeFloatText(x, buf); }
+inline void writeText(is_integer auto x, WriteBuffer & buf)
+{
+    if constexpr (std::is_same_v<decltype(x), bool>)
+        writeBoolText(x, buf);
+    else if constexpr (std::is_same_v<decltype(x), char>)
+        writeChar(x, buf);
+    else
+        writeIntText(x, buf);
+}
 
-inline void writeText(const String & x, WriteBuffer & buf) { writeString(x.c_str(), x.size(), buf); }
-inline void writeText(const std::string_view & x, WriteBuffer & buf) { writeString(x.data(), x.size(), buf); }
+inline void writeText(is_floating_point auto x, WriteBuffer & buf) { writeFloatText(x, buf); }
 
-/// Implemented as template specialization (not function overload) to avoid preference over templates on arithmetic types above.
-template <> inline void writeText<bool>(const bool & x, WriteBuffer & buf) { writeBoolText(x, buf); }
+inline void writeText(is_enum auto x, WriteBuffer & buf) { writeText(magic_enum::enum_name(x), buf); }
 
-/// unlike the method for std::string
-/// assumes here that `x` is a null-terminated string.
-inline void writeText(const char * x, WriteBuffer & buf) { writeCString(x, buf); }
-inline void writeText(const char * x, size_t size, WriteBuffer & buf) { writeString(x, size, buf); }
+inline void writeText(std::string_view x, WriteBuffer & buf) { writeString(x.data(), x.size(), buf); }
 
 inline void writeText(const DayNum & x, WriteBuffer & buf) { writeDateText(LocalDate(x), buf); }
 inline void writeText(const LocalDate & x, WriteBuffer & buf) { writeDateText(x, buf); }
diff --git a/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp b/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
new file mode 100644
index 00000000000..536fbf35113
--- /dev/null
+++ b/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
@@ -0,0 +1,164 @@
+#include <IO/ZstdDeflatingAppendableWriteBuffer.h>
+#include <Common/MemoryTracker.h>
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ZSTD_ENCODER_FAILED;
+}
+
+ZstdDeflatingAppendableWriteBuffer::ZstdDeflatingAppendableWriteBuffer(
+    WriteBuffer & out_, int compression_level, bool append_to_existing_stream_,
+    size_t buf_size, char * existing_memory, size_t alignment)
+    : BufferWithOwnMemory<WriteBuffer>(buf_size, existing_memory, alignment)
+    , out(out_)
+    , append_to_existing_stream(append_to_existing_stream_)
+{
+    cctx = ZSTD_createCCtx();
+    if (cctx == nullptr)
+        throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "zstd stream encoder init failed: zstd version: {}", ZSTD_VERSION_STRING);
+    size_t ret = ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, compression_level);
+    if (ZSTD_isError(ret))
+        throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "zstd stream encoder option setting failed: error code: {}; zstd version: {}", ret, ZSTD_VERSION_STRING);
+
+    input = {nullptr, 0, 0};
+    output = {nullptr, 0, 0};
+}
+
+void ZstdDeflatingAppendableWriteBuffer::nextImpl()
+{
+    if (!offset())
+        return;
+
+    ZSTD_EndDirective mode = ZSTD_e_flush;
+
+    input.src = reinterpret_cast<unsigned char *>(working_buffer.begin());
+    input.size = offset();
+    input.pos = 0;
+
+    if (first_write && append_to_existing_stream)
+    {
+        addEmptyBlock();
+        first_write = false;
+    }
+
+    try
+    {
+        bool ended = false;
+        do
+        {
+            out.nextIfAtEnd();
+
+            output.dst = reinterpret_cast<unsigned char *>(out.buffer().begin());
+            output.size = out.buffer().size();
+            output.pos = out.offset();
+
+            size_t compression_result = ZSTD_compressStream2(cctx, &output, &input, mode);
+            if (ZSTD_isError(compression_result))
+                throw Exception(
+                    ErrorCodes::ZSTD_ENCODER_FAILED, "Zstd stream encoding failed: error code: {}; zstd version: {}", ZSTD_getErrorName(compression_result), ZSTD_VERSION_STRING);
+
+            out.position() = out.buffer().begin() + output.pos;
+
+            bool everything_was_compressed = (input.pos == input.size);
+            bool everything_was_flushed = compression_result == 0;
+
+            ended = everything_was_compressed && everything_was_flushed;
+        } while (!ended);
+    }
+    catch (...)
+    {
+        /// Do not try to write next time after exception.
+        out.position() = out.buffer().begin();
+        throw;
+    }
+}
+
+void ZstdDeflatingAppendableWriteBuffer::finish()
+{
+    if (finished || first_write)
+    {
+        /// Nothing was written or we have already finished
+        return;
+    }
+
+    try
+    {
+        finishImpl();
+        out.finalize();
+        finished = true;
+    }
+    catch (...)
+    {
+        /// Do not try to flush next time after exception.
+        out.position() = out.buffer().begin();
+        finished = true;
+        throw;
+    }
+}
+
+
+ZstdDeflatingAppendableWriteBuffer::~ZstdDeflatingAppendableWriteBuffer()
+{
+    /// FIXME move final flush into the caller
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
+
+    finish();
+
+    try
+    {
+        int err = ZSTD_freeCCtx(cctx);
+        /// This is just in case, since it is impossible to get an error by using this wrapper.
+        if (unlikely(err))
+            throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "ZSTD_freeCCtx failed: error: '{}'; zstd version: {}", ZSTD_getErrorName(err), ZSTD_VERSION_STRING);
+    }
+    catch (...)
+    {
+        /// It is OK not to terminate under an error from ZSTD_freeCCtx()
+        /// since all data already written to the stream.
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void ZstdDeflatingAppendableWriteBuffer::finishImpl()
+{
+    next();
+
+    out.nextIfAtEnd();
+
+    input.src = reinterpret_cast<unsigned char *>(working_buffer.begin());
+    input.size = offset();
+    input.pos = 0;
+
+    output.dst = reinterpret_cast<unsigned char *>(out.buffer().begin());
+    output.size = out.buffer().size();
+    output.pos = out.offset();
+
+    size_t remaining = ZSTD_compressStream2(cctx, &output, &input, ZSTD_e_end);
+    while (remaining != 0)
+    {
+        if (ZSTD_isError(remaining))
+            throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "zstd stream encoder end failed: error: '{}' zstd version: {}", ZSTD_getErrorName(remaining), ZSTD_VERSION_STRING);
+
+        remaining = ZSTD_compressStream2(cctx, &output, &input, ZSTD_e_end);
+    }
+    out.position() = out.buffer().begin() + output.pos;
+}
+
+void ZstdDeflatingAppendableWriteBuffer::addEmptyBlock()
+{
+    /// HACK: https://github.com/facebook/zstd/issues/2090#issuecomment-620158967
+    static const char empty_block[3] = {0x01, 0x00, 0x00};
+
+    if (out.buffer().size() - out.offset() < sizeof(empty_block))
+        out.next();
+
+    std::memcpy(out.buffer().begin() + out.offset(), empty_block, sizeof(empty_block));
+
+    out.position() = out.buffer().begin() + out.offset() + sizeof(empty_block);
+}
+
+}
diff --git a/src/IO/ZstdDeflatingAppendableWriteBuffer.h b/src/IO/ZstdDeflatingAppendableWriteBuffer.h
new file mode 100644
index 00000000000..e958f9895f4
--- /dev/null
+++ b/src/IO/ZstdDeflatingAppendableWriteBuffer.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/CompressionMethod.h>
+#include <IO/WriteBuffer.h>
+
+#include <zstd.h>
+
+
+namespace DB
+{
+
+/// Performs stream compression using zstd library and writes compressed data to out_ WriteBuffer.
+/// Main differences from ZstdDeflatingWriteBuffer:
+/// 1) Allows to continue to write to the same output even if finalize() (or destructor) was not called, for example
+///    when server was killed with 9 signal. Natively zstd doesn't support such feature because
+///    ZSTD_decompressStream expect to see empty block at the end of each frame. There is not API function for it
+///    so we just use HACK and add empty block manually on the first write (see addEmptyBlock). Maintainers of zstd
+///    said that there is no risks of compatibility issues https://github.com/facebook/zstd/issues/2090#issuecomment-620158967.
+/// 2) Doesn't support internal ZSTD check-summing, because ZSTD checksums written at the end of frame (frame epilogue).
+///
+class ZstdDeflatingAppendableWriteBuffer : public BufferWithOwnMemory<WriteBuffer>
+{
+public:
+    ZstdDeflatingAppendableWriteBuffer(
+        WriteBuffer & out_,
+        int compression_level,
+        bool append_to_existing_stream_, /// if true then out mustn't be empty
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        char * existing_memory = nullptr,
+        size_t alignment = 0);
+
+    /// Write terminating ZSTD_e_end: empty block + frame epilogue. BTW it
+    /// should be almost noop, because frame epilogue contains only checksums,
+    /// and they are disabled for this buffer.
+    void finalize() override { finish(); }
+
+    ~ZstdDeflatingAppendableWriteBuffer() override;
+
+    void sync() override
+    {
+        next();
+        out.sync();
+    }
+
+private:
+    /// NOTE: will fill compressed data to the out.working_buffer, but will not call out.next method until the buffer is full
+    void nextImpl() override;
+
+    /// Flush all pending data and write zstd footer to the underlying buffer.
+    /// After the first call to this function, subsequent calls will have no effect and
+    /// an attempt to write to this buffer will result in exception.
+    void finish();
+    void finishImpl();
+    /// Adding zstd empty block to out.working_buffer
+    void addEmptyBlock();
+
+    WriteBuffer & out;
+    /// We appending data to existing stream so on the first nextImpl call we
+    /// will append empty block.
+    bool append_to_existing_stream;
+    ZSTD_CCtx * cctx;
+    ZSTD_inBuffer input;
+    ZSTD_outBuffer output;
+    /// Flipped in finish call
+    bool finished = false;
+    /// Flipped on the first nextImpl call
+    bool first_write = true;
+};
+
+}
diff --git a/src/IO/ZstdDeflatingWriteBuffer.cpp b/src/IO/ZstdDeflatingWriteBuffer.cpp
index 08b289a2e04..f66d48151c8 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.cpp
+++ b/src/IO/ZstdDeflatingWriteBuffer.cpp
@@ -40,7 +40,7 @@ ZstdDeflatingWriteBuffer::~ZstdDeflatingWriteBuffer()
         int err = ZSTD_freeCCtx(cctx);
         /// This is just in case, since it is impossible to get an error by using this wrapper.
         if (unlikely(err))
-            throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "ZSTD_freeCCtx failed: error code: {}; zstd version: {}", err, ZSTD_VERSION_STRING);
+            throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "ZSTD_freeCCtx failed: error: '{}'; zstd version: {}", ZSTD_getErrorName(err), ZSTD_VERSION_STRING);
     }
     catch (...)
     {
@@ -73,9 +73,17 @@ void ZstdDeflatingWriteBuffer::nextImpl()
             output.pos = out->offset();
 
 
-            ZSTD_compressStream2(cctx, &output, &input, mode);
+            size_t compression_result = ZSTD_compressStream2(cctx, &output, &input, mode);
+            if (ZSTD_isError(compression_result))
+                throw Exception(
+                    ErrorCodes::ZSTD_ENCODER_FAILED, "Zstd stream encoding failed: error: '{}'; zstd version: {}", ZSTD_getErrorName(compression_result), ZSTD_VERSION_STRING);
+
             out->position() = out->buffer().begin() + output.pos;
-            ended = (input.pos == input.size);
+
+            bool everything_was_compressed = (input.pos == input.size);
+            bool everything_was_flushed = compression_result == 0;
+
+            ended = everything_was_compressed && everything_was_flushed;
         } while (!ended);
     }
     catch (...)
diff --git a/src/IO/ZstdDeflatingWriteBuffer.h b/src/IO/ZstdDeflatingWriteBuffer.h
index b4ecc44d6f4..941223bac45 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.h
+++ b/src/IO/ZstdDeflatingWriteBuffer.h
@@ -24,6 +24,11 @@ public:
 
     ~ZstdDeflatingWriteBuffer() override;
 
+    void sync() override
+    {
+        out->sync();
+    }
+
 private:
     void nextImpl() override;
 
diff --git a/src/IO/ZstdInflatingReadBuffer.cpp b/src/IO/ZstdInflatingReadBuffer.cpp
index da6768f7c4a..ce89f09f955 100644
--- a/src/IO/ZstdInflatingReadBuffer.cpp
+++ b/src/IO/ZstdInflatingReadBuffer.cpp
@@ -52,10 +52,10 @@ bool ZstdInflatingReadBuffer::nextImpl()
         size_t ret = ZSTD_decompressStream(dctx, &output, &input);
         if (ZSTD_isError(ret))
             throw Exception(
-                ErrorCodes::ZSTD_DECODER_FAILED, "Zstd stream decoding failed: error code: {}; zstd version: {}", ret, ZSTD_VERSION_STRING);
+                ErrorCodes::ZSTD_DECODER_FAILED, "Zstd stream encoding failed: error '{}'; zstd version: {}", ZSTD_getErrorName(ret), ZSTD_VERSION_STRING);
 
         /// Check that something has changed after decompress (input or output position)
-        assert(output.pos > 0 || in->position() < in->buffer().begin() + input.pos);
+        assert(in->eof() || output.pos > 0 || in->position() < in->buffer().begin() + input.pos);
 
         /// move position to the end of read data
         in->position() = in->buffer().begin() + input.pos;
diff --git a/src/IO/tests/gtest_bit_io.cpp b/src/IO/tests/gtest_bit_io.cpp
index 2302a6c6135..53bc4c9ae82 100644
--- a/src/IO/tests/gtest_bit_io.cpp
+++ b/src/IO/tests/gtest_bit_io.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <string.h>
 #include <IO/BitHelpers.h>
 
@@ -158,7 +162,6 @@ TEST_P(BitIO, WriteAndRead)
 
         BitReader reader(data.data(), data.size());
 
-        int bitpos = 0;
         int item = 0;
         for (const auto & bv : bits_and_vals)
         {
@@ -172,7 +175,6 @@ TEST_P(BitIO, WriteAndRead)
             ASSERT_TRUE(BinaryEqual(getBits(bv.first, bv.second), reader.readBits(bv.first)));
 
             ++item;
-            bitpos += bv.first;
         }
     }
 }
diff --git a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp b/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
index 656e40b2ad7..36b4ec10de0 100644
--- a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
+++ b/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
@@ -33,8 +33,7 @@ static void testCascadeBufferRedability(
     EXPECT_EQ(cascade.count(), data.size());
 
     std::vector<WriteBufferPtr> write_buffers;
-    std::vector<ReadBufferPtr> read_buffers;
-    std::vector<ReadBuffer *> read_buffers_raw;
+    ConcatReadBuffer concat;
     cascade.getResultBuffers(write_buffers);
 
     for (WriteBufferPtr & wbuf : write_buffers)
@@ -47,11 +46,9 @@ static void testCascadeBufferRedability(
         auto rbuf = wbuf_readable.tryGetReadBuffer();
         ASSERT_FALSE(!rbuf);
 
-        read_buffers.emplace_back(rbuf);
-        read_buffers_raw.emplace_back(rbuf.get());
+        concat.appendBuffer(wrapReadBufferPointer(rbuf));
     }
 
-    ConcatReadBuffer concat(read_buffers_raw);
     std::string decoded_data;
     {
         WriteBufferFromString decoded_data_writer(decoded_data);
diff --git a/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp b/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
index 536e5a89ca9..6c4d7436e52 100644
--- a/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
+++ b/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
@@ -33,19 +33,16 @@ TEST(MySQLBinlogEventReadBuffer, NiceBufferSize)
 TEST(MySQLBinlogEventReadBuffer, BadBufferSizes)
 {
     char res[4];
-    std::vector<ReadBufferPtr> buffers;
-    std::vector<ReadBuffer *> nested_buffers;
+    ConcatReadBuffer concat_buffer;
     std::vector<std::shared_ptr<std::vector<char>>> memory_buffers_data;
     std::vector<size_t> bad_buffers_size = {2, 1, 2, 3};
 
     for (const auto & bad_buffer_size : bad_buffers_size)
     {
         memory_buffers_data.emplace_back(std::make_shared<std::vector<char>>(bad_buffer_size, 0x01));
-        buffers.emplace_back(std::make_shared<ReadBufferFromMemory>(memory_buffers_data.back()->data(), bad_buffer_size));
-        nested_buffers.emplace_back(buffers.back().get());
+        concat_buffer.appendBuffer(std::make_unique<ReadBufferFromMemory>(memory_buffers_data.back()->data(), bad_buffer_size));
     }
 
-    ConcatReadBuffer concat_buffer(nested_buffers);
     MySQLBinlogEventReadBuffer binlog_in(concat_buffer, 4);
     binlog_in.readStrict(res, 4);
 
@@ -58,19 +55,17 @@ TEST(MySQLBinlogEventReadBuffer, BadBufferSizes)
 TEST(MySQLBinlogEventReadBuffer, NiceAndBadBufferSizes)
 {
     char res[12];
-    std::vector<ReadBufferPtr> buffers;
-    std::vector<ReadBuffer *> nested_buffers;
+    ConcatReadBuffer::Buffers nested_buffers;
     std::vector<std::shared_ptr<std::vector<char>>> memory_buffers_data;
     std::vector<size_t> buffers_size = {6, 1, 3, 6};
 
     for (const auto & bad_buffer_size : buffers_size)
     {
         memory_buffers_data.emplace_back(std::make_shared<std::vector<char>>(bad_buffer_size, 0x01));
-        buffers.emplace_back(std::make_shared<ReadBufferFromMemory>(memory_buffers_data.back()->data(), bad_buffer_size));
-        nested_buffers.emplace_back(buffers.back().get());
+        nested_buffers.emplace_back(std::make_unique<ReadBufferFromMemory>(memory_buffers_data.back()->data(), bad_buffer_size));
     }
 
-    ConcatReadBuffer concat_buffer(nested_buffers);
+    ConcatReadBuffer concat_buffer(std::move(nested_buffers));
     MySQLBinlogEventReadBuffer binlog_in(concat_buffer, 4);
     binlog_in.readStrict(res, 12);
 
diff --git a/src/IO/tests/gtest_peekable_read_buffer.cpp b/src/IO/tests/gtest_peekable_read_buffer.cpp
index 2e5ca47c0aa..0ddc355f874 100644
--- a/src/IO/tests/gtest_peekable_read_buffer.cpp
+++ b/src/IO/tests/gtest_peekable_read_buffer.cpp
@@ -28,12 +28,12 @@ try
     std::string s2 = "qwertyuiop";
     std::string s3 = "asdfghjkl;";
     std::string s4 = "zxcvbnm,./";
-    DB::ReadBufferFromString b1(s1);
-    DB::ReadBufferFromString b2(s2);
-    DB::ReadBufferFromString b3(s3);
-    DB::ReadBufferFromString b4(s4);
 
-    DB::ConcatReadBuffer concat({&b1, &b2, &b3, &b4});
+    DB::ConcatReadBuffer concat;
+    concat.appendBuffer(std::make_unique<DB::ReadBufferFromString>(s1));
+    concat.appendBuffer(std::make_unique<DB::ReadBufferFromString>(s2));
+    concat.appendBuffer(std::make_unique<DB::ReadBufferFromString>(s3));
+    concat.appendBuffer(std::make_unique<DB::ReadBufferFromString>(s4));
     DB::PeekableReadBuffer peekable(concat, 0);
 
     ASSERT_TRUE(!peekable.eof());
diff --git a/src/IO/ya.make b/src/IO/ya.make
deleted file mode 100644
index cc24a690308..00000000000
--- a/src/IO/ya.make
+++ /dev/null
@@ -1,93 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/zstd/include
-    contrib/libs/lz4
-    contrib/restricted/fast_float/include
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/brotli/dec
-    contrib/libs/brotli/enc
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/zstd
-    contrib/libs/lz4
-    contrib/restricted/fast_float
-)
-
-SRCS(
-    AIO.cpp
-    AsynchronousReadBufferFromFile.cpp
-    AsynchronousReadBufferFromFileDescriptor.cpp
-    BrotliReadBuffer.cpp
-    BrotliWriteBuffer.cpp
-    Bzip2ReadBuffer.cpp
-    Bzip2WriteBuffer.cpp
-    CascadeWriteBuffer.cpp
-    CompressionMethod.cpp
-    DoubleConverter.cpp
-    FileEncryptionCommon.cpp
-    HTTPChunkedReadBuffer.cpp
-    HTTPCommon.cpp
-    HashingWriteBuffer.cpp
-    LZMADeflatingWriteBuffer.cpp
-    LZMAInflatingReadBuffer.cpp
-    LimitReadBuffer.cpp
-    Lz4DeflatingWriteBuffer.cpp
-    Lz4InflatingReadBuffer.cpp
-    MMapReadBufferFromFile.cpp
-    MMapReadBufferFromFileDescriptor.cpp
-    MMapReadBufferFromFileWithCache.cpp
-    MMappedFile.cpp
-    MMappedFileDescriptor.cpp
-    MemoryReadWriteBuffer.cpp
-    MySQLBinlogEventReadBuffer.cpp
-    MySQLPacketPayloadReadBuffer.cpp
-    MySQLPacketPayloadWriteBuffer.cpp
-    NullWriteBuffer.cpp
-    OpenedFile.cpp
-    PeekableReadBuffer.cpp
-    Progress.cpp
-    ReadBufferFromEncryptedFile.cpp
-    ReadBufferFromFile.cpp
-    ReadBufferFromFileBase.cpp
-    ReadBufferFromFileDecorator.cpp
-    ReadBufferFromFileDescriptor.cpp
-    ReadBufferFromIStream.cpp
-    ReadBufferFromMemory.cpp
-    ReadBufferFromPocoSocket.cpp
-    ReadHelpers.cpp
-    ReadSettings.cpp
-    SeekAvoidingReadBuffer.cpp
-    SynchronousReader.cpp
-    ThreadPoolReader.cpp
-    TimeoutSetter.cpp
-    UseSSL.cpp
-    WriteBufferFromEncryptedFile.cpp
-    WriteBufferFromFile.cpp
-    WriteBufferFromFileBase.cpp
-    WriteBufferFromFileDecorator.cpp
-    WriteBufferFromFileDescriptor.cpp
-    WriteBufferFromFileDescriptorDiscardOnFailure.cpp
-    WriteBufferFromHTTP.cpp
-    WriteBufferFromOStream.cpp
-    WriteBufferFromPocoSocket.cpp
-    WriteBufferFromTemporaryFile.cpp
-    WriteBufferValidUTF8.cpp
-    WriteHelpers.cpp
-    ZlibDeflatingWriteBuffer.cpp
-    ZlibInflatingReadBuffer.cpp
-    ZstdDeflatingWriteBuffer.cpp
-    ZstdInflatingReadBuffer.cpp
-    copyData.cpp
-    createReadBufferFromFileBase.cpp
-    parseDateTimeBestEffort.cpp
-    readFloatText.cpp
-
-)
-
-END()
diff --git a/src/IO/ya.make.in b/src/IO/ya.make.in
deleted file mode 100644
index 21e64baa10a..00000000000
--- a/src/IO/ya.make.in
+++ /dev/null
@@ -1,25 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/zstd/include
-    contrib/libs/lz4
-    contrib/restricted/fast_float/include
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/brotli/dec
-    contrib/libs/brotli/enc
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/zstd
-    contrib/libs/lz4
-    contrib/restricted/fast_float
-)
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | grep -v -P 'S3|HDFS' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index fc8f5801ba2..50d08b87fa9 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -30,34 +30,15 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-const char * ActionsDAG::typeToString(ActionsDAG::ActionType type)
-{
-    switch (type)
-    {
-        case ActionType::INPUT:
-            return "Input";
-        case ActionType::COLUMN:
-            return "Column";
-        case ActionType::ALIAS:
-            return "Alias";
-        case ActionType::ARRAY_JOIN:
-            return "ArrayJoin";
-        case ActionType::FUNCTION:
-            return "Function";
-    }
-
-    __builtin_unreachable();
-}
-
 void ActionsDAG::Node::toTree(JSONBuilder::JSONMap & map) const
 {
-    map.add("Node Type", ActionsDAG::typeToString(type));
+    map.add("Node Type", magic_enum::enum_name(type));
 
     if (result_type)
         map.add("Result Type", result_type->getName());
 
     if (!result_name.empty())
-        map.add("Result Type", ActionsDAG::typeToString(type));
+        map.add("Result Type", magic_enum::enum_name(type));
 
     if (column)
         map.add("Column", column->getName());
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index d10218bc913..8111bcb123c 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -61,8 +61,6 @@ public:
         FUNCTION,
     };
 
-    static const char * typeToString(ActionType type);
-
     struct Node;
     using NodeRawPtrs = std::vector<Node *>;
     using NodeRawConstPtrs = std::vector<const Node *>;
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 9a27043160f..953eb68cff7 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -37,6 +37,8 @@
 #include <Interpreters/interpretSubquery.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/IdentifierSemantic.h>
+#include <Interpreters/UserDefinedExecutableFunctionFactory.h>
+
 
 namespace DB
 {
@@ -185,9 +187,11 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, Co
 
                 /// If the function is not a tuple, treat it as a constant expression that returns tuple and extract it.
                 function_result = extractValueFromNode(elem, *tuple_type, context);
+
                 if (function_result.getType() != Field::Types::Tuple)
-                    throw Exception("Invalid type of set. Expected tuple, got " + String(function_result.getTypeName()),
-                                    ErrorCodes::INCORRECT_ELEMENT_OF_SET);
+                    throw Exception(ErrorCodes::INCORRECT_ELEMENT_OF_SET,
+                        "Invalid type of set. Expected tuple, got {}",
+                        function_result.getTypeName());
 
                 tuple = &function_result.get<Tuple>();
             }
@@ -198,8 +202,9 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, Co
             {
                 /// The literal must be tuple.
                 if (literal->value.getType() != Field::Types::Tuple)
-                    throw Exception("Invalid type in set. Expected tuple, got "
-                        + String(literal->value.getTypeName()), ErrorCodes::INCORRECT_ELEMENT_OF_SET);
+                    throw Exception(ErrorCodes::INCORRECT_ELEMENT_OF_SET,
+                        "Invalid type in set. Expected tuple, got {}",
+                        literal->value.getTypeName());
 
                 tuple = &literal->value.get<Tuple>();
             }
@@ -851,17 +856,21 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     if (AggregateFunctionFactory::instance().isAggregateFunctionName(node.name))
         return;
 
-    FunctionOverloadResolverPtr function_builder;
-    try
+    FunctionOverloadResolverPtr function_builder = UserDefinedExecutableFunctionFactory::instance().tryGet(node.name, data.getContext());
+
+    if (!function_builder)
     {
-        function_builder = FunctionFactory::instance().get(node.name, data.getContext());
-    }
-    catch (Exception & e)
-    {
-        auto hints = AggregateFunctionFactory::instance().getHints(node.name);
-        if (!hints.empty())
-            e.addMessage("Or unknown aggregate function " + node.name + ". Maybe you meant: " + toString(hints));
-        throw;
+        try
+        {
+            function_builder = FunctionFactory::instance().get(node.name, data.getContext());
+        }
+        catch (Exception & e)
+        {
+            auto hints = AggregateFunctionFactory::instance().getHints(node.name);
+            if (!hints.empty())
+                e.addMessage("Or unknown aggregate function " + node.name + ". Maybe you meant: " + toString(hints));
+            throw;
+        }
     }
 
     Names argument_names;
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index c26eb10e697..a2896127d04 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -786,7 +786,7 @@ void NO_INLINE Aggregator::executeWithoutKeyImpl(
     AggregatedDataWithoutKey & res,
     size_t rows,
     AggregateFunctionInstruction * aggregate_instructions,
-    Arena * arena)
+    Arena * arena) const
 {
 #if USE_EMBEDDED_COMPILER
     if constexpr (use_compiled_functions)
@@ -865,7 +865,7 @@ void NO_INLINE Aggregator::executeOnIntervalWithoutKeyImpl(
 
 
 void Aggregator::prepareAggregateInstructions(Columns columns, AggregateColumns & aggregate_columns, Columns & materialized_columns,
-    AggregateFunctionInstructions & aggregate_functions_instructions, NestedColumnsHolder & nested_columns_holder)
+    AggregateFunctionInstructions & aggregate_functions_instructions, NestedColumnsHolder & nested_columns_holder) const
 {
     for (size_t i = 0; i < params.aggregates_size; ++i)
         aggregate_columns[i].resize(params.aggregates[i].arguments.size());
@@ -917,7 +917,7 @@ void Aggregator::prepareAggregateInstructions(Columns columns, AggregateColumns
 
 
 bool Aggregator::executeOnBlock(const Block & block, AggregatedDataVariants & result,
-                                ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, bool & no_more_keys)
+                                ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, bool & no_more_keys) const
 {
     UInt64 num_rows = block.rows();
     return executeOnBlock(block.getColumns(), num_rows, result, key_columns, aggregate_columns, no_more_keys);
@@ -925,7 +925,7 @@ bool Aggregator::executeOnBlock(const Block & block, AggregatedDataVariants & re
 
 
 bool Aggregator::executeOnBlock(Columns columns, UInt64 num_rows, AggregatedDataVariants & result,
-    ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, bool & no_more_keys)
+    ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, bool & no_more_keys) const
 {
     /// `result` will destroy the states of aggregate functions in the destructor
     result.aggregator = this;
@@ -1058,7 +1058,7 @@ bool Aggregator::executeOnBlock(Columns columns, UInt64 num_rows, AggregatedData
 }
 
 
-void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path)
+void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path) const
 {
     Stopwatch watch;
     size_t rows = data_variants.size();
@@ -1130,7 +1130,7 @@ void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, co
 }
 
 
-void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants)
+void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants) const
 {
     String tmp_path = params.tmp_volume->getDisk()->getPath();
     return writeToTemporaryFile(data_variants, tmp_path);
@@ -1192,7 +1192,7 @@ template <typename Method>
 void Aggregator::writeToTemporaryFileImpl(
     AggregatedDataVariants & data_variants,
     Method & method,
-    IBlockOutputStream & out)
+    IBlockOutputStream & out) const
 {
     size_t max_temporary_block_size_rows = 0;
     size_t max_temporary_block_size_bytes = 0;
@@ -2311,7 +2311,7 @@ void NO_INLINE Aggregator::mergeWithoutKeyStreamsImpl(
     block.clear();
 }
 
-bool Aggregator::mergeBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys)
+bool Aggregator::mergeOnBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys) const
 {
     /// `result` will destroy the states of aggregate functions in the destructor
     result.aggregator = this;
@@ -2661,7 +2661,7 @@ void NO_INLINE Aggregator::convertBlockToTwoLevelImpl(
 }
 
 
-std::vector<Block> Aggregator::convertBlockToTwoLevel(const Block & block)
+std::vector<Block> Aggregator::convertBlockToTwoLevel(const Block & block) const
 {
     if (!block)
         return {};
@@ -2753,7 +2753,7 @@ void Aggregator::destroyWithoutKey(AggregatedDataVariants & result) const
 }
 
 
-void Aggregator::destroyAllAggregateStates(AggregatedDataVariants & result)
+void Aggregator::destroyAllAggregateStates(AggregatedDataVariants & result) const
 {
     if (result.empty())
         return;
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index fde6ba219df..e72fe4baea3 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -506,7 +506,7 @@ struct AggregatedDataVariants : private boost::noncopyable
       * But this can hardly be done simply because it is planned to put variable-length strings into the same pool.
       * In this case, the pool will not be able to know with what offsets objects are stored.
       */
-    Aggregator * aggregator = nullptr;
+    const Aggregator * aggregator = nullptr;
 
     size_t keys_size{};  /// Number of keys. NOTE do we need this field?
     Sizes key_sizes;     /// Dimensions of keys, if keys of fixed length
@@ -975,11 +975,14 @@ public:
     /// Process one block. Return false if the processing should be aborted (with group_by_overflow_mode = 'break').
     bool executeOnBlock(const Block & block, AggregatedDataVariants & result,
         ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns,    /// Passed to not create them anew for each block
-        bool & no_more_keys);
+        bool & no_more_keys) const;
 
     bool executeOnBlock(Columns columns, UInt64 num_rows, AggregatedDataVariants & result,
         ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns,    /// Passed to not create them anew for each block
-        bool & no_more_keys);
+        bool & no_more_keys) const;
+
+    /// Used for aggregate projection.
+    bool mergeOnBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys) const;
 
     /** Convert the aggregation data structure into a block.
       * If overflow_row = true, then aggregates for rows that are not included in max_rows_to_group_by are put in the first block.
@@ -996,8 +999,6 @@ public:
     /// Merge partially aggregated blocks separated to buckets into one data structure.
     void mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVariants & result, size_t max_threads);
 
-    bool mergeBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys);
-
     /// Merge several partially aggregated blocks into one.
     /// Precondition: for all blocks block.info.is_overflows flag must be the same.
     /// (either all blocks are from overflow data or none blocks are).
@@ -1007,11 +1008,11 @@ public:
     /** Split block with partially-aggregated data to many blocks, as if two-level method of aggregation was used.
       * This is needed to simplify merging of that data with other results, that are already two-level.
       */
-    std::vector<Block> convertBlockToTwoLevel(const Block & block);
+    std::vector<Block> convertBlockToTwoLevel(const Block & block) const;
 
     /// For external aggregation.
-    void writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path);
-    void writeToTemporaryFile(AggregatedDataVariants & data_variants);
+    void writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path) const;
+    void writeToTemporaryFile(AggregatedDataVariants & data_variants) const;
 
     bool hasTemporaryFiles() const { return !temporary_files.empty(); }
 
@@ -1083,7 +1084,7 @@ private:
     Poco::Logger * log = &Poco::Logger::get("Aggregator");
 
     /// For external aggregation.
-    TemporaryFiles temporary_files;
+    mutable TemporaryFiles temporary_files;
 
 #if USE_EMBEDDED_COMPILER
     std::shared_ptr<CompiledAggregateFunctionsHolder> compiled_aggregate_functions_holder;
@@ -1106,7 +1107,7 @@ private:
     /** Call `destroy` methods for states of aggregate functions.
       * Used in the exception handler for aggregation, since RAII in this case is not applicable.
       */
-    void destroyAllAggregateStates(AggregatedDataVariants & result);
+    void destroyAllAggregateStates(AggregatedDataVariants & result) const;
 
 
     /// Process one data block, aggregate the data into a hash table.
@@ -1136,7 +1137,7 @@ private:
         AggregatedDataWithoutKey & res,
         size_t rows,
         AggregateFunctionInstruction * aggregate_instructions,
-        Arena * arena);
+        Arena * arena) const;
 
     static void executeOnIntervalWithoutKeyImpl(
         AggregatedDataWithoutKey & res,
@@ -1149,7 +1150,7 @@ private:
     void writeToTemporaryFileImpl(
         AggregatedDataVariants & data_variants,
         Method & method,
-        IBlockOutputStream & out);
+        IBlockOutputStream & out) const;
 
     /// Merge NULL key data from hash table `src` into `dst`.
     template <typename Method, typename Table>
@@ -1304,7 +1305,7 @@ private:
         AggregateColumns & aggregate_columns,
         Columns & materialized_columns,
         AggregateFunctionInstructions & instructions,
-        NestedColumnsHolder & nested_columns_holder);
+        NestedColumnsHolder & nested_columns_holder) const;
 
     void addSingleKeyToAggregateColumns(
         const AggregatedDataVariants & data_variants,
diff --git a/src/Interpreters/ArrayJoinedColumnsVisitor.h b/src/Interpreters/ArrayJoinedColumnsVisitor.h
index 94f6bdaf138..b64a170cb00 100644
--- a/src/Interpreters/ArrayJoinedColumnsVisitor.h
+++ b/src/Interpreters/ArrayJoinedColumnsVisitor.h
@@ -60,7 +60,7 @@ public:
 private:
     static void visit(const ASTSelectQuery & node, ASTPtr &, Data & data)
     {
-        ASTPtr array_join_expression_list = node.arrayJoinExpressionList();
+        auto [array_join_expression_list, _] = node.arrayJoinExpressionList();
         if (!array_join_expression_list)
             throw Exception("Logical error: no ARRAY JOIN", ErrorCodes::LOGICAL_ERROR);
 
diff --git a/src/Interpreters/AsynchronousInsertQueue.cpp b/src/Interpreters/AsynchronousInsertQueue.cpp
new file mode 100644
index 00000000000..da41eb82d5e
--- /dev/null
+++ b/src/Interpreters/AsynchronousInsertQueue.cpp
@@ -0,0 +1,463 @@
+#include <Interpreters/AsynchronousInsertQueue.h>
+
+#include <Core/Settings.h>
+#include <DataStreams/BlockIO.h>
+#include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/Context.h>
+#include <Processors/Transforms/getSourceFromASTInsertQuery.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Executors/StreamingFormatExecutor.h>
+#include <Processors/Transforms/AddingDefaultsTransform.h>
+#include <IO/ConcatReadBuffer.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/copyData.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/queryToString.h>
+#include <Storages/IStorage.h>
+#include <Common/SipHash.h>
+#include <Common/FieldVisitorHash.h>
+#include <Access/AccessFlags.h>
+#include <Formats/FormatFactory.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int TIMEOUT_EXCEEDED;
+    extern const int UNKNOWN_EXCEPTION;
+    extern const int UNKNOWN_FORMAT;
+}
+
+AsynchronousInsertQueue::InsertQuery::InsertQuery(const ASTPtr & query_, const Settings & settings_)
+    : query(query_->clone()), settings(settings_)
+{
+}
+
+AsynchronousInsertQueue::InsertQuery::InsertQuery(const InsertQuery & other)
+    : query(other.query->clone()), settings(other.settings)
+{
+}
+
+AsynchronousInsertQueue::InsertQuery &
+AsynchronousInsertQueue::InsertQuery::operator=(const InsertQuery & other)
+{
+    if (this != &other)
+    {
+        query = other.query->clone();
+        settings = other.settings;
+    }
+
+    return *this;
+}
+
+UInt64 AsynchronousInsertQueue::InsertQuery::Hash::operator()(const InsertQuery & insert_query) const
+{
+    SipHash hash;
+    insert_query.query->updateTreeHash(hash);
+
+    for (const auto & setting : insert_query.settings.allChanged())
+    {
+        hash.update(setting.getName());
+        applyVisitor(FieldVisitorHash(hash), setting.getValue());
+    }
+
+    return hash.get64();
+}
+
+bool AsynchronousInsertQueue::InsertQuery::operator==(const InsertQuery & other) const
+{
+    return queryToString(query) == queryToString(other.query) && settings == other.settings;
+}
+
+AsynchronousInsertQueue::InsertData::Entry::Entry(String && bytes_, String && query_id_)
+    : bytes(std::move(bytes_)), query_id(std::move(query_id_))
+{
+}
+
+void AsynchronousInsertQueue::InsertData::Entry::finish(std::exception_ptr exception_)
+{
+    std::lock_guard lock(mutex);
+    finished = true;
+    exception = exception_;
+    cv.notify_all();
+}
+
+bool AsynchronousInsertQueue::InsertData::Entry::wait(const Milliseconds & timeout) const
+{
+    std::unique_lock lock(mutex);
+    return cv.wait_for(lock, timeout, [&] { return finished; });
+}
+
+bool AsynchronousInsertQueue::InsertData::Entry::isFinished() const
+{
+    std::lock_guard lock(mutex);
+    return finished;
+}
+
+std::exception_ptr AsynchronousInsertQueue::InsertData::Entry::getException() const
+{
+    std::lock_guard lock(mutex);
+    return exception;
+}
+
+
+AsynchronousInsertQueue::AsynchronousInsertQueue(ContextPtr context_, size_t pool_size, size_t max_data_size_, const Timeout & timeouts)
+    : WithContext(context_)
+    , max_data_size(max_data_size_)
+    , busy_timeout(timeouts.busy)
+    , stale_timeout(timeouts.stale)
+    , pool(pool_size)
+    , dump_by_first_update_thread(&AsynchronousInsertQueue::busyCheck, this)
+    , cleanup_thread(&AsynchronousInsertQueue::cleanup, this)
+{
+    using namespace std::chrono;
+
+    assert(pool_size);
+
+    if (stale_timeout > 0ms)
+        dump_by_last_update_thread = ThreadFromGlobalPool(&AsynchronousInsertQueue::staleCheck, this);
+}
+
+AsynchronousInsertQueue::~AsynchronousInsertQueue()
+{
+    /// TODO: add a setting for graceful shutdown.
+
+    shutdown = true;
+
+    assert(dump_by_first_update_thread.joinable());
+    dump_by_first_update_thread.join();
+
+    assert(cleanup_thread.joinable());
+    cleanup_thread.join();
+
+    if (dump_by_last_update_thread.joinable())
+        dump_by_last_update_thread.join();
+
+    pool.wait();
+
+    std::lock_guard lock(currently_processing_mutex);
+    for (const auto & [_, entry] : currently_processing_queries)
+    {
+        if (!entry->isFinished())
+            entry->finish(std::make_exception_ptr(Exception(
+                ErrorCodes::TIMEOUT_EXCEEDED,
+                "Wait for async insert timeout exceeded)")));
+    }
+}
+
+void AsynchronousInsertQueue::scheduleProcessDataJob(const InsertQuery & key, InsertDataPtr data, ContextPtr global_context)
+{
+    /// Wrap 'unique_ptr' with 'shared_ptr' to make this
+    /// lambda copyable and allow to save it to the thread pool.
+    pool.scheduleOrThrowOnError([=, data = std::make_shared<InsertDataPtr>(std::move(data))]
+    {
+        processData(std::move(key), std::move(*data), std::move(global_context));
+    });
+}
+
+void AsynchronousInsertQueue::push(ASTPtr query, ContextPtr query_context)
+{
+    query = query->clone();
+    const auto & settings = query_context->getSettingsRef();
+    auto & insert_query = query->as<ASTInsertQuery &>();
+
+    InterpreterInsertQuery interpreter(query, query_context, settings.insert_allow_materialized_columns);
+    auto table = interpreter.getTable(insert_query);
+    auto sample_block = interpreter.getSampleBlock(insert_query, table, table->getInMemoryMetadataPtr());
+
+    if (!FormatFactory::instance().isInputFormat(insert_query.format))
+        throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown input format {}", insert_query.format);
+
+    query_context->checkAccess(AccessType::INSERT, insert_query.table_id, sample_block.getNames());
+
+    String bytes;
+    {
+        auto read_buf = getReadBufferFromASTInsertQuery(query);
+        WriteBufferFromString write_buf(bytes);
+        copyData(*read_buf, write_buf);
+    }
+
+    auto entry = std::make_shared<InsertData::Entry>(std::move(bytes), query_context->getCurrentQueryId());
+    InsertQuery key{query, settings};
+
+    {
+        /// Firstly try to get entry from queue without exclusive lock.
+        std::shared_lock read_lock(rwlock);
+        if (auto it = queue.find(key); it != queue.end())
+        {
+            pushImpl(std::move(entry), it);
+            return;
+        }
+    }
+
+    std::unique_lock write_lock(rwlock);
+    auto it = queue.emplace(key, std::make_shared<Container>()).first;
+    pushImpl(std::move(entry), it);
+}
+
+void AsynchronousInsertQueue::pushImpl(InsertData::EntryPtr entry, QueueIterator it)
+{
+    auto & [data_mutex, data] = *it->second;
+    std::lock_guard data_lock(data_mutex);
+
+    if (!data)
+        data = std::make_unique<InsertData>();
+
+    data->size += entry->bytes.size();
+    data->last_update = std::chrono::steady_clock::now();
+    data->entries.emplace_back(entry);
+
+    {
+        std::lock_guard currently_processing_lock(currently_processing_mutex);
+        currently_processing_queries.emplace(entry->query_id, entry);
+    }
+
+    LOG_TRACE(log, "Have {} pending inserts with total {} bytes of data for query '{}'",
+        data->entries.size(), data->size, queryToString(it->first.query));
+
+    if (data->size > max_data_size)
+        scheduleProcessDataJob(it->first, std::move(data), getContext());
+}
+
+void AsynchronousInsertQueue::waitForProcessingQuery(const String & query_id, const Milliseconds & timeout)
+{
+    InsertData::EntryPtr entry;
+
+    {
+        std::lock_guard lock(currently_processing_mutex);
+        auto it = currently_processing_queries.find(query_id);
+        if (it == currently_processing_queries.end())
+            return;
+
+        entry = it->second;
+    }
+
+    bool finished = entry->wait(timeout);
+
+    if (!finished)
+        throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Wait for async insert timeout ({} ms) exceeded)", timeout.count());
+
+    if (auto exception = entry->getException())
+        std::rethrow_exception(exception);
+}
+
+void AsynchronousInsertQueue::busyCheck()
+{
+    auto timeout = busy_timeout;
+
+    while (!shutdown)
+    {
+        std::this_thread::sleep_for(timeout);
+
+        /// TODO: use priority queue instead of raw unsorted queue.
+        timeout = busy_timeout;
+        std::shared_lock read_lock(rwlock);
+
+        for (auto & [key, elem] : queue)
+        {
+            std::lock_guard data_lock(elem->mutex);
+            if (!elem->data)
+                continue;
+
+            auto lag = std::chrono::steady_clock::now() - elem->data->first_update;
+            if (lag >= busy_timeout)
+                scheduleProcessDataJob(key, std::move(elem->data), getContext());
+            else
+                timeout = std::min(timeout, std::chrono::ceil<std::chrono::milliseconds>(busy_timeout - lag));
+        }
+    }
+}
+
+void AsynchronousInsertQueue::staleCheck()
+{
+    while (!shutdown)
+    {
+        std::this_thread::sleep_for(stale_timeout);
+        std::shared_lock read_lock(rwlock);
+
+        for (auto & [key, elem] : queue)
+        {
+            std::lock_guard data_lock(elem->mutex);
+            if (!elem->data)
+                continue;
+
+            auto lag = std::chrono::steady_clock::now() - elem->data->last_update;
+            if (lag >= stale_timeout)
+                scheduleProcessDataJob(key, std::move(elem->data), getContext());
+        }
+    }
+}
+
+void AsynchronousInsertQueue::cleanup()
+{
+    /// Do not run cleanup too often,
+    /// because it holds exclusive lock.
+    auto timeout = busy_timeout * 5;
+
+    while (!shutdown)
+    {
+        std::this_thread::sleep_for(timeout);
+        std::vector<InsertQuery> keys_to_remove;
+
+        {
+            std::shared_lock read_lock(rwlock);
+
+            for (auto & [key, elem] : queue)
+            {
+                std::lock_guard data_lock(elem->mutex);
+                if (!elem->data)
+                    keys_to_remove.push_back(key);
+            }
+        }
+
+        if (!keys_to_remove.empty())
+        {
+            std::unique_lock write_lock(rwlock);
+            size_t total_removed = 0;
+
+            for (const auto & key : keys_to_remove)
+            {
+                auto it = queue.find(key);
+                if (it != queue.end() && !it->second->data)
+                {
+                    queue.erase(it);
+                    ++total_removed;
+                }
+            }
+
+            if (total_removed)
+                LOG_TRACE(log, "Removed stale entries for {} queries from asynchronous insertion queue", total_removed);
+        }
+
+        {
+            std::vector<String> ids_to_remove;
+            std::lock_guard lock(currently_processing_mutex);
+
+            for (const auto & [query_id, entry] : currently_processing_queries)
+                if (entry->isFinished())
+                    ids_to_remove.push_back(query_id);
+
+            if (!ids_to_remove.empty())
+            {
+                for (const auto & id : ids_to_remove)
+                    currently_processing_queries.erase(id);
+
+                LOG_TRACE(log, "Removed {} finished entries from asynchronous insertion queue", ids_to_remove.size());
+            }
+        }
+    }
+}
+
+// static
+void AsynchronousInsertQueue::processData(InsertQuery key, InsertDataPtr data, ContextPtr global_context)
+try
+{
+    if (!data)
+        return;
+
+    const auto * log = &Poco::Logger::get("AsynchronousInsertQueue");
+    const auto & insert_query = assert_cast<const ASTInsertQuery &>(*key.query);
+    auto insert_context = Context::createCopy(global_context);
+
+    /// 'resetParser' doesn't work for parallel parsing.
+    key.settings.set("input_format_parallel_parsing", false);
+    insert_context->makeQueryContext();
+    insert_context->setSettings(key.settings);
+
+    InterpreterInsertQuery interpreter(key.query, insert_context, key.settings.insert_allow_materialized_columns);
+    auto sinks = interpreter.getSinks();
+    assert(sinks.size() == 1);
+
+    auto header = sinks.at(0)->getInputs().front().getHeader();
+    auto format = getInputFormatFromASTInsertQuery(key.query, false, header, insert_context, nullptr);
+
+    size_t total_rows = 0;
+    InsertData::EntryPtr current_entry;
+
+    auto on_error = [&](const MutableColumns & result_columns, Exception & e)
+    {
+        LOG_ERROR(log, "Failed parsing for query '{}' with query id {}. {}",
+            queryToString(key.query), current_entry->query_id, e.displayText());
+
+        for (const auto & column : result_columns)
+            if (column->size() > total_rows)
+                column->popBack(column->size() - total_rows);
+
+        current_entry->finish(std::current_exception());
+        return 0;
+    };
+
+    std::shared_ptr<ISimpleTransform> adding_defaults_transform;
+    if (insert_context->getSettingsRef().input_format_defaults_for_omitted_fields)
+    {
+        StoragePtr storage = DatabaseCatalog::instance().getTable(insert_query.table_id, insert_context);
+        auto metadata_snapshot = storage->getInMemoryMetadataPtr();
+        const auto & columns = metadata_snapshot->getColumns();
+        if (columns.hasDefaults())
+            adding_defaults_transform = std::make_shared<AddingDefaultsTransform>(header, columns, *format, insert_context);
+    }
+
+    StreamingFormatExecutor executor(header, format, std::move(on_error), std::move(adding_defaults_transform));
+    std::unique_ptr<ReadBuffer> buffer;
+    for (const auto & entry : data->entries)
+    {
+        buffer = std::make_unique<ReadBufferFromString>(entry->bytes);
+        current_entry = entry;
+        total_rows += executor.execute(*buffer);
+    }
+
+    auto chunk = Chunk(executor.getResultColumns(), total_rows);
+    size_t total_bytes = chunk.bytes();
+
+    auto source = std::make_shared<SourceFromSingleChunk>(header, std::move(chunk));
+    Pipe pipe(source);
+
+    QueryPipeline out_pipeline;
+    out_pipeline.init(std::move(pipe));
+    out_pipeline.resize(1);
+    out_pipeline.setSinks([&](const Block &, Pipe::StreamType) { return sinks.at(0); });
+
+    auto out_executor = out_pipeline.execute();
+    out_executor->execute(out_pipeline.getNumThreads());
+
+    LOG_INFO(log, "Flushed {} rows, {} bytes for query '{}'",
+        total_rows, total_bytes, queryToString(key.query));
+
+    for (const auto & entry : data->entries)
+        if (!entry->isFinished())
+            entry->finish();
+}
+catch (const Exception & e)
+{
+    finishWithException(key.query, data->entries, e);
+}
+catch (const std::exception & e)
+{
+    finishWithException(key.query, data->entries, e);
+}
+catch (...)
+{
+    finishWithException(key.query, data->entries, Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Unknown exception"));
+}
+
+template <typename E>
+void AsynchronousInsertQueue::finishWithException(
+    const ASTPtr & query, const std::list<InsertData::EntryPtr> & entries, const E & exception)
+{
+    tryLogCurrentException("AsynchronousInsertQueue", fmt::format("Failed insertion for query '{}'", queryToString(query)));
+
+    for (const auto & entry : entries)
+    {
+        if (!entry->isFinished())
+        {
+            /// Make a copy of exception to avoid concurrent usage of
+            /// one exception object from several threads.
+            entry->finish(std::make_exception_ptr(exception));
+        }
+    }
+}
+
+}
diff --git a/src/Interpreters/AsynchronousInsertQueue.h b/src/Interpreters/AsynchronousInsertQueue.h
new file mode 100644
index 00000000000..e92a7b04d74
--- /dev/null
+++ b/src/Interpreters/AsynchronousInsertQueue.h
@@ -0,0 +1,151 @@
+#pragma once
+
+#include <Parsers/IAST_fwd.h>
+#include <Common/RWLock.h>
+#include <Common/ThreadPool.h>
+#include <Core/Settings.h>
+#include <Poco/Logger.h>
+
+#include <unordered_map>
+
+
+namespace DB
+{
+
+/// A queue, that stores data for insert queries and periodically flushes it to tables.
+/// The data is grouped by table, format and settings of insert query.
+class AsynchronousInsertQueue : public WithContext
+{
+public:
+    using Milliseconds = std::chrono::milliseconds;
+
+    /// Using structure to allow and benefit from designated initialization and not mess with a positional arguments in ctor.
+    struct Timeout
+    {
+        Milliseconds busy;
+        Milliseconds stale;
+    };
+
+    AsynchronousInsertQueue(ContextPtr context_, size_t pool_size, size_t max_data_size, const Timeout & timeouts);
+    ~AsynchronousInsertQueue();
+
+    void push(ASTPtr query, ContextPtr query_context);
+    void waitForProcessingQuery(const String & query_id, const Milliseconds & timeout);
+
+private:
+
+    struct InsertQuery
+    {
+        ASTPtr query;
+        Settings settings;
+
+        InsertQuery(const ASTPtr & query_, const Settings & settings_);
+        InsertQuery(const InsertQuery & other);
+        InsertQuery & operator=(const InsertQuery & other);
+
+        bool operator==(const InsertQuery & other) const;
+        struct Hash { UInt64 operator()(const InsertQuery & insert_query) const; };
+    };
+
+    struct InsertData
+    {
+        struct Entry
+        {
+        public:
+            const String bytes;
+            const String query_id;
+
+            Entry(String && bytes_, String && query_id_);
+
+            void finish(std::exception_ptr exception_ = nullptr);
+            bool wait(const Milliseconds & timeout) const;
+            bool isFinished() const;
+            std::exception_ptr getException() const;
+
+        private:
+            mutable std::mutex mutex;
+            mutable std::condition_variable cv;
+
+            bool finished = false;
+            std::exception_ptr exception;
+        };
+
+        using EntryPtr = std::shared_ptr<Entry>;
+
+        std::list<EntryPtr> entries;
+        size_t size = 0;
+
+        /// Timestamp of the first insert into queue, or after the last queue dump.
+        /// Used to detect for how long the queue is active, so we can dump it by timer.
+        std::chrono::time_point<std::chrono::steady_clock> first_update = std::chrono::steady_clock::now();
+
+        /// Timestamp of the last insert into queue.
+        /// Used to detect for how long the queue is stale, so we can dump it by another timer.
+        std::chrono::time_point<std::chrono::steady_clock> last_update;
+    };
+
+    using InsertDataPtr = std::unique_ptr<InsertData>;
+
+    /// A separate container, that holds a data and a mutex for it.
+    /// When it's needed to process current chunk of data, it can be moved for processing
+    /// and new data can be recreated without holding a lock during processing.
+    struct Container
+    {
+        std::mutex mutex;
+        InsertDataPtr data;
+    };
+
+    using Queue = std::unordered_map<InsertQuery, std::shared_ptr<Container>, InsertQuery::Hash>;
+    using QueueIterator = Queue::iterator;
+
+    mutable std::shared_mutex rwlock;
+    Queue queue;
+
+    using QueryIdToEntry = std::unordered_map<String, InsertData::EntryPtr>;
+    mutable std::mutex currently_processing_mutex;
+    QueryIdToEntry currently_processing_queries;
+
+    /// Logic and events behind queue are as follows:
+    ///  - reset_timeout:  if queue is empty for some time, then we delete the queue and free all associated resources, e.g. tables.
+    ///  - busy_timeout:   if queue is active for too long and there are a lot of rapid inserts, then we dump the data, so it doesn't
+    ///                    grow for a long period of time and users will be able to select new data in deterministic manner.
+    ///  - stale_timeout:  if queue is stale for too long, then we dump the data too, so that users will be able to select the last
+    ///                    piece of inserted data.
+    ///  - access_timeout: also we have to check if user still has access to the tables periodically, and if the access is lost, then
+    ///                    we dump pending data and delete queue immediately.
+    ///  - max_data_size:  if the maximum size of data is reached, then again we dump the data.
+
+    const size_t max_data_size;  /// in bytes
+    const Milliseconds busy_timeout;
+    const Milliseconds stale_timeout;
+
+    std::atomic<bool> shutdown{false};
+    ThreadPool pool;  /// dump the data only inside this pool.
+    ThreadFromGlobalPool dump_by_first_update_thread;  /// uses busy_timeout and busyCheck()
+    ThreadFromGlobalPool dump_by_last_update_thread;   /// uses stale_timeout and staleCheck()
+    ThreadFromGlobalPool cleanup_thread;               /// uses busy_timeout and cleanup()
+
+    Poco::Logger * log = &Poco::Logger::get("AsynchronousInsertQueue");
+
+    void busyCheck();
+    void staleCheck();
+    void cleanup();
+
+    /// Should be called with shared or exclusively locked 'rwlock'.
+    void pushImpl(InsertData::EntryPtr entry, QueueIterator it);
+
+    void scheduleProcessDataJob(const InsertQuery & key, InsertDataPtr data, ContextPtr global_context);
+    static void processData(InsertQuery key, InsertDataPtr data, ContextPtr global_context);
+
+    template <typename E>
+    static void finishWithException(const ASTPtr & query, const std::list<InsertData::EntryPtr> & entries, const E & exception);
+
+public:
+    Queue getQueue() const
+    {
+        std::shared_lock lock(rwlock);
+        return queue;
+    }
+};
+
+}
diff --git a/src/Interpreters/AsynchronousMetrics.cpp b/src/Interpreters/AsynchronousMetrics.cpp
index fd02aa4abec..c1e4bb86895 100644
--- a/src/Interpreters/AsynchronousMetrics.cpp
+++ b/src/Interpreters/AsynchronousMetrics.cpp
@@ -1105,7 +1105,8 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        if (errno != ENODATA)   /// Ok for thermal sensors.
+            tryLogCurrentException(__PRETTY_FUNCTION__);
 
         /// Files maybe re-created on module load/unload
         try
@@ -1144,7 +1145,8 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        if (errno != ENODATA)   /// Ok for thermal sensors.
+            tryLogCurrentException(__PRETTY_FUNCTION__);
 
         /// Files can be re-created on:
         /// - module load/unload
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index a77eb3983dc..ec78abf574c 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -85,7 +85,7 @@ public:
         */
 
         String host_name;
-        UInt16 port;
+        UInt16 port{0};
         String user;
         String password;
 
diff --git a/src/Interpreters/ColumnAliasesVisitor.cpp b/src/Interpreters/ColumnAliasesVisitor.cpp
index 9b7e0a91c18..43a6c4d4cf1 100644
--- a/src/Interpreters/ColumnAliasesVisitor.cpp
+++ b/src/Interpreters/ColumnAliasesVisitor.cpp
@@ -3,7 +3,6 @@
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
 #include <Interpreters/addTypeConversionToAST.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTAlterQuery.h>
@@ -14,8 +13,11 @@
 namespace DB
 {
 
-bool ColumnAliasesMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &)
+bool ColumnAliasesMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &, const Data & data)
 {
+    if (data.excluded_nodes.contains(node.get()))
+        return false;
+
     if (const auto * f = node->as<ASTFunction>())
     {
         /// "lambda" visits children itself.
diff --git a/src/Interpreters/ColumnAliasesVisitor.h b/src/Interpreters/ColumnAliasesVisitor.h
index 9be83d83d49..b593842e133 100644
--- a/src/Interpreters/ColumnAliasesVisitor.h
+++ b/src/Interpreters/ColumnAliasesVisitor.h
@@ -46,7 +46,7 @@ using DataTypePtr = std::shared_ptr<const IDataType>;
 class ColumnAliasesMatcher
 {
 public:
-    using Visitor = InDepthNodeVisitor<ColumnAliasesMatcher, false>;
+    using Visitor = InDepthNodeVisitor<ColumnAliasesMatcher, false, true>;
 
     struct Data
     {
@@ -57,14 +57,16 @@ public:
         NameSet array_join_source_columns;
         ContextPtr context;
 
+        const std::unordered_set<IAST *> & excluded_nodes;
+
         /// private_aliases are from lambda, so these are local names.
         NameSet private_aliases;
 
         /// Check if query is changed by this visitor.
         bool changed = false;
 
-        Data(const ColumnsDescription & columns_, const NameToNameMap & array_join_result_columns_, ContextPtr context_)
-            : columns(columns_), context(context_)
+        Data(const ColumnsDescription & columns_, const NameToNameMap & array_join_result_columns_, ContextPtr context_, const std::unordered_set<IAST *> & excluded_nodes_)
+            : columns(columns_), context(context_), excluded_nodes(excluded_nodes_)
         {
             for (const auto & [result, source] : array_join_result_columns_)
             {
@@ -75,7 +77,7 @@ public:
     };
 
     static void visit(ASTPtr & ast, Data & data);
-    static bool needChildVisit(const ASTPtr & node, const ASTPtr & child);
+    static bool needChildVisit(const ASTPtr & node, const ASTPtr & child, const Data & data);
 
 private:
     static void visit(ASTIdentifier & node, ASTPtr & ast, Data & data);
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index c0d884ac4b3..7e43343ab34 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -50,6 +50,7 @@
 #include <Dictionaries/Embedded/GeoDictionariesLoader.h>
 #include <Interpreters/EmbeddedDictionaries.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h>
 #include <Interpreters/ExternalModelsLoader.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ProcessList.h>
@@ -57,6 +58,7 @@
 #include <Interpreters/Cluster.h>
 #include <Interpreters/InterserverIOHandler.h>
 #include <Interpreters/SystemLog.h>
+#include <Interpreters/SessionLog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DDLWorker.h>
 #include <Interpreters/DDLTask.h>
@@ -74,10 +76,12 @@
 #include <Common/ShellCommand.h>
 #include <Common/TraceCollector.h>
 #include <common/logger_useful.h>
+#include <common/EnumReflection.h>
 #include <Common/RemoteHostFilter.h>
+#include <Interpreters/AsynchronousInsertQueue.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
-#include <Storages/MergeTree/BackgroundJobsExecutor.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
 #include <Interpreters/SynonymsExtensions.h>
 #include <Interpreters/Lemmatizers.h>
@@ -100,6 +104,13 @@ namespace CurrentMetrics
     extern const Metric BackgroundBufferFlushSchedulePoolTask;
     extern const Metric BackgroundDistributedSchedulePoolTask;
     extern const Metric BackgroundMessageBrokerSchedulePoolTask;
+
+
+    extern const Metric DelayedInserts;
+    extern const Metric BackgroundPoolTask;
+    extern const Metric BackgroundMovePoolTask;
+    extern const Metric BackgroundFetchesPoolTask;
+
 }
 
 namespace DB
@@ -118,6 +129,8 @@ namespace ErrorCodes
     extern const int TABLE_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT;
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
+    extern const int INVALID_SETTING_VALUE;
+    extern const int UNKNOWN_READ_METHOD;
 }
 
 
@@ -133,6 +146,7 @@ struct ContextSharedPart
     /// Separate mutex for access of dictionaries. Separate mutex to avoid locks when server doing request to itself.
     mutable std::mutex embedded_dictionaries_mutex;
     mutable std::mutex external_dictionaries_mutex;
+    mutable std::mutex external_user_defined_executable_functions_mutex;
     mutable std::mutex external_models_mutex;
     /// Separate mutex for storage policies. During server startup we may
     /// initialize some important storages (system logs with MergeTree engine)
@@ -171,11 +185,13 @@ struct ContextSharedPart
 
     mutable std::optional<EmbeddedDictionaries> embedded_dictionaries;    /// Metrica's dictionaries. Have lazy initialization.
     mutable std::optional<ExternalDictionariesLoader> external_dictionaries_loader;
+    mutable std::optional<ExternalUserDefinedExecutableFunctionsLoader> external_user_defined_executable_functions_loader;
     mutable std::optional<ExternalModelsLoader> external_models_loader;
     ConfigurationPtr external_models_config;
     scope_guard models_repository_guard;
 
     scope_guard dictionaries_xmls;
+    scope_guard user_defined_executable_functions_xmls;
 
 #if USE_NLP
     mutable std::optional<SynonymsExtensions> synonyms_extensions;
@@ -222,6 +238,11 @@ struct ContextSharedPart
     std::optional<StorageS3Settings> storage_s3_settings;   /// Settings of S3 storage
     std::vector<String> warnings;                           /// Store warning messages about server configuration.
 
+    /// Background executors for *MergeTree tables
+    MergeTreeBackgroundExecutorPtr merge_mutate_executor;
+    MergeTreeBackgroundExecutorPtr moves_executor;
+    MergeTreeBackgroundExecutorPtr fetch_executor;
+
     RemoteHostFilter remote_host_filter; /// Allowed URL from config.xml
 
     std::optional<TraceCollector> trace_collector;        /// Thread collecting traces from threads executing queries
@@ -232,6 +253,7 @@ struct ContextSharedPart
     ConfigurationPtr clusters_config;                        /// Stores updated configs
     mutable std::mutex clusters_mutex;                       /// Guards clusters and clusters_config
 
+    std::shared_ptr<AsynchronousInsertQueue> async_insert_queue;
     std::map<String, UInt16> server_ports;
 
     bool shutdown_called = false;
@@ -291,6 +313,13 @@ struct ContextSharedPart
 
         DatabaseCatalog::shutdown();
 
+        if (merge_mutate_executor)
+            merge_mutate_executor->wait();
+        if (fetch_executor)
+            fetch_executor->wait();
+        if (moves_executor)
+            moves_executor->wait();
+
         std::unique_ptr<SystemLogs> delete_system_logs;
         {
             auto lock = std::lock_guard(mutex);
@@ -316,10 +345,12 @@ struct ContextSharedPart
             /// But they cannot be created before storages since they may required table as a source,
             /// but at least they can be preserved for storage termination.
             dictionaries_xmls.reset();
+            user_defined_executable_functions_xmls.reset();
 
             delete_system_logs = std::move(system_logs);
             embedded_dictionaries.reset();
             external_dictionaries_loader.reset();
+            external_user_defined_executable_functions_loader.reset();
             models_repository_guard.reset();
             external_models_loader.reset();
             buffer_flush_schedule_pool.reset();
@@ -410,11 +441,6 @@ ContextMutablePtr Context::createCopy(const ContextMutablePtr & other)
     return createCopy(std::const_pointer_cast<const Context>(other));
 }
 
-void Context::copyFrom(const ContextPtr & other)
-{
-    *this = *other;
-}
-
 Context::~Context() = default;
 
 InterserverIOHandler & Context::getInterserverIOHandler() { return shared->interserver_io_handler; }
@@ -641,7 +667,6 @@ ConfigurationPtr Context::getUsersConfig()
     return shared->users_config;
 }
 
-
 void Context::setUser(const UUID & user_id_)
 {
     auto lock = getLock();
@@ -944,7 +969,6 @@ void Context::addQueryAccessInfo(
         query_access_info.views.emplace(view_name);
 }
 
-
 void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const
 {
     assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
@@ -1306,6 +1330,18 @@ ExternalDictionariesLoader & Context::getExternalDictionariesLoader()
     return *shared->external_dictionaries_loader;
 }
 
+const ExternalUserDefinedExecutableFunctionsLoader & Context::getExternalUserDefinedExecutableFunctionsLoader() const
+{
+    return const_cast<Context *>(this)->getExternalUserDefinedExecutableFunctionsLoader();
+}
+
+ExternalUserDefinedExecutableFunctionsLoader & Context::getExternalUserDefinedExecutableFunctionsLoader()
+{
+    std::lock_guard lock(shared->external_user_defined_executable_functions_mutex);
+    if (!shared->external_user_defined_executable_functions_loader)
+        shared->external_user_defined_executable_functions_loader.emplace(getGlobalContext());
+    return *shared->external_user_defined_executable_functions_loader;
+}
 
 const ExternalModelsLoader & Context::getExternalModelsLoader() const
 {
@@ -1373,6 +1409,13 @@ void Context::loadDictionaries(const Poco::Util::AbstractConfiguration & config)
         std::make_unique<ExternalLoaderXMLConfigRepository>(config, "dictionaries_config"));
 }
 
+void Context::loadUserDefinedExecutableFunctions(const Poco::Util::AbstractConfiguration & config)
+{
+    getExternalUserDefinedExecutableFunctionsLoader().enableAlwaysLoadEverything(true);
+    shared->user_defined_executable_functions_xmls = getExternalUserDefinedExecutableFunctionsLoader().addConfigRepository(
+        std::make_unique<ExternalLoaderXMLConfigRepository>(config, "user_defined_executable_functions_config"));
+}
+
 #if USE_NLP
 
 SynonymsExtensions & Context::getSynonymsExtensions() const
@@ -1646,6 +1689,14 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
     return shared->zookeeper;
 }
 
+UInt32 Context::getZooKeeperSessionUptime() const
+{
+    std::lock_guard lock(shared->zookeeper_mutex);
+    if (!shared->zookeeper || shared->zookeeper->expired())
+        return 0;
+    return shared->zookeeper->getSessionUptime();
+}
+
 void Context::setSystemZooKeeperLogAfterInitializationIfNeeded()
 {
     /// It can be nearly impossible to understand in which order global objects are initialized on server startup.
@@ -2071,6 +2122,16 @@ std::shared_ptr<OpenTelemetrySpanLog> Context::getOpenTelemetrySpanLog() const
     return shared->system_logs->opentelemetry_span_log;
 }
 
+std::shared_ptr<SessionLog> Context::getSessionLog() const
+{
+    auto lock = getLock();
+
+    if (!shared->system_logs)
+        return {};
+
+    return shared->system_logs->session_log;
+}
+
 
 std::shared_ptr<ZooKeeperLog> Context::getZooKeeperLog() const
 {
@@ -2707,16 +2768,85 @@ PartUUIDsPtr Context::getIgnoredPartUUIDs() const
     return ignored_part_uuids;
 }
 
+AsynchronousInsertQueue * Context::getAsynchronousInsertQueue() const
+{
+    return shared->async_insert_queue.get();
+}
+
+void Context::setAsynchronousInsertQueue(const std::shared_ptr<AsynchronousInsertQueue> & ptr)
+{
+    using namespace std::chrono;
+
+    if (std::chrono::milliseconds(settings.async_insert_busy_timeout_ms) == 0ms)
+        throw Exception("Setting async_insert_busy_timeout_ms can't be zero", ErrorCodes::INVALID_SETTING_VALUE);
+
+    shared->async_insert_queue = ptr;
+}
+
+void Context::initializeBackgroundExecutors()
+{
+    // Initialize background executors with callbacks to be able to change pool size and tasks count at runtime.
+
+    shared->merge_mutate_executor = MergeTreeBackgroundExecutor::create
+    (
+        MergeTreeBackgroundExecutor::Type::MERGE_MUTATE,
+        getSettingsRef().background_pool_size,
+        getSettingsRef().background_pool_size,
+        CurrentMetrics::BackgroundPoolTask
+    );
+
+    shared->moves_executor = MergeTreeBackgroundExecutor::create
+    (
+        MergeTreeBackgroundExecutor::Type::MOVE,
+        getSettingsRef().background_move_pool_size,
+        getSettingsRef().background_move_pool_size,
+        CurrentMetrics::BackgroundMovePoolTask
+    );
+
+
+    shared->fetch_executor = MergeTreeBackgroundExecutor::create
+    (
+        MergeTreeBackgroundExecutor::Type::FETCH,
+        getSettingsRef().background_fetches_pool_size,
+        getSettingsRef().background_fetches_pool_size,
+        CurrentMetrics::BackgroundFetchesPoolTask
+    );
+}
+
+
+MergeTreeBackgroundExecutorPtr Context::getMergeMutateExecutor() const
+{
+    return shared->merge_mutate_executor;
+}
+
+MergeTreeBackgroundExecutorPtr Context::getMovesExecutor() const
+{
+    return shared->moves_executor;
+}
+
+MergeTreeBackgroundExecutorPtr Context::getFetchesExecutor() const
+{
+    return shared->fetch_executor;
+}
+
 
 ReadSettings Context::getReadSettings() const
 {
     ReadSettings res;
 
-    res.local_fs_method = parseReadMethod(settings.local_filesystem_read_method.value);
+    std::string_view read_method_str = settings.local_filesystem_read_method.value;
+
+    if (auto opt_method = magic_enum::enum_cast<ReadMethod>(read_method_str))
+        res.local_fs_method = *opt_method;
+    else
+        throw Exception(ErrorCodes::UNKNOWN_READ_METHOD, "Unknown read method '{}'", read_method_str);
 
     res.local_fs_prefetch = settings.local_filesystem_read_prefetch;
     res.remote_fs_prefetch = settings.remote_filesystem_read_prefetch;
 
+    res.remote_fs_backoff_threshold = settings.remote_fs_read_backoff_threshold;
+    res.remote_fs_backoff_max_tries = settings.remote_fs_read_backoff_max_tries;
+
     res.local_fs_buffer_size = settings.max_read_buffer_size;
     res.direct_io_threshold = settings.min_bytes_to_use_direct_io;
     res.mmap_threshold = settings.min_bytes_to_use_mmap_io;
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 357db0a3552..118ab32f772 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -24,6 +24,7 @@
 #include <memory>
 #include <mutex>
 #include <optional>
+#include <exception>
 
 
 namespace Poco::Net { class IPAddress; }
@@ -47,6 +48,7 @@ class AccessRightsElements;
 class EmbeddedDictionaries;
 class ExternalDictionariesLoader;
 class ExternalModelsLoader;
+class ExternalUserDefinedExecutableFunctionsLoader;
 class InterserverCredentials;
 using InterserverCredentialsPtr = std::shared_ptr<const InterserverCredentials>;
 class InterserverIOHandler;
@@ -74,6 +76,7 @@ class MetricLog;
 class AsynchronousMetricLog;
 class OpenTelemetrySpanLog;
 class ZooKeeperLog;
+class SessionLog;
 struct MergeTreeSettings;
 class StorageS3Settings;
 class IDatabase;
@@ -100,6 +103,8 @@ using StoragePolicyPtr = std::shared_ptr<const IStoragePolicy>;
 using StoragePoliciesMap = std::map<String, StoragePolicyPtr>;
 class StoragePolicySelector;
 using StoragePolicySelectorPtr = std::shared_ptr<const StoragePolicySelector>;
+class MergeTreeBackgroundExecutor;
+using MergeTreeBackgroundExecutorPtr = std::shared_ptr<MergeTreeBackgroundExecutor>;
 struct PartUUIDs;
 using PartUUIDsPtr = std::shared_ptr<PartUUIDs>;
 class KeeperDispatcher;
@@ -123,6 +128,8 @@ using ThrottlerPtr = std::shared_ptr<Throttler>;
 class ZooKeeperMetadataTransaction;
 using ZooKeeperMetadataTransactionPtr = std::shared_ptr<ZooKeeperMetadataTransaction>;
 
+class AsynchronousInsertQueue;
+
 /// Callback for external tables initializer
 using ExternalTablesInitializer = std::function<void(ContextPtr)>;
 
@@ -276,9 +283,10 @@ private:
     /// XXX: move this stuff to shared part instead.
     ContextMutablePtr buffer_context;  /// Buffer context. Could be equal to this.
 
-    /// A flag, used to distinguish between user query and internal query to a database engine (MaterializePostgreSQL).
+    /// A flag, used to distinguish between user query and internal query to a database engine (MaterializedPostgreSQL).
     bool is_internal_query = false;
 
+
 public:
     // Top-level OpenTelemetry trace context for the query. Makes sense only for a query context.
     OpenTelemetryTraceContext query_trace_context;
@@ -317,8 +325,6 @@ public:
     static ContextMutablePtr createCopy(const ContextPtr & other);
     static SharedContextHolder createShared();
 
-    void copyFrom(const ContextPtr & other);
-
     ~Context();
 
     String getPath() const;
@@ -470,6 +476,7 @@ public:
         const String & projection_name = {},
         const String & view_name = {});
 
+
     /// Supported factories for records in query_log
     enum class QueryLogFactories
     {
@@ -539,12 +546,15 @@ public:
     const EmbeddedDictionaries & getEmbeddedDictionaries() const;
     const ExternalDictionariesLoader & getExternalDictionariesLoader() const;
     const ExternalModelsLoader & getExternalModelsLoader() const;
+    const ExternalUserDefinedExecutableFunctionsLoader & getExternalUserDefinedExecutableFunctionsLoader() const;
     EmbeddedDictionaries & getEmbeddedDictionaries();
     ExternalDictionariesLoader & getExternalDictionariesLoader();
+    ExternalUserDefinedExecutableFunctionsLoader & getExternalUserDefinedExecutableFunctionsLoader();
     ExternalModelsLoader & getExternalModelsLoader();
     ExternalModelsLoader & getExternalModelsLoaderUnlocked();
     void tryCreateEmbeddedDictionaries() const;
     void loadDictionaries(const Poco::Util::AbstractConfiguration & config);
+    void loadUserDefinedExecutableFunctions(const Poco::Util::AbstractConfiguration & config);
 
 #if USE_NLP
     SynonymsExtensions & getSynonymsExtensions() const;
@@ -600,6 +610,7 @@ public:
     bool hasSessionContext() const { return !session_context.expired(); }
 
     ContextMutablePtr getGlobalContext() const;
+
     bool hasGlobalContext() const { return !global_context.expired(); }
     bool isGlobalContext() const
     {
@@ -648,6 +659,8 @@ public:
     /// Same as above but return a zookeeper connection from auxiliary_zookeepers configuration entry.
     std::shared_ptr<zkutil::ZooKeeper> getAuxiliaryZooKeeper(const String & name) const;
 
+    UInt32 getZooKeeperSessionUptime() const;
+
 #if USE_NURAFT
     std::shared_ptr<KeeperDispatcher> & getKeeperDispatcher() const;
 #endif
@@ -735,6 +748,7 @@ public:
     std::shared_ptr<AsynchronousMetricLog> getAsynchronousMetricLog() const;
     std::shared_ptr<OpenTelemetrySpanLog> getOpenTelemetrySpanLog() const;
     std::shared_ptr<ZooKeeperLog> getZooKeeperLog() const;
+    std::shared_ptr<SessionLog> getSessionLog() const;
 
     /// Returns an object used to log operations with parts if it possible.
     /// Provide table name to make required checks.
@@ -824,9 +838,19 @@ public:
     PartUUIDsPtr getPartUUIDs() const;
     PartUUIDsPtr getIgnoredPartUUIDs() const;
 
+    AsynchronousInsertQueue * getAsynchronousInsertQueue() const;
+    void setAsynchronousInsertQueue(const std::shared_ptr<AsynchronousInsertQueue> & ptr);
+
     ReadTaskCallback getReadTaskCallback() const;
     void setReadTaskCallback(ReadTaskCallback && callback);
 
+    /// Background executors related methods
+    void initializeBackgroundExecutors();
+
+    MergeTreeBackgroundExecutorPtr getMergeMutateExecutor() const;
+    MergeTreeBackgroundExecutorPtr getMovesExecutor() const;
+    MergeTreeBackgroundExecutorPtr getFetchesExecutor() const;
+
     /** Get settings for reading from filesystem. */
     ReadSettings getReadSettings() const;
 
diff --git a/src/Interpreters/ConvertStringsToEnumVisitor.cpp b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
index e483bc9b5b6..4ca0909cd23 100644
--- a/src/Interpreters/ConvertStringsToEnumVisitor.cpp
+++ b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
@@ -149,8 +149,7 @@ void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data
         if (!literal1 || !literal2)
             return;
 
-        if (literal1->value.getTypeName() != std::string_view{"String"}
-            || literal2->value.getTypeName() != std::string_view{"String"})
+        if (literal1->value.getTypeName() != "String" || literal2->value.getTypeName() != "String")
             return;
 
         changeIfArguments(function_node.arguments->children[1],
@@ -166,8 +165,7 @@ void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data
         if (!literal_to || !literal_other)
             return;
 
-        if (literal_to->value.getTypeName() != std::string_view{"Array"}
-            || literal_other->value.getTypeName() != std::string_view{"String"})
+        if (literal_to->value.getTypeName() != "Array" || literal_other->value.getTypeName() != "String")
             return;
 
         Array array_to = literal_to->value.get<Array>();
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 7abe78472b0..4c08ff06e87 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -772,7 +772,9 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
     String shard_path = task.getShardNodePath();
     String is_executed_path = fs::path(shard_path) / "executed";
     String tries_to_execute_path = fs::path(shard_path) / "tries_to_execute";
-    zookeeper->createAncestors(fs::path(shard_path) / ""); /* appends "/" at the end of shard_path */
+    assert(shard_path.starts_with(String(fs::path(task.entry_path) / "shards" / "")));
+    zookeeper->createIfNotExists(fs::path(task.entry_path) / "shards", "");
+    zookeeper->createIfNotExists(shard_path, "");
 
     /// Leader replica creates is_executed_path node on successful query execution.
     /// We will remove create_shard_flag from zk operations list, if current replica is just waiting for leader to execute the query.
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index af60eeeaba3..f273f8a165d 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -30,6 +30,7 @@
 
 #if USE_LIBPQXX
 #    include <Storages/PostgreSQL/StorageMaterializedPostgreSQL.h>
+#    include <Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h>
 #endif
 
 namespace fs = std::filesystem;
@@ -156,15 +157,6 @@ void DatabaseCatalog::loadDatabases()
     /// Another background thread which drops temporary LiveViews.
     /// We should start it after loadMarkedAsDroppedTables() to avoid race condition.
     TemporaryLiveViewCleaner::instance().startup();
-
-    /// Start up tables after all databases are loaded.
-    for (const auto & [database_name, database] : databases)
-    {
-        if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
-            continue;
-
-        database->startupTables();
-    }
 }
 
 void DatabaseCatalog::shutdownImpl()
@@ -249,7 +241,9 @@ DatabaseAndTable DatabaseCatalog::getTableImpl(
 #if USE_LIBPQXX
         if (!context_->isInternalQuery() && (db_and_table.first->getEngineName() == "MaterializedPostgreSQL"))
         {
-            db_and_table.second = std::make_shared<StorageMaterializedPostgreSQL>(std::move(db_and_table.second), getContext());
+            db_and_table.second = std::make_shared<StorageMaterializedPostgreSQL>(std::move(db_and_table.second), getContext(),
+                                        assert_cast<const DatabaseMaterializedPostgreSQL *>(db_and_table.first.get())->getPostgreSQLDatabaseName(),
+                                        db_and_table.second->getStorageID().table_name);
         }
 #endif
 
@@ -617,12 +611,6 @@ Dependencies DatabaseCatalog::getDependencies(const StorageID & from) const
     return Dependencies(iter->second.begin(), iter->second.end());
 }
 
-ViewDependencies DatabaseCatalog::getViewDependencies() const
-{
-    std::lock_guard lock{databases_mutex};
-    return ViewDependencies(view_dependencies.begin(), view_dependencies.end());
-}
-
 void
 DatabaseCatalog::updateDependency(const StorageID & old_from, const StorageID & old_where, const StorageID & new_from,
                                   const StorageID & new_where)
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index 72dd28d335b..f2063e4199f 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -123,6 +123,8 @@ class DatabaseCatalog : boost::noncopyable, WithMutableContext
 public:
     static constexpr const char * TEMPORARY_DATABASE = "_temporary_and_external_tables";
     static constexpr const char * SYSTEM_DATABASE = "system";
+    static constexpr const char * INFORMATION_SCHEMA = "information_schema";
+    static constexpr const char * INFORMATION_SCHEMA_UPPERCASE = "INFORMATION_SCHEMA";
 
     static DatabaseCatalog & init(ContextMutablePtr global_context_);
     static DatabaseCatalog & instance();
@@ -175,7 +177,6 @@ public:
     void addDependency(const StorageID & from, const StorageID & where);
     void removeDependency(const StorageID & from, const StorageID & where);
     Dependencies getDependencies(const StorageID & from) const;
-    ViewDependencies getViewDependencies() const;
 
     /// For Materialized and Live View
     void updateDependency(const StorageID & old_from, const StorageID & old_where,const StorageID & new_from, const StorageID & new_where);
diff --git a/src/Interpreters/DuplicateOrderByVisitor.cpp b/src/Interpreters/DuplicateOrderByVisitor.cpp
new file mode 100644
index 00000000000..df063fc849e
--- /dev/null
+++ b/src/Interpreters/DuplicateOrderByVisitor.cpp
@@ -0,0 +1,124 @@
+#include <Interpreters/DuplicateOrderByVisitor.h>
+#include <Functions/FunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Common/typeid_cast.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_TYPE_OF_AST_NODE;
+}
+
+
+namespace
+{
+
+/// Checks if SELECT has stateful functions
+class ASTFunctionStatefulData
+{
+public:
+    using TypeToVisit = ASTFunction;
+
+    ContextPtr context;
+    bool & is_stateful;
+    void visit(ASTFunction & ast_function, ASTPtr &)
+    {
+        auto aggregate_function_properties = AggregateFunctionFactory::instance().tryGetProperties(ast_function.name);
+
+        if (aggregate_function_properties && aggregate_function_properties->is_order_dependent)
+        {
+            is_stateful = true;
+            return;
+        }
+
+        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, context);
+
+        if (function && function->isStateful())
+        {
+            is_stateful = true;
+            return;
+        }
+    }
+};
+
+using ASTFunctionStatefulMatcher = OneTypeMatcher<ASTFunctionStatefulData>;
+using ASTFunctionStatefulVisitor = InDepthNodeVisitor<ASTFunctionStatefulMatcher, true>;
+
+}
+
+
+void DuplicateOrderByFromSubqueriesData::visit(ASTSelectQuery & select_query, ASTPtr &)
+{
+    if (done)
+        return;
+    done = true;
+
+    if (select_query.orderBy())
+    {
+        /// If we have limits then the ORDER BY is non-removable.
+        if (select_query.limitBy()
+            || select_query.limitByOffset()
+            || select_query.limitByLength()
+            || select_query.limitLength()
+            || select_query.limitOffset())
+        {
+            return;
+        }
+
+        /// If ORDER BY contains filling (in addition to sorting) it is non-removable.
+        for (const auto & child : select_query.orderBy()->children)
+        {
+            auto * ast = child->as<ASTOrderByElement>();
+            if (!ast || ast->children.empty())
+                throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+            if (ast->with_fill)
+                return;
+        }
+
+        select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
+    }
+}
+
+void DuplicateOrderByData::visit(ASTSelectQuery & select_query, ASTPtr &)
+{
+    if (select_query.orderBy() || select_query.groupBy())
+    {
+        for (auto & elem : select_query.children)
+        {
+            if (elem->as<ASTExpressionList>())
+            {
+                bool is_stateful = false;
+                ASTFunctionStatefulVisitor::Data data{context, is_stateful};
+                ASTFunctionStatefulVisitor(data).visit(elem);
+                if (is_stateful) //-V547
+                    return;
+            }
+        }
+
+        if (auto select_table_ptr = select_query.tables())
+        {
+            if (auto * select_table = select_table_ptr->as<ASTTablesInSelectQuery>())
+            {
+                if (!select_table->children.empty())
+                {
+                    DuplicateOrderByFromSubqueriesVisitor::Data data{false};
+                    DuplicateOrderByFromSubqueriesVisitor(data).visit(select_table->children[0]);
+                }
+            }
+        }
+    }
+}
+
+}
+
diff --git a/src/Interpreters/DuplicateOrderByVisitor.h b/src/Interpreters/DuplicateOrderByVisitor.h
index 4231b2600af..de8cb4c8f32 100644
--- a/src/Interpreters/DuplicateOrderByVisitor.h
+++ b/src/Interpreters/DuplicateOrderByVisitor.h
@@ -1,51 +1,13 @@
 #pragma once
 
-#include <Functions/FunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <IO/WriteHelpers.h>
 #include <Interpreters/InDepthNodeVisitor.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTSetQuery.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/IAST.h>
-#include <Common/typeid_cast.h>
+
 
 namespace DB
 {
 
-/// Checks if SELECT has stateful functions
-class ASTFunctionStatefulData
-{
-public:
-    using TypeToVisit = ASTFunction;
-
-    ContextPtr context;
-    bool & is_stateful;
-    void visit(ASTFunction & ast_function, ASTPtr &)
-    {
-        auto aggregate_function_properties = AggregateFunctionFactory::instance().tryGetProperties(ast_function.name);
-
-        if (aggregate_function_properties && aggregate_function_properties->is_order_dependent)
-        {
-            is_stateful = true;
-            return;
-        }
-
-        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, context);
-
-        if (function && function->isStateful())
-        {
-            is_stateful = true;
-            return;
-        }
-    }
-};
-
-using ASTFunctionStatefulMatcher = OneTypeMatcher<ASTFunctionStatefulData>;
-using ASTFunctionStatefulVisitor = InDepthNodeVisitor<ASTFunctionStatefulMatcher, true>;
-
+class ASTSelectQuery;
 
 /// Erases unnecessary ORDER BY from subquery
 class DuplicateOrderByFromSubqueriesData
@@ -55,19 +17,7 @@ public:
 
     bool done = false;
 
-    void visit(ASTSelectQuery & select_query, ASTPtr &)
-    {
-        if (done)
-            return;
-
-        if (select_query.orderBy() && !select_query.limitBy() && !select_query.limitByOffset() &&
-            !select_query.limitByLength() && !select_query.limitLength() && !select_query.limitOffset())
-        {
-            select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
-        }
-
-        done = true;
-    }
+    void visit(ASTSelectQuery & select_query, ASTPtr &);
 };
 
 using DuplicateOrderByFromSubqueriesMatcher = OneTypeMatcher<DuplicateOrderByFromSubqueriesData>;
@@ -82,35 +32,7 @@ public:
 
     ContextPtr context;
 
-    void visit(ASTSelectQuery & select_query, ASTPtr &)
-    {
-        if (select_query.orderBy() || select_query.groupBy())
-        {
-            for (auto & elem : select_query.children)
-            {
-                if (elem->as<ASTExpressionList>())
-                {
-                    bool is_stateful = false;
-                    ASTFunctionStatefulVisitor::Data data{context, is_stateful};
-                    ASTFunctionStatefulVisitor(data).visit(elem);
-                    if (is_stateful) //-V547
-                        return;
-                }
-            }
-
-            if (auto select_table_ptr = select_query.tables())
-            {
-                if (auto * select_table = select_table_ptr->as<ASTTablesInSelectQuery>())
-                {
-                    if (!select_table->children.empty())
-                    {
-                        DuplicateOrderByFromSubqueriesVisitor::Data data{false};
-                        DuplicateOrderByFromSubqueriesVisitor(data).visit(select_table->children[0]);
-                    }
-                }
-            }
-        }
-    }
+    void visit(ASTSelectQuery & select_query, ASTPtr &);
 };
 
 using DuplicateOrderByMatcher = OneTypeMatcher<DuplicateOrderByData>;
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index f3c51487a05..91ba4085c3e 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -792,7 +792,7 @@ std::string ExpressionActions::getSmallestColumn(const NamesAndTypesList & colum
     for (const auto & column : columns)
     {
         /// Skip .sizeX and similar meta information
-        if (!column.getSubcolumnName().empty())
+        if (column.isSubcolumn())
             continue;
 
         /// @todo resolve evil constant
@@ -1042,7 +1042,7 @@ ExpressionActionsChain::JoinStep::JoinStep(
         required_columns.emplace_back(column.name, column.type);
 
     NamesAndTypesList result_names_and_types = required_columns;
-    analyzed_join->addJoinedColumnsAndCorrectTypes(result_names_and_types);
+    analyzed_join->addJoinedColumnsAndCorrectTypes(result_names_and_types, true);
     for (const auto & [name, type] : result_names_and_types)
         /// `column` is `nullptr` because we don't care on constness here, it may be changed in join
         result_columns.emplace_back(nullptr, type, name);
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index dbb1addf202..1dd63695ad4 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -43,7 +43,6 @@
 #include <Common/StringUtils/StringUtils.h>
 
 #include <DataTypes/DataTypeFactory.h>
-#include <Parsers/parseQuery.h>
 
 #include <Interpreters/ActionsVisitor.h>
 #include <Interpreters/GetAggregatesVisitor.h>
@@ -152,6 +151,9 @@ ExpressionAnalyzer::ExpressionAnalyzer(
     /// Replaces global subqueries with the generated names of temporary tables that will be sent to remote servers.
     initGlobalSubqueriesAndExternalTables(do_global);
 
+    auto temp_actions = std::make_shared<ActionsDAG>(sourceColumns());
+    columns_after_array_join = getColumnsAfterArrayJoin(temp_actions, sourceColumns());
+    columns_after_join = analyzeJoin(temp_actions, columns_after_array_join);
     /// has_aggregation, aggregation_keys, aggregate_descriptions, aggregated_columns.
     /// This analysis should be performed after processing global subqueries, because otherwise,
     /// if the aggregate function contains a global subquery, then `analyzeAggregation` method will save
@@ -159,7 +161,7 @@ ExpressionAnalyzer::ExpressionAnalyzer(
     /// global subquery. Then, when you call `initGlobalSubqueriesAndExternalTables` method, this
     /// the global subquery will be replaced with a temporary table, resulting in aggregate_descriptions
     /// will contain out-of-date information, which will lead to an error when the query is executed.
-    analyzeAggregation();
+    analyzeAggregation(temp_actions);
 }
 
 static ASTPtr checkPositionalArgument(ASTPtr argument, const ASTSelectQuery * select_query, ASTSelectQuery::Expression expression)
@@ -193,7 +195,64 @@ static ASTPtr checkPositionalArgument(ASTPtr argument, const ASTSelectQuery * se
     return nullptr;
 }
 
-void ExpressionAnalyzer::analyzeAggregation()
+NamesAndTypesList ExpressionAnalyzer::getColumnsAfterArrayJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns)
+{
+    const auto * select_query = query->as<ASTSelectQuery>();
+    if (!select_query)
+        return {};
+
+    auto [array_join_expression_list, is_array_join_left] = select_query->arrayJoinExpressionList();
+
+    if (!array_join_expression_list)
+        return src_columns;
+
+    getRootActionsNoMakeSet(array_join_expression_list, true, actions, false);
+
+    auto array_join = addMultipleArrayJoinAction(actions, is_array_join_left);
+    auto sample_columns = actions->getResultColumns();
+    array_join->prepare(sample_columns);
+    actions = std::make_shared<ActionsDAG>(sample_columns);
+
+    NamesAndTypesList new_columns_after_array_join;
+    NameSet added_columns;
+
+    for (auto & column : actions->getResultColumns())
+    {
+        if (syntax->array_join_result_to_source.count(column.name))
+        {
+            new_columns_after_array_join.emplace_back(column.name, column.type);
+            added_columns.emplace(column.name);
+        }
+    }
+
+    for (const auto & column : src_columns)
+        if (added_columns.count(column.name) == 0)
+            new_columns_after_array_join.emplace_back(column.name, column.type);
+
+    return new_columns_after_array_join;
+}
+
+NamesAndTypesList ExpressionAnalyzer::analyzeJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns)
+{
+    const auto * select_query = query->as<ASTSelectQuery>();
+    if (!select_query)
+        return {};
+
+    const ASTTablesInSelectQueryElement * join = select_query->join();
+    if (join)
+    {
+        getRootActionsNoMakeSet(analyzedJoin().leftKeysList(), true, actions, false);
+        auto sample_columns = actions->getNamesAndTypesList();
+        syntax->analyzed_join->addJoinedColumnsAndCorrectTypes(sample_columns, true);
+        actions = std::make_shared<ActionsDAG>(sample_columns);
+    }
+
+    NamesAndTypesList result_columns = src_columns;
+    syntax->analyzed_join->addJoinedColumnsAndCorrectTypes(result_columns,false);
+    return result_columns;
+}
+
+void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
 {
     /** Find aggregation keys (aggregation_keys), information about aggregate functions (aggregate_descriptions),
      *  as well as a set of columns obtained after the aggregation, if any,
@@ -204,146 +263,90 @@ void ExpressionAnalyzer::analyzeAggregation()
 
     auto * select_query = query->as<ASTSelectQuery>();
 
-    auto temp_actions = std::make_shared<ActionsDAG>(sourceColumns());
+    makeAggregateDescriptions(temp_actions, aggregate_descriptions);
+    has_aggregation = !aggregate_descriptions.empty() || (select_query && (select_query->groupBy() || select_query->having()));
 
-    if (select_query)
+    if (!has_aggregation)
     {
-        NamesAndTypesList array_join_columns;
-        columns_after_array_join = sourceColumns();
-
-        bool is_array_join_left;
-        if (ASTPtr array_join_expression_list = select_query->arrayJoinExpressionList(is_array_join_left))
-        {
-            getRootActionsNoMakeSet(array_join_expression_list, true, temp_actions, false);
-
-            auto array_join = addMultipleArrayJoinAction(temp_actions, is_array_join_left);
-            auto sample_columns = temp_actions->getResultColumns();
-            array_join->prepare(sample_columns);
-            temp_actions = std::make_shared<ActionsDAG>(sample_columns);
-
-            NamesAndTypesList new_columns_after_array_join;
-            NameSet added_columns;
-
-            for (auto & column : temp_actions->getResultColumns())
-            {
-                if (syntax->array_join_result_to_source.count(column.name))
-                {
-                    new_columns_after_array_join.emplace_back(column.name, column.type);
-                    added_columns.emplace(column.name);
-                }
-            }
-
-            for (auto & column : columns_after_array_join)
-                if (added_columns.count(column.name) == 0)
-                    new_columns_after_array_join.emplace_back(column.name, column.type);
-
-            columns_after_array_join.swap(new_columns_after_array_join);
-        }
-
-        columns_after_array_join.insert(columns_after_array_join.end(), array_join_columns.begin(), array_join_columns.end());
-
-        const ASTTablesInSelectQueryElement * join = select_query->join();
-        if (join)
-        {
-            getRootActionsNoMakeSet(analyzedJoin().leftKeysList(), true, temp_actions, false);
-            auto sample_columns = temp_actions->getNamesAndTypesList();
-            analyzedJoin().addJoinedColumnsAndCorrectTypes(sample_columns);
-            temp_actions = std::make_shared<ActionsDAG>(sample_columns);
-        }
-
-        columns_after_join = columns_after_array_join;
-        analyzedJoin().addJoinedColumnsAndCorrectTypes(columns_after_join, false);
+        aggregated_columns = temp_actions->getNamesAndTypesList();
+        return;
     }
 
-    has_aggregation = makeAggregateDescriptions(temp_actions);
-    if (select_query && (select_query->groupBy() || select_query->having()))
-        has_aggregation = true;
-
-    if (has_aggregation)
+    /// Find out aggregation keys.
+    if (select_query)
     {
-        /// Find out aggregation keys.
-        if (select_query)
+        if (ASTPtr group_by_ast = select_query->groupBy())
         {
-            if (select_query->groupBy())
+            NameSet unique_keys;
+            ASTs & group_asts = group_by_ast->children;
+            for (ssize_t i = 0; i < ssize_t(group_asts.size()); ++i)
             {
-                NameSet unique_keys;
-                ASTs & group_asts = select_query->groupBy()->children;
+                ssize_t size = group_asts.size();
+                getRootActionsNoMakeSet(group_asts[i], true, temp_actions, false);
 
-                for (ssize_t i = 0; i < ssize_t(group_asts.size()); ++i)
+                if (getContext()->getSettingsRef().enable_positional_arguments)
                 {
-                    ssize_t size = group_asts.size();
-                    getRootActionsNoMakeSet(group_asts[i], true, temp_actions, false);
+                    auto new_argument = checkPositionalArgument(group_asts[i], select_query, ASTSelectQuery::Expression::GROUP_BY);
+                    if (new_argument)
+                        group_asts[i] = new_argument;
+                }
 
-                    if (getContext()->getSettingsRef().enable_positional_arguments)
+                const auto & column_name = group_asts[i]->getColumnName();
+                const auto * node = temp_actions->tryFindInIndex(column_name);
+                if (!node)
+                    throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
+
+                /// Only removes constant keys if it's an initiator or distributed_group_by_no_merge is enabled.
+                if (getContext()->getClientInfo().distributed_depth == 0 || settings.distributed_group_by_no_merge > 0)
+                {
+                    /// Constant expressions have non-null column pointer at this stage.
+                    if (node->column && isColumnConst(*node->column))
                     {
-                        auto new_argument = checkPositionalArgument(group_asts[i], select_query, ASTSelectQuery::Expression::GROUP_BY);
-                        if (new_argument)
-                            group_asts[i] = new_argument;
-                    }
+                        select_query->group_by_with_constant_keys = true;
 
-                    const auto & column_name = group_asts[i]->getColumnName();
-                    const auto * node = temp_actions->tryFindInIndex(column_name);
-
-                    if (!node)
-                        throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
-
-                    /// Only removes constant keys if it's an initiator or distributed_group_by_no_merge is enabled.
-                    if (getContext()->getClientInfo().distributed_depth == 0 || settings.distributed_group_by_no_merge > 0)
-                    {
-                        /// Constant expressions have non-null column pointer at this stage.
-                        if (node->column && isColumnConst(*node->column))
+                        /// But don't remove last key column if no aggregate functions, otherwise aggregation will not work.
+                        if (!aggregate_descriptions.empty() || size > 1)
                         {
-                            select_query->group_by_with_constant_keys = true;
+                            if (i + 1 < static_cast<ssize_t>(size))
+                                group_asts[i] = std::move(group_asts.back());
 
-                            /// But don't remove last key column if no aggregate functions, otherwise aggregation will not work.
-                            if (!aggregate_descriptions.empty() || size > 1)
-                            {
-                                if (i + 1 < static_cast<ssize_t>(size))
-                                    group_asts[i] = std::move(group_asts.back());
+                            group_asts.pop_back();
 
-                                group_asts.pop_back();
-
-                                --i;
-                                continue;
-                            }
+                            --i;
+                            continue;
                         }
                     }
-
-                    NameAndTypePair key{column_name, node->result_type};
-
-                    /// Aggregation keys are uniqued.
-                    if (!unique_keys.count(key.name))
-                    {
-                        unique_keys.insert(key.name);
-                        aggregation_keys.push_back(key);
-
-                        /// Key is no longer needed, therefore we can save a little by moving it.
-                        aggregated_columns.push_back(std::move(key));
-                    }
                 }
 
-                if (group_asts.empty())
+                NameAndTypePair key{column_name, node->result_type};
+
+                /// Aggregation keys are uniqued.
+                if (!unique_keys.count(key.name))
                 {
-                    select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, {});
-                    has_aggregation = select_query->having() || !aggregate_descriptions.empty();
+                    unique_keys.insert(key.name);
+                    aggregation_keys.push_back(key);
+
+                    /// Key is no longer needed, therefore we can save a little by moving it.
+                    aggregated_columns.push_back(std::move(key));
                 }
             }
+
+            if (group_asts.empty())
+            {
+                select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, {});
+                has_aggregation = select_query->having() || !aggregate_descriptions.empty();
+            }
         }
-        else
-            aggregated_columns = temp_actions->getNamesAndTypesList();
 
         /// Constant expressions are already removed during first 'analyze' run.
         /// So for second `analyze` information is taken from select_query.
-        if (select_query)
-            has_const_aggregation_keys = select_query->group_by_with_constant_keys;
-
-        for (const auto & desc : aggregate_descriptions)
-            aggregated_columns.emplace_back(desc.column_name, desc.function->getReturnType());
+        has_const_aggregation_keys = select_query->group_by_with_constant_keys;
     }
     else
-    {
         aggregated_columns = temp_actions->getNamesAndTypesList();
-    }
+
+    for (const auto & desc : aggregate_descriptions)
+        aggregated_columns.emplace_back(desc.column_name, desc.function->getReturnType());
 }
 
 
@@ -487,7 +490,7 @@ void ExpressionAnalyzer::getRootActionsForHaving(const ASTPtr & ast, bool no_sub
 }
 
 
-bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
+void ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions, AggregateDescriptions & descriptions)
 {
     for (const ASTFunction * node : aggregates())
     {
@@ -520,10 +523,8 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
         aggregate.parameters = (node->parameters) ? getAggregateFunctionParametersArray(node->parameters, "", getContext()) : Array();
         aggregate.function = AggregateFunctionFactory::instance().get(node->name, types, aggregate.parameters, properties);
 
-        aggregate_descriptions.push_back(aggregate);
+        descriptions.push_back(aggregate);
     }
-
-    return !aggregates().empty();
 }
 
 void makeWindowDescriptionFromAST(const Context & context,
@@ -624,7 +625,7 @@ void makeWindowDescriptionFromAST(const Context & context,
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
             "Window frame '{}' is not implemented (while processing '{}')",
-            WindowFrame::toString(definition.frame_type),
+            definition.frame_type,
             ast->formatForErrorMessage());
     }
 
@@ -804,8 +805,7 @@ ArrayJoinActionPtr SelectQueryExpressionAnalyzer::appendArrayJoin(ExpressionActi
 {
     const auto * select_query = getSelectQuery();
 
-    bool is_array_join_left;
-    ASTPtr array_join_expression_list = select_query->arrayJoinExpressionList(is_array_join_left);
+    auto [array_join_expression_list, is_array_join_left] = select_query->arrayJoinExpressionList();
     if (!array_join_expression_list)
         return nullptr;
 
@@ -832,14 +832,14 @@ bool SelectQueryExpressionAnalyzer::appendJoinLeftKeys(ExpressionActionsChain &
     return true;
 }
 
-JoinPtr SelectQueryExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain)
+JoinPtr SelectQueryExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain, ActionsDAGPtr & converting_join_columns)
 {
     const ColumnsWithTypeAndName & left_sample_columns = chain.getLastStep().getResultColumns();
-    JoinPtr table_join = makeTableJoin(*syntax->ast_join, left_sample_columns);
+    JoinPtr table_join = makeTableJoin(*syntax->ast_join, left_sample_columns, converting_join_columns);
 
-    if (syntax->analyzed_join->needConvert())
+    if (converting_join_columns)
     {
-        chain.steps.push_back(std::make_unique<ExpressionActionsChain::ExpressionActionsStep>(syntax->analyzed_join->leftConvertingActions()));
+        chain.steps.push_back(std::make_unique<ExpressionActionsChain::ExpressionActionsStep>(converting_join_columns));
         chain.addStep();
     }
 
@@ -850,14 +850,6 @@ JoinPtr SelectQueryExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain
     return table_join;
 }
 
-static JoinPtr tryGetStorageJoin(std::shared_ptr<TableJoin> analyzed_join)
-{
-    if (auto * table = analyzed_join->joined_storage.get())
-        if (auto * storage_join = dynamic_cast<StorageJoin *>(table))
-            return storage_join->getJoinLocked(analyzed_join);
-    return {};
-}
-
 static ActionsDAGPtr createJoinedBlockActions(ContextPtr context, const TableJoin & analyzed_join)
 {
     ASTPtr expression_list = analyzed_join.rightKeysList();
@@ -865,44 +857,13 @@ static ActionsDAGPtr createJoinedBlockActions(ContextPtr context, const TableJoi
     return ExpressionAnalyzer(expression_list, syntax_result, context).getActionsDAG(true, false);
 }
 
-static bool allowDictJoin(StoragePtr joined_storage, ContextPtr context, String & dict_name, String & key_name)
+static std::shared_ptr<IJoin> chooseJoinAlgorithm(std::shared_ptr<TableJoin> analyzed_join, const Block & sample_block, ContextPtr context)
 {
-    if (!joined_storage->isDictionary())
-        return false;
-
-    StorageDictionary & storage_dictionary = static_cast<StorageDictionary &>(*joined_storage);
-    dict_name = storage_dictionary.getDictionaryName();
-    auto dictionary = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
-    if (!dictionary)
-        return false;
-
-    const DictionaryStructure & structure = dictionary->getStructure();
-    if (structure.id)
-    {
-        key_name = structure.id->name;
-        return true;
-    }
-    return false;
-}
-
-static std::shared_ptr<IJoin> makeJoin(std::shared_ptr<TableJoin> analyzed_join, const Block & sample_block, ContextPtr context)
-{
-    bool allow_merge_join = analyzed_join->allowMergeJoin();
-
     /// HashJoin with Dictionary optimisation
-    String dict_name;
-    String key_name;
-    if (analyzed_join->joined_storage && allowDictJoin(analyzed_join->joined_storage, context, dict_name, key_name))
-    {
-        Names original_names;
-        NamesAndTypesList result_columns;
-        if (analyzed_join->allowDictJoin(key_name, sample_block, original_names, result_columns))
-        {
-            analyzed_join->dictionary_reader = std::make_shared<DictionaryReader>(dict_name, original_names, result_columns, context);
-            return std::make_shared<HashJoin>(analyzed_join, sample_block);
-        }
-    }
+    if (analyzed_join->tryInitDictJoin(sample_block, context))
+        return std::make_shared<HashJoin>(analyzed_join, sample_block);
 
+    bool allow_merge_join = analyzed_join->allowMergeJoin();
     if (analyzed_join->forceHashJoin() || (analyzed_join->preferMergeJoin() && !allow_merge_join))
         return std::make_shared<HashJoin>(analyzed_join, sample_block);
     else if (analyzed_join->forceMergeJoin() || (analyzed_join->preferMergeJoin() && allow_merge_join))
@@ -910,79 +871,91 @@ static std::shared_ptr<IJoin> makeJoin(std::shared_ptr<TableJoin> analyzed_join,
     return std::make_shared<JoinSwitcher>(analyzed_join, sample_block);
 }
 
+static std::unique_ptr<QueryPlan> buildJoinedPlan(
+    ContextPtr context,
+    const ASTTablesInSelectQueryElement & join_element,
+    TableJoin & analyzed_join,
+    SelectQueryOptions query_options)
+{
+    /// Actions which need to be calculated on joined block.
+    auto joined_block_actions = createJoinedBlockActions(context, analyzed_join);
+    Names original_right_columns;
+
+    NamesWithAliases required_columns_with_aliases = analyzed_join.getRequiredColumns(
+        Block(joined_block_actions->getResultColumns()), joined_block_actions->getRequiredColumns().getNames());
+    for (auto & pr : required_columns_with_aliases)
+        original_right_columns.push_back(pr.first);
+
+    /** For GLOBAL JOINs (in the case, for example, of the push method for executing GLOBAL subqueries), the following occurs
+        * - in the addExternalStorage function, the JOIN (SELECT ...) subquery is replaced with JOIN _data1,
+        *   in the subquery_for_set object this subquery is exposed as source and the temporary table _data1 as the `table`.
+        * - this function shows the expression JOIN _data1.
+        */
+    auto interpreter = interpretSubquery(
+        join_element.table_expression, context, original_right_columns, query_options.copy().setWithAllColumns());
+    auto joined_plan = std::make_unique<QueryPlan>();
+    interpreter->buildQueryPlan(*joined_plan);
+    {
+        auto sample_block = interpreter->getSampleBlock();
+        auto rename_dag = std::make_unique<ActionsDAG>(sample_block.getColumnsWithTypeAndName());
+        for (const auto & name_with_alias : required_columns_with_aliases)
+        {
+            if (sample_block.has(name_with_alias.first))
+            {
+                auto pos = sample_block.getPositionByName(name_with_alias.first);
+                const auto & alias = rename_dag->addAlias(*rename_dag->getInputs()[pos], name_with_alias.second);
+                rename_dag->getIndex()[pos] = &alias;
+            }
+        }
+
+        auto rename_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(rename_dag));
+        rename_step->setStepDescription("Rename joined columns");
+        joined_plan->addStep(std::move(rename_step));
+    }
+
+    auto joined_actions_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(joined_block_actions));
+    joined_actions_step->setStepDescription("Joined actions");
+    joined_plan->addStep(std::move(joined_actions_step));
+
+    return joined_plan;
+}
+
 JoinPtr SelectQueryExpressionAnalyzer::makeTableJoin(
-    const ASTTablesInSelectQueryElement & join_element, const ColumnsWithTypeAndName & left_sample_columns)
+    const ASTTablesInSelectQueryElement & join_element,
+    const ColumnsWithTypeAndName & left_columns,
+    ActionsDAGPtr & left_convert_actions)
 {
     /// Two JOINs are not supported with the same subquery, but different USINGs.
 
     if (joined_plan)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Table join was already created for query");
 
-    /// Use StorageJoin if any.
-    JoinPtr join = tryGetStorageJoin(syntax->analyzed_join);
+    ActionsDAGPtr right_convert_actions = nullptr;
 
-    if (!join)
+    const auto & analyzed_join = syntax->analyzed_join;
+
+    if (auto storage = analyzed_join->getStorageJoin())
     {
-        /// Actions which need to be calculated on joined block.
-        auto joined_block_actions = createJoinedBlockActions(getContext(), analyzedJoin());
-
-        Names original_right_columns;
-
-        NamesWithAliases required_columns_with_aliases = analyzedJoin().getRequiredColumns(
-            Block(joined_block_actions->getResultColumns()), joined_block_actions->getRequiredColumns().getNames());
-        for (auto & pr : required_columns_with_aliases)
-            original_right_columns.push_back(pr.first);
-
-        /** For GLOBAL JOINs (in the case, for example, of the push method for executing GLOBAL subqueries), the following occurs
-            * - in the addExternalStorage function, the JOIN (SELECT ...) subquery is replaced with JOIN _data1,
-            *   in the subquery_for_set object this subquery is exposed as source and the temporary table _data1 as the `table`.
-            * - this function shows the expression JOIN _data1.
-            */
-        auto interpreter = interpretSubquery(
-            join_element.table_expression, getContext(), original_right_columns, query_options.copy().setWithAllColumns());
-        {
-            joined_plan = std::make_unique<QueryPlan>();
-            interpreter->buildQueryPlan(*joined_plan);
-
-            auto sample_block = interpreter->getSampleBlock();
-
-            auto rename_dag = std::make_unique<ActionsDAG>(sample_block.getColumnsWithTypeAndName());
-            for (const auto & name_with_alias : required_columns_with_aliases)
-            {
-                if (sample_block.has(name_with_alias.first))
-                {
-                    auto pos = sample_block.getPositionByName(name_with_alias.first);
-                    const auto & alias = rename_dag->addAlias(*rename_dag->getInputs()[pos], name_with_alias.second);
-                    rename_dag->getIndex()[pos] = &alias;
-                }
-            }
-
-            auto rename_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(rename_dag));
-            rename_step->setStepDescription("Rename joined columns");
-            joined_plan->addStep(std::move(rename_step));
-        }
-
-        auto joined_actions_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(joined_block_actions));
-        joined_actions_step->setStepDescription("Joined actions");
-        joined_plan->addStep(std::move(joined_actions_step));
-
-        const ColumnsWithTypeAndName & right_sample_columns = joined_plan->getCurrentDataStream().header.getColumnsWithTypeAndName();
-        bool need_convert = syntax->analyzed_join->applyJoinKeyConvert(left_sample_columns, right_sample_columns);
-        if (need_convert)
-        {
-            auto converting_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), syntax->analyzed_join->rightConvertingActions());
-            converting_step->setStepDescription("Convert joined columns");
-            joined_plan->addStep(std::move(converting_step));
-        }
-
-        join = makeJoin(syntax->analyzed_join, joined_plan->getCurrentDataStream().header, getContext());
-
-        /// Do not make subquery for join over dictionary.
-        if (syntax->analyzed_join->dictionary_reader)
-            joined_plan.reset();
+        std::tie(left_convert_actions, right_convert_actions) = analyzed_join->createConvertingActions(left_columns, {});
+        return storage->getJoinLocked(analyzed_join);
     }
-    else
-        syntax->analyzed_join->applyJoinKeyConvert(left_sample_columns, {});
+
+    joined_plan = buildJoinedPlan(getContext(), join_element, *analyzed_join, query_options);
+
+    const ColumnsWithTypeAndName & right_columns = joined_plan->getCurrentDataStream().header.getColumnsWithTypeAndName();
+    std::tie(left_convert_actions, right_convert_actions) = analyzed_join->createConvertingActions(left_columns, right_columns);
+    if (right_convert_actions)
+    {
+        auto converting_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), right_convert_actions);
+        converting_step->setStepDescription("Convert joined columns");
+        joined_plan->addStep(std::move(converting_step));
+    }
+
+    JoinPtr join = chooseJoinAlgorithm(analyzed_join, joined_plan->getCurrentDataStream().header, getContext());
+
+    /// Do not make subquery for join over dictionary.
+    if (analyzed_join->getDictionaryReader())
+        joined_plan.reset();
 
     return join;
 }
@@ -1267,7 +1240,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendOrderBy(ExpressionActionsChai
     {
         auto * ast = child->as<ASTOrderByElement>();
         if (!ast || ast->children.empty())
-            throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
 
         if (getContext()->getSettingsRef().enable_positional_arguments)
         {
@@ -1574,8 +1547,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         {
             query_analyzer.appendJoinLeftKeys(chain, only_types || !first_stage);
             before_join = chain.getLastActions();
-            join = query_analyzer.appendJoin(chain);
-            converting_join_columns = query_analyzer.analyzedJoin().leftConvertingActions();
+            join = query_analyzer.appendJoin(chain, converting_join_columns);
             chain.addStep();
         }
 
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index 2d0041bd96b..5e3a7af8e9e 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -92,7 +92,7 @@ private:
         const SizeLimits size_limits_for_set;
         const UInt64 distributed_group_by_no_merge;
 
-        ExtractedSettings(const Settings & settings_);
+        explicit ExtractedSettings(const Settings & settings_);
     };
 
 public:
@@ -188,12 +188,15 @@ protected:
       *  or after all the actions that are normally performed before aggregation.
       * Set has_aggregation = true if there is GROUP BY or at least one aggregate function.
       */
-    void analyzeAggregation();
-    bool makeAggregateDescriptions(ActionsDAGPtr & actions);
+    void analyzeAggregation(ActionsDAGPtr & temp_actions);
+    void makeAggregateDescriptions(ActionsDAGPtr & actions, AggregateDescriptions & descriptions);
 
     const ASTSelectQuery * getSelectQuery() const;
 
     bool isRemoteStorage() const { return syntax->is_remote_storage; }
+
+    NamesAndTypesList getColumnsAfterArrayJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns);
+    NamesAndTypesList analyzeJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns);
 };
 
 class SelectQueryExpressionAnalyzer;
@@ -338,7 +341,8 @@ private:
 
     JoinPtr makeTableJoin(
         const ASTTablesInSelectQueryElement & join_element,
-        const ColumnsWithTypeAndName & left_sample_columns);
+        const ColumnsWithTypeAndName & left_columns,
+        ActionsDAGPtr & left_convert_actions);
 
     const ASTSelectQuery * getAggregatingQuery() const;
 
@@ -359,7 +363,8 @@ private:
     /// Before aggregation:
     ArrayJoinActionPtr appendArrayJoin(ExpressionActionsChain & chain, ActionsDAGPtr & before_array_join, bool only_types);
     bool appendJoinLeftKeys(ExpressionActionsChain & chain, bool only_types);
-    JoinPtr appendJoin(ExpressionActionsChain & chain);
+    JoinPtr appendJoin(ExpressionActionsChain & chain, ActionsDAGPtr & converting_join_columns);
+
     /// remove_filter is set in ExpressionActionsChain::finalize();
     /// Columns in `additional_required_columns` will not be removed (they can be used for e.g. sampling or FINAL modifier).
     ActionsDAGPtr appendPrewhere(ExpressionActionsChain & chain, bool only_types, const Names & additional_required_columns);
diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 27089ab8d37..9005b24b044 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -353,7 +353,8 @@ static bool isCompilableFunction(const ActionsDAG::Node & node, const std::unord
 
 static CompileDAG getCompilableDAG(
     const ActionsDAG::Node * root,
-    ActionsDAG::NodeRawConstPtrs & children)
+    ActionsDAG::NodeRawConstPtrs & children,
+    const std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes)
 {
     /// Extract CompileDAG from root actions dag node.
 
@@ -376,29 +377,29 @@ static CompileDAG getCompilableDAG(
         const auto * node = frame.node;
 
         bool is_compilable_constant = isCompilableConstant(*node);
-        bool is_compilable_function = isCompilableFunction(*node, {});
+        bool is_compilable_function = isCompilableFunction(*node, lazy_executed_nodes);
 
         if (!is_compilable_function || is_compilable_constant)
         {
-           CompileDAG::Node compile_node;
-           compile_node.function = node->function_base;
-           compile_node.result_type = node->result_type;
+            CompileDAG::Node compile_node;
+            compile_node.function = node->function_base;
+            compile_node.result_type = node->result_type;
 
-           if (is_compilable_constant)
-           {
-               compile_node.type = CompileDAG::CompileType::CONSTANT;
-               compile_node.column = node->column;
-           }
-           else
-           {
+            if (is_compilable_constant)
+            {
+                compile_node.type = CompileDAG::CompileType::CONSTANT;
+                compile_node.column = node->column;
+            }
+            else
+            {
                 compile_node.type = CompileDAG::CompileType::INPUT;
                 children.emplace_back(node);
-           }
+            }
 
-           visited_node_to_compile_dag_position[node] = dag.getNodesCount();
-           dag.addNode(std::move(compile_node));
-           stack.pop();
-           continue;
+            visited_node_to_compile_dag_position[node] = dag.getNodesCount();
+            dag.addNode(std::move(compile_node));
+            stack.pop();
+            continue;
         }
 
         while (frame.next_child_to_visit < node->children.size())
@@ -568,7 +569,7 @@ void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression, const
     for (auto & node : nodes_to_compile)
     {
         NodeRawConstPtrs new_children;
-        auto dag = getCompilableDAG(node, new_children);
+        auto dag = getCompilableDAG(node, new_children, lazy_executed_nodes);
 
         if (dag.getInputNodesCount() == 0)
             continue;
diff --git a/src/Interpreters/ExternalDictionariesLoader.cpp b/src/Interpreters/ExternalDictionariesLoader.cpp
index cbb0e52b91b..bf2ce9e66ee 100644
--- a/src/Interpreters/ExternalDictionariesLoader.cpp
+++ b/src/Interpreters/ExternalDictionariesLoader.cpp
@@ -89,57 +89,53 @@ DictionaryStructure ExternalDictionariesLoader::getDictionaryStructure(const std
 
 std::string ExternalDictionariesLoader::resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const
 {
-    bool has_dictionary = has(dictionary_name);
-    if (has_dictionary)
+    if (has(dictionary_name))
         return dictionary_name;
 
-    std::string resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name);
-    has_dictionary = has(resolved_name);
+    std::string resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name, current_database_name);
 
-    if (!has_dictionary)
-    {
-        /// If dictionary not found. And database was not implicitly specified
-        /// we can qualify dictionary name with current database name.
-        /// It will help if dictionary is created with DDL and is in current database.
-        if (dictionary_name.find('.') == std::string::npos)
-        {
-            String dictionary_name_with_database = current_database_name + '.' + dictionary_name;
-            resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name_with_database);
-            has_dictionary = has(resolved_name);
-        }
-    }
+    if (has(resolved_name))
+        return resolved_name;
 
-    if (!has_dictionary)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary ({}) not found", backQuote(dictionary_name));
-
-    return resolved_name;
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary ({}) not found", backQuote(dictionary_name));
 }
 
-std::string ExternalDictionariesLoader::resolveDictionaryNameFromDatabaseCatalog(const std::string & name) const
+std::string ExternalDictionariesLoader::resolveDictionaryNameFromDatabaseCatalog(const std::string & name, const std::string & current_database_name) const
 {
     /// If it's dictionary from Atomic database, then we need to convert qualified name to UUID.
     /// Try to split name and get id from associated StorageDictionary.
     /// If something went wrong, return name as is.
 
-    auto pos = name.find('.');
-    if (pos == std::string::npos || name.find('.', pos + 1) != std::string::npos)
-        return name;
+    String res = name;
 
-    std::string maybe_database_name = name.substr(0, pos);
-    std::string maybe_table_name = name.substr(pos + 1);
+    auto qualified_name = QualifiedTableName::tryParseFromString(name);
+    if (!qualified_name)
+        return res;
+
+    if (qualified_name->database.empty())
+    {
+        /// Ether database name is not specified and we should use current one
+        /// or it's an XML dictionary.
+        bool is_xml_dictionary = has(name);
+        if (is_xml_dictionary)
+            return res;
+
+        qualified_name->database = current_database_name;
+        res = current_database_name + '.' + name;
+    }
 
     auto [db, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable(
-        {maybe_database_name, maybe_table_name},
+        {qualified_name->database, qualified_name->table},
         const_pointer_cast<Context>(getContext()));
 
     if (!db)
-        return name;
+        return res;
     assert(table);
 
     if (db->getUUID() == UUIDHelpers::Nil)
-        return name;
+        return res;
     if (table->getName() != "Dictionary")
-        return name;
+        return res;
 
     return toString(table->getStorageID().uuid);
 }
diff --git a/src/Interpreters/ExternalDictionariesLoader.h b/src/Interpreters/ExternalDictionariesLoader.h
index 06f64ef30c5..f748d75d908 100644
--- a/src/Interpreters/ExternalDictionariesLoader.h
+++ b/src/Interpreters/ExternalDictionariesLoader.h
@@ -42,7 +42,7 @@ protected:
     std::string resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const;
 
     /// Try convert qualified dictionary name to persistent UUID
-    std::string resolveDictionaryNameFromDatabaseCatalog(const std::string & name) const;
+    std::string resolveDictionaryNameFromDatabaseCatalog(const std::string & name, const std::string & current_database_name) const;
 
     friend class StorageSystemDictionaries;
     friend class DatabaseDictionary;
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index eb7824a1124..09d0ea3a4b7 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -1198,8 +1198,8 @@ class ExternalLoader::PeriodicUpdater : private boost::noncopyable
 public:
     static constexpr UInt64 check_period_sec = 5;
 
-    PeriodicUpdater(LoadablesConfigReader & config_files_reader_, LoadingDispatcher & loading_dispatcher_)
-        : config_files_reader(config_files_reader_), loading_dispatcher(loading_dispatcher_)
+    PeriodicUpdater(LoadablesConfigReader & config_files_reader_, LoadingDispatcher & loading_dispatcher_, std::recursive_mutex & config_mutex_)
+        : config_files_reader(config_files_reader_), loading_dispatcher(loading_dispatcher_), config_mutex(config_mutex_)
     {
     }
 
@@ -1242,8 +1242,11 @@ private:
         while (!event.wait_for(lock, std::chrono::seconds(check_period_sec), pred))
         {
             lock.unlock();
-            loading_dispatcher.setConfiguration(config_files_reader.read());
-            loading_dispatcher.reloadOutdated();
+            {
+                std::lock_guard config_lock{config_mutex};
+                loading_dispatcher.setConfiguration(config_files_reader.read());
+                loading_dispatcher.reloadOutdated();
+            }
             lock.lock();
         }
     }
@@ -1251,6 +1254,7 @@ private:
     LoadablesConfigReader & config_files_reader;
     LoadingDispatcher & loading_dispatcher;
 
+    std::recursive_mutex & config_mutex;
     mutable std::mutex mutex;
     bool enabled = false;
     ThreadFromGlobalPool thread;
@@ -1264,7 +1268,7 @@ ExternalLoader::ExternalLoader(const String & type_name_, Poco::Logger * log_)
           [this](auto && a, auto && b, auto && c) { return createObject(a, b, c); },
           type_name_,
           log_))
-    , periodic_updater(std::make_unique<PeriodicUpdater>(*config_files_reader, *loading_dispatcher))
+    , periodic_updater(std::make_unique<PeriodicUpdater>(*config_files_reader, *loading_dispatcher, config_mutex))
     , type_name(type_name_)
     , log(log_)
 {
@@ -1276,11 +1280,13 @@ scope_guard ExternalLoader::addConfigRepository(std::unique_ptr<IExternalLoaderC
 {
     auto * ptr = repository.get();
     String name = ptr->getName();
+    std::lock_guard lock{config_mutex};
     config_files_reader->addConfigRepository(std::move(repository));
     reloadConfig(name);
 
     return [this, ptr, name]()
     {
+        std::lock_guard config_lock{config_mutex};
         config_files_reader->removeConfigRepository(ptr);
         reloadConfig(name);
     };
@@ -1379,7 +1385,10 @@ ReturnType ExternalLoader::load(const FilterByNameFunction & filter) const
 template <typename ReturnType, typename>
 ReturnType ExternalLoader::loadOrReload(const String & name) const
 {
-    loading_dispatcher->setConfiguration(config_files_reader->read());
+    {
+        std::lock_guard lock{config_mutex};
+        loading_dispatcher->setConfiguration(config_files_reader->read());
+    }
     auto result = loading_dispatcher->tryLoadOrReload<LoadResult>(name, WAIT);
     checkLoaded(result, true);
     return convertTo<ReturnType>(result);
@@ -1388,7 +1397,10 @@ ReturnType ExternalLoader::loadOrReload(const String & name) const
 template <typename ReturnType, typename>
 ReturnType ExternalLoader::loadOrReload(const FilterByNameFunction & filter) const
 {
-    loading_dispatcher->setConfiguration(config_files_reader->read());
+    {
+        std::lock_guard lock{config_mutex};
+        loading_dispatcher->setConfiguration(config_files_reader->read());
+    }
     auto results = loading_dispatcher->tryLoadOrReload<LoadResults>(filter, WAIT);
     checkLoaded(results, true);
     return convertTo<ReturnType>(results);
@@ -1476,16 +1488,19 @@ void ExternalLoader::checkLoaded(const ExternalLoader::LoadResults & results,
 
 void ExternalLoader::reloadConfig() const
 {
+    std::lock_guard lock{config_mutex};
     loading_dispatcher->setConfiguration(config_files_reader->read());
 }
 
 void ExternalLoader::reloadConfig(const String & repository_name) const
 {
+    std::lock_guard lock{config_mutex};
     loading_dispatcher->setConfiguration(config_files_reader->read(repository_name));
 }
 
 void ExternalLoader::reloadConfig(const String & repository_name, const String & path) const
 {
+    std::lock_guard lock{config_mutex};
     loading_dispatcher->setConfiguration(config_files_reader->read(repository_name, path));
 }
 
diff --git a/src/Interpreters/ExternalLoader.h b/src/Interpreters/ExternalLoader.h
index 2ea79d3aade..1fa11807eba 100644
--- a/src/Interpreters/ExternalLoader.h
+++ b/src/Interpreters/ExternalLoader.h
@@ -219,6 +219,14 @@ private:
 
     LoadablePtr createObject(const String & name, const ObjectConfig & config, const LoadablePtr & previous_version) const;
 
+    /// We have to read configuration from LoadablesConfigReader and load configuration using LoadingDispatcher atomically.
+    /// Otherwise we can read configuration in one thread, then read and load newer configuration in another thread,
+    /// and then load outdated configuration from the first thread.
+    /// Remarkably, each class (LoadablesConfigReader, LoadingDispatcher, PeriodicUpdater) has own mutex for own purposes,
+    /// but it does not save from complex logical race conditions.
+    /// TODO Refactor dictionaries loading and get rid of this.
+    mutable std::recursive_mutex config_mutex;
+
     class LoadablesConfigReader;
     std::unique_ptr<LoadablesConfigReader> config_files_reader;
 
diff --git a/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.cpp b/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.cpp
new file mode 100644
index 00000000000..0b1c30f2b14
--- /dev/null
+++ b/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.cpp
@@ -0,0 +1,123 @@
+#include "ExternalUserDefinedExecutableFunctionsLoader.h"
+
+#include <DataTypes/DataTypeFactory.h>
+
+#include <Interpreters/UserDefinedExecutableFunction.h>
+#include <Interpreters/UserDefinedExecutableFunctionFactory.h>
+#include <Functions/FunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int FUNCTION_ALREADY_EXISTS;
+}
+
+ExternalUserDefinedExecutableFunctionsLoader::ExternalUserDefinedExecutableFunctionsLoader(ContextPtr global_context_)
+    : ExternalLoader("external user defined function", &Poco::Logger::get("ExternalUserDefinedExecutableFunctionsLoader"))
+    , WithContext(global_context_)
+{
+    setConfigSettings({"function", "name", "database", "uuid"});
+    enableAsyncLoading(false);
+    enablePeriodicUpdates(true);
+}
+
+ExternalUserDefinedExecutableFunctionsLoader::UserDefinedExecutableFunctionPtr ExternalUserDefinedExecutableFunctionsLoader::getUserDefinedFunction(const std::string & user_defined_function_name) const
+{
+    return std::static_pointer_cast<const UserDefinedExecutableFunction>(load(user_defined_function_name));
+}
+
+ExternalUserDefinedExecutableFunctionsLoader::UserDefinedExecutableFunctionPtr ExternalUserDefinedExecutableFunctionsLoader::tryGetUserDefinedFunction(const std::string & user_defined_function_name) const
+{
+    return std::static_pointer_cast<const UserDefinedExecutableFunction>(tryLoad(user_defined_function_name));
+}
+
+void ExternalUserDefinedExecutableFunctionsLoader::reloadFunction(const std::string & user_defined_function_name) const
+{
+    loadOrReload(user_defined_function_name);
+}
+
+ExternalLoader::LoadablePtr ExternalUserDefinedExecutableFunctionsLoader::create(const std::string & name,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & key_in_config,
+    const std::string &) const
+{
+    if (FunctionFactory::instance().hasNameOrAlias(name))
+        throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "The function '{}' already exists", name);
+
+    if (AggregateFunctionFactory::instance().hasNameOrAlias(name))
+        throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "The aggregate function '{}' already exists", name);
+
+    String type = config.getString(key_in_config + ".type");
+    UserDefinedExecutableFunctionType function_type;
+
+    if (type == "executable")
+        function_type = UserDefinedExecutableFunctionType::executable;
+    else if (type == "executable_pool")
+        function_type = UserDefinedExecutableFunctionType::executable_pool;
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Wrong user defined function type expected 'executable' or 'executable_pool' actual {}",
+            function_type);
+
+    String command = config.getString(key_in_config + ".command");
+    String format = config.getString(key_in_config + ".format");
+    DataTypePtr result_type = DataTypeFactory::instance().get(config.getString(key_in_config + ".return_type"));
+    bool send_chunk_header = config.getBool(key_in_config + ".send_chunk_header", false);
+
+    size_t pool_size = 0;
+    size_t command_termination_timeout = 0;
+    size_t max_command_execution_time = 0;
+    if (function_type == UserDefinedExecutableFunctionType::executable_pool)
+    {
+        pool_size = config.getUInt64(key_in_config + ".pool_size", 16);
+        command_termination_timeout = config.getUInt64(key_in_config + ".command_termination_timeout", 10);
+        max_command_execution_time = config.getUInt64(key_in_config + ".max_command_execution_time", 10);
+
+        size_t max_execution_time_seconds = static_cast<size_t>(getContext()->getSettings().max_execution_time.totalSeconds());
+        if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
+            max_command_execution_time = max_execution_time_seconds;
+    }
+
+    ExternalLoadableLifetime lifetime;
+
+    if (config.has(key_in_config + ".lifetime"))
+        lifetime = ExternalLoadableLifetime(config, key_in_config + ".lifetime");
+
+    std::vector<DataTypePtr> argument_types;
+
+    Poco::Util::AbstractConfiguration::Keys config_elems;
+    config.keys(key_in_config, config_elems);
+
+    for (const auto & config_elem : config_elems)
+    {
+        if (!startsWith(config_elem, "argument"))
+            continue;
+
+        const auto argument_prefix = key_in_config + '.' + config_elem + '.';
+        auto argument_type = DataTypeFactory::instance().get(config.getString(argument_prefix + "type"));
+        argument_types.emplace_back(std::move(argument_type));
+    }
+
+    UserDefinedExecutableFunctionConfiguration function_configuration
+    {
+        .type = function_type,
+        .name = std::move(name),
+        .script_path = std::move(command),
+        .format = std::move(format),
+        .argument_types = std::move(argument_types),
+        .result_type = std::move(result_type),
+        .pool_size = pool_size,
+        .command_termination_timeout = command_termination_timeout,
+        .max_command_execution_time = max_command_execution_time,
+        .send_chunk_header = send_chunk_header
+    };
+
+    return std::make_shared<UserDefinedExecutableFunction>(function_configuration, lifetime);
+}
+
+}
diff --git a/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h b/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h
new file mode 100644
index 00000000000..4d4843e8677
--- /dev/null
+++ b/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <memory>
+
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/ExternalLoader.h>
+#include <Interpreters/UserDefinedExecutableFunction.h>
+
+namespace DB
+{
+
+class IExternalLoaderConfigRepository;
+
+/// Manages external user-defined functions.
+class ExternalUserDefinedExecutableFunctionsLoader : public ExternalLoader, WithContext
+{
+public:
+
+    using UserDefinedExecutableFunctionPtr = std::shared_ptr<const UserDefinedExecutableFunction>;
+
+    /// External user-defined functions will be loaded immediately and then will be updated in separate thread, each 'reload_period' seconds.
+    explicit ExternalUserDefinedExecutableFunctionsLoader(ContextPtr global_context_);
+
+    UserDefinedExecutableFunctionPtr getUserDefinedFunction(const std::string & user_defined_function_name) const;
+
+    UserDefinedExecutableFunctionPtr tryGetUserDefinedFunction(const std::string & user_defined_function_name) const;
+
+    void reloadFunction(const std::string & user_defined_function_name) const;
+
+protected:
+    LoadablePtr create(const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & key_in_config,
+        const std::string & repository_name) const override;
+
+};
+
+}
diff --git a/src/Interpreters/FillingRow.h b/src/Interpreters/FillingRow.h
index 434a9270718..604f4b1ee74 100644
--- a/src/Interpreters/FillingRow.h
+++ b/src/Interpreters/FillingRow.h
@@ -24,14 +24,14 @@ public:
 
     void initFromDefaults(size_t from_pos = 0);
 
-    Field & operator[](size_t ind) { return row[ind]; }
-    const Field & operator[](size_t ind) const { return row[ind]; }
+    Field & operator[](size_t index) { return row[index]; }
+    const Field & operator[](size_t index) const { return row[index]; }
     size_t size() const { return row.size(); }
     bool operator<(const FillingRow & other) const;
     bool operator==(const FillingRow & other) const;
 
-    int getDirection(size_t ind) const { return description[ind].direction; }
-    FillColumnDescription & getFillDescription(size_t ind) { return description[ind].fill_description; }
+    int getDirection(size_t index) const { return description[index].direction; }
+    FillColumnDescription & getFillDescription(size_t index) { return description[index].fill_description; }
 
 private:
     Row row;
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.cpp b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
new file mode 100644
index 00000000000..ec3866ba0c0
--- /dev/null
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
@@ -0,0 +1,85 @@
+#include <string>
+#include <Interpreters/GatherFunctionQuantileVisitor.h>
+#include <Common/Exception.h>
+#include <common/types.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+/// Mapping from quantile functions for single value to plural
+static const std::unordered_map<String, String> quantile_fuse_name_mapping = {
+    {NameQuantile::name, NameQuantiles::name},
+    {NameQuantileBFloat16::name, NameQuantilesBFloat16::name},
+    {NameQuantileBFloat16Weighted::name, NameQuantilesBFloat16Weighted::name},
+    {NameQuantileDeterministic::name, NameQuantilesDeterministic::name},
+    {NameQuantileExact::name, NameQuantilesExact::name},
+    {NameQuantileExactExclusive::name, NameQuantilesExactExclusive::name},
+    {NameQuantileExactHigh::name, NameQuantilesExactHigh::name},
+    {NameQuantileExactInclusive::name, NameQuantilesExactInclusive::name},
+    {NameQuantileExactLow::name, NameQuantilesExactLow::name},
+    {NameQuantileExactWeighted::name, NameQuantilesExactWeighted::name},
+    {NameQuantileTDigest::name, NameQuantilesTDigest::name},
+    {NameQuantileTDigestWeighted::name, NameQuantilesTDigestWeighted::name},
+    {NameQuantileTiming::name, NameQuantilesTiming::name},
+    {NameQuantileTimingWeighted::name, NameQuantilesTimingWeighted::name},
+};
+
+String GatherFunctionQuantileData::getFusedName(const String & func_name)
+{
+    if (auto it = quantile_fuse_name_mapping.find(func_name); it != quantile_fuse_name_mapping.end())
+        return it->second;
+    throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Function '{}' is not quantile-family or cannot be fused", func_name);
+}
+
+void GatherFunctionQuantileData::visit(ASTFunction & function, ASTPtr & ast)
+{
+    if (!quantile_fuse_name_mapping.contains(function.name))
+        return;
+
+    fuse_quantile[function.name].addFuncNode(ast);
+}
+
+void GatherFunctionQuantileData::FuseQuantileAggregatesData::addFuncNode(ASTPtr & ast)
+{
+    const auto * func = ast->as<ASTFunction>();
+    if (!func)
+        return;
+
+    const auto & arguments = func->arguments->children;
+
+    bool need_two_args = func->name == NameQuantileDeterministic::name
+                         || func->name == NameQuantileExactWeighted::name
+                         || func->name == NameQuantileTimingWeighted::name
+                         || func->name == NameQuantileTDigestWeighted::name
+                         || func->name == NameQuantileBFloat16Weighted::name;
+    if (arguments.size() != (need_two_args ? 2 : 1))
+        return;
+
+    if (arguments[0]->getColumnName().find(',') != std::string::npos)
+        return;
+    String arg_name = arguments[0]->getColumnName();
+    if (need_two_args)
+    {
+        if (arguments[1]->getColumnName().find(',') != std::string::npos)
+            return;
+        arg_name += "," + arguments[1]->getColumnName();
+    }
+
+    arg_map_function[arg_name].push_back(&ast);
+}
+
+bool GatherFunctionQuantileData::needChild(const ASTPtr & node, const ASTPtr &)
+{
+    /// Skip children of quantile* functions to escape cycles in further processing
+    if (const auto * func = node ? node->as<ASTFunction>() : nullptr)
+        return !quantile_fuse_name_mapping.contains(func->name);
+    return true;
+}
+
+}
+
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.h b/src/Interpreters/GatherFunctionQuantileVisitor.h
new file mode 100644
index 00000000000..19f092720af
--- /dev/null
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/IAST.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <AggregateFunctions/AggregateFunctionQuantile.h>
+
+namespace DB
+{
+
+/// Gather all the `quantile*` functions
+class GatherFunctionQuantileData
+{
+public:
+    struct FuseQuantileAggregatesData
+    {
+        std::unordered_map<String, std::vector<ASTPtr *>> arg_map_function;
+
+        void addFuncNode(ASTPtr & ast);
+    };
+
+    using TypeToVisit = ASTFunction;
+
+    std::unordered_map<String, FuseQuantileAggregatesData> fuse_quantile;
+
+    void visit(ASTFunction & function, ASTPtr & ast);
+
+    static String getFusedName(const String & func_name);
+
+    static bool needChild(const ASTPtr & node, const ASTPtr &);
+};
+
+using GatherFunctionQuantileVisitor = InDepthNodeVisitor<OneTypeMatcher<GatherFunctionQuantileData, GatherFunctionQuantileData::needChild>, true>;
+
+}
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 6a87527dc9c..99197e81f80 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -164,7 +164,7 @@ public:
                     return table_out;
                 });
                 auto executor = io.pipeline.execute();
-                executor->execute(io.pipeline.getNumStreams());
+                executor->execute(io.pipeline.getNumThreads());
             }
             else
             {
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 46f8c9aac79..9d1480c2030 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -211,7 +211,7 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
     if (nullable_right_side)
         JoinCommon::convertColumnsToNullable(sample_block_with_columns_to_add);
 
-    if (table_join->dictionary_reader)
+    if (table_join->getDictionaryReader())
     {
         LOG_DEBUG(log, "Performing join over dict");
         data->type = Type::DICT;
@@ -331,7 +331,8 @@ public:
 
     KeyGetterForDict(const TableJoin & table_join, const ColumnRawPtrs & key_columns)
     {
-        table_join.dictionary_reader->readKeys(*key_columns[0], read_result, found, positions);
+        assert(table_join.getDictionaryReader());
+        table_join.getDictionaryReader()->readKeys(*key_columns[0], read_result, found, positions);
 
         for (ColumnWithTypeAndName & column : read_result)
             if (table_join.rightBecomeNullable(column.type))
@@ -1094,7 +1095,7 @@ IColumn::Filter dictionaryJoinRightColumns(const TableJoin & table_join, AddedCo
                 std::move(key_getter), nullptr, added_columns, null_map, flags);
     }
 
-    throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", STRICTNESS, KIND);
 }
 
 } /// nameless
@@ -1386,6 +1387,11 @@ ColumnWithTypeAndName HashJoin::joinGet(const Block & block, const Block & block
     return keys.getByPosition(keys.columns() - 1);
 }
 
+void HashJoin::checkTypesOfKeys(const Block & block) const
+{
+    JoinCommon::checkTypesOfKeys(block, table_join->keyNamesLeft(), right_table_keys, key_names_right);
+}
+
 void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
 {
     const Names & key_names_left = table_join->keyNamesLeft();
@@ -1413,13 +1419,13 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
                     joinBlockImpl<Kind::Left, Strictness::Anti>(block, key_names_left, sample_block_with_columns_to_add, map);
                     break;
                 default:
-                    throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: dictionary + {} {}", strictness, kind);
             }
         }
         else if (kind == Kind::Inner && strictness == Strictness::All)
             joinBlockImpl<Kind::Left, Strictness::Semi>(block, key_names_left, sample_block_with_columns_to_add, map);
         else
-            throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: dictionary + {} {}", strictness, kind);
     }
     else if (joinDispatch(kind, strictness, data->maps, [&](auto kind_, auto strictness_, auto & map)
         {
@@ -1431,7 +1437,7 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
     else if (kind == ASTTableJoin::Kind::Cross)
         joinBlockImplCross(block, not_processed);
     else
-        throw Exception("Logical error: unknown combination of JOIN", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", strictness, kind);
 }
 
 template <typename Mapped>
@@ -1493,7 +1499,7 @@ public:
         };
 
         if (!joinDispatch(parent.kind, parent.strictness, parent.data->maps, fill_callback))
-            throw Exception("Logical error: unknown JOIN strictness (must be on of: ANY, ALL, ASOF)", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown JOIN strictness '{}' (must be on of: ANY, ALL, ASOF)", parent.strictness);
 
         fillNullsFromBlocks(columns_right, rows_added);
         return rows_added;
diff --git a/src/Interpreters/HashJoin.h b/src/Interpreters/HashJoin.h
index 2e691f189c4..a36393278ff 100644
--- a/src/Interpreters/HashJoin.h
+++ b/src/Interpreters/HashJoin.h
@@ -140,6 +140,8 @@ public:
       */
     bool addJoinedBlock(const Block & block, bool check_limits) override;
 
+    void checkTypesOfKeys(const Block & block) const override;
+
     /** Join data from the map (that was previously built by calls to addJoinedBlock) to the block with data from "left" table.
       * Could be called from different threads in parallel.
       */
diff --git a/src/Interpreters/IJoin.h b/src/Interpreters/IJoin.h
index 2215402e1d4..c48524e2031 100644
--- a/src/Interpreters/IJoin.h
+++ b/src/Interpreters/IJoin.h
@@ -27,6 +27,8 @@ public:
     /// @returns false, if some limit was exceeded and you should not insert more data.
     virtual bool addJoinedBlock(const Block & block, bool check_limits = true) = 0;
 
+    virtual void checkTypesOfKeys(const Block & block) const = 0;
+
     /// Join the block with data from left hand of JOIN to the right hand data (that was previously built by calls to addJoinedBlock).
     /// Could be called from different threads in parallel.
     virtual void joinBlock(Block & block, std::shared_ptr<ExtraBlock> & not_processed) = 0;
diff --git a/src/Interpreters/InDepthNodeVisitor.h b/src/Interpreters/InDepthNodeVisitor.h
index 90235de34b0..b7353f2c243 100644
--- a/src/Interpreters/InDepthNodeVisitor.h
+++ b/src/Interpreters/InDepthNodeVisitor.h
@@ -10,7 +10,7 @@ namespace DB
 
 /// Visits AST tree in depth, call functions for nodes according to Matcher type data.
 /// You need to define Data, visit() and needChildVisit() in Matcher class.
-template <typename Matcher, bool _top_to_bottom, typename T = ASTPtr>
+template <typename Matcher, bool _top_to_bottom, bool need_child_accept_data = false, typename T = ASTPtr>
 class InDepthNodeVisitor
 {
 public:
@@ -51,13 +51,21 @@ private:
     void visitChildren(T & ast)
     {
         for (auto & child : ast->children)
-            if (Matcher::needChildVisit(ast, child))
+        {
+            bool need_visit_child = false;
+            if constexpr (need_child_accept_data)
+                need_visit_child = Matcher::needChildVisit(ast, child, data);
+            else
+                need_visit_child = Matcher::needChildVisit(ast, child);
+
+            if (need_visit_child)
                 visit(child);
+        }
     }
 };
 
-template <typename Matcher, bool top_to_bottom>
-using ConstInDepthNodeVisitor = InDepthNodeVisitor<Matcher, top_to_bottom, const ASTPtr>;
+template <typename Matcher, bool top_to_bottom, bool need_child_accept_data = false>
+using ConstInDepthNodeVisitor = InDepthNodeVisitor<Matcher, top_to_bottom, need_child_accept_data, const ASTPtr>;
 
 struct NeedChild
 {
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index c10f4d33f6d..6595e1c02be 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -40,12 +40,23 @@ InterpreterAlterQuery::InterpreterAlterQuery(const ASTPtr & query_ptr_, ContextP
 {
 }
 
+
 BlockIO InterpreterAlterQuery::execute()
 {
-    BlockIO res;
     const auto & alter = query_ptr->as<ASTAlterQuery &>();
+    if (alter.alter_object == ASTAlterQuery::AlterObjectType::DATABASE)
+        return executeToDatabase(alter);
+    else if (alter.alter_object == ASTAlterQuery::AlterObjectType::TABLE
+            || alter.alter_object == ASTAlterQuery::AlterObjectType::LIVE_VIEW)
+        return executeToTable(alter);
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown alter object type");
+}
 
 
+BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
+{
+    BlockIO res;
+
     if (!alter.cluster.empty())
         return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
 
@@ -63,7 +74,7 @@ BlockIO InterpreterAlterQuery::execute()
     }
 
     StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
-    if (table->isReadOnly())
+    if (table->isStaticStorage())
         throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
     auto alter_lock = table->lockForAlter(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
@@ -81,7 +92,9 @@ BlockIO InterpreterAlterQuery::execute()
     {
         auto * command_ast = child->as<ASTAlterCommand>();
         if (auto alter_command = AlterCommand::parse(command_ast))
+        {
             alter_commands.emplace_back(std::move(*alter_command));
+        }
         else if (auto partition_command = PartitionCommand::parse(command_ast))
         {
             partition_commands.emplace_back(std::move(*partition_command));
@@ -95,7 +108,9 @@ BlockIO InterpreterAlterQuery::execute()
             mutation_commands.emplace_back(std::move(*mut_command));
         }
         else if (auto live_view_command = LiveViewCommand::parse(command_ast))
+        {
             live_view_commands.emplace_back(std::move(*live_view_command));
+        }
         else
             throw Exception("Wrong parameter type in ALTER query", ErrorCodes::LOGICAL_ERROR);
     }
@@ -152,6 +167,45 @@ BlockIO InterpreterAlterQuery::execute()
 }
 
 
+BlockIO InterpreterAlterQuery::executeToDatabase(const ASTAlterQuery & alter)
+{
+    BlockIO res;
+    getContext()->checkAccess(getRequiredAccess());
+    DatabasePtr database = DatabaseCatalog::instance().getDatabase(alter.database);
+    AlterCommands alter_commands;
+
+    for (const auto & child : alter.command_list->children)
+    {
+        auto * command_ast = child->as<ASTAlterCommand>();
+        if (auto alter_command = AlterCommand::parse(command_ast))
+            alter_commands.emplace_back(std::move(*alter_command));
+        else
+            throw Exception("Wrong parameter type in ALTER DATABASE query", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    if (!alter_commands.empty())
+    {
+        /// Only ALTER SETTING is supported.
+        for (const auto & command : alter_commands)
+        {
+            if (command.type != AlterCommand::MODIFY_DATABASE_SETTING)
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unsupported alter type for database engines");
+        }
+
+        for (const auto & command : alter_commands)
+        {
+            if (!command.ignore)
+            {
+                if (command.type == AlterCommand::MODIFY_DATABASE_SETTING)
+                    database->applySettingsChanges(command.settings_changes, getContext());
+                else
+                    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unsupported alter command");
+            }
+        }
+    }
+
+    return res;
+}
 AccessRightsElements InterpreterAlterQuery::getRequiredAccess() const
 {
     AccessRightsElements required_access;
@@ -351,6 +405,11 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::ALTER_RENAME_COLUMN, database, table, column_name());
             break;
         }
+        case ASTAlterCommand::MODIFY_DATABASE_SETTING:
+        {
+            required_access.emplace_back(AccessType::ALTER_DATABASE_SETTINGS, database, table);
+            break;
+        }
         case ASTAlterCommand::NO_TYPE: break;
     }
 
@@ -362,7 +421,7 @@ void InterpreterAlterQuery::extendQueryLogElemImpl(QueryLogElement & elem, const
     const auto & alter = ast->as<const ASTAlterQuery &>();
 
     elem.query_kind = "Alter";
-    if (alter.command_list != nullptr)
+    if (alter.command_list != nullptr && alter.alter_object != ASTAlterQuery::AlterObjectType::DATABASE)
     {
         // Alter queries already have their target table inserted into `elem`.
         if (elem.query_tables.size() != 1)
diff --git a/src/Interpreters/InterpreterAlterQuery.h b/src/Interpreters/InterpreterAlterQuery.h
index ae9750b0b62..9494a400e7b 100644
--- a/src/Interpreters/InterpreterAlterQuery.h
+++ b/src/Interpreters/InterpreterAlterQuery.h
@@ -9,6 +9,7 @@ namespace DB
 
 class AccessRightsElements;
 class ASTAlterCommand;
+class ASTAlterQuery;
 
 
 /** Allows you add or remove a column in the table.
@@ -28,6 +29,10 @@ public:
 private:
     AccessRightsElements getRequiredAccess() const;
 
+    BlockIO executeToTable(const ASTAlterQuery & alter);
+
+    BlockIO executeToDatabase(const ASTAlterQuery & alter);
+
     ASTPtr query_ptr;
 };
 
diff --git a/src/Interpreters/InterpreterCreateFunctionQuery.cpp b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
index 01fc60060b3..74d8c9cf980 100644
--- a/src/Interpreters/InterpreterCreateFunctionQuery.cpp
+++ b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
@@ -6,8 +6,8 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/InterpreterCreateFunctionQuery.h>
 #include <Interpreters/FunctionNameNormalizer.h>
-#include <Interpreters/UserDefinedObjectsLoader.h>
-#include <Interpreters/UserDefinedFunctionFactory.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
 
 
 namespace DB
@@ -34,17 +34,17 @@ BlockIO InterpreterCreateFunctionQuery::execute()
     auto & function_name = create_function_query->function_name;
     validateFunction(create_function_query->function_core, function_name);
 
-    UserDefinedFunctionFactory::instance().registerFunction(function_name, query_ptr);
+    UserDefinedSQLFunctionFactory::instance().registerFunction(function_name, query_ptr);
 
     if (!is_internal)
     {
         try
         {
-            UserDefinedObjectsLoader::instance().storeObject(current_context, UserDefinedObjectType::Function, function_name, *query_ptr);
+            UserDefinedSQLObjectsLoader::instance().storeObject(current_context, UserDefinedSQLObjectType::Function, function_name, *query_ptr);
         }
         catch (Exception & exception)
         {
-            UserDefinedFunctionFactory::instance().unregisterFunction(function_name);
+            UserDefinedSQLFunctionFactory::instance().unregisterFunction(function_name);
             exception.addMessage(fmt::format("while storing user defined function {} on disk", backQuote(function_name)));
             throw;
         }
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 7e061662534..adac31e08e2 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -53,6 +53,7 @@
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/IDatabase.h>
 #include <Databases/DatabaseOnDisk.h>
+#include <Databases/TablesLoader.h>
 
 #include <Compression/CompressionFactory.h>
 
@@ -153,7 +154,9 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         throw Exception(ErrorCodes::UNKNOWN_DATABASE_ENGINE, "Unknown database engine: {}", serializeAST(*create.storage));
     }
 
-    if (create.storage->engine->name == "Atomic" || create.storage->engine->name == "Replicated" || create.storage->engine->name == "MaterializedPostgreSQL")
+    if (create.storage->engine->name == "Atomic"
+        || create.storage->engine->name == "Replicated"
+        || create.storage->engine->name == "MaterializedPostgreSQL")
     {
         if (create.attach && create.uuid == UUIDHelpers::Nil)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "UUID must be specified for ATTACH. "
@@ -166,7 +169,8 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         if (!create.attach && fs::exists(metadata_path))
             throw Exception(ErrorCodes::DATABASE_ALREADY_EXISTS, "Metadata directory {} already exists", metadata_path.string());
     }
-    else if (create.storage->engine->name == "MaterializeMySQL" || create.storage->engine->name == "MaterializedMySQL")
+    else if (create.storage->engine->name == "MaterializeMySQL"
+        || create.storage->engine->name == "MaterializedMySQL")
     {
         /// It creates nested database with Ordinary or Atomic engine depending on UUID in query and default engine setting.
         /// Do nothing if it's an internal ATTACH on server startup or short-syntax ATTACH query from user,
@@ -214,13 +218,17 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
                         "Enable allow_experimental_database_materialized_mysql to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
     }
 
-    if (create.storage->engine->name == "Replicated" && !getContext()->getSettingsRef().allow_experimental_database_replicated && !internal)
+    if (create.storage->engine->name == "Replicated"
+        && !getContext()->getSettingsRef().allow_experimental_database_replicated
+        && !internal)
     {
         throw Exception("Replicated is an experimental database engine. "
                         "Enable allow_experimental_database_replicated to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
     }
 
-    if (create.storage->engine->name == "MaterializedPostgreSQL" && !getContext()->getSettingsRef().allow_experimental_database_materialized_postgresql && !internal)
+    if (create.storage->engine->name == "MaterializedPostgreSQL"
+        && !getContext()->getSettingsRef().allow_experimental_database_materialized_postgresql
+        && !internal)
     {
         throw Exception("MaterializedPostgreSQL is an experimental database engine. "
                         "Enable allow_experimental_database_materialized_postgresql to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
@@ -271,9 +279,13 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
             renamed = true;
         }
 
-        /// We use global context here, because storages lifetime is bigger than query context lifetime
-        database->loadStoredObjects(
-            getContext()->getGlobalContext(), has_force_restore_data_flag, create.attach && force_attach, skip_startup_tables); //-V560
+        if (!load_database_without_tables)
+        {
+            /// We use global context here, because storages lifetime is bigger than query context lifetime
+            TablesLoader loader{getContext()->getGlobalContext(), {{database_name, database}}, has_force_restore_data_flag, create.attach && force_attach}; //-V560
+            loader.loadTables();
+            loader.startupTables();
+        }
     }
     catch (...)
     {
@@ -619,7 +631,6 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTableProperti
     else
         throw Exception("Incorrect CREATE query: required list of column descriptions or AS section or SELECT.", ErrorCodes::INCORRECT_QUERY);
 
-
     /// Even if query has list of columns, canonicalize it (unfold Nested columns).
     if (!create.columns_list)
         create.set(create.columns_list, std::make_shared<ASTColumns>());
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index 1ef5e0470fc..89d27a30555 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -52,9 +52,9 @@ public:
         force_attach = force_attach_;
     }
 
-    void setSkipStartupTables(bool skip_startup_tables_)
+    void setLoadDatabaseWithoutTables(bool load_database_without_tables_)
     {
-        skip_startup_tables = skip_startup_tables_;
+        load_database_without_tables = load_database_without_tables_;
     }
 
     /// Obtain information about columns, their types, default values and column comments,
@@ -99,7 +99,7 @@ private:
     /// Is this an internal query - not from the user.
     bool internal = false;
     bool force_attach = false;
-    bool skip_startup_tables = false;
+    bool load_database_without_tables = false;
 
     mutable String as_database_saved;
     mutable String as_table_saved;
diff --git a/src/Interpreters/InterpreterDescribeQuery.cpp b/src/Interpreters/InterpreterDescribeQuery.cpp
index 705e52da72c..5fd9c2539eb 100644
--- a/src/Interpreters/InterpreterDescribeQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeQuery.cpp
@@ -1,5 +1,4 @@
 #include <Storages/IStorage.h>
-#include <DataStreams/OneBlockInputStream.h>
 #include <DataStreams/BlockIO.h>
 #include <DataTypes/DataTypeString.h>
 #include <Parsers/queryToString.h>
@@ -15,20 +14,14 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
+#include <DataTypes/NestedUtils.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 
 
 namespace DB
 {
 
-BlockIO InterpreterDescribeQuery::execute()
-{
-    BlockIO res;
-    res.in = executeImpl();
-    return res;
-}
-
-
-Block InterpreterDescribeQuery::getSampleBlock()
+Block InterpreterDescribeQuery::getSampleBlock(bool include_subcolumns)
 {
     Block block;
 
@@ -56,11 +49,19 @@ Block InterpreterDescribeQuery::getSampleBlock()
     col.name = "ttl_expression";
     block.insert(col);
 
+    if (include_subcolumns)
+    {
+        col.name = "is_subcolumn";
+        col.type = std::make_shared<DataTypeUInt8>();
+        col.column = col.type->createColumn();
+        block.insert(col);
+    }
+
     return block;
 }
 
 
-BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
+BlockIO InterpreterDescribeQuery::execute()
 {
     ColumnsDescription columns;
 
@@ -87,7 +88,8 @@ BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
         columns = metadata_snapshot->getColumns();
     }
 
-    Block sample_block = getSampleBlock();
+    bool include_subcolumns = getContext()->getSettingsRef().describe_include_subcolumns;
+    Block sample_block = getSampleBlock(include_subcolumns);
     MutableColumns res_columns = sample_block.cloneEmptyColumns();
 
     for (const auto & column : columns)
@@ -117,9 +119,47 @@ BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
             res_columns[6]->insert(queryToString(column.ttl));
         else
             res_columns[6]->insertDefault();
+
+        if (include_subcolumns)
+            res_columns[7]->insertDefault();
     }
 
-    return std::make_shared<OneBlockInputStream>(sample_block.cloneWithColumns(std::move(res_columns)));
+    if (include_subcolumns)
+    {
+        for (const auto & column : columns)
+        {
+            column.type->forEachSubcolumn([&](const auto & name, const auto & type, const auto & path)
+            {
+                res_columns[0]->insert(Nested::concatenateName(column.name, name));
+                res_columns[1]->insert(type->getName());
+
+                /// It's not trivial to calculate default expression for subcolumn.
+                /// So, leave it empty.
+                res_columns[2]->insertDefault();
+                res_columns[3]->insertDefault();
+                res_columns[4]->insert(column.comment);
+
+                if (column.codec && ISerialization::isSpecialCompressionAllowed(path))
+                    res_columns[5]->insert(queryToString(column.codec->as<ASTFunction>()->arguments));
+                else
+                    res_columns[5]->insertDefault();
+
+                if (column.ttl)
+                    res_columns[6]->insert(queryToString(column.ttl));
+                else
+                    res_columns[6]->insertDefault();
+
+                res_columns[7]->insert(1u);
+            });
+        }
+    }
+
+    BlockIO res;
+    size_t num_rows = res_columns[0]->size();
+    auto source = std::make_shared<SourceFromSingleChunk>(sample_block, Chunk(std::move(res_columns), num_rows));
+    res.pipeline.init(Pipe(std::move(source)));
+
+    return res;
 }
 
 }
diff --git a/src/Interpreters/InterpreterDescribeQuery.h b/src/Interpreters/InterpreterDescribeQuery.h
index 627d1ca0353..c0b380d57ab 100644
--- a/src/Interpreters/InterpreterDescribeQuery.h
+++ b/src/Interpreters/InterpreterDescribeQuery.h
@@ -16,12 +16,10 @@ public:
 
     BlockIO execute() override;
 
-    static Block getSampleBlock();
+    static Block getSampleBlock(bool include_subcolumns);
 
 private:
     ASTPtr query_ptr;
-
-    BlockInputStreamPtr executeImpl();
 };
 
 
diff --git a/src/Interpreters/InterpreterDropFunctionQuery.cpp b/src/Interpreters/InterpreterDropFunctionQuery.cpp
index 9f945c11aac..53cb96b42fe 100644
--- a/src/Interpreters/InterpreterDropFunctionQuery.cpp
+++ b/src/Interpreters/InterpreterDropFunctionQuery.cpp
@@ -2,8 +2,8 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/FunctionNameNormalizer.h>
 #include <Interpreters/InterpreterDropFunctionQuery.h>
-#include <Interpreters/UserDefinedObjectsLoader.h>
-#include <Interpreters/UserDefinedFunctionFactory.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
 #include <Parsers/ASTDropFunctionQuery.h>
 
 
@@ -18,8 +18,8 @@ BlockIO InterpreterDropFunctionQuery::execute()
     FunctionNameNormalizer().visit(query_ptr.get());
     auto & drop_function_query = query_ptr->as<ASTDropFunctionQuery &>();
 
-    UserDefinedFunctionFactory::instance().unregisterFunction(drop_function_query.function_name);
-    UserDefinedObjectsLoader::instance().removeObject(current_context, UserDefinedObjectType::Function, drop_function_query.function_name);
+    UserDefinedSQLFunctionFactory::instance().unregisterFunction(drop_function_query.function_name);
+    UserDefinedSQLObjectsLoader::instance().removeObject(current_context, UserDefinedSQLObjectType::Function, drop_function_query.function_name);
 
     return {};
 }
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index 608bd615e6a..509211df3b6 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -163,8 +163,6 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
         if (query.kind == ASTDropQuery::Kind::Detach)
         {
             getContext()->checkAccess(drop_storage, table_id);
-            if (table->isReadOnly())
-                throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
 
             if (table->isDictionary())
             {
@@ -198,7 +196,7 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
                 throw Exception("Cannot TRUNCATE dictionary", ErrorCodes::SYNTAX_ERROR);
 
             getContext()->checkAccess(AccessType::TRUNCATE, table_id);
-            if (table->isReadOnly())
+            if (table->isStaticStorage())
                 throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
 
             table->checkTableCanBeDropped();
@@ -357,6 +355,13 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 }
             }
 
+            if (!drop && query.no_delay)
+            {
+                /// Avoid "some tables are still in use" when sync mode is enabled
+                for (const auto & table_uuid : uuids_to_wait)
+                    database->waitDetachedTableNotInUse(table_uuid);
+            }
+
             /// Protects from concurrent CREATE TABLE queries
             auto db_guard = DatabaseCatalog::instance().getExclusiveDDLGuardForDatabase(database_name);
 
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 37650f5caa7..fc47f42d266 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -223,8 +223,9 @@ ExplainSettings<Settings> checkAndGetSettings(const ASTPtr & ast_settings)
                             "Supported settings: " + settings.getSettingsList(), ErrorCodes::UNKNOWN_SETTING);
 
         if (change.value.getType() != Field::Types::UInt64)
-            throw Exception("Invalid type " + std::string(change.value.getTypeName()) + " for setting \"" + change.name +
-                            "\" only boolean settings are supported", ErrorCodes::INVALID_SETTING_VALUE);
+            throw Exception(ErrorCodes::INVALID_SETTING_VALUE,
+                "Invalid type {} for setting \"{}\" only boolean settings are supported",
+                change.value.getTypeName(), change.name);
 
         auto value = change.value.get<UInt64>();
         if (value > 1)
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 6742b93fc71..3dd42d92e21 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -4,7 +4,7 @@
 #include <DataStreams/AddingDefaultBlockOutputStream.h>
 #include <DataStreams/CheckConstraintsBlockOutputStream.h>
 #include <DataStreams/CountingBlockOutputStream.h>
-#include <Processors/Transforms/getSourceFromFromASTInsertQuery.h>
+#include <Processors/Transforms/getSourceFromASTInsertQuery.h>
 #include <DataStreams/PushingToViewsBlockOutputStream.h>
 #include <DataStreams/SquashingBlockOutputStream.h>
 #include <DataStreams/copyData.h>
@@ -54,7 +54,6 @@ InterpreterInsertQuery::InterpreterInsertQuery(
     checkStackSize();
 }
 
-
 StoragePtr InterpreterInsertQuery::getTable(ASTInsertQuery & query)
 {
     if (query.table_function)
@@ -148,26 +147,19 @@ static bool isTrivialSelect(const ASTPtr & select)
 };
 
 
-BlockIO InterpreterInsertQuery::execute()
+std::pair<BlockIO, BlockOutputStreams> InterpreterInsertQuery::executeImpl(
+    const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot, Block & sample_block)
 {
-    const Settings & settings = getContext()->getSettingsRef();
-    auto & query = query_ptr->as<ASTInsertQuery &>();
+    const auto & settings = getContext()->getSettingsRef();
+    const auto & query = query_ptr->as<const ASTInsertQuery &>();
 
-    BlockIO res;
-
-    StoragePtr table = getTable(query);
     if (query.partition_by && !table->supportsPartitionBy())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "PARTITION BY clause is not supported by storage");
 
-    auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), settings.lock_acquire_timeout);
-    auto metadata_snapshot = table->getInMemoryMetadataPtr();
-
-    auto query_sample_block = getSampleBlock(query, table, metadata_snapshot);
-    if (!query.table_function)
-        getContext()->checkAccess(AccessType::INSERT, query.table_id, query_sample_block.getNames());
+    BlockIO res;
+    BlockOutputStreams out_streams;
 
     bool is_distributed_insert_select = false;
-
     if (query.select && table->isRemote() && settings.parallel_distributed_insert_select)
     {
         // Distributed INSERT SELECT
@@ -178,7 +170,6 @@ BlockIO InterpreterInsertQuery::execute()
         }
     }
 
-    BlockOutputStreams out_streams;
     if (!is_distributed_insert_select || query.watch)
     {
         size_t out_streams_size = 1;
@@ -246,7 +237,7 @@ BlockIO InterpreterInsertQuery::execute()
             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 & query_columns = sample_block.getColumnsWithTypeAndName();
                 const auto & output_columns = metadata_snapshot->getColumns();
 
                 if (input_columns.size() == query_columns.size())
@@ -256,7 +247,7 @@ BlockIO InterpreterInsertQuery::execute()
                         /// 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));
+                            sample_block.setColumn(col_idx, ColumnWithTypeAndName(makeNullable(query_columns[col_idx].column), makeNullable(query_columns[col_idx].type), query_columns[col_idx].name));
                     }
                 }
             }
@@ -291,7 +282,7 @@ BlockIO InterpreterInsertQuery::execute()
             /// Actually we don't know structure of input blocks from query/table,
             /// because some clients break insertion protocol (columns != header)
             out = std::make_shared<AddingDefaultBlockOutputStream>(
-                out, query_sample_block, metadata_snapshot->getColumns(), getContext(), null_as_default);
+                out, 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.
@@ -315,13 +306,35 @@ BlockIO InterpreterInsertQuery::execute()
         }
     }
 
+    return {std::move(res), std::move(out_streams)};
+}
+
+BlockIO InterpreterInsertQuery::execute()
+{
+    const auto & settings = getContext()->getSettingsRef();
+    auto & query = query_ptr->as<ASTInsertQuery &>();
+
+    auto table = getTable(query);
+    auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), settings.lock_acquire_timeout);
+    auto metadata_snapshot = table->getInMemoryMetadataPtr();
+    auto sample_block = getSampleBlock(query, table, metadata_snapshot);
+
+    if (!query.table_function)
+        getContext()->checkAccess(AccessType::INSERT, query.table_id, sample_block.getNames());
+
+    BlockIO res;
+    BlockOutputStreams out_streams;
+    std::tie(res, out_streams) = executeImpl(table, metadata_snapshot, sample_block);
+
     /// What type of query: INSERT or INSERT SELECT or INSERT WATCH?
-    if (is_distributed_insert_select)
+    if (out_streams.empty())
     {
         /// Pipeline was already built.
     }
     else if (query.select || query.watch)
     {
+        /// XXX: is this branch also triggered for select+input() case?
+
         const auto & header = out_streams.at(0)->getHeader();
         auto actions_dag = ActionsDAG::makeConvertingActions(
                 res.pipeline.getHeader().getColumnsWithTypeAndName(),
@@ -352,9 +365,9 @@ BlockIO InterpreterInsertQuery::execute()
                     throw Exception("Cannot insert column " + column.name + ", because it is MATERIALIZED column.", ErrorCodes::ILLEGAL_COLUMN);
         }
     }
-    else if (query.data && !query.has_tail) /// can execute without additional data
+    else if (query.hasInlinedData())
     {
-        auto pipe = getSourceFromFromASTInsertQuery(query_ptr, nullptr, query_sample_block, getContext(), nullptr);
+        auto pipe = getSourceFromASTInsertQuery(query_ptr, true, sample_block, getContext(), nullptr);
         res.pipeline.init(std::move(pipe));
         res.pipeline.resize(1);
         res.pipeline.setSinks([&](const Block &, Pipe::StreamType)
@@ -375,6 +388,28 @@ BlockIO InterpreterInsertQuery::execute()
     return res;
 }
 
+Processors InterpreterInsertQuery::getSinks()
+{
+    const auto & settings = getContext()->getSettingsRef();
+    auto & query = query_ptr->as<ASTInsertQuery &>();
+
+    auto table = getTable(query);
+    auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), settings.lock_acquire_timeout);
+    auto metadata_snapshot = table->getInMemoryMetadataPtr();
+    auto sample_block = getSampleBlock(query, table, metadata_snapshot);
+
+    if (!query.table_function)
+        getContext()->checkAccess(AccessType::INSERT, query.table_id, sample_block.getNames());
+
+    auto out_streams = executeImpl(table, metadata_snapshot, sample_block).second;
+
+    Processors sinks;
+    sinks.reserve(out_streams.size());
+    for (const auto & out : out_streams)
+        sinks.emplace_back(std::make_shared<SinkToOutputStream>(out));
+
+    return sinks;
+}
 
 StorageID InterpreterInsertQuery::getDatabaseTable() const
 {
diff --git a/src/Interpreters/InterpreterInsertQuery.h b/src/Interpreters/InterpreterInsertQuery.h
index 71b8c827702..0ccf931db35 100644
--- a/src/Interpreters/InterpreterInsertQuery.h
+++ b/src/Interpreters/InterpreterInsertQuery.h
@@ -5,10 +5,12 @@
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Storages/StorageInMemoryMetadata.h>
+#include <IO/ReadBuffer.h>
 
 namespace DB
 {
 
+
 /** Interprets the INSERT query.
   */
 class InterpreterInsertQuery : public IInterpreter, WithContext
@@ -28,13 +30,18 @@ public:
       */
     BlockIO execute() override;
 
+    /// Returns only sinks, without input sources.
+    Processors getSinks();
+
     StorageID getDatabaseTable() const;
 
     void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr context_) const override;
+    Block getSampleBlock(const ASTInsertQuery & query, const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot) const;
+    StoragePtr getTable(ASTInsertQuery & query);
 
 private:
-    StoragePtr getTable(ASTInsertQuery & query);
-    Block getSampleBlock(const ASTInsertQuery & query, const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot) const;
+    std::pair<BlockIO, BlockOutputStreams> executeImpl(
+        const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot, Block & sample_block);
 
     ASTPtr query_ptr;
     const bool allow_materialized;
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 6f64c83f8bf..5fe9948f857 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -854,7 +854,7 @@ static std::pair<UInt64, UInt64> getLimitLengthAndOffset(const ASTSelectQuery &
 static UInt64 getLimitForSorting(const ASTSelectQuery & query, ContextPtr context)
 {
     /// Partial sort can be done if there is LIMIT but no DISTINCT or LIMIT BY, neither ARRAY JOIN.
-    if (!query.distinct && !query.limitBy() && !query.limit_with_ties && !query.arrayJoinExpressionList() && query.limitLength())
+    if (!query.distinct && !query.limitBy() && !query.limit_with_ties && !query.arrayJoinExpressionList().first && query.limitLength())
     {
         auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, context);
         if (limit_length > std::numeric_limits<UInt64>::max() - limit_offset)
@@ -1132,8 +1132,6 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             }
 
             /// Optional step to convert key columns to common supertype.
-            /// Columns with changed types will be returned to user,
-            ///  so its only suitable for `USING` join.
             if (expressions.converting_join_columns)
             {
                 QueryPlanStepPtr convert_join_step = std::make_unique<ExpressionStep>(
@@ -1354,17 +1352,15 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             bool apply_prelimit = apply_limit &&
                                   query.limitLength() && !query.limit_with_ties &&
                                   !hasWithTotalsInAnySubqueryInFromClause(query) &&
-                                  !query.arrayJoinExpressionList() &&
+                                  !query.arrayJoinExpressionList().first &&
                                   !query.distinct &&
                                   !expressions.hasLimitBy() &&
                                   !settings.extremes &&
                                   !has_withfill;
             bool apply_offset = options.to_stage != QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit;
-            bool limit_applied = false;
             if (apply_prelimit)
             {
                 executePreLimit(query_plan, /* do_not_skip_offset= */!apply_offset);
-                limit_applied = true;
             }
 
             /** If there was more than one stream,
@@ -1386,7 +1382,6 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             if (query.limit_with_ties && apply_offset)
             {
                 executeLimit(query_plan);
-                limit_applied = true;
             }
 
             /// Projection not be done on the shards, since then initiator will not find column in blocks.
@@ -1400,6 +1395,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             /// Extremes are calculated before LIMIT, but after LIMIT BY. This is Ok.
             executeExtremes(query_plan);
 
+            bool limit_applied = apply_prelimit || (query.limit_with_ties && apply_offset);
             /// Limit is no longer needed if there is prelimit.
             ///
             /// NOTE: that LIMIT cannot be applied if OFFSET should not be applied,
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index d4ac555add0..18d31e2f89c 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -11,6 +11,7 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/ExternalModelsLoader.h>
+#include <Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h>
 #include <Interpreters/EmbeddedDictionaries.h>
 #include <Interpreters/ActionLocksManager.h>
 #include <Interpreters/InterpreterDropQuery.h>
@@ -21,6 +22,7 @@
 #include <Interpreters/PartLog.h>
 #include <Interpreters/QueryThreadLog.h>
 #include <Interpreters/QueryViewsLog.h>
+#include <Interpreters/SessionLog.h>
 #include <Interpreters/TraceLog.h>
 #include <Interpreters/TextLog.h>
 #include <Interpreters/MetricLog.h>
@@ -38,6 +40,7 @@
 #include <Parsers/ASTSystemQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Common/ThreadFuzzer.h>
 #include <csignal>
 #include <algorithm>
 
@@ -295,7 +298,6 @@ BlockIO InterpreterSystemQuery::execute()
             auto & external_dictionaries_loader = system_context->getExternalDictionariesLoader();
             external_dictionaries_loader.reloadDictionary(query.table, getContext());
 
-
             ExternalDictionariesLoader::resetAll();
             break;
         }
@@ -325,6 +327,22 @@ BlockIO InterpreterSystemQuery::execute()
             external_models_loader.reloadAllTriedToLoad();
             break;
         }
+        case Type::RELOAD_FUNCTION:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_FUNCTION);
+
+            auto & external_user_defined_executable_functions_loader = system_context->getExternalUserDefinedExecutableFunctionsLoader();
+            external_user_defined_executable_functions_loader.reloadFunction(query.target_function);
+            break;
+        }
+        case Type::RELOAD_FUNCTIONS:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_FUNCTION);
+
+            auto & external_user_defined_executable_functions_loader = system_context->getExternalUserDefinedExecutableFunctionsLoader();
+            external_user_defined_executable_functions_loader.reloadAllTriedToLoad();
+            break;
+        }
         case Type::RELOAD_EMBEDDED_DICTIONARIES:
             getContext()->checkAccess(AccessType::SYSTEM_RELOAD_EMBEDDED_DICTIONARIES);
             system_context->getEmbeddedDictionaries().reload();
@@ -337,7 +355,7 @@ BlockIO InterpreterSystemQuery::execute()
         {
 #if defined(__ELF__) && !defined(__FreeBSD__)
             getContext()->checkAccess(AccessType::SYSTEM_RELOAD_SYMBOLS);
-            (void)SymbolIndex::instance(true);
+            SymbolIndex::reload();
             break;
 #else
             throw Exception("SYSTEM RELOAD SYMBOLS is not supported on current platform", ErrorCodes::NOT_IMPLEMENTED);
@@ -420,13 +438,20 @@ BlockIO InterpreterSystemQuery::execute()
                 [&] { if (auto asynchronous_metric_log = getContext()->getAsynchronousMetricLog()) asynchronous_metric_log->flush(true); },
                 [&] { if (auto opentelemetry_span_log = getContext()->getOpenTelemetrySpanLog()) opentelemetry_span_log->flush(true); },
                 [&] { if (auto query_views_log = getContext()->getQueryViewsLog()) query_views_log->flush(true); },
-                [&] { if (auto zookeeper_log = getContext()->getZooKeeperLog()) zookeeper_log->flush(true); }
+                [&] { if (auto zookeeper_log = getContext()->getZooKeeperLog()) zookeeper_log->flush(true); },
+                [&] { if (auto session_log = getContext()->getSessionLog()) session_log->flush(true); }
             );
             break;
         }
         case Type::STOP_LISTEN_QUERIES:
         case Type::START_LISTEN_QUERIES:
-            throw Exception(String(ASTSystemQuery::typeToString(query.type)) + " is not supported yet", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not supported yet", query.type);
+        case Type::STOP_THREAD_FUZZER:
+            ThreadFuzzer::stop();
+            break;
+        case Type::START_THREAD_FUZZER:
+            ThreadFuzzer::start();
+            break;
         default:
             throw Exception("Unknown type of SYSTEM query", ErrorCodes::BAD_ARGUMENTS);
     }
@@ -738,6 +763,12 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_MODEL);
             break;
         }
+        case Type::RELOAD_FUNCTION: [[fallthrough]];
+        case Type::RELOAD_FUNCTIONS:
+        {
+            required_access.emplace_back(AccessType::SYSTEM_RELOAD_FUNCTION);
+            break;
+        }
         case Type::RELOAD_CONFIG:
         {
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_CONFIG);
@@ -853,6 +884,8 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
         }
         case Type::STOP_LISTEN_QUERIES: break;
         case Type::START_LISTEN_QUERIES: break;
+        case Type::STOP_THREAD_FUZZER: break;
+        case Type::START_THREAD_FUZZER: break;
         case Type::UNKNOWN: break;
         case Type::END: break;
     }
diff --git a/src/Interpreters/JoinSwitcher.h b/src/Interpreters/JoinSwitcher.h
index e750bc5eed0..83ac70044a8 100644
--- a/src/Interpreters/JoinSwitcher.h
+++ b/src/Interpreters/JoinSwitcher.h
@@ -26,6 +26,11 @@ public:
     /// @returns false, if join-on-disk disk limit exceeded
     bool addJoinedBlock(const Block & block, bool check_limits) override;
 
+    void checkTypesOfKeys(const Block & block) const override
+    {
+        join->checkTypesOfKeys(block);
+    }
+
     void joinBlock(Block & block, std::shared_ptr<ExtraBlock> & not_processed) override
     {
         join->joinBlock(block, not_processed);
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 099fb5c2f44..271d7371425 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -299,16 +299,17 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
     if (table_to_join.database_and_table_name)
     {
         auto joined_table_id = context->resolveStorageID(table_to_join.database_and_table_name);
-        StoragePtr table = DatabaseCatalog::instance().tryGetTable(joined_table_id, context);
-        if (table)
+        StoragePtr storage = DatabaseCatalog::instance().tryGetTable(joined_table_id, context);
+        if (storage)
         {
-            if (dynamic_cast<StorageJoin *>(table.get()) ||
-                dynamic_cast<StorageDictionary *>(table.get()))
-                table_join->joined_storage = table;
+            if (auto storage_join = std::dynamic_pointer_cast<StorageJoin>(storage); storage_join)
+                table_join->setStorageJoin(storage_join);
+            else if (auto storage_dict = std::dynamic_pointer_cast<StorageDictionary>(storage); storage_dict)
+                table_join->setStorageJoin(storage_dict);
         }
     }
 
-    if (!table_join->joined_storage &&
+    if (!table_join->isSpecialStorage() &&
         settings.enable_optimize_predicate_expression)
         replaceJoinedTable(select_query);
 
diff --git a/src/Interpreters/LogicalExpressionsOptimizer.cpp b/src/Interpreters/LogicalExpressionsOptimizer.cpp
index c0d5a16fa65..936ed0149d2 100644
--- a/src/Interpreters/LogicalExpressionsOptimizer.cpp
+++ b/src/Interpreters/LogicalExpressionsOptimizer.cpp
@@ -225,22 +225,19 @@ void LogicalExpressionsOptimizer::addInExpression(const DisjunctiveEqualityChain
 
     /// 1. Create a new IN expression based on information from the OR-chain.
 
-    /// Construct a list of literals `x1, ..., xN` from the string `expr = x1 OR ... OR expr = xN`
-    ASTPtr value_list = std::make_shared<ASTExpressionList>();
+    /// Construct a tuple of literals `x1, ..., xN` from the string `expr = x1 OR ... OR expr = xN`
+
+    Tuple tuple;
+    tuple.reserve(equality_functions.size());
+
     for (const auto * function : equality_functions)
     {
         const auto & operands = getFunctionOperands(function);
-        value_list->children.push_back(operands[1]);
+        tuple.push_back(operands[1]->as<ASTLiteral>()->value);
     }
 
     /// Sort the literals so that they are specified in the same order in the IN expression.
-    /// Otherwise, they would be specified in the order of the ASTLiteral addresses, which is nondeterministic.
-    std::sort(value_list->children.begin(), value_list->children.end(), [](const DB::ASTPtr & lhs, const DB::ASTPtr & rhs)
-    {
-        const auto * val_lhs = lhs->as<ASTLiteral>();
-        const auto * val_rhs = rhs->as<ASTLiteral>();
-        return val_lhs->value < val_rhs->value;
-    });
+    std::sort(tuple.begin(), tuple.end());
 
     /// Get the expression `expr` from the chain `expr = x1 OR ... OR expr = xN`
     ASTPtr equals_expr_lhs;
@@ -250,14 +247,11 @@ void LogicalExpressionsOptimizer::addInExpression(const DisjunctiveEqualityChain
         equals_expr_lhs = operands[0];
     }
 
-    auto tuple_function = std::make_shared<ASTFunction>();
-    tuple_function->name = "tuple";
-    tuple_function->arguments = value_list;
-    tuple_function->children.push_back(tuple_function->arguments);
+    auto tuple_literal = std::make_shared<ASTLiteral>(std::move(tuple));
 
     ASTPtr expression_list = std::make_shared<ASTExpressionList>();
     expression_list->children.push_back(equals_expr_lhs);
-    expression_list->children.push_back(tuple_function);
+    expression_list->children.push_back(tuple_literal);
 
     /// Construct the expression `expr IN (x1, ..., xN)`
     auto in_function = std::make_shared<ASTFunction>();
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index 0150bbe1d93..eb806caa34f 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -666,16 +666,24 @@ bool MergeJoin::addJoinedBlock(const Block & src_block, bool)
     return saveRightBlock(std::move(block));
 }
 
+void MergeJoin::checkTypesOfKeys(const Block & block) const
+{
+    /// Do not check auxailary column for extra conditions, use original key names
+    JoinCommon::checkTypesOfKeys(block, table_join->keyNamesLeft(), right_table_keys, table_join->keyNamesRight());
+}
+
 void MergeJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
 {
     Names lowcard_keys = lowcard_right_keys;
     if (block)
     {
+        /// We need to check type of masks before `addConditionJoinColumn`, because it assumes that types is correct
         JoinCommon::checkTypesOfMasks(block, mask_column_name_left, right_sample_block, mask_column_name_right);
 
         /// Add auxiliary column, will be removed after joining
         addConditionJoinColumn(block, JoinTableSide::Left);
 
+        /// Types of keys can be checked only after `checkTypesOfKeys`
         JoinCommon::checkTypesOfKeys(block, key_names_left, right_table_keys, key_names_right);
 
         materializeBlockInplace(block);
diff --git a/src/Interpreters/MergeJoin.h b/src/Interpreters/MergeJoin.h
index 9e765041846..53cde2bff7c 100644
--- a/src/Interpreters/MergeJoin.h
+++ b/src/Interpreters/MergeJoin.h
@@ -25,6 +25,7 @@ public:
 
     const TableJoin & getTableJoin() const override { return *table_join; }
     bool addJoinedBlock(const Block & block, bool check_limits) override;
+    void checkTypesOfKeys(const Block & block) const override;
     void joinBlock(Block &, ExtraBlockPtr & not_processed) override;
 
     void setTotals(const Block &) override;
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
index 90917a0fd7e..f2860235117 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
@@ -571,6 +571,7 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
     auto rewritten_rename_query = std::make_shared<ASTRenameQuery>();
     rewritten_alter_query->database = mapped_to_database;
     rewritten_alter_query->table = alter_query.table;
+    rewritten_alter_query->alter_object = ASTAlterQuery::AlterObjectType::TABLE;
     rewritten_alter_query->set(rewritten_alter_query->command_list, std::make_shared<ASTExpressionList>());
 
     String default_after_column;
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.cpp b/src/Interpreters/PredicateExpressionsOptimizer.cpp
index f2e55441fb6..adc164e0596 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.cpp
+++ b/src/Interpreters/PredicateExpressionsOptimizer.cpp
@@ -39,7 +39,7 @@ bool PredicateExpressionsOptimizer::optimize(ASTSelectQuery & select_query)
     if (!select_query.tables() || select_query.tables()->children.empty())
         return false;
 
-    if ((!select_query.where() && !select_query.prewhere()) || select_query.arrayJoinExpressionList())
+    if ((!select_query.where() && !select_query.prewhere()) || select_query.arrayJoinExpressionList().first)
         return false;
 
     const auto & tables_predicates = extractTablesPredicates(select_query.where(), select_query.prewhere());
diff --git a/src/Interpreters/ReplaceQueryParameterVisitor.h b/src/Interpreters/ReplaceQueryParameterVisitor.h
index 23e36df3fee..cb3d0f668d8 100644
--- a/src/Interpreters/ReplaceQueryParameterVisitor.h
+++ b/src/Interpreters/ReplaceQueryParameterVisitor.h
@@ -13,7 +13,7 @@ class ASTQueryParameter;
 class ReplaceQueryParameterVisitor
 {
 public:
-    ReplaceQueryParameterVisitor(const NameToNameMap & parameters)
+    explicit ReplaceQueryParameterVisitor(const NameToNameMap & parameters)
         : query_parameters(parameters)
     {}
 
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 03abae01453..956ecc94b96 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -69,7 +69,7 @@ void AsofRowRefs::insert(TypeIndex type, const IColumn & asof_column, const Bloc
         using T = std::decay_t<decltype(t)>;
         using LookupPtr = typename Entry<T>::LookupPtr;
 
-        using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColumnType = ColumnVectorOrDecimal<T>;
         const auto & column = typeid_cast<const ColumnType &>(asof_column);
 
         T key = column.getElement(row_num);
@@ -93,7 +93,7 @@ const RowRef * AsofRowRefs::findAsof(TypeIndex type, ASOF::Inequality inequality
         using EntryType = Entry<T>;
         using LookupPtr = typename EntryType::LookupPtr;
 
-        using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColumnType = ColumnVectorOrDecimal<T>;
         const auto & column = typeid_cast<const ColumnType &>(asof_column);
         T key = column.getElement(row_num);
         auto & typed_lookup = std::get<LookupPtr>(lookups);
diff --git a/src/Interpreters/Session.cpp b/src/Interpreters/Session.cpp
index 4d41ba21026..128df040c7a 100644
--- a/src/Interpreters/Session.cpp
+++ b/src/Interpreters/Session.cpp
@@ -8,6 +8,7 @@
 #include <Common/ThreadPool.h>
 #include <Common/setThreadName.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/SessionLog.h>
 
 #include <atomic>
 #include <condition_variable>
@@ -241,7 +242,8 @@ void Session::shutdownNamedSessions()
 
 
 Session::Session(const ContextPtr & global_context_, ClientInfo::Interface interface_)
-    : global_context(global_context_)
+    : session_id(UUIDHelpers::generateV4()),
+      global_context(global_context_)
 {
     prepared_client_info.emplace();
     prepared_client_info->interface = interface_;
@@ -254,6 +256,14 @@ Session::~Session()
     /// Early release a NamedSessionData.
     if (named_session)
         named_session->release();
+
+    if (notified_session_log_about_login)
+    {
+        // must have been set in makeQueryContext or makeSessionContext
+        assert(user);
+        if (auto session_log = getSessionLog())
+            session_log->addLogOut(session_id, user->getName(), getClientInfo());
+    }
 }
 
 Authentication::Type Session::getAuthenticationType(const String & user_name) const
@@ -261,6 +271,21 @@ Authentication::Type Session::getAuthenticationType(const String & user_name) co
     return global_context->getAccessControlManager().read<User>(user_name)->authentication.getType();
 }
 
+Authentication::Type Session::getAuthenticationTypeOrLogInFailure(const String & user_name) const
+{
+    try
+    {
+        return getAuthenticationType(user_name);
+    }
+    catch (const Exception & e)
+    {
+        if (auto session_log = getSessionLog())
+            session_log->addLoginFailure(session_id, getClientInfo(), user_name, e);
+
+        throw;
+    }
+}
+
 Authentication::Digest Session::getPasswordDoubleSHA1(const String & user_name) const
 {
     return global_context->getAccessControlManager().read<User>(user_name)->authentication.getPasswordDoubleSHA1();
@@ -280,7 +305,16 @@ void Session::authenticate(const Credentials & credentials_, const Poco::Net::So
     if ((address == Poco::Net::SocketAddress{}) && (prepared_client_info->interface == ClientInfo::Interface::LOCAL))
         address = Poco::Net::SocketAddress{"127.0.0.1", 0};
 
-    user_id = global_context->getAccessControlManager().login(credentials_, address.host());
+    try
+    {
+        user_id = global_context->getAccessControlManager().login(credentials_, address.host());
+    }
+    catch (const Exception & e)
+    {
+        if (auto session_log = getSessionLog())
+            session_log->addLoginFailure(session_id, *prepared_client_info, credentials_.getUserName(), e);
+        throw;
+    }
 
     prepared_client_info->current_user = credentials_.getUserName();
     prepared_client_info->current_address = address;
@@ -330,7 +364,7 @@ ContextMutablePtr Session::makeSessionContext()
     return session_context;
 }
 
-ContextMutablePtr Session::makeSessionContext(const String & session_id_, std::chrono::steady_clock::duration timeout_, bool session_check_)
+ContextMutablePtr Session::makeSessionContext(const String & session_name_, std::chrono::steady_clock::duration timeout_, bool session_check_)
 {
     if (session_context)
         throw Exception("Session context already exists", ErrorCodes::LOGICAL_ERROR);
@@ -342,7 +376,7 @@ ContextMutablePtr Session::makeSessionContext(const String & session_id_, std::c
     std::shared_ptr<NamedSessionData> new_named_session;
     bool new_named_session_created = false;
     std::tie(new_named_session, new_named_session_created)
-        = NamedSessionsStorage::instance().acquireSession(global_context, user_id.value_or(UUID{}), session_id_, timeout_, session_check_);
+        = NamedSessionsStorage::instance().acquireSession(global_context, user_id.value_or(UUID{}), session_name_, timeout_, session_check_);
 
     auto new_session_context = new_named_session->context;
     new_session_context->makeSessionContext();
@@ -359,8 +393,7 @@ ContextMutablePtr Session::makeSessionContext(const String & session_id_, std::c
         new_session_context->setUser(*user_id);
 
     /// Session context is ready.
-    session_context = new_session_context;
-    session_id = session_id_;
+    session_context = std::move(new_session_context);
     named_session = new_named_session;
     named_session_created = new_named_session_created;
     user = session_context->getUser();
@@ -378,6 +411,13 @@ ContextMutablePtr Session::makeQueryContext(ClientInfo && query_client_info) con
     return makeQueryContextImpl(nullptr, &query_client_info);
 }
 
+std::shared_ptr<SessionLog> Session::getSessionLog() const
+{
+    // take it from global context, since it outlives the Session and always available.
+    // please note that server may have session_log disabled, hence this may return nullptr.
+    return global_context->getSessionLog();
+}
+
 ContextMutablePtr Session::makeQueryContextImpl(const ClientInfo * client_info_to_copy, ClientInfo * client_info_to_move) const
 {
     /// We can create a query context either from a session context or from a global context.
@@ -425,7 +465,21 @@ ContextMutablePtr Session::makeQueryContextImpl(const ClientInfo * client_info_t
     query_context_created = true;
     user = query_context->getUser();
 
+    if (!notified_session_log_about_login)
+    {
+        if (auto session_log = getSessionLog())
+        {
+            session_log->addLoginSuccess(
+                    session_id,
+                    named_session ? std::optional<std::string>(named_session->key.second) : std::nullopt,
+                    *query_context);
+
+            notified_session_log_about_login = true;
+        }
+    }
+
     return query_context;
 }
 
 }
+
diff --git a/src/Interpreters/Session.h b/src/Interpreters/Session.h
index d104e250099..772ccba7766 100644
--- a/src/Interpreters/Session.h
+++ b/src/Interpreters/Session.h
@@ -19,6 +19,7 @@ struct NamedSessionData;
 class NamedSessionsStorage;
 struct User;
 using UserPtr = std::shared_ptr<const User>;
+class SessionLog;
 
 /** Represents user-session from the server perspective,
  *  basically it is just a smaller subset of Context API, simplifies Context management.
@@ -41,6 +42,8 @@ public:
     /// Provides information about the authentication type of a specified user.
     Authentication::Type getAuthenticationType(const String & user_name) const;
     Authentication::Digest getPasswordDoubleSHA1(const String & user_name) const;
+    /// Same as getAuthenticationType, but adds LoginFailure event in case of error.
+    Authentication::Type getAuthenticationTypeOrLogInFailure(const String & user_name) const;
 
     /// Sets the current user, checks the credentials and that the specified address is allowed to connect from.
     /// The function throws an exception if there is no such user or password is wrong.
@@ -54,7 +57,7 @@ public:
     /// Makes a session context, can be used one or zero times.
     /// The function also assigns an user to this context.
     ContextMutablePtr makeSessionContext();
-    ContextMutablePtr makeSessionContext(const String & session_id_, std::chrono::steady_clock::duration timeout_, bool session_check_);
+    ContextMutablePtr makeSessionContext(const String & session_name_, std::chrono::steady_clock::duration timeout_, bool session_check_);
     ContextMutablePtr sessionContext() { return session_context; }
     ContextPtr sessionContext() const { return session_context; }
 
@@ -66,8 +69,11 @@ public:
     ContextMutablePtr makeQueryContext(ClientInfo && query_client_info) const;
 
 private:
+    std::shared_ptr<SessionLog> getSessionLog() const;
     ContextMutablePtr makeQueryContextImpl(const ClientInfo * client_info_to_copy, ClientInfo * client_info_to_move) const;
 
+    mutable bool notified_session_log_about_login = false;
+    const UUID session_id;
     const ContextPtr global_context;
 
     /// ClientInfo that will be copied to a session context when it's created.
@@ -79,9 +85,9 @@ private:
     ContextMutablePtr session_context;
     mutable bool query_context_created = false;
 
-    String session_id;
     std::shared_ptr<NamedSessionData> named_session;
     bool named_session_created = false;
 };
 
 }
+
diff --git a/src/Interpreters/SessionLog.cpp b/src/Interpreters/SessionLog.cpp
new file mode 100644
index 00000000000..4967cb867c8
--- /dev/null
+++ b/src/Interpreters/SessionLog.cpp
@@ -0,0 +1,261 @@
+#include <Interpreters/SessionLog.h>
+
+#include <Access/ContextAccess.h>
+#include <Access/User.h>
+#include <Access/EnabledRolesInfo.h>
+#include <Core/Settings.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Common/IPv6ToBinary.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
+#include <Access/SettingsProfilesInfo.h>
+
+#include <cassert>
+
+namespace
+{
+using namespace DB;
+
+inline DateTime64 time_in_microseconds(std::chrono::time_point<std::chrono::system_clock> timepoint)
+{
+    return std::chrono::duration_cast<std::chrono::microseconds>(timepoint.time_since_epoch()).count();
+}
+
+inline time_t time_in_seconds(std::chrono::time_point<std::chrono::system_clock> timepoint)
+{
+    return std::chrono::duration_cast<std::chrono::seconds>(timepoint.time_since_epoch()).count();
+}
+
+auto eventTime()
+{
+    const auto finish_time = std::chrono::system_clock::now();
+
+    return std::make_pair(time_in_seconds(finish_time), time_in_microseconds(finish_time));
+}
+
+using AuthType = Authentication::Type;
+using Interface = ClientInfo::Interface;
+
+void fillColumnArray(const Strings & data, IColumn & column)
+{
+    auto & array = typeid_cast<ColumnArray &>(column);
+    size_t size = 0;
+    auto & data_col = array.getData();
+    for (const auto & name : data)
+    {
+        data_col.insertData(name.data(), name.size());
+        ++size;
+    }
+    auto & offsets = array.getOffsets();
+    offsets.push_back(offsets.back() + size);
+};
+
+}
+
+namespace DB
+{
+
+SessionLogElement::SessionLogElement(const UUID & session_id_, Type type_)
+    : session_id(session_id_),
+      type(type_)
+{
+    std::tie(event_time, event_time_microseconds) = eventTime();
+}
+
+NamesAndTypesList SessionLogElement::getNamesAndTypes()
+{
+    const auto event_type = std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+        {
+            {"LoginFailure",           static_cast<Int8>(SESSION_LOGIN_FAILURE)},
+            {"LoginSuccess",           static_cast<Int8>(SESSION_LOGIN_SUCCESS)},
+            {"Logout",                 static_cast<Int8>(SESSION_LOGOUT)}
+        });
+
+#define AUTH_TYPE_NAME_AND_VALUE(v) std::make_pair(Authentication::TypeInfo::get(v).raw_name, static_cast<Int8>(v))
+    const auto identified_with_column = std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+        {
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::NO_PASSWORD),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::PLAINTEXT_PASSWORD),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::SHA256_PASSWORD),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::DOUBLE_SHA1_PASSWORD),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::LDAP),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::KERBEROS)
+        });
+#undef AUTH_TYPE_NAME_AND_VALUE
+
+    const auto interface_type_column = std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+        {
+            {"TCP",                    static_cast<Int8>(Interface::TCP)},
+            {"HTTP",                   static_cast<Int8>(Interface::HTTP)},
+            {"gRPC",                   static_cast<Int8>(Interface::GRPC)},
+            {"MySQL",                  static_cast<Int8>(Interface::MYSQL)},
+            {"PostgreSQL",             static_cast<Int8>(Interface::POSTGRESQL)}
+        });
+
+    const auto lc_string_datatype = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+
+    const auto changed_settings_type_column = std::make_shared<DataTypeArray>(
+        std::make_shared<DataTypeTuple>(
+            DataTypes({
+                // setting name
+                lc_string_datatype,
+                // value
+                std::make_shared<DataTypeString>()
+            })));
+
+    return
+    {
+        {"type", std::move(event_type)},
+        {"session_id", std::make_shared<DataTypeUUID>()},
+        {"session_name", std::make_shared<DataTypeString>()},
+        {"event_date", std::make_shared<DataTypeDate>()},
+        {"event_time", std::make_shared<DataTypeDateTime>()},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
+
+        {"user", std::make_shared<DataTypeString>()},
+        {"auth_type", std::move(identified_with_column)},
+
+        {"profiles", std::make_shared<DataTypeArray>(lc_string_datatype)},
+        {"roles", std::make_shared<DataTypeArray>(lc_string_datatype)},
+        {"changed_settings", std::move(changed_settings_type_column)},
+
+        {"client_address", DataTypeFactory::instance().get("IPv6")},
+        {"client_port", std::make_shared<DataTypeUInt16>()},
+        {"interface", std::move(interface_type_column)},
+
+        {"client_hostname", std::make_shared<DataTypeString>()},
+        {"client_name", std::make_shared<DataTypeString>()},
+        {"client_revision", std::make_shared<DataTypeUInt32>()},
+        {"client_version_major", std::make_shared<DataTypeUInt32>()},
+        {"client_version_minor", std::make_shared<DataTypeUInt32>()},
+        {"client_version_patch", std::make_shared<DataTypeUInt32>()},
+
+        {"failure_reason", std::make_shared<DataTypeString>()},
+    };
+}
+
+void SessionLogElement::appendToBlock(MutableColumns & columns) const
+{
+    assert(type >= SESSION_LOGIN_FAILURE && type <= SESSION_LOGOUT);
+    assert(user_identified_with >= Authentication::Type::NO_PASSWORD && user_identified_with <= Authentication::Type::MAX_TYPE);
+
+    size_t i = 0;
+
+    columns[i++]->insert(type);
+    columns[i++]->insert(session_id);
+    columns[i++]->insert(session_name);
+    columns[i++]->insert(static_cast<DayNum>(DateLUT::instance().toDayNum(event_time).toUnderType()));
+    columns[i++]->insert(event_time);
+    columns[i++]->insert(event_time_microseconds);
+
+    columns[i++]->insert(user);
+    columns[i++]->insert(user_identified_with);
+
+    fillColumnArray(profiles, *columns[i++]);
+    fillColumnArray(roles, *columns[i++]);
+
+    {
+        auto & changed_settings_array_col = assert_cast<ColumnArray &>(*columns[i++]);
+        auto & changed_settings_tuple_col = assert_cast<ColumnTuple &>(changed_settings_array_col.getData());
+        auto & names_col = *changed_settings_tuple_col.getColumnPtr(0)->assumeMutable();
+        auto & values_col = assert_cast<ColumnString &>(*changed_settings_tuple_col.getColumnPtr(1)->assumeMutable());
+
+        size_t items_added = 0;
+        for (const auto & kv : changed_settings)
+        {
+            names_col.insert(kv.first);
+            values_col.insert(kv.second);
+            ++items_added;
+        }
+
+        auto & offsets = changed_settings_array_col.getOffsets();
+        offsets.push_back(changed_settings_tuple_col.size());
+    }
+
+    columns[i++]->insertData(IPv6ToBinary(client_info.current_address.host()).data(), 16);
+    columns[i++]->insert(client_info.current_address.port());
+
+    columns[i++]->insert(client_info.interface);
+
+    columns[i++]->insertData(client_info.client_hostname.data(), client_info.client_hostname.length());
+    columns[i++]->insertData(client_info.client_name.data(), client_info.client_name.length());
+    columns[i++]->insert(client_info.client_tcp_protocol_version);
+    columns[i++]->insert(client_info.client_version_major);
+    columns[i++]->insert(client_info.client_version_minor);
+    columns[i++]->insert(client_info.client_version_patch);
+
+    columns[i++]->insertData(auth_failure_reason.data(), auth_failure_reason.length());
+}
+
+void SessionLog::addLoginSuccess(const UUID & session_id, std::optional<String> session_name, const Context & login_context)
+{
+    const auto access = login_context.getAccess();
+    const auto & settings = login_context.getSettingsRef();
+    const auto & client_info = login_context.getClientInfo();
+
+    DB::SessionLogElement log_entry(session_id, SESSION_LOGIN_SUCCESS);
+    log_entry.client_info = client_info;
+
+    {
+        const auto user = access->getUser();
+        log_entry.user = user->getName();
+        log_entry.user_identified_with = user->authentication.getType();
+        log_entry.external_auth_server = user->authentication.getLDAPServerName();
+    }
+
+    if (session_name)
+        log_entry.session_name = *session_name;
+
+    if (const auto roles_info = access->getRolesInfo())
+        log_entry.roles = roles_info->getCurrentRolesNames();
+
+    if (const auto profile_info = access->getDefaultProfileInfo())
+    log_entry.profiles = profile_info->getProfileNames();
+
+    for (const auto & s : settings.allChanged())
+        log_entry.changed_settings.emplace_back(s.getName(), s.getValueString());
+
+    add(log_entry);
+}
+
+void SessionLog::addLoginFailure(
+        const UUID & session_id,
+        const ClientInfo & info,
+        const String & user,
+        const Exception & reason)
+{
+    SessionLogElement log_entry(session_id, SESSION_LOGIN_FAILURE);
+
+    log_entry.user = user;
+    log_entry.auth_failure_reason = reason.message();
+    log_entry.client_info = info;
+    log_entry.user_identified_with = Authentication::Type::NO_PASSWORD;
+
+    add(log_entry);
+}
+
+void SessionLog::addLogOut(const UUID & session_id, const String & user, const ClientInfo & client_info)
+{
+    auto log_entry = SessionLogElement(session_id, SESSION_LOGOUT);
+    log_entry.user = user;
+    log_entry.client_info = client_info;
+
+    add(log_entry);
+}
+
+}
diff --git a/src/Interpreters/SessionLog.h b/src/Interpreters/SessionLog.h
new file mode 100644
index 00000000000..fddabf45e4e
--- /dev/null
+++ b/src/Interpreters/SessionLog.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include <Interpreters/SystemLog.h>
+#include <Interpreters/ClientInfo.h>
+#include <Access/Authentication.h>
+
+namespace DB
+{
+
+enum SessionLogElementType : int8_t
+{
+    SESSION_LOGIN_FAILURE = 0,
+    SESSION_LOGIN_SUCCESS = 1,
+    SESSION_LOGOUT = 2,
+};
+
+class ContextAccess;
+
+/** A struct which will be inserted as row into session_log table.
+  *
+  *  Allows to log information about user sessions:
+  * - auth attempts, auth result, auth method, etc.
+  * - log out events
+  */
+struct SessionLogElement
+{
+    using Type = SessionLogElementType;
+
+    SessionLogElement() = default;
+    SessionLogElement(const UUID & session_id_, Type type_);
+    SessionLogElement(const SessionLogElement &) = default;
+    SessionLogElement & operator=(const SessionLogElement &) = default;
+    SessionLogElement(SessionLogElement &&) = default;
+    SessionLogElement & operator=(SessionLogElement &&) = default;
+
+    UUID session_id;
+
+    Type type = SESSION_LOGIN_FAILURE;
+
+    String session_name;
+    time_t event_time{};
+    Decimal64 event_time_microseconds{};
+
+    String user;
+    Authentication::Type user_identified_with = Authentication::Type::NO_PASSWORD;
+    String external_auth_server;
+    Strings roles;
+    Strings profiles;
+    std::vector<std::pair<String, String>> changed_settings;
+
+    ClientInfo client_info;
+    String auth_failure_reason;
+
+    static std::string name() { return "SessionLog"; }
+
+    static NamesAndTypesList getNamesAndTypes();
+    static NamesAndAliases getNamesAndAliases() { return {}; }
+
+    void appendToBlock(MutableColumns & columns) const;
+};
+
+
+/// Instead of typedef - to allow forward declaration.
+class SessionLog : public SystemLog<SessionLogElement>
+{
+    using SystemLog<SessionLogElement>::SystemLog;
+
+public:
+    void addLoginSuccess(const UUID & session_id, std::optional<String> session_name, const Context & login_context);
+    void addLoginFailure(const UUID & session_id, const ClientInfo & info, const String & user, const Exception & reason);
+    void addLogOut(const UUID & session_id, const String & user, const ClientInfo & client_info);
+};
+
+}
diff --git a/src/Interpreters/Set.cpp b/src/Interpreters/Set.cpp
index 5ab59ba3f07..5304859aeea 100644
--- a/src/Interpreters/Set.cpp
+++ b/src/Interpreters/Set.cpp
@@ -402,8 +402,8 @@ void Set::checkTypesEqual(size_t set_type_idx, const DataTypePtr & other_type) c
                         + data_types[set_type_idx]->getName() + " on the right", ErrorCodes::TYPE_MISMATCH);
 }
 
-MergeTreeSetIndex::MergeTreeSetIndex(const Columns & set_elements, std::vector<KeyTuplePositionMapping> && index_mapping_)
-    : indexes_mapping(std::move(index_mapping_))
+MergeTreeSetIndex::MergeTreeSetIndex(const Columns & set_elements, std::vector<KeyTuplePositionMapping> && indexes_mapping_)
+    : has_all_keys(set_elements.size() == indexes_mapping_.size()), indexes_mapping(std::move(indexes_mapping_))
 {
     std::sort(indexes_mapping.begin(), indexes_mapping.end(),
         [](const KeyTuplePositionMapping & l, const KeyTuplePositionMapping & r)
@@ -548,11 +548,11 @@ BoolMask MergeTreeSetIndex::checkInRange(const std::vector<Range> & key_ranges,
             break;
         }
     }
-    if (one_element_range)
+    if (one_element_range && has_all_keys)
     {
         /// Here we know that there is one element in range.
         /// The main difference with the normal case is that we can definitely say that
-        /// condition in this range always TRUE (can_be_false = 0) xor always FALSE (can_be_true = 0).
+        /// condition in this range is always TRUE (can_be_false = 0) or always FALSE (can_be_true = 0).
 
         /// Check if it's an empty range
         if (!left_included || !right_included)
diff --git a/src/Interpreters/Set.h b/src/Interpreters/Set.h
index 727a2c144a1..578913dd0d2 100644
--- a/src/Interpreters/Set.h
+++ b/src/Interpreters/Set.h
@@ -208,7 +208,7 @@ public:
         std::vector<FunctionBasePtr> functions;
     };
 
-    MergeTreeSetIndex(const Columns & set_elements, std::vector<KeyTuplePositionMapping> && index_mapping_);
+    MergeTreeSetIndex(const Columns & set_elements, std::vector<KeyTuplePositionMapping> && indexes_mapping_);
 
     size_t size() const { return ordered_set.at(0)->size(); }
 
@@ -217,6 +217,8 @@ public:
     BoolMask checkInRange(const std::vector<Range> & key_ranges, const DataTypes & data_types) const;
 
 private:
+    // If all arguments in tuple are key columns, we can optimize NOT IN when there is only one element.
+    bool has_all_keys;
     Columns ordered_set;
     std::vector<KeyTuplePositionMapping> indexes_mapping;
 
diff --git a/src/Interpreters/SystemLog.cpp b/src/Interpreters/SystemLog.cpp
index 5c5a6e1439a..2ccb84e1ffa 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -6,7 +6,7 @@
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/QueryThreadLog.h>
 #include <Interpreters/QueryViewsLog.h>
-#include <Interpreters/SystemLog.h>
+#include <Interpreters/SessionLog.h>
 #include <Interpreters/TextLog.h>
 #include <Interpreters/TraceLog.h>
 #include <Interpreters/ZooKeeperLog.h>
@@ -39,7 +39,13 @@ std::shared_ptr<TSystemLog> createSystemLog(
     const String & config_prefix)
 {
     if (!config.has(config_prefix))
+    {
+        LOG_DEBUG(&Poco::Logger::get("SystemLog"),
+                "Not creating {}.{} since corresponding section '{}' is missing from config",
+                default_database_name, default_table_name, config_prefix);
+
         return {};
+    }
 
     String database = config.getString(config_prefix + ".database", default_database_name);
     String table = config.getString(config_prefix + ".table", default_table_name);
@@ -107,6 +113,7 @@ SystemLogs::SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConf
         "opentelemetry_span_log");
     query_views_log = createSystemLog<QueryViewsLog>(global_context, "system", "query_views_log", config, "query_views_log");
     zookeeper_log = createSystemLog<ZooKeeperLog>(global_context, "system", "zookeeper_log", config, "zookeeper_log");
+    session_log = createSystemLog<SessionLog>(global_context, "system", "session_log", config, "session_log");
 
     if (query_log)
         logs.emplace_back(query_log.get());
@@ -130,6 +137,8 @@ SystemLogs::SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConf
         logs.emplace_back(query_views_log.get());
     if (zookeeper_log)
         logs.emplace_back(zookeeper_log.get());
+    if (session_log)
+        logs.emplace_back(session_log.get());
 
     try
     {
diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index a332245439b..f6f7706dc24 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -75,6 +75,7 @@ class AsynchronousMetricLog;
 class OpenTelemetrySpanLog;
 class QueryViewsLog;
 class ZooKeeperLog;
+class SessionLog;
 
 
 class ISystemLog
@@ -115,6 +116,8 @@ struct SystemLogs
     std::shared_ptr<QueryViewsLog> query_views_log;
     /// Used to log all actions of ZooKeeper client
     std::shared_ptr<ZooKeeperLog> zookeeper_log;
+    /// Login, LogOut and Login failure events
+    std::shared_ptr<SessionLog> session_log;
 
     std::vector<ISystemLog *> logs;
 };
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index d15cbe42063..b0c89adee45 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/TableJoin.h>
 
+
 #include <Common/StringUtils/StringUtils.h>
 
 #include <Core/Block.h>
@@ -7,10 +8,20 @@
 #include <Core/Settings.h>
 
 #include <DataTypes/DataTypeNullable.h>
+
+#include <Dictionaries/DictionaryStructure.h>
+
+#include <Interpreters/DictionaryReader.h>
+#include <Interpreters/ExternalDictionariesLoader.h>
+
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/queryToString.h>
 
+#include <Storages/IStorage.h>
+#include <Storages/StorageDictionary.h>
+#include <Storages/StorageJoin.h>
+
 #include <common/logger_useful.h>
 
 
@@ -20,6 +31,24 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int TYPE_MISMATCH;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+std::string formatTypeMap(const TableJoin::NameToTypeMap & target, const TableJoin::NameToTypeMap & source)
+{
+    std::vector<std::string> text;
+    for (const auto & [k, v] : target)
+    {
+        auto src_type_it = source.find(k);
+        std::string src_type_name = src_type_it != source.end() ? src_type_it->second->getName() : "";
+        text.push_back(fmt::format("{} : {} -> {}", k, src_type_name, v->getName()));
+    }
+    return fmt::format("{}", fmt::join(text, ", "));
+}
+
 }
 
 TableJoin::TableJoin(const Settings & settings, VolumePtr tmp_volume_)
@@ -49,8 +78,6 @@ void TableJoin::resetCollected()
     renames.clear();
     left_type_map.clear();
     right_type_map.clear();
-    left_converting_actions = nullptr;
-    right_converting_actions = nullptr;
 }
 
 void TableJoin::addUsingKey(const ASTPtr & ast)
@@ -184,7 +211,7 @@ Block TableJoin::getRequiredRightKeys(const Block & right_table_keys, std::vecto
 {
     const Names & left_keys = keyNamesLeft();
     const Names & right_keys = keyNamesRight();
-    NameSet required_keys(requiredRightKeys().begin(), requiredRightKeys().end());
+    NameSet required_keys = requiredRightKeys();
     Block required_right_keys;
 
     for (size_t i = 0; i < right_keys.size(); ++i)
@@ -202,7 +229,6 @@ Block TableJoin::getRequiredRightKeys(const Block & right_table_keys, std::vecto
     return required_right_keys;
 }
 
-
 bool TableJoin::leftBecomeNullable(const DataTypePtr & column_type) const
 {
     return forceNullableLeft() && JoinCommon::canBecomeNullable(column_type);
@@ -215,36 +241,54 @@ bool TableJoin::rightBecomeNullable(const DataTypePtr & column_type) const
 
 void TableJoin::addJoinedColumn(const NameAndTypePair & joined_column)
 {
-    DataTypePtr type = joined_column.type;
-
-    if (hasUsing())
-    {
-        if (auto it = right_type_map.find(joined_column.name); it != right_type_map.end())
-            type = it->second;
-    }
-
-    if (rightBecomeNullable(type))
-        type = JoinCommon::convertTypeToNullable(type);
-
-    columns_added_by_join.emplace_back(joined_column.name, type);
+    columns_added_by_join.emplace_back(joined_column);
 }
 
-void TableJoin::addJoinedColumnsAndCorrectTypes(NamesAndTypesList & names_and_types, bool correct_nullability) const
+NamesAndTypesList TableJoin::correctedColumnsAddedByJoin() const
 {
-    for (auto & col : names_and_types)
+    NamesAndTypesList result;
+    for (const auto & col : columns_added_by_join)
+    {
+        DataTypePtr type = col.type;
+        if (hasUsing())
+        {
+            if (auto it = right_type_map.find(col.name); it != right_type_map.end())
+                type = it->second;
+        }
+
+        if (rightBecomeNullable(type))
+            type = JoinCommon::convertTypeToNullable(type);
+        result.emplace_back(col.name, type);
+    }
+
+    return result;
+}
+
+void TableJoin::addJoinedColumnsAndCorrectTypes(NamesAndTypesList & left_columns, bool correct_nullability)
+{
+    for (auto & col : left_columns)
     {
         if (hasUsing())
         {
+            /*
+             * Join with `USING` semantic allows to have columns with changed types in result table.
+             * But `JOIN ON` should preserve types from original table.
+             * So we need to know changed types in result tables before further analysis (e.g. analyzeAggregation)
+             * For `JOIN ON expr1 == expr2` we will infer common type later in makeTableJoin,
+             *   when part of plan built and types of expression will be known.
+             */
+            inferJoinKeyCommonType(left_columns, columns_from_joined_table, !isSpecialStorage());
+
             if (auto it = left_type_map.find(col.name); it != left_type_map.end())
                 col.type = it->second;
         }
+
         if (correct_nullability && leftBecomeNullable(col.type))
             col.type = JoinCommon::convertTypeToNullable(col.type);
     }
 
-    /// Types in columns_added_by_join already converted and set nullable if needed
-    for (const auto & col : columns_added_by_join)
-        names_and_types.emplace_back(col.name, col.type);
+    for (const auto & col : correctedColumnsAddedByJoin())
+        left_columns.emplace_back(col.name, col.type);
 }
 
 bool TableJoin::sameStrictnessAndKind(ASTTableJoin::Strictness strictness_, ASTTableJoin::Kind kind_) const
@@ -282,10 +326,29 @@ bool TableJoin::needStreamWithNonJoinedRows() const
     return isRightOrFull(kind());
 }
 
-bool TableJoin::allowDictJoin(const String & dict_key, const Block & sample_block, Names & src_names, NamesAndTypesList & dst_columns) const
+static std::optional<String> getDictKeyName(const String & dict_name , ContextPtr context)
 {
+    auto dictionary = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
+    if (!dictionary)
+        return {};
+
+    if (const auto & structure = dictionary->getStructure(); structure.id)
+        return structure.id->name;
+    return {};
+}
+
+bool TableJoin::tryInitDictJoin(const Block & sample_block, ContextPtr context)
+{
+    using Strictness = ASTTableJoin::Strictness;
+
+    bool allowed_inner = isInner(kind()) && strictness() == Strictness::All;
+    bool allowed_left = isLeft(kind()) && (strictness() == Strictness::Any ||
+                                           strictness() == Strictness::All ||
+                                           strictness() == Strictness::Semi ||
+                                           strictness() == Strictness::Anti);
+
     /// Support ALL INNER, [ANY | ALL | SEMI | ANTI] LEFT
-    if (!isLeft(kind()) && !(isInner(kind()) && strictness() == ASTTableJoin::Strictness::All))
+    if (!allowed_inner && !allowed_left)
         return false;
 
     const Names & right_keys = keyNamesRight();
@@ -297,9 +360,17 @@ bool TableJoin::allowDictJoin(const String & dict_key, const Block & sample_bloc
     if (it_key == original_names.end())
         return false;
 
-    if (dict_key != it_key->second)
+    if (!right_storage_dictionary)
+        return false;
+
+    auto dict_name = right_storage_dictionary->getDictionaryName();
+
+    auto dict_key = getDictKeyName(dict_name, context);
+    if (!dict_key.has_value() || *dict_key != it_key->second)
         return false; /// JOIN key != Dictionary key
 
+    Names src_names;
+    NamesAndTypesList dst_columns;
     for (const auto & col : sample_block)
     {
         if (col.name == right_keys[0])
@@ -313,51 +384,35 @@ bool TableJoin::allowDictJoin(const String & dict_key, const Block & sample_bloc
             dst_columns.push_back({col.name, col.type});
         }
     }
+    dictionary_reader = std::make_shared<DictionaryReader>(dict_name, src_names, dst_columns, context);
 
     return true;
 }
 
-bool TableJoin::applyJoinKeyConvert(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns)
+std::pair<ActionsDAGPtr, ActionsDAGPtr>
+TableJoin::createConvertingActions(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns)
 {
-    bool need_convert = needConvert();
-    if (!need_convert && !hasUsing())
-    {
-        /// For `USING` we already inferred common type an syntax analyzer stage
-        NamesAndTypesList left_list;
-        NamesAndTypesList right_list;
-        for (const auto & col : left_sample_columns)
-            left_list.emplace_back(col.name, col.type);
-        for (const auto & col : right_sample_columns)
-            right_list.emplace_back(col.name, col.type);
+    inferJoinKeyCommonType(left_sample_columns, right_sample_columns, !isSpecialStorage());
 
-        need_convert = inferJoinKeyCommonType(left_list, right_list);
-    }
+    auto left_converting_actions = applyKeyConvertToTable(left_sample_columns, left_type_map, key_names_left);
+    auto right_converting_actions = applyKeyConvertToTable(right_sample_columns, right_type_map, key_names_right);
 
-    if (need_convert)
-    {
-        left_converting_actions = applyKeyConvertToTable(left_sample_columns, left_type_map, key_names_left);
-        right_converting_actions = applyKeyConvertToTable(right_sample_columns, right_type_map, key_names_right);
-    }
-
-    return need_convert;
+    return {left_converting_actions, right_converting_actions};
 }
 
-bool TableJoin::inferJoinKeyCommonType(const NamesAndTypesList & left, const NamesAndTypesList & right)
+template <typename LeftNamesAndTypes, typename RightNamesAndTypes>
+bool TableJoin::inferJoinKeyCommonType(const LeftNamesAndTypes & left, const RightNamesAndTypes & right, bool allow_right)
 {
-    std::unordered_map<String, DataTypePtr> left_types;
-    for (const auto & col : left)
-    {
-        left_types[col.name] = col.type;
-    }
+    if (!left_type_map.empty() || !right_type_map.empty())
+        return true;
 
-    std::unordered_map<String, DataTypePtr> right_types;
+    NameToTypeMap left_types;
+    for (const auto & col : left)
+        left_types[col.name] = col.type;
+
+    NameToTypeMap right_types;
     for (const auto & col : right)
-    {
-        if (auto it = renames.find(col.name); it != renames.end())
-            right_types[it->second] = col.type;
-        else
-            right_types[col.name] = col.type;
-    }
+        right_types[renamedRightColumnName(col.name)] = col.type;
 
     for (size_t i = 0; i < key_names_left.size(); ++i)
     {
@@ -374,37 +429,37 @@ bool TableJoin::inferJoinKeyCommonType(const NamesAndTypesList & left, const Nam
         if (JoinCommon::typesEqualUpToNullability(ltype->second, rtype->second))
             continue;
 
-        DataTypePtr supertype;
+        DataTypePtr common_type;
         try
         {
-            supertype = DB::getLeastSupertype({ltype->second, rtype->second});
+            /// TODO(vdimir): use getMostSubtype if possible
+            common_type = DB::getLeastSupertype({ltype->second, rtype->second});
         }
         catch (DB::Exception & ex)
         {
-            throw Exception(
-                "Type mismatch of columns to JOIN by: " +
-                    key_names_left[i] + ": " + ltype->second->getName() + " at left, " +
-                    key_names_right[i] + ": " + rtype->second->getName() + " at right. " +
-                    "Can't get supertype: " + ex.message(),
-                ErrorCodes::TYPE_MISMATCH);
+            throw DB::Exception(ErrorCodes::TYPE_MISMATCH,
+                "Can't infer common type for joined columns: {}: {} at left, {}: {} at right. {}",
+                key_names_left[i], ltype->second->getName(),
+                key_names_right[i], rtype->second->getName(),
+                ex.message());
         }
-        left_type_map[key_names_left[i]] = right_type_map[key_names_right[i]] = supertype;
+
+        if (!allow_right && !common_type->equals(*rtype->second))
+        {
+            throw DB::Exception(ErrorCodes::TYPE_MISMATCH,
+                "Can't change type for right table: {}: {} -> {}.",
+                key_names_right[i], rtype->second->getName(), common_type->getName());
+        }
+        left_type_map[key_names_left[i]] = right_type_map[key_names_right[i]] = common_type;
     }
 
     if (!left_type_map.empty() || !right_type_map.empty())
     {
-        auto format_type_map = [](NameToTypeMap mapping) -> std::string
-        {
-            std::vector<std::string> text;
-            for (const auto & [k, v] : mapping)
-                text.push_back(k + ": " + v->getName());
-            return fmt::format("{}", fmt::join(text, ", "));
-        };
         LOG_TRACE(
             &Poco::Logger::get("TableJoin"),
             "Infer supertype for joined columns. Left: [{}], Right: [{}]",
-            format_type_map(left_type_map),
-            format_type_map(right_type_map));
+            formatTypeMap(left_type_map, left_types),
+            formatTypeMap(right_type_map, right_types));
     }
 
     return !left_type_map.empty();
@@ -413,15 +468,20 @@ bool TableJoin::inferJoinKeyCommonType(const NamesAndTypesList & left, const Nam
 ActionsDAGPtr TableJoin::applyKeyConvertToTable(
     const ColumnsWithTypeAndName & cols_src, const NameToTypeMap & type_mapping, Names & names_to_rename) const
 {
+    bool has_some_to_do = false;
+
     ColumnsWithTypeAndName cols_dst = cols_src;
     for (auto & col : cols_dst)
     {
         if (auto it = type_mapping.find(col.name); it != type_mapping.end())
         {
+            has_some_to_do = true;
             col.type = it->second;
             col.column = nullptr;
         }
     }
+    if (!has_some_to_do)
+        return nullptr;
 
     NameToNameMap key_column_rename;
     /// Returns converting actions for tables that need to be performed before join
@@ -437,6 +497,20 @@ ActionsDAGPtr TableJoin::applyKeyConvertToTable(
     return dag;
 }
 
+void TableJoin::setStorageJoin(std::shared_ptr<StorageJoin> storage)
+{
+    if (right_storage_dictionary)
+        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "StorageJoin and Dictionary join are mutually exclusive");
+    right_storage_join = storage;
+}
+
+void TableJoin::setStorageJoin(std::shared_ptr<StorageDictionary> storage)
+{
+    if (right_storage_join)
+        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "StorageJoin and Dictionary join are mutually exclusive");
+    right_storage_dictionary = storage;
+}
+
 String TableJoin::renamedRightColumnName(const String & name) const
 {
     if (const auto it = renames.find(name); it != renames.end())
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index 5d26a14113c..462dd540a00 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -24,6 +24,8 @@ class ASTSelectQuery;
 struct DatabaseAndTableWithAlias;
 class Block;
 class DictionaryReader;
+class StorageJoin;
+class StorageDictionary;
 
 struct ColumnWithTypeAndName;
 using ColumnsWithTypeAndName = std::vector<ColumnWithTypeAndName>;
@@ -86,16 +88,14 @@ private:
     /// All columns which can be read from joined table. Duplicating names are qualified.
     NamesAndTypesList columns_from_joined_table;
     /// Columns will be added to block by JOIN.
-    /// It's a subset of columns_from_joined_table with corrected Nullability and type (if inplace type conversion is required)
+    /// It's a subset of columns_from_joined_table
+    /// Note: without corrected Nullability or type, see correctedColumnsAddedByJoin
     NamesAndTypesList columns_added_by_join;
 
     /// Target type to convert key columns before join
     NameToTypeMap left_type_map;
     NameToTypeMap right_type_map;
 
-    ActionsDAGPtr left_converting_actions;
-    ActionsDAGPtr right_converting_actions;
-
     /// Name -> original name. Names are the same as in columns_from_joined_table list.
     std::unordered_map<String, String> original_names;
     /// Original name -> name. Only renamed columns.
@@ -103,12 +103,23 @@ private:
 
     VolumePtr tmp_volume;
 
+    std::shared_ptr<StorageJoin> right_storage_join;
+
+    std::shared_ptr<StorageDictionary> right_storage_dictionary;
+    std::shared_ptr<DictionaryReader> dictionary_reader;
+
     Names requiredJoinedNames() const;
 
     /// Create converting actions and change key column names if required
     ActionsDAGPtr applyKeyConvertToTable(
         const ColumnsWithTypeAndName & cols_src, const NameToTypeMap & type_mapping, Names & names_to_rename) const;
 
+    /// Calculates common supertypes for corresponding join key columns.
+    template <typename LeftNamesAndTypes, typename RightNamesAndTypes>
+    bool inferJoinKeyCommonType(const LeftNamesAndTypes & left, const RightNamesAndTypes & right, bool allow_right);
+
+    NamesAndTypesList correctedColumnsAddedByJoin() const;
+
 public:
     TableJoin() = default;
     TableJoin(const Settings &, VolumePtr tmp_volume);
@@ -126,16 +137,12 @@ public:
         table_join.strictness = strictness;
     }
 
-    StoragePtr joined_storage;
-    std::shared_ptr<DictionaryReader> dictionary_reader;
-
     ASTTableJoin::Kind kind() const { return table_join.kind; }
     ASTTableJoin::Strictness strictness() const { return table_join.strictness; }
     bool sameStrictnessAndKind(ASTTableJoin::Strictness, ASTTableJoin::Kind) const;
     const SizeLimits & sizeLimits() const { return size_limits; }
     VolumePtr getTemporaryVolume() { return tmp_volume; }
     bool allowMergeJoin() const;
-    bool allowDictJoin(const String & dict_key, const Block & sample_block, Names &, NamesAndTypesList &) const;
     bool preferMergeJoin() const { return join_algorithm == JoinAlgorithm::PREFER_PARTIAL_MERGE; }
     bool forceMergeJoin() const { return join_algorithm == JoinAlgorithm::PARTIAL_MERGE; }
     bool forceHashJoin() const
@@ -190,21 +197,13 @@ public:
     bool rightBecomeNullable(const DataTypePtr & column_type) const;
     void addJoinedColumn(const NameAndTypePair & joined_column);
 
-    void addJoinedColumnsAndCorrectTypes(NamesAndTypesList & names_and_types, bool correct_nullability = true) const;
-
-    /// Calculates common supertypes for corresponding join key columns.
-    bool inferJoinKeyCommonType(const NamesAndTypesList & left, const NamesAndTypesList & right);
+    void addJoinedColumnsAndCorrectTypes(NamesAndTypesList & left_columns, bool correct_nullability);
 
     /// Calculate converting actions, rename key columns in required
     /// For `USING` join we will convert key columns inplace and affect into types in the result table
     /// For `JOIN ON` we will create new columns with converted keys to join by.
-    bool applyJoinKeyConvert(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns);
-
-    bool needConvert() const { return !left_type_map.empty(); }
-
-    /// Key columns should be converted before join.
-    ActionsDAGPtr leftConvertingActions() const { return left_converting_actions; }
-    ActionsDAGPtr rightConvertingActions() const { return right_converting_actions; }
+    std::pair<ActionsDAGPtr, ActionsDAGPtr>
+    createConvertingActions(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns);
 
     void setAsofInequality(ASOF::Inequality inequality) { asof_inequality = inequality; }
     ASOF::Inequality getAsofInequality() { return asof_inequality; }
@@ -215,6 +214,7 @@ public:
     const Names & keyNamesLeft() const { return key_names_left; }
     const Names & keyNamesRight() const { return key_names_right; }
     const NamesAndTypesList & columnsFromJoinedTable() const { return columns_from_joined_table; }
+
     Names columnsAddedByJoin() const
     {
         Names res;
@@ -230,6 +230,16 @@ public:
 
     String renamedRightColumnName(const String & name) const;
     std::unordered_map<String, String> leftToRightKeyRemap() const;
+
+    void setStorageJoin(std::shared_ptr<StorageJoin> storage);
+    void setStorageJoin(std::shared_ptr<StorageDictionary> storage);
+
+    std::shared_ptr<StorageJoin> getStorageJoin() { return right_storage_join; }
+
+    bool tryInitDictJoin(const Block & sample_block, ContextPtr context);
+
+    bool isSpecialStorage() const { return right_storage_dictionary || right_storage_join; }
+    const DictionaryReader * getDictionaryReader() const { return dictionary_reader.get(); }
 };
 
 }
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index 518c041d785..3236418fe6f 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -18,6 +18,7 @@
 #include <Interpreters/RewriteFunctionToSubcolumnVisitor.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/GatherFunctionQuantileVisitor.h>
 
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
@@ -39,6 +40,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int UNKNOWN_TYPE_OF_AST_NODE;
 }
 
 namespace
@@ -90,12 +92,7 @@ void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_colum
     const FunctionFactory & function_factory = FunctionFactory::instance();
 
     if (!select_query->groupBy())
-    {
-        // If there is a HAVING clause without GROUP BY, make sure we have some aggregation happen.
-        if (select_query->having())
-            appendUnusedGroupByColumn(select_query, source_columns);
         return;
-    }
 
     const auto is_literal = [] (const ASTPtr & ast) -> bool
     {
@@ -282,7 +279,8 @@ void optimizeDuplicatesInOrderBy(const ASTSelectQuery * select_query)
         String name = elem->children.front()->getColumnName();
         const auto & order_by_elem = elem->as<ASTOrderByElement &>();
 
-        if (elems_set.emplace(name, order_by_elem.collation ? order_by_elem.collation->getColumnName() : "").second)
+        if (order_by_elem.with_fill /// Always keep elements WITH FILL as they affects other.
+            || elems_set.emplace(name, order_by_elem.collation ? order_by_elem.collation->getColumnName() : "").second)
             unique_elems.emplace_back(elem);
     }
 
@@ -425,6 +423,17 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, Context
     if (!order_by)
         return;
 
+    for (const auto & child : order_by->children)
+    {
+        auto * order_by_element = child->as<ASTOrderByElement>();
+
+        if (!order_by_element || order_by_element->children.empty())
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+        if (order_by_element->with_fill)
+            return;
+    }
+
     std::unordered_set<String> group_by_hashes;
     if (auto group_by = select_query->groupBy())
     {
@@ -440,6 +449,7 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, Context
     for (size_t i = 0; i < order_by->children.size(); ++i)
     {
         auto * order_by_element = order_by->children[i]->as<ASTOrderByElement>();
+
         auto & ast_func = order_by_element->children[0];
         if (!ast_func->as<ASTFunction>())
             continue;
@@ -475,6 +485,17 @@ void optimizeRedundantFunctionsInOrderBy(const ASTSelectQuery * select_query, Co
     if (!order_by)
         return;
 
+    for (const auto & child : order_by->children)
+    {
+        auto * order_by_element = child->as<ASTOrderByElement>();
+
+        if (!order_by_element || order_by_element->children.empty())
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+        if (order_by_element->with_fill)
+            return;
+    }
+
     std::unordered_set<String> prev_keys;
     ASTs modified;
     modified.reserve(order_by->children.size());
@@ -606,6 +627,59 @@ void optimizeFunctionsToSubcolumns(ASTPtr & query, const StorageMetadataPtr & me
     RewriteFunctionToSubcolumnVisitor(data).visit(query);
 }
 
+std::shared_ptr<ASTFunction> getQuantileFuseCandidate(const String & func_name, std::vector<ASTPtr *> & functions)
+{
+    if (functions.size() < 2)
+        return nullptr;
+
+    const auto & common_arguments = (*functions[0])->as<ASTFunction>()->arguments->children;
+    auto func_base = makeASTFunction(GatherFunctionQuantileData::getFusedName(func_name));
+    func_base->arguments->children = common_arguments;
+    func_base->parameters = std::make_shared<ASTExpressionList>();
+
+    for (const auto * ast : functions)
+    {
+        assert(ast && *ast);
+        const auto * func = (*ast)->as<ASTFunction>();
+        assert(func && func->parameters->as<ASTExpressionList>());
+        const ASTs & parameters = func->parameters->as<ASTExpressionList &>().children;
+        if (parameters.size() != 1)
+            return nullptr; /// query is illegal, give up
+        func_base->parameters->children.push_back(parameters[0]);
+    }
+    return func_base;
+}
+
+/// Rewrites multi quantile()() functions with the same arguments to quantiles()()[]
+/// eg:SELECT quantile(0.5)(x), quantile(0.9)(x), quantile(0.95)(x) FROM...
+///    rewrite to : SELECT quantiles(0.5, 0.9, 0.95)(x)[1], quantiles(0.5, 0.9, 0.95)(x)[2], quantiles(0.5, 0.9, 0.95)(x)[3] FROM ...
+void optimizeFuseQuantileFunctions(ASTPtr & query)
+{
+    GatherFunctionQuantileVisitor::Data data{};
+    GatherFunctionQuantileVisitor(data).visit(query);
+    for (auto & candidate : data.fuse_quantile)
+    {
+        String func_name = candidate.first;
+        auto & args_to_functions = candidate.second;
+
+        /// Try to fuse multiply `quantile*` Function to plural
+        for (auto it : args_to_functions.arg_map_function)
+        {
+            std::vector<ASTPtr *> & functions = it.second;
+            auto func_base = getQuantileFuseCandidate(func_name, functions);
+            if (!func_base)
+                continue;
+            for (size_t i = 0; i < functions.size(); ++i)
+            {
+                std::shared_ptr<ASTFunction> ast_new = makeASTFunction("arrayElement", func_base, std::make_shared<ASTLiteral>(i + 1));
+                if (const auto & alias = (*functions[i])->tryGetAlias(); !alias.empty())
+                    ast_new->setAlias(alias);
+                *functions[i] = ast_new;
+            }
+        }
+    }
+}
+
 }
 
 void TreeOptimizer::optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif)
@@ -703,6 +777,9 @@ void TreeOptimizer::apply(ASTPtr & query, TreeRewriterResult & result,
 
     /// Remove duplicated columns from USING(...).
     optimizeUsing(select_query);
+
+    if (settings.optimize_syntax_fuse_functions)
+        optimizeFuseQuantileFunctions(query);
 }
 
 }
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 5a9e2bfbd17..8ac7b48ddcb 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -14,7 +14,7 @@
 #include <Interpreters/CollectJoinOnKeysVisitor.h>
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
 #include <Interpreters/GetAggregatesVisitor.h>
-#include <Interpreters/UserDefinedFunctionsVisitor.h>
+#include <Interpreters/UserDefinedSQLFunctionVisitor.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/ExpressionActions.h> /// getSmallestColumn()
 #include <Interpreters/getTableExpressions.h>
@@ -422,46 +422,44 @@ void executeScalarSubqueries(ASTPtr & query, ContextPtr context, size_t subquery
 void getArrayJoinedColumns(ASTPtr & query, TreeRewriterResult & result, const ASTSelectQuery * select_query,
                            const NamesAndTypesList & source_columns, const NameSet & source_columns_set)
 {
-    if (ASTPtr array_join_expression_list = select_query->arrayJoinExpressionList())
+    if (!select_query->arrayJoinExpressionList().first)
+        return;
+
+    ArrayJoinedColumnsVisitor::Data visitor_data{
+        result.aliases, result.array_join_name_to_alias, result.array_join_alias_to_name, result.array_join_result_to_source};
+    ArrayJoinedColumnsVisitor(visitor_data).visit(query);
+
+    /// If the result of ARRAY JOIN is not used, it is necessary to ARRAY-JOIN any column,
+    /// to get the correct number of rows.
+    if (result.array_join_result_to_source.empty())
     {
-        ArrayJoinedColumnsVisitor::Data visitor_data{result.aliases,
-                                                    result.array_join_name_to_alias,
-                                                    result.array_join_alias_to_name,
-                                                    result.array_join_result_to_source};
-        ArrayJoinedColumnsVisitor(visitor_data).visit(query);
+        if (select_query->arrayJoinExpressionList().first->children.empty())
+            throw DB::Exception("ARRAY JOIN requires an argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        /// If the result of ARRAY JOIN is not used, it is necessary to ARRAY-JOIN any column,
-        /// to get the correct number of rows.
-        if (result.array_join_result_to_source.empty())
+        ASTPtr expr = select_query->arrayJoinExpressionList().first->children.at(0);
+        String source_name = expr->getColumnName();
+        String result_name = expr->getAliasOrColumnName();
+
+        /// This is an array.
+        if (!expr->as<ASTIdentifier>() || source_columns_set.count(source_name))
         {
-            if (select_query->arrayJoinExpressionList()->children.empty())
-                throw DB::Exception("ARRAY JOIN requires an argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-            ASTPtr expr = select_query->arrayJoinExpressionList()->children.at(0);
-            String source_name = expr->getColumnName();
-            String result_name = expr->getAliasOrColumnName();
-
-            /// This is an array.
-            if (!expr->as<ASTIdentifier>() || source_columns_set.count(source_name))
+            result.array_join_result_to_source[result_name] = source_name;
+        }
+        else /// This is a nested table.
+        {
+            bool found = false;
+            for (const auto & column : source_columns)
             {
-                result.array_join_result_to_source[result_name] = source_name;
-            }
-            else /// This is a nested table.
-            {
-                bool found = false;
-                for (const auto & column : source_columns)
+                auto split = Nested::splitName(column.name);
+                if (split.first == source_name && !split.second.empty())
                 {
-                    auto split = Nested::splitName(column.name);
-                    if (split.first == source_name && !split.second.empty())
-                    {
-                        result.array_join_result_to_source[Nested::concatenateName(result_name, split.second)] = column.name;
-                        found = true;
-                        break;
-                    }
+                    result.array_join_result_to_source[Nested::concatenateName(result_name, split.second)] = column.name;
+                    found = true;
+                    break;
                 }
-                if (!found)
-                    throw Exception("No columns in nested table " + source_name, ErrorCodes::EMPTY_NESTED_TABLE);
             }
+            if (!found)
+                throw Exception("No columns in nested table " + source_name, ErrorCodes::EMPTY_NESTED_TABLE);
         }
     }
 }
@@ -519,13 +517,6 @@ void collectJoinedColumns(TableJoin & analyzed_join, const ASTTableJoin & table_
         const auto & keys = table_join.using_expression_list->as<ASTExpressionList &>();
         for (const auto & key : keys.children)
             analyzed_join.addUsingKey(key);
-
-        /// `USING` semantic allows to have columns with changed types in result table.
-        /// `JOIN ON` should preserve types from original table
-        /// We can infer common type on syntax stage for `USING` because join is performed only by columns (not expressions)
-        /// We need to know  changed types in result tables because some analysis (e.g. analyzeAggregation) performed before join
-        /// For `JOIN ON expr1 == expr2` we will infer common type later in ExpressionAnalyzer, when types of expression will be known
-        analyzed_join.inferJoinKeyCommonType(tables[0].columns, tables[1].columns);
     }
     else if (table_join.on_expression)
     {
@@ -960,16 +951,9 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     setJoinStrictness(
         *select_query, settings.join_default_strictness, settings.any_join_distinct_right_table_keys, result.analyzed_join->table_join);
 
-    if (const auto * join_ast = select_query->join(); join_ast && tables_with_columns.size() >= 2)
-    {
-        auto & table_join_ast = join_ast->table_join->as<ASTTableJoin &>();
-        if (table_join_ast.using_expression_list && result.metadata_snapshot)
-            replaceAliasColumnsInQuery(table_join_ast.using_expression_list, result.metadata_snapshot->getColumns(), result.array_join_result_to_source, getContext());
-        if (table_join_ast.on_expression && result.metadata_snapshot)
-            replaceAliasColumnsInQuery(table_join_ast.on_expression, result.metadata_snapshot->getColumns(), result.array_join_result_to_source, getContext());
-
-        collectJoinedColumns(*result.analyzed_join, table_join_ast, tables_with_columns, result.aliases);
-    }
+    auto * table_join_ast = select_query->join() ? select_query->join()->table_join->as<ASTTableJoin>() : nullptr;
+    if (table_join_ast && tables_with_columns.size() >= 2)
+        collectJoinedColumns(*result.analyzed_join, *table_join_ast, tables_with_columns, result.aliases);
 
     result.aggregates = getAggregates(query, *select_query);
     result.window_function_asts = getWindowFunctions(query, *select_query);
@@ -980,8 +964,19 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     bool is_initiator = getContext()->getClientInfo().distributed_depth == 0;
     if (settings.optimize_respect_aliases && result.metadata_snapshot && is_initiator)
     {
+        std::unordered_set<IAST *> excluded_nodes;
+        {
+            /// Do not replace ALIASed columns in JOIN ON/USING sections
+            if (table_join_ast && table_join_ast->on_expression)
+                excluded_nodes.insert(table_join_ast->on_expression.get());
+            if (table_join_ast && table_join_ast->using_expression_list)
+                excluded_nodes.insert(table_join_ast->using_expression_list.get());
+        }
+
+        bool is_changed = replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(),
+                                                     result.array_join_result_to_source, getContext(), excluded_nodes);
         /// If query is changed, we need to redo some work to correct name resolution.
-        if (replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.array_join_result_to_source, getContext()))
+        if (is_changed)
         {
             result.aggregates = getAggregates(query, *select_query);
             result.window_function_asts = getWindowFunctions(query, *select_query);
@@ -1046,8 +1041,8 @@ TreeRewriterResultPtr TreeRewriter::analyze(
 void TreeRewriter::normalize(
     ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, bool ignore_alias, const Settings & settings, bool allow_self_aliases)
 {
-    UserDefinedFunctionsVisitor::Data data_user_defined_functions_visitor;
-    UserDefinedFunctionsVisitor(data_user_defined_functions_visitor).visit(query);
+    UserDefinedSQLFunctionVisitor::Data data_user_defined_functions_visitor;
+    UserDefinedSQLFunctionVisitor(data_user_defined_functions_visitor).visit(query);
 
     CustomizeCountDistinctVisitor::Data data_count_distinct{settings.count_distinct_implementation};
     CustomizeCountDistinctVisitor(data_count_distinct).visit(query);
@@ -1077,7 +1072,7 @@ void TreeRewriter::normalize(
     // if we have at least two different functions. E.g. we will replace sum(x)
     // and count(x) with sumCount(x).1 and sumCount(x).2, and sumCount() will
     // be calculated only once because of CSE.
-    if (settings.optimize_fuse_sum_count_avg)
+    if (settings.optimize_fuse_sum_count_avg || settings.optimize_syntax_fuse_functions)
     {
         FuseSumCountAggregatesVisitor::Data data;
         FuseSumCountAggregatesVisitor(data).visit(query);
diff --git a/src/Interpreters/TreeRewriter.h b/src/Interpreters/TreeRewriter.h
index 0dca00c285e..98201f35216 100644
--- a/src/Interpreters/TreeRewriter.h
+++ b/src/Interpreters/TreeRewriter.h
@@ -73,7 +73,7 @@ struct TreeRewriterResult
     /// Results of scalar sub queries
     Scalars scalars;
 
-    TreeRewriterResult(
+    explicit TreeRewriterResult(
         const NamesAndTypesList & source_columns_,
         ConstStoragePtr storage_ = {},
         const StorageMetadataPtr & metadata_snapshot_ = {},
@@ -84,7 +84,6 @@ struct TreeRewriterResult
     Names requiredSourceColumns() const { return required_source_columns.getNames(); }
     const Names & requiredSourceColumnsForAccessCheck() const { return required_source_columns_before_expanding_alias_columns; }
     NameSet getArrayJoinSourceNameSet() const;
-    Names getExpandedAliases() const { return {expanded_aliases.begin(), expanded_aliases.end()}; }
     const Scalars & getScalars() const { return scalars; }
 };
 
diff --git a/src/Interpreters/UserDefinedExecutableFunction.cpp b/src/Interpreters/UserDefinedExecutableFunction.cpp
new file mode 100644
index 00000000000..06830df68e6
--- /dev/null
+++ b/src/Interpreters/UserDefinedExecutableFunction.cpp
@@ -0,0 +1,26 @@
+#include "UserDefinedExecutableFunction.h"
+
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+
+#include <DataStreams/ShellCommandSource.h>
+#include <DataStreams/formatBlock.h>
+
+
+namespace DB
+{
+
+UserDefinedExecutableFunction::UserDefinedExecutableFunction(
+    const UserDefinedExecutableFunctionConfiguration & configuration_,
+    const ExternalLoadableLifetime & lifetime_,
+    std::shared_ptr<ProcessPool> process_pool_)
+    : configuration(configuration_)
+    , lifetime(lifetime_)
+    , process_pool(process_pool_)
+{
+    if (!process_pool && configuration.type == UserDefinedExecutableFunctionType::executable_pool)
+        process_pool = std::make_shared<ProcessPool>(configuration.pool_size == 0 ? std::numeric_limits<int>::max() : configuration.pool_size);
+}
+
+};
diff --git a/src/Interpreters/UserDefinedExecutableFunction.h b/src/Interpreters/UserDefinedExecutableFunction.h
new file mode 100644
index 00000000000..240422a02ca
--- /dev/null
+++ b/src/Interpreters/UserDefinedExecutableFunction.h
@@ -0,0 +1,99 @@
+#pragma once
+
+#include <string>
+
+#include <DataTypes/IDataType.h>
+#include <DataStreams/ShellCommandSource.h>
+#include <Interpreters/IExternalLoadable.h>
+
+
+namespace DB
+{
+
+enum class UserDefinedExecutableFunctionType
+{
+    executable,
+    executable_pool
+};
+
+struct UserDefinedExecutableFunctionConfiguration
+{
+    UserDefinedExecutableFunctionType type = UserDefinedExecutableFunctionType::executable;
+    std::string name;
+    std::string script_path;
+    std::string format;
+    std::vector<DataTypePtr> argument_types;
+    DataTypePtr result_type;
+    /// Pool settings
+    size_t pool_size = 0;
+    size_t command_termination_timeout = 0;
+    size_t max_command_execution_time = 0;
+    /// Send number_of_rows\n before sending chunk to process
+    bool send_chunk_header = false;
+};
+
+class UserDefinedExecutableFunction final : public IExternalLoadable
+{
+public:
+
+    UserDefinedExecutableFunction(
+        const UserDefinedExecutableFunctionConfiguration & configuration_,
+        const ExternalLoadableLifetime & lifetime_,
+        std::shared_ptr<ProcessPool> process_pool_ = nullptr);
+
+    const ExternalLoadableLifetime & getLifetime() const override
+    {
+        return lifetime;
+    }
+
+    const std::string & getLoadableName() const override
+    {
+        return configuration.name;
+    }
+
+    bool supportUpdates() const override
+    {
+        return true;
+    }
+
+    bool isModified() const override
+    {
+        return true;
+    }
+
+    std::shared_ptr<const IExternalLoadable> clone() const override
+    {
+        return std::make_shared<UserDefinedExecutableFunction>(configuration, lifetime, process_pool);
+    }
+
+    const UserDefinedExecutableFunctionConfiguration & getConfiguration() const
+    {
+        return configuration;
+    }
+
+    std::shared_ptr<ProcessPool> getProcessPool() const
+    {
+        return process_pool;
+    }
+
+    std::shared_ptr<UserDefinedExecutableFunction> shared_from_this()
+    {
+        return std::static_pointer_cast<UserDefinedExecutableFunction>(IExternalLoadable::shared_from_this());
+    }
+
+    std::shared_ptr<const UserDefinedExecutableFunction> shared_from_this() const
+    {
+        return std::static_pointer_cast<const UserDefinedExecutableFunction>(IExternalLoadable::shared_from_this());
+    }
+
+private:
+    UserDefinedExecutableFunction(const UserDefinedExecutableFunctionConfiguration & configuration_,
+        std::shared_ptr<ProcessPool> process_pool_,
+        const ExternalLoadableLifetime & lifetime_);
+
+    UserDefinedExecutableFunctionConfiguration configuration;
+    ExternalLoadableLifetime lifetime;
+    std::shared_ptr<ProcessPool> process_pool;
+};
+
+}
diff --git a/src/Interpreters/UserDefinedExecutableFunctionFactory.cpp b/src/Interpreters/UserDefinedExecutableFunctionFactory.cpp
new file mode 100644
index 00000000000..b6fb4d8d5e5
--- /dev/null
+++ b/src/Interpreters/UserDefinedExecutableFunctionFactory.cpp
@@ -0,0 +1,218 @@
+#include "UserDefinedExecutableFunctionFactory.h"
+
+#include <IO/WriteHelpers.h>
+
+#include <DataStreams/ShellCommandSource.h>
+#include <DataStreams/formatBlock.h>
+
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNSUPPORTED_METHOD;
+    extern const int TIMEOUT_EXCEEDED;
+}
+
+class UserDefinedFunction final : public IFunction
+{
+public:
+
+    explicit UserDefinedFunction(
+        ExternalUserDefinedExecutableFunctionsLoader::UserDefinedExecutableFunctionPtr executable_function_,
+        ContextPtr context_)
+        : executable_function(std::move(executable_function_))
+        , context(context_)
+    {
+    }
+
+    String getName() const override { return executable_function->getConfiguration().name; }
+
+    bool isVariadic() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+    size_t getNumberOfArguments() const override { return executable_function->getConfiguration().argument_types.size(); }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForNulls() const override { return true; }
+    bool isDeterministic() const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto & configuration = executable_function->getConfiguration();
+
+        for (size_t i = 0; i < arguments.size(); ++i)
+        {
+            const auto & expected_argument_type = configuration.argument_types[i];
+            if (!areTypesEqual(expected_argument_type, arguments[i]))
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                    "Function {} for {} argument expected {} actual {}",
+                    getName(),
+                    i,
+                    expected_argument_type->getName(),
+                    arguments[i]->getName());
+        }
+
+        return configuration.result_type;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        std::unique_ptr<ShellCommand> process = getProcess();
+
+        ColumnWithTypeAndName result(result_type, "result");
+        Block result_block({result});
+
+        Block arguments_block(arguments);
+        auto * process_in = &process->in;
+
+        const auto & configuration = executable_function->getConfiguration();
+        auto process_pool = executable_function->getProcessPool();
+        bool is_executable_pool_function = (process_pool != nullptr);
+
+        ShellCommandSourceConfiguration shell_command_source_configuration;
+
+        if (is_executable_pool_function)
+        {
+            shell_command_source_configuration.read_fixed_number_of_rows = true;
+            shell_command_source_configuration.number_of_rows_to_read = input_rows_count;
+        }
+
+        ShellCommandSource::SendDataTask task = {[process_in, arguments_block, &configuration, is_executable_pool_function, this]()
+        {
+            auto & out = *process_in;
+
+            if (configuration.send_chunk_header)
+            {
+                writeText(arguments_block.rows(), out);
+                writeChar('\n', out);
+            }
+
+            auto output_stream = context->getOutputStream(configuration.format, out, arguments_block.cloneEmpty());
+            formatBlock(output_stream, arguments_block);
+            if (!is_executable_pool_function)
+                out.close();
+        }};
+        std::vector<ShellCommandSource::SendDataTask> tasks = {std::move(task)};
+
+        Pipe pipe(std::make_unique<ShellCommandSource>(
+            context,
+            configuration.format,
+            result_block.cloneEmpty(),
+            std::move(process),
+            std::move(tasks),
+            shell_command_source_configuration,
+            process_pool));
+
+        QueryPipeline pipeline;
+        pipeline.init(std::move(pipe));
+
+        PullingPipelineExecutor executor(pipeline);
+
+        auto result_column = result_type->createColumn();
+        result_column->reserve(input_rows_count);
+
+        Block block;
+        while (executor.pull(block))
+        {
+            const auto & result_column_to_add = *block.safeGetByPosition(0).column;
+            result_column->insertRangeFrom(result_column_to_add, 0, result_column_to_add.size());
+        }
+
+        size_t result_column_size = result_column->size();
+        if (result_column_size != input_rows_count)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Function {} wrong result rows count expected {} actual {}",
+                getName(),
+                input_rows_count,
+                result_column_size);
+
+        return result_column;
+    }
+
+private:
+
+    std::unique_ptr<ShellCommand> getProcess() const
+    {
+        auto process_pool = executable_function->getProcessPool();
+        auto executable_function_configuration = executable_function->getConfiguration();
+
+        std::unique_ptr<ShellCommand> process;
+        bool is_executable_pool_function = (process_pool != nullptr);
+        if (is_executable_pool_function)
+        {
+            bool result = process_pool->tryBorrowObject(process, [&]()
+            {
+                ShellCommand::Config process_config(executable_function_configuration.script_path);
+                process_config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, executable_function_configuration.command_termination_timeout };
+                auto shell_command = ShellCommand::execute(process_config);
+                return shell_command;
+            }, executable_function_configuration.max_command_execution_time * 1000);
+
+            if (!result)
+                throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
+                    "Could not get process from pool, max command execution timeout exceeded {} seconds",
+                    executable_function_configuration.max_command_execution_time);
+        }
+        else
+        {
+            process = ShellCommand::execute(executable_function_configuration.script_path);
+        }
+
+        return process;
+    }
+
+    ExternalUserDefinedExecutableFunctionsLoader::UserDefinedExecutableFunctionPtr executable_function;
+    ContextPtr context;
+};
+
+UserDefinedExecutableFunctionFactory & UserDefinedExecutableFunctionFactory::instance()
+{
+    static UserDefinedExecutableFunctionFactory result;
+    return result;
+}
+
+FunctionOverloadResolverPtr UserDefinedExecutableFunctionFactory::get(const String & function_name, ContextPtr context)
+{
+    const auto & loader = context->getExternalUserDefinedExecutableFunctionsLoader();
+    auto executable_function = std::static_pointer_cast<const UserDefinedExecutableFunction>(loader.load(function_name));
+    auto function = std::make_shared<UserDefinedFunction>(std::move(executable_function), std::move(context));
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::move(function));
+}
+
+FunctionOverloadResolverPtr UserDefinedExecutableFunctionFactory::tryGet(const String & function_name, ContextPtr context)
+{
+    const auto & loader = context->getExternalUserDefinedExecutableFunctionsLoader();
+    auto load_result = loader.getLoadResult(function_name);
+
+    if (load_result.object)
+    {
+        auto executable_function = std::static_pointer_cast<const UserDefinedExecutableFunction>(load_result.object);
+        auto function = std::make_shared<UserDefinedFunction>(std::move(executable_function), std::move(context));
+        return std::make_unique<FunctionToOverloadResolverAdaptor>(std::move(function));
+    }
+
+    return nullptr;
+}
+
+std::vector<String> UserDefinedExecutableFunctionFactory::getRegisteredNames(ContextPtr context)
+{
+    const auto & loader = context->getExternalUserDefinedExecutableFunctionsLoader();
+    auto loaded_objects = loader.getLoadedObjects();
+
+    std::vector<std::string> registered_names;
+    registered_names.reserve(loaded_objects.size());
+
+    for (auto & loaded_object : loaded_objects)
+        registered_names.emplace_back(loaded_object->getLoadableName());
+
+    return registered_names;
+}
+
+}
diff --git a/src/Interpreters/UserDefinedExecutableFunctionFactory.h b/src/Interpreters/UserDefinedExecutableFunctionFactory.h
new file mode 100644
index 00000000000..0afeeecbca7
--- /dev/null
+++ b/src/Interpreters/UserDefinedExecutableFunctionFactory.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+#include <Common/NamePrompter.h>
+#include <Interpreters/Context_fwd.h>
+#include <Functions/IFunction.h>
+
+
+namespace DB
+{
+
+class UserDefinedExecutableFunctionFactory
+{
+public:
+    using Creator = std::function<FunctionOverloadResolverPtr(ContextPtr)>;
+
+    static UserDefinedExecutableFunctionFactory & instance();
+
+    static FunctionOverloadResolverPtr get(const String & function_name, ContextPtr context);
+
+    static FunctionOverloadResolverPtr tryGet(const String & function_name, ContextPtr context);
+
+    static std::vector<String> getRegisteredNames(ContextPtr context);
+
+};
+
+}
diff --git a/src/Interpreters/UserDefinedFunctionFactory.h b/src/Interpreters/UserDefinedFunctionFactory.h
deleted file mode 100644
index 0d7167eb1b7..00000000000
--- a/src/Interpreters/UserDefinedFunctionFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <unordered_map>
-#include <mutex>
-
-#include <Common/NamePrompter.h>
-
-#include <Parsers/ASTCreateFunctionQuery.h>
-
-namespace DB
-{
-
-///Factory for user defined functions stores functions.
-class UserDefinedFunctionFactory : public IHints<1, UserDefinedFunctionFactory>
-{
-public:
-    static UserDefinedFunctionFactory & instance();
-
-    /// Register function with function_name. create_function_query pointer must be ASTCreateFunctionQuery.
-    void registerFunction(const String & function_name, ASTPtr create_function_query);
-
-    /// Unregister function with function_name.
-    void unregisterFunction(const String & function_name);
-
-    /// Throws an exception if not found. Result ast pointer safely can be casted to ASTCreateFunctionQuery.
-    ASTPtr get(const String & function_name) const;
-
-    /// Returns nullptr if not found. Result ast pointer safely can be casted to ASTCreateFunctionQuery.
-    ASTPtr tryGet(const String & function_name) const;
-
-    /// Get all registered function names.
-    std::vector<String> getAllRegisteredNames() const override;
-
-private:
-    std::unordered_map<String, ASTPtr> function_name_to_create_query;
-    mutable std::mutex mutex;
-};
-
-}
diff --git a/src/Interpreters/UserDefinedObjectsLoader.h b/src/Interpreters/UserDefinedObjectsLoader.h
deleted file mode 100644
index f0054fac450..00000000000
--- a/src/Interpreters/UserDefinedObjectsLoader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <Interpreters/Context_fwd.h>
-#include <Parsers/IAST.h>
-
-#include <boost/noncopyable.hpp>
-
-
-namespace DB
-{
-
-enum class UserDefinedObjectType
-{
-    Function
-};
-
-class UserDefinedObjectsLoader : private boost::noncopyable
-{
-public:
-    static UserDefinedObjectsLoader & instance();
-    UserDefinedObjectsLoader();
-
-    void loadObjects(ContextPtr context);
-    void storeObject(ContextPtr context, UserDefinedObjectType object_type, const String & object_name, const IAST & ast);
-    void removeObject(ContextPtr context, UserDefinedObjectType object_type, const String & object_name);
-
-private:
-
-    void loadUserDefinedObject(ContextPtr context, UserDefinedObjectType object_type, const std::string_view & object_name, const String & file_path);
-    Poco::Logger * log;
-};
-
-}
diff --git a/src/Interpreters/UserDefinedFunctionFactory.cpp b/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
similarity index 79%
rename from src/Interpreters/UserDefinedFunctionFactory.cpp
rename to src/Interpreters/UserDefinedSQLFunctionFactory.cpp
index 0970b09f863..434f5523b42 100644
--- a/src/Interpreters/UserDefinedFunctionFactory.cpp
+++ b/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
@@ -1,4 +1,4 @@
-#include "UserDefinedFunctionFactory.h"
+#include "UserDefinedSQLFunctionFactory.h"
 
 #include <Functions/FunctionFactory.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
@@ -13,13 +13,13 @@ namespace ErrorCodes
     extern const int CANNOT_DROP_SYSTEM_FUNCTION;
 }
 
-UserDefinedFunctionFactory & UserDefinedFunctionFactory::instance()
+UserDefinedSQLFunctionFactory & UserDefinedSQLFunctionFactory::instance()
 {
-    static UserDefinedFunctionFactory result;
+    static UserDefinedSQLFunctionFactory result;
     return result;
 }
 
-void UserDefinedFunctionFactory::registerFunction(const String & function_name, ASTPtr create_function_query)
+void UserDefinedSQLFunctionFactory::registerFunction(const String & function_name, ASTPtr create_function_query)
 {
     if (FunctionFactory::instance().hasNameOrAlias(function_name))
         throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "The function '{}' already exists", function_name);
@@ -36,7 +36,7 @@ void UserDefinedFunctionFactory::registerFunction(const String & function_name,
             function_name);
 }
 
-void UserDefinedFunctionFactory::unregisterFunction(const String & function_name)
+void UserDefinedSQLFunctionFactory::unregisterFunction(const String & function_name)
 {
     if (FunctionFactory::instance().hasNameOrAlias(function_name) ||
         AggregateFunctionFactory::instance().hasNameOrAlias(function_name))
@@ -53,7 +53,7 @@ void UserDefinedFunctionFactory::unregisterFunction(const String & function_name
     function_name_to_create_query.erase(it);
 }
 
-ASTPtr UserDefinedFunctionFactory::get(const String & function_name) const
+ASTPtr UserDefinedSQLFunctionFactory::get(const String & function_name) const
 {
     std::lock_guard lock(mutex);
 
@@ -66,7 +66,7 @@ ASTPtr UserDefinedFunctionFactory::get(const String & function_name) const
     return it->second;
 }
 
-ASTPtr UserDefinedFunctionFactory::tryGet(const std::string & function_name) const
+ASTPtr UserDefinedSQLFunctionFactory::tryGet(const std::string & function_name) const
 {
     std::lock_guard lock(mutex);
 
@@ -77,7 +77,7 @@ ASTPtr UserDefinedFunctionFactory::tryGet(const std::string & function_name) con
     return it->second;
 }
 
-std::vector<std::string> UserDefinedFunctionFactory::getAllRegisteredNames() const
+std::vector<std::string> UserDefinedSQLFunctionFactory::getAllRegisteredNames() const
 {
     std::vector<std::string> registered_names;
 
diff --git a/src/Interpreters/UserDefinedSQLFunctionFactory.h b/src/Interpreters/UserDefinedSQLFunctionFactory.h
new file mode 100644
index 00000000000..366e27e833d
--- /dev/null
+++ b/src/Interpreters/UserDefinedSQLFunctionFactory.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <unordered_map>
+#include <mutex>
+
+#include <Common/NamePrompter.h>
+
+#include <Parsers/ASTCreateFunctionQuery.h>
+
+namespace DB
+{
+
+class UserDefinedSQLFunctionFactory : public IHints<1, UserDefinedSQLFunctionFactory>
+{
+public:
+    static UserDefinedSQLFunctionFactory & instance();
+
+    void registerFunction(const String & function_name, ASTPtr create_function_query);
+
+    void unregisterFunction(const String & function_name);
+
+    ASTPtr get(const String & function_name) const;
+
+    ASTPtr tryGet(const String & function_name) const;
+
+    std::vector<String> getAllRegisteredNames() const override;
+
+private:
+    std::unordered_map<String, ASTPtr> function_name_to_create_query;
+    mutable std::mutex mutex;
+};
+
+}
diff --git a/src/Interpreters/UserDefinedFunctionsVisitor.cpp b/src/Interpreters/UserDefinedSQLFunctionVisitor.cpp
similarity index 86%
rename from src/Interpreters/UserDefinedFunctionsVisitor.cpp
rename to src/Interpreters/UserDefinedSQLFunctionVisitor.cpp
index 2a793d17817..6471f9cbf62 100644
--- a/src/Interpreters/UserDefinedFunctionsVisitor.cpp
+++ b/src/Interpreters/UserDefinedSQLFunctionVisitor.cpp
@@ -1,4 +1,4 @@
-#include "UserDefinedFunctionsVisitor.h"
+#include "UserDefinedSQLFunctionVisitor.h"
 
 #include <unordered_map>
 #include <stack>
@@ -7,7 +7,7 @@
 #include <Parsers/ASTCreateFunctionQuery.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTIdentifier.h>
-#include <Interpreters/UserDefinedFunctionFactory.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
 
 
 namespace DB
@@ -18,7 +18,7 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
 }
 
-void UserDefinedFunctionsMatcher::visit(ASTPtr & ast, Data &)
+void UserDefinedSQLFunctionMatcher::visit(ASTPtr & ast, Data &)
 {
     auto * function = ast->as<ASTFunction>();
     if (!function)
@@ -29,14 +29,14 @@ void UserDefinedFunctionsMatcher::visit(ASTPtr & ast, Data &)
         ast = result;
 }
 
-bool UserDefinedFunctionsMatcher::needChildVisit(const ASTPtr &, const ASTPtr &)
+bool UserDefinedSQLFunctionMatcher::needChildVisit(const ASTPtr &, const ASTPtr &)
 {
     return true;
 }
 
-ASTPtr UserDefinedFunctionsMatcher::tryToReplaceFunction(const ASTFunction & function)
+ASTPtr UserDefinedSQLFunctionMatcher::tryToReplaceFunction(const ASTFunction & function)
 {
-    auto user_defined_function = UserDefinedFunctionFactory::instance().tryGet(function.name);
+    auto user_defined_function = UserDefinedSQLFunctionFactory::instance().tryGet(function.name);
     if (!user_defined_function)
         return nullptr;
 
diff --git a/src/Interpreters/UserDefinedFunctionsVisitor.h b/src/Interpreters/UserDefinedSQLFunctionVisitor.h
similarity index 82%
rename from src/Interpreters/UserDefinedFunctionsVisitor.h
rename to src/Interpreters/UserDefinedSQLFunctionVisitor.h
index c24e0327ddc..46f95f29ab9 100644
--- a/src/Interpreters/UserDefinedFunctionsVisitor.h
+++ b/src/Interpreters/UserDefinedSQLFunctionVisitor.h
@@ -19,10 +19,10 @@ class ASTFunction;
   * After applying visitor:
   * SELECT number + 1 FROM system.numbers LIMIT 10;
   */
-class UserDefinedFunctionsMatcher
+class UserDefinedSQLFunctionMatcher
 {
 public:
-    using Visitor = InDepthNodeVisitor<UserDefinedFunctionsMatcher, true>;
+    using Visitor = InDepthNodeVisitor<UserDefinedSQLFunctionMatcher, true>;
 
     struct Data
     {
@@ -39,6 +39,6 @@ private:
 };
 
 /// Visits AST nodes and collect their aliases in one map (with links to source nodes).
-using UserDefinedFunctionsVisitor = UserDefinedFunctionsMatcher::Visitor;
+using UserDefinedSQLFunctionVisitor = UserDefinedSQLFunctionMatcher::Visitor;
 
 }
diff --git a/src/Interpreters/UserDefinedObjectsLoader.cpp b/src/Interpreters/UserDefinedSQLObjectsLoader.cpp
similarity index 79%
rename from src/Interpreters/UserDefinedObjectsLoader.cpp
rename to src/Interpreters/UserDefinedSQLObjectsLoader.cpp
index 5237de594f4..5b2a5605de7 100644
--- a/src/Interpreters/UserDefinedObjectsLoader.cpp
+++ b/src/Interpreters/UserDefinedSQLObjectsLoader.cpp
@@ -1,4 +1,4 @@
-#include "UserDefinedObjectsLoader.h"
+#include "UserDefinedSQLObjectsLoader.h"
 
 #include <filesystem>
 
@@ -32,17 +32,17 @@ namespace ErrorCodes
     extern const int OBJECT_WAS_NOT_STORED_ON_DISK;
 }
 
-UserDefinedObjectsLoader & UserDefinedObjectsLoader::instance()
+UserDefinedSQLObjectsLoader & UserDefinedSQLObjectsLoader::instance()
 {
-    static UserDefinedObjectsLoader ret;
+    static UserDefinedSQLObjectsLoader ret;
     return ret;
 }
 
-UserDefinedObjectsLoader::UserDefinedObjectsLoader()
-    : log(&Poco::Logger::get("UserDefinedObjectsLoader"))
+UserDefinedSQLObjectsLoader::UserDefinedSQLObjectsLoader()
+    : log(&Poco::Logger::get("UserDefinedSQLObjectsLoader"))
 {}
 
-void UserDefinedObjectsLoader::loadUserDefinedObject(ContextPtr context, UserDefinedObjectType object_type, const std::string_view & name, const String & path)
+void UserDefinedSQLObjectsLoader::loadUserDefinedObject(ContextPtr context, UserDefinedSQLObjectType object_type, const std::string_view & name, const String & path)
 {
     auto name_ref = StringRef(name.data(), name.size());
     LOG_DEBUG(log, "Loading user defined object {} from file {}", backQuote(name_ref), path);
@@ -57,7 +57,7 @@ void UserDefinedObjectsLoader::loadUserDefinedObject(ContextPtr context, UserDef
     {
         switch (object_type)
         {
-            case UserDefinedObjectType::Function:
+            case UserDefinedSQLObjectType::Function:
             {
                 ParserCreateFunctionQuery parser;
                 ASTPtr ast = parseQuery(
@@ -80,7 +80,7 @@ void UserDefinedObjectsLoader::loadUserDefinedObject(ContextPtr context, UserDef
     }
 }
 
-void UserDefinedObjectsLoader::loadObjects(ContextPtr context)
+void UserDefinedSQLObjectsLoader::loadObjects(ContextPtr context)
 {
     LOG_DEBUG(log, "loading user defined objects");
 
@@ -102,19 +102,19 @@ void UserDefinedObjectsLoader::loadObjects(ContextPtr context)
             std::string_view object_name = file_name;
             object_name.remove_suffix(strlen(".sql"));
             object_name.remove_prefix(strlen("function_"));
-            loadUserDefinedObject(context, UserDefinedObjectType::Function, object_name, dir_path + it.name());
+            loadUserDefinedObject(context, UserDefinedSQLObjectType::Function, object_name, dir_path + it.name());
         }
     }
 }
 
-void UserDefinedObjectsLoader::storeObject(ContextPtr context, UserDefinedObjectType object_type, const String & object_name, const IAST & ast)
+void UserDefinedSQLObjectsLoader::storeObject(ContextPtr context, UserDefinedSQLObjectType object_type, const String & object_name, const IAST & ast)
 {
     String dir_path = context->getPath() + "user_defined/";
     String file_path;
 
     switch (object_type)
     {
-        case UserDefinedObjectType::Function:
+        case UserDefinedSQLObjectType::Function:
         {
             file_path = dir_path + "function_" + escapeForFileName(object_name) + ".sql";
         }
@@ -140,7 +140,7 @@ void UserDefinedObjectsLoader::storeObject(ContextPtr context, UserDefinedObject
     LOG_DEBUG(log, "Stored object {}", backQuote(object_name));
 }
 
-void UserDefinedObjectsLoader::removeObject(ContextPtr context, UserDefinedObjectType object_type, const String & object_name)
+void UserDefinedSQLObjectsLoader::removeObject(ContextPtr context, UserDefinedSQLObjectType object_type, const String & object_name)
 {
     String dir_path = context->getPath() + "user_defined/";
     LOG_DEBUG(log, "Removing file for user defined object {} from {}", backQuote(object_name), dir_path);
@@ -149,7 +149,7 @@ void UserDefinedObjectsLoader::removeObject(ContextPtr context, UserDefinedObjec
 
     switch (object_type)
     {
-        case UserDefinedObjectType::Function:
+        case UserDefinedSQLObjectType::Function:
         {
             file_path = dir_path + "function_" + escapeForFileName(object_name) + ".sql";
         }
diff --git a/src/Interpreters/UserDefinedSQLObjectsLoader.h b/src/Interpreters/UserDefinedSQLObjectsLoader.h
new file mode 100644
index 00000000000..6daf3e99833
--- /dev/null
+++ b/src/Interpreters/UserDefinedSQLObjectsLoader.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <Interpreters/Context_fwd.h>
+#include <Parsers/IAST.h>
+
+#include <boost/noncopyable.hpp>
+
+
+namespace DB
+{
+
+enum class UserDefinedSQLObjectType
+{
+    Function
+};
+
+class UserDefinedSQLObjectsLoader : private boost::noncopyable
+{
+public:
+    static UserDefinedSQLObjectsLoader & instance();
+    UserDefinedSQLObjectsLoader();
+
+    void loadObjects(ContextPtr context);
+    void storeObject(ContextPtr context, UserDefinedSQLObjectType object_type, const String & object_name, const IAST & ast);
+    void removeObject(ContextPtr context, UserDefinedSQLObjectType object_type, const String & object_name);
+
+private:
+
+    void loadUserDefinedObject(ContextPtr context, UserDefinedSQLObjectType object_type, const std::string_view & object_name, const String & file_path);
+    Poco::Logger * log;
+};
+
+}
diff --git a/src/Interpreters/WindowDescription.cpp b/src/Interpreters/WindowDescription.cpp
index 32129072972..4661a148d70 100644
--- a/src/Interpreters/WindowDescription.cpp
+++ b/src/Interpreters/WindowDescription.cpp
@@ -51,7 +51,7 @@ std::string WindowFrame::toString() const
 
 void WindowFrame::toString(WriteBuffer & buf) const
 {
-    buf << toString(type) << " BETWEEN ";
+    buf << type << " BETWEEN ";
     if (begin_type == BoundaryType::Current)
     {
         buf << "CURRENT ROW";
@@ -101,9 +101,9 @@ void WindowFrame::checkValid() const
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Frame start offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given",
-                toString(type),
+                type,
                 applyVisitor(FieldVisitorToString(), begin_offset),
-                Field::Types::toString(begin_offset.getType()));
+                begin_offset.getType());
         }
 
         if (end_type == BoundaryType::Offset
@@ -114,9 +114,9 @@ void WindowFrame::checkValid() const
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Frame end offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given",
-                toString(type),
+                type,
                 applyVisitor(FieldVisitorToString(), end_offset),
-                Field::Types::toString(end_offset.getType()));
+                end_offset.getType());
         }
     }
 
diff --git a/src/Interpreters/WindowDescription.h b/src/Interpreters/WindowDescription.h
index 4cb478bae85..bb0130b4d4e 100644
--- a/src/Interpreters/WindowDescription.h
+++ b/src/Interpreters/WindowDescription.h
@@ -73,40 +73,6 @@ struct WindowFrame
             && other.end_preceding == end_preceding
             ;
     }
-
-    static std::string toString(FrameType type)
-    {
-        switch (type)
-        {
-            case FrameType::Rows:
-                return "ROWS";
-            case FrameType::Groups:
-                return "GROUPS";
-            case FrameType::Range:
-                return "RANGE";
-        }
-
-        // Somehow GCC 10 doesn't understand that the above switch is exhaustive.
-        assert(false);
-        return "<unknown frame>";
-    }
-
-    static std::string toString(BoundaryType type)
-    {
-        switch (type)
-        {
-            case BoundaryType::Unbounded:
-                return "UNBOUNDED";
-            case BoundaryType::Offset:
-                return "OFFSET";
-            case BoundaryType::Current:
-                return "CURRENT ROW";
-        }
-
-        // Somehow GCC 10 doesn't understand that the above switch is exhaustive.
-        assert(false);
-        return "<unknown frame boundary>";
-    }
 };
 
 struct WindowDescription
diff --git a/src/Interpreters/ZooKeeperLog.cpp b/src/Interpreters/ZooKeeperLog.cpp
index 39bd9a75f3e..fdcbe430834 100644
--- a/src/Interpreters/ZooKeeperLog.cpp
+++ b/src/Interpreters/ZooKeeperLog.cpp
@@ -19,6 +19,41 @@
 namespace DB
 {
 
+
+DataTypePtr getCoordinationErrorCodesEnumType()
+{
+    return std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+            {
+                {"ZOK",                         static_cast<Int8>(Coordination::Error::ZOK)},
+
+                {"ZSYSTEMERROR",                static_cast<Int8>(Coordination::Error::ZSYSTEMERROR)},
+                {"ZRUNTIMEINCONSISTENCY",       static_cast<Int8>(Coordination::Error::ZRUNTIMEINCONSISTENCY)},
+                {"ZDATAINCONSISTENCY",          static_cast<Int8>(Coordination::Error::ZDATAINCONSISTENCY)},
+                {"ZCONNECTIONLOSS",             static_cast<Int8>(Coordination::Error::ZCONNECTIONLOSS)},
+                {"ZMARSHALLINGERROR",           static_cast<Int8>(Coordination::Error::ZMARSHALLINGERROR)},
+                {"ZUNIMPLEMENTED",              static_cast<Int8>(Coordination::Error::ZUNIMPLEMENTED)},
+                {"ZOPERATIONTIMEOUT",           static_cast<Int8>(Coordination::Error::ZOPERATIONTIMEOUT)},
+                {"ZBADARGUMENTS",               static_cast<Int8>(Coordination::Error::ZBADARGUMENTS)},
+                {"ZINVALIDSTATE",               static_cast<Int8>(Coordination::Error::ZINVALIDSTATE)},
+
+                {"ZAPIERROR",                   static_cast<Int8>(Coordination::Error::ZAPIERROR)},
+                {"ZNONODE",                     static_cast<Int8>(Coordination::Error::ZNONODE)},
+                {"ZNOAUTH",                     static_cast<Int8>(Coordination::Error::ZNOAUTH)},
+                {"ZBADVERSION",                 static_cast<Int8>(Coordination::Error::ZBADVERSION)},
+                {"ZNOCHILDRENFOREPHEMERALS",    static_cast<Int8>(Coordination::Error::ZNOCHILDRENFOREPHEMERALS)},
+                {"ZNODEEXISTS",                 static_cast<Int8>(Coordination::Error::ZNODEEXISTS)},
+                {"ZNOTEMPTY",                   static_cast<Int8>(Coordination::Error::ZNOTEMPTY)},
+                {"ZSESSIONEXPIRED",             static_cast<Int8>(Coordination::Error::ZSESSIONEXPIRED)},
+                {"ZINVALIDCALLBACK",            static_cast<Int8>(Coordination::Error::ZINVALIDCALLBACK)},
+                {"ZINVALIDACL",                 static_cast<Int8>(Coordination::Error::ZINVALIDACL)},
+                {"ZAUTHFAILED",                 static_cast<Int8>(Coordination::Error::ZAUTHFAILED)},
+                {"ZCLOSING",                    static_cast<Int8>(Coordination::Error::ZCLOSING)},
+                {"ZNOTHING",                    static_cast<Int8>(Coordination::Error::ZNOTHING)},
+                {"ZSESSIONMOVED",               static_cast<Int8>(Coordination::Error::ZSESSIONMOVED)},
+            });
+}
+
 NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
 {
     auto type_enum = std::make_shared<DataTypeEnum8>(
@@ -52,36 +87,7 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
                 {"SessionID",           static_cast<Int16>(Coordination::OpNum::SessionID)},
             });
 
-    auto error_enum = std::make_shared<DataTypeEnum8>(
-        DataTypeEnum8::Values
-            {
-                {"ZOK",                         static_cast<Int8>(Coordination::Error::ZOK)},
-
-                {"ZSYSTEMERROR",                static_cast<Int8>(Coordination::Error::ZSYSTEMERROR)},
-                {"ZRUNTIMEINCONSISTENCY",       static_cast<Int8>(Coordination::Error::ZRUNTIMEINCONSISTENCY)},
-                {"ZDATAINCONSISTENCY",          static_cast<Int8>(Coordination::Error::ZDATAINCONSISTENCY)},
-                {"ZCONNECTIONLOSS",             static_cast<Int8>(Coordination::Error::ZCONNECTIONLOSS)},
-                {"ZMARSHALLINGERROR",           static_cast<Int8>(Coordination::Error::ZMARSHALLINGERROR)},
-                {"ZUNIMPLEMENTED",              static_cast<Int8>(Coordination::Error::ZUNIMPLEMENTED)},
-                {"ZOPERATIONTIMEOUT",           static_cast<Int8>(Coordination::Error::ZOPERATIONTIMEOUT)},
-                {"ZBADARGUMENTS",               static_cast<Int8>(Coordination::Error::ZBADARGUMENTS)},
-                {"ZINVALIDSTATE",               static_cast<Int8>(Coordination::Error::ZINVALIDSTATE)},
-
-                {"ZAPIERROR",                   static_cast<Int8>(Coordination::Error::ZAPIERROR)},
-                {"ZNONODE",                     static_cast<Int8>(Coordination::Error::ZNONODE)},
-                {"ZNOAUTH",                     static_cast<Int8>(Coordination::Error::ZNOAUTH)},
-                {"ZBADVERSION",                 static_cast<Int8>(Coordination::Error::ZBADVERSION)},
-                {"ZNOCHILDRENFOREPHEMERALS",    static_cast<Int8>(Coordination::Error::ZNOCHILDRENFOREPHEMERALS)},
-                {"ZNODEEXISTS",                 static_cast<Int8>(Coordination::Error::ZNODEEXISTS)},
-                {"ZNOTEMPTY",                   static_cast<Int8>(Coordination::Error::ZNOTEMPTY)},
-                {"ZSESSIONEXPIRED",             static_cast<Int8>(Coordination::Error::ZSESSIONEXPIRED)},
-                {"ZINVALIDCALLBACK",            static_cast<Int8>(Coordination::Error::ZINVALIDCALLBACK)},
-                {"ZINVALIDACL",                 static_cast<Int8>(Coordination::Error::ZINVALIDACL)},
-                {"ZAUTHFAILED",                 static_cast<Int8>(Coordination::Error::ZAUTHFAILED)},
-                {"ZCLOSING",                    static_cast<Int8>(Coordination::Error::ZCLOSING)},
-                {"ZNOTHING",                    static_cast<Int8>(Coordination::Error::ZNOTHING)},
-                {"ZSESSIONMOVED",               static_cast<Int8>(Coordination::Error::ZSESSIONMOVED)},
-            });
+    auto error_enum = getCoordinationErrorCodesEnumType();
 
     auto watch_type_enum = std::make_shared<DataTypeEnum8>(
         DataTypeEnum8::Values
diff --git a/src/Interpreters/ZooKeeperLog.h b/src/Interpreters/ZooKeeperLog.h
index d3ef68625af..d721081fdae 100644
--- a/src/Interpreters/ZooKeeperLog.h
+++ b/src/Interpreters/ZooKeeperLog.h
@@ -73,4 +73,6 @@ class ZooKeeperLog : public SystemLog<ZooKeeperLogElement>
     using SystemLog<ZooKeeperLogElement>::SystemLog;
 };
 
+DataTypePtr getCoordinationErrorCodesEnumType();
+
 }
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index be0a10cf2e7..83db4c65bbe 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -75,8 +75,8 @@ static Field convertNumericType(const Field & from, const IDataType & type)
     if (from.getType() == Field::Types::Int256)
         return convertNumericTypeImpl<Int256, To>(from);
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(from.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), from.getType());
 }
 
 
@@ -134,8 +134,8 @@ static Field convertDecimalType(const Field & from, const To & type)
     if (from.getType() == Field::Types::Decimal128)
         return convertDecimalToDecimalType<Decimal128>(from, type);
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(from.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), from.getType());
 }
 
 
@@ -346,8 +346,9 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
     else if (const DataTypeAggregateFunction * agg_func_type = typeid_cast<const DataTypeAggregateFunction *>(&type))
     {
         if (src.getType() != Field::Types::AggregateFunctionState)
-            throw Exception(String("Cannot convert ") + src.getTypeName() + " to " + agg_func_type->getName(),
-                    ErrorCodes::TYPE_MISMATCH);
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "Cannot convert {} to {}",
+                src.getTypeName(), agg_func_type->getName());
 
         const auto & name = src.get<AggregateFunctionStateData>().name;
         if (agg_func_type->getName() != name)
@@ -387,8 +388,8 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         return convertFieldToType(parsed, type, from_type_hint);
     }
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(src.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), src.getType());
 }
 
 }
diff --git a/src/Interpreters/examples/hash_map_string_2.cpp b/src/Interpreters/examples/hash_map_string_2.cpp
index a75978c9e13..9b104ffa8a1 100644
--- a/src/Interpreters/examples/hash_map_string_2.cpp
+++ b/src/Interpreters/examples/hash_map_string_2.cpp
@@ -659,9 +659,10 @@ int main(int argc, char ** argv)
     if (!m || m == 100) bench<StringRef_CompareAlwaysTrue>          (data, "StringRef_CompareAlwaysTrue");
     if (!m || m == 101) bench<StringRef_CompareAlmostAlwaysTrue>    (data, "StringRef_CompareAlmostAlwaysTrue");
 
+    if (!m || m == 111) bench<StringRef>                            (data, "StringRef");
+
     /// 10 > 8, 9
     /// 1, 2, 5 - bad
 
-
     return 0;
 }
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 6f8caf74322..0b1746feebc 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -3,6 +3,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/ThreadProfileEvents.h>
 
+#include <Interpreters/AsynchronousInsertQueue.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromVector.h>
 #include <IO/LimitReadBuffer.h>
@@ -11,7 +12,7 @@
 #include <DataStreams/BlockIO.h>
 #include <DataStreams/copyData.h>
 #include <DataStreams/IBlockInputStream.h>
-#include <Processors/Transforms/getSourceFromFromASTInsertQuery.h>
+#include <Processors/Transforms/getSourceFromASTInsertQuery.h>
 #include <DataStreams/CountingBlockOutputStream.h>
 
 #include <Parsers/ASTIdentifier.h>
@@ -50,11 +51,13 @@
 #include <Common/ProfileEvents.h>
 
 #include <Common/SensitiveDataMasker.h>
+#include "IO/CompressionMethod.h"
 
 #include <Processors/Transforms/LimitsCheckingTransform.h>
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Processors/Sources/SinkToOutputStream.h>
+#include <Processors/Sources/WaitForAsyncInsertSource.h>
 
 #include <random>
 
@@ -345,20 +348,35 @@ static void onExceptionBeforeStart(const String & query_for_logging, ContextPtr
 
 static void setQuerySpecificSettings(ASTPtr & ast, ContextMutablePtr context)
 {
-    if (auto * ast_insert_into = dynamic_cast<ASTInsertQuery *>(ast.get()))
+    if (auto * ast_insert_into = ast->as<ASTInsertQuery>())
     {
         if (ast_insert_into->watch)
             context->setSetting("output_format_enable_streaming", 1);
     }
 }
 
+static void applySettingsFromSelectWithUnion(const ASTSelectWithUnionQuery & select_with_union, ContextMutablePtr context)
+{
+    const ASTs & children = select_with_union.list_of_selects->children;
+    if (children.empty())
+        return;
+
+    // We might have an arbitrarily complex UNION tree, so just give
+    // up if the last first-order child is not a plain SELECT.
+    // It is flattened later, when we process UNION ALL/DISTINCT.
+    const auto * last_select = children.back()->as<ASTSelectQuery>();
+    if (last_select && last_select->settings())
+    {
+        InterpreterSetQuery(last_select->settings(), context).executeForCurrentContext();
+    }
+}
+
 static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     const char * begin,
     const char * end,
     ContextMutablePtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
-    bool has_query_tail,
     ReadBuffer * istr)
 {
     const auto current_time = std::chrono::system_clock::now();
@@ -408,17 +426,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         }
         else if (const auto * select_with_union_query = ast->as<ASTSelectWithUnionQuery>())
         {
-            if (!select_with_union_query->list_of_selects->children.empty())
-            {
-                // We might have an arbitrarily complex UNION tree, so just give
-                // up if the last first-order child is not a plain SELECT.
-                // It is flattened later, when we process UNION ALL/DISTINCT.
-                const auto * last_select = select_with_union_query->list_of_selects->children.back()->as<ASTSelectQuery>();
-                if (last_select && last_select->settings())
-                {
-                    InterpreterSetQuery(last_select->settings(), context).executeForCurrentContext();
-                }
-            }
+            applySettingsFromSelectWithUnion(*select_with_union_query, context);
         }
         else if (const auto * query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get()))
         {
@@ -432,15 +440,27 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             query_table = query_with_table_output->table;
         }
 
+        if (auto * create_query = ast->as<ASTCreateQuery>())
+        {
+            if (create_query->select)
+            {
+                applySettingsFromSelectWithUnion(create_query->select->as<ASTSelectWithUnionQuery &>(), context);
+            }
+        }
+
         auto * insert_query = ast->as<ASTInsertQuery>();
 
         if (insert_query && insert_query->settings_ast)
             InterpreterSetQuery(insert_query->settings_ast, context).executeForCurrentContext();
 
-        if (insert_query && insert_query->data)
+        if (insert_query)
         {
-            query_end = insert_query->data;
-            insert_query->has_tail = has_query_tail;
+            if (insert_query->data)
+                query_end = insert_query->data;
+            else
+                query_end = end;
+
+            insert_query->tail = istr;
         }
         else
         {
@@ -493,8 +513,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             query = serializeAST(*ast);
         }
 
-        /// MUST goes before any modification (except for prepared statements,
-        /// since it substitute parameters and w/o them query does not contains
+        /// MUST go before any modification (except for prepared statements,
+        /// since it substitute parameters and w/o them query does not contain
         /// parameters), to keep query as-is in query_log and server log.
         query_for_logging = prepareQueryForLogging(query, context);
         logQuery(query_for_logging, context, internal);
@@ -532,6 +552,11 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         context->initializeExternalTablesIfSet();
 
         auto * insert_query = ast->as<ASTInsertQuery>();
+
+        if (insert_query && insert_query->table_id)
+            /// Resolve database before trying to use async insert feature - to properly hash the query.
+            insert_query->table_id = context->resolveStorageID(insert_query->table_id);
+
         if (insert_query && insert_query->select)
         {
             /// Prepare Input storage before executing interpreter if we already got a buffer with data.
@@ -544,8 +569,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                     StoragePtr storage = context->executeTableFunction(input_function);
                     auto & input_storage = dynamic_cast<StorageInput &>(*storage);
                     auto input_metadata_snapshot = input_storage.getInMemoryMetadataPtr();
-                    auto pipe = getSourceFromFromASTInsertQuery(
-                        ast, istr, input_metadata_snapshot->getSampleBlock(), context, input_function);
+                    auto pipe = getSourceFromASTInsertQuery(
+                        ast, true, input_metadata_snapshot->getSampleBlock(), context, input_function);
                     input_storage.setPipe(std::move(pipe));
                 }
             }
@@ -554,6 +579,27 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// reset Input callbacks if query is not INSERT SELECT
             context->resetInputCallbacks();
 
+        auto * queue = context->getAsynchronousInsertQueue();
+        const bool async_insert = queue
+            && insert_query && !insert_query->select
+            && insert_query->hasInlinedData() && settings.async_insert;
+
+        if (async_insert)
+        {
+            queue->push(ast, context);
+
+            BlockIO io;
+            if (settings.wait_for_async_insert)
+            {
+                auto timeout = settings.wait_for_async_insert_timeout.totalMilliseconds();
+                auto query_id = context->getCurrentQueryId();
+                auto source = std::make_shared<WaitForAsyncInsertSource>(query_id, timeout, *queue);
+                io.pipeline.init(Pipe(source));
+            }
+
+            return std::make_tuple(ast, std::move(io));
+        }
+
         auto interpreter = InterpreterFactory::get(ast, context, SelectQueryOptions(stage).setInternal(internal));
 
         std::shared_ptr<const EnabledQuota> quota;
@@ -940,13 +986,11 @@ BlockIO executeQuery(
     const String & query,
     ContextMutablePtr context,
     bool internal,
-    QueryProcessingStage::Enum stage,
-    bool may_have_embedded_data)
+    QueryProcessingStage::Enum stage)
 {
     ASTPtr ast;
     BlockIO streams;
-    std::tie(ast, streams) = executeQueryImpl(query.data(), query.data() + query.size(), context,
-        internal, stage, !may_have_embedded_data, nullptr);
+    std::tie(ast, streams) = executeQueryImpl(query.data(), query.data() + query.size(), context, internal, stage, nullptr);
 
     if (const auto * ast_query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get()))
     {
@@ -962,14 +1006,13 @@ BlockIO executeQuery(
 }
 
 BlockIO executeQuery(
+    bool allow_processors,
     const String & query,
     ContextMutablePtr context,
     bool internal,
-    QueryProcessingStage::Enum stage,
-    bool may_have_embedded_data,
-    bool allow_processors)
+    QueryProcessingStage::Enum stage)
 {
-    BlockIO res = executeQuery(query, context, internal, stage, may_have_embedded_data);
+    BlockIO res = executeQuery(query, context, internal, stage);
 
     if (!allow_processors && res.pipeline.initialized())
         res.in = res.getInputStream();
@@ -991,25 +1034,21 @@ void executeQuery(
     const char * begin;
     const char * end;
 
-    /// If 'istr' is empty now, fetch next data into buffer.
-    if (!istr.hasPendingData())
-        istr.next();
+    istr.nextIfAtEnd();
 
     size_t max_query_size = context->getSettingsRef().max_query_size;
 
-    bool may_have_tail;
     if (istr.buffer().end() - istr.position() > static_cast<ssize_t>(max_query_size))
     {
         /// If remaining buffer space in 'istr' is enough to parse query up to 'max_query_size' bytes, then parse inplace.
         begin = istr.position();
         end = istr.buffer().end();
         istr.position() += end - begin;
-        /// Actually we don't know will query has additional data or not.
-        /// But we can't check istr.eof(), because begin and end pointers will become invalid
-        may_have_tail = true;
     }
     else
     {
+        /// FIXME: this is an extra copy not required for async insertion.
+
         /// If not - copy enough data into 'parse_buf'.
         WriteBufferFromVector<PODArray<char>> out(parse_buf);
         LimitReadBuffer limit(istr, max_query_size + 1, false);
@@ -1018,22 +1057,19 @@ void executeQuery(
 
         begin = parse_buf.data();
         end = begin + parse_buf.size();
-        /// Can check stream for eof, because we have copied data
-        may_have_tail = !istr.eof();
     }
 
     ASTPtr ast;
     BlockIO streams;
 
-    std::tie(ast, streams) = executeQueryImpl(begin, end, context, false, QueryProcessingStage::Complete, may_have_tail, &istr);
-
+    std::tie(ast, streams) = executeQueryImpl(begin, end, context, false, QueryProcessingStage::Complete, &istr);
     auto & pipeline = streams.pipeline;
 
     try
     {
         if (streams.out)
         {
-            auto pipe = getSourceFromFromASTInsertQuery(ast, &istr, streams.out->getHeader(), context, nullptr);
+            auto pipe = getSourceFromASTInsertQuery(ast, true, streams.out->getHeader(), context, nullptr);
 
             pipeline.init(std::move(pipe));
             pipeline.resize(1);
@@ -1047,6 +1083,8 @@ void executeQuery(
         }
         else if (streams.in)
         {
+            assert(!pipeline.initialized());
+
             const auto * ast_query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get());
 
             WriteBuffer * out_buf = &ostr;
@@ -1057,9 +1095,17 @@ void executeQuery(
                     throw Exception("INTO OUTFILE is not allowed", ErrorCodes::INTO_OUTFILE_NOT_ALLOWED);
 
                 const auto & out_file = ast_query_with_output->out_file->as<ASTLiteral &>().value.safeGet<std::string>();
+
+                std::string compression_method;
+                if (ast_query_with_output->compression)
+                {
+                    const auto & compression_method_node = ast_query_with_output->compression->as<ASTLiteral &>();
+                    compression_method = compression_method_node.value.safeGet<std::string>();
+                }
+
                 compressed_buffer = wrapWriteBufferWithCompressionMethod(
                     std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
-                    chooseCompressionMethod(out_file, ""),
+                    chooseCompressionMethod(out_file, compression_method),
                     /* compression level = */ 3
                 );
             }
@@ -1105,9 +1151,17 @@ void executeQuery(
                     throw Exception("INTO OUTFILE is not allowed", ErrorCodes::INTO_OUTFILE_NOT_ALLOWED);
 
                 const auto & out_file = typeid_cast<const ASTLiteral &>(*ast_query_with_output->out_file).value.safeGet<std::string>();
+
+                std::string compression_method;
+                if (ast_query_with_output->compression)
+                {
+                    const auto & compression_method_node = ast_query_with_output->compression->as<ASTLiteral &>();
+                    compression_method = compression_method_node.value.safeGet<std::string>();
+                }
+
                 compressed_buffer = wrapWriteBufferWithCompressionMethod(
                     std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
-                    chooseCompressionMethod(out_file, ""),
+                    chooseCompressionMethod(out_file, compression_method),
                     /* compression level = */ 3
                 );
             }
@@ -1162,6 +1216,10 @@ void executeQuery(
                 executor->execute(pipeline.getNumThreads());
             }
         }
+        else
+        {
+            /// It's possible to have queries without input and output.
+        }
     }
     catch (...)
     {
diff --git a/src/Interpreters/executeQuery.h b/src/Interpreters/executeQuery.h
index 9672c4e7517..6f932caa30a 100644
--- a/src/Interpreters/executeQuery.h
+++ b/src/Interpreters/executeQuery.h
@@ -41,18 +41,16 @@ BlockIO executeQuery(
     const String & query,     /// Query text without INSERT data. The latter must be written to BlockIO::out.
     ContextMutablePtr context,       /// DB, tables, data types, storage engines, functions, aggregate functions...
     bool internal = false,    /// If true, this query is caused by another query and thus needn't be registered in the ProcessList.
-    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete,    /// To which stage the query must be executed.
-    bool may_have_embedded_data = false /// If insert query may have embedded data
+    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete    /// To which stage the query must be executed.
 );
 
 /// Old interface with allow_processors flag. For compatibility.
 BlockIO executeQuery(
+    bool allow_processors,  /// If can use processors pipeline
     const String & query,
     ContextMutablePtr context,
-    bool internal,
-    QueryProcessingStage::Enum stage,
-    bool may_have_embedded_data,
-    bool allow_processors /// If can use processors pipeline
+    bool internal = false,
+    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete
 );
 
 /// Executes BlockIO returned from executeQuery(...)
diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index e40e0635a85..4ba924821d7 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -63,8 +63,11 @@ void addDefaultRequiredExpressionsRecursively(
         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);
     }
-    else
+    else if (columns.has(required_column_name))
     {
+        /// In case of dictGet function we allow to use it with identifier dictGet(identifier, 'column_name', key_expression)
+        /// and this identifier will be in required columns. If such column is not in ColumnsDescription we ignore it.
+
         /// This column is required, but doesn't have default expression, so lets use "default default"
         auto column = columns.get(required_column_name);
         auto default_value = column.type->getDefault();
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/join_common.cpp
index b097a8f6192..9a4cdd97c13 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/join_common.cpp
@@ -399,7 +399,7 @@ void checkTypesOfKeys(const Block & block_left, const Names & key_names_left,
 void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, const String & condition_name_left,
                       const Block & block_right, const Names & key_names_right, const String & condition_name_right)
 {
-    checkTypesOfKeys(block_left, key_names_left,block_right,key_names_right);
+    checkTypesOfKeys(block_left, key_names_left, block_right, key_names_right);
     checkTypesOfMasks(block_left, condition_name_left, block_right, condition_name_right);
 }
 
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index 458e17ac16b..858b4281f5a 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -11,6 +11,7 @@
 #include <Interpreters/loadMetadata.h>
 
 #include <Databases/DatabaseOrdinary.h>
+#include <Databases/TablesLoader.h>
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
@@ -43,10 +44,16 @@ static void executeCreateQuery(
     interpreter.setInternal(true);
     interpreter.setForceAttach(true);
     interpreter.setForceRestoreData(has_force_restore_data_flag);
-    interpreter.setSkipStartupTables(true);
+    interpreter.setLoadDatabaseWithoutTables(true);
     interpreter.execute();
 }
 
+static bool isSystemOrInformationSchema(const String & database_name)
+{
+    return database_name == DatabaseCatalog::SYSTEM_DATABASE ||
+           database_name == DatabaseCatalog::INFORMATION_SCHEMA ||
+           database_name == DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE;
+}
 
 static void loadDatabase(
     ContextMutablePtr context,
@@ -116,7 +123,7 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
             if (fs::path(current_file).extension() == ".sql")
             {
                 String db_name = fs::path(current_file).stem();
-                if (db_name != DatabaseCatalog::SYSTEM_DATABASE)
+                if (!isSystemOrInformationSchema(db_name))
                     databases.emplace(unescapeForFileName(db_name), fs::path(path) / db_name);
             }
 
@@ -142,7 +149,7 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
         if (current_file.at(0) == '.')
             continue;
 
-        if (current_file == DatabaseCatalog::SYSTEM_DATABASE)
+        if (isSystemOrInformationSchema(current_file))
             continue;
 
         databases.emplace(unescapeForFileName(current_file), it->path().string());
@@ -155,8 +162,16 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
     if (create_default_db_if_not_exists && !metadata_dir_for_default_db_already_exists)
         databases.emplace(default_database_name, path + "/" + escapeForFileName(default_database_name));
 
+    TablesLoader::Databases loaded_databases;
     for (const auto & [name, db_path] : databases)
+    {
         loadDatabase(context, name, db_path, has_force_restore_data_flag);
+        loaded_databases.insert({name, DatabaseCatalog::instance().getDatabase(name)});
+    }
+
+    TablesLoader loader{context, std::move(loaded_databases), has_force_restore_data_flag, /* force_attach */ true};
+    loader.loadTables();
+    loader.startupTables();
 
     if (has_force_restore_data_flag)
     {
@@ -171,25 +186,48 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
     }
 }
 
-
-void loadMetadataSystem(ContextMutablePtr context)
+static void loadSystemDatabaseImpl(ContextMutablePtr context, const String & database_name, const String & default_engine)
 {
-    String path = context->getPath() + "metadata/" + DatabaseCatalog::SYSTEM_DATABASE;
+    String path = context->getPath() + "metadata/" + database_name;
     String metadata_file = path + ".sql";
     if (fs::exists(fs::path(path)) || fs::exists(fs::path(metadata_file)))
     {
         /// 'has_force_restore_data_flag' is true, to not fail on loading query_log table, if it is corrupted.
-        loadDatabase(context, DatabaseCatalog::SYSTEM_DATABASE, path, true);
+        loadDatabase(context, database_name, path, true);
     }
     else
     {
         /// Initialize system database manually
         String database_create_query = "CREATE DATABASE ";
-        database_create_query += DatabaseCatalog::SYSTEM_DATABASE;
-        database_create_query += " ENGINE=Atomic";
-        executeCreateQuery(database_create_query, context, DatabaseCatalog::SYSTEM_DATABASE, "<no file>", true);
+        database_create_query += database_name;
+        database_create_query += " ENGINE=";
+        database_create_query += default_engine;
+        executeCreateQuery(database_create_query, context, database_name, "<no file>", true);
     }
+}
 
+
+void startupSystemTables()
+{
+    ThreadPool pool;
+    DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, /* force_restore */ true, /* force_attach */ true);
+}
+
+void loadMetadataSystem(ContextMutablePtr context)
+{
+    loadSystemDatabaseImpl(context, DatabaseCatalog::SYSTEM_DATABASE, "Atomic");
+    loadSystemDatabaseImpl(context, DatabaseCatalog::INFORMATION_SCHEMA, "Memory");
+    loadSystemDatabaseImpl(context, DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE, "Memory");
+
+    TablesLoader::Databases databases =
+    {
+        {DatabaseCatalog::SYSTEM_DATABASE, DatabaseCatalog::instance().getSystemDatabase()},
+        {DatabaseCatalog::INFORMATION_SCHEMA, DatabaseCatalog::instance().getDatabase(DatabaseCatalog::INFORMATION_SCHEMA)},
+        {DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE, DatabaseCatalog::instance().getDatabase(DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE)},
+    };
+    TablesLoader loader{context, databases, /* force_restore */ true, /* force_attach */ true};
+    loader.loadTables();
+    /// Will startup tables in system database after all databases are loaded.
 }
 
 }
diff --git a/src/Interpreters/loadMetadata.h b/src/Interpreters/loadMetadata.h
index cf038a42855..e918b5f530c 100644
--- a/src/Interpreters/loadMetadata.h
+++ b/src/Interpreters/loadMetadata.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Interpreters/Context_fwd.h>
+#include <Databases/TablesLoader.h>
 
 
 namespace DB
@@ -10,7 +11,12 @@ namespace DB
 /// You should first load system database, then attach system tables that you need into it, then load other databases.
 void loadMetadataSystem(ContextMutablePtr context);
 
-/// Load tables from databases and add them to context. Database 'system' is ignored. Use separate function to load system tables.
+/// Load tables from databases and add them to context. Database 'system' and 'information_schema' is ignored.
+/// Use separate function to load system tables.
 void loadMetadata(ContextMutablePtr context, const String & default_database_name = {});
 
+/// Background operations in system tables may slowdown loading of the rest tables,
+/// so we startup system tables after all databases are loaded.
+void startupSystemTables();
+
 }
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.cpp b/src/Interpreters/replaceAliasColumnsInQuery.cpp
index 604ba3590ae..fc6a97e2039 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.cpp
+++ b/src/Interpreters/replaceAliasColumnsInQuery.cpp
@@ -7,9 +7,13 @@ namespace DB
 {
 
 bool replaceAliasColumnsInQuery(
-    ASTPtr & ast, const ColumnsDescription & columns, const NameToNameMap & array_join_result_to_source, ContextPtr context)
+        ASTPtr & ast,
+        const ColumnsDescription & columns,
+        const NameToNameMap & array_join_result_to_source,
+        ContextPtr context,
+        const std::unordered_set<IAST *> & excluded_nodes)
 {
-    ColumnAliasesVisitor::Data aliases_column_data(columns, array_join_result_to_source, context);
+    ColumnAliasesVisitor::Data aliases_column_data(columns, array_join_result_to_source, context, excluded_nodes);
     ColumnAliasesVisitor aliases_column_visitor(aliases_column_data);
     aliases_column_visitor.visit(ast);
     return aliases_column_data.changed;
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.h b/src/Interpreters/replaceAliasColumnsInQuery.h
index 5d9207ad11b..7f5fee3b14b 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.h
+++ b/src/Interpreters/replaceAliasColumnsInQuery.h
@@ -12,6 +12,10 @@ class ColumnsDescription;
 
 /// Replace storage alias columns in select query if possible. Return true if the query is changed.
 bool replaceAliasColumnsInQuery(
-    ASTPtr & ast, const ColumnsDescription & columns, const NameToNameMap & array_join_result_to_source, ContextPtr context);
+        ASTPtr & ast,
+        const ColumnsDescription & columns,
+        const NameToNameMap & array_join_result_to_source,
+        ContextPtr context,
+        const std::unordered_set<IAST *> & excluded_nodes = {});
 
 }
diff --git a/src/Interpreters/ya.make b/src/Interpreters/ya.make
deleted file mode 100644
index e0c0c475dad..00000000000
--- a/src/Interpreters/ya.make
+++ /dev/null
@@ -1,192 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/libdivide
-    contrib/libs/pdqsort
-)
-
-PEERDIR(
-    clickhouse/src/Core
-    contrib/libs/libdivide
-    contrib/libs/pdqsort
-)
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-    ActionLocksManager.cpp
-    ActionsDAG.cpp
-    ActionsVisitor.cpp
-    AggregateDescription.cpp
-    Aggregator.cpp
-    ApplyWithAliasVisitor.cpp
-    ApplyWithGlobalVisitor.cpp
-    ApplyWithSubqueryVisitor.cpp
-    ArithmeticOperationsInAgrFuncOptimize.cpp
-    ArrayJoinAction.cpp
-    AsynchronousMetricLog.cpp
-    AsynchronousMetrics.cpp
-    BloomFilter.cpp
-    CatBoostModel.cpp
-    ClientInfo.cpp
-    Cluster.cpp
-    ClusterProxy/SelectStreamFactory.cpp
-    ClusterProxy/executeQuery.cpp
-    CollectJoinOnKeysVisitor.cpp
-    ColumnAliasesVisitor.cpp
-    Context.cpp
-    ConvertStringsToEnumVisitor.cpp
-    CrashLog.cpp
-    CrossToInnerJoinVisitor.cpp
-    DDLTask.cpp
-    DDLWorker.cpp
-    DNSCacheUpdater.cpp
-    DatabaseAndTableWithAlias.cpp
-    DatabaseCatalog.cpp
-    DictionaryReader.cpp
-    EmbeddedDictionaries.cpp
-    ExecuteScalarSubqueriesVisitor.cpp
-    ExpressionActions.cpp
-    ExpressionActionsSettings.cpp
-    ExpressionAnalyzer.cpp
-    ExternalDictionariesLoader.cpp
-    ExternalLoader.cpp
-    ExternalLoaderDictionaryStorageConfigRepository.cpp
-    ExternalLoaderTempConfigRepository.cpp
-    ExternalLoaderXMLConfigRepository.cpp
-    ExternalModelsLoader.cpp
-    ExtractExpressionInfoVisitor.cpp
-    FillingRow.cpp
-    FunctionNameNormalizer.cpp
-    HashJoin.cpp
-    IExternalLoadable.cpp
-    IInterpreter.cpp
-    IInterpreterUnionOrSelectQuery.cpp
-    IdentifierSemantic.cpp
-    InJoinSubqueriesPreprocessor.cpp
-    InternalTextLogsQueue.cpp
-    InterpreterAlterQuery.cpp
-    InterpreterBackupQuery.cpp
-    InterpreterCheckQuery.cpp
-    InterpreterCreateFunctionQuery.cpp
-    InterpreterCreateQuery.cpp
-    InterpreterCreateQuotaQuery.cpp
-    InterpreterCreateRoleQuery.cpp
-    InterpreterCreateRowPolicyQuery.cpp
-    InterpreterCreateSettingsProfileQuery.cpp
-    InterpreterCreateUserQuery.cpp
-    InterpreterDescribeQuery.cpp
-    InterpreterDropAccessEntityQuery.cpp
-    InterpreterDropFunctionQuery.cpp
-    InterpreterDropQuery.cpp
-    InterpreterExistsQuery.cpp
-    InterpreterExplainQuery.cpp
-    InterpreterExternalDDLQuery.cpp
-    InterpreterFactory.cpp
-    InterpreterGrantQuery.cpp
-    InterpreterInsertQuery.cpp
-    InterpreterKillQueryQuery.cpp
-    InterpreterOptimizeQuery.cpp
-    InterpreterRenameQuery.cpp
-    InterpreterSelectIntersectExceptQuery.cpp
-    InterpreterSelectQuery.cpp
-    InterpreterSelectWithUnionQuery.cpp
-    InterpreterSetQuery.cpp
-    InterpreterSetRoleQuery.cpp
-    InterpreterShowAccessEntitiesQuery.cpp
-    InterpreterShowAccessQuery.cpp
-    InterpreterShowCreateAccessEntityQuery.cpp
-    InterpreterShowCreateQuery.cpp
-    InterpreterShowGrantsQuery.cpp
-    InterpreterShowPrivilegesQuery.cpp
-    InterpreterShowProcesslistQuery.cpp
-    InterpreterShowTablesQuery.cpp
-    InterpreterSystemQuery.cpp
-    InterpreterUseQuery.cpp
-    InterpreterWatchQuery.cpp
-    InterserverCredentials.cpp
-    JoinSwitcher.cpp
-    JoinToSubqueryTransformVisitor.cpp
-    JoinedTables.cpp
-    Lemmatizers.cpp
-    LogicalExpressionsOptimizer.cpp
-    MarkTableIdentifiersVisitor.cpp
-    MergeJoin.cpp
-    MetricLog.cpp
-    MutationsInterpreter.cpp
-    MySQL/InterpretersMySQLDDLQuery.cpp
-    NormalizeSelectWithUnionQueryVisitor.cpp
-    NullableUtils.cpp
-    OpenTelemetrySpanLog.cpp
-    OptimizeIfChains.cpp
-    OptimizeIfWithConstantConditionVisitor.cpp
-    OptimizeShardingKeyRewriteInVisitor.cpp
-    PartLog.cpp
-    PredicateExpressionsOptimizer.cpp
-    PredicateRewriteVisitor.cpp
-    ProcessList.cpp
-    ProfileEventsExt.cpp
-    QueryAliasesVisitor.cpp
-    QueryLog.cpp
-    QueryNormalizer.cpp
-    QueryParameterVisitor.cpp
-    QueryThreadLog.cpp
-    QueryViewsLog.cpp
-    RemoveInjectiveFunctionsVisitor.cpp
-    RenameColumnVisitor.cpp
-    ReplaceQueryParameterVisitor.cpp
-    RequiredSourceColumnsData.cpp
-    RequiredSourceColumnsVisitor.cpp
-    RewriteAnyFunctionVisitor.cpp
-    RewriteCountVariantsVisitor.cpp
-    RewriteFunctionToSubcolumnVisitor.cpp
-    RewriteSumIfFunctionVisitor.cpp
-    RowRefs.cpp
-    SelectIntersectExceptQueryVisitor.cpp
-    Session.cpp
-    Set.cpp
-    SetVariants.cpp
-    SortedBlocksWriter.cpp
-    StorageID.cpp
-    SubqueryForSet.cpp
-    SynonymsExtensions.cpp
-    SystemLog.cpp
-    TableJoin.cpp
-    TablesStatus.cpp
-    TextLog.cpp
-    ThreadStatusExt.cpp
-    TraceLog.cpp
-    TranslateQualifiedNamesVisitor.cpp
-    TreeOptimizer.cpp
-    TreeRewriter.cpp
-    UserDefinedFunctionFactory.cpp
-    UserDefinedFunctionsVisitor.cpp
-    UserDefinedObjectsLoader.cpp
-    WindowDescription.cpp
-    ZooKeeperLog.cpp
-    addMissingDefaults.cpp
-    addTypeConversionToAST.cpp
-    castColumn.cpp
-    convertFieldToType.cpp
-    createBlockSelector.cpp
-    evaluateConstantExpression.cpp
-    executeDDLQueryOnCluster.cpp
-    executeQuery.cpp
-    getClusterName.cpp
-    getHeaderForProcessingStage.cpp
-    getTableExpressions.cpp
-    inplaceBlockConversions.cpp
-    interpretSubquery.cpp
-    join_common.cpp
-    loadMetadata.cpp
-    processColumnTransformers.cpp
-    replaceAliasColumnsInQuery.cpp
-    sortBlock.cpp
-
-)
-
-END()
diff --git a/src/Interpreters/ya.make.in b/src/Interpreters/ya.make.in
deleted file mode 100644
index 4481f8c6136..00000000000
--- a/src/Interpreters/ya.make.in
+++ /dev/null
@@ -1,23 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/libdivide
-    contrib/libs/pdqsort
-)
-
-PEERDIR(
-    clickhouse/src/Core
-    contrib/libs/libdivide
-    contrib/libs/pdqsort
-)
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F JIT | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Parsers/ASTAlterQuery.cpp b/src/Parsers/ASTAlterQuery.cpp
index 4b70f25f5c5..1aa116fefc4 100644
--- a/src/Parsers/ASTAlterQuery.cpp
+++ b/src/Parsers/ASTAlterQuery.cpp
@@ -400,6 +400,11 @@ void ASTAlterCommand::formatImpl(
         settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "RESET SETTING " << (settings.hilite ? hilite_none : "");
         settings_resets->formatImpl(settings, state, frame);
     }
+    else if (type == ASTAlterCommand::MODIFY_DATABASE_SETTING)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MODIFY SETTING " << (settings.hilite ? hilite_none : "");
+        settings_changes->formatImpl(settings, state, frame);
+    }
     else if (type == ASTAlterCommand::MODIFY_QUERY)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MODIFY QUERY " << settings.nl_or_ws << (settings.hilite ? hilite_none : "");
@@ -472,11 +477,24 @@ void ASTAlterQuery::formatQueryImpl(const FormatSettings & settings, FormatState
     frame.need_parens = false;
 
     std::string indent_str = settings.one_line ? "" : std::string(4u * frame.indent, ' ');
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str;
 
-    if (is_live_view)
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ALTER LIVE VIEW " << (settings.hilite ? hilite_none : "");
-    else
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ALTER TABLE " << (settings.hilite ? hilite_none : "");
+    switch (alter_object)
+    {
+        case AlterObjectType::TABLE:
+            settings.ostr << "ALTER TABLE ";
+            break;
+        case AlterObjectType::DATABASE:
+            settings.ostr << "ALTER DATABASE ";
+            break;
+        case AlterObjectType::LIVE_VIEW:
+            settings.ostr << "ALTER LIVE VIEW ";
+            break;
+        default:
+            break;
+    }
+
+    settings.ostr << (settings.hilite ? hilite_none : "");
 
     if (!table.empty())
     {
@@ -487,6 +505,11 @@ void ASTAlterQuery::formatQueryImpl(const FormatSettings & settings, FormatState
         }
         settings.ostr << indent_str << backQuoteIfNeed(table);
     }
+    else if (alter_object == AlterObjectType::DATABASE && !database.empty())
+    {
+        settings.ostr << indent_str << backQuoteIfNeed(database);
+    }
+
     formatOnCluster(settings);
     settings.ostr << settings.nl_or_ws;
 
diff --git a/src/Parsers/ASTAlterQuery.h b/src/Parsers/ASTAlterQuery.h
index a5410e797ce..7c301d581e6 100644
--- a/src/Parsers/ASTAlterQuery.h
+++ b/src/Parsers/ASTAlterQuery.h
@@ -70,6 +70,8 @@ public:
         NO_TYPE,
 
         LIVE_VIEW_REFRESH,
+
+        MODIFY_DATABASE_SETTING,
     };
 
     Type type = NO_TYPE;
@@ -210,7 +212,15 @@ protected:
 class ASTAlterQuery : public ASTQueryWithTableAndOutput, public ASTQueryWithOnCluster
 {
 public:
-    bool is_live_view{false}; /// true for ALTER LIVE VIEW
+    enum class AlterObjectType
+    {
+        TABLE,
+        DATABASE,
+        LIVE_VIEW,
+        UNKNOWN,
+    };
+
+    AlterObjectType alter_object = AlterObjectType::UNKNOWN;
 
     ASTExpressionList * command_list = nullptr;
 
diff --git a/src/Parsers/ASTInsertQuery.cpp b/src/Parsers/ASTInsertQuery.cpp
index 745585ae175..3c8c31b85dd 100644
--- a/src/Parsers/ASTInsertQuery.cpp
+++ b/src/Parsers/ASTInsertQuery.cpp
@@ -57,6 +57,8 @@ void ASTInsertQuery::formatImpl(const FormatSettings & settings, FormatState & s
         if (infile)
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM INFILE " << (settings.hilite ? hilite_none : "") << infile->as<ASTLiteral &>().value.safeGet<std::string>();
+            if (compression)
+                settings.ostr << (settings.hilite ? hilite_keyword : "") << " COMPRESSION " << (settings.hilite ? hilite_none : "") << compression->as<ASTLiteral &>().value.safeGet<std::string>();
         }
         if (!format.empty())
         {
@@ -75,6 +77,15 @@ void ASTInsertQuery::formatImpl(const FormatSettings & settings, FormatState & s
     }
 }
 
+void ASTInsertQuery::updateTreeHashImpl(SipHash & hash_state) const
+{
+    hash_state.update(table_id.database_name);
+    hash_state.update(table_id.table_name);
+    hash_state.update(table_id.uuid);
+    hash_state.update(format);
+    IAST::updateTreeHashImpl(hash_state);
+}
+
 
 static void tryFindInputFunctionImpl(const ASTPtr & ast, ASTPtr & input_function)
 {
diff --git a/src/Parsers/ASTInsertQuery.h b/src/Parsers/ASTInsertQuery.h
index 6eab3e7acac..81925ec2e66 100644
--- a/src/Parsers/ASTInsertQuery.h
+++ b/src/Parsers/ASTInsertQuery.h
@@ -1,34 +1,37 @@
 #pragma once
 
-#include <Parsers/IAST.h>
 #include <Interpreters/StorageID.h>
-#include "Parsers/IAST_fwd.h"
+#include <Parsers/IAST.h>
 
 namespace DB
 {
 
+class ReadBuffer;
 
-/** INSERT query
-  */
+/// INSERT query
 class ASTInsertQuery : public IAST
 {
 public:
     StorageID table_id = StorageID::createEmpty();
     ASTPtr columns;
     String format;
-    ASTPtr select;
-    ASTPtr infile;
-    ASTPtr watch;
     ASTPtr table_function;
     ASTPtr partition_by;
     ASTPtr settings_ast;
 
-    /// Data to insert
+    ASTPtr select;
+    ASTPtr watch;
+    ASTPtr infile;
+    ASTPtr compression;
+
+    /// Data inlined into query
     const char * data = nullptr;
     const char * end = nullptr;
 
-    /// Query has additional data, which will be sent later
-    bool has_tail = false;
+    /// Data from buffer to insert after inlined one - may be nullptr.
+    ReadBuffer * tail = nullptr;
+
+    bool hasInlinedData() const { return data || tail; }
 
     /// Try to find table function input() in SELECT part
     void tryFindInputFunction(ASTPtr & input_function) const;
@@ -55,6 +58,7 @@ public:
 
 protected:
     void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+    void updateTreeHashImpl(SipHash & hash_state) const override;
 };
 
 }
diff --git a/src/Parsers/ASTQueryWithOutput.h b/src/Parsers/ASTQueryWithOutput.h
index 92f9331f259..10852467a76 100644
--- a/src/Parsers/ASTQueryWithOutput.h
+++ b/src/Parsers/ASTQueryWithOutput.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/IAST.h>
 #include <IO/Operators.h>
+#include "Parsers/IAST_fwd.h"
 
 
 namespace DB
@@ -16,6 +17,7 @@ public:
     ASTPtr out_file;
     ASTPtr format;
     ASTPtr settings_ast;
+    ASTPtr compression;
 
     void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const final;
 
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index 7699d380623..1c5a4310f1b 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -319,24 +319,16 @@ bool ASTSelectQuery::withFill() const
 }
 
 
-ASTPtr ASTSelectQuery::arrayJoinExpressionList(bool & is_left) const
+std::pair<ASTPtr, bool> ASTSelectQuery::arrayJoinExpressionList() const
 {
     const ASTArrayJoin * array_join = getFirstArrayJoin(*this);
     if (!array_join)
         return {};
 
-    is_left = (array_join->kind == ASTArrayJoin::Kind::Left);
-    return array_join->expression_list;
+    bool is_left = (array_join->kind == ASTArrayJoin::Kind::Left);
+    return {array_join->expression_list, is_left};
 }
 
-
-ASTPtr ASTSelectQuery::arrayJoinExpressionList() const
-{
-    bool is_left;
-    return arrayJoinExpressionList(is_left);
-}
-
-
 const ASTTablesInSelectQueryElement * ASTSelectQuery::join() const
 {
     return getFirstTableJoin(*this);
diff --git a/src/Parsers/ASTSelectQuery.h b/src/Parsers/ASTSelectQuery.h
index 2babc2f75c8..2b004e9e040 100644
--- a/src/Parsers/ASTSelectQuery.h
+++ b/src/Parsers/ASTSelectQuery.h
@@ -123,8 +123,8 @@ public:
     /// Compatibility with old parser of tables list. TODO remove
     ASTPtr sampleSize() const;
     ASTPtr sampleOffset() const;
-    ASTPtr arrayJoinExpressionList(bool & is_left) const;
-    ASTPtr arrayJoinExpressionList() const;
+    std::pair<ASTPtr, bool> arrayJoinExpressionList() const;
+
     const ASTTablesInSelectQueryElement * join() const;
     bool final() const;
     bool withFill() const;
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index 5d01e124b0e..ba8e49b98ca 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -3,106 +3,41 @@
 #include <Common/quoteString.h>
 #include <IO/Operators.h>
 
+#include <magic_enum.hpp>
 
 namespace DB
 {
 
-
-namespace ErrorCodes
+namespace
 {
-    extern const int LOGICAL_ERROR;
-}
-
-
-const char * ASTSystemQuery::typeToString(Type type)
-{
-    switch (type)
+    std::vector<std::string> getTypeIndexToTypeName()
     {
-        case Type::SHUTDOWN:
-            return "SHUTDOWN";
-        case Type::KILL:
-            return "KILL";
-        case Type::SUSPEND:
-            return "SUSPEND";
-        case Type::DROP_DNS_CACHE:
-            return "DROP DNS CACHE";
-        case Type::DROP_MARK_CACHE:
-            return "DROP MARK CACHE";
-        case Type::DROP_UNCOMPRESSED_CACHE:
-            return "DROP UNCOMPRESSED CACHE";
-        case Type::DROP_MMAP_CACHE:
-            return "DROP MMAP CACHE";
-#if USE_EMBEDDED_COMPILER
-        case Type::DROP_COMPILED_EXPRESSION_CACHE:
-            return "DROP COMPILED EXPRESSION CACHE";
-#endif
-        case Type::STOP_LISTEN_QUERIES:
-            return "STOP LISTEN QUERIES";
-        case Type::START_LISTEN_QUERIES:
-            return "START LISTEN QUERIES";
-        case Type::RESTART_REPLICAS:
-            return "RESTART REPLICAS";
-        case Type::RESTART_REPLICA:
-            return "RESTART REPLICA";
-        case Type::RESTORE_REPLICA:
-            return "RESTORE REPLICA";
-        case Type::DROP_REPLICA:
-            return "DROP REPLICA";
-        case Type::SYNC_REPLICA:
-            return "SYNC REPLICA";
-        case Type::FLUSH_DISTRIBUTED:
-            return "FLUSH DISTRIBUTED";
-        case Type::RELOAD_DICTIONARY:
-            return "RELOAD DICTIONARY";
-        case Type::RELOAD_DICTIONARIES:
-            return "RELOAD DICTIONARIES";
-        case Type::RELOAD_MODEL:
-            return "RELOAD MODEL";
-        case Type::RELOAD_MODELS:
-            return "RELOAD MODELS";
-        case Type::RELOAD_EMBEDDED_DICTIONARIES:
-            return "RELOAD EMBEDDED DICTIONARIES";
-        case Type::RELOAD_CONFIG:
-            return "RELOAD CONFIG";
-        case Type::RELOAD_SYMBOLS:
-            return "RELOAD SYMBOLS";
-        case Type::STOP_MERGES:
-            return "STOP MERGES";
-        case Type::START_MERGES:
-            return "START MERGES";
-        case Type::STOP_TTL_MERGES:
-            return "STOP TTL MERGES";
-        case Type::START_TTL_MERGES:
-            return "START TTL MERGES";
-        case Type::STOP_MOVES:
-            return "STOP MOVES";
-        case Type::START_MOVES:
-            return "START MOVES";
-        case Type::STOP_FETCHES:
-            return "STOP FETCHES";
-        case Type::START_FETCHES:
-            return "START FETCHES";
-        case Type::STOP_REPLICATED_SENDS:
-            return "STOP REPLICATED SENDS";
-        case Type::START_REPLICATED_SENDS:
-            return "START REPLICATED SENDS";
-        case Type::STOP_REPLICATION_QUEUES:
-            return "STOP REPLICATION QUEUES";
-        case Type::START_REPLICATION_QUEUES:
-            return "START REPLICATION QUEUES";
-        case Type::STOP_DISTRIBUTED_SENDS:
-            return "STOP DISTRIBUTED SENDS";
-        case Type::START_DISTRIBUTED_SENDS:
-            return "START DISTRIBUTED SENDS";
-        case Type::FLUSH_LOGS:
-            return "FLUSH LOGS";
-        case Type::RESTART_DISK:
-            return "RESTART DISK";
-        default:
-            throw Exception("Unknown SYSTEM query command", ErrorCodes::LOGICAL_ERROR);
+        constexpr std::size_t types_size = magic_enum::enum_count<ASTSystemQuery::Type>();
+
+        std::vector<std::string> type_index_to_type_name;
+        type_index_to_type_name.resize(types_size);
+
+        auto entries = magic_enum::enum_entries<ASTSystemQuery::Type>();
+        for (const auto & [entry, str] : entries)
+        {
+            auto str_copy = String(str);
+            std::replace(str_copy.begin(), str_copy.end(), '_', ' ');
+            type_index_to_type_name[static_cast<UInt64>(entry)] = std::move(str_copy);
+        }
+
+        return type_index_to_type_name;
     }
 }
 
+const char * ASTSystemQuery::typeToString(Type type)
+{
+    /** During parsing if SystemQuery is not parsed properly it is added to Expected variants as description check IParser.h.
+      * Description string must be statically allocated.
+      */
+    static std::vector<std::string> type_index_to_type_name = getTypeIndexToTypeName();
+    const auto & type_name = type_index_to_type_name[static_cast<UInt64>(type)];
+    return type_name.data();
+}
 
 void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
 {
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index fa7b6ece59a..2248818fd0f 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -15,7 +15,7 @@ class ASTSystemQuery : public IAST, public ASTQueryWithOnCluster
 {
 public:
 
-    enum class Type
+    enum class Type : UInt64
     {
         UNKNOWN,
         SHUTDOWN,
@@ -39,6 +39,8 @@ public:
         RELOAD_DICTIONARIES,
         RELOAD_MODEL,
         RELOAD_MODELS,
+        RELOAD_FUNCTION,
+        RELOAD_FUNCTIONS,
         RELOAD_EMBEDDED_DICTIONARIES,
         RELOAD_CONFIG,
         RELOAD_SYMBOLS,
@@ -59,6 +61,8 @@ public:
         FLUSH_DISTRIBUTED,
         STOP_DISTRIBUTED_SENDS,
         START_DISTRIBUTED_SENDS,
+        START_THREAD_FUZZER,
+        STOP_THREAD_FUZZER,
         END
     };
 
@@ -67,6 +71,7 @@ public:
     Type type = Type::UNKNOWN;
 
     String target_model;
+    String target_function;
     String database;
     String table;
     String replica;
diff --git a/src/Parsers/ASTTablesInSelectQuery.h b/src/Parsers/ASTTablesInSelectQuery.h
index 8b489974804..9d31ca6f653 100644
--- a/src/Parsers/ASTTablesInSelectQuery.h
+++ b/src/Parsers/ASTTablesInSelectQuery.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Parsers/IAST.h>
+#include <common/EnumReflection.h>
 
 
 namespace DB
diff --git a/src/Parsers/ASTWindowDefinition.cpp b/src/Parsers/ASTWindowDefinition.cpp
index 613dbcc392b..29e42de3ce0 100644
--- a/src/Parsers/ASTWindowDefinition.cpp
+++ b/src/Parsers/ASTWindowDefinition.cpp
@@ -98,7 +98,7 @@ void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
             settings.ostr << " ";
         }
 
-        settings.ostr << WindowFrame::toString(frame_type) << " BETWEEN ";
+        settings.ostr << frame_type << " BETWEEN ";
         if (frame_begin_type == WindowFrame::BoundaryType::Current)
         {
             settings.ostr << "CURRENT ROW";
diff --git a/src/Parsers/CommonParsers.cpp b/src/Parsers/CommonParsers.cpp
index d7a9ed60ac3..f1aa8c5fde2 100644
--- a/src/Parsers/CommonParsers.cpp
+++ b/src/Parsers/CommonParsers.cpp
@@ -1,52 +1,24 @@
-#include <Common/StringUtils/StringUtils.h>
 #include <Parsers/CommonParsers.h>
 #include <common/find_symbols.h>
-#include <IO/Operators.h>
-
-#include <string.h>        /// strncmp, strncasecmp
-
 
 namespace DB
 {
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-
-ParserKeyword::ParserKeyword(const char * s_) : s(s_)
-{
-}
-
-
-const char * ParserKeyword::getName() const
-{
-    return s;
-}
-
-
-bool ParserKeyword::parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected)
+bool ParserKeyword::parseImpl(Pos & pos, [[maybe_unused]] ASTPtr & node, Expected & expected)
 {
     if (pos->type != TokenType::BareWord)
         return false;
 
-    const char * current_word = s;
-
-    size_t s_length = strlen(s);
-    if (!s_length)
-        throw Exception("Logical error: keyword cannot be empty string", ErrorCodes::LOGICAL_ERROR);
-
-    const char * s_end = s + s_length;
+    const char * current_word = s.begin();
 
     while (true)
     {
         expected.add(pos, current_word);
+
         if (pos->type != TokenType::BareWord)
             return false;
 
-        const char * next_whitespace = find_first_symbols<' ', '\0'>(current_word, s_end);
-        size_t word_length = next_whitespace - current_word;
+        const char * const next_whitespace = find_first_symbols<' ', '\0'>(current_word, s.end());
+        const size_t word_length = next_whitespace - current_word;
 
         if (word_length != pos->size())
             return false;
@@ -64,5 +36,4 @@ bool ParserKeyword::parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected)
 
     return true;
 }
-
 }
diff --git a/src/Parsers/CommonParsers.h b/src/Parsers/CommonParsers.h
index 85b5217b617..9ac58f2f2ed 100644
--- a/src/Parsers/CommonParsers.h
+++ b/src/Parsers/CommonParsers.h
@@ -13,13 +13,14 @@ namespace DB
 class ParserKeyword : public IParserBase
 {
 private:
-    const char * s;
+    std::string_view s;
 
 public:
-    ParserKeyword(const char * s_);
+    //NOLINTNEXTLINE Want to be able to init ParserKeyword("literal")
+    constexpr ParserKeyword(std::string_view s_): s(s_) { assert(!s.empty()); }
 
 protected:
-    const char * getName() const override;
+    constexpr const char * getName() const override { return s.data(); }
 
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index ed15d5f2a86..d2fe79b2d06 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -103,26 +103,34 @@ bool ParserParenthesisExpression::parseImpl(Pos & pos, ASTPtr & node, Expected &
 
     const auto & expr_list = contents_node->as<ASTExpressionList &>();
 
-    /// empty expression in parentheses is not allowed
+    /// Empty expression in parentheses is not allowed.
     if (expr_list.children.empty())
     {
         expected.add(pos, "non-empty parenthesized list of expressions");
         return false;
     }
 
+    /// Special case for one-element tuple.
     if (expr_list.children.size() == 1 && is_elem)
     {
-        node = expr_list.children.front();
-    }
-    else
-    {
-        auto function_node = std::make_shared<ASTFunction>();
-        function_node->name = "tuple";
-        function_node->arguments = contents_node;
-        function_node->children.push_back(contents_node);
-        node = function_node;
+        auto * ast_literal = expr_list.children.front()->as<ASTLiteral>();
+        /// But only if its argument is not tuple,
+        /// since otherwise it will do incorrect transformation:
+        ///
+        ///     (foo,bar) IN (('foo','bar')) -> (foo,bar) IN ('foo','bar')
+        if (!(ast_literal && ast_literal->value.getType() == Field::Types::Tuple))
+        {
+            node = expr_list.children.front();
+            return true;
+        }
     }
 
+    auto function_node = std::make_shared<ASTFunction>();
+    function_node->name = "tuple";
+    function_node->arguments = contents_node;
+    function_node->children.push_back(contents_node);
+    node = function_node;
+
     return true;
 }
 
@@ -1516,6 +1524,25 @@ bool ParserNull::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         return false;
 }
 
+static bool parseNumber(char * buffer, size_t size, bool negative, int base, Field & res)
+{
+    errno = 0;    /// Functions strto* don't clear errno.
+
+    char * pos_integer = buffer;
+    UInt64 uint_value = std::strtoull(buffer, &pos_integer, base);
+
+    if (pos_integer == buffer + size && errno != ERANGE && (!negative || uint_value <= (1ULL << 63)))
+    {
+        if (negative)
+            res = static_cast<Int64>(-uint_value);
+        else
+            res = uint_value;
+
+        return true;
+    }
+
+    return false;
+}
 
 bool ParserNumber::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
@@ -1556,6 +1583,22 @@ bool ParserNumber::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     Float64 float_value = std::strtod(buf, &pos_double);
     if (pos_double != buf + pos->size() || errno == ERANGE)
     {
+        /// Try to parse number as binary literal representation. Example: 0b0001.
+        if (pos->size() > 2 && buf[0] == '0' && buf[1] == 'b')
+        {
+            char * buf_skip_prefix = buf + 2;
+
+            if (parseNumber(buf_skip_prefix, pos->size() - 2, negative, 2, res))
+            {
+                auto literal = std::make_shared<ASTLiteral>(res);
+                literal->begin = literal_begin;
+                literal->end = ++pos;
+                node = literal;
+
+                return true;
+            }
+        }
+
         expected.add(pos, "number");
         return false;
     }
@@ -1570,22 +1613,13 @@ bool ParserNumber::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     /// try to use more exact type: UInt64
 
-    char * pos_integer = buf;
-
-    errno = 0;
-    UInt64 uint_value = std::strtoull(buf, &pos_integer, 0);
-    if (pos_integer == pos_double && errno != ERANGE && (!negative || uint_value <= (1ULL << 63)))
-    {
-        if (negative)
-            res = static_cast<Int64>(-uint_value);
-        else
-            res = uint_value;
-    }
+    parseNumber(buf, pos->size(), negative, 0, res);
 
     auto literal = std::make_shared<ASTLiteral>(res);
     literal->begin = literal_begin;
     literal->end = ++pos;
     node = literal;
+
     return true;
 }
 
diff --git a/src/Parsers/ParserAlterQuery.cpp b/src/Parsers/ParserAlterQuery.cpp
index f654033b296..e89302fd212 100644
--- a/src/Parsers/ParserAlterQuery.cpp
+++ b/src/Parsers/ParserAlterQuery.cpp
@@ -125,508 +125,42 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserSelectWithUnionQuery select_p;
     ParserTTLExpressionList parser_ttl_list;
 
-    if (is_live_view)
+    switch (alter_object)
     {
-        if (s_refresh.ignore(pos, expected))
+        case ASTAlterQuery::AlterObjectType::LIVE_VIEW:
         {
-            command->type = ASTAlterCommand::LIVE_VIEW_REFRESH;
-        }
-        else
-            return false;
-    }
-    else
-    {
-        if (s_add_column.ignore(pos, expected))
-        {
-            if (s_if_not_exists.ignore(pos, expected))
-                command->if_not_exists = true;
-
-            if (!parser_col_decl.parse(pos, command->col_decl, expected))
-                return false;
-
-            if (s_first.ignore(pos, expected))
-                command->first = true;
-            else if (s_after.ignore(pos, expected))
+            if (s_refresh.ignore(pos, expected))
             {
-                if (!parser_name.parse(pos, command->column, expected))
-                    return false;
-            }
-
-            command->type = ASTAlterCommand::ADD_COLUMN;
-        }
-        else if (s_rename_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
-
-            if (!s_to.ignore(pos, expected))
-                return false;
-
-            if (!parser_name.parse(pos, command->rename_to, expected))
-                return false;
-
-            command->type = ASTAlterCommand::RENAME_COLUMN;
-        }
-        else if (s_materialize_column.ignore(pos, expected))
-        {
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MATERIALIZE_COLUMN;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_drop_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PARTITION;
-        }
-        else if (s_drop_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PARTITION;
-            command->part = true;
-        }
-        else if (s_drop_detached_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
-        }
-        else if (s_drop_detached_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
-            command->part = true;
-        }
-        else if (s_drop_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_COLUMN;
-            command->detach = false;
-        }
-        else if (s_clear_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_COLUMN;
-            command->clear_column = true;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_add_index.ignore(pos, expected))
-        {
-            if (s_if_not_exists.ignore(pos, expected))
-                command->if_not_exists = true;
-
-            if (!parser_idx_decl.parse(pos, command->index_decl, expected))
-                return false;
-
-            if (s_first.ignore(pos, expected))
-                command->first = true;
-            else if (s_after.ignore(pos, expected))
-            {
-                if (!parser_name.parse(pos, command->index, expected))
-                    return false;
-            }
-
-            command->type = ASTAlterCommand::ADD_INDEX;
-        }
-        else if (s_drop_index.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->index, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_INDEX;
-            command->detach = false;
-        }
-        else if (s_clear_index.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->index, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_INDEX;
-            command->clear_index = true;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_materialize_index.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->index, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MATERIALIZE_INDEX;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_add_projection.ignore(pos, expected))
-        {
-            if (s_if_not_exists.ignore(pos, expected))
-                command->if_not_exists = true;
-
-            if (!parser_projection_decl.parse(pos, command->projection_decl, expected))
-                return false;
-
-            if (s_first.ignore(pos, expected))
-                command->first = true;
-            else if (s_after.ignore(pos, expected))
-            {
-                if (!parser_name.parse(pos, command->projection, expected))
-                    return false;
-            }
-
-            command->type = ASTAlterCommand::ADD_PROJECTION;
-        }
-        else if (s_drop_projection.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->projection, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PROJECTION;
-            command->detach = false;
-        }
-        else if (s_clear_projection.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->projection, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PROJECTION;
-            command->clear_projection = true;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_materialize_projection.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->projection, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MATERIALIZE_PROJECTION;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_move_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MOVE_PARTITION;
-            command->part = true;
-
-            if (s_to_disk.ignore(pos))
-                command->move_destination_type = DataDestinationType::DISK;
-            else if (s_to_volume.ignore(pos))
-                command->move_destination_type = DataDestinationType::VOLUME;
-            else if (s_to_table.ignore(pos))
-            {
-                if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
-                    return false;
-                command->move_destination_type = DataDestinationType::TABLE;
-            }
-            else if (s_to_shard.ignore(pos))
-            {
-                command->move_destination_type = DataDestinationType::SHARD;
+                command->type = ASTAlterCommand::LIVE_VIEW_REFRESH;
             }
             else
                 return false;
-
-            if (command->move_destination_type != DataDestinationType::TABLE)
-            {
-                ASTPtr ast_space_name;
-                if (!parser_string_literal.parse(pos, ast_space_name, expected))
-                    return false;
-
-                command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
-            }
+            break;
         }
-        else if (s_move_partition.ignore(pos, expected))
+        case ASTAlterQuery::AlterObjectType::DATABASE:
         {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MOVE_PARTITION;
-
-            if (s_to_disk.ignore(pos))
-                command->move_destination_type = DataDestinationType::DISK;
-            else if (s_to_volume.ignore(pos))
-                command->move_destination_type = DataDestinationType::VOLUME;
-            else if (s_to_table.ignore(pos))
+            if (s_modify_setting.ignore(pos, expected))
             {
-                if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
+                if (!parser_settings.parse(pos, command->settings_changes, expected))
                     return false;
-                command->move_destination_type = DataDestinationType::TABLE;
+                command->type = ASTAlterCommand::MODIFY_DATABASE_SETTING;
             }
             else
                 return false;
-
-            if (command->move_destination_type != DataDestinationType::TABLE)
+            break;
+        }
+        default:
+            break;
+        case ASTAlterQuery::AlterObjectType::TABLE:
+        {
+            if (s_add_column.ignore(pos, expected))
             {
-                ASTPtr ast_space_name;
-                if (!parser_string_literal.parse(pos, ast_space_name, expected))
+                if (s_if_not_exists.ignore(pos, expected))
+                    command->if_not_exists = true;
+
+                if (!parser_col_decl.parse(pos, command->col_decl, expected))
                     return false;
 
-                command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
-            }
-        }
-        else if (s_add_constraint.ignore(pos, expected))
-        {
-            if (s_if_not_exists.ignore(pos, expected))
-                command->if_not_exists = true;
-
-            if (!parser_constraint_decl.parse(pos, command->constraint_decl, expected))
-                return false;
-
-            command->type = ASTAlterCommand::ADD_CONSTRAINT;
-        }
-        else if (s_drop_constraint.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->constraint, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_CONSTRAINT;
-            command->detach = false;
-        }
-        else if (s_detach_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PARTITION;
-            command->detach = true;
-        }
-        else if (s_detach_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PARTITION;
-            command->part = true;
-            command->detach = true;
-        }
-        else if (s_attach_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            if (s_from.ignore(pos))
-            {
-                if (!parseDatabaseAndTableName(pos, expected, command->from_database, command->from_table))
-                    return false;
-
-                command->replace = false;
-                command->type = ASTAlterCommand::REPLACE_PARTITION;
-            }
-            else
-            {
-                command->type = ASTAlterCommand::ATTACH_PARTITION;
-            }
-        }
-        else if (s_replace_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            if (!s_from.ignore(pos, expected))
-                return false;
-
-            if (!parseDatabaseAndTableName(pos, expected, command->from_database, command->from_table))
-                return false;
-
-            command->replace = true;
-            command->type = ASTAlterCommand::REPLACE_PARTITION;
-        }
-        else if (s_attach_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->part = true;
-            command->type = ASTAlterCommand::ATTACH_PARTITION;
-        }
-        else if (s_fetch_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            if (!s_from.ignore(pos, expected))
-                return false;
-
-            ASTPtr ast_from;
-            if (!parser_string_literal.parse(pos, ast_from, expected))
-                return false;
-
-            command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
-            command->type = ASTAlterCommand::FETCH_PARTITION;
-        }
-        else if (s_fetch_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            if (!s_from.ignore(pos, expected))
-                return false;
-
-            ASTPtr ast_from;
-            if (!parser_string_literal.parse(pos, ast_from, expected))
-                return false;
-            command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
-            command->part = true;
-            command->type = ASTAlterCommand::FETCH_PARTITION;
-        }
-        else if (s_freeze.ignore(pos, expected))
-        {
-            if (s_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-
-                command->type = ASTAlterCommand::FREEZE_PARTITION;
-            }
-            else
-            {
-                command->type = ASTAlterCommand::FREEZE_ALL;
-            }
-
-            /// WITH NAME 'name' - place local backup to directory with specified name
-            if (s_with.ignore(pos, expected))
-            {
-                if (!s_name.ignore(pos, expected))
-                    return false;
-
-                ASTPtr ast_with_name;
-                if (!parser_string_literal.parse(pos, ast_with_name, expected))
-                    return false;
-
-                command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
-            }
-        }
-        else if (s_unfreeze.ignore(pos, expected))
-        {
-            if (s_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-
-                command->type = ASTAlterCommand::UNFREEZE_PARTITION;
-            }
-            else
-            {
-                command->type = ASTAlterCommand::UNFREEZE_ALL;
-            }
-
-            /// WITH NAME 'name' - remove local backup to directory with specified name
-            if (s_with.ignore(pos, expected))
-            {
-                if (!s_name.ignore(pos, expected))
-                    return false;
-
-                ASTPtr ast_with_name;
-                if (!parser_string_literal.parse(pos, ast_with_name, expected))
-                    return false;
-
-                command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else if (s_modify_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_modify_col_decl.parse(pos, command->col_decl, expected))
-                return false;
-
-            if (s_remove.ignore(pos, expected))
-            {
-                if (s_default.ignore(pos, expected))
-                    command->remove_property = "DEFAULT";
-                else if (s_materialized.ignore(pos, expected))
-                    command->remove_property = "MATERIALIZED";
-                else if (s_alias.ignore(pos, expected))
-                    command->remove_property = "ALIAS";
-                else if (s_comment.ignore(pos, expected))
-                    command->remove_property = "COMMENT";
-                else if (s_codec.ignore(pos, expected))
-                    command->remove_property = "CODEC";
-                else if (s_ttl.ignore(pos, expected))
-                    command->remove_property = "TTL";
-                else
-                    return false;
-            }
-            else
-            {
                 if (s_first.ignore(pos, expected))
                     command->first = true;
                 else if (s_after.ignore(pos, expected))
@@ -634,111 +168,595 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                     if (!parser_name.parse(pos, command->column, expected))
                         return false;
                 }
+
+                command->type = ASTAlterCommand::ADD_COLUMN;
             }
-            command->type = ASTAlterCommand::MODIFY_COLUMN;
-        }
-        else if (s_modify_order_by.ignore(pos, expected))
-        {
-            if (!parser_exp_elem.parse(pos, command->order_by, expected))
-                return false;
+            else if (s_rename_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
 
-            command->type = ASTAlterCommand::MODIFY_ORDER_BY;
-        }
-        else if (s_modify_sample_by.ignore(pos, expected))
-        {
-            if (!parser_exp_elem.parse(pos, command->sample_by, expected))
-                return false;
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
 
-            command->type = ASTAlterCommand::MODIFY_SAMPLE_BY;
-        }
-        else if (s_delete.ignore(pos, expected))
-        {
-            if (s_in_partition.ignore(pos, expected))
+                if (!s_to.ignore(pos, expected))
+                    return false;
+
+                if (!parser_name.parse(pos, command->rename_to, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::RENAME_COLUMN;
+            }
+            else if (s_materialize_column.ignore(pos, expected))
+            {
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MATERIALIZE_COLUMN;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_drop_partition.ignore(pos, expected))
             {
                 if (!parser_partition.parse(pos, command->partition, expected))
                     return false;
+
+                command->type = ASTAlterCommand::DROP_PARTITION;
             }
+            else if (s_drop_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
 
-            if (!s_where.ignore(pos, expected))
-                return false;
-
-            if (!parser_exp_elem.parse(pos, command->predicate, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DELETE;
-        }
-        else if (s_update.ignore(pos, expected))
-        {
-            if (!parser_assignment_list.parse(pos, command->update_assignments, expected))
-                return false;
-
-            if (s_in_partition.ignore(pos, expected))
+                command->type = ASTAlterCommand::DROP_PARTITION;
+                command->part = true;
+            }
+            else if (s_drop_detached_partition.ignore(pos, expected))
             {
                 if (!parser_partition.parse(pos, command->partition, expected))
                     return false;
+
+                command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
             }
+            else if (s_drop_detached_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
 
-            if (!s_where.ignore(pos, expected))
-                return false;
+                command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
+                command->part = true;
+            }
+            else if (s_drop_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
 
-            if (!parser_exp_elem.parse(pos, command->predicate, expected))
-                return false;
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
 
-            command->type = ASTAlterCommand::UPDATE;
-        }
-        else if (s_comment_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
+                command->type = ASTAlterCommand::DROP_COLUMN;
+                command->detach = false;
+            }
+            else if (s_clear_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
 
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
 
-            if (!parser_string_literal.parse(pos, command->comment, expected))
-                return false;
+                command->type = ASTAlterCommand::DROP_COLUMN;
+                command->clear_column = true;
+                command->detach = false;
 
-            command->type = ASTAlterCommand::COMMENT_COLUMN;
-        }
-        else if (s_modify_ttl.ignore(pos, expected))
-        {
-            if (!parser_ttl_list.parse(pos, command->ttl, expected))
-                return false;
-            command->type = ASTAlterCommand::MODIFY_TTL;
-        }
-        else if (s_remove_ttl.ignore(pos, expected))
-        {
-            command->type = ASTAlterCommand::REMOVE_TTL;
-        }
-        else if (s_materialize_ttl.ignore(pos, expected))
-        {
-            command->type = ASTAlterCommand::MATERIALIZE_TTL;
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_add_index.ignore(pos, expected))
+            {
+                if (s_if_not_exists.ignore(pos, expected))
+                    command->if_not_exists = true;
 
-            if (s_in_partition.ignore(pos, expected))
+                if (!parser_idx_decl.parse(pos, command->index_decl, expected))
+                    return false;
+
+                if (s_first.ignore(pos, expected))
+                    command->first = true;
+                else if (s_after.ignore(pos, expected))
+                {
+                    if (!parser_name.parse(pos, command->index, expected))
+                        return false;
+                }
+
+                command->type = ASTAlterCommand::ADD_INDEX;
+            }
+            else if (s_drop_index.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->index, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_INDEX;
+                command->detach = false;
+            }
+            else if (s_clear_index.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->index, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_INDEX;
+                command->clear_index = true;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_materialize_index.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->index, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MATERIALIZE_INDEX;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_add_projection.ignore(pos, expected))
+            {
+                if (s_if_not_exists.ignore(pos, expected))
+                    command->if_not_exists = true;
+
+                if (!parser_projection_decl.parse(pos, command->projection_decl, expected))
+                    return false;
+
+                if (s_first.ignore(pos, expected))
+                    command->first = true;
+                else if (s_after.ignore(pos, expected))
+                {
+                    if (!parser_name.parse(pos, command->projection, expected))
+                        return false;
+                }
+
+                command->type = ASTAlterCommand::ADD_PROJECTION;
+            }
+            else if (s_drop_projection.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->projection, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_PROJECTION;
+                command->detach = false;
+            }
+            else if (s_clear_projection.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->projection, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_PROJECTION;
+                command->clear_projection = true;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_materialize_projection.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->projection, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MATERIALIZE_PROJECTION;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_move_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MOVE_PARTITION;
+                command->part = true;
+
+                if (s_to_disk.ignore(pos))
+                    command->move_destination_type = DataDestinationType::DISK;
+                else if (s_to_volume.ignore(pos))
+                    command->move_destination_type = DataDestinationType::VOLUME;
+                else if (s_to_table.ignore(pos))
+                {
+                    if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
+                        return false;
+                    command->move_destination_type = DataDestinationType::TABLE;
+                }
+                else if (s_to_shard.ignore(pos))
+                {
+                    command->move_destination_type = DataDestinationType::SHARD;
+                }
+                else
+                    return false;
+
+                if (command->move_destination_type != DataDestinationType::TABLE)
+                {
+                    ASTPtr ast_space_name;
+                    if (!parser_string_literal.parse(pos, ast_space_name, expected))
+                        return false;
+
+                    command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
+                }
+            }
+            else if (s_move_partition.ignore(pos, expected))
             {
                 if (!parser_partition.parse(pos, command->partition, expected))
                     return false;
+
+                command->type = ASTAlterCommand::MOVE_PARTITION;
+
+                if (s_to_disk.ignore(pos))
+                    command->move_destination_type = DataDestinationType::DISK;
+                else if (s_to_volume.ignore(pos))
+                    command->move_destination_type = DataDestinationType::VOLUME;
+                else if (s_to_table.ignore(pos))
+                {
+                    if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
+                        return false;
+                    command->move_destination_type = DataDestinationType::TABLE;
+                }
+                else
+                    return false;
+
+                if (command->move_destination_type != DataDestinationType::TABLE)
+                {
+                    ASTPtr ast_space_name;
+                    if (!parser_string_literal.parse(pos, ast_space_name, expected))
+                        return false;
+
+                    command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
+                }
             }
-        }
-        else if (s_modify_setting.ignore(pos, expected))
-        {
-            if (!parser_settings.parse(pos, command->settings_changes, expected))
+            else if (s_add_constraint.ignore(pos, expected))
+            {
+                if (s_if_not_exists.ignore(pos, expected))
+                    command->if_not_exists = true;
+
+                if (!parser_constraint_decl.parse(pos, command->constraint_decl, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::ADD_CONSTRAINT;
+            }
+            else if (s_drop_constraint.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->constraint, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_CONSTRAINT;
+                command->detach = false;
+            }
+            else if (s_detach_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_PARTITION;
+                command->detach = true;
+            }
+            else if (s_detach_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_PARTITION;
+                command->part = true;
+                command->detach = true;
+            }
+            else if (s_attach_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                if (s_from.ignore(pos))
+                {
+                    if (!parseDatabaseAndTableName(pos, expected, command->from_database, command->from_table))
+                        return false;
+
+                    command->replace = false;
+                    command->type = ASTAlterCommand::REPLACE_PARTITION;
+                }
+                else
+                {
+                    command->type = ASTAlterCommand::ATTACH_PARTITION;
+                }
+            }
+            else if (s_replace_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                if (!s_from.ignore(pos, expected))
+                    return false;
+
+                if (!parseDatabaseAndTableName(pos, expected, command->from_database, command->from_table))
+                    return false;
+
+                command->replace = true;
+                command->type = ASTAlterCommand::REPLACE_PARTITION;
+            }
+            else if (s_attach_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
+
+                command->part = true;
+                command->type = ASTAlterCommand::ATTACH_PARTITION;
+            }
+            else if (s_fetch_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                if (!s_from.ignore(pos, expected))
+                    return false;
+
+                ASTPtr ast_from;
+                if (!parser_string_literal.parse(pos, ast_from, expected))
+                    return false;
+
+                command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
+                command->type = ASTAlterCommand::FETCH_PARTITION;
+            }
+            else if (s_fetch_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
+
+                if (!s_from.ignore(pos, expected))
+                    return false;
+
+                ASTPtr ast_from;
+                if (!parser_string_literal.parse(pos, ast_from, expected))
+                    return false;
+                command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
+                command->part = true;
+                command->type = ASTAlterCommand::FETCH_PARTITION;
+            }
+            else if (s_freeze.ignore(pos, expected))
+            {
+                if (s_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+
+                    command->type = ASTAlterCommand::FREEZE_PARTITION;
+                }
+                else
+                {
+                    command->type = ASTAlterCommand::FREEZE_ALL;
+                }
+
+                /// WITH NAME 'name' - place local backup to directory with specified name
+                if (s_with.ignore(pos, expected))
+                {
+                    if (!s_name.ignore(pos, expected))
+                        return false;
+
+                    ASTPtr ast_with_name;
+                    if (!parser_string_literal.parse(pos, ast_with_name, expected))
+                        return false;
+
+                    command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
+                }
+            }
+            else if (s_unfreeze.ignore(pos, expected))
+            {
+                if (s_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+
+                    command->type = ASTAlterCommand::UNFREEZE_PARTITION;
+                }
+                else
+                {
+                    command->type = ASTAlterCommand::UNFREEZE_ALL;
+                }
+
+                /// WITH NAME 'name' - remove local backup to directory with specified name
+                if (s_with.ignore(pos, expected))
+                {
+                    if (!s_name.ignore(pos, expected))
+                        return false;
+
+                    ASTPtr ast_with_name;
+                    if (!parser_string_literal.parse(pos, ast_with_name, expected))
+                        return false;
+
+                    command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else if (s_modify_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_modify_col_decl.parse(pos, command->col_decl, expected))
+                    return false;
+
+                if (s_remove.ignore(pos, expected))
+                {
+                    if (s_default.ignore(pos, expected))
+                        command->remove_property = "DEFAULT";
+                    else if (s_materialized.ignore(pos, expected))
+                        command->remove_property = "MATERIALIZED";
+                    else if (s_alias.ignore(pos, expected))
+                        command->remove_property = "ALIAS";
+                    else if (s_comment.ignore(pos, expected))
+                        command->remove_property = "COMMENT";
+                    else if (s_codec.ignore(pos, expected))
+                        command->remove_property = "CODEC";
+                    else if (s_ttl.ignore(pos, expected))
+                        command->remove_property = "TTL";
+                    else
+                        return false;
+                }
+                else
+                {
+                    if (s_first.ignore(pos, expected))
+                        command->first = true;
+                    else if (s_after.ignore(pos, expected))
+                    {
+                        if (!parser_name.parse(pos, command->column, expected))
+                            return false;
+                    }
+                }
+                command->type = ASTAlterCommand::MODIFY_COLUMN;
+            }
+            else if (s_modify_order_by.ignore(pos, expected))
+            {
+                if (!parser_exp_elem.parse(pos, command->order_by, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MODIFY_ORDER_BY;
+            }
+            else if (s_modify_sample_by.ignore(pos, expected))
+            {
+                if (!parser_exp_elem.parse(pos, command->sample_by, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MODIFY_SAMPLE_BY;
+            }
+            else if (s_delete.ignore(pos, expected))
+            {
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+
+                if (!s_where.ignore(pos, expected))
+                    return false;
+
+                if (!parser_exp_elem.parse(pos, command->predicate, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DELETE;
+            }
+            else if (s_update.ignore(pos, expected))
+            {
+                if (!parser_assignment_list.parse(pos, command->update_assignments, expected))
+                    return false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+
+                if (!s_where.ignore(pos, expected))
+                    return false;
+
+                if (!parser_exp_elem.parse(pos, command->predicate, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::UPDATE;
+            }
+            else if (s_comment_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
+
+                if (!parser_string_literal.parse(pos, command->comment, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::COMMENT_COLUMN;
+            }
+            else if (s_modify_ttl.ignore(pos, expected))
+            {
+                if (!parser_ttl_list.parse(pos, command->ttl, expected))
+                    return false;
+                command->type = ASTAlterCommand::MODIFY_TTL;
+            }
+            else if (s_remove_ttl.ignore(pos, expected))
+            {
+                command->type = ASTAlterCommand::REMOVE_TTL;
+            }
+            else if (s_materialize_ttl.ignore(pos, expected))
+            {
+                command->type = ASTAlterCommand::MATERIALIZE_TTL;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_modify_setting.ignore(pos, expected))
+            {
+                if (!parser_settings.parse(pos, command->settings_changes, expected))
+                    return false;
+                command->type = ASTAlterCommand::MODIFY_SETTING;
+            }
+            else if (s_reset_setting.ignore(pos, expected))
+            {
+                if (!parser_reset_setting.parse(pos, command->settings_resets, expected))
+                    return false;
+                command->type = ASTAlterCommand::RESET_SETTING;
+            }
+            else if (s_modify_query.ignore(pos, expected))
+            {
+                if (!select_p.parse(pos, command->select, expected))
+                    return false;
+                command->type = ASTAlterCommand::MODIFY_QUERY;
+            }
+            else
                 return false;
-            command->type = ASTAlterCommand::MODIFY_SETTING;
         }
-        else if (s_reset_setting.ignore(pos, expected))
-        {
-            if (!parser_reset_setting.parse(pos, command->settings_resets, expected))
-                return false;
-            command->type = ASTAlterCommand::RESET_SETTING;
-        }
-        else if (s_modify_query.ignore(pos, expected))
-        {
-            if (!select_p.parse(pos, command->select, expected))
-                return false;
-            command->type = ASTAlterCommand::MODIFY_QUERY;
-        }
-        else
-            return false;
     }
 
     if (command->col_decl)
@@ -786,7 +804,7 @@ bool ParserAlterCommandList::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     node = command_list;
 
     ParserToken s_comma(TokenType::Comma);
-    ParserAlterCommand p_command(is_live_view);
+    ParserAlterCommand p_command(alter_object);
 
     do
     {
@@ -809,37 +827,51 @@ bool ParserAlterQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     ParserKeyword s_alter_table("ALTER TABLE");
     ParserKeyword s_alter_live_view("ALTER LIVE VIEW");
+    ParserKeyword s_alter_database("ALTER DATABASE");
 
-    bool is_live_view = false;
+    ASTAlterQuery::AlterObjectType alter_object_type;
 
-    if (!s_alter_table.ignore(pos, expected))
+    if (s_alter_table.ignore(pos, expected))
     {
-        if (!s_alter_live_view.ignore(pos, expected))
-            return false;
-        else
-            is_live_view = true;
+        alter_object_type = ASTAlterQuery::AlterObjectType::TABLE;
     }
-
-    if (is_live_view)
-        query->is_live_view = true;
-
-    if (!parseDatabaseAndTableName(pos, expected, query->database, query->table))
+    else if (s_alter_live_view.ignore(pos, expected))
+    {
+        alter_object_type = ASTAlterQuery::AlterObjectType::LIVE_VIEW;
+    }
+    else if (s_alter_database.ignore(pos, expected))
+    {
+        alter_object_type = ASTAlterQuery::AlterObjectType::DATABASE;
+    }
+    else
         return false;
 
-    String cluster_str;
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (alter_object_type == ASTAlterQuery::AlterObjectType::DATABASE)
     {
-        if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+        if (!parseDatabase(pos, expected, query->database))
             return false;
     }
-    query->cluster = cluster_str;
+    else
+    {
+        if (!parseDatabaseAndTableName(pos, expected, query->database, query->table))
+            return false;
 
-    ParserAlterCommandList p_command_list(is_live_view);
+        String cluster_str;
+        if (ParserKeyword{"ON"}.ignore(pos, expected))
+        {
+            if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+                return false;
+        }
+        query->cluster = cluster_str;
+    }
+
+    ParserAlterCommandList p_command_list(alter_object_type);
     ASTPtr command_list;
     if (!p_command_list.parse(pos, command_list, expected))
         return false;
 
     query->set(query->command_list, command_list);
+    query->alter_object = alter_object_type;
 
     return true;
 }
diff --git a/src/Parsers/ParserAlterQuery.h b/src/Parsers/ParserAlterQuery.h
index 2e54c4ddbaf..de9d752d1a3 100644
--- a/src/Parsers/ParserAlterQuery.h
+++ b/src/Parsers/ParserAlterQuery.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/IParserBase.h>
 #include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTAlterQuery.h>
 
 namespace DB
 {
@@ -45,9 +46,10 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 
 public:
-    bool is_live_view;
+    ASTAlterQuery::AlterObjectType alter_object;
 
-    ParserAlterCommandList(bool is_live_view_ = false) : is_live_view(is_live_view_) {}
+    ParserAlterCommandList(ASTAlterQuery::AlterObjectType alter_object_ = ASTAlterQuery::AlterObjectType::TABLE)
+        : alter_object(alter_object_) {}
 };
 
 
@@ -58,9 +60,10 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 
 public:
-    bool is_live_view;
+    ASTAlterQuery::AlterObjectType alter_object;
 
-    ParserAlterCommand(bool is_live_view_ = false) : is_live_view(is_live_view_) {}
+    ParserAlterCommand(ASTAlterQuery::AlterObjectType alter_object_ = ASTAlterQuery::AlterObjectType::TABLE)
+        : alter_object(alter_object_) {}
 };
 
 
diff --git a/src/Parsers/ParserInsertQuery.cpp b/src/Parsers/ParserInsertQuery.cpp
index 19457f027bf..6ac6d3b50b9 100644
--- a/src/Parsers/ParserInsertQuery.cpp
+++ b/src/Parsers/ParserInsertQuery.cpp
@@ -25,8 +25,10 @@ namespace ErrorCodes
 
 bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
+    /// Create parsers
     ParserKeyword s_insert_into("INSERT INTO");
     ParserKeyword s_from_infile("FROM INFILE");
+    ParserKeyword s_compression("COMPRESSION");
     ParserKeyword s_table("TABLE");
     ParserKeyword s_function("FUNCTION");
     ParserToken s_dot(TokenType::Dot);
@@ -45,6 +47,8 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserStringLiteral infile_name_p;
     ParserExpressionWithOptionalAlias exp_elem_p(false);
 
+    /// create ASTPtr variables (result of parsing will be put in them).
+    /// They will be used to initialize ASTInsertQuery's fields.
     ASTPtr database;
     ASTPtr table;
     ASTPtr infile;
@@ -55,20 +59,28 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ASTPtr table_function;
     ASTPtr settings_ast;
     ASTPtr partition_by_expr;
+    ASTPtr compression;
 
     /// Insertion data
     const char * data = nullptr;
 
+    /// Check for key words `INSERT INTO`. If it isn't found, the query can't be parsed as insert query.
     if (!s_insert_into.ignore(pos, expected))
         return false;
 
+    /// try to find 'TABLE'
     s_table.ignore(pos, expected);
 
+    /// Search for 'FUNCTION'. If this key word is in query, read fields for insertion into 'TABLE FUNCTION'.
+    /// Word table is optional for table functions. (for example, s3 table function)
+    /// Otherwise fill 'TABLE' fields.
     if (s_function.ignore(pos, expected))
     {
+        /// Read function name
         if (!table_function_p.parse(pos, table_function, expected))
             return false;
 
+        /// Support insertion values with partition by.
         if (s_partition_by.ignore(pos, expected))
         {
             if (!exp_elem_p.parse(pos, partition_by_expr, expected))
@@ -77,9 +89,12 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     }
     else
     {
+        /// Read one word. It can be table or database name.
         if (!name_p.parse(pos, table, expected))
             return false;
 
+        /// If there is a dot, previous name was database name,
+        /// so read table name after dot.
         if (s_dot.ignore(pos, expected))
         {
             database = table;
@@ -98,26 +113,41 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             return false;
     }
 
-    Pos before_values = pos;
-
+    /// Check if file is a source of data.
     if (s_from_infile.ignore(pos, expected))
     {
+        /// Read its name to process it later
         if (!infile_name_p.parse(pos, infile, expected))
             return false;
+
+        /// Check for 'COMPRESSION' parameter (optional)
+        if (s_compression.ignore(pos, expected))
+        {
+            /// Read compression name. Create parser for this purpose.
+            ParserStringLiteral compression_p;
+            if (!compression_p.parse(pos, compression, expected))
+                return false;
+        }
     }
 
+    Pos before_values = pos;
+
     /// VALUES or FROM INFILE or FORMAT or SELECT
     if (!infile && s_values.ignore(pos, expected))
     {
+        /// If VALUES is defined in query, everything except setting will be parsed as data
         data = pos->begin;
     }
     else if (s_format.ignore(pos, expected))
     {
+        /// If FORMAT is defined, read format name
         if (!name_p.parse(pos, format, expected))
             return false;
     }
     else if (s_select.ignore(pos, expected) || s_with.ignore(pos,expected))
     {
+        /// If SELECT is defined, return to position before select and parse
+        /// rest of query as SELECT query.
         pos = before_values;
         ParserSelectWithUnionQuery select_p;
         select_p.parse(pos, select, expected);
@@ -128,6 +158,8 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     }
     else if (s_watch.ignore(pos, expected))
     {
+        /// If WATCH is defined, return to position before WATCH and parse
+        /// rest of query as WATCH query.
         pos = before_values;
         ParserWatchQuery watch_p;
         watch_p.parse(pos, watch, expected);
@@ -138,11 +170,14 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     }
     else
     {
+        /// If all previous conditions were false, query is incorrect
         return false;
     }
 
+    /// Read SETTINGS if they are defined
     if (s_settings.ignore(pos, expected))
     {
+        /// Settings are written like SET query, so parse them with ParserSetQuery
         ParserSetQuery parser_settings(true);
         if (!parser_settings.parse(pos, settings_ast, expected))
             return false;
@@ -155,13 +190,14 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         InsertQuerySettingsPushDownVisitor(visitor_data).visit(select);
     }
 
-
+    /// In case of defined format, data follows it.
     if (format && !infile)
     {
         Pos last_token = pos;
         --last_token;
         data = last_token->end;
 
+        /// If format name is followed by ';' (end of query symbol) there is no data to insert.
         if (data < end && *data == ';')
             throw Exception("You have excessive ';' symbol before data for INSERT.\n"
                                     "Example:\n\n"
@@ -184,11 +220,16 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             ++data;
     }
 
+    /// Create query and fill its fields.
     auto query = std::make_shared<ASTInsertQuery>();
     node = query;
 
     if (infile)
+    {
         query->infile = infile;
+        if (compression)
+            query->compression = compression;
+    }
 
     if (table_function)
     {
diff --git a/src/Parsers/ParserQueryWithOutput.cpp b/src/Parsers/ParserQueryWithOutput.cpp
index 82f9f561187..4309063a736 100644
--- a/src/Parsers/ParserQueryWithOutput.cpp
+++ b/src/Parsers/ParserQueryWithOutput.cpp
@@ -23,6 +23,7 @@
 #include <Parsers/ParserTablePropertiesQuery.h>
 #include <Parsers/ParserWatchQuery.h>
 #include <Parsers/QueryWithOutputSettingsPushDownVisitor.h>
+#include "Common/Exception.h"
 
 
 namespace DB
@@ -86,6 +87,14 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         if (!out_file_p.parse(pos, query_with_output.out_file, expected))
             return false;
 
+        ParserKeyword s_compression_method("COMPRESSION");
+        if (s_compression_method.ignore(pos, expected))
+        {
+            ParserStringLiteral compression;
+            if (!compression.parse(pos, query_with_output.compression, expected))
+                return false;
+        }
+
         query_with_output.children.push_back(query_with_output.out_file);
     }
 
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 66bd39e0202..81afdad9a6e 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -6,6 +6,8 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/parseDatabaseAndTableName.h>
 
+#include <magic_enum.hpp>
+#include <common/EnumReflection.h>
 
 namespace ErrorCodes
 {
@@ -67,13 +69,14 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
     auto res = std::make_shared<ASTSystemQuery>();
 
     bool found = false;
-    for (int i = static_cast<int>(Type::UNKNOWN) + 1; i < static_cast<int>(Type::END); ++i)
+
+    for (const auto & type : magic_enum::enum_values<Type>())
     {
-        Type t = static_cast<Type>(i);
-        if (ParserKeyword{ASTSystemQuery::typeToString(t)}.ignore(pos, expected))
+        if (ParserKeyword{ASTSystemQuery::typeToString(type)}.ignore(pos, expected))
         {
-            res->type = t;
+            res->type = type;
             found = true;
+            break;
         }
     }
 
@@ -117,6 +120,35 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
 
             break;
         }
+        case Type::RELOAD_FUNCTION:
+        {
+            String cluster_str;
+            if (ParserKeyword{"ON"}.ignore(pos, expected))
+            {
+                if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+                    return false;
+            }
+            res->cluster = cluster_str;
+            ASTPtr ast;
+            if (ParserStringLiteral{}.parse(pos, ast, expected))
+            {
+                res->target_function = ast->as<ASTLiteral &>().value.safeGet<String>();
+            }
+            else
+            {
+                ParserIdentifier function_parser;
+                ASTPtr function;
+                String target_function;
+
+                if (!function_parser.parse(pos, function, expected))
+                    return false;
+
+                if (!tryGetIdentifierNameInto(function, res->target_function))
+                    return false;
+            }
+
+            break;
+        }
         case Type::DROP_REPLICA:
         {
             ASTPtr ast;
diff --git a/src/Parsers/parseDatabaseAndTableName.cpp b/src/Parsers/parseDatabaseAndTableName.cpp
index 13429df5b4d..c071f1b6eb4 100644
--- a/src/Parsers/parseDatabaseAndTableName.cpp
+++ b/src/Parsers/parseDatabaseAndTableName.cpp
@@ -42,6 +42,22 @@ bool parseDatabaseAndTableName(IParser::Pos & pos, Expected & expected, String &
 }
 
 
+bool parseDatabase(IParser::Pos & pos, Expected & expected, String & database_str)
+{
+    ParserToken s_dot(TokenType::Dot);
+    ParserIdentifier identifier_parser;
+
+    ASTPtr database;
+    database_str = "";
+
+    if (!identifier_parser.parse(pos, database, expected))
+        return false;
+
+    tryGetIdentifierNameInto(database, database_str);
+    return true;
+}
+
+
 bool parseDatabaseAndTableNameOrAsterisks(IParser::Pos & pos, Expected & expected, String & database, bool & any_database, String & table, bool & any_table)
 {
     return IParserBase::wrapParseImpl(pos, [&]
diff --git a/src/Parsers/parseDatabaseAndTableName.h b/src/Parsers/parseDatabaseAndTableName.h
index e4699c8ad91..dc435ca047e 100644
--- a/src/Parsers/parseDatabaseAndTableName.h
+++ b/src/Parsers/parseDatabaseAndTableName.h
@@ -10,4 +10,6 @@ bool parseDatabaseAndTableName(IParser::Pos & pos, Expected & expected, String &
 /// Parses [db.]name or [db.]* or [*.]*
 bool parseDatabaseAndTableNameOrAsterisks(IParser::Pos & pos, Expected & expected, String & database, bool & any_database, String & table, bool & any_table);
 
+bool parseDatabase(IParser::Pos & pos, Expected & expected, String & database_str);
+
 }
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index aeb57b7f9b6..fd65fc5bd33 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -195,7 +195,7 @@ std::string getLexicalErrorMessage(
     out << getErrorTokenDescription(last_token.type);
     if (last_token.size())
     {
-       out << ": '" << StringRef{last_token.begin, last_token.size()} << "'";
+       out << ": '" << std::string_view{last_token.begin, last_token.size()} << "'";
     }
 
     return out.str();
diff --git a/src/Parsers/ya.make b/src/Parsers/ya.make
deleted file mode 100644
index d17b73104d6..00000000000
--- a/src/Parsers/ya.make
+++ /dev/null
@@ -1,161 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    ASTAlterQuery.cpp
-    ASTAsterisk.cpp
-    ASTBackupQuery.cpp
-    ASTColumnDeclaration.cpp
-    ASTColumnsMatcher.cpp
-    ASTColumnsTransformers.cpp
-    ASTConstraintDeclaration.cpp
-    ASTCreateFunctionQuery.cpp
-    ASTCreateQuery.cpp
-    ASTCreateQuotaQuery.cpp
-    ASTCreateRoleQuery.cpp
-    ASTCreateRowPolicyQuery.cpp
-    ASTCreateSettingsProfileQuery.cpp
-    ASTCreateUserQuery.cpp
-    ASTDatabaseOrNone.cpp
-    ASTDictionary.cpp
-    ASTDictionaryAttributeDeclaration.cpp
-    ASTDropAccessEntityQuery.cpp
-    ASTDropFunctionQuery.cpp
-    ASTDropQuery.cpp
-    ASTExpressionList.cpp
-    ASTFunction.cpp
-    ASTFunctionWithKeyValueArguments.cpp
-    ASTGrantQuery.cpp
-    ASTIdentifier.cpp
-    ASTIndexDeclaration.cpp
-    ASTInsertQuery.cpp
-    ASTKillQueryQuery.cpp
-    ASTLiteral.cpp
-    ASTNameTypePair.cpp
-    ASTOptimizeQuery.cpp
-    ASTOrderByElement.cpp
-    ASTPartition.cpp
-    ASTProjectionDeclaration.cpp
-    ASTProjectionSelectQuery.cpp
-    ASTQualifiedAsterisk.cpp
-    ASTQueryParameter.cpp
-    ASTQueryWithOnCluster.cpp
-    ASTQueryWithOutput.cpp
-    ASTQueryWithTableAndOutput.cpp
-    ASTRolesOrUsersSet.cpp
-    ASTRowPolicyName.cpp
-    ASTSampleRatio.cpp
-    ASTSelectIntersectExceptQuery.cpp
-    ASTSelectQuery.cpp
-    ASTSelectWithUnionQuery.cpp
-    ASTSetQuery.cpp
-    ASTSetRoleQuery.cpp
-    ASTSettingsProfileElement.cpp
-    ASTShowAccessEntitiesQuery.cpp
-    ASTShowCreateAccessEntityQuery.cpp
-    ASTShowGrantsQuery.cpp
-    ASTShowTablesQuery.cpp
-    ASTSubquery.cpp
-    ASTSystemQuery.cpp
-    ASTTTLElement.cpp
-    ASTTablesInSelectQuery.cpp
-    ASTUserNameWithHost.cpp
-    ASTWindowDefinition.cpp
-    ASTWithAlias.cpp
-    ASTWithElement.cpp
-    CommonParsers.cpp
-    ExpressionElementParsers.cpp
-    ExpressionListParsers.cpp
-    IAST.cpp
-    IParserBase.cpp
-    InsertQuerySettingsPushDownVisitor.cpp
-    Lexer.cpp
-    MySQL/ASTAlterCommand.cpp
-    MySQL/ASTAlterQuery.cpp
-    MySQL/ASTCreateDefines.cpp
-    MySQL/ASTCreateQuery.cpp
-    MySQL/ASTDeclareColumn.cpp
-    MySQL/ASTDeclareConstraint.cpp
-    MySQL/ASTDeclareIndex.cpp
-    MySQL/ASTDeclareOption.cpp
-    MySQL/ASTDeclarePartition.cpp
-    MySQL/ASTDeclarePartitionOptions.cpp
-    MySQL/ASTDeclareReference.cpp
-    MySQL/ASTDeclareSubPartition.cpp
-    MySQL/ASTDeclareTableOptions.cpp
-    ParserAlterQuery.cpp
-    ParserBackupQuery.cpp
-    ParserCase.cpp
-    ParserCheckQuery.cpp
-    ParserCreateFunctionQuery.cpp
-    ParserCreateQuery.cpp
-    ParserCreateQuotaQuery.cpp
-    ParserCreateRoleQuery.cpp
-    ParserCreateRowPolicyQuery.cpp
-    ParserCreateSettingsProfileQuery.cpp
-    ParserCreateUserQuery.cpp
-    ParserDataType.cpp
-    ParserDatabaseOrNone.cpp
-    ParserDescribeTableQuery.cpp
-    ParserDictionary.cpp
-    ParserDictionaryAttributeDeclaration.cpp
-    ParserDropAccessEntityQuery.cpp
-    ParserDropFunctionQuery.cpp
-    ParserDropQuery.cpp
-    ParserExplainQuery.cpp
-    ParserExternalDDLQuery.cpp
-    ParserGrantQuery.cpp
-    ParserInsertQuery.cpp
-    ParserKillQueryQuery.cpp
-    ParserOptimizeQuery.cpp
-    ParserPartition.cpp
-    ParserProjectionSelectQuery.cpp
-    ParserQuery.cpp
-    ParserQueryWithOutput.cpp
-    ParserRenameQuery.cpp
-    ParserRolesOrUsersSet.cpp
-    ParserRowPolicyName.cpp
-    ParserSampleRatio.cpp
-    ParserSelectQuery.cpp
-    ParserSelectWithUnionQuery.cpp
-    ParserSetQuery.cpp
-    ParserSetRoleQuery.cpp
-    ParserSettingsProfileElement.cpp
-    ParserShowAccessEntitiesQuery.cpp
-    ParserShowCreateAccessEntityQuery.cpp
-    ParserShowGrantsQuery.cpp
-    ParserShowPrivilegesQuery.cpp
-    ParserShowTablesQuery.cpp
-    ParserSystemQuery.cpp
-    ParserTablePropertiesQuery.cpp
-    ParserTablesInSelectQuery.cpp
-    ParserUnionQueryElement.cpp
-    ParserUseQuery.cpp
-    ParserUserNameWithHost.cpp
-    ParserWatchQuery.cpp
-    ParserWithElement.cpp
-    QueryWithOutputSettingsPushDownVisitor.cpp
-    TokenIterator.cpp
-    formatAST.cpp
-    formatSettingName.cpp
-    getInsertQuery.cpp
-    iostream_debug_helpers.cpp
-    makeASTForLogicalFunction.cpp
-    obfuscateQueries.cpp
-    parseDatabaseAndTableName.cpp
-    parseIdentifierOrStringLiteral.cpp
-    parseIntervalKind.cpp
-    parseQuery.cpp
-    parseUserName.cpp
-    queryToString.cpp
-
-)
-
-END()
diff --git a/src/Parsers/ya.make.in b/src/Parsers/ya.make.in
deleted file mode 100644
index 600c2bd9715..00000000000
--- a/src/Parsers/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F New | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Processors/Executors/StreamingFormatExecutor.cpp b/src/Processors/Executors/StreamingFormatExecutor.cpp
new file mode 100644
index 00000000000..c1d10cabdcb
--- /dev/null
+++ b/src/Processors/Executors/StreamingFormatExecutor.cpp
@@ -0,0 +1,91 @@
+#include <Processors/Executors/StreamingFormatExecutor.h>
+#include <Processors/Transforms/AddingDefaultsTransform.h>
+#include <iostream>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+StreamingFormatExecutor::StreamingFormatExecutor(
+    const Block & header_,
+    InputFormatPtr format_,
+    ErrorCallback on_error_,
+    SimpleTransformPtr adding_defaults_transform_)
+    : header(header_)
+    , format(std::move(format_))
+    , on_error(std::move(on_error_))
+    , adding_defaults_transform(std::move(adding_defaults_transform_))
+    , port(format->getPort().getHeader(), format.get())
+    , result_columns(header.cloneEmptyColumns())
+{
+    connect(format->getPort(), port);
+}
+
+MutableColumns StreamingFormatExecutor::getResultColumns()
+{
+    auto ret_columns = header.cloneEmptyColumns();
+    std::swap(ret_columns, result_columns);
+    return ret_columns;
+}
+
+size_t StreamingFormatExecutor::execute(ReadBuffer & buffer)
+{
+    format->setReadBuffer(buffer);
+    return execute();
+}
+
+size_t StreamingFormatExecutor::execute()
+{
+    try
+    {
+        size_t new_rows = 0;
+        port.setNeeded();
+        while (true)
+        {
+            auto status = format->prepare();
+
+            switch (status)
+            {
+                case IProcessor::Status::Ready:
+                    format->work();
+                    break;
+
+                case IProcessor::Status::Finished:
+                    format->resetParser();
+                    return new_rows;
+
+                case IProcessor::Status::PortFull:
+                {
+                    auto chunk = port.pull();
+                    if (adding_defaults_transform)
+                        adding_defaults_transform->transform(chunk);
+
+                    auto chunk_rows = chunk.getNumRows();
+                    new_rows += chunk_rows;
+
+                    auto columns = chunk.detachColumns();
+
+                    for (size_t i = 0, s = columns.size(); i < s; ++i)
+                        result_columns[i]->insertRangeFrom(*columns[i], 0, columns[i]->size());
+
+                    break;
+                }
+                case IProcessor::Status::NeedData:
+                case IProcessor::Status::Async:
+                case IProcessor::Status::ExpandPipeline:
+                    throw Exception("Source processor returned status " + IProcessor::statusToName(status), ErrorCodes::LOGICAL_ERROR);
+            }
+        }
+    }
+    catch (Exception & e)
+    {
+        format->resetParser();
+        return on_error(result_columns, e);
+    }
+}
+
+}
diff --git a/src/Processors/Executors/StreamingFormatExecutor.h b/src/Processors/Executors/StreamingFormatExecutor.h
new file mode 100644
index 00000000000..b84364dcca0
--- /dev/null
+++ b/src/Processors/Executors/StreamingFormatExecutor.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/ISimpleTransform.h>
+
+namespace DB
+{
+
+using SimpleTransformPtr = std::shared_ptr<ISimpleTransform>;
+
+/// Receives format and allows to execute
+/// it multiple times for streaming processing of data.
+class StreamingFormatExecutor
+{
+public:
+    /// Callback is called, when exception is thrown in `execute` method.
+    /// It provides currently accumulated columns to make a rollback, for example,
+    /// and exception to rethrow it or add context to it.
+    /// Should return number of new rows, which are added in callback
+    /// to result columns in comparison to previous call of `execute`.
+    using ErrorCallback = std::function<size_t(const MutableColumns &, Exception &)>;
+
+    StreamingFormatExecutor(
+        const Block & header_,
+        InputFormatPtr format_,
+        ErrorCallback on_error_ = [](const MutableColumns &, Exception &) -> size_t { throw; },
+        SimpleTransformPtr adding_defaults_transform_ = nullptr);
+
+    /// Returns numbers of new read rows.
+    size_t execute();
+
+    /// Execute with provided read buffer.
+    size_t execute(ReadBuffer & buffer);
+
+    /// Releases currently accumulated columns.
+    MutableColumns getResultColumns();
+
+private:
+    const Block header;
+    const InputFormatPtr format;
+    const ErrorCallback on_error;
+    const SimpleTransformPtr adding_defaults_transform;
+
+    InputPort port;
+    MutableColumns result_columns;
+};
+
+}
diff --git a/src/Processors/Formats/IInputFormat.cpp b/src/Processors/Formats/IInputFormat.cpp
index 5594e04dc74..674a4affc46 100644
--- a/src/Processors/Formats/IInputFormat.cpp
+++ b/src/Processors/Formats/IInputFormat.cpp
@@ -6,14 +6,14 @@ namespace DB
 {
 
 IInputFormat::IInputFormat(Block header, ReadBuffer & in_)
-    : ISource(std::move(header)), in(in_)
+    : ISource(std::move(header)), in(&in_)
 {
     column_mapping = std::make_shared<ColumnMapping>();
 }
 
 void IInputFormat::resetParser()
 {
-    in.ignoreAll();
+    in->ignoreAll();
     // those are protected attributes from ISource (I didn't want to propagate resetParser up there)
     finished = false;
     got_exception = false;
@@ -21,4 +21,9 @@ void IInputFormat::resetParser()
     getPort().getInputPort().reopen();
 }
 
+void IInputFormat::setReadBuffer(ReadBuffer & in_)
+{
+    in = &in_;
+}
+
 }
diff --git a/src/Processors/Formats/IInputFormat.h b/src/Processors/Formats/IInputFormat.h
index 59d33e3295e..f133161c3ec 100644
--- a/src/Processors/Formats/IInputFormat.h
+++ b/src/Processors/Formats/IInputFormat.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <Processors/ISource.h>
-
-#include <memory>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
@@ -31,8 +30,6 @@ struct ColumnMapping
 
 using ColumnMappingPtr = std::shared_ptr<ColumnMapping>;
 
-class ReadBuffer;
-
 /** Input format is a source, that reads data from ReadBuffer.
   */
 class IInputFormat : public ISource
@@ -43,7 +40,7 @@ protected:
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wattributes"
 
-    ReadBuffer & in [[maybe_unused]];
+    ReadBuffer * in [[maybe_unused]];
 
 #pragma GCC diagnostic pop
 
@@ -73,6 +70,7 @@ public:
     void setCurrentUnitNumber(size_t current_unit_number_) { current_unit_number = current_unit_number_; }
 
     void addBuffer(std::unique_ptr<ReadBuffer> buffer) { owned_buffers.emplace_back(std::move(buffer)); }
+    void setReadBuffer(ReadBuffer & in_);
 
 protected:
     ColumnMappingPtr column_mapping{};
@@ -84,4 +82,6 @@ private:
     std::vector<std::unique_ptr<ReadBuffer>> owned_buffers;
 };
 
+using InputFormatPtr = std::shared_ptr<IInputFormat>;
+
 }
diff --git a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
index 84ca789261f..a305753d03f 100644
--- a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
@@ -85,7 +85,7 @@ void ArrowBlockInputFormat::prepareReader()
 
     if (stream)
     {
-        auto stream_reader_status = arrow::ipc::RecordBatchStreamReader::Open(std::make_unique<ArrowInputStreamFromReadBuffer>(in));
+        auto stream_reader_status = arrow::ipc::RecordBatchStreamReader::Open(std::make_unique<ArrowInputStreamFromReadBuffer>(*in));
         if (!stream_reader_status.ok())
             throw Exception(ErrorCodes::UNKNOWN_EXCEPTION,
                 "Error while opening a table: {}", stream_reader_status.status().ToString());
@@ -94,7 +94,7 @@ void ArrowBlockInputFormat::prepareReader()
     }
     else
     {
-        auto file_reader_status = arrow::ipc::RecordBatchFileReader::Open(asArrowFile(in));
+        auto file_reader_status = arrow::ipc::RecordBatchFileReader::Open(asArrowFile(*in));
         if (!file_reader_status.ok())
             throw Exception(ErrorCodes::UNKNOWN_EXCEPTION,
                 "Error while opening a table: {}", file_reader_status.status().ToString());
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
index 243f3da5903..e461baba7bc 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include "ArrowBufferedStreams.h"
 
 #if USE_ARROW || USE_ORC || USE_PARQUET
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index 2da4d7d298d..0536e034fbf 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -367,15 +367,10 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         }
         case arrow::Type::TIMESTAMP:
             return readColumnWithTimestampData(arrow_column, column_name);
-#if defined(ARCADIA_BUILD)
-            case arrow::Type::DECIMAL:
-                return readColumnWithDecimalData<Decimal128, arrow::Decimal128Array>(arrow_column, column_name);
-#else
         case arrow::Type::DECIMAL128:
             return readColumnWithDecimalData<Decimal128, arrow::Decimal128Array>(arrow_column, column_name);
         case arrow::Type::DECIMAL256:
             return readColumnWithDecimalData<Decimal256, arrow::Decimal256Array>(arrow_column, column_name);
-#endif
         case arrow::Type::MAP:
         {
             auto arrow_nested_column = getNestedArrowColumn(arrow_column);
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index cd576916364..d5aab5da74a 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -35,6 +35,7 @@
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnLowCardinality.h>
 
 #include <avro/Compiler.hh>
 #include <avro/DataFile.hh>
@@ -178,7 +179,20 @@ static std::string nodeName(avro::NodePtr node)
 
 AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::NodePtr root_node, DataTypePtr target_type)
 {
-    const WhichDataType target = removeLowCardinality(target_type);
+    if (target_type->lowCardinality())
+    {
+        const auto * lc_type = assert_cast<const DataTypeLowCardinality *>(target_type.get());
+        auto dict_deserialize = createDeserializeFn(root_node, lc_type->getDictionaryType());
+        return [dict_deserialize](IColumn & column, avro::Decoder & decoder)
+        {
+            auto & lc_column = assert_cast<ColumnLowCardinality &>(column);
+            auto tmp_column = lc_column.getDictionary().getNestedColumn()->cloneEmpty();
+            dict_deserialize(*tmp_column, decoder);
+            lc_column.insertFromFullColumn(*tmp_column, 0);
+        };
+    }
+
+    const WhichDataType target = WhichDataType(target_type);
 
     switch (root_node->type())
     {
@@ -599,7 +613,7 @@ AvroRowInputFormat::AvroRowInputFormat(const Block & header_, ReadBuffer & in_,
 
 void AvroRowInputFormat::readPrefix()
 {
-    file_reader_ptr = std::make_unique<avro::DataFileReaderBase>(std::make_unique<InputStreamReadBufferAdapter>(in));
+    file_reader_ptr = std::make_unique<avro::DataFileReaderBase>(std::make_unique<InputStreamReadBufferAdapter>(*in));
     deserializer_ptr = std::make_unique<AvroDeserializer>(output.getHeader(), file_reader_ptr->dataSchema(), allow_missing_fields);
     file_reader_ptr->init();
 }
@@ -748,7 +762,7 @@ AvroConfluentRowInputFormat::AvroConfluentRowInputFormat(
     const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_)
     : IRowInputFormat(header_, in_, params_)
     , schema_registry(getConfluentSchemaRegistry(format_settings_))
-    , input_stream(std::make_unique<InputStreamReadBufferAdapter>(in))
+    , input_stream(std::make_unique<InputStreamReadBufferAdapter>(*in))
     , decoder(avro::binaryDecoder())
     , format_settings(format_settings_)
 
@@ -758,16 +772,16 @@ AvroConfluentRowInputFormat::AvroConfluentRowInputFormat(
 
 bool AvroConfluentRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
-    if (in.eof())
+    if (in->eof())
     {
         return false;
     }
     // skip tombstone records (kafka messages with null value)
-    if (in.available() == 0)
+    if (in->available() == 0)
     {
         return false;
     }
-    SchemaId schema_id = readConfluentSchemaId(in);
+    SchemaId schema_id = readConfluentSchemaId(*in);
     const auto & deserializer = getOrCreateDeserializer(schema_id);
     deserializer.deserializeRow(columns, *decoder, ext);
     decoder->drain();
@@ -777,7 +791,7 @@ bool AvroConfluentRowInputFormat::readRow(MutableColumns & columns, RowReadExten
 void AvroConfluentRowInputFormat::syncAfterError()
 {
     // skip until the end of current kafka message
-    in.tryIgnore(in.available());
+    in->tryIgnore(in->available());
 }
 
 const AvroDeserializer & AvroConfluentRowInputFormat::getOrCreateDeserializer(SchemaId schema_id)
diff --git a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
index 2d820a5985f..a7677ec7e6a 100644
--- a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
@@ -15,12 +15,12 @@ BinaryRowInputFormat::BinaryRowInputFormat(ReadBuffer & in_, Block header, Param
 
 bool BinaryRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     size_t num_columns = columns.size();
     for (size_t i = 0; i < num_columns; ++i)
-        serializations[i]->deserializeBinary(*columns[i], in);
+        serializations[i]->deserializeBinary(*columns[i], *in);
 
     return true;
 }
@@ -35,14 +35,14 @@ void BinaryRowInputFormat::readPrefix()
 
     if (with_names || with_types)
     {
-        readVarUInt(columns, in);
+        readVarUInt(columns, *in);
     }
 
     if (with_names)
     {
         for (size_t i = 0; i < columns; ++i)
         {
-            readStringBinary(tmp, in);
+            readStringBinary(tmp, *in);
         }
     }
 
@@ -50,7 +50,7 @@ void BinaryRowInputFormat::readPrefix()
     {
         for (size_t i = 0; i < columns; ++i)
         {
-            readStringBinary(tmp, in);
+            readStringBinary(tmp, *in);
         }
     }
 }
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
index d62cc112d1a..c613288ed0a 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
@@ -160,7 +160,7 @@ void CSVRowInputFormat::readPrefix()
 {
     /// In this format, we assume, that if first string field contain BOM as value, it will be written in quotes,
     ///  so BOM at beginning of stream cannot be confused with BOM in first string value, and it is safe to skip it.
-    skipBOMIfExists(in);
+    skipBOMIfExists(*in);
 
     size_t num_columns = data_types.size();
     const auto & header = getPort().getHeader();
@@ -179,15 +179,15 @@ void CSVRowInputFormat::readPrefix()
             do
             {
                 String column_name;
-                skipWhitespacesAndTabs(in);
-                readCSVString(column_name, in, format_settings.csv);
-                skipWhitespacesAndTabs(in);
+                skipWhitespacesAndTabs(*in);
+                readCSVString(column_name, *in, format_settings.csv);
+                skipWhitespacesAndTabs(*in);
 
                 addInputColumn(column_name);
             }
-            while (checkChar(format_settings.csv.delimiter, in));
+            while (checkChar(format_settings.csv.delimiter, *in));
 
-            skipDelimiter(in, format_settings.csv.delimiter, true);
+            skipDelimiter(*in, format_settings.csv.delimiter, true);
 
             for (auto read_column : column_mapping->read_columns)
             {
@@ -202,7 +202,7 @@ void CSVRowInputFormat::readPrefix()
         }
         else
         {
-            skipRow(in, format_settings.csv, num_columns);
+            skipRow(*in, format_settings.csv, num_columns);
             setupAllColumnsByTableSchema();
         }
     }
@@ -213,7 +213,7 @@ void CSVRowInputFormat::readPrefix()
 
 bool CSVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     updateDiagnosticInfo();
@@ -232,22 +232,22 @@ bool CSVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext
 
         if (table_column)
         {
-            skipWhitespacesAndTabs(in);
+            skipWhitespacesAndTabs(*in);
             ext.read_columns[*table_column] = readField(*columns[*table_column], data_types[*table_column],
                 serializations[*table_column], is_last_file_column);
 
             if (!ext.read_columns[*table_column])
                 have_default_columns = true;
-            skipWhitespacesAndTabs(in);
+            skipWhitespacesAndTabs(*in);
         }
         else
         {
             /// We never read this column from the file, just skip it.
             String tmp;
-            readCSVString(tmp, in, format_settings.csv);
+            readCSVString(tmp, *in, format_settings.csv);
         }
 
-        skipDelimiter(in, delimiter, is_last_file_column);
+        skipDelimiter(*in, delimiter, is_last_file_column);
     }
 
     if (have_default_columns)
@@ -277,13 +277,13 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
 
     for (size_t file_column = 0; file_column < column_mapping->column_indexes_for_input_fields.size(); ++file_column)
     {
-        if (file_column == 0 && in.eof())
+        if (file_column == 0 && in->eof())
         {
             out << "<End of stream>\n";
             return false;
         }
 
-        skipWhitespacesAndTabs(in);
+        skipWhitespacesAndTabs(*in);
         if (column_mapping->column_indexes_for_input_fields[file_column].has_value())
         {
             const auto & header = getPort().getHeader();
@@ -300,26 +300,26 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
             if (!deserializeFieldAndPrintDiagnosticInfo(skipped_column_str, skipped_column_type, *skipped_column, out, file_column))
                 return false;
         }
-        skipWhitespacesAndTabs(in);
+        skipWhitespacesAndTabs(*in);
 
         /// Delimiters
         if (file_column + 1 == column_mapping->column_indexes_for_input_fields.size())
         {
-            if (in.eof())
+            if (in->eof())
                 return false;
 
             /// we support the extra delimiter at the end of the line
-            if (*in.position() == delimiter)
+            if (*in->position() == delimiter)
             {
-                ++in.position();
-                if (in.eof())
+                ++in->position();
+                if (in->eof())
                     break;
             }
 
-            if (!in.eof() && *in.position() != '\n' && *in.position() != '\r')
+            if (!in->eof() && *in->position() != '\n' && *in->position() != '\r')
             {
                 out << "ERROR: There is no line feed. ";
-                verbosePrintString(in.position(), in.position() + 1, out);
+                verbosePrintString(in->position(), in->position() + 1, out);
                 out << " found instead.\n"
                        " It's like your file has more columns than expected.\n"
                        "And if your file has the right number of columns, maybe it has an unquoted string value with a comma.\n";
@@ -327,17 +327,17 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
                 return false;
             }
 
-            skipEndOfLine(in);
+            skipEndOfLine(*in);
         }
         else
         {
             try
             {
-                assertChar(delimiter, in);
+                assertChar(delimiter, *in);
             }
             catch (const DB::Exception &)
             {
-                if (*in.position() == '\n' || *in.position() == '\r')
+                if (*in->position() == '\n' || *in->position() == '\r')
                 {
                     out << "ERROR: Line feed found where delimiter (" << delimiter << ") is expected."
                            " It's like your file has less columns than expected.\n"
@@ -346,7 +346,7 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
                 else
                 {
                     out << "ERROR: There is no delimiter (" << delimiter << "). ";
-                    verbosePrintString(in.position(), in.position() + 1, out);
+                    verbosePrintString(in->position(), in->position() + 1, out);
                     out << " found instead.\n";
                 }
                 return false;
@@ -360,7 +360,7 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
 
 void CSVRowInputFormat::syncAfterError()
 {
-    skipToNextLineOrEOF(in);
+    skipToNextLineOrEOF(*in);
 }
 
 void CSVRowInputFormat::tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column)
@@ -374,15 +374,15 @@ void CSVRowInputFormat::tryDeserializeField(const DataTypePtr & type, IColumn &
     else
     {
         String tmp;
-        readCSVString(tmp, in, format_settings.csv);
+        readCSVString(tmp, *in, format_settings.csv);
     }
 }
 
 bool CSVRowInputFormat::readField(IColumn & column, const DataTypePtr & type, const SerializationPtr & serialization, bool is_last_file_column)
 {
-    const bool at_delimiter = !in.eof() && *in.position() == format_settings.csv.delimiter;
+    const bool at_delimiter = !in->eof() && *in->position() == format_settings.csv.delimiter;
     const bool at_last_column_line_end = is_last_file_column
-                                         && (in.eof() || *in.position() == '\n' || *in.position() == '\r');
+                                         && (in->eof() || *in->position() == '\n' || *in->position() == '\r');
 
     /// Note: Tuples are serialized in CSV as separate columns, but with empty_as_default or null_as_default
     /// only one empty or NULL column will be expected
@@ -401,12 +401,12 @@ bool CSVRowInputFormat::readField(IColumn & column, const DataTypePtr & type, co
     else if (format_settings.null_as_default && !type->isNullable())
     {
         /// If value is null but type is not nullable then use default value instead.
-        return SerializationNullable::deserializeTextCSVImpl(column, in, format_settings, serialization);
+        return SerializationNullable::deserializeTextCSVImpl(column, *in, format_settings, serialization);
     }
     else
     {
         /// Read the column normally.
-        serialization->deserializeTextCSV(column, in, format_settings);
+        serialization->deserializeTextCSV(column, *in, format_settings);
         return true;
     }
 }
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
index 44e6ec02903..2e02d08ed0b 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
@@ -206,7 +206,7 @@ CapnProtoRowInputFormat::CapnProtoRowInputFormat(ReadBuffer & in_, Block header,
 kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
 {
     uint32_t segment_count;
-    in.readStrict(reinterpret_cast<char*>(&segment_count), sizeof(uint32_t));
+    in->readStrict(reinterpret_cast<char*>(&segment_count), sizeof(uint32_t));
 
     // one for segmentCount and one because segmentCount starts from 0
     const auto prefix_size = (2 + segment_count) * sizeof(uint32_t);
@@ -217,7 +217,7 @@ kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
 
     // read size of each segment
     for (size_t i = 0; i <= segment_count; ++i)
-        in.readStrict(prefix_chars.begin() + ((i + 1) * sizeof(uint32_t)), sizeof(uint32_t));
+        in->readStrict(prefix_chars.begin() + ((i + 1) * sizeof(uint32_t)), sizeof(uint32_t));
 
     // calculate size of message
     const auto expected_words = capnp::expectedSizeInWordsFromPrefix(prefix);
@@ -228,14 +228,14 @@ kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
 
     // read full message
     ::memcpy(msg_chars.begin(), prefix_chars.begin(), prefix_size);
-    in.readStrict(msg_chars.begin() + prefix_size, data_size);
+    in->readStrict(msg_chars.begin() + prefix_size, data_size);
 
     return msg;
 }
 
 bool CapnProtoRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     auto array = readMessage();
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index c5684b797bf..2120c00b3b5 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -276,8 +276,9 @@ private:
             info.type = std::make_shared<DataTypeMap>(nested_types);
         }
         else
-            throw Exception(String("Unexpected literal type ") + info.literal->value.getTypeName() + ". It's a bug",
-                            ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Unexpected literal type {}",
+                info.literal->value.getTypeName());
 
         /// Allow literal to be NULL, if result column has nullable type or if function never returns NULL
         if (info.force_nullable && info.type->canBeInsideNullable())
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
index e968c187bef..8694c27d8f8 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
@@ -15,7 +15,7 @@ namespace ErrorCodes
 }
 
 JSONAsStringRowInputFormat::JSONAsStringRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_) :
-    IRowInputFormat(header_, in_, std::move(params_)), buf(in)
+    IRowInputFormat(header_, in_, std::move(params_)), buf(*in)
 {
     if (header_.columns() > 1)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
index 682a4fbf69a..927fdd0bdcc 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
@@ -49,33 +49,33 @@ void JSONCompactEachRowRowInputFormat::resetParser()
 void JSONCompactEachRowRowInputFormat::readPrefix()
 {
     /// In this format, BOM at beginning of stream cannot be confused with value, so it is safe to skip it.
-    skipBOMIfExists(in);
+    skipBOMIfExists(*in);
 
     if (with_names)
     {
         size_t num_columns = getPort().getHeader().columns();
         read_columns.assign(num_columns, false);
 
-        assertChar('[', in);
+        assertChar('[', *in);
         do
         {
-            skipWhitespaceIfAny(in);
+            skipWhitespaceIfAny(*in);
             String column_name;
-            readJSONString(column_name, in);
+            readJSONString(column_name, *in);
             addInputColumn(column_name);
-            skipWhitespaceIfAny(in);
+            skipWhitespaceIfAny(*in);
         }
-        while (checkChar(',', in));
-        assertChar(']', in);
+        while (checkChar(',', *in));
+        assertChar(']', *in);
         skipEndOfLine();
 
         /// Type checking
-        assertChar('[', in);
+        assertChar('[', *in);
         for (size_t i = 0; i < column_indexes_for_input_fields.size(); ++i)
         {
-            skipWhitespaceIfAny(in);
+            skipWhitespaceIfAny(*in);
             String data_type;
-            readJSONString(data_type, in);
+            readJSONString(data_type, *in);
 
             if (column_indexes_for_input_fields[i] &&
                 data_types[*column_indexes_for_input_fields[i]]->getName() != data_type)
@@ -89,10 +89,10 @@ void JSONCompactEachRowRowInputFormat::readPrefix()
             }
 
             if (i != column_indexes_for_input_fields.size() - 1)
-                assertChar(',', in);
-            skipWhitespaceIfAny(in);
+                assertChar(',', *in);
+            skipWhitespaceIfAny(*in);
         }
-        assertChar(']', in);
+        assertChar(']', *in);
     }
     else
     {
@@ -149,14 +149,14 @@ bool JSONCompactEachRowRowInputFormat::readRow(DB::MutableColumns &columns, DB::
 {
     skipEndOfLine();
 
-    if (in.eof())
+    if (in->eof())
         return false;
 
     size_t num_columns = columns.size();
 
     read_columns.assign(num_columns, false);
 
-    assertChar('[', in);
+    assertChar('[', *in);
     for (size_t file_column = 0; file_column < column_indexes_for_input_fields.size(); ++file_column)
     {
         const auto & table_column = column_indexes_for_input_fields[file_column];
@@ -166,19 +166,19 @@ bool JSONCompactEachRowRowInputFormat::readRow(DB::MutableColumns &columns, DB::
         }
         else
         {
-            skipJSONField(in, StringRef(names_of_columns[file_column]));
+            skipJSONField(*in, StringRef(names_of_columns[file_column]));
         }
 
-        skipWhitespaceIfAny(in);
-        if (in.eof())
+        skipWhitespaceIfAny(*in);
+        if (in->eof())
             throw ParsingException("Unexpected end of stream while parsing JSONCompactEachRow format", ErrorCodes::CANNOT_READ_ALL_DATA);
         if (file_column + 1 != column_indexes_for_input_fields.size())
         {
-            assertChar(',', in);
-            skipWhitespaceIfAny(in);
+            assertChar(',', *in);
+            skipWhitespaceIfAny(*in);
         }
     }
-    assertChar(']', in);
+    assertChar(']', *in);
 
     for (const auto & name : not_seen_columns)
         columns[name]->insertDefault();
@@ -189,11 +189,11 @@ bool JSONCompactEachRowRowInputFormat::readRow(DB::MutableColumns &columns, DB::
 
 void JSONCompactEachRowRowInputFormat::skipEndOfLine()
 {
-    skipWhitespaceIfAny(in);
-    if (!in.eof() && (*in.position() == ',' || *in.position() == ';'))
-        ++in.position();
+    skipWhitespaceIfAny(*in);
+    if (!in->eof() && (*in->position() == ',' || *in->position() == ';'))
+        ++in->position();
 
-    skipWhitespaceIfAny(in);
+    skipWhitespaceIfAny(*in);
 }
 
 void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns & columns)
@@ -207,7 +207,7 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
         if (yield_strings)
         {
             String str;
-            readJSONString(str, in);
+            readJSONString(str, *in);
 
             ReadBufferFromString buf(str);
 
@@ -219,9 +219,9 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
         else
         {
             if (format_settings.null_as_default && !type->isNullable())
-                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], in, format_settings, serialization);
+                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], *in, format_settings, serialization);
             else
-                serialization->deserializeTextJSON(*columns[index], in, format_settings);
+                serialization->deserializeTextJSON(*columns[index], *in, format_settings);
         }
     }
     catch (Exception & e)
@@ -233,7 +233,7 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
 
 void JSONCompactEachRowRowInputFormat::syncAfterError()
 {
-    skipToUnescapedNextLineOrEOF(in);
+    skipToUnescapedNextLineOrEOF(*in);
 }
 
 void registerInputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index 61034a8e01b..9f3ab8747ed 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -128,7 +128,7 @@ void JSONEachRowRowInputFormat::skipUnknownField(const StringRef & name_ref)
     if (!format_settings.skip_unknown_fields)
         throw Exception("Unknown field found while parsing JSONEachRow format: " + name_ref.toString(), ErrorCodes::INCORRECT_DATA);
 
-    skipJSONField(in, name_ref);
+    skipJSONField(*in, name_ref);
 }
 
 void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns)
@@ -145,7 +145,7 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
         if (yield_strings)
         {
             String str;
-            readJSONString(str, in);
+            readJSONString(str, *in);
 
             ReadBufferFromString buf(str);
 
@@ -157,9 +157,9 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
         else
         {
             if (format_settings.null_as_default && !type->isNullable())
-                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], in, format_settings, serialization);
+                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], *in, format_settings, serialization);
             else
-                serialization->deserializeTextJSON(*columns[index], in, format_settings);
+                serialization->deserializeTextJSON(*columns[index], *in, format_settings);
         }
     }
     catch (Exception & e)
@@ -171,31 +171,31 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
 
 inline bool JSONEachRowRowInputFormat::advanceToNextKey(size_t key_index)
 {
-    skipWhitespaceIfAny(in);
+    skipWhitespaceIfAny(*in);
 
-    if (in.eof())
+    if (in->eof())
         throw ParsingException("Unexpected end of stream while parsing JSONEachRow format", ErrorCodes::CANNOT_READ_ALL_DATA);
-    else if (*in.position() == '}')
+    else if (*in->position() == '}')
     {
-        ++in.position();
+        ++in->position();
         return false;
     }
 
     if (key_index > 0)
     {
-        assertChar(',', in);
-        skipWhitespaceIfAny(in);
+        assertChar(',', *in);
+        skipWhitespaceIfAny(*in);
     }
     return true;
 }
 
 void JSONEachRowRowInputFormat::readJSONObject(MutableColumns & columns)
 {
-    assertChar('{', in);
+    assertChar('{', *in);
 
     for (size_t key_index = 0; advanceToNextKey(key_index); ++key_index)
     {
-        StringRef name_ref = readColumnName(in);
+        StringRef name_ref = readColumnName(*in);
         const size_t column_index = columnIndex(name_ref, key_index);
 
         if (unlikely(ssize_t(column_index) < 0))
@@ -207,7 +207,7 @@ void JSONEachRowRowInputFormat::readJSONObject(MutableColumns & columns)
             current_column_name.assign(name_ref.data, name_ref.size);
             name_ref = StringRef(current_column_name);
 
-            skipColonDelimeter(in);
+            skipColonDelimeter(*in);
 
             if (column_index == UNKNOWN_FIELD)
                 skipUnknownField(name_ref);
@@ -218,7 +218,7 @@ void JSONEachRowRowInputFormat::readJSONObject(MutableColumns & columns)
         }
         else
         {
-            skipColonDelimeter(in);
+            skipColonDelimeter(*in);
             readField(column_index, columns);
         }
     }
@@ -238,7 +238,7 @@ bool JSONEachRowRowInputFormat::readRow(MutableColumns & columns, RowReadExtensi
 {
     if (!allow_new_rows)
         return false;
-    skipWhitespaceIfAny(in);
+    skipWhitespaceIfAny(*in);
 
     /// We consume , or \n before scanning a new row, instead scanning to next row at the end.
     /// The reason is that if we want an exact number of rows read with LIMIT x
@@ -247,25 +247,25 @@ bool JSONEachRowRowInputFormat::readRow(MutableColumns & columns, RowReadExtensi
 
     /// Semicolon is added for convenience as it could be used at end of INSERT query.
     bool is_first_row = getCurrentUnitNumber() == 0 && getTotalRows() == 1;
-    if (!in.eof())
+    if (!in->eof())
     {
         /// There may be optional ',' (but not before the first row)
-        if (!is_first_row && *in.position() == ',')
-            ++in.position();
-        else if (!data_in_square_brackets && *in.position() == ';')
+        if (!is_first_row && *in->position() == ',')
+            ++in->position();
+        else if (!data_in_square_brackets && *in->position() == ';')
         {
             /// ';' means the end of query (but it cannot be before ']')
             return allow_new_rows = false;
         }
-        else if (data_in_square_brackets && *in.position() == ']')
+        else if (data_in_square_brackets && *in->position() == ']')
         {
             /// ']' means the end of query
             return allow_new_rows = false;
         }
     }
 
-    skipWhitespaceIfAny(in);
-    if (in.eof())
+    skipWhitespaceIfAny(*in);
+    if (in->eof())
         return false;
 
     size_t num_columns = columns.size();
@@ -290,7 +290,7 @@ bool JSONEachRowRowInputFormat::readRow(MutableColumns & columns, RowReadExtensi
 
 void JSONEachRowRowInputFormat::syncAfterError()
 {
-    skipToUnescapedNextLineOrEOF(in);
+    skipToUnescapedNextLineOrEOF(*in);
 }
 
 void JSONEachRowRowInputFormat::resetParser()
@@ -305,30 +305,30 @@ void JSONEachRowRowInputFormat::resetParser()
 void JSONEachRowRowInputFormat::readPrefix()
 {
     /// In this format, BOM at beginning of stream cannot be confused with value, so it is safe to skip it.
-    skipBOMIfExists(in);
+    skipBOMIfExists(*in);
 
-    skipWhitespaceIfAny(in);
-    if (!in.eof() && *in.position() == '[')
+    skipWhitespaceIfAny(*in);
+    if (!in->eof() && *in->position() == '[')
     {
-        ++in.position();
+        ++in->position();
         data_in_square_brackets = true;
     }
 }
 
 void JSONEachRowRowInputFormat::readSuffix()
 {
-    skipWhitespaceIfAny(in);
+    skipWhitespaceIfAny(*in);
     if (data_in_square_brackets)
     {
-        assertChar(']', in);
-        skipWhitespaceIfAny(in);
+        assertChar(']', *in);
+        skipWhitespaceIfAny(*in);
     }
-    if (!in.eof() && *in.position() == ';')
+    if (!in->eof() && *in->position() == ';')
     {
-        ++in.position();
-        skipWhitespaceIfAny(in);
+        ++in->position();
+        skipWhitespaceIfAny(*in);
     }
-    assertEOF(in);
+    assertEOF(*in);
 }
 
 
diff --git a/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
index 01c2c8cd614..37a2ab473fc 100644
--- a/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
@@ -29,13 +29,13 @@ void LineAsStringRowInputFormat::readLineObject(IColumn & column)
 {
     DB::Memory<> object;
 
-    char * pos = in.position();
+    char * pos = in->position();
     bool need_more_data = true;
 
-    while (loadAtPosition(in, object, pos) && need_more_data)
+    while (loadAtPosition(*in, object, pos) && need_more_data)
     {
-        pos = find_first_symbols<'\n'>(pos, in.buffer().end());
-        if (pos == in.buffer().end())
+        pos = find_first_symbols<'\n'>(pos, in->buffer().end());
+        if (pos == in->buffer().end())
             continue;
 
         if (*pos == '\n')
@@ -44,8 +44,8 @@ void LineAsStringRowInputFormat::readLineObject(IColumn & column)
         ++pos;
     }
 
-    saveUpToPosition(in, object, pos);
-    loadAtPosition(in, object, pos);
+    saveUpToPosition(*in, object, pos);
+    loadAtPosition(*in, object, pos);
 
     /// Last character is always \n.
     column.insertData(object.data(), object.size() - 1);
@@ -53,7 +53,7 @@ void LineAsStringRowInputFormat::readLineObject(IColumn & column)
 
 bool LineAsStringRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     readLineObject(*columns[0]);
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
index 6eb9d1d037c..2b568166d5b 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
@@ -7,15 +7,17 @@
 #include <IO/ReadHelpers.h>
 
 #include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Columns/ColumnArray.h>
-#include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnLowCardinality.h>
 
 namespace DB
 {
@@ -27,7 +29,7 @@ namespace ErrorCodes
 }
 
 MsgPackRowInputFormat::MsgPackRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_)
-    : IRowInputFormat(header_, in_, std::move(params_)), buf(in), parser(visitor), data_types(header_.getDataTypes())  {}
+    : IRowInputFormat(header_, in_, std::move(params_)), buf(*in), parser(visitor), data_types(header_.getDataTypes())  {}
 
 void MsgPackRowInputFormat::resetParser()
 {
@@ -50,95 +52,213 @@ void MsgPackVisitor::reset()
     info_stack = {};
 }
 
-void MsgPackVisitor::insert_integer(UInt64 value) // NOLINT
+template <typename InsertFunc>
+static bool checkAndInsertNullable(IColumn & column, DataTypePtr type, InsertFunc insert_func)
 {
-    Info & info = info_stack.top();
-    switch (info.type->getTypeId())
+    if (type->isNullable())
+    {
+        auto & nullable_column = assert_cast<ColumnNullable &>(column);
+        auto & nested_column = nullable_column.getNestedColumn();
+        const auto & nested_type = assert_cast<const DataTypeNullable *>(type.get())->getNestedType();
+        insert_func(nested_column, nested_type);
+        nullable_column.getNullMapColumn().insertValue(0);
+        return true;
+    }
+
+    return false;
+}
+
+template <typename InsertFunc>
+static bool checkAndInsertLowCardinality(IColumn & column, DataTypePtr type, InsertFunc insert_func)
+{
+    if (type->lowCardinality())
+    {
+        auto & lc_column = assert_cast<ColumnLowCardinality &>(column);
+        auto tmp_column = lc_column.getDictionary().getNestedColumn()->cloneEmpty();
+        auto dict_type = assert_cast<const DataTypeLowCardinality *>(type.get())->getDictionaryType();
+        insert_func(*tmp_column, dict_type);
+        lc_column.insertFromFullColumn(*tmp_column, 0);
+        return true;
+    }
+    return false;
+}
+
+static void insertInteger(IColumn & column, DataTypePtr type, UInt64 value)
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertInteger(column_, type_, value);
+    };
+
+    if (checkAndInsertNullable(column, type, insert_func) || checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    switch (type->getTypeId())
     {
         case TypeIndex::UInt8:
         {
-            assert_cast<ColumnUInt8 &>(info.column).insertValue(value);
+            assert_cast<ColumnUInt8 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Date: [[fallthrough]];
         case TypeIndex::UInt16:
         {
-            assert_cast<ColumnUInt16 &>(info.column).insertValue(value);
+            assert_cast<ColumnUInt16 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::DateTime: [[fallthrough]];
         case TypeIndex::UInt32:
         {
-            assert_cast<ColumnUInt32 &>(info.column).insertValue(value);
+            assert_cast<ColumnUInt32 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::UInt64:
         {
-            assert_cast<ColumnUInt64 &>(info.column).insertValue(value);
+            assert_cast<ColumnUInt64 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Int8:
         {
-            assert_cast<ColumnInt8 &>(info.column).insertValue(value);
+            assert_cast<ColumnInt8 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Int16:
         {
-            assert_cast<ColumnInt16 &>(info.column).insertValue(value);
+            assert_cast<ColumnInt16 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Int32:
         {
-            assert_cast<ColumnInt32 &>(info.column).insertValue(value);
+            assert_cast<ColumnInt32 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Int64:
         {
-            assert_cast<ColumnInt64 &>(info.column).insertValue(value);
+            assert_cast<ColumnInt64 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::DateTime64:
         {
-            assert_cast<DataTypeDateTime64::ColumnType &>(info.column).insertValue(value);
+            assert_cast<DataTypeDateTime64::ColumnType &>(column).insertValue(value);
             break;
         }
         default:
-            throw Exception("Type " + info.type->getName() + " is not supported for MsgPack input format", ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack integer into column with type {}.", type->getName());
     }
 }
 
+static void insertString(IColumn & column, DataTypePtr type, const char * value, size_t size)
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertString(column_, type_, value, size);
+    };
+
+    if (checkAndInsertNullable(column, type, insert_func) || checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    if (!isStringOrFixedString(type))
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack string into column with type {}.", type->getName());
+
+    column.insertData(value, size);
+}
+
+static void insertFloat32(IColumn & column, DataTypePtr type, Float32 value) // NOLINT
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertFloat32(column_, type_, value);
+    };
+
+    if (checkAndInsertNullable(column, type, insert_func) || checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    if (!WhichDataType(type).isFloat32())
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack float32 into column with type {}.", type->getName());
+
+    assert_cast<ColumnFloat32 &>(column).insertValue(value);
+}
+
+static void insertFloat64(IColumn & column, DataTypePtr type, Float64 value) // NOLINT
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertFloat64(column_, type_, value);
+    };
+
+    if (checkAndInsertNullable(column, type, insert_func) || checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    if (!WhichDataType(type).isFloat64())
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack float64 into column with type {}.", type->getName());
+
+    assert_cast<ColumnFloat64 &>(column).insertValue(value);
+}
+
+static void insertNull(IColumn & column, DataTypePtr type)
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertNull(column_, type_);
+    };
+
+    /// LowCardinality(Nullable(...))
+    if (checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    if (!type->isNullable())
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack null into non-nullable column with type {}.", type->getName());
+
+    assert_cast<ColumnNullable &>(column).insertDefault();
+}
+
 bool MsgPackVisitor::visit_positive_integer(UInt64 value) // NOLINT
 {
-    insert_integer(value);
+    insertInteger(info_stack.top().column, info_stack.top().type, value);
     return true;
 }
 
 bool MsgPackVisitor::visit_negative_integer(Int64 value) // NOLINT
 {
-    insert_integer(value);
+    insertInteger(info_stack.top().column, info_stack.top().type, value);
     return true;
 }
 
-bool MsgPackVisitor::visit_str(const char* value, size_t size) // NOLINT
+bool MsgPackVisitor::visit_str(const char * value, size_t size) // NOLINT
 {
-    info_stack.top().column.insertData(value, size);
+    insertString(info_stack.top().column, info_stack.top().type, value, size);
+    return true;
+}
+
+bool MsgPackVisitor::visit_bin(const char * value, size_t size) // NOLINT
+{
+    insertString(info_stack.top().column, info_stack.top().type, value, size);
     return true;
 }
 
 bool MsgPackVisitor::visit_float32(Float32 value) // NOLINT
 {
-    assert_cast<ColumnFloat32 &>(info_stack.top().column).insertValue(value);
+    insertFloat32(info_stack.top().column, info_stack.top().type, value);
     return true;
 }
 
 bool MsgPackVisitor::visit_float64(Float64 value) // NOLINT
 {
-    assert_cast<ColumnFloat64 &>(info_stack.top().column).insertValue(value);
+    insertFloat64(info_stack.top().column, info_stack.top().type, value);
+    return true;
+}
+
+bool MsgPackVisitor::visit_boolean(bool value)
+{
+    insertInteger(info_stack.top().column, info_stack.top().type, UInt64(value));
     return true;
 }
 
 bool MsgPackVisitor::start_array(size_t size) // NOLINT
 {
+    if (!isArray(info_stack.top().type))
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack array into column with type {}.", info_stack.top().type->getName());
+
     auto nested_type = assert_cast<const DataTypeArray &>(*info_stack.top().type).getNestedType();
     ColumnArray & column_array = assert_cast<ColumnArray &>(info_stack.top().column);
     ColumnArray::Offsets & offsets = column_array.getOffsets();
@@ -154,6 +274,50 @@ bool MsgPackVisitor::end_array() // NOLINT
     return true;
 }
 
+bool MsgPackVisitor::start_map(uint32_t size) // NOLINT
+{
+    if (!isMap(info_stack.top().type))
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack map into column with type {}.", info_stack.top().type->getName());
+    ColumnArray & column_array = assert_cast<ColumnMap &>(info_stack.top().column).getNestedColumn();
+    ColumnArray::Offsets & offsets = column_array.getOffsets();
+    offsets.push_back(offsets.back() + size);
+    return true;
+}
+
+bool MsgPackVisitor::start_map_key() // NOLINT
+{
+    auto key_column = assert_cast<ColumnMap &>(info_stack.top().column).getNestedData().getColumns()[0];
+    auto key_type = assert_cast<const DataTypeMap &>(*info_stack.top().type).getKeyType();
+    info_stack.push(Info{*key_column, key_type});
+    return true;
+}
+
+bool MsgPackVisitor::end_map_key() // NOLINT
+{
+    info_stack.pop();
+    return true;
+}
+
+bool MsgPackVisitor::start_map_value() // NOLINT
+{
+    auto value_column = assert_cast<ColumnMap &>(info_stack.top().column).getNestedData().getColumns()[1];
+    auto value_type = assert_cast<const DataTypeMap &>(*info_stack.top().type).getValueType();
+    info_stack.push(Info{*value_column, value_type});
+    return true;
+}
+
+bool MsgPackVisitor::end_map_value() // NOLINT
+{
+    info_stack.pop();
+    return true;
+}
+
+bool MsgPackVisitor::visit_nil()
+{
+    insertNull(info_stack.top().column, info_stack.top().type);
+    return true;
+}
+
 void MsgPackVisitor::parse_error(size_t, size_t) // NOLINT
 {
     throw Exception("Error occurred while parsing msgpack data.", ErrorCodes::INCORRECT_DATA);
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.h b/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
index ac44772929a..1d790b4485b 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
@@ -33,22 +33,27 @@ public:
     bool visit_negative_integer(Int64 value);
     bool visit_float32(Float32 value);
     bool visit_float64(Float64 value);
-    bool visit_str(const char* value, size_t size);
+    bool visit_str(const char * value, size_t size);
+    bool visit_bin(const char * value, size_t size);
+    bool visit_boolean(bool value);
     bool start_array(size_t size);
     bool end_array();
+    bool visit_nil();
+    bool start_map(uint32_t size);
+    bool start_map_key();
+    bool end_map_key();
+    bool start_map_value();
+    bool end_map_value();
 
     /// This function will be called if error occurs in parsing
     [[noreturn]] void parse_error(size_t parsed_offset, size_t error_offset);
 
     /// Update info_stack
     void set_info(IColumn & column, DataTypePtr type);
-
-    void insert_integer(UInt64 value);
-
     void reset();
 
 private:
-    /// Stack is needed to process nested arrays
+    /// Stack is needed to process arrays and maps
     std::stack<Info> info_stack;
 };
 
diff --git a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
index bb20d3d9899..27f736128f7 100644
--- a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
@@ -6,15 +6,18 @@
 #include <Common/assert_cast.h>
 
 #include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnLowCardinality.h>
 
 namespace DB
 {
@@ -91,15 +94,15 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
         case TypeIndex::String:
         {
             const StringRef & string = assert_cast<const ColumnString &>(column).getDataAt(row_num);
-            packer.pack_str(string.size);
-            packer.pack_str_body(string.data, string.size);
+            packer.pack_bin(string.size);
+            packer.pack_bin_body(string.data, string.size);
             return;
         }
         case TypeIndex::FixedString:
         {
             const StringRef & string = assert_cast<const ColumnFixedString &>(column).getDataAt(row_num);
-            packer.pack_str(string.size);
-            packer.pack_str_body(string.data, string.size);
+            packer.pack_bin(string.size);
+            packer.pack_bin_body(string.data, string.size);
             return;
         }
         case TypeIndex::Array:
@@ -132,6 +135,35 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
             packer.pack_nil();
             return;
         }
+        case TypeIndex::Map:
+        {
+            const auto & map_column = assert_cast<const ColumnMap &>(column);
+            const auto & nested_column = map_column.getNestedColumn();
+            const auto & key_value_columns = map_column.getNestedData().getColumns();
+            const auto & key_column = key_value_columns[0];
+            const auto & value_column = key_value_columns[1];
+
+            const auto & map_type = assert_cast<const DataTypeMap &>(*data_type);
+            const auto & offsets = nested_column.getOffsets();
+            size_t offset = offsets[row_num - 1];
+            size_t size = offsets[row_num] - offset;
+            packer.pack_map(size);
+            for (size_t i = 0; i < size; ++i)
+            {
+                serializeField(*key_column, map_type.getKeyType(), offset + i);
+                serializeField(*value_column, map_type.getValueType(), offset + i);
+            }
+            return;
+        }
+        case TypeIndex::LowCardinality:
+        {
+            const auto & lc_column = assert_cast<const ColumnLowCardinality &>(column);
+            auto dict_type = assert_cast<const DataTypeLowCardinality *>(data_type.get())->getDictionaryType();
+            auto dict_column = lc_column.getDictionary().getNestedColumn();
+            size_t index = lc_column.getIndexAt(row_num);
+            serializeField(*dict_column, dict_type, index);
+            return;
+        }
         default:
             break;
     }
diff --git a/src/Processors/Formats/Impl/NativeFormat.h b/src/Processors/Formats/Impl/NativeFormat.h
index 664252c268b..4757274e1c9 100644
--- a/src/Processors/Formats/Impl/NativeFormat.h
+++ b/src/Processors/Formats/Impl/NativeFormat.h
@@ -14,7 +14,7 @@ class NativeInputFormatFromNativeBlockInputStream : public IInputFormat
 public:
     NativeInputFormatFromNativeBlockInputStream(const Block & header, ReadBuffer & in_)
         : IInputFormat(header, in_)
-        , stream(std::make_shared<NativeBlockInputStream>(in, header, 0))
+        , stream(std::make_shared<NativeBlockInputStream>(*in, header, 0))
     {
     }
 
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
index 9d56d2c8fa8..aa158788394 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
@@ -93,7 +93,7 @@ static size_t countIndicesForType(std::shared_ptr<arrow::DataType> type)
 
 void ORCBlockInputFormat::prepareReader()
 {
-    THROW_ARROW_NOT_OK(arrow::adapters::orc::ORCFileReader::Open(asArrowFile(in), arrow::default_memory_pool(), &file_reader));
+    THROW_ARROW_NOT_OK(arrow::adapters::orc::ORCFileReader::Open(asArrowFile(*in), arrow::default_memory_pool(), &file_reader));
     stripe_total = file_reader->NumberOfStripes();
     stripe_current = 0;
 
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.h b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
index 254d0554cb2..60ce963a6a1 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
@@ -1,5 +1,7 @@
 #pragma once
-#include "config_formats.h"
+#if !defined(ARCADIA_BUILD)
+#    include "config_formats.h"
+#endif
 #if USE_ORC
 
 #include <Processors/Formats/IInputFormat.h>
diff --git a/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
index a5143792e7d..78c8b324689 100644
--- a/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
@@ -20,6 +20,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 namespace DB
 {
@@ -48,8 +49,10 @@ void ORCOutputStream::write(const void* buf, size_t length)
 }
 
 ORCBlockOutputFormat::ORCBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_)
-    : IOutputFormat(header_, out_), format_settings{format_settings_}, output_stream(out_), data_types(header_.getDataTypes())
+    : IOutputFormat(header_, out_), format_settings{format_settings_}, output_stream(out_)
 {
+    for (const auto & type : header_.getDataTypes())
+        data_types.push_back(recursiveRemoveLowCardinality(type));
 }
 
 ORC_UNIQUE_PTR<orc::Type> ORCBlockOutputFormat::getORCType(const DataTypePtr & type, const std::string & column_name)
@@ -482,10 +485,12 @@ void ORCBlockOutputFormat::consume(Chunk chunk)
     /// The size of the batch must be no less than total amount of array elements.
     ORC_UNIQUE_PTR<orc::ColumnVectorBatch> batch = writer->createRowBatch(getMaxColumnSize(chunk));
     orc::StructVectorBatch & root = dynamic_cast<orc::StructVectorBatch &>(*batch);
+    auto columns = chunk.detachColumns();
+    for (auto & column : columns)
+        column = recursiveRemoveLowCardinality(column);
+
     for (size_t i = 0; i != columns_num; ++i)
-    {
-        writeColumn(*root.fields[i], *chunk.getColumns()[i], data_types[i], nullptr);
-    }
+        writeColumn(*root.fields[i], *columns[i], data_types[i], nullptr);
     root.numElements = rows_num;
     writer->add(*batch);
 }
@@ -505,7 +510,7 @@ void ORCBlockOutputFormat::prepareWriter()
     options.setCompression(orc::CompressionKind::CompressionKind_NONE);
     size_t columns_count = header.columns();
     for (size_t i = 0; i != columns_count; ++i)
-        schema->addStructField(header.safeGetByPosition(i).name, getORCType(data_types[i], header.safeGetByPosition(i).name));
+        schema->addStructField(header.safeGetByPosition(i).name, getORCType(recursiveRemoveLowCardinality(data_types[i]), header.safeGetByPosition(i).name));
     writer = orc::createWriter(*schema, &output_stream, options);
 }
 
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
index 2971dbe8b5a..03c5b7de9bc 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
@@ -26,8 +26,7 @@ void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr
 
             {
                 std::unique_lock<std::mutex> lock(mutex);
-                segmentator_condvar.wait(lock,
-                                         [&]{ return unit.status == READY_TO_INSERT || parsing_finished; });
+                segmentator_condvar.wait(lock, [&] { return unit.status == READY_TO_INSERT || parsing_finished; });
             }
 
             if (parsing_finished)
@@ -38,7 +37,7 @@ void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr
             // Segmentating the original input.
             unit.segment.resize(0);
 
-            auto [have_more_data, currently_read_rows] = file_segmentation_engine(in, unit.segment, min_chunk_bytes);
+            auto [have_more_data, currently_read_rows] = file_segmentation_engine(*in, unit.segment, min_chunk_bytes);
 
             unit.offset = successfully_read_rows_count;
             successfully_read_rows_count += currently_read_rows;
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index a0b92f98ca9..44f115799ef 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -92,7 +92,7 @@ static size_t countIndicesForType(std::shared_ptr<arrow::DataType> type)
 
 void ParquetBlockInputFormat::prepareReader()
 {
-    THROW_ARROW_NOT_OK(parquet::arrow::OpenFile(asArrowFile(in), arrow::default_memory_pool(), &file_reader));
+    THROW_ARROW_NOT_OK(parquet::arrow::OpenFile(asArrowFile(*in), arrow::default_memory_pool(), &file_reader));
     row_group_total = file_reader->num_row_groups();
     row_group_current = 0;
 
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
index c2ed1552423..a38db0b3a02 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
@@ -1,6 +1,7 @@
 #pragma once
-
-#include "config_formats.h"
+#if !defined(ARCADIA_BUILD)
+#    include "config_formats.h"
+#endif
 #if USE_PARQUET
 
 #include <Processors/Formats/IInputFormat.h>
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
index 8114d1ab494..ba82000e463 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
@@ -1,6 +1,8 @@
 #pragma once
+#if !defined(ARCADIA_BUILD)
+#    include "config_formats.h"
+#endif
 
-#include "config_formats.h"
 #if USE_PARQUET
 #    include <Processors/Formats/IOutputFormat.h>
 #    include <Formats/FormatSettings.h>
diff --git a/src/Processors/Formats/Impl/RawBLOBRowInputFormat.cpp b/src/Processors/Formats/Impl/RawBLOBRowInputFormat.cpp
index bd9eaada05e..3b1317acc63 100644
--- a/src/Processors/Formats/Impl/RawBLOBRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RawBLOBRowInputFormat.cpp
@@ -29,12 +29,12 @@ RawBLOBRowInputFormat::RawBLOBRowInputFormat(const Block & header_, ReadBuffer &
 
 bool RawBLOBRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     /// One excessive copy.
     String blob;
-    readStringUntilEOF(blob, in);
+    readStringUntilEOF(blob, *in);
     columns.at(0)->insertData(blob.data(), blob.size());
     return false;
 }
diff --git a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
index ee6fce83358..df992a965b1 100644
--- a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
@@ -30,7 +30,7 @@ void TSKVRowInputFormat::readPrefix()
 {
     /// In this format, we assume that column name cannot contain BOM,
     ///  so BOM at beginning of stream cannot be confused with name of field, and it is safe to skip it.
-    skipBOMIfExists(in);
+    skipBOMIfExists(*in);
 }
 
 
@@ -95,7 +95,7 @@ static bool readName(ReadBuffer & buf, StringRef & ref, String & tmp)
 
 bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     const auto & header = getPort().getHeader();
@@ -105,17 +105,17 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
     read_columns.assign(num_columns, false);
     seen_columns.assign(num_columns, false);
 
-    if (unlikely(*in.position() == '\n'))
+    if (unlikely(*in->position() == '\n'))
     {
         /// An empty string. It is permissible, but it is unclear why.
-        ++in.position();
+        ++in->position();
     }
     else
     {
         while (true)
         {
             StringRef name_ref;
-            bool has_value = readName(in, name_ref, name_buf);
+            bool has_value = readName(*in, name_ref, name_buf);
             ssize_t index = -1;
 
             if (has_value)
@@ -131,7 +131,7 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
 
                     /// If the key is not found, skip the value.
                     NullOutput sink;
-                    readEscapedStringInto(sink, in);
+                    readEscapedStringInto(sink, *in);
                 }
                 else
                 {
@@ -144,9 +144,9 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
                     const auto & type = getPort().getHeader().getByPosition(index).type;
                     const auto & serialization = serializations[index];
                     if (format_settings.null_as_default && !type->isNullable())
-                        read_columns[index] = SerializationNullable::deserializeTextEscapedImpl(*columns[index], in, format_settings, serialization);
+                        read_columns[index] = SerializationNullable::deserializeTextEscapedImpl(*columns[index], *in, format_settings, serialization);
                     else
-                        serialization->deserializeTextEscaped(*columns[index], in, format_settings);
+                        serialization->deserializeTextEscaped(*columns[index], *in, format_settings);
                 }
             }
             else
@@ -156,18 +156,18 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
                     throw Exception("Found field without value while parsing TSKV format: " + name_ref.toString(), ErrorCodes::INCORRECT_DATA);
             }
 
-            if (in.eof())
+            if (in->eof())
             {
                 throw ParsingException("Unexpected end of stream after field in TSKV format: " + name_ref.toString(), ErrorCodes::CANNOT_READ_ALL_DATA);
             }
-            else if (*in.position() == '\t')
+            else if (*in->position() == '\t')
             {
-                ++in.position();
+                ++in->position();
                 continue;
             }
-            else if (*in.position() == '\n')
+            else if (*in->position() == '\n')
             {
-                ++in.position();
+                ++in->position();
                 break;
             }
             else
@@ -198,7 +198,7 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
 
 void TSKVRowInputFormat::syncAfterError()
 {
-    skipToUnescapedNextLineOrEOF(in);
+    skipToUnescapedNextLineOrEOF(*in);
 }
 
 
diff --git a/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
index 07c8edf9e6e..3e12388bede 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
@@ -35,15 +35,15 @@ public:
     {
         String tmp;
 
-        while (!in.eof())
+        while (!in->eof())
         {
-            char * pos = find_first_symbols<'\n', '\t'>(in.position(), in.buffer().end());
+            char * pos = find_first_symbols<'\n', '\t'>(in->position(), in->buffer().end());
 
-            tmp.append(in.position(), pos - in.position());
-            in.position() = pos;
+            tmp.append(in->position(), pos - in->position());
+            in->position() = pos;
 
-            if (pos == in.buffer().end())
-                in.next();
+            if (pos == in->buffer().end())
+                in->next();
             else
                 break;
         }
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
index 5d56ed1327e..7fe23a5bb94 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
@@ -36,7 +36,7 @@ static void skipTSVRow(ReadBuffer & in, const size_t num_columns)
   */
 static void checkForCarriageReturn(ReadBuffer & in)
 {
-    if (in.position()[0] == '\r' || (in.position() != in.buffer().begin() && in.position()[-1] == '\r'))
+    if (!in.eof() && (in.position()[0] == '\r' || (in.position() != in.buffer().begin() && in.position()[-1] == '\r')))
         throw Exception("\nYou have carriage return (\\r, 0x0D, ASCII 13) at end of first row."
             "\nIt's like your input data has DOS/Windows style line separators, that are illegal in TabSeparated format."
             " You must transform your file to Unix format."
@@ -134,7 +134,7 @@ void TabSeparatedRowInputFormat::readPrefix()
         /// In this format, we assume that column name or type cannot contain BOM,
         ///  so, if format has header,
         ///  then BOM at beginning of stream cannot be confused with name or type of field, and it is safe to skip it.
-        skipBOMIfExists(in);
+        skipBOMIfExists(*in);
     }
 
     /// This is a bit of abstraction leakage, but we have almost the same code in other places.
@@ -146,12 +146,12 @@ void TabSeparatedRowInputFormat::readPrefix()
             String column_name;
             for (;;)
             {
-                readEscapedString(column_name, in);
-                if (!checkChar('\t', in))
+                readEscapedString(column_name, *in);
+                if (!checkChar('\t', *in))
                 {
                     /// Check last column for \r before adding it, otherwise an error will be:
                     ///     "Unknown field found in TSV header"
-                    checkForCarriageReturn(in);
+                    checkForCarriageReturn(*in);
                     addInputColumn(column_name);
                     break;
                 }
@@ -160,15 +160,15 @@ void TabSeparatedRowInputFormat::readPrefix()
             }
 
 
-            if (!in.eof())
+            if (!in->eof())
             {
-                assertChar('\n', in);
+                assertChar('\n', *in);
             }
         }
         else
         {
             setupAllColumnsByTableSchema();
-            skipTSVRow(in, column_mapping->column_indexes_for_input_fields.size());
+            skipTSVRow(*in, column_mapping->column_indexes_for_input_fields.size());
         }
     }
     else if (!column_mapping->is_set)
@@ -176,14 +176,14 @@ void TabSeparatedRowInputFormat::readPrefix()
 
     if (with_types)
     {
-        skipTSVRow(in, column_mapping->column_indexes_for_input_fields.size());
+        skipTSVRow(*in, column_mapping->column_indexes_for_input_fields.size());
     }
 }
 
 
 bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     updateDiagnosticInfo();
@@ -201,20 +201,20 @@ bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
         else
         {
             NullOutput null_sink;
-            readEscapedStringInto(null_sink, in);
+            readEscapedStringInto(null_sink, *in);
         }
 
         /// skip separators
         if (file_column + 1 < column_mapping->column_indexes_for_input_fields.size())
         {
-            assertChar('\t', in);
+            assertChar('\t', *in);
         }
-        else if (!in.eof())
+        else if (!in->eof())
         {
             if (unlikely(row_num == 1))
-                checkForCarriageReturn(in);
+                checkForCarriageReturn(*in);
 
-            assertChar('\n', in);
+            assertChar('\n', *in);
         }
     }
 
@@ -227,8 +227,8 @@ bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
 bool TabSeparatedRowInputFormat::readField(IColumn & column, const DataTypePtr & type,
     const SerializationPtr & serialization, bool is_last_file_column)
 {
-    const bool at_delimiter = !is_last_file_column && !in.eof() && *in.position() == '\t';
-    const bool at_last_column_line_end = is_last_file_column && (in.eof() || *in.position() == '\n');
+    const bool at_delimiter = !is_last_file_column && !in->eof() && *in->position() == '\t';
+    const bool at_last_column_line_end = is_last_file_column && (in->eof() || *in->position() == '\n');
 
     if (format_settings.tsv.empty_as_default && (at_delimiter || at_last_column_line_end))
     {
@@ -236,9 +236,9 @@ bool TabSeparatedRowInputFormat::readField(IColumn & column, const DataTypePtr &
         return false;
     }
     else if (format_settings.null_as_default && !type->isNullable())
-        return SerializationNullable::deserializeTextEscapedImpl(column, in, format_settings, serialization);
+        return SerializationNullable::deserializeTextEscapedImpl(column, *in, format_settings, serialization);
 
-    serialization->deserializeTextEscaped(column, in, format_settings);
+    serialization->deserializeTextEscaped(column, *in, format_settings);
     return true;
 }
 
@@ -246,7 +246,7 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
 {
     for (size_t file_column = 0; file_column < column_mapping->column_indexes_for_input_fields.size(); ++file_column)
     {
-        if (file_column == 0 && in.eof())
+        if (file_column == 0 && in->eof())
         {
             out << "<End of stream>\n";
             return false;
@@ -272,21 +272,21 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
         /// Delimiters
         if (file_column + 1 == column_mapping->column_indexes_for_input_fields.size())
         {
-            if (!in.eof())
+            if (!in->eof())
             {
                 try
                 {
-                    assertChar('\n', in);
+                    assertChar('\n', *in);
                 }
                 catch (const DB::Exception &)
                 {
-                    if (*in.position() == '\t')
+                    if (*in->position() == '\t')
                     {
                         out << "ERROR: Tab found where line feed is expected."
                                " It's like your file has more columns than expected.\n"
                                "And if your file has the right number of columns, maybe it has an unescaped tab in a value.\n";
                     }
-                    else if (*in.position() == '\r')
+                    else if (*in->position() == '\r')
                     {
                         out << "ERROR: Carriage return found where line feed is expected."
                                " It's like your file has DOS/Windows style line separators, that is illegal in TabSeparated format.\n";
@@ -294,7 +294,7 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
                     else
                     {
                         out << "ERROR: There is no line feed. ";
-                        verbosePrintString(in.position(), in.position() + 1, out);
+                        verbosePrintString(in->position(), in->position() + 1, out);
                         out << " found instead.\n";
                     }
                     return false;
@@ -305,25 +305,25 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
         {
             try
             {
-                assertChar('\t', in);
+                assertChar('\t', *in);
             }
             catch (const DB::Exception &)
             {
-                if (*in.position() == '\n')
+                if (*in->position() == '\n')
                 {
                     out << "ERROR: Line feed found where tab is expected."
                            " It's like your file has less columns than expected.\n"
                            "And if your file has the right number of columns, "
                            "maybe it has an unescaped backslash in value before tab, which causes the tab to be escaped.\n";
                 }
-                else if (*in.position() == '\r')
+                else if (*in->position() == '\r')
                 {
                     out << "ERROR: Carriage return found where tab is expected.\n";
                 }
                 else
                 {
                     out << "ERROR: There is no tab. ";
-                    verbosePrintString(in.position(), in.position() + 1, out);
+                    verbosePrintString(in->position(), in->position() + 1, out);
                     out << " found instead.\n";
                 }
                 return false;
@@ -342,19 +342,19 @@ void TabSeparatedRowInputFormat::tryDeserializeField(const DataTypePtr & type, I
         bool can_be_parsed_as_null = removeLowCardinality(type)->isNullable();
 
         // check null value for type is not nullable. don't cross buffer bound for simplicity, so maybe missing some case
-        if (!can_be_parsed_as_null && !in.eof())
+        if (!can_be_parsed_as_null && !in->eof())
         {
-            if (*in.position() == '\\' && in.available() >= 2)
+            if (*in->position() == '\\' && in->available() >= 2)
             {
-                ++in.position();
-                if (*in.position() == 'N')
+                ++in->position();
+                if (*in->position() == 'N')
                 {
-                    ++in.position();
+                    ++in->position();
                     throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected NULL value of not Nullable type {}", type->getName());
                 }
                 else
                 {
-                    --in.position();
+                    --in->position();
                 }
             }
         }
@@ -365,13 +365,13 @@ void TabSeparatedRowInputFormat::tryDeserializeField(const DataTypePtr & type, I
     else
     {
         NullOutput null_sink;
-        readEscapedStringInto(null_sink, in);
+        readEscapedStringInto(null_sink, *in);
     }
 }
 
 void TabSeparatedRowInputFormat::syncAfterError()
 {
-    skipToUnescapedNextLineOrEOF(in);
+    skipToUnescapedNextLineOrEOF(*in);
 }
 
 void TabSeparatedRowInputFormat::resetParser()
diff --git a/src/Processors/Formats/InputStreamFromInputFormat.h b/src/Processors/Formats/InputStreamFromInputFormat.h
index 4369287d39e..339f559ac9b 100644
--- a/src/Processors/Formats/InputStreamFromInputFormat.h
+++ b/src/Processors/Formats/InputStreamFromInputFormat.h
@@ -9,9 +9,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-class IInputFormat;
-using InputFormatPtr = std::shared_ptr<IInputFormat>;
-
 class InputStreamFromInputFormat : public IBlockInputStream
 {
 public:
diff --git a/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp b/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
index 4dddc9fff9b..f4568830720 100644
--- a/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
+++ b/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
@@ -29,15 +29,15 @@ void RowInputFormatWithDiagnosticInfo::updateDiagnosticInfo()
     ++row_num;
 
     bytes_read_at_start_of_buffer_on_prev_row = bytes_read_at_start_of_buffer_on_current_row;
-    bytes_read_at_start_of_buffer_on_current_row = in.count() - in.offset();
+    bytes_read_at_start_of_buffer_on_current_row = in->count() - in->offset();
 
     offset_of_prev_row = offset_of_current_row;
-    offset_of_current_row = in.offset();
+    offset_of_current_row = in->offset();
 }
 
 String RowInputFormatWithDiagnosticInfo::getDiagnosticInfo()
 {
-    if (in.eof())
+    if (in->eof())
         return "Buffer has gone, cannot extract information about what has been parsed.";
 
     WriteBufferFromOwnString out;
@@ -46,7 +46,7 @@ String RowInputFormatWithDiagnosticInfo::getDiagnosticInfo()
     MutableColumns columns = header.cloneEmptyColumns();
 
     /// It is possible to display detailed diagnostics only if the last and next to last rows are still in the read buffer.
-    size_t bytes_read_at_start_of_buffer = in.count() - in.offset();
+    size_t bytes_read_at_start_of_buffer = in->count() - in->offset();
     if (bytes_read_at_start_of_buffer != bytes_read_at_start_of_buffer_on_prev_row)
     {
         out << "Could not print diagnostic info because two last rows aren't in buffer (rare case)\n";
@@ -65,9 +65,9 @@ String RowInputFormatWithDiagnosticInfo::getDiagnosticInfo()
 
     /// Roll back the cursor to the beginning of the previous or current row and parse all over again. But now we derive detailed information.
 
-    if (offset_of_prev_row <= in.buffer().size())
+    if (offset_of_prev_row <= in->buffer().size())
     {
-        in.position() = in.buffer().begin() + offset_of_prev_row;
+        in->position() = in->buffer().begin() + offset_of_prev_row;
 
         out << "\nRow " << (row_num - 1) << ":\n";
         if (!parseRowAndPrintDiagnosticInfo(columns, out))
@@ -75,13 +75,13 @@ String RowInputFormatWithDiagnosticInfo::getDiagnosticInfo()
     }
     else
     {
-        if (in.buffer().size() < offset_of_current_row)
+        if (in->buffer().size() < offset_of_current_row)
         {
             out << "Could not print diagnostic info because parsing of data hasn't started.\n";
             return out.str();
         }
 
-        in.position() = in.buffer().begin() + offset_of_current_row;
+        in->position() = in->buffer().begin() + offset_of_current_row;
     }
 
     out << "\nRow " << row_num << ":\n";
@@ -101,7 +101,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
         << "name: " << alignedName(col_name, max_length_of_column_name)
         << "type: " << alignedName(type->getName(), max_length_of_data_type_name);
 
-    auto * prev_position = in.position();
+    auto * prev_position = in->position();
     std::exception_ptr exception;
 
     try
@@ -112,7 +112,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
     {
         exception = std::current_exception();
     }
-    auto * curr_position = in.position();
+    auto * curr_position = in->position();
 
     if (curr_position < prev_position)
         throw Exception("Logical error: parsing is non-deterministic.", ErrorCodes::LOGICAL_ERROR);
@@ -123,7 +123,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
         if (curr_position == prev_position)
         {
             out << "ERROR: text ";
-            verbosePrintString(prev_position, std::min(prev_position + 10, in.buffer().end()), out);
+            verbosePrintString(prev_position, std::min(prev_position + 10, in->buffer().end()), out);
             out << " is not like " << type->getName() << "\n";
             return false;
         }
@@ -152,7 +152,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
         if (isGarbageAfterField(file_column, curr_position))
         {
             out << "ERROR: garbage after " << type->getName() << ": ";
-            verbosePrintString(curr_position, std::min(curr_position + 10, in.buffer().end()), out);
+            verbosePrintString(curr_position, std::min(curr_position + 10, in->buffer().end()), out);
             out << "\n";
 
             if (type->getName() == "DateTime")
diff --git a/src/Processors/ISimpleTransform.h b/src/Processors/ISimpleTransform.h
index ee92b574d7c..7c08a4c707e 100644
--- a/src/Processors/ISimpleTransform.h
+++ b/src/Processors/ISimpleTransform.h
@@ -32,11 +32,6 @@ protected:
     /// This allows to escape caching chunks in input port, which can lead to uneven data distribution.
     bool set_input_not_needed_after_read = true;
 
-    virtual void transform(Chunk &)
-    {
-        throw Exception("Method transform is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
-    }
-
     virtual void transform(Chunk & input_chunk, Chunk & output_chunk)
     {
         transform(input_chunk);
@@ -49,6 +44,11 @@ protected:
 public:
     ISimpleTransform(Block input_header_, Block output_header_, bool skip_empty_chunks_);
 
+    virtual void transform(Chunk &)
+    {
+        throw Exception("Method transform is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     Status prepare() override;
     void work() override;
 
diff --git a/src/Processors/QueryPipeline.h b/src/Processors/QueryPipeline.h
index 358d31a6dff..b75f6d99124 100644
--- a/src/Processors/QueryPipeline.h
+++ b/src/Processors/QueryPipeline.h
@@ -118,7 +118,7 @@ public:
     const Block & getHeader() const { return pipe.getHeader(); }
 
     void addTableLock(TableLockHolder lock) { pipe.addTableLock(std::move(lock)); }
-    void addInterpreterContext(std::shared_ptr<const Context> context) { pipe.addInterpreterContext(std::move(context)); }
+    void addInterpreterContext(ContextPtr 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); }
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index bc3b8458531..0b1b78b6c34 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -196,7 +196,7 @@ Pipe QueryPlan::convertToPipe(
     return QueryPipeline::getPipe(std::move(*buildQueryPipeline(optimization_settings, build_pipeline_settings)));
 }
 
-void QueryPlan::addInterpreterContext(std::shared_ptr<Context> context)
+void QueryPlan::addInterpreterContext(ContextPtr context)
 {
     interpreter_context.emplace_back(std::move(context));
 }
diff --git a/src/Processors/QueryPlan/QueryPlan.h b/src/Processors/QueryPlan/QueryPlan.h
index 95034d34c9c..06639ebfd38 100644
--- a/src/Processors/QueryPlan/QueryPlan.h
+++ b/src/Processors/QueryPlan/QueryPlan.h
@@ -93,7 +93,7 @@ public:
     void setMaxThreads(size_t max_threads_) { max_threads = max_threads_; }
     size_t getMaxThreads() const { return max_threads; }
 
-    void addInterpreterContext(std::shared_ptr<Context> context);
+    void addInterpreterContext(ContextPtr context);
 
     /// Tree node. Step and it's children.
     struct Node
@@ -113,7 +113,7 @@ private:
 
     /// Those fields are passed to QueryPipeline.
     size_t max_threads = 0;
-    std::vector<std::shared_ptr<Context>> interpreter_context;
+    std::vector<ContextPtr> interpreter_context;
 };
 
 std::string debugExplainStep(const IQueryPlanStep & step);
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index ce717021c44..86d4a7c93b1 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -649,7 +649,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
     /// If do_not_merge_across_partitions_select_final is true and num_streams > 1
     /// we will store lonely parts with level > 0 to use parallel select on them.
     std::vector<RangesInDataPart> lonely_parts;
-    size_t total_rows_in_lonely_parts = 0;
     size_t sum_marks_in_lonely_parts = 0;
 
     for (size_t range_index = 0; range_index < parts_to_merge_ranges.size() - 1; ++range_index)
@@ -667,7 +666,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
                 std::distance(parts_to_merge_ranges[range_index], parts_to_merge_ranges[range_index + 1]) == 1 &&
                 parts_to_merge_ranges[range_index]->data_part->info.level > 0)
             {
-                total_rows_in_lonely_parts += parts_to_merge_ranges[range_index]->getRowsCount();
                 sum_marks_in_lonely_parts += parts_to_merge_ranges[range_index]->getMarksCount();
                 lonely_parts.push_back(std::move(*parts_to_merge_ranges[range_index]));
                 continue;
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.h b/src/Processors/QueryPlan/ReadFromPreparedSource.h
index 0d4e9653806..eb36cf28643 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<const Context> context_ = nullptr);
+    explicit ReadFromPreparedSource(Pipe pipe_, ContextPtr context_ = nullptr);
 
     String getName() const override { return "ReadFromPreparedSource"; }
 
@@ -17,7 +17,7 @@ public:
 
 private:
     Pipe pipe;
-    std::shared_ptr<const Context> context;
+    ContextPtr context;
 };
 
 class ReadFromStorageStep : public ReadFromPreparedSource
diff --git a/src/Processors/Sources/WaitForAsyncInsertSource.h b/src/Processors/Sources/WaitForAsyncInsertSource.h
new file mode 100644
index 00000000000..40871a59125
--- /dev/null
+++ b/src/Processors/Sources/WaitForAsyncInsertSource.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <Processors/ISource.h>
+#include <Interpreters/AsynchronousInsertQueue.h>
+
+namespace DB
+{
+
+/// Source, that allow to wait until processing of
+/// asynchronous insert for specified query_id will be finished.
+class WaitForAsyncInsertSource : public ISource, WithContext
+{
+public:
+    WaitForAsyncInsertSource(
+        const String & query_id_, size_t timeout_ms_, AsynchronousInsertQueue & queue_)
+        : ISource(Block())
+        , query_id(query_id_)
+        , timeout_ms(timeout_ms_)
+        , queue(queue_)
+    {
+    }
+
+    String getName() const override { return "WaitForAsyncInsert"; }
+
+protected:
+    Chunk generate() override
+    {
+        queue.waitForProcessingQuery(query_id, std::chrono::milliseconds(timeout_ms));
+        return Chunk();
+    }
+
+private:
+    String query_id;
+    size_t timeout_ms;
+    AsynchronousInsertQueue & queue;
+};
+
+}
diff --git a/src/Processors/Transforms/AddingDefaultsTransform.cpp b/src/Processors/Transforms/AddingDefaultsTransform.cpp
index c92d4d7a456..01048354b82 100644
--- a/src/Processors/Transforms/AddingDefaultsTransform.cpp
+++ b/src/Processors/Transforms/AddingDefaultsTransform.cpp
@@ -64,7 +64,7 @@ static void mixNumberColumns(
         if constexpr (!std::is_same_v<DataType, DataTypeString> && !std::is_same_v<DataType, DataTypeFixedString>)
         {
             using FieldType = typename DataType::FieldType;
-            using ColVecType = std::conditional_t<IsDecimalNumber<FieldType>, ColumnDecimal<FieldType>, ColumnVector<FieldType>>;
+            using ColVecType = ColumnVectorOrDecimal<FieldType>;
 
             auto col_read = typeid_cast<ColVecType *>(column_mixed.get());
             if (!col_read)
diff --git a/src/Processors/Transforms/AggregatingTransform.cpp b/src/Processors/Transforms/AggregatingTransform.cpp
index 7802bf6e3bf..a8a93e53663 100644
--- a/src/Processors/Transforms/AggregatingTransform.cpp
+++ b/src/Processors/Transforms/AggregatingTransform.cpp
@@ -395,9 +395,14 @@ AggregatingTransform::AggregatingTransform(Block header, AggregatingTransformPar
 }
 
 AggregatingTransform::AggregatingTransform(
-    Block header, AggregatingTransformParamsPtr params_, ManyAggregatedDataPtr many_data_,
-    size_t current_variant, size_t max_threads_, size_t temporary_data_merge_threads_)
-    : IProcessor({std::move(header)}, {params_->getHeader()}), params(std::move(params_))
+    Block header,
+    AggregatingTransformParamsPtr params_,
+    ManyAggregatedDataPtr many_data_,
+    size_t current_variant,
+    size_t max_threads_,
+    size_t temporary_data_merge_threads_)
+    : IProcessor({std::move(header)}, {params_->getHeader()})
+    , params(std::move(params_))
     , key_columns(params->params.keys_size)
     , aggregate_columns(params->params.aggregates_size)
     , many_data(std::move(many_data_))
@@ -525,7 +530,7 @@ void AggregatingTransform::consume(Chunk chunk)
     {
         auto block = getInputs().front().getHeader().cloneWithColumns(chunk.detachColumns());
         block = materializeBlock(block);
-        if (!params->aggregator.mergeBlock(block, variants, no_more_keys))
+        if (!params->aggregator.mergeOnBlock(block, variants, no_more_keys))
             is_consume_finished = true;
     }
     else
@@ -547,7 +552,7 @@ void AggregatingTransform::initGenerate()
     if (variants.empty() && params->params.keys_size == 0 && !params->params.empty_result_for_aggregation_by_empty_set)
     {
         if (params->only_merge)
-            params->aggregator.mergeBlock(getInputs().front().getHeader(), variants, no_more_keys);
+            params->aggregator.mergeOnBlock(getInputs().front().getHeader(), variants, no_more_keys);
         else
             params->aggregator.executeOnBlock(getInputs().front().getHeader(), variants, key_columns, aggregate_columns, no_more_keys);
     }
diff --git a/src/Processors/Transforms/AggregatingTransform.h b/src/Processors/Transforms/AggregatingTransform.h
index 9512a7a2811..1639bc4df4b 100644
--- a/src/Processors/Transforms/AggregatingTransform.h
+++ b/src/Processors/Transforms/AggregatingTransform.h
@@ -27,15 +27,38 @@ public:
 class IBlockInputStream;
 using BlockInputStreamPtr = std::shared_ptr<IBlockInputStream>;
 
+using AggregatorList = std::list<Aggregator>;
+using AggregatorListPtr = std::shared_ptr<AggregatorList>;
+
 struct AggregatingTransformParams
 {
     Aggregator::Params params;
-    Aggregator aggregator;
+
+    /// Each params holds a list of aggregators which are used in query. It's needed because we need
+    /// to use a pointer of aggregator to proper destroy complex aggregation states on exception
+    /// (See comments in AggregatedDataVariants). However, this pointer might not be valid because
+    /// we can have two different aggregators at the same time due to mixed pipeline of aggregate
+    /// projections, and one of them might gets destroyed before used.
+    AggregatorListPtr aggregator_list_ptr;
+    Aggregator & aggregator;
     bool final;
     bool only_merge = false;
 
     AggregatingTransformParams(const Aggregator::Params & params_, bool final_)
-        : params(params_), aggregator(params), final(final_) {}
+        : params(params_)
+        , aggregator_list_ptr(std::make_shared<AggregatorList>())
+        , aggregator(*aggregator_list_ptr->emplace(aggregator_list_ptr->end(), params))
+        , final(final_)
+    {
+    }
+
+    AggregatingTransformParams(const Aggregator::Params & params_, const AggregatorListPtr & aggregator_list_ptr_, bool final_)
+        : params(params_)
+        , aggregator_list_ptr(aggregator_list_ptr_)
+        , aggregator(*aggregator_list_ptr->emplace(aggregator_list_ptr->end(), params))
+        , final(final_)
+    {
+    }
 
     Block getHeader() const { return aggregator.getHeader(final); }
 
@@ -82,9 +105,13 @@ public:
     AggregatingTransform(Block header, AggregatingTransformParamsPtr params_);
 
     /// For Parallel aggregating.
-    AggregatingTransform(Block header, AggregatingTransformParamsPtr params_,
-                         ManyAggregatedDataPtr many_data, size_t current_variant,
-                         size_t max_threads, size_t temporary_data_merge_threads);
+    AggregatingTransform(
+        Block header,
+        AggregatingTransformParamsPtr params_,
+        ManyAggregatedDataPtr many_data,
+        size_t current_variant,
+        size_t max_threads,
+        size_t temporary_data_merge_threads);
     ~AggregatingTransform() override;
 
     String getName() const override { return "AggregatingTransform"; }
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index 831130d06d1..3ff89c302ff 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -81,7 +81,7 @@ FillingTransform::FillingTransform(
     };
 
     std::vector<bool> is_fill_column(header_.columns());
-    for (size_t i = 0; i < sort_description.size(); ++i)
+    for (size_t i = 0, size = sort_description.size(); i < size; ++i)
     {
         size_t block_position = header_.getPositionByName(sort_description[i].column_name);
         is_fill_column[block_position] = true;
@@ -103,6 +103,11 @@ FillingTransform::FillingTransform(
         }
     }
 
+    std::set<size_t> unique_positions;
+    for (auto pos : fill_column_positions)
+        if (!unique_positions.insert(pos).second)
+            throw Exception("Multiple WITH FILL for identical expressions is not supported in ORDER BY", ErrorCodes::INVALID_WITH_FILL_EXPRESSION);
+
     for (size_t i = 0; i < header_.columns(); ++i)
         if (!is_fill_column[i])
             other_column_positions.push_back(i);
@@ -114,7 +119,7 @@ IProcessor::Status FillingTransform::prepare()
     {
         should_insert_first = next_row < filling_row;
 
-        for (size_t i = 0; i < filling_row.size(); ++i)
+        for (size_t i = 0, size = filling_row.size(); i < size; ++i)
             next_row[i] = filling_row.getFillDescription(i).fill_to;
 
         if (filling_row < next_row)
@@ -227,9 +232,9 @@ void FillingTransform::setResultColumns(Chunk & chunk, MutableColumns & fill_col
     /// fill_columns always non-empty.
     size_t num_rows = fill_columns[0]->size();
 
-    for (size_t i = 0; i < fill_columns.size(); ++i)
+    for (size_t i = 0, size = fill_columns.size(); i < size; ++i)
         result_columns[fill_column_positions[i]] = std::move(fill_columns[i]);
-    for (size_t i = 0; i < other_columns.size(); ++i)
+    for (size_t i = 0, size = other_columns.size(); i < size; ++i)
         result_columns[other_column_positions[i]] = std::move(other_columns[i]);
 
     chunk.setColumns(std::move(result_columns), num_rows);
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index f099f41f472..aceb04d7994 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -14,8 +14,9 @@ namespace ErrorCodes
 
 Block JoiningTransform::transformHeader(Block header, const JoinPtr & join)
 {
-    ExtraBlockPtr tmp;
     LOG_DEBUG(&Poco::Logger::get("JoiningTransform"), "Before join block: '{}'", header.dumpStructure());
+    join->checkTypesOfKeys(header);
+    ExtraBlockPtr tmp;
     join->joinBlock(header, tmp);
     LOG_DEBUG(&Poco::Logger::get("JoiningTransform"), "After join block: '{}'", header.dumpStructure());
     return header;
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 132bdb7b327..ff62df8d939 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -423,7 +423,7 @@ void WindowTransform::advancePartitionEnd()
     assert(!partition_ended && partition_end == blocksEnd());
 }
 
-auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) const
+auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const
 {
     RowNumber x = _x;
 
@@ -461,9 +461,9 @@ auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) con
             assertValid(x);
             assert(offset <= 0);
 
-            // abs(offset) is less than INT_MAX, as checked in the parser, so
+            // abs(offset) is less than INT64_MAX, as checked in the parser, so
             // this negation should always work.
-            assert(offset >= -INT_MAX);
+            assert(offset >= -INT64_MAX);
             if (x.row >= static_cast<uint64_t>(-offset))
             {
                 x.row -= -offset;
@@ -493,7 +493,7 @@ auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) con
     return std::tuple{x, offset};
 }
 
-auto WindowTransform::moveRowNumber(const RowNumber & _x, int offset) const
+auto WindowTransform::moveRowNumber(const RowNumber & _x, int64_t offset) const
 {
     auto [x, o] = moveRowNumberNoCheck(_x, offset);
 
@@ -617,8 +617,8 @@ void WindowTransform::advanceFrameStart()
                 default:
                     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "Frame start type '{}' for frame '{}' is not implemented",
-                        WindowFrame::toString(window_description.frame.begin_type),
-                        WindowFrame::toString(window_description.frame.type));
+                        window_description.frame.begin_type,
+                        window_description.frame.type);
             }
             break;
     }
@@ -849,7 +849,7 @@ void WindowTransform::advanceFrameEnd()
                 default:
                     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "The frame end type '{}' is not implemented",
-                        WindowFrame::toString(window_description.frame.end_type));
+                        window_description.frame.end_type);
             }
             break;
     }
@@ -1614,17 +1614,13 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             offset = (*current_block.input_columns[
                     workspace.argument_column_indices[1]])[
                         transform->current_row.row].get<Int64>();
+
+            /// Either overflow or really negative value, both is not acceptable.
             if (offset < 0)
             {
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "The offset for function {} must be nonnegative, {} given",
-                    getName(), offset);
-            }
-            if (offset > INT_MAX)
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "The offset for function {} must be less than {}, {} given",
-                    getName(), INT_MAX, offset);
+                    "The offset for function {} must be in (0, {}], {} given",
+                    getName(), INT64_MAX, offset);
             }
         }
 
@@ -1662,73 +1658,6 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
     }
 };
 
-struct WindowFunctionNthValue final : public WindowFunction
-{
-    WindowFunctionNthValue(const std::string & name_,
-    const DataTypes & argument_types_, const Array & parameters_)
-    : WindowFunction(name_, argument_types_, parameters_)
-    {
-        if (!parameters.empty())
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Function {} cannot be parameterized", name_);
-        }
-
-        if (argument_types.size() != 2)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Function '{}' accepts 2 arguments, {} given",
-                name_, argument_types.size());
-        }
-    }
-
-    DataTypePtr getReturnType() const override
-    { return argument_types[0]; }
-
-    bool allocatesMemoryInArena() const override { return false; }
-
-    void windowInsertResultInto(const WindowTransform * transform,
-        size_t function_index) override
-    {
-        const auto & current_block = transform->blockAt(transform->current_row);
-        IColumn & to = *(current_block.output_columns[function_index]);
-        const auto & workspace = transform->workspaces[function_index];
-
-        int64_t offset = (*current_block.input_columns[
-                workspace.argument_column_indices[1]])[
-            transform->current_row.row].get<Int64>() - 1;
-
-        if (offset < 0)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "The offset for function {} must be non-negative, {} given",
-                getName(), offset);
-        }
-
-        if (offset > INT_MAX)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "The offset for function {} must be less than {}, {} given",
-                getName(), INT_MAX, offset);
-        }
-
-        const auto [target_row, offset_left] = transform->moveRowNumber(transform->frame_start, offset);
-        if (offset_left != 0
-            || target_row < transform->frame_start
-            || transform->frame_end <= target_row)
-        {
-            // Offset is outside the frame.
-            to.insertDefault();
-        }
-        else
-        {
-            // Offset is inside the frame.
-            to.insertFrom(*transform->blockAt(target_row).input_columns[
-                    workspace.argument_column_indices[0]],
-               target_row.row);
-        }
-    }
-};
 
 void registerWindowFunctions(AggregateFunctionFactory & factory)
 {
@@ -1793,13 +1722,6 @@ void registerWindowFunctions(AggregateFunctionFactory & factory)
             return std::make_shared<WindowFunctionLagLeadInFrame<true>>(
                 name, argument_types, parameters);
         }, properties});
-
-    factory.registerFunction("nth_value", {[](const std::string & name,
-            const DataTypes & argument_types, const Array & parameters, const Settings *)
-        {
-            return std::make_shared<WindowFunctionNthValue>(
-                name, argument_types, parameters);
-        }, properties}, AggregateFunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index 5dc78a34f78..650a0b5a4d3 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -218,8 +218,8 @@ public:
 #endif
     }
 
-    auto moveRowNumber(const RowNumber & _x, int offset) const;
-    auto moveRowNumberNoCheck(const RowNumber & _x, int offset) const;
+    auto moveRowNumber(const RowNumber & _x, int64_t offset) const;
+    auto moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const;
 
     void assertValid(const RowNumber & x) const
     {
diff --git a/src/Processors/Transforms/getSourceFromFromASTInsertQuery.cpp b/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
similarity index 53%
rename from src/Processors/Transforms/getSourceFromFromASTInsertQuery.cpp
rename to src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
index 9e64bd954fa..3f8328ac835 100644
--- a/src/Processors/Transforms/getSourceFromFromASTInsertQuery.cpp
+++ b/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
@@ -5,8 +5,9 @@
 #include <IO/ConcatReadBuffer.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadBufferFromFile.h>
+#include <IO/EmptyReadBuffer.h>
 #include <DataStreams/BlockIO.h>
-#include <Processors/Transforms/getSourceFromFromASTInsertQuery.h>
+#include <Processors/Transforms/getSourceFromASTInsertQuery.h>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/IStorage.h>
@@ -26,14 +27,14 @@ namespace ErrorCodes
     extern const int UNKNOWN_TYPE_OF_QUERY;
 }
 
-
-Pipe getSourceFromFromASTInsertQuery(
+InputFormatPtr getInputFormatFromASTInsertQuery(
     const ASTPtr & ast,
-    ReadBuffer * input_buffer_tail_part,
+    bool with_buffers,
     const Block & header,
     ContextPtr context,
     const ASTPtr & input_function)
 {
+    /// get ast query
     const auto * ast_insert_query = ast->as<ASTInsertQuery>();
 
     if (!ast_insert_query)
@@ -51,39 +52,30 @@ Pipe getSourceFromFromASTInsertQuery(
     }
 
     /// Data could be in parsed (ast_insert_query.data) and in not parsed yet (input_buffer_tail_part) part of query.
-
     auto input_buffer_ast_part = std::make_unique<ReadBufferFromMemory>(
         ast_insert_query->data, ast_insert_query->data ? ast_insert_query->end - ast_insert_query->data : 0);
 
-    std::unique_ptr<ReadBuffer> input_buffer;
-
-    if (ast_insert_query->infile)
-    {
-        /// Data can be from infile
-        const auto & in_file_node = ast_insert_query->infile->as<ASTLiteral &>();
-        const auto in_file = in_file_node.value.safeGet<std::string>();
-
-        input_buffer = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromFile>(in_file), chooseCompressionMethod(in_file, ""));
-    }
-    else
-    {
-        ConcatReadBuffer::ReadBuffers buffers;
-        if (ast_insert_query->data)
-            buffers.push_back(input_buffer_ast_part.get());
-
-        if (input_buffer_tail_part)
-            buffers.push_back(input_buffer_tail_part);
-
-        /** NOTE Must not read from 'input_buffer_tail_part' before read all between 'ast_insert_query.data' and 'ast_insert_query.end'.
-            * - because 'query.data' could refer to memory piece, used as buffer for 'input_buffer_tail_part'.
-            */
-
-        input_buffer = std::make_unique<ConcatReadBuffer>(buffers);
-    }
+    std::unique_ptr<ReadBuffer> input_buffer = with_buffers
+        ? getReadBufferFromASTInsertQuery(ast)
+        : std::make_unique<EmptyReadBuffer>();
 
+    /// Create a source from input buffer using format from query
     auto source = FormatFactory::instance().getInput(format, *input_buffer, header, context, context->getSettings().max_insert_block_size);
+    source->addBuffer(std::move(input_buffer));
+    return source;
+}
+
+Pipe getSourceFromASTInsertQuery(
+    const ASTPtr & ast,
+    bool with_buffers,
+    const Block & header,
+    ContextPtr context,
+    const ASTPtr & input_function)
+{
+    auto source = getInputFormatFromASTInsertQuery(ast, with_buffers, header, context, input_function);
     Pipe pipe(source);
 
+    const auto * ast_insert_query = ast->as<ASTInsertQuery>();
     if (context->getSettingsRef().input_format_defaults_for_omitted_fields && ast_insert_query->table_id && !input_function)
     {
         StoragePtr storage = DatabaseCatalog::instance().getTable(ast_insert_query->table_id, context);
@@ -98,10 +90,48 @@ Pipe getSourceFromFromASTInsertQuery(
         }
     }
 
-    source->addBuffer(std::move(input_buffer_ast_part));
-    source->addBuffer(std::move(input_buffer));
-
     return pipe;
 }
 
+std::unique_ptr<ReadBuffer> getReadBufferFromASTInsertQuery(const ASTPtr & ast)
+{
+    const auto * insert_query = ast->as<ASTInsertQuery>();
+    if (!insert_query)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: query requires data to insert, but it is not INSERT query");
+
+    if (insert_query->infile)
+    {
+        /// Data can be from infile
+        const auto & in_file_node = insert_query->infile->as<ASTLiteral &>();
+        const auto in_file = in_file_node.value.safeGet<std::string>();
+
+        /// It can be compressed and compression method maybe specified in query
+        std::string compression_method;
+        if (insert_query->compression)
+        {
+            const auto & compression_method_node = insert_query->compression->as<ASTLiteral &>();
+            compression_method = compression_method_node.value.safeGet<std::string>();
+        }
+
+        /// Otherwise, it will be detected from file name automatically (by chooseCompressionMethod)
+        /// Buffer for reading from file is created and wrapped with appropriate compression method
+        return wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromFile>(in_file), chooseCompressionMethod(in_file, compression_method));
+    }
+
+    std::vector<std::unique_ptr<ReadBuffer>> buffers;
+    if (insert_query->data)
+    {
+        /// Data could be in parsed (ast_insert_query.data) and in not parsed yet (input_buffer_tail_part) part of query.
+        auto ast_buffer = std::make_unique<ReadBufferFromMemory>(
+            insert_query->data, insert_query->end - insert_query->data);
+
+        buffers.emplace_back(std::move(ast_buffer));
+    }
+
+    if (insert_query->tail)
+        buffers.emplace_back(wrapReadBufferReference(*insert_query->tail));
+
+    return std::make_unique<ConcatReadBuffer>(std::move(buffers));
+}
+
 }
diff --git a/src/Processors/Transforms/getSourceFromASTInsertQuery.h b/src/Processors/Transforms/getSourceFromASTInsertQuery.h
new file mode 100644
index 00000000000..4a5ed952efc
--- /dev/null
+++ b/src/Processors/Transforms/getSourceFromASTInsertQuery.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+#include <Interpreters/Context_fwd.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <cstddef>
+#include <memory>
+
+
+namespace DB
+{
+
+class Pipe;
+
+/// Prepares a input format, which produce data containing in INSERT query.
+InputFormatPtr getInputFormatFromASTInsertQuery(
+        const ASTPtr & ast,
+        bool with_buffers,
+        const Block & header,
+        ContextPtr context,
+        const ASTPtr & input_function);
+
+/// Prepares a pipe which produce data containing in INSERT query.
+Pipe getSourceFromASTInsertQuery(
+        const ASTPtr & ast,
+        bool with_buffers,
+        const Block & header,
+        ContextPtr context,
+        const ASTPtr & input_function);
+
+class ReadBuffer;
+
+/// Prepares a read buffer, that allows to read inlined data
+/// from ASTInsertQuert directly, and from tail buffer, if it exists.
+std::unique_ptr<ReadBuffer> getReadBufferFromASTInsertQuery(const ASTPtr & ast);
+
+}
diff --git a/src/Processors/Transforms/getSourceFromFromASTInsertQuery.h b/src/Processors/Transforms/getSourceFromFromASTInsertQuery.h
deleted file mode 100644
index 3c00bd47ea0..00000000000
--- a/src/Processors/Transforms/getSourceFromFromASTInsertQuery.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <Parsers/IAST.h>
-#include <Interpreters/Context_fwd.h>
-#include <cstddef>
-#include <memory>
-
-
-namespace DB
-{
-
-/** Prepares a pipe which produce data containing in INSERT query
-  * Head of inserting data could be stored in INSERT ast directly
-  * Remaining (tail) data could be stored in input_buffer_tail_part
-  */
-
-class Pipe;
-
-Pipe getSourceFromFromASTInsertQuery(
-        const ASTPtr & ast,
-        ReadBuffer * input_buffer_tail_part,
-        const Block & header,
-        ContextPtr context,
-        const ASTPtr & input_function);
-
-}
diff --git a/src/Processors/ya.make b/src/Processors/ya.make
deleted file mode 100644
index ffca7a2e8af..00000000000
--- a/src/Processors/ya.make
+++ /dev/null
@@ -1,189 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/msgpack
-    contrib/libs/protobuf
-    contrib/libs/apache/arrow
-)
-
-ADDINCL(
-    contrib/libs/apache/arrow/src
-)
-
-CFLAGS(-DUSE_ARROW=1)
-
-SRCS(
-    Chunk.cpp
-    ConcatProcessor.cpp
-    DelayedPortsProcessor.cpp
-    Executors/ExecutingGraph.cpp
-    Executors/PipelineExecutingBlockInputStream.cpp
-    Executors/PipelineExecutor.cpp
-    Executors/PollingQueue.cpp
-    Executors/PullingAsyncPipelineExecutor.cpp
-    Executors/PullingPipelineExecutor.cpp
-    ForkProcessor.cpp
-    Formats/IInputFormat.cpp
-    Formats/IOutputFormat.cpp
-    Formats/IRowInputFormat.cpp
-    Formats/IRowOutputFormat.cpp
-    Formats/Impl/ArrowBlockInputFormat.cpp
-    Formats/Impl/ArrowBlockOutputFormat.cpp
-    Formats/Impl/ArrowBufferedStreams.cpp
-    Formats/Impl/ArrowColumnToCHColumn.cpp
-    Formats/Impl/BinaryRowInputFormat.cpp
-    Formats/Impl/BinaryRowOutputFormat.cpp
-    Formats/Impl/CHColumnToArrowColumn.cpp
-    Formats/Impl/CSVRowInputFormat.cpp
-    Formats/Impl/CSVRowOutputFormat.cpp
-    Formats/Impl/ConstantExpressionTemplate.cpp
-    Formats/Impl/JSONAsStringRowInputFormat.cpp
-    Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
-    Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp
-    Formats/Impl/JSONCompactRowOutputFormat.cpp
-    Formats/Impl/JSONEachRowRowInputFormat.cpp
-    Formats/Impl/JSONEachRowRowOutputFormat.cpp
-    Formats/Impl/JSONEachRowWithProgressRowOutputFormat.cpp
-    Formats/Impl/JSONRowOutputFormat.cpp
-    Formats/Impl/LineAsStringRowInputFormat.cpp
-    Formats/Impl/MarkdownRowOutputFormat.cpp
-    Formats/Impl/MsgPackRowInputFormat.cpp
-    Formats/Impl/MsgPackRowOutputFormat.cpp
-    Formats/Impl/MySQLOutputFormat.cpp
-    Formats/Impl/NullFormat.cpp
-    Formats/Impl/ODBCDriver2BlockOutputFormat.cpp
-    Formats/Impl/ParallelFormattingOutputFormat.cpp
-    Formats/Impl/ParallelParsingInputFormat.cpp
-    Formats/Impl/PostgreSQLOutputFormat.cpp
-    Formats/Impl/PrettyBlockOutputFormat.cpp
-    Formats/Impl/PrettyCompactBlockOutputFormat.cpp
-    Formats/Impl/PrettySpaceBlockOutputFormat.cpp
-    Formats/Impl/ProtobufRowInputFormat.cpp
-    Formats/Impl/ProtobufRowOutputFormat.cpp
-    Formats/Impl/RawBLOBRowInputFormat.cpp
-    Formats/Impl/RawBLOBRowOutputFormat.cpp
-    Formats/Impl/RegexpRowInputFormat.cpp
-    Formats/Impl/TSKVRowInputFormat.cpp
-    Formats/Impl/TSKVRowOutputFormat.cpp
-    Formats/Impl/TabSeparatedRowInputFormat.cpp
-    Formats/Impl/TabSeparatedRowOutputFormat.cpp
-    Formats/Impl/TemplateBlockOutputFormat.cpp
-    Formats/Impl/TemplateRowInputFormat.cpp
-    Formats/Impl/ValuesBlockInputFormat.cpp
-    Formats/Impl/ValuesRowOutputFormat.cpp
-    Formats/Impl/VerticalRowOutputFormat.cpp
-    Formats/Impl/XMLRowOutputFormat.cpp
-    Formats/LazyOutputFormat.cpp
-    Formats/OutputStreamToOutputFormat.cpp
-    Formats/PullingOutputFormat.cpp
-    Formats/RowInputFormatWithDiagnosticInfo.cpp
-    IAccumulatingTransform.cpp
-    IInflatingTransform.cpp
-    IProcessor.cpp
-    ISimpleTransform.cpp
-    ISink.cpp
-    ISource.cpp
-    LimitTransform.cpp
-    Merges/Algorithms/AggregatingSortedAlgorithm.cpp
-    Merges/Algorithms/CollapsingSortedAlgorithm.cpp
-    Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
-    Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
-    Merges/Algorithms/IMergingAlgorithmWithDelayedChunk.cpp
-    Merges/Algorithms/IMergingAlgorithmWithSharedChunks.cpp
-    Merges/Algorithms/MergingSortedAlgorithm.cpp
-    Merges/Algorithms/ReplacingSortedAlgorithm.cpp
-    Merges/Algorithms/SummingSortedAlgorithm.cpp
-    Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
-    Merges/IMergingTransform.cpp
-    Merges/MergingSortedTransform.cpp
-    OffsetTransform.cpp
-    Pipe.cpp
-    Port.cpp
-    QueryPipeline.cpp
-    QueryPlan/AggregatingStep.cpp
-    QueryPlan/ArrayJoinStep.cpp
-    QueryPlan/BuildQueryPipelineSettings.cpp
-    QueryPlan/CreatingSetsStep.cpp
-    QueryPlan/CubeStep.cpp
-    QueryPlan/DistinctStep.cpp
-    QueryPlan/ExpressionStep.cpp
-    QueryPlan/ExtremesStep.cpp
-    QueryPlan/FillingStep.cpp
-    QueryPlan/FilterStep.cpp
-    QueryPlan/FinishSortingStep.cpp
-    QueryPlan/IQueryPlanStep.cpp
-    QueryPlan/ISourceStep.cpp
-    QueryPlan/ITransformingStep.cpp
-    QueryPlan/IntersectOrExceptStep.cpp
-    QueryPlan/JoinStep.cpp
-    QueryPlan/LimitByStep.cpp
-    QueryPlan/LimitStep.cpp
-    QueryPlan/MergeSortingStep.cpp
-    QueryPlan/MergingAggregatedStep.cpp
-    QueryPlan/MergingSortedStep.cpp
-    QueryPlan/OffsetStep.cpp
-    QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
-    QueryPlan/Optimizations/filterPushDown.cpp
-    QueryPlan/Optimizations/liftUpArrayJoin.cpp
-    QueryPlan/Optimizations/limitPushDown.cpp
-    QueryPlan/Optimizations/mergeExpressions.cpp
-    QueryPlan/Optimizations/optimizeTree.cpp
-    QueryPlan/Optimizations/splitFilter.cpp
-    QueryPlan/PartialSortingStep.cpp
-    QueryPlan/QueryIdHolder.cpp
-    QueryPlan/QueryPlan.cpp
-    QueryPlan/ReadFromMergeTree.cpp
-    QueryPlan/ReadFromPreparedSource.cpp
-    QueryPlan/ReadFromRemote.cpp
-    QueryPlan/ReadNothingStep.cpp
-    QueryPlan/RollupStep.cpp
-    QueryPlan/SettingQuotaAndLimitsStep.cpp
-    QueryPlan/TotalsHavingStep.cpp
-    QueryPlan/UnionStep.cpp
-    QueryPlan/WindowStep.cpp
-    ResizeProcessor.cpp
-    Sources/DelayedSource.cpp
-    Sources/RemoteSource.cpp
-    Sources/SinkToOutputStream.cpp
-    Sources/SourceFromInputStream.cpp
-    Sources/SourceWithProgress.cpp
-    Transforms/AddingDefaultsTransform.cpp
-    Transforms/AddingSelectorTransform.cpp
-    Transforms/AggregatingInOrderTransform.cpp
-    Transforms/AggregatingTransform.cpp
-    Transforms/ArrayJoinTransform.cpp
-    Transforms/CheckSortedTransform.cpp
-    Transforms/CopyTransform.cpp
-    Transforms/CreatingSetsTransform.cpp
-    Transforms/CubeTransform.cpp
-    Transforms/DistinctTransform.cpp
-    Transforms/ExpressionTransform.cpp
-    Transforms/ExtremesTransform.cpp
-    Transforms/FillingTransform.cpp
-    Transforms/FilterTransform.cpp
-    Transforms/FinishSortingTransform.cpp
-    Transforms/IntersectOrExceptTransform.cpp
-    Transforms/JoiningTransform.cpp
-    Transforms/LimitByTransform.cpp
-    Transforms/LimitsCheckingTransform.cpp
-    Transforms/MaterializingTransform.cpp
-    Transforms/MergeSortingTransform.cpp
-    Transforms/MergingAggregatedMemoryEfficientTransform.cpp
-    Transforms/MergingAggregatedTransform.cpp
-    Transforms/PartialSortingTransform.cpp
-    Transforms/ReverseTransform.cpp
-    Transforms/RollupTransform.cpp
-    Transforms/SortingTransform.cpp
-    Transforms/SquashingChunksTransform.cpp
-    Transforms/TotalsHavingTransform.cpp
-    Transforms/WindowTransform.cpp
-    Transforms/getSourceFromFromASTInsertQuery.cpp
-    printPipeline.cpp
-
-)
-
-END()
diff --git a/src/Processors/ya.make.in b/src/Processors/ya.make.in
deleted file mode 100644
index ee87d25eafc..00000000000
--- a/src/Processors/ya.make.in
+++ /dev/null
@@ -1,22 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/msgpack
-    contrib/libs/protobuf
-    contrib/libs/apache/arrow
-)
-
-ADDINCL(
-    contrib/libs/apache/arrow/src
-)
-
-CFLAGS(-DUSE_ARROW=1)
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | grep -v -P 'Avro|ORC|Parquet|CapnProto' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index f0c6e208323..50a627311e3 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -120,6 +120,33 @@ namespace
             throw Exception("Unknown compression level: '" + str + "'", ErrorCodes::INVALID_CONFIG_PARAMETER);
     }
 
+    grpc_compression_algorithm convertCompressionAlgorithm(const ::clickhouse::grpc::CompressionAlgorithm & algorithm)
+    {
+        if (algorithm == ::clickhouse::grpc::NO_COMPRESSION)
+            return GRPC_COMPRESS_NONE;
+        else if (algorithm == ::clickhouse::grpc::DEFLATE)
+            return GRPC_COMPRESS_DEFLATE;
+        else if (algorithm == ::clickhouse::grpc::GZIP)
+            return GRPC_COMPRESS_GZIP;
+        else if (algorithm == ::clickhouse::grpc::STREAM_GZIP)
+            return GRPC_COMPRESS_STREAM_GZIP;
+        else
+            throw Exception("Unknown compression algorithm: '" + ::clickhouse::grpc::CompressionAlgorithm_Name(algorithm) + "'", ErrorCodes::INVALID_GRPC_QUERY_INFO);
+    }
+
+    grpc_compression_level convertCompressionLevel(const ::clickhouse::grpc::CompressionLevel & level)
+    {
+        if (level == ::clickhouse::grpc::COMPRESSION_NONE)
+            return GRPC_COMPRESS_LEVEL_NONE;
+        else if (level == ::clickhouse::grpc::COMPRESSION_LOW)
+            return GRPC_COMPRESS_LEVEL_LOW;
+        else if (level == ::clickhouse::grpc::COMPRESSION_MEDIUM)
+            return GRPC_COMPRESS_LEVEL_MED;
+        else if (level == ::clickhouse::grpc::COMPRESSION_HIGH)
+            return GRPC_COMPRESS_LEVEL_HIGH;
+        else
+            throw Exception("Unknown compression level: '" + ::clickhouse::grpc::CompressionLevel_Name(level) + "'", ErrorCodes::INVALID_GRPC_QUERY_INFO);
+    }
 
     /// Gets file's contents as a string, throws an exception if failed.
     String readFile(const String & filepath)
@@ -242,7 +269,22 @@ namespace
         virtual void write(const GRPCResult & result, const CompletionCallback & callback) = 0;
         virtual void writeAndFinish(const GRPCResult & result, const grpc::Status & status, const CompletionCallback & callback) = 0;
 
-        Poco::Net::SocketAddress getClientAddress() const { String peer = grpc_context.peer(); return Poco::Net::SocketAddress{peer.substr(peer.find(':') + 1)}; }
+        Poco::Net::SocketAddress getClientAddress() const
+        {
+            String peer = grpc_context.peer();
+            return Poco::Net::SocketAddress{peer.substr(peer.find(':') + 1)};
+        }
+
+        void setResultCompression(grpc_compression_algorithm algorithm, grpc_compression_level level)
+        {
+            grpc_context.set_compression_algorithm(algorithm);
+            grpc_context.set_compression_level(level);
+        }
+
+        void setResultCompression(const ::clickhouse::grpc::Compression & compression)
+        {
+            setResultCompression(convertCompressionAlgorithm(compression.algorithm()), convertCompressionLevel(compression.level()));
+        }
 
     protected:
         CompletionCallback * getCallbackPtr(const CompletionCallback & callback)
@@ -732,6 +774,10 @@ namespace
         if (!query_info.database().empty())
             query_context->setCurrentDatabase(query_info.database());
 
+        /// Apply compression settings for this call.
+        if (query_info.has_result_compression())
+            responder->setResultCompression(query_info.result_compression());
+
         /// The interactive delay will be used to show progress.
         interactive_delay = settings.interactive_delay;
         query_context->setProgressCallback([this](const Progress & value) { return progress.incrementPiecewiseAtomically(value); });
@@ -799,7 +845,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(true, query, query_context);
     }
 
     void Call::processInput()
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 0492b58dc88..46bf0e90c67 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -225,8 +225,7 @@ static std::chrono::steady_clock::duration parseSessionTimeout(
 void HTTPHandler::pushDelayedResults(Output & used_output)
 {
     std::vector<WriteBufferPtr> write_buffers;
-    std::vector<ReadBufferPtr> read_buffers;
-    std::vector<ReadBuffer *> read_buffers_raw_ptr;
+    ConcatReadBuffer::Buffers read_buffers;
 
     auto * cascade_buffer = typeid_cast<CascadeWriteBuffer *>(used_output.out_maybe_delayed_and_compressed.get());
     if (!cascade_buffer)
@@ -246,14 +245,13 @@ void HTTPHandler::pushDelayedResults(Output & used_output)
             && (write_buf_concrete = dynamic_cast<IReadableWriteBuffer *>(write_buf.get()))
             && (reread_buf = write_buf_concrete->tryGetReadBuffer()))
         {
-            read_buffers.emplace_back(reread_buf);
-            read_buffers_raw_ptr.emplace_back(reread_buf.get());
+            read_buffers.emplace_back(wrapReadBufferPointer(reread_buf));
         }
     }
 
-    if (!read_buffers_raw_ptr.empty())
+    if (!read_buffers.empty())
     {
-        ConcatReadBuffer concat_read_buffer(read_buffers_raw_ptr);
+        ConcatReadBuffer concat_read_buffer(std::move(read_buffers));
         copyData(concat_read_buffer, *used_output.out_maybe_compressed);
     }
 }
@@ -710,7 +708,7 @@ 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 = context] (ProgressCallback callback)
     {
         auto prev = context->getProgressCallback();
 
@@ -729,7 +727,7 @@ void HTTPHandler::processQuery(
 
     if (settings.readonly > 0 && settings.cancel_http_readonly_queries_on_client_close)
     {
-        append_callback([context, &request](const Progress &)
+        append_callback([context = context, &request](const Progress &)
         {
             /// Assume that at the point this method is called no one is reading data from the socket any more:
             /// should be true for read-only queries.
@@ -758,8 +756,7 @@ void HTTPHandler::processQuery(
         pushDelayedResults(used_output);
     }
 
-    /// Send HTTP headers with code 200 if no exception happened and the data is still not sent to
-    /// the client.
+    /// Send HTTP headers with code 200 if no exception happened and the data is still not sent to the client.
     used_output.out->finalize();
 }
 
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index 93f4bff46c2..3720362775c 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -246,7 +246,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.
-        if (session->getAuthenticationType(user_name) == DB::Authentication::SHA256_PASSWORD)
+        if (session->getAuthenticationTypeOrLogInFailure(user_name) == DB::Authentication::SHA256_PASSWORD)
         {
             authPluginSSL();
         }
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index 2d710449da6..eb756a47156 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -286,14 +286,15 @@ void TCPHandler::runImpl()
                 return receiveReadTaskResponseAssumeLocked();
             });
 
-            bool may_have_embedded_data = client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_CLIENT_SUPPORT_EMBEDDED_DATA;
             /// Processing Query
-            state.io = executeQuery(state.query, query_context, false, state.stage, may_have_embedded_data);
+            state.io = executeQuery(state.query, query_context, false, state.stage);
 
             after_check_cancelled.restart();
             after_send_progress.restart();
 
-            if (state.io.out)
+            /// FIXME: check explicitly that insert query suggests to receive data via native protocol,
+            ///        and don't check implicitly via existence of |state.io.in|.
+            if (state.io.out && !state.io.in)
             {
                 state.need_receive_data_for_insert = true;
                 processInsertQuery();
@@ -307,6 +308,7 @@ void TCPHandler::runImpl()
             else if (state.io.pipeline.initialized())
                 processOrdinaryQueryWithProcessors();
             else if (state.io.in)
+                /// TODO: check that this branch works well for insert query with embedded data.
                 processOrdinaryQuery();
 
             state.io.onFinish();
diff --git a/src/Server/grpc_protos/clickhouse_grpc.proto b/src/Server/grpc_protos/clickhouse_grpc.proto
index da01432d76c..c6cafaf6e40 100644
--- a/src/Server/grpc_protos/clickhouse_grpc.proto
+++ b/src/Server/grpc_protos/clickhouse_grpc.proto
@@ -41,6 +41,25 @@ message ExternalTable {
    map<string, string> settings = 5;
 }
 
+enum CompressionAlgorithm {
+   NO_COMPRESSION = 0;
+   DEFLATE = 1;
+   GZIP = 2;
+   STREAM_GZIP = 3;
+}
+
+enum CompressionLevel {
+   COMPRESSION_NONE = 0;
+   COMPRESSION_LOW = 1;
+   COMPRESSION_MEDIUM = 2;
+   COMPRESSION_HIGH = 3;
+}
+
+message Compression {
+   CompressionAlgorithm algorithm = 1;
+   CompressionLevel level = 2;
+}
+
 // Information about a query which a client sends to a ClickHouse server.
 // The first QueryInfo can set any of the following fields. Extra QueryInfos only add extra data.
 // In extra QueryInfos only `input_data`, `external_tables`, `next_query_info` and `cancel` fields can be set.
@@ -78,6 +97,10 @@ message QueryInfo {
    // If true there will be at least one more QueryInfo in the input stream.
    // `next_query_info` is allowed to be set only if a method with streaming input (i.e. ExecuteQueryWithStreamInput() or ExecuteQueryWithStreamIO()) is used.
    bool next_query_info = 16;
+
+   /// Controls how a ClickHouse server will compress query execution results before sending back to the client.
+   /// If not set the compression settings from the configuration file will be used.
+   Compression result_compression = 17;
 }
 
 enum LogsLevel {
diff --git a/src/Server/ya.make b/src/Server/ya.make
deleted file mode 100644
index 6a6a442fce8..00000000000
--- a/src/Server/ya.make
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/Util
-)
-
-
-SRCS(
-    GRPCServer.cpp
-    HTTP/HTMLForm.cpp
-    HTTP/HTTPServer.cpp
-    HTTP/HTTPServerConnection.cpp
-    HTTP/HTTPServerConnectionFactory.cpp
-    HTTP/HTTPServerRequest.cpp
-    HTTP/HTTPServerResponse.cpp
-    HTTP/ReadHeaders.cpp
-    HTTP/WriteBufferFromHTTPServerResponse.cpp
-    HTTPHandler.cpp
-    HTTPHandlerFactory.cpp
-    InterserverIOHTTPHandler.cpp
-    KeeperTCPHandler.cpp
-    MySQLHandler.cpp
-    MySQLHandlerFactory.cpp
-    NotFoundHandler.cpp
-    PostgreSQLHandler.cpp
-    PostgreSQLHandlerFactory.cpp
-    PrometheusMetricsWriter.cpp
-    PrometheusRequestHandler.cpp
-    ProtocolServerAdapter.cpp
-    ReplicasStatusHandler.cpp
-    StaticRequestHandler.cpp
-    TCPHandler.cpp
-    WebUIRequestHandler.cpp
-
-)
-
-END()
diff --git a/src/Server/ya.make.in b/src/Server/ya.make.in
deleted file mode 100644
index fd1b414edf5..00000000000
--- a/src/Server/ya.make.in
+++ /dev/null
@@ -1,15 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/Util
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index 7388f44fee1..b0254da7a44 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -312,6 +312,14 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.settings_changes = command_ast->settings_changes->as<ASTSetQuery &>().changes;
         return command;
     }
+    else if (command_ast->type == ASTAlterCommand::MODIFY_DATABASE_SETTING)
+    {
+        AlterCommand command;
+        command.ast = command_ast->clone();
+        command.type = AlterCommand::MODIFY_DATABASE_SETTING;
+        command.settings_changes = command_ast->settings_changes->as<ASTSetQuery &>().changes;
+        return command;
+    }
     else if (command_ast->type == ASTAlterCommand::RESET_SETTING)
     {
         AlterCommand command;
@@ -843,52 +851,6 @@ std::optional<MutationCommand> AlterCommand::tryConvertToMutationCommand(Storage
 }
 
 
-String alterTypeToString(const AlterCommand::Type type)
-{
-    switch (type)
-    {
-    case AlterCommand::Type::ADD_COLUMN:
-        return "ADD COLUMN";
-    case AlterCommand::Type::ADD_CONSTRAINT:
-        return "ADD CONSTRAINT";
-    case AlterCommand::Type::ADD_INDEX:
-        return "ADD INDEX";
-    case AlterCommand::Type::ADD_PROJECTION:
-        return "ADD PROJECTION";
-    case AlterCommand::Type::COMMENT_COLUMN:
-        return "COMMENT COLUMN";
-    case AlterCommand::Type::DROP_COLUMN:
-        return "DROP COLUMN";
-    case AlterCommand::Type::DROP_CONSTRAINT:
-        return "DROP CONSTRAINT";
-    case AlterCommand::Type::DROP_INDEX:
-        return "DROP INDEX";
-    case AlterCommand::Type::DROP_PROJECTION:
-        return "DROP PROJECTION";
-    case AlterCommand::Type::MODIFY_COLUMN:
-        return "MODIFY COLUMN";
-    case AlterCommand::Type::MODIFY_ORDER_BY:
-        return "MODIFY ORDER BY";
-    case AlterCommand::Type::MODIFY_SAMPLE_BY:
-        return "MODIFY SAMPLE BY";
-    case AlterCommand::Type::MODIFY_TTL:
-        return "MODIFY TTL";
-    case AlterCommand::Type::MODIFY_SETTING:
-        return "MODIFY SETTING";
-    case AlterCommand::Type::RESET_SETTING:
-        return "RESET SETTING";
-    case AlterCommand::Type::MODIFY_QUERY:
-        return "MODIFY QUERY";
-    case AlterCommand::Type::RENAME_COLUMN:
-        return "RENAME COLUMN";
-    case AlterCommand::Type::REMOVE_TTL:
-        return "REMOVE TTL";
-    default:
-        throw Exception("Uninitialized ALTER command", ErrorCodes::LOGICAL_ERROR);
-    }
-
-}
-
 void AlterCommands::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!prepared)
@@ -1007,6 +969,7 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata)
     prepared = true;
 }
 
+
 void AlterCommands::validate(const StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     auto all_columns = metadata.columns;
diff --git a/src/Storages/AlterCommands.h b/src/Storages/AlterCommands.h
index 60f4ad7d552..41b48b4b034 100644
--- a/src/Storages/AlterCommands.h
+++ b/src/Storages/AlterCommands.h
@@ -13,6 +13,8 @@ namespace DB
 {
 
 class ASTAlterCommand;
+class IDatabase;
+using DatabasePtr = std::shared_ptr<IDatabase>;
 
 /// Operation from the ALTER query (except for manipulation with PART/PARTITION).
 /// Adding Nested columns is not expanded to add individual columns.
@@ -42,6 +44,7 @@ struct AlterCommand
         MODIFY_QUERY,
         RENAME_COLUMN,
         REMOVE_TTL,
+        MODIFY_DATABASE_SETTING,
     };
 
     /// Which property user wants to remove from column
@@ -168,9 +171,6 @@ struct AlterCommand
     std::optional<MutationCommand> tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 };
 
-/// Return string representation of AlterCommand::Type
-String alterTypeToString(const AlterCommand::Type type);
-
 class Context;
 
 /// Vector of AlterCommand with several additional functions
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index c05441148df..568257b4fd7 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -29,6 +29,7 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/ExpressionActions.h>
+#include <Interpreters/FunctionNameNormalizer.h>
 
 
 namespace DB
@@ -201,6 +202,12 @@ void ColumnsDescription::add(ColumnDescription column, const String & after_colu
         throw Exception("Cannot add column " + column.name + ": column with this name already exists",
             ErrorCodes::ILLEGAL_COLUMN);
 
+    /// Normalize ASTs to be compatible with InterpreterCreateQuery.
+    if (column.default_desc.expression)
+        FunctionNameNormalizer::visit(column.default_desc.expression.get());
+    if (column.ttl)
+        FunctionNameNormalizer::visit(column.ttl.get());
+
     auto insert_it = columns.cend();
 
     if (first)
diff --git a/src/Storages/ExecutablePoolSettings.cpp b/src/Storages/ExecutableSettings.cpp
similarity index 79%
rename from src/Storages/ExecutablePoolSettings.cpp
rename to src/Storages/ExecutableSettings.cpp
index 8951c8edabf..136357eb6f8 100644
--- a/src/Storages/ExecutablePoolSettings.cpp
+++ b/src/Storages/ExecutableSettings.cpp
@@ -1,4 +1,4 @@
-#include "ExecutablePoolSettings.h"
+#include "ExecutableSettings.h"
 
 #include <Common/Exception.h>
 
@@ -14,9 +14,9 @@ namespace ErrorCodes
     extern const int UNKNOWN_SETTING;
 }
 
-IMPLEMENT_SETTINGS_TRAITS(ExecutablePoolSettingsTraits, LIST_OF_EXECUTABLE_POOL_SETTINGS);
+IMPLEMENT_SETTINGS_TRAITS(ExecutableSettingsTraits, LIST_OF_EXECUTABLE_SETTINGS);
 
-void ExecutablePoolSettings::loadFromQuery(ASTStorage & storage_def)
+void ExecutableSettings::loadFromQuery(ASTStorage & storage_def)
 {
     if (storage_def.settings)
     {
diff --git a/src/Storages/ExecutablePoolSettings.h b/src/Storages/ExecutableSettings.h
similarity index 62%
rename from src/Storages/ExecutablePoolSettings.h
rename to src/Storages/ExecutableSettings.h
index 6de9b0f0e6c..9c0cfc05fa5 100644
--- a/src/Storages/ExecutablePoolSettings.h
+++ b/src/Storages/ExecutableSettings.h
@@ -8,15 +8,16 @@ namespace DB
 
 class ASTStorage;
 
-#define LIST_OF_EXECUTABLE_POOL_SETTINGS(M) \
+#define LIST_OF_EXECUTABLE_SETTINGS(M) \
+    M(UInt64, send_chunk_header, false, "Send number_of_rows\n before sending chunk to process", 0) \
     M(UInt64, pool_size, 16, "Processes pool size. If size == 0, then there is no size restrictions", 0) \
     M(UInt64, max_command_execution_time, 10, "Max command execution time in seconds.", 0) \
     M(UInt64, command_termination_timeout, 10, "Command termination timeout in seconds.", 0) \
 
-DECLARE_SETTINGS_TRAITS(ExecutablePoolSettingsTraits, LIST_OF_EXECUTABLE_POOL_SETTINGS)
+DECLARE_SETTINGS_TRAITS(ExecutableSettingsTraits, LIST_OF_EXECUTABLE_SETTINGS)
 
 /// Settings for ExecutablePool engine.
-struct ExecutablePoolSettings : public BaseSettings<ExecutablePoolSettingsTraits>
+struct ExecutableSettings : public BaseSettings<ExecutableSettingsTraits>
 {
     void loadFromQuery(ASTStorage & storage_def);
 };
diff --git a/src/Storages/ExternalDataSourceConfiguration.cpp b/src/Storages/ExternalDataSourceConfiguration.cpp
new file mode 100644
index 00000000000..00c41069101
--- /dev/null
+++ b/src/Storages/ExternalDataSourceConfiguration.cpp
@@ -0,0 +1,314 @@
+#include "ExternalDataSourceConfiguration.h"
+
+#include <Interpreters/Context.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <IO/WriteBufferFromString.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+String ExternalDataSourceConfiguration::toString() const
+{
+    WriteBufferFromOwnString configuration_info;
+    configuration_info << "username: " << username << "\t";
+    if (addresses.empty())
+    {
+        configuration_info << "host: " << host << "\t";
+        configuration_info << "port: " << port << "\t";
+    }
+    else
+    {
+        for (const auto & [replica_host, replica_port] : addresses)
+        {
+            configuration_info << "host: " << replica_host << "\t";
+            configuration_info << "port: " << replica_port << "\t";
+        }
+    }
+    return configuration_info.str();
+}
+
+
+void ExternalDataSourceConfiguration::set(const ExternalDataSourceConfiguration & conf)
+{
+    host = conf.host;
+    port = conf.port;
+    username = conf.username;
+    password = conf.password;
+    database = conf.database;
+    table = conf.table;
+    schema = conf.schema;
+}
+
+
+std::optional<ExternalDataSourceConfig> getExternalDataSourceConfiguration(const ASTs & args, ContextPtr context, bool is_database_engine)
+{
+    if (args.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
+
+    ExternalDataSourceConfiguration configuration;
+    StorageSpecificArgs non_common_args;
+
+    if (const auto * collection = typeid_cast<const ASTIdentifier *>(args[0].get()))
+    {
+        const auto & config = context->getConfigRef();
+        const auto & config_prefix = fmt::format("named_collections.{}", collection->name());
+
+        if (!config.has(config_prefix))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection->name());
+
+        configuration.host = config.getString(config_prefix + ".host", "");
+        configuration.port = config.getInt(config_prefix + ".port", 0);
+        configuration.username = config.getString(config_prefix + ".user", "");
+        configuration.password = config.getString(config_prefix + ".password", "");
+        configuration.database = config.getString(config_prefix + ".database", "");
+        configuration.table = config.getString(config_prefix + ".table", "");
+        configuration.schema = config.getString(config_prefix + ".schema", "");
+
+        if ((args.size() == 1) && (configuration.host.empty() || configuration.port == 0
+            || configuration.username.empty() || configuration.password.empty()
+            || configuration.database.empty() || (configuration.table.empty() && !is_database_engine)))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Named collection of connection parameters is missing some of the parameters and no key-value arguments are added");
+        }
+
+        for (size_t i = 1; i < args.size(); ++i)
+        {
+            if (const auto * ast_function = typeid_cast<const ASTFunction *>(args[i].get()))
+            {
+                const auto * args_expr = assert_cast<const ASTExpressionList *>(ast_function->arguments.get());
+                auto function_args = args_expr->children;
+                if (function_args.size() != 2)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
+
+                auto arg_name = function_args[0]->as<ASTIdentifier>()->name();
+                auto arg_value = evaluateConstantExpressionOrIdentifierAsLiteral(function_args[1], context)->as<ASTLiteral>()->value;
+
+                if (arg_name == "host")
+                    configuration.host = arg_value.safeGet<String>();
+                else if (arg_name == "port")
+                    configuration.port = arg_value.safeGet<UInt64>();
+                else if (arg_name == "user")
+                    configuration.username = arg_value.safeGet<String>();
+                else if (arg_name == "password")
+                    configuration.password = arg_value.safeGet<String>();
+                else if (arg_name == "database")
+                    configuration.database = arg_value.safeGet<String>();
+                else if (arg_name == "table")
+                    configuration.table = arg_value.safeGet<String>();
+                else if (arg_name == "schema")
+                    configuration.schema = arg_value.safeGet<String>();
+                else
+                    non_common_args.emplace_back(std::make_pair(arg_name, arg_value));
+            }
+            else
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
+            }
+        }
+
+        ExternalDataSourceConfig source_config{ .configuration = configuration, .specific_args = non_common_args };
+        return source_config;
+    }
+    return std::nullopt;
+}
+
+
+std::optional<ExternalDataSourceConfiguration> getExternalDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context)
+{
+    ExternalDataSourceConfiguration configuration;
+
+    auto collection_name = dict_config.getString(dict_config_prefix + ".name", "");
+    if (!collection_name.empty())
+    {
+        const auto & config = context->getConfigRef();
+        const auto & config_prefix = fmt::format("named_collections.{}", collection_name);
+
+        if (!config.has(config_prefix))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection_name);
+
+        configuration.host = dict_config.getString(dict_config_prefix + ".host", config.getString(config_prefix + ".host", ""));
+        configuration.port = dict_config.getInt(dict_config_prefix + ".port", config.getUInt(config_prefix + ".port", 0));
+        configuration.username = dict_config.getString(dict_config_prefix + ".user", config.getString(config_prefix + ".user", ""));
+        configuration.password = dict_config.getString(dict_config_prefix + ".password", config.getString(config_prefix + ".password", ""));
+        configuration.database = dict_config.getString(dict_config_prefix + ".db", config.getString(config_prefix + ".database", ""));
+        configuration.table = dict_config.getString(dict_config_prefix + ".table", config.getString(config_prefix + ".table", ""));
+        configuration.schema = dict_config.getString(dict_config_prefix + ".schema", config.getString(config_prefix + ".schema", ""));
+
+        if (configuration.host.empty() || configuration.port == 0 || configuration.username.empty() || configuration.password.empty()
+            || configuration.database.empty() || configuration.table.empty())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Named collection of connection parameters is missing some of the parameters and dictionary parameters are added");
+        }
+        return configuration;
+    }
+    return std::nullopt;
+}
+
+
+ExternalDataSourcesByPriority getExternalDataSourceConfigurationByPriority(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context)
+{
+    ExternalDataSourceConfiguration common_configuration;
+
+    auto named_collection = getExternalDataSourceConfiguration(dict_config, dict_config_prefix, context);
+    if (named_collection)
+    {
+        common_configuration = *named_collection;
+    }
+    else
+    {
+        common_configuration.host = dict_config.getString(dict_config_prefix + ".host", "");
+        common_configuration.port = dict_config.getUInt(dict_config_prefix + ".port", 0);
+        common_configuration.username = dict_config.getString(dict_config_prefix + ".user", "");
+        common_configuration.password = dict_config.getString(dict_config_prefix + ".password", "");
+        common_configuration.database = dict_config.getString(dict_config_prefix + ".db", "");
+        common_configuration.table = dict_config.getString(fmt::format("{}.table", dict_config_prefix), "");
+        common_configuration.schema = dict_config.getString(fmt::format("{}.schema", dict_config_prefix), "");
+    }
+
+    ExternalDataSourcesByPriority configuration
+    {
+        .database = common_configuration.database,
+        .table = common_configuration.table,
+        .schema = common_configuration.schema,
+        .replicas_configurations = {}
+    };
+
+    if (dict_config.has(dict_config_prefix + ".replica"))
+    {
+        Poco::Util::AbstractConfiguration::Keys config_keys;
+        dict_config.keys(dict_config_prefix, config_keys);
+
+        for (const auto & config_key : config_keys)
+        {
+            if (config_key.starts_with("replica"))
+            {
+                ExternalDataSourceConfiguration replica_configuration(common_configuration);
+                String replica_name = dict_config_prefix + "." + config_key;
+                size_t priority = dict_config.getInt(replica_name + ".priority", 0);
+
+                replica_configuration.host = dict_config.getString(replica_name + ".host", common_configuration.host);
+                replica_configuration.port = dict_config.getUInt(replica_name + ".port", common_configuration.port);
+                replica_configuration.username = dict_config.getString(replica_name + ".user", common_configuration.username);
+                replica_configuration.password = dict_config.getString(replica_name + ".password", common_configuration.password);
+
+                if (replica_configuration.host.empty() || replica_configuration.port == 0
+                    || replica_configuration.username.empty() || replica_configuration.password.empty())
+                {
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Named collection of connection parameters is missing some of the parameters and no other dictionary parameters are added");
+                }
+
+                configuration.replicas_configurations[priority].emplace_back(replica_configuration);
+            }
+        }
+    }
+    else
+    {
+        configuration.replicas_configurations[0].emplace_back(common_configuration);
+    }
+
+    return configuration;
+}
+
+
+void URLBasedDataSourceConfiguration::set(const URLBasedDataSourceConfiguration & conf)
+{
+    url = conf.url;
+    format = conf.format;
+    compression_method = conf.compression_method;
+    structure = conf.structure;
+}
+
+
+std::optional<URLBasedDataSourceConfig> getURLBasedDataSourceConfiguration(const ASTs & args, ContextPtr context)
+{
+    if (args.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
+
+    URLBasedDataSourceConfiguration configuration;
+    StorageSpecificArgs non_common_args;
+
+    if (const auto * collection = typeid_cast<const ASTIdentifier *>(args[0].get()))
+    {
+        const auto & config = context->getConfigRef();
+        auto config_prefix = fmt::format("named_collections.{}", collection->name());
+
+        if (!config.has(config_prefix))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection->name());
+
+        Poco::Util::AbstractConfiguration::Keys keys;
+        config.keys(config_prefix, keys);
+        for (const auto & key : keys)
+        {
+            if (key == "url")
+            {
+                configuration.url = config.getString(config_prefix + ".url", "");
+            }
+            else if (key == "headers")
+            {
+                Poco::Util::AbstractConfiguration::Keys header_keys;
+                config.keys(config_prefix + ".headers", header_keys);
+                for (const auto & header : header_keys)
+                {
+                    const auto header_prefix = config_prefix + ".headers." + header;
+                    configuration.headers.emplace_back(std::make_pair(config.getString(header_prefix + ".name"), config.getString(header_prefix + ".value")));
+                }
+            }
+            else
+                non_common_args.emplace_back(std::make_pair(key, config.getString(config_prefix + '.' + key)));
+        }
+
+        for (size_t i = 1; i < args.size(); ++i)
+        {
+            if (const auto * ast_function = typeid_cast<const ASTFunction *>(args[i].get()))
+            {
+                const auto * args_expr = assert_cast<const ASTExpressionList *>(ast_function->arguments.get());
+                auto function_args = args_expr->children;
+                if (function_args.size() != 2)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
+
+                auto arg_name = function_args[0]->as<ASTIdentifier>()->name();
+                auto arg_value = evaluateConstantExpressionOrIdentifierAsLiteral(function_args[1], context)->as<ASTLiteral>()->value;
+
+                if (arg_name == "url")
+                    configuration.url = arg_value.safeGet<String>();
+                else if (arg_name == "format")
+                    configuration.format = arg_value.safeGet<String>();
+                else if (arg_name == "compression_method")
+                    configuration.compression_method = arg_value.safeGet<String>();
+                else if (arg_name == "structure")
+                    configuration.structure = arg_value.safeGet<String>();
+                else
+                    non_common_args.emplace_back(std::make_pair(arg_name, arg_value));
+            }
+            else
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
+            }
+        }
+
+        if (configuration.url.empty() || configuration.format.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Storage requires {}", configuration.url.empty() ? "url" : "format");
+
+        URLBasedDataSourceConfig source_config{ .configuration = configuration, .specific_args = non_common_args };
+        return source_config;
+    }
+    return std::nullopt;
+}
+
+}
diff --git a/src/Storages/ExternalDataSourceConfiguration.h b/src/Storages/ExternalDataSourceConfiguration.h
new file mode 100644
index 00000000000..5f88653807b
--- /dev/null
+++ b/src/Storages/ExternalDataSourceConfiguration.h
@@ -0,0 +1,113 @@
+#pragma once
+
+#include <Parsers/ASTIdentifier.h>
+#include <Interpreters/Context.h>
+#include <Poco/Util/AbstractConfiguration.h>
+
+
+namespace DB
+{
+
+struct ExternalDataSourceConfiguration
+{
+    String host;
+    UInt16 port = 0;
+    String username;
+    String password;
+    String database;
+    String table;
+    String schema;
+
+    std::vector<std::pair<String, UInt16>> addresses; /// Failover replicas.
+
+    String toString() const;
+
+    void set(const ExternalDataSourceConfiguration & conf);
+};
+
+
+struct StoragePostgreSQLConfiguration : ExternalDataSourceConfiguration
+{
+    String on_conflict;
+};
+
+
+struct StorageMySQLConfiguration : ExternalDataSourceConfiguration
+{
+    bool replace_query = false;
+    String on_duplicate_clause;
+};
+
+struct StorageMongoDBConfiguration : ExternalDataSourceConfiguration
+{
+    String collection;
+    String options;
+};
+
+
+using StorageSpecificArgs = std::vector<std::pair<String, DB::Field>>;
+
+struct ExternalDataSourceConfig
+{
+    ExternalDataSourceConfiguration configuration;
+    StorageSpecificArgs specific_args;
+};
+
+/* If there is a storage engine's configuration specified in the named_collections,
+ * this function returns valid for usage ExternalDataSourceConfiguration struct
+ * otherwise std::nullopt is returned.
+ *
+ * If any configuration options are provided as key-value engine arguments, they will override
+ * configuration values, i.e. ENGINE = PostgreSQL(postgresql_configuration, database = 'postgres_database');
+ *
+ * Any key-value engine argument except common (`host`, `port`, `username`, `password`, `database`)
+ * is returned in EngineArgs struct.
+ */
+std::optional<ExternalDataSourceConfig> getExternalDataSourceConfiguration(const ASTs & args, ContextPtr context, bool is_database_engine = false);
+
+std::optional<ExternalDataSourceConfiguration> getExternalDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context);
+
+
+/// Highest priority is 0, the bigger the number in map, the less the priority.
+using ExternalDataSourcesConfigurationByPriority = std::map<size_t, std::vector<ExternalDataSourceConfiguration>>;
+
+struct ExternalDataSourcesByPriority
+{
+    String database;
+    String table;
+    String schema;
+    ExternalDataSourcesConfigurationByPriority replicas_configurations;
+};
+
+ExternalDataSourcesByPriority
+getExternalDataSourceConfigurationByPriority(const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context);
+
+
+struct URLBasedDataSourceConfiguration
+{
+    String url;
+    String format;
+    String compression_method = "auto";
+    String structure;
+
+    std::vector<std::pair<String, Field>> headers;
+
+    void set(const URLBasedDataSourceConfiguration & conf);
+};
+
+struct StorageS3Configuration : URLBasedDataSourceConfiguration
+{
+    String access_key_id;
+    String secret_access_key;
+};
+
+struct URLBasedDataSourceConfig
+{
+    URLBasedDataSourceConfiguration configuration;
+    StorageSpecificArgs specific_args;
+};
+
+std::optional<URLBasedDataSourceConfig> getURLBasedDataSourceConfiguration(const ASTs & args, ContextPtr context);
+
+}
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index d3636e6c756..fe5da1ce8db 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -140,9 +140,8 @@ void IStorage::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /
     for (const auto & command : commands)
     {
         if (!command.isCommentAlter())
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
     }
 }
 
@@ -201,7 +200,7 @@ NameDependencies IStorage::getDependentViewsByColumn(ContextPtr context) const
     return name_deps;
 }
 
-bool IStorage::isReadOnly() const
+bool IStorage::isStaticStorage() const
 {
     auto storage_policy = getStoragePolicy();
     if (storage_policy)
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index e1c0f030954..90cb963e064 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -540,7 +540,7 @@ public:
     virtual StoragePolicyPtr getStoragePolicy() const { return {}; }
 
     /// Returns true if all disks of storage are read-only.
-    virtual bool isReadOnly() const;
+    virtual bool isStaticStorage() const;
 
     /// If it is possible to quickly determine exact number of rows in the table at this moment of time, then return it.
     /// Used for:
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.cpp b/src/Storages/Kafka/KafkaBlockInputStream.cpp
index 95fa1459e76..d073155d55c 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockInputStream.cpp
@@ -5,6 +5,7 @@
 #include <Formats/FormatFactory.h>
 #include <Storages/Kafka/ReadBufferFromKafkaConsumer.h>
 #include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Processors/Executors/StreamingFormatExecutor.h>
 #include <common/logger_useful.h>
 #include <Interpreters/Context.h>
 
@@ -22,7 +23,7 @@ const auto MAX_FAILED_POLL_ATTEMPTS = 10;
 KafkaBlockInputStream::KafkaBlockInputStream(
     StorageKafka & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const std::shared_ptr<Context> & context_,
+    const ContextPtr & context_,
     const Names & columns,
     Poco::Logger * log_,
     size_t max_block_size_,
@@ -78,7 +79,6 @@ 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;
@@ -86,92 +86,45 @@ Block KafkaBlockInputStream::readImpl()
     auto input_format = FormatFactory::instance().getInputFormat(
         storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
 
-    InputPort port(input_format->getPort().getHeader(), input_format.get());
-    connect(input_format->getPort(), port);
-    port.setNeeded();
-
     std::optional<std::string> exception_message;
-    auto read_kafka_message = [&]
+    size_t total_rows = 0;
+    size_t failed_poll_attempts = 0;
+
+    auto on_error = [&](const MutableColumns & result_columns, Exception & e)
     {
-        size_t new_rows = 0;
-        while (true)
+        if (put_error_to_stream)
         {
-            auto status = input_format->prepare();
-
-            switch (status)
+            exception_message = e.message();
+            for (const auto & column : result_columns)
             {
-                case IProcessor::Status::Ready:
-                    input_format->work();
-                    break;
+                // read_kafka_message could already push some rows to result_columns
+                // before exception, we need to fix it.
+                auto cur_rows = column->size();
+                if (cur_rows > total_rows)
+                    column->popBack(cur_rows - total_rows);
 
-                case IProcessor::Status::Finished:
-                    input_format->resetParser();
-                    return new_rows;
-
-                case IProcessor::Status::PortFull:
-                {
-                    auto chunk = port.pull();
-
-                    // that was returning bad value before https://github.com/ClickHouse/ClickHouse/pull/8005
-                    // if will be backported should go together with #8005
-                    auto chunk_rows = chunk.getNumRows();
-                    new_rows += chunk_rows;
-
-                    auto columns = chunk.detachColumns();
-                    for (size_t i = 0, s = columns.size(); i < s; ++i)
-                    {
-                        result_columns[i]->insertRangeFrom(*columns[i], 0, columns[i]->size());
-                    }
-                    break;
-                }
-                case IProcessor::Status::NeedData:
-                case IProcessor::Status::Async:
-                case IProcessor::Status::ExpandPipeline:
-                    throw Exception("Source processor returned status " + IProcessor::statusToName(status), ErrorCodes::LOGICAL_ERROR);
+                // all data columns will get default value in case of error
+                column->insertDefault();
             }
+
+            return 1;
+        }
+        else
+        {
+            e.addMessage("while parsing Kafka message (topic: {}, partition: {}, offset: {})'",
+                buffer->currentTopic(), buffer->currentPartition(), buffer->currentOffset());
+            throw;
         }
     };
 
-    size_t total_rows = 0;
-    size_t failed_poll_attempts = 0;
+    StreamingFormatExecutor executor(non_virtual_header, input_format, std::move(on_error));
 
     while (true)
     {
         size_t new_rows = 0;
         exception_message.reset();
         if (buffer->poll())
-        {
-            try
-            {
-                new_rows = read_kafka_message();
-            }
-            catch (Exception & e)
-            {
-                if (put_error_to_stream)
-                {
-                    input_format->resetParser();
-                    exception_message = e.message();
-                    for (auto & column : result_columns)
-                    {
-                        // read_kafka_message could already push some rows to result_columns
-                        // before exception, we need to fix it.
-                        auto cur_rows = column->size();
-                        if (cur_rows > total_rows)
-                        {
-                            column->popBack(cur_rows - total_rows);
-                        }
-                        // all data columns will get default value in case of error
-                        column->insertDefault();
-                    }
-                    new_rows = 1;
-                }
-                else
-                {
-                    e.addMessage("while parsing Kafka message (topic: {}, partition: {}, offset: {})'", buffer->currentTopic(), buffer->currentPartition(), buffer->currentOffset());
-                    throw;
-                }
-            }
-        }
+            new_rows = executor.execute();
 
         if (new_rows)
         {
@@ -276,7 +229,7 @@ Block KafkaBlockInputStream::readImpl()
     // i.e. will not be stored anythere
     // If needed any extra columns can be added using DEFAULT they can be added at MV level if needed.
 
-    auto result_block  = non_virtual_header.cloneWithColumns(std::move(result_columns));
+    auto result_block  = non_virtual_header.cloneWithColumns(executor.getResultColumns());
     auto virtual_block = virtual_header.cloneWithColumns(std::move(virtual_columns));
 
     for (const auto & column : virtual_block.getColumnsWithTypeAndName())
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.h b/src/Storages/Kafka/KafkaBlockInputStream.h
index 98e4b8982e0..ba95c983ee5 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.h
+++ b/src/Storages/Kafka/KafkaBlockInputStream.h
@@ -19,7 +19,7 @@ public:
     KafkaBlockInputStream(
         StorageKafka & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const std::shared_ptr<Context> & context_,
+        const ContextPtr & context_,
         const Names & columns,
         Poco::Logger * log_,
         size_t max_block_size_,
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.h b/src/Storages/Kafka/KafkaBlockOutputStream.h
index 7d65ac99998..5529cd8ece8 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.h
+++ b/src/Storages/Kafka/KafkaBlockOutputStream.h
@@ -12,7 +12,7 @@ public:
     explicit KafkaSink(
         StorageKafka & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const std::shared_ptr<const Context> & context_);
+        const ContextPtr & context_);
 
     void consume(Chunk chunk) override;
     void onStart() override;
@@ -24,7 +24,7 @@ public:
 private:
     StorageKafka & storage;
     StorageMetadataPtr metadata_snapshot;
-    const std::shared_ptr<const Context> context;
+    const ContextPtr context;
     ProducerBufferPtr buffer;
     BlockOutputStreamPtr child;
 };
diff --git a/src/Storages/KeyDescription.cpp b/src/Storages/KeyDescription.cpp
index 264a3ab45be..6a2f4bbb055 100644
--- a/src/Storages/KeyDescription.cpp
+++ b/src/Storages/KeyDescription.cpp
@@ -153,4 +153,12 @@ KeyDescription KeyDescription::getSortingKeyFromAST(
     return result;
 }
 
+KeyDescription KeyDescription::buildEmptyKey()
+{
+    KeyDescription result;
+    result.expression_list_ast = std::make_shared<ASTExpressionList>();
+    result.expression = std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(), ExpressionActionsSettings{});
+    return result;
+}
+
 }
diff --git a/src/Storages/KeyDescription.h b/src/Storages/KeyDescription.h
index c99c7ebc5c5..81803c3e44b 100644
--- a/src/Storages/KeyDescription.h
+++ b/src/Storages/KeyDescription.h
@@ -50,6 +50,10 @@ struct KeyDescription
         ContextPtr context,
         const std::optional<String> & additional_column);
 
+    /// Build an empty key description. It's different from the default constructor with some
+    /// additional initializations.
+    static KeyDescription buildEmptyKey();
+
     /// Recalculate all expressions and fields for key with new columns without
     /// changes in constant fields. Just wrapper for static methods.
     void recalculateWithNewColumns(
diff --git a/src/Storages/MergeTree/BackgroundJobsAssignee.cpp b/src/Storages/MergeTree/BackgroundJobsAssignee.cpp
new file mode 100644
index 00000000000..c1cb0b497cd
--- /dev/null
+++ b/src/Storages/MergeTree/BackgroundJobsAssignee.cpp
@@ -0,0 +1,144 @@
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/randomSeed.h>
+#include <pcg_random.hpp>
+#include <random>
+
+namespace DB
+{
+
+BackgroundJobsAssignee::BackgroundJobsAssignee(MergeTreeData & data_, BackgroundJobsAssignee::Type type_, ContextPtr global_context_)
+    : WithContext(global_context_)
+    , data(data_)
+    , sleep_settings(global_context_->getBackgroundMoveTaskSchedulingSettings())
+    , rng(randomSeed())
+    , type(type_)
+{
+}
+
+void BackgroundJobsAssignee::trigger()
+{
+    std::lock_guard lock(holder_mutex);
+
+    if (!holder)
+        return;
+
+    no_work_done_count = 0;
+    /// We have background jobs, schedule task as soon as possible
+    holder->schedule();
+}
+
+void BackgroundJobsAssignee::postpone()
+{
+    std::lock_guard lock(holder_mutex);
+
+    if (!holder)
+        return;
+
+    auto no_work_done_times = no_work_done_count.fetch_add(1, std::memory_order_relaxed);
+    double random_addition = std::uniform_real_distribution<double>(0, sleep_settings.task_sleep_seconds_when_no_work_random_part)(rng);
+
+    size_t next_time_to_execute = 1000 * (std::min(
+            sleep_settings.task_sleep_seconds_when_no_work_max,
+            sleep_settings.thread_sleep_seconds_if_nothing_to_do * std::pow(sleep_settings.task_sleep_seconds_when_no_work_multiplier, no_work_done_times))
+        + random_addition);
+
+    holder->scheduleAfter(next_time_to_execute, false);
+}
+
+
+void BackgroundJobsAssignee::scheduleMergeMutateTask(ExecutableTaskPtr merge_task)
+{
+    bool res = getContext()->getMergeMutateExecutor()->trySchedule(merge_task);
+    res ? trigger() : postpone();
+}
+
+
+void BackgroundJobsAssignee::scheduleFetchTask(ExecutableTaskPtr fetch_task)
+{
+    bool res = getContext()->getFetchesExecutor()->trySchedule(fetch_task);
+    res ? trigger() : postpone();
+}
+
+
+void BackgroundJobsAssignee::scheduleMoveTask(ExecutableTaskPtr move_task)
+{
+    bool res = getContext()->getMovesExecutor()->trySchedule(move_task);
+    res ? trigger() : postpone();
+}
+
+
+String BackgroundJobsAssignee::toString(Type type)
+{
+    switch (type)
+    {
+        case Type::DataProcessing:
+            return "DataProcessing";
+        case Type::Moving:
+            return "Moving";
+    }
+    __builtin_unreachable();
+}
+
+void BackgroundJobsAssignee::start()
+{
+    std::lock_guard lock(holder_mutex);
+    if (!holder)
+        holder = getContext()->getSchedulePool().createTask("BackgroundJobsAssignee:" + toString(type), [this]{ threadFunc(); });
+
+    holder->activateAndSchedule();
+}
+
+void BackgroundJobsAssignee::finish()
+{
+    /// No lock here, because scheduled tasks could call trigger method
+    if (holder)
+    {
+        holder->deactivate();
+
+        auto storage_id = data.getStorageID();
+
+        getContext()->getMovesExecutor()->removeTasksCorrespondingToStorage(storage_id);
+        getContext()->getFetchesExecutor()->removeTasksCorrespondingToStorage(storage_id);
+        getContext()->getMergeMutateExecutor()->removeTasksCorrespondingToStorage(storage_id);
+    }
+}
+
+
+void BackgroundJobsAssignee::threadFunc()
+try
+{
+    bool succeed = false;
+    switch (type)
+    {
+        case Type::DataProcessing:
+            succeed = data.scheduleDataProcessingJob(*this);
+            break;
+        case Type::Moving:
+            succeed = data.scheduleDataMovingJob(*this);
+            break;
+    }
+
+    if (!succeed)
+        postpone();
+}
+catch (...) /// Catch any exception to avoid thread termination.
+{
+    tryLogCurrentException(__PRETTY_FUNCTION__);
+    postpone();
+}
+
+BackgroundJobsAssignee::~BackgroundJobsAssignee()
+{
+    try
+    {
+        finish();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+}
diff --git a/src/Storages/MergeTree/BackgroundJobsAssignee.h b/src/Storages/MergeTree/BackgroundJobsAssignee.h
new file mode 100644
index 00000000000..4ccb4c0169b
--- /dev/null
+++ b/src/Storages/MergeTree/BackgroundJobsAssignee.h
@@ -0,0 +1,89 @@
+#pragma once
+
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
+#include <Common/ThreadPool.h>
+#include <Core/BackgroundSchedulePool.h>
+#include <pcg_random.hpp>
+
+
+namespace DB
+{
+
+/// Settings for background tasks scheduling. Each background assignee has one
+/// BackgroundSchedulingPoolTask and depending on execution result may put this
+/// task to sleep according to settings. Look at scheduleTask function for details.
+struct BackgroundTaskSchedulingSettings
+{
+    double thread_sleep_seconds_random_part = 1.0;
+    double thread_sleep_seconds_if_nothing_to_do = 0.1;
+    double task_sleep_seconds_when_no_work_max = 600;
+    /// For exponential backoff.
+    double task_sleep_seconds_when_no_work_multiplier = 1.1;
+
+    double task_sleep_seconds_when_no_work_random_part = 1.0;
+
+     /// Deprecated settings, don't affect background execution
+    double thread_sleep_seconds = 10;
+    double task_sleep_seconds_when_no_work_min = 10;
+};
+
+class MergeTreeData;
+
+class BackgroundJobsAssignee : public WithContext
+{
+private:
+    MergeTreeData & data;
+
+    /// Settings for execution control of background scheduling task
+    BackgroundTaskSchedulingSettings sleep_settings;
+    /// Useful for random backoff timeouts generation
+    pcg64 rng;
+
+    /// How many times execution of background job failed or we have
+    /// no new jobs.
+    std::atomic<size_t> no_work_done_count{0};
+
+    /// Scheduling task which assign jobs in background pool
+    BackgroundSchedulePool::TaskHolder holder;
+    /// Mutex for thread safety
+    std::mutex holder_mutex;
+
+public:
+    /// In case of ReplicatedMergeTree the first assignee will be responsible for
+    /// polling the replication queue and schedule operations according to the LogEntry type
+    /// e.g. merges, mutations and fetches. The same will be for Plain MergeTree except there is no
+    /// replication queue, so we will just scan parts and decide what to do.
+    /// Moving operations are the same for all types of MergeTree and also have their own timetable.
+    enum class Type
+    {
+        DataProcessing,
+        Moving
+    };
+    Type type{Type::DataProcessing};
+
+    void start();
+    void trigger();
+    void postpone();
+    void finish();
+
+    void scheduleMergeMutateTask(ExecutableTaskPtr merge_task);
+    void scheduleFetchTask(ExecutableTaskPtr fetch_task);
+    void scheduleMoveTask(ExecutableTaskPtr move_task);
+
+    /// Just call finish
+    ~BackgroundJobsAssignee();
+
+    BackgroundJobsAssignee(
+        MergeTreeData & data_,
+        Type type,
+        ContextPtr global_context_);
+
+private:
+    static String toString(Type type);
+
+    /// Function that executes in background scheduling pool
+    void threadFunc();
+};
+
+
+}
diff --git a/src/Storages/MergeTree/BackgroundJobsExecutor.cpp b/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
deleted file mode 100644
index 7c784de9ebb..00000000000
--- a/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-#include <Storages/MergeTree/BackgroundJobsExecutor.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/randomSeed.h>
-#include <pcg_random.hpp>
-#include <random>
-
-namespace CurrentMetrics
-{
-    extern const Metric BackgroundPoolTask;
-    extern const Metric BackgroundMovePoolTask;
-    extern const Metric BackgroundFetchesPoolTask;
-}
-
-namespace DB
-{
-
-IBackgroundJobExecutor::IBackgroundJobExecutor(
-        ContextPtr global_context_,
-        const BackgroundTaskSchedulingSettings & sleep_settings_,
-        const std::vector<PoolConfig> & pools_configs_)
-    : WithContext(global_context_)
-    , sleep_settings(sleep_settings_)
-    , rng(randomSeed())
-{
-    for (const auto & pool_config : pools_configs_)
-    {
-        const auto max_pool_size = pool_config.get_max_pool_size();
-        pools.try_emplace(pool_config.pool_type, max_pool_size, 0, max_pool_size, false);
-        pools_configs.emplace(pool_config.pool_type, pool_config);
-    }
-}
-
-double IBackgroundJobExecutor::getSleepRandomAdd()
-{
-    std::lock_guard random_lock(random_mutex);
-    return std::uniform_real_distribution<double>(0, sleep_settings.task_sleep_seconds_when_no_work_random_part)(rng);
-}
-
-void IBackgroundJobExecutor::runTaskWithoutDelay()
-{
-    no_work_done_count = 0;
-    /// We have background jobs, schedule task as soon as possible
-    scheduling_task->schedule();
-}
-
-void IBackgroundJobExecutor::scheduleTask(bool with_backoff)
-{
-    size_t next_time_to_execute;
-    if (with_backoff)
-    {
-        auto no_work_done_times = no_work_done_count.fetch_add(1, std::memory_order_relaxed);
-
-        next_time_to_execute = 1000 * (std::min(
-                sleep_settings.task_sleep_seconds_when_no_work_max,
-                sleep_settings.thread_sleep_seconds_if_nothing_to_do * std::pow(sleep_settings.task_sleep_seconds_when_no_work_multiplier, no_work_done_times))
-            + getSleepRandomAdd());
-    }
-    else
-    {
-        no_work_done_count = 0;
-        next_time_to_execute = 1000 * sleep_settings.thread_sleep_seconds_if_nothing_to_do;
-    }
-
-    scheduling_task->scheduleAfter(next_time_to_execute, false);
-}
-
-namespace
-{
-
-/// Tricky function: we have separate thread pool with max_threads in each background executor for each table
-/// But we want total background threads to be less than max_threads value. So we use global atomic counter (BackgroundMetric)
-/// to limit total number of background threads.
-bool incrementMetricIfLessThanMax(std::atomic<Int64> & atomic_value, Int64 max_value)
-{
-    auto value = atomic_value.load(std::memory_order_relaxed);
-    while (value < max_value)
-    {
-        if (atomic_value.compare_exchange_weak(value, value + 1, std::memory_order_release, std::memory_order_relaxed))
-            return true;
-    }
-    return false;
-}
-
-}
-
-/// This is a RAII class which only decrements metric.
-/// It is added because after all other fixes a bug non-executing merges was occurred again.
-/// Last hypothesis: task was successfully added to pool, however, was not executed because of internal exception in it.
-class ParanoidMetricDecrementor
-{
-public:
-    explicit ParanoidMetricDecrementor(CurrentMetrics::Metric metric_) : metric(metric_) {}
-    void alarm() { is_alarmed = true; }
-    void decrement()
-    {
-        if (is_alarmed.exchange(false))
-        {
-            CurrentMetrics::values[metric]--;
-        }
-    }
-
-    ~ParanoidMetricDecrementor() { decrement(); }
-
-private:
-
-    CurrentMetrics::Metric metric;
-    std::atomic_bool is_alarmed = false;
-};
-
-void IBackgroundJobExecutor::execute(JobAndPool job_and_pool)
-try
-{
-    auto & pool_config = pools_configs[job_and_pool.pool_type];
-    const auto max_pool_size = pool_config.get_max_pool_size();
-
-    auto metric_decrementor = std::make_shared<ParanoidMetricDecrementor>(pool_config.tasks_metric);
-
-    /// If corresponding pool is not full increment metric and assign new job
-    if (incrementMetricIfLessThanMax(CurrentMetrics::values[pool_config.tasks_metric], max_pool_size))
-    {
-        metric_decrementor->alarm();
-        try /// this try required because we have to manually decrement metric
-        {
-            /// Synchronize pool size, because config could be reloaded
-            pools[job_and_pool.pool_type].setMaxThreads(max_pool_size);
-            pools[job_and_pool.pool_type].setQueueSize(max_pool_size);
-
-            pools[job_and_pool.pool_type].scheduleOrThrowOnError([this, metric_decrementor, job{std::move(job_and_pool.job)}] ()
-            {
-                try /// We don't want exceptions in background pool
-                {
-                    bool job_success = job();
-                    /// Job done, decrement metric and reset no_work counter
-                    metric_decrementor->decrement();
-
-                    if (job_success)
-                    {
-                        /// Job done, new empty space in pool, schedule background task
-                        runTaskWithoutDelay();
-                    }
-                    else
-                    {
-                        /// Job done, but failed, schedule with backoff
-                        scheduleTask(/* with_backoff = */ true);
-                    }
-
-                }
-                catch (...)
-                {
-                    metric_decrementor->decrement();
-                    tryLogCurrentException(__PRETTY_FUNCTION__);
-                    scheduleTask(/* with_backoff = */ true);
-                }
-            });
-            /// We've scheduled task in the background pool and when it will finish we will be triggered again. But this task can be
-            /// extremely long and we may have a lot of other small tasks to do, so we schedule ourselves here.
-            runTaskWithoutDelay();
-        }
-        catch (...)
-        {
-            /// With our Pool settings scheduleOrThrowOnError shouldn't throw exceptions, but for safety catch added here
-            metric_decrementor->decrement();
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-            scheduleTask(/* with_backoff = */ true);
-        }
-    }
-    else /// Pool is full and we have some work to do
-    {
-        scheduleTask(/* with_backoff = */ false);
-    }
-}
-catch (...) /// Exception while we looking for a task, reschedule
-{
-    tryLogCurrentException(__PRETTY_FUNCTION__);
-
-    /// Why do we scheduleTask again?
-    /// To retry on exception, since it may be some temporary exception.
-    scheduleTask(/* with_backoff = */ true);
-}
-
-void IBackgroundJobExecutor::start()
-{
-    std::lock_guard lock(scheduling_task_mutex);
-    if (!scheduling_task)
-    {
-        scheduling_task = getContext()->getSchedulePool().createTask(
-            getBackgroundTaskName(), [this]{ backgroundTaskFunction(); });
-    }
-
-    scheduling_task->activateAndSchedule();
-}
-
-void IBackgroundJobExecutor::finish()
-{
-    std::lock_guard lock(scheduling_task_mutex);
-    if (scheduling_task)
-    {
-        scheduling_task->deactivate();
-        for (auto & [pool_type, pool] : pools)
-            pool.wait();
-    }
-}
-
-void IBackgroundJobExecutor::triggerTask()
-{
-    std::lock_guard lock(scheduling_task_mutex);
-    if (scheduling_task)
-        runTaskWithoutDelay();
-}
-
-void IBackgroundJobExecutor::backgroundTaskFunction()
-try
-{
-    if (!scheduleJob())
-        scheduleTask(/* with_backoff = */ true);
-}
-catch (...) /// Catch any exception to avoid thread termination.
-{
-    tryLogCurrentException(__PRETTY_FUNCTION__);
-    scheduleTask(/* with_backoff = */ true);
-}
-
-IBackgroundJobExecutor::~IBackgroundJobExecutor()
-{
-    finish();
-}
-
-BackgroundJobsExecutor::BackgroundJobsExecutor(
-       MergeTreeData & data_,
-       ContextPtr global_context_)
-    : IBackgroundJobExecutor(
-        global_context_,
-        global_context_->getBackgroundProcessingTaskSchedulingSettings(),
-        {PoolConfig
-            {
-                .pool_type = PoolType::MERGE_MUTATE,
-                .get_max_pool_size = [global_context_] () { return global_context_->getSettingsRef().background_pool_size; },
-                .tasks_metric = CurrentMetrics::BackgroundPoolTask
-            },
-        PoolConfig
-            {
-                .pool_type = PoolType::FETCH,
-                .get_max_pool_size = [global_context_] () { return global_context_->getSettingsRef().background_fetches_pool_size; },
-                .tasks_metric = CurrentMetrics::BackgroundFetchesPoolTask
-            }
-        })
-    , data(data_)
-{
-}
-
-String BackgroundJobsExecutor::getBackgroundTaskName() const
-{
-    return data.getStorageID().getFullTableName() + " (dataProcessingTask)";
-}
-
-bool BackgroundJobsExecutor::scheduleJob()
-{
-    return data.scheduleDataProcessingJob(*this);
-}
-
-BackgroundMovesExecutor::BackgroundMovesExecutor(
-       MergeTreeData & data_,
-       ContextPtr global_context_)
-    : IBackgroundJobExecutor(
-        global_context_,
-        global_context_->getBackgroundMoveTaskSchedulingSettings(),
-        {PoolConfig
-            {
-                .pool_type = PoolType::MOVE,
-                .get_max_pool_size = [global_context_] () { return global_context_->getSettingsRef().background_move_pool_size; },
-                .tasks_metric = CurrentMetrics::BackgroundMovePoolTask
-            }
-        })
-    , data(data_)
-{
-}
-
-String BackgroundMovesExecutor::getBackgroundTaskName() const
-{
-    return data.getStorageID().getFullTableName() + " (dataMovingTask)";
-}
-
-bool BackgroundMovesExecutor::scheduleJob()
-{
-    return data.scheduleDataMovingJob(*this);
-}
-
-}
diff --git a/src/Storages/MergeTree/BackgroundJobsExecutor.h b/src/Storages/MergeTree/BackgroundJobsExecutor.h
deleted file mode 100644
index 0d9856a2f40..00000000000
--- a/src/Storages/MergeTree/BackgroundJobsExecutor.h
+++ /dev/null
@@ -1,162 +0,0 @@
-#pragma once
-
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Common/ThreadPool.h>
-#include <Core/BackgroundSchedulePool.h>
-#include <pcg_random.hpp>
-
-
-namespace DB
-{
-
-/// Settings for background tasks scheduling. Each background executor has one
-/// BackgroundSchedulingPoolTask and depending on execution result may put this
-/// task to sleep according to settings. Look at scheduleTask function for details.
-struct BackgroundTaskSchedulingSettings
-{
-    double thread_sleep_seconds_random_part = 1.0;
-    double thread_sleep_seconds_if_nothing_to_do = 0.1;
-    double task_sleep_seconds_when_no_work_max = 600;
-    /// For exponential backoff.
-    double task_sleep_seconds_when_no_work_multiplier = 1.1;
-
-    double task_sleep_seconds_when_no_work_random_part = 1.0;
-
-     /// Deprecated settings, don't affect background execution
-    double thread_sleep_seconds = 10;
-    double task_sleep_seconds_when_no_work_min = 10;
-};
-
-/// Pool type where we must execute new job. Each background executor can have several
-/// background pools. When it receives new job it will execute new task in corresponding pool.
-enum class PoolType
-{
-    MERGE_MUTATE,
-    MOVE,
-    FETCH,
-};
-
-using BackgroundJobFunc = std::function<bool()>;
-
-/// Result from background job providers. Function which will be executed in pool and pool type.
-struct JobAndPool
-{
-    BackgroundJobFunc job;
-    PoolType pool_type;
-};
-
-/// Background jobs executor which execute heavy-weight background tasks for MergTree tables, like
-/// background merges, moves, mutations, fetches and so on.
-/// Consists of two important parts:
-/// 1) Task in background scheduling pool which receives new jobs from storages and put them into required pool.
-/// 2) One or more ThreadPool objects, which execute background jobs.
-class IBackgroundJobExecutor : protected WithContext
-{
-protected:
-    /// Configuration for single background ThreadPool
-    struct PoolConfig
-    {
-        /// This pool type
-        PoolType pool_type;
-        /// Max pool size in threads
-        const std::function<size_t()> get_max_pool_size;
-        /// Metric that we have to increment when we execute task in this pool
-        CurrentMetrics::Metric tasks_metric;
-    };
-
-private:
-    /// Name for task in background scheduling pool
-    String task_name;
-    /// Settings for execution control of background scheduling task
-    BackgroundTaskSchedulingSettings sleep_settings;
-    /// Useful for random backoff timeouts generation
-    pcg64 rng;
-
-    /// How many times execution of background job failed or we have
-    /// no new jobs.
-    std::atomic<size_t> no_work_done_count{0};
-
-    /// Pools where we execute background jobs
-    std::unordered_map<PoolType, ThreadPool> pools;
-    /// Configs for background pools
-    std::unordered_map<PoolType, PoolConfig> pools_configs;
-
-    /// Scheduling task which assign jobs in background pool
-    BackgroundSchedulePool::TaskHolder scheduling_task;
-    /// Mutex for thread safety
-    std::mutex scheduling_task_mutex;
-    /// Mutex for pcg random generator thread safety
-    std::mutex random_mutex;
-
-public:
-    /// These three functions are thread safe
-
-    /// Start background task and start to assign jobs
-    void start();
-    /// Schedule background task as soon as possible, even if it sleep at this
-    /// moment for some reason.
-    void triggerTask();
-    /// Finish execution: deactivate background task and wait already scheduled jobs
-    void finish();
-
-    /// Executes job in a nested pool
-    void execute(JobAndPool job_and_pool);
-
-    /// Just call finish
-    virtual ~IBackgroundJobExecutor();
-
-protected:
-    IBackgroundJobExecutor(
-        ContextPtr global_context_,
-        const BackgroundTaskSchedulingSettings & sleep_settings_,
-        const std::vector<PoolConfig> & pools_configs_);
-
-    /// Name for task in background schedule pool
-    virtual String getBackgroundTaskName() const = 0;
-
-    /// Schedules a job in a nested pool in this class.
-    virtual bool scheduleJob() = 0;
-
-private:
-    /// Function that executes in background scheduling pool
-    void backgroundTaskFunction();
-    /// Recalculate timeouts when we have to check for a new job
-    void scheduleTask(bool with_backoff);
-    /// Run background task as fast as possible and reset errors counter
-    void runTaskWithoutDelay();
-    /// Return random add for sleep in case of error
-    double getSleepRandomAdd();
-};
-
-/// Main jobs executor: merges, mutations, fetches and so on
-class BackgroundJobsExecutor final : public IBackgroundJobExecutor
-{
-private:
-    MergeTreeData & data;
-public:
-    BackgroundJobsExecutor(
-        MergeTreeData & data_,
-        ContextPtr global_context_);
-
-protected:
-    String getBackgroundTaskName() const override;
-    bool scheduleJob() override;
-};
-
-/// Move jobs executor, move parts between disks in the background
-/// Does nothing in case of default configuration
-class BackgroundMovesExecutor final : public IBackgroundJobExecutor
-{
-private:
-    MergeTreeData & data;
-public:
-    BackgroundMovesExecutor(
-        MergeTreeData & data_,
-        ContextPtr global_context_);
-
-protected:
-    String getBackgroundTaskName() const override;
-    bool scheduleJob() override;
-};
-
-}
diff --git a/src/Storages/MergeTree/BackgroundProcessList.h b/src/Storages/MergeTree/BackgroundProcessList.h
index b447753ca74..81aded5e45c 100644
--- a/src/Storages/MergeTree/BackgroundProcessList.h
+++ b/src/Storages/MergeTree/BackgroundProcessList.h
@@ -26,6 +26,8 @@ public:
     BackgroundProcessListEntry(const BackgroundProcessListEntry &) = delete;
     BackgroundProcessListEntry & operator=(const BackgroundProcessListEntry &) = delete;
 
+    BackgroundProcessListEntry(BackgroundProcessListEntry &&) = default;
+
     BackgroundProcessListEntry(BackgroundProcessList<ListElement, Info> & list_, const typename container_t::iterator it_, const CurrentMetrics::Metric & metric)
         : list(list_), it{it_}, metric_increment{metric}
     {
@@ -58,7 +60,7 @@ protected:
 
     CurrentMetrics::Metric metric;
 
-    BackgroundProcessList(const CurrentMetrics::Metric & metric_)
+    explicit BackgroundProcessList(const CurrentMetrics::Metric & metric_)
         : metric(metric_)
     {}
 public:
@@ -85,7 +87,7 @@ public:
 
     virtual void onEntryCreate(const Entry & /* entry */) {}
     virtual void onEntryDestroy(const Entry & /* entry */) {}
-    virtual inline ~BackgroundProcessList() {}
+    virtual inline ~BackgroundProcessList() = default;
 };
 
 }
diff --git a/src/Storages/MergeTree/ColumnSizeEstimator.h b/src/Storages/MergeTree/ColumnSizeEstimator.h
new file mode 100644
index 00000000000..61c0ac64dbd
--- /dev/null
+++ b/src/Storages/MergeTree/ColumnSizeEstimator.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "Storages/MergeTree/IMergeTreeDataPart.h"
+
+
+namespace DB
+{
+
+/* Allow to compute more accurate progress statistics */
+class ColumnSizeEstimator
+{
+    using ColumnToSize = MergeTreeDataPartInMemory::ColumnToSize;
+    ColumnToSize map;
+public:
+
+    /// Stores approximate size of columns in bytes
+    /// Exact values are not required since it used for relative values estimation (progress).
+    size_t sum_total = 0;
+    size_t sum_index_columns = 0;
+    size_t sum_ordinary_columns = 0;
+
+    ColumnSizeEstimator(ColumnToSize && map_, const Names & key_columns, const Names & ordinary_columns)
+        : map(std::move(map_))
+    {
+        for (const auto & name : key_columns)
+            if (!map.count(name)) map[name] = 0;
+        for (const auto & name : ordinary_columns)
+            if (!map.count(name)) map[name] = 0;
+
+        for (const auto & name : key_columns)
+            sum_index_columns += map.at(name);
+
+        for (const auto & name : ordinary_columns)
+            sum_ordinary_columns += map.at(name);
+
+        sum_total = std::max(static_cast<decltype(sum_index_columns)>(1), sum_index_columns + sum_ordinary_columns);
+    }
+
+    Float64 columnWeight(const String & column) const
+    {
+        return static_cast<Float64>(map.at(column)) / sum_total;
+    }
+
+    Float64 keyColumnsWeight() const
+    {
+        return static_cast<Float64>(sum_index_columns) / sum_total;
+    }
+};
+}
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 9310e88db97..2683b5a6042 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -580,9 +580,8 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
         new_projection_part->is_temp = false;
         new_projection_part->setColumns(block.getNamesAndTypesList());
         MergeTreePartition partition{};
-        IMergeTreeDataPart::MinMaxIndex minmax_idx{};
         new_projection_part->partition = std::move(partition);
-        new_projection_part->minmax_idx = std::move(minmax_idx);
+        new_projection_part->minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
 
         MergedBlockOutputStream part_out(
             new_projection_part,
@@ -608,7 +607,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
     new_data_part->uuid = part_uuid;
     new_data_part->is_temp = true;
     new_data_part->setColumns(block.getNamesAndTypesList());
-    new_data_part->minmax_idx.update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+    new_data_part->minmax_idx->update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
     new_data_part->partition.create(metadata_snapshot, block, 0, context);
 
     MergedBlockOutputStream part_out(
diff --git a/src/Storages/MergeTree/FutureMergedMutatedPart.cpp b/src/Storages/MergeTree/FutureMergedMutatedPart.cpp
new file mode 100644
index 00000000000..acbdcdcf38a
--- /dev/null
+++ b/src/Storages/MergeTree/FutureMergedMutatedPart.cpp
@@ -0,0 +1,92 @@
+#include "Storages/MergeTree/FutureMergedMutatedPart.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_)
+{
+    if (parts_.empty())
+        return;
+
+    size_t sum_rows = 0;
+    size_t sum_bytes_uncompressed = 0;
+    MergeTreeDataPartType future_part_type = MergeTreeDataPartType::UNKNOWN;
+    for (const auto & part : parts_)
+    {
+        sum_rows += part->rows_count;
+        sum_bytes_uncompressed += part->getTotalColumnsSize().data_uncompressed;
+        future_part_type = std::min(future_part_type, part->getType());
+    }
+
+    auto chosen_type = parts_.front()->storage.choosePartTypeOnDisk(sum_bytes_uncompressed, sum_rows);
+    future_part_type = std::min(future_part_type, chosen_type);
+    assign(std::move(parts_), future_part_type);
+}
+
+void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type)
+{
+    if (parts_.empty())
+        return;
+
+    for (const MergeTreeData::DataPartPtr & part : parts_)
+    {
+        const MergeTreeData::DataPartPtr & first_part = parts_.front();
+
+        if (part->partition.value != first_part->partition.value)
+            throw Exception(
+                "Attempting to merge parts " + first_part->name + " and " + part->name + " that are in different partitions",
+                ErrorCodes::LOGICAL_ERROR);
+    }
+
+    parts = std::move(parts_);
+
+    UInt32 max_level = 0;
+    Int64 max_mutation = 0;
+    for (const auto & part : parts)
+    {
+        max_level = std::max(max_level, part->info.level);
+        max_mutation = std::max(max_mutation, part->info.mutation);
+    }
+
+    type = future_part_type;
+    part_info.partition_id = parts.front()->info.partition_id;
+    part_info.min_block = parts.front()->info.min_block;
+    part_info.max_block = parts.back()->info.max_block;
+    part_info.level = max_level + 1;
+    part_info.mutation = max_mutation;
+
+    if (parts.front()->storage.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
+    {
+        DayNum min_date = DayNum(std::numeric_limits<UInt16>::max());
+        DayNum max_date = DayNum(std::numeric_limits<UInt16>::min());
+        for (const auto & part : parts)
+        {
+            /// NOTE: getting min and max dates from part names (instead of part data) because we want
+            /// the merged part name be determined only by source part names.
+            /// It is simpler this way when the real min and max dates for the block range can change
+            /// (e.g. after an ALTER DELETE command).
+            DayNum part_min_date;
+            DayNum part_max_date;
+            MergeTreePartInfo::parseMinMaxDatesFromPartName(part->name, part_min_date, part_max_date);
+            min_date = std::min(min_date, part_min_date);
+            max_date = std::max(max_date, part_max_date);
+        }
+
+        name = part_info.getPartNameV0(min_date, max_date);
+    }
+    else
+        name = part_info.getPartName();
+}
+
+void FutureMergedMutatedPart::updatePath(const MergeTreeData & storage, const IReservation * reservation)
+{
+    path = storage.getFullPathOnDisk(reservation->getDisk()) + name + "/";
+}
+
+}
diff --git a/src/Storages/MergeTree/FutureMergedMutatedPart.h b/src/Storages/MergeTree/FutureMergedMutatedPart.h
new file mode 100644
index 00000000000..895f5209e74
--- /dev/null
+++ b/src/Storages/MergeTree/FutureMergedMutatedPart.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "common/types.h"
+#include "Storages/MergeTree/MergeTreeData.h"
+#include "Storages/MergeTree/MergeTreeDataPartType.h"
+#include "Storages/MergeTree/MergeTreePartInfo.h"
+#include "Storages/MergeTree/MergeType.h"
+#include "Storages/MergeTree/IMergeTreeDataPart.h"
+
+
+namespace DB
+{
+
+class MergeTreeData;
+
+/// Auxiliary struct holding metainformation for the future merged or mutated part.
+struct FutureMergedMutatedPart
+{
+    String name;
+    UUID uuid = UUIDHelpers::Nil;
+    String path;
+    MergeTreeDataPartType type;
+    MergeTreePartInfo part_info;
+    MergeTreeData::DataPartsVector parts;
+    MergeType merge_type = MergeType::REGULAR;
+
+    const MergeTreePartition & getPartition() const { return parts.front()->partition; }
+
+    FutureMergedMutatedPart() = default;
+
+    explicit FutureMergedMutatedPart(MergeTreeData::DataPartsVector parts_)
+    {
+        assign(std::move(parts_));
+    }
+
+    FutureMergedMutatedPart(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type)
+    {
+        assign(std::move(parts_), future_part_type);
+    }
+
+    void assign(MergeTreeData::DataPartsVector parts_);
+    void assign(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type);
+
+    void updatePath(const MergeTreeData & storage, const IReservation * reservation);
+};
+
+using FutureMergedMutatedPartPtr = std::shared_ptr<FutureMergedMutatedPart>;
+
+}
diff --git a/src/Storages/MergeTree/IExecutableTask.h b/src/Storages/MergeTree/IExecutableTask.h
new file mode 100644
index 00000000000..3e86d5b3201
--- /dev/null
+++ b/src/Storages/MergeTree/IExecutableTask.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <memory>
+#include <functional>
+
+#include <common/shared_ptr_helper.h>
+#include <Interpreters/StorageID.h>
+
+namespace DB
+{
+
+/**
+ * Generic interface for background operations. Simply this is self-made coroutine.
+ * The main method is executeStep, which will return true
+ * if the task wants to execute another 'step' in near future and false otherwise.
+ *
+ * Each storage assigns some operations such as merges, mutations, fetches, etc.
+ * We need to ask a storage or some another entity to try to assign another operation when current operation is completed.
+ *
+ * Each task corresponds to a storage, that's why there is a method getStorageID.
+ * This is needed to correctly shutdown a storage, e.g. we need to wait for all background operations to complete.
+ */
+class IExecutableTask
+{
+public:
+    using TaskResultCallback = std::function<void(bool)>;
+    virtual bool executeStep() = 0;
+    virtual void onCompleted() = 0;
+    virtual StorageID getStorageID() = 0;
+    virtual ~IExecutableTask() = default;
+};
+
+using ExecutableTaskPtr = std::shared_ptr<IExecutableTask>;
+
+
+/**
+ * Some background operations won't represent a coroutines (don't want to be executed step-by-step). For this we have this wrapper.
+ */
+class ExecutableLambdaAdapter : public shared_ptr_helper<ExecutableLambdaAdapter>, public IExecutableTask
+{
+public:
+
+    template <typename Job, typename Callback>
+    explicit ExecutableLambdaAdapter(
+        Job && job_to_execute_,
+        Callback && job_result_callback_,
+        StorageID id_)
+        : job_to_execute(job_to_execute_)
+        , job_result_callback(job_result_callback_)
+        , id(id_) {}
+
+    bool executeStep() override
+    {
+        res = job_to_execute();
+        job_to_execute = {};
+        return false;
+    }
+
+    void onCompleted() override { job_result_callback(!res); }
+
+    StorageID getStorageID() override { return id; }
+
+private:
+    bool res = false;
+    std::function<bool()> job_to_execute;
+    IExecutableTask::TaskResultCallback job_result_callback;
+    StorageID id;
+};
+
+
+}
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 47efec3c7ec..af807fed471 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -68,6 +68,7 @@ void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const Dis
     auto minmax_column_names = data.getMinMaxColumnsNames(partition_key);
     auto minmax_column_types = data.getMinMaxColumnsTypes(partition_key);
     size_t minmax_idx_size = minmax_column_types.size();
+
     hyperrectangle.reserve(minmax_idx_size);
     for (size_t i = 0; i < minmax_idx_size; ++i)
     {
@@ -287,6 +288,8 @@ IMergeTreeDataPart::IMergeTreeDataPart(
         state = State::Committed;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
+
+    minmax_idx = std::make_shared<MinMaxIndex>();
 }
 
 IMergeTreeDataPart::IMergeTreeDataPart(
@@ -310,6 +313,8 @@ IMergeTreeDataPart::IMergeTreeDataPart(
         state = State::Committed;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
+
+    minmax_idx = std::make_shared<MinMaxIndex>();
 }
 
 IMergeTreeDataPart::~IMergeTreeDataPart()
@@ -360,9 +365,9 @@ IMergeTreeDataPart::State IMergeTreeDataPart::getState() const
 
 std::pair<DayNum, DayNum> IMergeTreeDataPart::getMinMaxDate() const
 {
-    if (storage.minmax_idx_date_column_pos != -1 && minmax_idx.initialized)
+    if (storage.minmax_idx_date_column_pos != -1 && minmax_idx->initialized)
     {
-        const auto & hyperrectangle = minmax_idx.hyperrectangle[storage.minmax_idx_date_column_pos];
+        const auto & hyperrectangle = minmax_idx->hyperrectangle[storage.minmax_idx_date_column_pos];
         return {DayNum(hyperrectangle.left.get<UInt64>()), DayNum(hyperrectangle.right.get<UInt64>())};
     }
     else
@@ -371,9 +376,9 @@ std::pair<DayNum, DayNum> IMergeTreeDataPart::getMinMaxDate() const
 
 std::pair<time_t, time_t> IMergeTreeDataPart::getMinMaxTime() const
 {
-    if (storage.minmax_idx_time_column_pos != -1 && minmax_idx.initialized)
+    if (storage.minmax_idx_time_column_pos != -1 && minmax_idx->initialized)
     {
-        const auto & hyperrectangle = minmax_idx.hyperrectangle[storage.minmax_idx_time_column_pos];
+        const auto & hyperrectangle = minmax_idx->hyperrectangle[storage.minmax_idx_time_column_pos];
 
         /// The case of DateTime
         if (hyperrectangle.left.getType() == Field::Types::UInt64)
@@ -480,39 +485,16 @@ UInt64 IMergeTreeDataPart::getIndexSizeInAllocatedBytes() const
     return res;
 }
 
-String IMergeTreeDataPart::stateToString(IMergeTreeDataPart::State state)
-{
-    switch (state)
-    {
-        case State::Temporary:
-            return "Temporary";
-        case State::PreCommitted:
-            return "PreCommitted";
-        case State::Committed:
-            return "Committed";
-        case State::Outdated:
-            return "Outdated";
-        case State::Deleting:
-            return "Deleting";
-        case State::DeleteOnDestroy:
-            return "DeleteOnDestroy";
-    }
-
-    __builtin_unreachable();
-}
-
-String IMergeTreeDataPart::stateString() const
-{
-    return stateToString(state);
-}
-
 void IMergeTreeDataPart::assertState(const std::initializer_list<IMergeTreeDataPart::State> & affordable_states) const
 {
     if (!checkState(affordable_states))
     {
         String states_str;
         for (auto affordable_state : affordable_states)
-            states_str += stateToString(affordable_state) + " ";
+        {
+            states_str += stateString(affordable_state);
+            states_str += ' ';
+        }
 
         throw Exception("Unexpected state of part " + getNameWithState() + ". Expected: " + states_str, ErrorCodes::NOT_FOUND_EXPECTED_DATA_PART);
     }
@@ -809,7 +791,7 @@ void IMergeTreeDataPart::loadPartitionAndMinMaxIndex()
 
         const auto & date_lut = DateLUT::instance();
         partition = MergeTreePartition(date_lut.toNumYYYYMM(min_date));
-        minmax_idx = MinMaxIndex(min_date, max_date);
+        minmax_idx = std::make_shared<MinMaxIndex>(min_date, max_date);
     }
     else
     {
@@ -821,9 +803,9 @@ void IMergeTreeDataPart::loadPartitionAndMinMaxIndex()
         {
             if (parent_part)
                 // projection parts don't have minmax_idx, and it's always initialized
-                minmax_idx.initialized = true;
+                minmax_idx->initialized = true;
             else
-                minmax_idx.load(storage, volume->getDisk(), path);
+                minmax_idx->load(storage, volume->getDisk(), path);
         }
         if (parent_part)
             return;
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index f4493adf0b6..b88e19585e6 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -16,7 +16,6 @@
 
 #include <shared_mutex>
 
-
 namespace zkutil
 {
     class ZooKeeper;
@@ -221,12 +220,6 @@ public:
         DeleteOnDestroy, /// part was moved to another disk and should be deleted in own destructor
     };
 
-    static constexpr auto all_part_states =
-    {
-        State::Temporary, State::PreCommitted, State::Committed, State::Outdated, State::Deleting,
-        State::DeleteOnDestroy
-    };
-
     using TTLInfo = MergeTreeDataPartTTLInfo;
     using TTLInfos = MergeTreeDataPartTTLInfos;
 
@@ -236,14 +229,10 @@ public:
     void setState(State new_state) const;
     State getState() const;
 
-    /// Returns name of state
-    static String stateToString(State state);
-    String stateString() const;
+    static constexpr std::string_view stateString(State state) { return magic_enum::enum_name(state); }
+    constexpr std::string_view stateString() const { return stateString(state); }
 
-    String getNameWithState() const
-    {
-        return name + " (state " + stateString() + ")";
-    }
+    String getNameWithState() const { return fmt::format("{} (state {})", name, stateString()); }
 
     /// Returns true if state of part is one of affordable_states
     bool checkState(const std::initializer_list<State> & affordable_states) const
@@ -299,7 +288,9 @@ public:
         void merge(const MinMaxIndex & other);
     };
 
-    MinMaxIndex minmax_idx;
+    using MinMaxIndexPtr = std::shared_ptr<MinMaxIndex>;
+
+    MinMaxIndexPtr minmax_idx;
 
     Checksums checksums;
 
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index d659259e1a9..75eb01ed73c 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -42,8 +42,10 @@ IMergeTreeReader::IMergeTreeReader(
     , all_mark_ranges(all_mark_ranges_)
     , alter_conversions(storage.getAlterConversionsForPart(data_part))
 {
-    if (settings.convert_nested_to_subcolumns)
+    if (isWidePart(data_part))
     {
+        /// For wide parts convert plain arrays of Nested to subcolumns
+        /// to allow to use shared offset column from cache.
         columns = Nested::convertToSubcolumns(columns);
         part_columns = Nested::collect(part_columns);
     }
@@ -135,10 +137,11 @@ void IMergeTreeReader::fillMissingColumns(Columns & res_columns, bool & should_e
 
                 String offsets_name = Nested::extractTableName(name);
                 auto offset_it = offset_columns.find(offsets_name);
-                if (offset_it != offset_columns.end())
+                const auto * array_type = typeid_cast<const DataTypeArray *>(type.get());
+                if (offset_it != offset_columns.end() && array_type)
                 {
+                    const auto & nested_type = array_type->getNestedType();
                     ColumnPtr offsets_column = offset_it->second;
-                    DataTypePtr nested_type = typeid_cast<const DataTypeArray &>(*type).getNestedType();
                     size_t nested_rows = typeid_cast<const ColumnUInt64 &>(*offsets_column).getData().back();
 
                     ColumnPtr nested_column =
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.h b/src/Storages/MergeTree/IMergedBlockOutputStream.h
index b2ad5309017..0e689b7c84c 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.h
@@ -18,7 +18,7 @@ public:
 
     using WrittenOffsetColumns = std::set<std::string>;
 
-    const MergeTreeIndexGranularity & getIndexGranularity()
+    const MergeTreeIndexGranularity & getIndexGranularity() const
     {
         return writer->getIndexGranularity();
     }
@@ -45,4 +45,6 @@ protected:
     IMergeTreeDataPart::MergeTreeWriterPtr writer;
 };
 
+using IMergedBlockOutputStreamPtr = std::shared_ptr<IMergedBlockOutputStream>;
+
 }
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 425860509be..d53faf144f9 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -1299,34 +1299,48 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context,
                 }
             }
 
+            key_expr_type = recursiveRemoveLowCardinality(key_expr_type);
+            DataTypePtr key_expr_type_not_null;
+            bool key_expr_type_is_nullable = false;
+            if (const auto * nullable_type = typeid_cast<const DataTypeNullable *>(key_expr_type.get()))
+            {
+                key_expr_type_is_nullable = true;
+                key_expr_type_not_null = nullable_type->getNestedType();
+            }
+            else
+                key_expr_type_not_null = key_expr_type;
+
             bool cast_not_needed = is_set_const /// Set args are already casted inside Set::createFromAST
-                || ((isNativeNumber(key_expr_type) || isDateTime(key_expr_type))
+                || ((isNativeNumber(key_expr_type_not_null) || isDateTime(key_expr_type_not_null))
                     && (isNativeNumber(const_type) || isDateTime(const_type))); /// Numbers and DateTime are accurately compared without cast.
 
-            if (!cast_not_needed && !key_expr_type->equals(*const_type))
+            if (!cast_not_needed && !key_expr_type_not_null->equals(*const_type))
             {
                 if (const_value.getType() == Field::Types::String)
                 {
-                    const_value = convertFieldToType(const_value, *key_expr_type);
+                    const_value = convertFieldToType(const_value, *key_expr_type_not_null);
                     if (const_value.isNull())
                         return false;
                     // No need to set is_constant_transformed because we're doing exact conversion
                 }
                 else
                 {
-                    DataTypePtr common_type = getLeastSupertype({key_expr_type, const_type});
+                    DataTypePtr common_type = getLeastSupertype({key_expr_type_not_null, const_type});
                     if (!const_type->equals(*common_type))
                     {
                         castValueToType(common_type, const_value, const_type, node);
 
                         // Need to set is_constant_transformed unless we're doing exact conversion
-                        if (!key_expr_type->equals(*common_type))
+                        if (!key_expr_type_not_null->equals(*common_type))
                             is_constant_transformed = true;
                     }
-                    if (!key_expr_type->equals(*common_type))
+                    if (!key_expr_type_not_null->equals(*common_type))
                     {
+                        auto common_type_maybe_nullable
+                            = key_expr_type_is_nullable ? DataTypePtr(std::make_shared<DataTypeNullable>(common_type)) : common_type;
                         ColumnsWithTypeAndName arguments{
-                            {nullptr, key_expr_type, ""}, {DataTypeString().createColumnConst(1, common_type->getName()), common_type, ""}};
+                            {nullptr, key_expr_type, ""},
+                            {DataTypeString().createColumnConst(1, common_type_maybe_nullable->getName()), common_type_maybe_nullable, ""}};
                         FunctionOverloadResolverPtr func_builder_cast = CastInternalOverloadResolver<CastType::nonAccurate>::createImpl();
                         auto func_cast = func_builder_cast->build(arguments);
 
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
new file mode 100644
index 00000000000..d9d691ab2e7
--- /dev/null
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
@@ -0,0 +1,277 @@
+#include <Storages/MergeTree/MergeFromLogEntryTask.h>
+
+#include <common/logger_useful.h>
+#include <Common/ProfileEvents.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+
+namespace ProfileEvents
+{
+    extern const Event DataAfterMergeDiffersFromReplica;
+    extern const Event ReplicatedPartMerges;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_DATA_PART_NAME;
+    extern const int LOGICAL_ERROR;
+}
+
+
+std::pair<bool, ReplicatedMergeMutateTaskBase::PartLogWriter> MergeFromLogEntryTask::prepare()
+{
+    LOG_TRACE(log, "Executing log entry to merge parts {} to {}",
+        fmt::join(entry.source_parts, ", "), entry.new_part_name);
+
+    const auto storage_settings_ptr = storage.getSettings();
+
+    if (storage_settings_ptr->always_fetch_merged_part)
+    {
+        LOG_INFO(log, "Will fetch part {} because setting 'always_fetch_merged_part' is true", entry.new_part_name);
+        return {false, {}};
+    }
+
+    if (entry.merge_type == MergeType::TTL_RECOMPRESS &&
+        (time(nullptr) - entry.create_time) <= storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds() &&
+        entry.source_replica != storage.replica_name)
+    {
+        LOG_INFO(log, "Will try to fetch part {} until '{}' because this part assigned to recompression merge. "
+            "Source replica {} will try to merge this part first", entry.new_part_name,
+            DateLUT::instance().timeToString(entry.create_time + storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds()), entry.source_replica);
+        return {false, {}};
+    }
+
+    /// In some use cases merging can be more expensive than fetching
+    /// and it may be better to spread merges tasks across the replicas
+    /// instead of doing exactly the same merge cluster-wise
+    std::optional<String> replica_to_execute_merge;
+    bool replica_to_execute_merge_picked = false;
+
+    if (storage.merge_strategy_picker.shouldMergeOnSingleReplica(entry))
+    {
+        replica_to_execute_merge = storage.merge_strategy_picker.pickReplicaToExecuteMerge(entry);
+        replica_to_execute_merge_picked = true;
+
+        if (replica_to_execute_merge)
+        {
+            LOG_DEBUG(log,
+                "Prefer fetching part {} from replica {} due to execute_merges_on_single_replica_time_threshold",
+                entry.new_part_name, replica_to_execute_merge.value());
+
+            return {false, {}};
+        }
+    }
+
+
+    for (const String & source_part_name : entry.source_parts)
+    {
+        MergeTreeData::DataPartPtr source_part_or_covering = storage.getActiveContainingPart(source_part_name);
+
+        if (!source_part_or_covering)
+        {
+            /// We do not have one of source parts locally, try to take some already merged part from someone.
+            LOG_DEBUG(log, "Don't have all parts for merge {}; will try to fetch it instead", entry.new_part_name);
+            return {false, {}};
+        }
+
+        if (source_part_or_covering->name != source_part_name)
+        {
+            /// We do not have source part locally, but we have some covering part. Possible options:
+            /// 1. We already have merged part (source_part_or_covering->name == new_part_name)
+            /// 2. We have some larger merged part which covers new_part_name (and therefore it covers source_part_name too)
+            /// 3. We have two intersecting parts, both cover source_part_name. It's logical error.
+            /// TODO Why 1 and 2 can happen? Do we need more assertions here or somewhere else?
+            constexpr const char * message = "Part {} is covered by {} but should be merged into {}. This shouldn't happen often.";
+            LOG_WARNING(log, message, source_part_name, source_part_or_covering->name, entry.new_part_name);
+            if (!source_part_or_covering->info.contains(MergeTreePartInfo::fromPartName(entry.new_part_name, storage.format_version)))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, message, source_part_name, source_part_or_covering->name, entry.new_part_name);
+            return {false, {}};
+        }
+
+        parts.push_back(source_part_or_covering);
+    }
+
+    /// All source parts are found locally, we can execute merge
+
+    if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr))
+    {
+        /// If entry is old enough, and have enough size, and part are exists in any replica,
+        ///  then prefer fetching of merged part from replica.
+
+        size_t sum_parts_bytes_on_disk = 0;
+        for (const auto & item : parts)
+            sum_parts_bytes_on_disk += item->getBytesOnDisk();
+
+        if (sum_parts_bytes_on_disk >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
+        {
+            String replica = storage.findReplicaHavingPart(entry.new_part_name, true);    /// NOTE excessive ZK requests for same data later, may remove.
+            if (!replica.empty())
+            {
+                LOG_DEBUG(log, "Prefer to fetch {} from replica {}", entry.new_part_name, replica);
+                return {false, {}};
+            }
+        }
+    }
+
+    /// Start to make the main work
+    size_t estimated_space_for_merge = MergeTreeDataMergerMutator::estimateNeededDiskSpace(parts);
+
+    /// Can throw an exception while reserving space.
+    IMergeTreeDataPart::TTLInfos ttl_infos;
+    size_t max_volume_index = 0;
+    for (auto & part_ptr : parts)
+    {
+        ttl_infos.update(part_ptr->ttl_infos);
+        max_volume_index = std::max(max_volume_index, storage.getStoragePolicy()->getVolumeIndexByDisk(part_ptr->volume->getDisk()));
+    }
+
+    /// It will live until the whole task is being destroyed
+    table_lock_holder = storage.lockForShare(RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
+
+    StorageMetadataPtr metadata_snapshot = storage.getInMemoryMetadataPtr();
+
+    auto future_merged_part = std::make_shared<FutureMergedMutatedPart>(parts, entry.new_part_type);
+    if (future_merged_part->name != entry.new_part_name)
+    {
+        throw Exception("Future merged part name " + backQuote(future_merged_part->name) + " differs from part name in log entry: "
+            + backQuote(entry.new_part_name), ErrorCodes::BAD_DATA_PART_NAME);
+    }
+
+    std::optional<CurrentlySubmergingEmergingTagger> tagger;
+    ReservationSharedPtr reserved_space = storage.balancedReservation(
+        metadata_snapshot,
+        estimated_space_for_merge,
+        max_volume_index,
+        future_merged_part->name,
+        future_merged_part->part_info,
+        future_merged_part->parts,
+        &tagger,
+        &ttl_infos);
+
+    if (!reserved_space)
+        reserved_space = storage.reserveSpacePreferringTTLRules(
+            metadata_snapshot, estimated_space_for_merge, ttl_infos, time(nullptr), max_volume_index);
+
+    future_merged_part->uuid = entry.new_part_uuid;
+    future_merged_part->updatePath(storage, reserved_space.get());
+    future_merged_part->merge_type = entry.merge_type;
+
+    if (storage_settings_ptr->allow_remote_fs_zero_copy_replication)
+    {
+        if (auto disk = reserved_space->getDisk(); disk->getType() == DB::DiskType::S3)
+        {
+            if (storage.merge_strategy_picker.shouldMergeOnSingleReplicaShared(entry))
+            {
+                if (!replica_to_execute_merge_picked)
+                    replica_to_execute_merge = storage.merge_strategy_picker.pickReplicaToExecuteMerge(entry);
+
+                if (replica_to_execute_merge)
+                {
+                    LOG_DEBUG(log,
+                        "Prefer fetching part {} from replica {} due s3_execute_merges_on_single_replica_time_threshold",
+                        entry.new_part_name, replica_to_execute_merge.value());
+                    return {false, {}};
+                }
+            }
+        }
+    }
+
+    /// Account TTL merge
+    if (isTTLMergeType(future_merged_part->merge_type))
+        storage.getContext()->getMergeList().bookMergeWithTTL();
+
+    auto table_id = storage.getStorageID();
+
+    /// Add merge to list
+    merge_mutate_entry = storage.getContext()->getMergeList().insert(storage.getStorageID(), future_merged_part);
+
+    transaction_ptr = std::make_unique<MergeTreeData::Transaction>(storage);
+    stopwatch_ptr = std::make_unique<Stopwatch>();
+
+    merge_task = storage.merger_mutator.mergePartsToTemporaryPart(
+            future_merged_part,
+            metadata_snapshot,
+            merge_mutate_entry.get(),
+            table_lock_holder,
+            entry.create_time,
+            storage.getContext(),
+            reserved_space,
+            entry.deduplicate,
+            entry.deduplicate_by_columns,
+            storage.merging_params);
+
+    return {true, [this, stopwatch = *stopwatch_ptr] (const ExecutionStatus & execution_status)
+    {
+        storage.writePartLog(
+            PartLogElement::MERGE_PARTS, execution_status, stopwatch.elapsed(),
+            entry.new_part_name, part, parts, merge_mutate_entry.get());
+    }};
+}
+
+
+bool MergeFromLogEntryTask::finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log)
+{
+    part = merge_task->getFuture().get();
+
+    /// Task is not needed
+    merge_task.reset();
+
+    storage.merger_mutator.renameMergedTemporaryPart(part, parts, transaction_ptr.get());
+
+    try
+    {
+        storage.checkPartChecksumsAndCommit(*transaction_ptr, part);
+    }
+    catch (const Exception & e)
+    {
+        if (MergeTreeDataPartChecksums::isBadChecksumsErrorCode(e.code()))
+        {
+            transaction_ptr->rollback();
+
+            ProfileEvents::increment(ProfileEvents::DataAfterMergeDiffersFromReplica);
+
+            LOG_ERROR(log,
+                "{}. Data after merge is not byte-identical to data on another replicas. There could be several"
+                " reasons: 1. Using newer version of compression library after server update. 2. Using another"
+                " compression method. 3. Non-deterministic compression algorithm (highly unlikely). 4."
+                " Non-deterministic merge algorithm due to logical error in code. 5. Data corruption in memory due"
+                " to bug in code. 6. Data corruption in memory due to hardware issue. 7. Manual modification of"
+                " source data after server startup. 8. Manual modification of checksums stored in ZooKeeper. 9."
+                " Part format related settings like 'enable_mixed_granularity_parts' are different on different"
+                " replicas. We will download merged part from replica to force byte-identical result.",
+                getCurrentExceptionMessage(false));
+
+            write_part_log(ExecutionStatus::fromCurrentException());
+
+            if (storage.getSettings()->detach_not_byte_identical_parts)
+                storage.forgetPartAndMoveToDetached(std::move(part), "merge-not-byte-identical");
+            else
+                storage.tryRemovePartImmediately(std::move(part));
+
+            /// No need to delete the part from ZK because we can be sure that the commit transaction
+            /// didn't go through.
+
+            return false;
+        }
+
+        throw;
+    }
+
+    /** Removing old parts from ZK and from the disk is delayed - see ReplicatedMergeTreeCleanupThread, clearOldParts.
+     */
+
+    /** With `ZSESSIONEXPIRED` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
+     * This is not a problem, because in this case the merge will remain in the queue, and we will try again.
+     */
+    storage.merge_selecting_task->schedule();
+    ProfileEvents::increment(ProfileEvents::ReplicatedPartMerges);
+
+    write_part_log({});
+
+    return true;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.h b/src/Storages/MergeTree/MergeFromLogEntryTask.h
new file mode 100644
index 00000000000..77bb8b4cbc6
--- /dev/null
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeTask.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
+#include <Storages/MergeTree/ReplicatedMergeMutateTaskBase.h>
+
+
+namespace DB
+{
+
+class MergeFromLogEntryTask : public shared_ptr_helper<MergeFromLogEntryTask>, public ReplicatedMergeMutateTaskBase
+{
+public:
+    template <class Callback>
+    MergeFromLogEntryTask(ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry_, StorageReplicatedMergeTree & storage_, Callback && task_result_callback_)
+        : ReplicatedMergeMutateTaskBase(&Poco::Logger::get("MergeFromLogEntryTask"), storage_, selected_entry_, task_result_callback_) {}
+
+protected:
+    /// Both return false if we can't execute merge.
+    std::pair<bool, ReplicatedMergeMutateTaskBase::PartLogWriter> prepare() override;
+    bool finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log) override;
+
+    bool executeInnerTask() override
+    {
+        return merge_task->execute();
+    }
+
+private:
+    TableLockHolder table_lock_holder{nullptr};
+
+    MergeTreeData::DataPartsVector parts;
+    MergeTreeData::TransactionUniquePtr transaction_ptr{nullptr};
+
+    StopwatchUniquePtr stopwatch_ptr{nullptr};
+    MergeTreeData::MutableDataPartPtr part;
+
+    MergeTaskPtr merge_task;
+};
+
+
+using MergeFromLogEntryTaskPtr = std::shared_ptr<MergeFromLogEntryTask>;
+
+
+}
diff --git a/src/Storages/MergeTree/MergeList.cpp b/src/Storages/MergeTree/MergeList.cpp
index 24beb0cc06f..23851825b92 100644
--- a/src/Storages/MergeTree/MergeList.cpp
+++ b/src/Storages/MergeTree/MergeList.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
 #include <Common/CurrentMetrics.h>
 #include <common/getThreadId.h>
 #include <Common/CurrentThread.h>
@@ -8,34 +9,10 @@
 namespace DB
 {
 
-MergeListElement::MergeListElement(const StorageID & table_id_, const FutureMergedMutatedPart & future_part)
-    : table_id{table_id_}
-    , partition_id{future_part.part_info.partition_id}
-    , result_part_name{future_part.name}
-    , result_part_path{future_part.path}
-    , result_part_info{future_part.part_info}
-    , num_parts{future_part.parts.size()}
-    , thread_id{getThreadId()}
-    , merge_type{future_part.merge_type}
-    , merge_algorithm{MergeAlgorithm::Undecided}
+
+MemoryTrackerThreadSwitcher::MemoryTrackerThreadSwitcher(MemoryTracker * memory_tracker_ptr)
 {
-    for (const auto & source_part : future_part.parts)
-    {
-        source_part_names.emplace_back(source_part->name);
-        source_part_paths.emplace_back(source_part->getFullPath());
-
-        total_size_bytes_compressed += source_part->getBytesOnDisk();
-        total_size_marks += source_part->getMarksCount();
-        total_rows_count += source_part->index_granularity.getTotalRows();
-    }
-
-    if (!future_part.parts.empty())
-    {
-        source_data_version = future_part.parts[0]->info.getDataVersion();
-        is_mutation = (result_part_info.getDataVersion() != source_data_version);
-    }
-
-    /// Each merge is executed into separate background processing pool thread
+    // Each merge is executed into separate background processing pool thread
     background_thread_memory_tracker = CurrentThread::getMemoryTracker();
     if (background_thread_memory_tracker)
     {
@@ -52,7 +29,44 @@ MergeListElement::MergeListElement(const StorageID & table_id_, const FutureMerg
         }
 
         background_thread_memory_tracker_prev_parent = background_thread_memory_tracker->getParent();
-        background_thread_memory_tracker->setParent(&memory_tracker);
+        background_thread_memory_tracker->setParent(memory_tracker_ptr);
+    }
+}
+
+
+MemoryTrackerThreadSwitcher::~MemoryTrackerThreadSwitcher()
+{
+    // Unplug memory_tracker from current background processing pool thread
+
+    if (background_thread_memory_tracker)
+        background_thread_memory_tracker->setParent(background_thread_memory_tracker_prev_parent);
+}
+
+MergeListElement::MergeListElement(const StorageID & table_id_, FutureMergedMutatedPartPtr future_part)
+    : table_id{table_id_}
+    , partition_id{future_part->part_info.partition_id}
+    , result_part_name{future_part->name}
+    , result_part_path{future_part->path}
+    , result_part_info{future_part->part_info}
+    , num_parts{future_part->parts.size()}
+    , thread_id{getThreadId()}
+    , merge_type{future_part->merge_type}
+    , merge_algorithm{MergeAlgorithm::Undecided}
+{
+    for (const auto & source_part : future_part->parts)
+    {
+        source_part_names.emplace_back(source_part->name);
+        source_part_paths.emplace_back(source_part->getFullPath());
+
+        total_size_bytes_compressed += source_part->getBytesOnDisk();
+        total_size_marks += source_part->getMarksCount();
+        total_rows_count += source_part->index_granularity.getTotalRows();
+    }
+
+    if (!future_part->parts.empty())
+    {
+        source_data_version = future_part->parts[0]->info.getDataVersion();
+        is_mutation = (result_part_info.getDataVersion() != source_data_version);
     }
 }
 
@@ -90,11 +104,7 @@ MergeInfo MergeListElement::getInfo() const
     return res;
 }
 
-MergeListElement::~MergeListElement()
-{
-    /// Unplug memory_tracker from current background processing pool thread
-    if (background_thread_memory_tracker)
-        background_thread_memory_tracker->setParent(background_thread_memory_tracker_prev_parent);
-}
+MergeListElement::~MergeListElement() = default;
+
 
 }
diff --git a/src/Storages/MergeTree/MergeList.h b/src/Storages/MergeTree/MergeList.h
index 9762e616e7b..bab4420de83 100644
--- a/src/Storages/MergeTree/MergeList.h
+++ b/src/Storages/MergeTree/MergeList.h
@@ -53,6 +53,23 @@ struct MergeInfo
 };
 
 struct FutureMergedMutatedPart;
+using FutureMergedMutatedPartPtr = std::shared_ptr<FutureMergedMutatedPart>;
+
+/**
+ * Since merge is executed with multiple threads, this class
+ * switches the parent MemoryTracker to account all the memory used.
+ */
+class MemoryTrackerThreadSwitcher : boost::noncopyable
+{
+public:
+    explicit MemoryTrackerThreadSwitcher(MemoryTracker * memory_tracker_ptr);
+    ~MemoryTrackerThreadSwitcher();
+private:
+    MemoryTracker * background_thread_memory_tracker;
+    MemoryTracker * background_thread_memory_tracker_prev_parent = nullptr;
+};
+
+using MemoryTrackerThreadSwitcherPtr = std::unique_ptr<MemoryTrackerThreadSwitcher>;
 
 struct MergeListElement : boost::noncopyable
 {
@@ -87,15 +104,13 @@ struct MergeListElement : boost::noncopyable
     std::atomic<UInt64> columns_written{};
 
     MemoryTracker memory_tracker{VariableContext::Process};
-    MemoryTracker * background_thread_memory_tracker;
-    MemoryTracker * background_thread_memory_tracker_prev_parent = nullptr;
 
     UInt64 thread_id;
     MergeType merge_type;
     /// Detected after merge already started
     std::atomic<MergeAlgorithm> merge_algorithm;
 
-    MergeListElement(const StorageID & table_id_, const FutureMergedMutatedPart & future_part);
+    MergeListElement(const StorageID & table_id_, FutureMergedMutatedPartPtr future_part);
 
     MergeInfo getInfo() const;
 
diff --git a/src/Storages/MergeTree/MergeMutateSelectedEntry.h b/src/Storages/MergeTree/MergeMutateSelectedEntry.h
new file mode 100644
index 00000000000..64136205157
--- /dev/null
+++ b/src/Storages/MergeTree/MergeMutateSelectedEntry.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MutationCommands.h>
+
+namespace DB
+{
+
+class StorageMergeTree;
+
+struct StorageInMemoryMetadata;
+using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
+struct FutureMergedMutatedPart;
+using FutureMergedMutatedPartPtr = std::shared_ptr<FutureMergedMutatedPart>;
+
+
+struct CurrentlyMergingPartsTagger
+{
+    FutureMergedMutatedPartPtr future_part;
+    ReservationSharedPtr reserved_space;
+    StorageMergeTree & storage;
+    // Optional tagger to maintain volatile parts for the JBOD balancer
+    std::optional<CurrentlySubmergingEmergingTagger> tagger;
+
+    CurrentlyMergingPartsTagger(
+        FutureMergedMutatedPartPtr future_part_,
+        size_t total_size,
+        StorageMergeTree & storage_,
+        const StorageMetadataPtr & metadata_snapshot,
+        bool is_mutation);
+
+    ~CurrentlyMergingPartsTagger();
+};
+
+using CurrentlyMergingPartsTaggerPtr = std::unique_ptr<CurrentlyMergingPartsTagger>;
+
+struct MergeMutateSelectedEntry
+{
+    FutureMergedMutatedPartPtr future_part;
+    CurrentlyMergingPartsTaggerPtr tagger;
+    MutationCommandsConstPtr commands;
+    MergeMutateSelectedEntry(FutureMergedMutatedPartPtr future_part_, CurrentlyMergingPartsTaggerPtr tagger_, MutationCommandsConstPtr commands_)
+        : future_part(future_part_)
+        , tagger(std::move(tagger_))
+        , commands(commands_)
+    {}
+};
+
+using MergeMutateSelectedEntryPtr = std::shared_ptr<MergeMutateSelectedEntry>;
+
+}
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
new file mode 100644
index 00000000000..e8770fdc76e
--- /dev/null
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
@@ -0,0 +1,115 @@
+#include <Storages/MergeTree/MergePlainMergeTreeTask.h>
+
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/StorageMergeTree.h>
+#include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
+StorageID MergePlainMergeTreeTask::getStorageID()
+{
+    return storage.getStorageID();
+}
+
+void MergePlainMergeTreeTask::onCompleted()
+{
+    bool delay = state == State::SUCCESS;
+    task_result_callback(delay);
+}
+
+
+bool MergePlainMergeTreeTask::executeStep()
+{
+    /// Make out memory tracker a parent of current thread memory tracker
+    MemoryTrackerThreadSwitcherPtr switcher;
+    if (merge_list_entry)
+        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(&(*merge_list_entry)->memory_tracker);
+
+    switch (state)
+    {
+        case State::NEED_PREPARE :
+        {
+            prepare();
+            state = State::NEED_EXECUTE;
+            return true;
+        }
+        case State::NEED_EXECUTE :
+        {
+            try
+            {
+                if (merge_task->execute())
+                    return true;
+
+                state = State::NEED_FINISH;
+                return true;
+            }
+            catch (...)
+            {
+                write_part_log(ExecutionStatus::fromCurrentException());
+                throw;
+            }
+        }
+        case State::NEED_FINISH :
+        {
+            finish();
+
+            state = State::SUCCESS;
+            return false;
+        }
+        case State::SUCCESS:
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Task with state SUCCESS mustn't be executed again");
+        }
+    }
+    return false;
+}
+
+
+void MergePlainMergeTreeTask::prepare()
+{
+    future_part = merge_mutate_entry->future_part;
+    stopwatch_ptr = std::make_unique<Stopwatch>();
+
+    merge_list_entry = storage.getContext()->getMergeList().insert(storage.getStorageID(), future_part);
+
+    write_part_log = [this] (const ExecutionStatus & execution_status)
+    {
+        storage.writePartLog(
+            PartLogElement::MERGE_PARTS,
+            execution_status,
+            stopwatch_ptr->elapsed(),
+            future_part->name,
+            new_part,
+            future_part->parts,
+            merge_list_entry.get());
+    };
+
+    merge_task = storage.merger_mutator.mergePartsToTemporaryPart(
+            future_part,
+            metadata_snapshot,
+            merge_list_entry.get(),
+            table_lock_holder,
+            time(nullptr),
+            storage.getContext(),
+            merge_mutate_entry->tagger->reserved_space,
+            deduplicate,
+            deduplicate_by_columns,
+            storage.merging_params);
+}
+
+
+void MergePlainMergeTreeTask::finish()
+{
+    new_part = merge_task->getFuture().get();
+    storage.merger_mutator.renameMergedTemporaryPart(new_part, future_part->parts, nullptr);
+    write_part_log({});
+}
+
+}
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.h b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
new file mode 100644
index 00000000000..f199557684c
--- /dev/null
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
@@ -0,0 +1,88 @@
+#pragma once
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeTask.h>
+#include <Storages/MutationCommands.h>
+#include <Storages/MergeTree/MergeMutateSelectedEntry.h>
+
+namespace DB
+{
+
+class StorageMergeTree;
+
+class MergePlainMergeTreeTask : public IExecutableTask
+{
+public:
+    template <class Callback>
+    MergePlainMergeTreeTask(
+        StorageMergeTree & storage_,
+        StorageMetadataPtr metadata_snapshot_,
+        bool deduplicate_,
+        Names deduplicate_by_columns_,
+        MergeMutateSelectedEntryPtr merge_mutate_entry_,
+        TableLockHolder table_lock_holder_,
+        Callback && task_result_callback_)
+        : storage(storage_)
+        , metadata_snapshot(metadata_snapshot_)
+        , deduplicate(deduplicate_)
+        , deduplicate_by_columns(deduplicate_by_columns_)
+        , merge_mutate_entry(merge_mutate_entry_)
+        , table_lock_holder(table_lock_holder_)
+        , task_result_callback(task_result_callback_) {}
+
+    bool executeStep() override;
+
+    void onCompleted() override;
+
+    StorageID getStorageID() override;
+
+private:
+
+    void prepare();
+    void finish();
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE,
+        NEED_FINISH,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+
+    StorageMergeTree & storage;
+
+    StorageMetadataPtr metadata_snapshot;
+    bool deduplicate;
+    Names deduplicate_by_columns;
+    std::shared_ptr<MergeMutateSelectedEntry> merge_mutate_entry{nullptr};
+
+    TableLockHolder table_lock_holder;
+
+    FutureMergedMutatedPartPtr future_part{nullptr};
+    MergeTreeData::MutableDataPartPtr new_part;
+    std::unique_ptr<Stopwatch> stopwatch_ptr{nullptr};
+
+    using MergeListEntryPtr = std::unique_ptr<MergeListEntry>;
+    MergeListEntryPtr merge_list_entry;
+
+    std::function<void(const ExecutionStatus &)> write_part_log;
+
+    IExecutableTask::TaskResultCallback task_result_callback;
+
+    MergeTaskPtr merge_task{nullptr};
+};
+
+
+using MergePlainMergeTreeTaskPtr = std::shared_ptr<MergePlainMergeTreeTask>;
+
+
+[[ maybe_unused ]] static void executeHere(MergePlainMergeTreeTaskPtr task)
+{
+    while (task->executeStep()) {}
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MergeProgress.h b/src/Storages/MergeTree/MergeProgress.h
new file mode 100644
index 00000000000..2862a934411
--- /dev/null
+++ b/src/Storages/MergeTree/MergeProgress.h
@@ -0,0 +1,94 @@
+#pragma once
+
+#include "common/types.h"
+#include "Common/ProfileEvents.h"
+#include "IO/Progress.h"
+#include "Storages/MergeTree/MergeList.h"
+
+namespace ProfileEvents
+{
+    extern const Event MergesTimeMilliseconds;
+    extern const Event MergedUncompressedBytes;
+    extern const Event MergedRows;
+    extern const Event Merge;
+}
+
+namespace DB
+{
+
+/** Progress callback.
+  * What it should update:
+  * - approximate progress
+  * - amount of read rows
+  * - various metrics
+  * - time elapsed for current merge.
+  */
+
+/// Auxiliary struct that for each merge stage stores its current progress.
+/// A stage is: the horizontal stage + a stage for each gathered column (if we are doing a
+/// Vertical merge) or a mutation of a single part. During a single stage all rows are read.
+struct MergeStageProgress
+{
+    explicit MergeStageProgress(Float64 weight_)
+        : is_first(true) , weight(weight_) {}
+
+    MergeStageProgress(Float64 initial_progress_, Float64 weight_)
+        : initial_progress(initial_progress_), is_first(false), weight(weight_) {}
+
+    Float64 initial_progress = 0.0;
+    bool is_first;
+    Float64 weight;
+
+    UInt64 total_rows = 0;
+    UInt64 rows_read = 0;
+};
+
+class MergeProgressCallback
+{
+public:
+    MergeProgressCallback(
+        MergeList::Entry & merge_entry_, UInt64 & watch_prev_elapsed_, MergeStageProgress & stage_)
+        : merge_entry(merge_entry_)
+        , watch_prev_elapsed(watch_prev_elapsed_)
+        , stage(stage_)
+    {
+        updateWatch();
+    }
+
+    MergeList::Entry & merge_entry;
+    UInt64 & watch_prev_elapsed;
+    MergeStageProgress & stage;
+
+    void updateWatch()
+    {
+        UInt64 watch_curr_elapsed = merge_entry->watch.elapsed();
+        ProfileEvents::increment(ProfileEvents::MergesTimeMilliseconds, (watch_curr_elapsed - watch_prev_elapsed) / 1000000);
+        watch_prev_elapsed = watch_curr_elapsed;
+    }
+
+    void operator() (const Progress & value)
+    {
+        ProfileEvents::increment(ProfileEvents::MergedUncompressedBytes, value.read_bytes);
+        if (stage.is_first)
+        {
+            ProfileEvents::increment(ProfileEvents::MergedRows, value.read_rows);
+            ProfileEvents::increment(ProfileEvents::Merge);
+        }
+        updateWatch();
+
+        merge_entry->bytes_read_uncompressed += value.read_bytes;
+        if (stage.is_first)
+            merge_entry->rows_read += value.read_rows;
+
+        stage.total_rows += value.total_rows_to_read;
+        stage.rows_read += value.read_rows;
+        if (stage.total_rows > 0)
+        {
+            merge_entry->progress.store(
+                stage.initial_progress + stage.weight * stage.rows_read / stage.total_rows,
+                std::memory_order_relaxed);
+        }
+    }
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
new file mode 100644
index 00000000000..855198f697e
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -0,0 +1,857 @@
+#include "Storages/MergeTree/MergeTask.h"
+
+#include <memory>
+#include <fmt/format.h>
+
+#include <common/logger_useful.h>
+#include "Common/ActionBlocker.h"
+
+#include "Storages/MergeTree/MergeTreeData.h"
+#include "Storages/MergeTree/IMergeTreeDataPart.h"
+#include "Storages/MergeTree/MergeTreeSequentialSource.h"
+#include "Storages/MergeTree/FutureMergedMutatedPart.h"
+#include "Processors/Transforms/ExpressionTransform.h"
+#include "Processors/Merges/MergingSortedTransform.h"
+#include "Processors/Merges/CollapsingSortedTransform.h"
+#include "Processors/Merges/SummingSortedTransform.h"
+#include "Processors/Merges/ReplacingSortedTransform.h"
+#include "Processors/Merges/GraphiteRollupSortedTransform.h"
+#include "Processors/Merges/AggregatingSortedTransform.h"
+#include "Processors/Merges/VersionedCollapsingTransform.h"
+#include "Processors/Executors/PipelineExecutingBlockInputStream.h"
+#include "DataStreams/DistinctSortedBlockInputStream.h"
+#include "DataStreams/TTLBlockInputStream.h"
+#include <DataStreams/TTLCalcInputStream.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/MaterializingBlockInputStream.h>
+#include <DataStreams/DistinctSortedBlockInputStream.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ABORTED;
+    extern const int DIRECTORY_ALREADY_EXISTS;
+    extern const int LOGICAL_ERROR;
+}
+
+
+/// PK columns are sorted and merged, ordinary columns are gathered using info from merge step
+static void extractMergingAndGatheringColumns(
+    const NamesAndTypesList & storage_columns,
+    const ExpressionActionsPtr & sorting_key_expr,
+    const IndicesDescription & indexes,
+    const MergeTreeData::MergingParams & merging_params,
+    NamesAndTypesList & gathering_columns, Names & gathering_column_names,
+    NamesAndTypesList & merging_columns, Names & merging_column_names)
+{
+    Names sort_key_columns_vec = sorting_key_expr->getRequiredColumns();
+    std::set<String> key_columns(sort_key_columns_vec.cbegin(), sort_key_columns_vec.cend());
+    for (const auto & index : indexes)
+    {
+        Names index_columns_vec = index.expression->getRequiredColumns();
+        std::copy(index_columns_vec.cbegin(), index_columns_vec.cend(),
+                  std::inserter(key_columns, key_columns.end()));
+    }
+
+    /// Force sign column for Collapsing mode
+    if (merging_params.mode == MergeTreeData::MergingParams::Collapsing)
+        key_columns.emplace(merging_params.sign_column);
+
+    /// Force version column for Replacing mode
+    if (merging_params.mode == MergeTreeData::MergingParams::Replacing)
+        key_columns.emplace(merging_params.version_column);
+
+    /// Force sign column for VersionedCollapsing mode. Version is already in primary key.
+    if (merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing)
+        key_columns.emplace(merging_params.sign_column);
+
+    /// Force to merge at least one column in case of empty key
+    if (key_columns.empty())
+        key_columns.emplace(storage_columns.front().name);
+
+    /// TODO: also force "summing" and "aggregating" columns to make Horizontal merge only for such columns
+
+    for (const auto & column : storage_columns)
+    {
+        if (key_columns.count(column.name))
+        {
+            merging_columns.emplace_back(column);
+            merging_column_names.emplace_back(column.name);
+        }
+        else
+        {
+            gathering_columns.emplace_back(column);
+            gathering_column_names.emplace_back(column.name);
+        }
+    }
+}
+
+
+bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
+{
+    const String local_tmp_prefix = global_ctx->parent_part ? ctx->prefix : "tmp_merge_";
+
+    if (global_ctx->merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
+
+    /// We don't want to perform merge assigned with TTL as normal merge, so
+    /// throw exception
+    if (isTTLMergeType(global_ctx->future_part->merge_type) && global_ctx->ttl_merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts with TTL", ErrorCodes::ABORTED);
+
+    LOG_DEBUG(ctx->log, "Merging {} parts: from {} to {} into {}",
+        global_ctx->future_part->parts.size(),
+        global_ctx->future_part->parts.front()->name,
+        global_ctx->future_part->parts.back()->name,
+        global_ctx->future_part->type.toString());
+
+    if (global_ctx->deduplicate)
+    {
+        if (global_ctx->deduplicate_by_columns.empty())
+            LOG_DEBUG(ctx->log, "DEDUPLICATE BY all columns");
+        else
+            LOG_DEBUG(ctx->log, "DEDUPLICATE BY ('{}')", fmt::join(global_ctx->deduplicate_by_columns, "', '"));
+    }
+
+    ctx->disk = global_ctx->space_reservation->getDisk();
+    auto local_new_part_tmp_path = global_ctx->data->relative_data_path + local_tmp_prefix + global_ctx->future_part->name + (global_ctx->parent_part ? ".proj" : "") + "/";
+    if (ctx->disk->exists(local_new_part_tmp_path))
+        throw Exception("Directory " + fullPath(ctx->disk, local_new_part_tmp_path) + " already exists", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
+
+    global_ctx->all_column_names = global_ctx->metadata_snapshot->getColumns().getNamesOfPhysical();
+    global_ctx->storage_columns = global_ctx->metadata_snapshot->getColumns().getAllPhysical();
+
+    extractMergingAndGatheringColumns(
+        global_ctx->storage_columns,
+        global_ctx->metadata_snapshot->getSortingKey().expression,
+        global_ctx->metadata_snapshot->getSecondaryIndices(),
+        ctx->merging_params,
+        global_ctx->gathering_columns,
+        global_ctx->gathering_column_names,
+        global_ctx->merging_columns,
+        global_ctx->merging_column_names);
+
+
+    auto local_single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + global_ctx->future_part->name, ctx->disk, 0);
+    global_ctx->new_data_part = global_ctx->data->createPart(
+        global_ctx->future_part->name,
+        global_ctx->future_part->type,
+        global_ctx->future_part->part_info,
+        local_single_disk_volume,
+        local_tmp_prefix + global_ctx->future_part->name + (global_ctx->parent_part ? ".proj" : ""),
+        global_ctx->parent_part.get());
+
+    global_ctx->new_data_part->uuid = global_ctx->future_part->uuid;
+    global_ctx->new_data_part->setColumns(global_ctx->storage_columns);
+    global_ctx->new_data_part->partition.assign(global_ctx->future_part->getPartition());
+    global_ctx->new_data_part->is_temp = global_ctx->parent_part == nullptr;
+
+    ctx->need_remove_expired_values = false;
+    ctx->force_ttl = false;
+    for (const auto & part : global_ctx->future_part->parts)
+    {
+        global_ctx->new_data_part->ttl_infos.update(part->ttl_infos);
+        if (global_ctx->metadata_snapshot->hasAnyTTL() && !part->checkAllTTLCalculated(global_ctx->metadata_snapshot))
+        {
+            LOG_INFO(ctx->log, "Some TTL values were not calculated for part {}. Will calculate them forcefully during merge.", part->name);
+            ctx->need_remove_expired_values = true;
+            ctx->force_ttl = true;
+        }
+    }
+
+    const auto & local_part_min_ttl = global_ctx->new_data_part->ttl_infos.part_min_ttl;
+    if (local_part_min_ttl && local_part_min_ttl <= global_ctx->time_of_merge)
+        ctx->need_remove_expired_values = true;
+
+    if (ctx->need_remove_expired_values && global_ctx->ttl_merges_blocker->isCancelled())
+    {
+        LOG_INFO(ctx->log, "Part {} has values with expired TTL, but merges with TTL are cancelled.", global_ctx->new_data_part->name);
+        ctx->need_remove_expired_values = false;
+    }
+
+    ctx->sum_input_rows_upper_bound = (*global_ctx->merge_entry)->total_rows_count;
+    ctx->sum_compressed_bytes_upper_bound = (*global_ctx->merge_entry)->total_size_bytes_compressed;
+    global_ctx->chosen_merge_algorithm = chooseMergeAlgorithm();
+    (*global_ctx->merge_entry)->merge_algorithm.store(global_ctx->chosen_merge_algorithm, std::memory_order_relaxed);
+
+    LOG_DEBUG(ctx->log, "Selected MergeAlgorithm: {}", toString(global_ctx->chosen_merge_algorithm));
+
+    /// Note: this is done before creating input streams, because otherwise data.data_parts_mutex
+    /// (which is locked in data.getTotalActiveSizeInBytes())
+    /// (which is locked in shared mode when input streams are created) and when inserting new data
+    /// the order is reverse. This annoys TSan even though one lock is locked in shared mode and thus
+    /// deadlock is impossible.
+    ctx->compression_codec = global_ctx->data->getCompressionCodecForPart(
+        (*global_ctx->merge_entry)->total_size_bytes_compressed, global_ctx->new_data_part->ttl_infos, global_ctx->time_of_merge);
+
+    ctx->tmp_disk = global_ctx->context->getTemporaryVolume()->getDisk();
+
+    switch (global_ctx->chosen_merge_algorithm)
+    {
+        case MergeAlgorithm::Horizontal :
+        {
+            global_ctx->merging_columns = global_ctx->storage_columns;
+            global_ctx->merging_column_names = global_ctx->all_column_names;
+            global_ctx->gathering_columns.clear();
+            global_ctx->gathering_column_names.clear();
+            break;
+        }
+        case MergeAlgorithm::Vertical :
+        {
+            ctx->rows_sources_file = createTemporaryFile(ctx->tmp_disk->getPath());
+            ctx->rows_sources_uncompressed_write_buf = ctx->tmp_disk->writeFile(fileName(ctx->rows_sources_file->path()));
+            ctx->rows_sources_write_buf = std::make_unique<CompressedWriteBuffer>(*ctx->rows_sources_uncompressed_write_buf);
+
+            MergeTreeDataPartInMemory::ColumnToSize local_merged_column_to_size;
+            for (const MergeTreeData::DataPartPtr & part : global_ctx->future_part->parts)
+                part->accumulateColumnSizes(local_merged_column_to_size);
+
+            ctx->column_sizes = ColumnSizeEstimator(
+                std::move(local_merged_column_to_size),
+                global_ctx->merging_column_names,
+                global_ctx->gathering_column_names);
+
+            if (global_ctx->data->getSettings()->fsync_part_directory)
+                global_ctx->sync_guard = ctx->disk->getDirectorySyncGuard(local_new_part_tmp_path);
+
+            break;
+        }
+        default :
+            throw Exception("Merge algorithm must be chosen", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    /// If merge is vertical we cannot calculate it
+    ctx->blocks_are_granules_size = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Vertical);
+
+    /// Merged stream will be created and available as merged_stream variable
+    createMergedStream();
+
+    global_ctx->to = std::make_shared<MergedBlockOutputStream>(
+        global_ctx->new_data_part,
+        global_ctx->metadata_snapshot,
+        global_ctx->merging_columns,
+        MergeTreeIndexFactory::instance().getMany(global_ctx->metadata_snapshot->getSecondaryIndices()),
+        ctx->compression_codec,
+        ctx->blocks_are_granules_size);
+
+    global_ctx->merged_stream->readPrefix();
+
+    /// TODO: const
+    const_cast<MergedBlockOutputStream&>(*global_ctx->to).writePrefix();
+
+    global_ctx->rows_written = 0;
+    ctx->initial_reservation = global_ctx->space_reservation ? global_ctx->space_reservation->getSize() : 0;
+
+    ctx->is_cancelled = [merges_blocker = global_ctx->merges_blocker,
+        ttl_merges_blocker = global_ctx->ttl_merges_blocker,
+        need_remove = ctx->need_remove_expired_values]() -> bool
+    {
+        return merges_blocker->isCancelled() || (need_remove && ttl_merges_blocker->isCancelled());
+    };
+
+    /// This is the end of preparation. Execution will be per block.
+    return false;
+}
+
+
+MergeTask::StageRuntimeContextPtr MergeTask::ExecuteAndFinalizeHorizontalPart::getContextForNextStage()
+{
+    auto new_ctx = std::make_shared<VerticalMergeRuntimeContext>();
+
+    new_ctx->rows_sources_write_buf = std::move(ctx->rows_sources_write_buf);
+    new_ctx->rows_sources_uncompressed_write_buf = std::move(ctx->rows_sources_uncompressed_write_buf);
+    new_ctx->rows_sources_file = std::move(ctx->rows_sources_file);
+    new_ctx->column_sizes = std::move(ctx->column_sizes);
+    new_ctx->compression_codec = std::move(ctx->compression_codec);
+    new_ctx->tmp_disk = std::move(ctx->tmp_disk);
+    new_ctx->it_name_and_type = std::move(ctx->it_name_and_type);
+    new_ctx->column_num_for_vertical_merge = std::move(ctx->column_num_for_vertical_merge);
+    new_ctx->read_with_direct_io = std::move(ctx->read_with_direct_io);
+    new_ctx->need_sync = std::move(ctx->need_sync);
+
+    ctx.reset();
+    return new_ctx;
+}
+
+MergeTask::StageRuntimeContextPtr MergeTask::VerticalMergeStage::getContextForNextStage()
+{
+    auto new_ctx = std::make_shared<MergeProjectionsRuntimeContext>();
+
+    new_ctx->need_sync = std::move(ctx->need_sync);
+
+    ctx.reset();
+    return new_ctx;
+}
+
+
+bool MergeTask::ExecuteAndFinalizeHorizontalPart::execute()
+{
+    assert(subtasks_iterator != subtasks.end());
+    if ((*subtasks_iterator)())
+        return true;
+
+    /// Move to the next subtask in an array of subtasks
+    ++subtasks_iterator;
+    return subtasks_iterator != subtasks.end();
+}
+
+
+bool MergeTask::ExecuteAndFinalizeHorizontalPart::executeImpl()
+{
+    Block block;
+    if (!ctx->is_cancelled() && (block = global_ctx->merged_stream->read()))
+    {
+        global_ctx->rows_written += block.rows();
+
+        const_cast<MergedBlockOutputStream &>(*global_ctx->to).write(block);
+
+        (*global_ctx->merge_entry)->rows_written = global_ctx->merged_stream->getProfileInfo().rows;
+        (*global_ctx->merge_entry)->bytes_written_uncompressed = global_ctx->merged_stream->getProfileInfo().bytes;
+
+        /// Reservation updates is not performed yet, during the merge it may lead to higher free space requirements
+        if (global_ctx->space_reservation && ctx->sum_input_rows_upper_bound)
+        {
+            /// The same progress from merge_entry could be used for both algorithms (it should be more accurate)
+            /// But now we are using inaccurate row-based estimation in Horizontal case for backward compatibility
+            Float64 progress = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Horizontal)
+                ? std::min(1., 1. * global_ctx->rows_written / ctx->sum_input_rows_upper_bound)
+                : std::min(1., (*global_ctx->merge_entry)->progress.load(std::memory_order_relaxed));
+
+            global_ctx->space_reservation->update(static_cast<size_t>((1. - progress) * ctx->initial_reservation));
+        }
+
+        /// Need execute again
+        return true;
+    }
+
+    global_ctx->merged_stream->readSuffix();
+    global_ctx->merged_stream.reset();
+
+    if (global_ctx->merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
+
+    if (ctx->need_remove_expired_values && global_ctx->ttl_merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts with expired TTL", ErrorCodes::ABORTED);
+
+    const auto data_settings = global_ctx->data->getSettings();
+    const size_t sum_compressed_bytes_upper_bound = (*global_ctx->merge_entry)->total_size_bytes_compressed;
+    ctx->need_sync = needSyncPart(ctx->sum_input_rows_upper_bound, sum_compressed_bytes_upper_bound, *data_settings);
+
+    return false;
+}
+
+
+bool MergeTask::VerticalMergeStage::prepareVerticalMergeForAllColumns() const
+{
+     /// No need to execute this part if it is horizontal merge.
+    if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
+        return false;
+
+    size_t sum_input_rows_exact = (*global_ctx->merge_entry)->rows_read;
+    (*global_ctx->merge_entry)->columns_written = global_ctx->merging_column_names.size();
+    (*global_ctx->merge_entry)->progress.store(ctx->column_sizes->keyColumnsWeight(), std::memory_order_relaxed);
+
+    ctx->column_part_streams = BlockInputStreams(global_ctx->future_part->parts.size());
+
+    ctx->rows_sources_write_buf->next();
+    ctx->rows_sources_uncompressed_write_buf->next();
+    /// Ensure data has written to disk.
+    ctx->rows_sources_uncompressed_write_buf->finalize();
+
+    size_t rows_sources_count = ctx->rows_sources_write_buf->count();
+    /// In special case, when there is only one source part, and no rows were skipped, we may have
+    /// skipped writing rows_sources file. Otherwise rows_sources_count must be equal to the total
+    /// number of input rows.
+    if ((rows_sources_count > 0 || global_ctx->future_part->parts.size() > 1) && sum_input_rows_exact != rows_sources_count)
+        throw Exception("Number of rows in source parts (" + toString(sum_input_rows_exact)
+            + ") differs from number of bytes written to rows_sources file (" + toString(rows_sources_count)
+            + "). It is a bug.", ErrorCodes::LOGICAL_ERROR);
+
+    ctx->rows_sources_read_buf = std::make_unique<CompressedReadBufferFromFile>(ctx->tmp_disk->readFile(fileName(ctx->rows_sources_file->path())));
+
+    /// For external cycle
+    global_ctx->gathering_column_names_size = global_ctx->gathering_column_names.size();
+    ctx->column_num_for_vertical_merge = 0;
+    ctx->it_name_and_type = global_ctx->gathering_columns.cbegin();
+
+    return false;
+}
+
+
+void MergeTask::VerticalMergeStage::prepareVerticalMergeForOneColumn() const
+{
+    const String & column_name = ctx->it_name_and_type->name;
+    Names column_names{column_name};
+
+    ctx->progress_before = (*global_ctx->merge_entry)->progress.load(std::memory_order_relaxed);
+
+    global_ctx->column_progress = std::make_unique<MergeStageProgress>(ctx->progress_before, ctx->column_sizes->columnWeight(column_name));
+
+    for (size_t part_num = 0; part_num < global_ctx->future_part->parts.size(); ++part_num)
+    {
+        auto column_part_source = std::make_shared<MergeTreeSequentialSource>(
+            *global_ctx->data, global_ctx->metadata_snapshot, global_ctx->future_part->parts[part_num], column_names, ctx->read_with_direct_io, true);
+
+        /// Dereference unique_ptr
+        column_part_source->setProgressCallback(
+            MergeProgressCallback(*global_ctx->merge_entry, global_ctx->watch_prev_elapsed, *global_ctx->column_progress));
+
+        QueryPipeline column_part_pipeline;
+        column_part_pipeline.init(Pipe(std::move(column_part_source)));
+        column_part_pipeline.setMaxThreads(1);
+
+        ctx->column_part_streams[part_num] =
+                std::make_shared<PipelineExecutingBlockInputStream>(std::move(column_part_pipeline));
+    }
+
+    ctx->rows_sources_read_buf->seek(0, 0);
+    ctx->column_gathered_stream = std::make_unique<ColumnGathererStream>(column_name, ctx->column_part_streams, *ctx->rows_sources_read_buf);
+
+    ctx->column_to = std::make_unique<MergedColumnOnlyOutputStream>(
+        global_ctx->new_data_part,
+        global_ctx->metadata_snapshot,
+        ctx->column_gathered_stream->getHeader(),
+        ctx->compression_codec,
+        /// we don't need to recalc indices here
+        /// because all of them were already recalculated and written
+        /// as key part of vertical merge
+        std::vector<MergeTreeIndexPtr>{},
+        &global_ctx->written_offset_columns,
+        global_ctx->to->getIndexGranularity());
+
+    ctx->column_elems_written = 0;
+
+    ctx->column_to->writePrefix();
+}
+
+
+bool MergeTask::VerticalMergeStage::executeVerticalMergeForOneColumn() const
+{
+    Block block;
+    if (!global_ctx->merges_blocker->isCancelled() && (block = ctx->column_gathered_stream->read()))
+    {
+        ctx->column_elems_written += block.rows();
+        ctx->column_to->write(block);
+
+        /// Need execute again
+        return true;
+    }
+    return false;
+}
+
+
+void MergeTask::VerticalMergeStage::finalizeVerticalMergeForOneColumn() const
+{
+    const String & column_name = ctx->it_name_and_type->name;
+    if (global_ctx->merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
+
+    ctx->column_gathered_stream->readSuffix();
+    auto changed_checksums = ctx->column_to->writeSuffixAndGetChecksums(global_ctx->new_data_part, global_ctx->checksums_gathered_columns, ctx->need_sync);
+    global_ctx->checksums_gathered_columns.add(std::move(changed_checksums));
+
+    if (global_ctx->rows_written != ctx->column_elems_written)
+    {
+        throw Exception("Written " + toString(ctx->column_elems_written) + " elements of column " + column_name +
+                        ", but " + toString(global_ctx->rows_written) + " rows of PK columns", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    /// NOTE: 'progress' is modified by single thread, but it may be concurrently read from MergeListElement::getInfo() (StorageSystemMerges).
+
+    (*global_ctx->merge_entry)->columns_written += 1;
+    (*global_ctx->merge_entry)->bytes_written_uncompressed += ctx->column_gathered_stream->getProfileInfo().bytes;
+    (*global_ctx->merge_entry)->progress.store(ctx->progress_before + ctx->column_sizes->columnWeight(column_name), std::memory_order_relaxed);
+
+    /// This is the external cycle increment.
+    ++ctx->column_num_for_vertical_merge;
+    ++ctx->it_name_and_type;
+}
+
+
+bool MergeTask::VerticalMergeStage::finalizeVerticalMergeForAllColumns() const
+{
+    /// No need to execute this part if it is horizontal merge.
+    if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
+        return false;
+
+    return false;
+}
+
+
+bool MergeTask::MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections() const
+{
+    for (const auto & part : global_ctx->future_part->parts)
+        global_ctx->new_data_part->minmax_idx->merge(*part->minmax_idx);
+
+    /// Print overall profiling info. NOTE: it may duplicates previous messages
+    {
+        double elapsed_seconds = (*global_ctx->merge_entry)->watch.elapsedSeconds();
+        LOG_DEBUG(ctx->log,
+            "Merge sorted {} rows, containing {} columns ({} merged, {} gathered) in {} sec., {} rows/sec., {}/sec.",
+            (*global_ctx->merge_entry)->rows_read,
+            global_ctx->all_column_names.size(),
+            global_ctx->merging_column_names.size(),
+            global_ctx->gathering_column_names.size(),
+            elapsed_seconds,
+            (*global_ctx->merge_entry)->rows_read / elapsed_seconds,
+            ReadableSize((*global_ctx->merge_entry)->bytes_read_uncompressed / elapsed_seconds));
+    }
+
+
+    const auto & projections = global_ctx->metadata_snapshot->getProjections();
+    // tasks_for_projections.reserve(projections.size());
+
+    for (const auto & projection : projections)
+    {
+        MergeTreeData::DataPartsVector projection_parts;
+        for (const auto & part : global_ctx->future_part->parts)
+        {
+            auto it = part->getProjectionParts().find(projection.name);
+            if (it != part->getProjectionParts().end())
+                projection_parts.push_back(it->second);
+        }
+        if (projection_parts.size() < global_ctx->future_part->parts.size())
+        {
+            LOG_DEBUG(ctx->log, "Projection {} is not merged because some parts don't have it", projection.name);
+            continue;
+        }
+
+        LOG_DEBUG(
+            ctx->log,
+            "Selected {} projection_parts from {} to {}",
+            projection_parts.size(),
+            projection_parts.front()->name,
+            projection_parts.back()->name);
+
+        auto projection_future_part = std::make_shared<FutureMergedMutatedPart>();
+        projection_future_part->assign(std::move(projection_parts));
+        projection_future_part->name = projection.name;
+        projection_future_part->path = global_ctx->future_part->path + "/" + projection.name + ".proj/";
+        projection_future_part->part_info = {"all", 0, 0, 0};
+
+        MergeTreeData::MergingParams projection_merging_params;
+        projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
+        if (projection.type == ProjectionDescription::Type::Aggregate)
+            projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
+
+        // TODO Should we use a new merge_entry for projection?
+        ctx->tasks_for_projections.emplace_back(std::make_shared<MergeTask>(
+            projection_future_part,
+            projection.metadata,
+            global_ctx->merge_entry,
+            global_ctx->time_of_merge,
+            global_ctx->context,
+            global_ctx->space_reservation,
+            global_ctx->deduplicate,
+            global_ctx->deduplicate_by_columns,
+            projection_merging_params,
+            global_ctx->new_data_part,
+            "", // empty string for projection
+            global_ctx->data,
+            global_ctx->merges_blocker,
+            global_ctx->ttl_merges_blocker));
+    }
+
+    /// We will iterate through projections and execute them
+    ctx->projections_iterator = ctx->tasks_for_projections.begin();
+
+    return false;
+}
+
+
+bool MergeTask::MergeProjectionsStage::executeProjections() const
+{
+    if (ctx->projections_iterator == ctx->tasks_for_projections.end())
+        return false;
+
+    if ((*ctx->projections_iterator)->execute())
+        return true;
+
+    ++ctx->projections_iterator;
+    return true;
+}
+
+
+bool MergeTask::MergeProjectionsStage::finalizeProjectionsAndWholeMerge() const
+{
+    const auto & projections = global_ctx->metadata_snapshot->getProjections();
+
+    size_t iter = 0;
+
+    for (const auto & projection : projections)
+    {
+        auto future = ctx->tasks_for_projections[iter]->getFuture();
+        ++iter;
+        global_ctx->new_data_part->addProjectionPart(projection.name, future.get());
+    }
+
+    if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
+        global_ctx->to->writeSuffixAndFinalizePart(global_ctx->new_data_part, ctx->need_sync);
+    else
+        global_ctx->to->writeSuffixAndFinalizePart(global_ctx->new_data_part, ctx->need_sync, &global_ctx->storage_columns, &global_ctx->checksums_gathered_columns);
+
+    global_ctx->promise.set_value(global_ctx->new_data_part);
+
+    return false;
+}
+
+
+bool MergeTask::VerticalMergeStage::execute()
+{
+    assert(subtasks_iterator != subtasks.end());
+    if ((*subtasks_iterator)())
+        return true;
+
+    /// Move to the next subtask in an array of subtasks
+    ++subtasks_iterator;
+    return subtasks_iterator != subtasks.end();
+}
+
+bool MergeTask::MergeProjectionsStage::execute()
+{
+    assert(subtasks_iterator != subtasks.end());
+    if ((*subtasks_iterator)())
+        return true;
+
+    /// Move to the next subtask in an array of subtasks
+    ++subtasks_iterator;
+    return subtasks_iterator != subtasks.end();
+}
+
+
+bool MergeTask::VerticalMergeStage::executeVerticalMergeForAllColumns() const
+{
+    /// No need to execute this part if it is horizontal merge.
+    if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
+        return false;
+
+    /// This is the external cycle condition
+    if (ctx->column_num_for_vertical_merge >= global_ctx->gathering_column_names_size)
+        return false;
+
+    switch (ctx->vertical_merge_one_column_state)
+    {
+        case VerticalMergeRuntimeContext::State::NEED_PREPARE:
+        {
+            prepareVerticalMergeForOneColumn();
+            ctx->vertical_merge_one_column_state = VerticalMergeRuntimeContext::State::NEED_EXECUTE;
+            return true;
+        }
+        case VerticalMergeRuntimeContext::State::NEED_EXECUTE:
+        {
+            if (executeVerticalMergeForOneColumn())
+                return true;
+
+            ctx->vertical_merge_one_column_state = VerticalMergeRuntimeContext::State::NEED_FINISH;
+            return true;
+        }
+        case VerticalMergeRuntimeContext::State::NEED_FINISH:
+        {
+            finalizeVerticalMergeForOneColumn();
+            ctx->vertical_merge_one_column_state = VerticalMergeRuntimeContext::State::NEED_PREPARE;
+            return true;
+        }
+    }
+    return false;
+}
+
+
+bool MergeTask::execute()
+{
+    assert(stages_iterator != stages.end());
+    if ((*stages_iterator)->execute())
+        return true;
+
+    /// Stage is finished, need initialize context for the next stage
+    auto next_stage_context = (*stages_iterator)->getContextForNextStage();
+
+    /// Move to the next stage in an array of stages
+    ++stages_iterator;
+    if (stages_iterator == stages.end())
+        return false;
+
+    (*stages_iterator)->setRuntimeContext(std::move(next_stage_context), global_ctx);
+    return true;
+}
+
+
+void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
+{
+    /** Read from all parts, merge and write into a new one.
+      * In passing, we calculate expression for sorting.
+      */
+    Pipes pipes;
+    global_ctx->watch_prev_elapsed = 0;
+
+    /// We count total amount of bytes in parts
+    /// and use direct_io + aio if there is more than min_merge_bytes_to_use_direct_io
+    ctx->read_with_direct_io = false;
+    const auto data_settings = global_ctx->data->getSettings();
+    if (data_settings->min_merge_bytes_to_use_direct_io != 0)
+    {
+        size_t total_size = 0;
+        for (const auto & part : global_ctx->future_part->parts)
+        {
+            total_size += part->getBytesOnDisk();
+            if (total_size >= data_settings->min_merge_bytes_to_use_direct_io)
+            {
+                LOG_DEBUG(ctx->log, "Will merge parts reading files in O_DIRECT");
+                ctx->read_with_direct_io = true;
+
+                break;
+            }
+        }
+    }
+
+    /// Using unique_ptr, because MergeStageProgress has no default constructor
+    global_ctx->horizontal_stage_progress = std::make_unique<MergeStageProgress>(
+        ctx->column_sizes ? ctx->column_sizes->keyColumnsWeight() : 1.0);
+
+
+    for (const auto & part : global_ctx->future_part->parts)
+    {
+        auto input = std::make_unique<MergeTreeSequentialSource>(
+            *global_ctx->data, global_ctx->metadata_snapshot, part, global_ctx->merging_column_names, ctx->read_with_direct_io, true);
+
+        /// Dereference unique_ptr and pass horizontal_stage_progress by reference
+        input->setProgressCallback(
+            MergeProgressCallback(*global_ctx->merge_entry, global_ctx->watch_prev_elapsed, *global_ctx->horizontal_stage_progress));
+
+        Pipe pipe(std::move(input));
+
+        if (global_ctx->metadata_snapshot->hasSortingKey())
+        {
+            pipe.addSimpleTransform([this](const Block & header)
+            {
+                return std::make_shared<ExpressionTransform>(header, global_ctx->metadata_snapshot->getSortingKey().expression);
+            });
+        }
+
+        pipes.emplace_back(std::move(pipe));
+    }
+
+
+    Names sort_columns = global_ctx->metadata_snapshot->getSortingKeyColumns();
+    SortDescription sort_description;
+    size_t sort_columns_size = sort_columns.size();
+    sort_description.reserve(sort_columns_size);
+
+    Names partition_key_columns = global_ctx->metadata_snapshot->getPartitionKey().column_names;
+
+    Block header = pipes.at(0).getHeader();
+    for (size_t i = 0; i < sort_columns_size; ++i)
+        sort_description.emplace_back(header.getPositionByName(sort_columns[i]), 1, 1);
+
+    /// The order of the streams is important: when the key is matched, the elements go in the order of the source stream number.
+    /// In the merged part, the lines with the same key must be in the ascending order of the identifier of original part,
+    ///  that is going in insertion order.
+    ProcessorPtr merged_transform;
+
+    /// If merge is vertical we cannot calculate it
+    ctx->blocks_are_granules_size = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Vertical);
+
+    UInt64 merge_block_size = data_settings->merge_max_block_size;
+
+    switch (ctx->merging_params.mode)
+    {
+        case MergeTreeData::MergingParams::Ordinary:
+            merged_transform = std::make_shared<MergingSortedTransform>(
+                header, pipes.size(), sort_description, merge_block_size, 0, false, ctx->rows_sources_write_buf.get(), true, ctx->blocks_are_granules_size);
+            break;
+
+        case MergeTreeData::MergingParams::Collapsing:
+            merged_transform = std::make_shared<CollapsingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.sign_column, false,
+                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+            break;
+
+        case MergeTreeData::MergingParams::Summing:
+            merged_transform = std::make_shared<SummingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.columns_to_sum, partition_key_columns, merge_block_size);
+            break;
+
+        case MergeTreeData::MergingParams::Aggregating:
+            merged_transform = std::make_shared<AggregatingSortedTransform>(header, pipes.size(), sort_description, merge_block_size);
+            break;
+
+        case MergeTreeData::MergingParams::Replacing:
+            merged_transform = std::make_shared<ReplacingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.version_column,
+                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+            break;
+
+        case MergeTreeData::MergingParams::Graphite:
+            merged_transform = std::make_shared<GraphiteRollupSortedTransform>(
+                header, pipes.size(), sort_description, merge_block_size,
+                ctx->merging_params.graphite_params, global_ctx->time_of_merge);
+            break;
+
+        case MergeTreeData::MergingParams::VersionedCollapsing:
+            merged_transform = std::make_shared<VersionedCollapsingTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.sign_column,
+                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+            break;
+    }
+
+    QueryPipeline pipeline;
+    pipeline.init(Pipe::unitePipes(std::move(pipes)));
+    pipeline.addTransform(std::move(merged_transform));
+    pipeline.setMaxThreads(1);
+
+    global_ctx->merged_stream = std::make_shared<PipelineExecutingBlockInputStream>(std::move(pipeline));
+
+    if (global_ctx->deduplicate)
+        global_ctx->merged_stream = std::make_shared<DistinctSortedBlockInputStream>(
+            global_ctx->merged_stream, sort_description, SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns);
+
+    if (ctx->need_remove_expired_values)
+        global_ctx->merged_stream = std::make_shared<TTLBlockInputStream>(
+            global_ctx->merged_stream, *global_ctx->data, global_ctx->metadata_snapshot, global_ctx->new_data_part, global_ctx->time_of_merge, ctx->force_ttl);
+
+    if (global_ctx->metadata_snapshot->hasSecondaryIndices())
+    {
+        const auto & indices = global_ctx->metadata_snapshot->getSecondaryIndices();
+        global_ctx->merged_stream = std::make_shared<ExpressionBlockInputStream>(
+            global_ctx->merged_stream, indices.getSingleExpressionForIndices(global_ctx->metadata_snapshot->getColumns(), global_ctx->data->getContext()));
+        global_ctx->merged_stream = std::make_shared<MaterializingBlockInputStream>(global_ctx->merged_stream);
+    }
+}
+
+
+MergeAlgorithm MergeTask::ExecuteAndFinalizeHorizontalPart::chooseMergeAlgorithm() const
+{
+    const size_t sum_rows_upper_bound = (*global_ctx->merge_entry)->total_rows_count;
+    const auto data_settings = global_ctx->data->getSettings();
+
+    if (global_ctx->deduplicate)
+        return MergeAlgorithm::Horizontal;
+    if (data_settings->enable_vertical_merge_algorithm == 0)
+        return MergeAlgorithm::Horizontal;
+    if (ctx->need_remove_expired_values)
+        return MergeAlgorithm::Horizontal;
+
+    for (const auto & part : global_ctx->future_part->parts)
+        if (!part->supportsVerticalMerge())
+            return MergeAlgorithm::Horizontal;
+
+    bool is_supported_storage =
+        ctx->merging_params.mode == MergeTreeData::MergingParams::Ordinary ||
+        ctx->merging_params.mode == MergeTreeData::MergingParams::Collapsing ||
+        ctx->merging_params.mode == MergeTreeData::MergingParams::Replacing ||
+        ctx->merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing;
+
+    bool enough_ordinary_cols = global_ctx->gathering_columns.size() >= data_settings->vertical_merge_algorithm_min_columns_to_activate;
+
+    bool enough_total_rows = sum_rows_upper_bound >= data_settings->vertical_merge_algorithm_min_rows_to_activate;
+
+    bool no_parts_overflow = global_ctx->future_part->parts.size() <= RowSourcePart::MAX_PARTS;
+
+    auto merge_alg = (is_supported_storage && enough_total_rows && enough_ordinary_cols && no_parts_overflow) ?
+                        MergeAlgorithm::Vertical : MergeAlgorithm::Horizontal;
+
+    return merge_alg;
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTask.h b/src/Storages/MergeTree/MergeTask.h
new file mode 100644
index 00000000000..e6bee9a16a3
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTask.h
@@ -0,0 +1,367 @@
+#pragma once
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeProgress.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/IMergedBlockOutputStream.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/ColumnSizeEstimator.h>
+#include <Storages/MergeTree/MergedColumnOnlyOutputStream.h>
+#include <DataStreams/ColumnGathererStream.h>
+#include <Compression/CompressedReadBufferFromFile.h>
+
+#include <memory>
+#include <list>
+
+namespace DB
+{
+
+class MergeTask;
+using MergeTaskPtr = std::shared_ptr<MergeTask>;
+
+/**
+ * Overview of the merge algorithm
+ *
+ * Each merge is executed sequentially block by block.
+ * The main idea is to make a merge not a subroutine which is executed
+ * in a thread pool and may occupy a thread for a period of time,
+ * but to make a merge a coroutine which can suspend the execution
+ * in some points and then resume the execution from this point.
+ *
+ * A perfect point where to suspend the execution is after the work over a block is finished.
+ * The task itself will be executed via BackgroundJobExecutor.
+ *
+ * The interface of the task is simple.
+ * The main method is `execute()` which will return true, if the task wants to be executed again and false otherwise.
+ *
+ * With this kind of task we can give a merge a priority.
+ * A priority is simple - the lower the size of the merge, the higher priority.
+ * So, if ClickHouse wants to merge some really big parts into a bigger part,
+ * then it will be executed for a long time, because the result of the merge is not really needed immediately.
+ * It is better to merge small parts as soon as possible.
+*/
+class MergeTask
+{
+public:
+
+    MergeTask(
+        FutureMergedMutatedPartPtr future_part_,
+        StorageMetadataPtr metadata_snapshot_,
+        MergeList::Entry * merge_entry_,
+        time_t time_of_merge_,
+        ContextPtr context_,
+        ReservationSharedPtr space_reservation_,
+        bool deduplicate_,
+        Names deduplicate_by_columns_,
+        MergeTreeData::MergingParams merging_params_,
+        MergeTreeDataPartPtr parent_part_,
+        String prefix_,
+        MergeTreeData * data_,
+        ActionBlocker * merges_blocker_,
+        ActionBlocker * ttl_merges_blocker_)
+        {
+            global_ctx = std::make_shared<GlobalRuntimeContext>();
+
+            global_ctx->future_part = std::move(future_part_);
+            global_ctx->metadata_snapshot = std::move(metadata_snapshot_);
+            global_ctx->merge_entry = std::move(merge_entry_);
+            global_ctx->time_of_merge = std::move(time_of_merge_);
+            global_ctx->context = std::move(context_);
+            global_ctx->space_reservation = std::move(space_reservation_);
+            global_ctx->deduplicate = std::move(deduplicate_);
+            global_ctx->deduplicate_by_columns = std::move(deduplicate_by_columns_);
+            global_ctx->parent_part = std::move(parent_part_);
+            global_ctx->data = std::move(data_);
+            global_ctx->merges_blocker = std::move(merges_blocker_);
+            global_ctx->ttl_merges_blocker = std::move(ttl_merges_blocker_);
+
+            auto prepare_stage_ctx = std::make_shared<ExecuteAndFinalizeHorizontalPartRuntimeContext>();
+
+            prepare_stage_ctx->prefix = std::move(prefix_);
+            prepare_stage_ctx->merging_params = std::move(merging_params_);
+
+            (*stages.begin())->setRuntimeContext(std::move(prepare_stage_ctx), global_ctx);
+        }
+
+    std::future<MergeTreeData::MutableDataPartPtr> getFuture()
+    {
+        return global_ctx->promise.get_future();
+    }
+
+    bool execute();
+
+private:
+    struct IStage;
+    using StagePtr = std::shared_ptr<IStage>;
+
+    struct IStageRuntimeContext {};
+    using StageRuntimeContextPtr = std::shared_ptr<IStageRuntimeContext>;
+
+    struct IStage
+    {
+        virtual void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) = 0;
+        virtual StageRuntimeContextPtr getContextForNextStage() = 0;
+        virtual bool execute() = 0;
+        virtual ~IStage() = default;
+    };
+
+    /// By default this context is uninitialed, but some variables has to be set after construction,
+    /// some variables are used in a process of execution
+    /// Proper initialization is responsibility of the author
+    struct GlobalRuntimeContext : public IStageRuntimeContext //-V730
+    {
+        MergeList::Entry * merge_entry{nullptr};
+        MergeTreeData * data{nullptr};
+        ActionBlocker * merges_blocker{nullptr};
+        ActionBlocker * ttl_merges_blocker{nullptr};
+        StorageMetadataPtr metadata_snapshot{nullptr};
+        FutureMergedMutatedPartPtr future_part{nullptr};
+        MergeTreeDataPartPtr parent_part{nullptr};
+        ContextPtr context{nullptr};
+        time_t time_of_merge{0};
+        ReservationSharedPtr space_reservation{nullptr};
+        bool deduplicate{false};
+        Names deduplicate_by_columns{};
+
+        NamesAndTypesList gathering_columns{};
+        NamesAndTypesList merging_columns{};
+        Names gathering_column_names{};
+        Names merging_column_names{};
+        NamesAndTypesList storage_columns{};
+        Names all_column_names{};
+        MergeTreeData::DataPart::Checksums checksums_gathered_columns{};
+
+        MergeAlgorithm chosen_merge_algorithm{MergeAlgorithm::Undecided};
+        size_t gathering_column_names_size{0};
+
+        std::unique_ptr<MergeStageProgress> horizontal_stage_progress{nullptr};
+        std::unique_ptr<MergeStageProgress> column_progress{nullptr};
+
+        std::shared_ptr<MergedBlockOutputStream> to{nullptr};
+        BlockInputStreamPtr merged_stream{nullptr};
+
+        SyncGuardPtr sync_guard{nullptr};
+        MergeTreeData::MutableDataPartPtr new_data_part{nullptr};
+
+        size_t rows_written{0};
+        UInt64 watch_prev_elapsed{0};
+
+        std::promise<MergeTreeData::MutableDataPartPtr> promise{};
+
+        IMergedBlockOutputStream::WrittenOffsetColumns written_offset_columns{};
+    };
+
+    using GlobalRuntimeContextPtr = std::shared_ptr<GlobalRuntimeContext>;
+
+    /// By default this context is uninitialed, but some variables has to be set after construction,
+    /// some variables are used in a process of execution
+    /// Proper initialization is responsibility of the author
+    struct ExecuteAndFinalizeHorizontalPartRuntimeContext : public IStageRuntimeContext //-V730
+    {
+        /// Dependencies
+        String prefix;
+        MergeTreeData::MergingParams merging_params{};
+
+        DiskPtr tmp_disk{nullptr};
+        DiskPtr disk{nullptr};
+        bool need_remove_expired_values{false};
+        bool force_ttl{false};
+        CompressionCodecPtr compression_codec{nullptr};
+        size_t sum_input_rows_upper_bound{0};
+        std::unique_ptr<TemporaryFile> rows_sources_file{nullptr};
+        std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf{nullptr};
+        std::unique_ptr<WriteBuffer> rows_sources_write_buf{nullptr};
+        std::optional<ColumnSizeEstimator> column_sizes{};
+
+        size_t initial_reservation{0};
+        bool read_with_direct_io{false};
+
+        std::function<bool()> is_cancelled{};
+
+        /// Local variables for this stage
+        size_t sum_compressed_bytes_upper_bound{0};
+        bool blocks_are_granules_size{false};
+
+        Poco::Logger * log{&Poco::Logger::get("MergeTask::PrepareStage")};
+
+        /// Dependencies for next stages
+        std::list<DB::NameAndTypePair>::const_iterator it_name_and_type;
+        size_t column_num_for_vertical_merge{0};
+        bool need_sync{false};
+    };
+
+    using ExecuteAndFinalizeHorizontalPartRuntimeContextPtr = std::shared_ptr<ExecuteAndFinalizeHorizontalPartRuntimeContext>;
+
+
+    struct ExecuteAndFinalizeHorizontalPart : public IStage
+    {
+        bool execute() override;
+
+        bool prepare();
+        bool executeImpl();
+
+        using ExecuteAndFinalizeHorizontalPartSubtasks = std::array<std::function<bool()>, 2>;
+
+        ExecuteAndFinalizeHorizontalPartSubtasks subtasks
+        {
+            [this] () { return prepare(); },
+            [this] () { return executeImpl(); }
+        };
+
+        ExecuteAndFinalizeHorizontalPartSubtasks::iterator subtasks_iterator = subtasks.begin();
+
+
+        MergeAlgorithm chooseMergeAlgorithm() const;
+        void createMergedStream();
+
+        void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) override
+        {
+            ctx = static_pointer_cast<ExecuteAndFinalizeHorizontalPartRuntimeContext>(local);
+            global_ctx = static_pointer_cast<GlobalRuntimeContext>(global);
+        }
+        StageRuntimeContextPtr getContextForNextStage() override;
+
+        ExecuteAndFinalizeHorizontalPartRuntimeContextPtr ctx;
+        GlobalRuntimeContextPtr global_ctx;
+    };
+
+    /// By default this context is uninitialed, but some variables has to be set after construction,
+    /// some variables are used in a process of execution
+    /// Proper initialization is responsibility of the author
+    struct VerticalMergeRuntimeContext : public IStageRuntimeContext //-V730
+    {
+        /// Begin dependencies from previous stage
+        std::unique_ptr<WriteBuffer> rows_sources_write_buf{nullptr};
+        std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf{nullptr};
+        std::unique_ptr<TemporaryFile> rows_sources_file;
+        std::optional<ColumnSizeEstimator> column_sizes;
+        CompressionCodecPtr compression_codec;
+        DiskPtr tmp_disk{nullptr};
+        std::list<DB::NameAndTypePair>::const_iterator it_name_and_type;
+        size_t column_num_for_vertical_merge{0};
+        bool read_with_direct_io{false};
+        bool need_sync{false};
+        /// End dependencies from previous stages
+
+        enum class State
+        {
+            NEED_PREPARE,
+            NEED_EXECUTE,
+            NEED_FINISH
+        };
+        State vertical_merge_one_column_state{State::NEED_PREPARE};
+
+        Float64 progress_before = 0;
+        std::unique_ptr<MergedColumnOnlyOutputStream> column_to{nullptr};
+        size_t column_elems_written{0};
+        BlockInputStreams column_part_streams;
+        std::unique_ptr<ColumnGathererStream> column_gathered_stream;
+        std::unique_ptr<CompressedReadBufferFromFile> rows_sources_read_buf{nullptr};
+    };
+
+    using VerticalMergeRuntimeContextPtr = std::shared_ptr<VerticalMergeRuntimeContext>;
+
+
+    struct VerticalMergeStage : public IStage
+    {
+        bool execute() override;
+        void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) override
+        {
+            ctx = static_pointer_cast<VerticalMergeRuntimeContext>(local);
+            global_ctx = static_pointer_cast<GlobalRuntimeContext>(global);
+        }
+        StageRuntimeContextPtr getContextForNextStage() override;
+
+        bool prepareVerticalMergeForAllColumns() const;
+        bool executeVerticalMergeForAllColumns() const;
+        bool finalizeVerticalMergeForAllColumns() const;
+
+        using VerticalMergeStageSubtasks = std::array<std::function<bool()>, 3>;
+
+        VerticalMergeStageSubtasks subtasks
+        {
+            [this] () { return prepareVerticalMergeForAllColumns(); },
+            [this] () { return executeVerticalMergeForAllColumns(); },
+            [this] () { return finalizeVerticalMergeForAllColumns(); }
+        };
+
+        VerticalMergeStageSubtasks::iterator subtasks_iterator = subtasks.begin();
+
+        void prepareVerticalMergeForOneColumn() const;
+        bool executeVerticalMergeForOneColumn() const;
+        void finalizeVerticalMergeForOneColumn() const;
+
+        VerticalMergeRuntimeContextPtr ctx;
+        GlobalRuntimeContextPtr global_ctx;
+    };
+
+    /// By default this context is uninitialed, but some variables has to be set after construction,
+    /// some variables are used in a process of execution
+    /// Proper initialization is responsibility of the author
+    struct MergeProjectionsRuntimeContext : public IStageRuntimeContext //-V730
+    {
+        /// Only one dependency
+        bool need_sync{false};
+
+        using MergeTasks = std::deque<MergeTaskPtr>;
+        MergeTasks tasks_for_projections;
+        MergeTasks::iterator projections_iterator;
+
+        Poco::Logger * log{&Poco::Logger::get("MergeTask::MergeProjectionsStage")};
+    };
+
+    using MergeProjectionsRuntimeContextPtr = std::shared_ptr<MergeProjectionsRuntimeContext>;
+
+    struct MergeProjectionsStage : public IStage
+    {
+        bool execute() override;
+        void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) override
+        {
+            ctx = static_pointer_cast<MergeProjectionsRuntimeContext>(local);
+            global_ctx = static_pointer_cast<GlobalRuntimeContext>(global);
+        }
+        StageRuntimeContextPtr getContextForNextStage() override { return nullptr; }
+
+        bool mergeMinMaxIndexAndPrepareProjections() const;
+        bool executeProjections() const;
+        bool finalizeProjectionsAndWholeMerge() const;
+
+        using MergeProjectionsStageSubtasks = std::array<std::function<bool()>, 3>;
+
+        MergeProjectionsStageSubtasks subtasks
+        {
+            [this] () { return mergeMinMaxIndexAndPrepareProjections(); },
+            [this] () { return executeProjections(); },
+            [this] () { return finalizeProjectionsAndWholeMerge(); }
+        };
+
+        MergeProjectionsStageSubtasks::iterator subtasks_iterator = subtasks.begin();
+
+        MergeProjectionsRuntimeContextPtr ctx;
+        GlobalRuntimeContextPtr global_ctx;
+    };
+
+    GlobalRuntimeContextPtr global_ctx;
+
+    using Stages = std::array<StagePtr, 3>;
+
+    Stages stages
+    {
+        std::make_shared<ExecuteAndFinalizeHorizontalPart>(),
+        std::make_shared<VerticalMergeStage>(),
+        std::make_shared<MergeProjectionsStage>()
+    };
+
+    Stages::iterator stages_iterator = stages.begin();
+
+};
+
+/// FIXME
+[[ maybe_unused]] static MergeTreeData::MutableDataPartPtr executeHere(MergeTaskPtr task)
+{
+    while (task->execute()) {}
+    return task->getFuture().get();
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
new file mode 100644
index 00000000000..304aee86e44
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
@@ -0,0 +1,191 @@
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
+
+#include <algorithm>
+
+#include <Common/setThreadName.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
+
+
+namespace DB
+{
+
+
+String MergeTreeBackgroundExecutor::toString(Type type)
+{
+    switch (type)
+    {
+        case Type::MERGE_MUTATE:
+            return "MergeMutate";
+        case Type::FETCH:
+            return "Fetch";
+        case Type::MOVE:
+            return "Move";
+    }
+    __builtin_unreachable();
+}
+
+
+void MergeTreeBackgroundExecutor::wait()
+{
+    {
+        std::lock_guard lock(mutex);
+        shutdown = true;
+        has_tasks.notify_all();
+    }
+
+    pool.wait();
+}
+
+
+bool MergeTreeBackgroundExecutor::trySchedule(ExecutableTaskPtr task)
+{
+    std::lock_guard lock(mutex);
+
+    if (shutdown)
+        return false;
+
+    auto & value = CurrentMetrics::values[metric];
+    if (value.load() >= static_cast<int64_t>(max_tasks_count))
+        return false;
+
+    pending.push_back(std::make_shared<TaskRuntimeData>(std::move(task), metric));
+
+    has_tasks.notify_one();
+    return true;
+}
+
+
+void MergeTreeBackgroundExecutor::removeTasksCorrespondingToStorage(StorageID id)
+{
+    std::vector<TaskRuntimeDataPtr> tasks_to_wait;
+    {
+        std::lock_guard lock(mutex);
+
+        /// Erase storage related tasks from pending and select active tasks to wait for
+        auto it = std::remove_if(pending.begin(), pending.end(),
+            [&] (auto item) -> bool { return item->task->getStorageID() == id; });
+        pending.erase(it, pending.end());
+
+        /// Copy items to wait for their completion
+        std::copy_if(active.begin(), active.end(), std::back_inserter(tasks_to_wait),
+            [&] (auto item) -> bool { return item->task->getStorageID() == id; });
+
+        for (auto & item : tasks_to_wait)
+            item->is_currently_deleting = true;
+    }
+
+
+    for (auto & item : tasks_to_wait)
+        item->is_done.wait();
+}
+
+
+void MergeTreeBackgroundExecutor::routine(TaskRuntimeDataPtr item)
+{
+    DENY_ALLOCATIONS_IN_SCOPE;
+
+    /// All operations with queues are considered no to do any allocations
+
+    auto erase_from_active = [this, item]
+    {
+        active.erase(std::remove(active.begin(), active.end(), item), active.end());
+    };
+
+    bool need_execute_again = false;
+
+    try
+    {
+        ALLOW_ALLOCATIONS_IN_SCOPE;
+        need_execute_again = item->task->executeStep();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+
+
+    if (need_execute_again)
+    {
+        std::lock_guard guard(mutex);
+
+        if (item->is_currently_deleting)
+        {
+            erase_from_active();
+
+            /// This is significant to order the destructors.
+            item->task.reset();
+            item->is_done.set();
+            return;
+        }
+
+        pending.push_back(item);
+        erase_from_active();
+        has_tasks.notify_one();
+        return;
+    }
+
+
+    {
+        std::lock_guard guard(mutex);
+        erase_from_active();
+        has_tasks.notify_one();
+
+        try
+        {
+            ALLOW_ALLOCATIONS_IN_SCOPE;
+            /// In a situation of a lack of memory this method can throw an exception,
+            /// because it may interact somehow with BackgroundSchedulePool, which may allocate memory
+            /// But it is rather safe, because we have try...catch block here, and another one in ThreadPool.
+            item->task->onCompleted();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+
+
+        /// We have to call reset() under a lock, otherwise a race is possible.
+        /// Imagine, that task is finally completed (last execution returned false),
+        /// we removed the task from both queues, but still have pointer.
+        /// The thread that shutdowns storage will scan queues in order to find some tasks to wait for, but will find nothing.
+        /// So, the destructor of a task and the destructor of a storage will be executed concurrently.
+        item->task.reset();
+        item->is_done.set();
+    }
+}
+
+
+void MergeTreeBackgroundExecutor::threadFunction()
+{
+    setThreadName(name.c_str());
+
+    DENY_ALLOCATIONS_IN_SCOPE;
+
+    while (true)
+    {
+        try
+        {
+            TaskRuntimeDataPtr item;
+            {
+                std::unique_lock lock(mutex);
+                has_tasks.wait(lock, [this](){ return !pending.empty() || shutdown; });
+
+                if (shutdown)
+                    break;
+
+                item = std::move(pending.front());
+                pending.pop_front();
+                active.push_back(item);
+            }
+
+            routine(std::move(item));
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
new file mode 100644
index 00000000000..6c3d904b3f0
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
@@ -0,0 +1,156 @@
+#pragma once
+
+#include <deque>
+#include <functional>
+#include <atomic>
+#include <mutex>
+#include <future>
+#include <condition_variable>
+#include <set>
+
+#include <boost/circular_buffer.hpp>
+
+#include <common/shared_ptr_helper.h>
+#include <common/logger_useful.h>
+#include <Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
+#include <Storages/MergeTree/IExecutableTask.h>
+
+
+namespace DB
+{
+
+/**
+ *  Executor for a background MergeTree related operations such as merges, mutations, fetches an so on.
+ *  It can execute only successors of ExecutableTask interface.
+ *  Which is a self-written coroutine. It suspends, when returns true from executeStep() method.
+ *
+ *  There are two queues of a tasks: pending (main queue for all the tasks) and active (currently executing).
+ *  Pending queue is needed since the number of tasks will be more than thread to execute.
+ *  Pending tasks are tasks that successfully scheduled to an executor or tasks that have some extra steps to execute.
+ *  There is an invariant, that task may occur only in one of these queue. It can occur in both queues only in critical sections.
+ *
+ *  Pending:                                              Active:
+ *
+ *  |s| |s| |s| |s| |s| |s| |s| |s| |s| |s|               |s|
+ *  |s| |s| |s| |s| |s| |s| |s| |s| |s|                   |s|
+ *  |s| |s|     |s|     |s| |s|     |s|                   |s|
+ *      |s|             |s| |s|                           |s|
+ *      |s|                 |s|
+ *                          |s|
+ *
+ *  Each task is simply a sequence of steps. Heavier tasks have longer sequences.
+ *  When a step of a task is executed, we move tasks to pending queue. And take another from the queue's head.
+ *  With these architecture all small merges / mutations will be executed faster, than bigger ones.
+ *
+ *  We use boost::circular_buffer as a container for queues not to do any allocations.
+ *
+ *  Another nuisance that we faces with is than background operations always interact with an associated Storage.
+ *  So, when a Storage want to shutdown, it must wait until all its background operaions are finished.
+ */
+class MergeTreeBackgroundExecutor : public shared_ptr_helper<MergeTreeBackgroundExecutor>
+{
+public:
+
+    enum class Type
+    {
+        MERGE_MUTATE,
+        FETCH,
+        MOVE
+    };
+
+    MergeTreeBackgroundExecutor(
+        Type type_,
+        size_t threads_count_,
+        size_t max_tasks_count_,
+        CurrentMetrics::Metric metric_)
+        : type(type_)
+        , threads_count(threads_count_)
+        , max_tasks_count(max_tasks_count_)
+        , metric(metric_)
+    {
+        name = toString(type);
+
+        pending.set_capacity(max_tasks_count);
+        active.set_capacity(max_tasks_count);
+
+        pool.setMaxThreads(std::max(1UL, threads_count));
+        pool.setMaxFreeThreads(std::max(1UL, threads_count));
+        pool.setQueueSize(std::max(1UL, threads_count));
+
+        for (size_t number = 0; number < threads_count; ++number)
+            pool.scheduleOrThrowOnError([this] { threadFunction(); });
+    }
+
+    ~MergeTreeBackgroundExecutor()
+    {
+        wait();
+    }
+
+    bool trySchedule(ExecutableTaskPtr task);
+
+    void removeTasksCorrespondingToStorage(StorageID id);
+
+    void wait();
+
+    size_t activeCount()
+    {
+        std::lock_guard lock(mutex);
+        return active.size();
+    }
+
+    size_t pendingCount()
+    {
+        std::lock_guard lock(mutex);
+        return pending.size();
+    }
+
+private:
+
+    static String toString(Type type);
+
+    Type type;
+    String name;
+    size_t threads_count{0};
+    size_t max_tasks_count{0};
+    CurrentMetrics::Metric metric;
+
+    /**
+     * Has RAII class to determine how many tasks are waiting for the execution and executing at the moment.
+     * Also has some flags and primitives to wait for current task to be executed.
+     */
+    struct TaskRuntimeData
+    {
+        TaskRuntimeData(ExecutableTaskPtr && task_, CurrentMetrics::Metric metric_)
+            : task(std::move(task_))
+            , increment(std::move(metric_))
+        {}
+
+        ExecutableTaskPtr task;
+        CurrentMetrics::Increment increment;
+        bool is_currently_deleting{false};
+        /// Actually autoreset=false is needed only for unit test
+        /// where multiple threads could remove tasks corresponding to the same storage
+        /// This scenario in not possible in reality.
+        Poco::Event is_done{/*autoreset=*/false};
+    };
+
+    using TaskRuntimeDataPtr = std::shared_ptr<TaskRuntimeData>;
+
+    void routine(TaskRuntimeDataPtr item);
+
+    void threadFunction();
+
+    /// Initially it will be empty
+    boost::circular_buffer<TaskRuntimeDataPtr> pending{0};
+    boost::circular_buffer<TaskRuntimeDataPtr> active{0};
+
+    std::mutex mutex;
+    std::condition_variable has_tasks;
+
+    std::atomic_bool shutdown{false};
+
+    ThreadPool pool;
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 4050d3fba0b..3e257acbedb 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -200,6 +200,8 @@ MergeTreeData::MergeTreeData(
     , data_parts_by_info(data_parts_indexes.get<TagByInfo>())
     , data_parts_by_state_and_info(data_parts_indexes.get<TagByStateAndInfo>())
     , parts_mover(this)
+    , background_operations_assignee(*this, BackgroundJobsAssignee::Type::DataProcessing, getContext())
+    , background_moves_assignee(*this, BackgroundJobsAssignee::Type::Moving, getContext())
 {
     const auto settings = getSettings();
     allow_nullable_key = attach || settings->allow_nullable_key;
@@ -278,10 +280,13 @@ MergeTreeData::MergeTreeData(
     if (!attach || !version_file_exists)
     {
         format_version = min_format_version;
-        auto buf = version_file.second->writeFile(version_file.first);
-        writeIntText(format_version.toUnderType(), *buf);
-        if (getContext()->getSettingsRef().fsync_metadata)
-            buf->sync();
+        if (!version_file.second->isReadOnly())
+        {
+            auto buf = version_file.second->writeFile(version_file.first);
+            writeIntText(format_version.toUnderType(), *buf);
+            if (getContext()->getSettingsRef().fsync_metadata)
+                buf->sync();
+        }
     }
     else
     {
@@ -305,6 +310,22 @@ MergeTreeData::MergeTreeData(
     if (!canUsePolymorphicParts(*settings, &reason) && !reason.empty())
         LOG_WARNING(log, "{} Settings 'min_rows_for_wide_part', 'min_bytes_for_wide_part', "
             "'min_rows_for_compact_part' and 'min_bytes_for_compact_part' will be ignored.", reason);
+
+    common_assignee_trigger = [this] (bool delay) noexcept
+    {
+        if (delay)
+            background_operations_assignee.postpone();
+        else
+            background_operations_assignee.trigger();
+    };
+
+    moves_assignee_trigger = [this] (bool delay) noexcept
+    {
+        if (delay)
+            background_moves_assignee.postpone();
+        else
+            background_moves_assignee.trigger();
+    };
 }
 
 StoragePolicyPtr MergeTreeData::getStoragePolicy() const
@@ -890,6 +911,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     {
         /// Check extra parts at different disks, in order to not allow to miss data parts at undefined disks.
         std::unordered_set<String> defined_disk_names;
+
         for (const auto & disk_ptr : disks)
             defined_disk_names.insert(disk_ptr->getName());
 
@@ -899,9 +921,10 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             {
                 for (const auto it = disk->iterateDirectory(relative_data_path); it->isValid(); it->next())
                 {
-                    MergeTreePartInfo part_info;
-                    if (MergeTreePartInfo::tryParsePartName(it->name(), &part_info, format_version))
-                        throw Exception("Part " + backQuote(it->name()) + " was found on disk " + backQuote(disk_name) + " which is not defined in the storage policy", ErrorCodes::UNKNOWN_DISK);
+                    if (MergeTreePartInfo::tryParsePartName(it->name(), format_version))
+                        throw Exception(ErrorCodes::UNKNOWN_DISK,
+                            "Part {} was found on disk {} which is not defined in the storage policy",
+                            backQuote(it->name()), backQuote(disk_name));
                 }
             }
         }
@@ -912,10 +935,13 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     for (auto disk_it = disks.rbegin(); disk_it != disks.rend(); ++disk_it)
     {
         auto disk_ptr = *disk_it;
+
         for (auto it = disk_ptr->iterateDirectory(relative_data_path); it->isValid(); it->next())
         {
             /// Skip temporary directories, file 'format_version.txt' and directory 'detached'.
-            if (startsWith(it->name(), "tmp") || it->name() == MergeTreeData::FORMAT_VERSION_FILE_NAME || it->name() == MergeTreeData::DETACHED_DIR_NAME)
+            if (startsWith(it->name(), "tmp")
+                || it->name() == MergeTreeData::FORMAT_VERSION_FILE_NAME
+                || it->name() == MergeTreeData::DETACHED_DIR_NAME)
                 continue;
 
             if (!startsWith(it->name(), MergeTreeWriteAheadLog::WAL_FILE_NAME))
@@ -952,6 +978,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
 
     DataPartsVector broken_parts_to_detach;
     size_t suspicious_broken_parts = 0;
+    size_t suspicious_broken_parts_bytes = 0;
 
     std::atomic<bool> has_adaptive_parts = false;
     std::atomic<bool> has_non_adaptive_parts = false;
@@ -962,25 +989,35 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     {
         pool.scheduleOrThrowOnError([&]
         {
-            const auto & part_name = part_names_with_disk.first;
-            const auto part_disk_ptr = part_names_with_disk.second;
+            const auto & [part_name, part_disk_ptr] = part_names_with_disk;
 
-            MergeTreePartInfo part_info;
-            if (!MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
+            auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version);
+
+            if (!part_opt)
                 return;
 
             auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, part_disk_ptr, 0);
-            auto part = createPart(part_name, part_info, single_disk_volume, part_name);
+            auto part = createPart(part_name, *part_opt, single_disk_volume, part_name);
             bool broken = false;
 
             String part_path = fs::path(relative_data_path) / part_name;
             String marker_path = fs::path(part_path) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME;
+
             if (part_disk_ptr->exists(marker_path))
             {
-                LOG_WARNING(log, "Detaching stale part {}{}, which should have been deleted after a move. That can only happen after unclean restart of ClickHouse after move of a part having an operation blocking that stale copy of part.", getFullPathOnDisk(part_disk_ptr), part_name);
+                /// NOTE: getBytesOnDisk() cannot be used here, since it maybe zero of checksums.txt will not exist
+                size_t size_of_part = IMergeTreeDataPart::calculateTotalSizeOnDisk(part->volume->getDisk(), part->getFullRelativePath());
+                LOG_WARNING(log,
+                    "Detaching stale part {}{} (size: {}), which should have been deleted after a move. "
+                    "That can only happen after unclean restart of ClickHouse after move of a part having an operation blocking that stale copy of part.",
+                    getFullPathOnDisk(part_disk_ptr), part_name, formatReadableSizeWithBinarySuffix(size_of_part));
                 std::lock_guard loading_lock(mutex);
+
                 broken_parts_to_detach.push_back(part);
+
                 ++suspicious_broken_parts;
+                suspicious_broken_parts_bytes += size_of_part;
+
                 return;
             }
 
@@ -1008,25 +1045,38 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             /// Ignore broken parts that can appear as a result of hard server restart.
             if (broken)
             {
-                LOG_ERROR(log, "Detaching broken part {}{}. If it happened after update, it is likely because of backward incompability. You need to resolve this manually", getFullPathOnDisk(part_disk_ptr), part_name);
+                /// NOTE: getBytesOnDisk() cannot be used here, since it maybe zero of checksums.txt will not exist
+                size_t size_of_part = IMergeTreeDataPart::calculateTotalSizeOnDisk(part->volume->getDisk(), part->getFullRelativePath());
+
+                LOG_ERROR(log,
+                    "Detaching broken part {}{} (size: {}). "
+                    "If it happened after update, it is likely because of backward incompability. "
+                    "You need to resolve this manually",
+                    getFullPathOnDisk(part_disk_ptr), part_name, formatReadableSizeWithBinarySuffix(size_of_part));
                 std::lock_guard loading_lock(mutex);
+
                 broken_parts_to_detach.push_back(part);
+
                 ++suspicious_broken_parts;
+                suspicious_broken_parts_bytes += size_of_part;
 
                 return;
             }
+
             if (!part->index_granularity_info.is_adaptive)
                 has_non_adaptive_parts.store(true, std::memory_order_relaxed);
             else
                 has_adaptive_parts.store(true, std::memory_order_relaxed);
 
             part->modification_time = part_disk_ptr->getLastModified(fs::path(relative_data_path) / part_name).epochTime();
+
             /// Assume that all parts are Committed, covered parts will be detected and marked as Outdated later
             part->setState(DataPartState::Committed);
 
             std::lock_guard loading_lock(mutex);
+
             if (!data_parts_indexes.insert(part).second)
-                throw Exception("Part " + part->name + " already exists", ErrorCodes::DUPLICATE_DATA_PART);
+                throw Exception(ErrorCodes::DUPLICATE_DATA_PART, "Part {} already exists", part->name);
 
             addPartContributionToDataVolume(part);
         });
@@ -1055,8 +1105,14 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     has_non_adaptive_index_granularity_parts = has_non_adaptive_parts;
 
     if (suspicious_broken_parts > settings->max_suspicious_broken_parts && !skip_sanity_checks)
-        throw Exception("Suspiciously many (" + toString(suspicious_broken_parts) + ") broken parts to remove.",
-            ErrorCodes::TOO_MANY_UNEXPECTED_DATA_PARTS);
+        throw Exception(ErrorCodes::TOO_MANY_UNEXPECTED_DATA_PARTS,
+            "Suspiciously many ({}) broken parts to remove.",
+            suspicious_broken_parts);
+
+    if (suspicious_broken_parts_bytes > settings->max_suspicious_broken_parts_bytes && !skip_sanity_checks)
+        throw Exception(ErrorCodes::TOO_MANY_UNEXPECTED_DATA_PARTS,
+            "Suspiciously big size ({}) of all broken parts to remove.",
+            formatReadableSizeWithBinarySuffix(suspicious_broken_parts_bytes));
 
     for (auto & part : broken_parts_to_detach)
         part->renameToDetached("broken-on-start"); /// detached parts must not have '_' in prefixes
@@ -3310,11 +3366,12 @@ RestoreDataTasks MergeTreeData::restoreDataPartsFromBackup(const BackupPtr & bac
     Strings part_names = backup->list(data_path_in_backup);
     for (const String & part_name : part_names)
     {
-        MergeTreePartInfo part_info;
-        if (!MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
+        const auto part_info = MergeTreePartInfo::tryParsePartName(part_name, format_version);
+
+        if (!part_info)
             continue;
 
-        if (!partition_ids.empty() && !partition_ids.contains(part_info.partition_id))
+        if (!partition_ids.empty() && !partition_ids.contains(part_info->partition_id))
             continue;
 
         UInt64 total_size_of_part = 0;
@@ -3351,7 +3408,7 @@ RestoreDataTasks MergeTreeData::restoreDataPartsFromBackup(const BackupPtr & bac
             }
 
             auto single_disk_volume = std::make_shared<SingleDiskVolume>(disk->getName(), disk, 0);
-            auto part = createPart(part_name, part_info, single_disk_volume, relative_temp_part_dir);
+            auto part = createPart(part_name, *part_info, single_disk_volume, relative_temp_part_dir);
             part->loadColumnsChecksumsIndexes(false, true);
             renameTempPartAndAdd(part, increment);
         };
@@ -3415,10 +3472,10 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr loc
 
     if (fields_count)
     {
-        ReadBufferFromMemory left_paren_buf("(", 1);
-        ReadBufferFromMemory fields_buf(partition_ast.fields_str.data(), partition_ast.fields_str.size());
-        ReadBufferFromMemory right_paren_buf(")", 1);
-        ConcatReadBuffer buf({&left_paren_buf, &fields_buf, &right_paren_buf});
+        ConcatReadBuffer buf;
+        buf.appendBuffer(std::make_unique<ReadBufferFromMemory>("(", 1));
+        buf.appendBuffer(std::make_unique<ReadBufferFromMemory>(partition_ast.fields_str.data(), partition_ast.fields_str.size()));
+        buf.appendBuffer(std::make_unique<ReadBufferFromMemory>(")", 1));
 
         auto input_format = FormatFactory::instance().getInput(
             "Values",
@@ -3563,11 +3620,10 @@ std::vector<DetachedPartInfo> MergeTreeData::getDetachedParts() const
         {
             for (auto it = disk->iterateDirectory(detached_path); it->isValid(); it->next())
             {
-                res.emplace_back();
-                auto & part = res.back();
-
-                DetachedPartInfo::tryParseDetachedPartName(it->name(), part, format_version);
+                auto part = DetachedPartInfo::parseDetachedPartName(it->name(), format_version);
                 part.disk = disk->getName();
+
+                res.push_back(std::move(part));
             }
         }
     }
@@ -3638,7 +3694,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
         validateDetachedPartName(part_id);
         renamed_parts.addPart(part_id, "attaching_" + part_id);
 
-        if (MergeTreePartInfo::tryParsePartName(part_id, nullptr, format_version))
+        if (MergeTreePartInfo::tryParsePartName(part_id, format_version))
             name_to_disk[part_id] = getDiskForPart(part_id, source_dir);
     }
     else
@@ -3654,12 +3710,11 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
             for (auto it = disk->iterateDirectory(relative_data_path + source_dir); it->isValid(); it->next())
             {
                 const String & name = it->name();
-                MergeTreePartInfo part_info;
 
                 // TODO what if name contains "_tryN" suffix?
                 /// Parts with prefix in name (e.g. attaching_1_3_3_0, deleting_1_3_3_0) will be ignored
-                if (!MergeTreePartInfo::tryParsePartName(name, &part_info, format_version)
-                    || part_info.partition_id != partition_id)
+                if (auto part_opt = MergeTreePartInfo::tryParsePartName(name, format_version);
+                    !part_opt || part_opt->partition_id != partition_id)
                 {
                     continue;
                 }
@@ -4205,10 +4260,10 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
 
         const auto & part = parts[part_idx];
 
-        if (!part->minmax_idx.initialized)
+        if (!part->minmax_idx->initialized)
             throw Exception("Found a non-empty part with uninitialized minmax_idx. It's a bug", ErrorCodes::LOGICAL_ERROR);
 
-        size_t minmax_idx_size = part->minmax_idx.hyperrectangle.size();
+        size_t minmax_idx_size = part->minmax_idx->hyperrectangle.size();
         if (2 * minmax_idx_size + 1 != minmax_count_columns.size())
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
@@ -4223,7 +4278,7 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
             size_t max_pos = i * 2 + 1;
             auto & min_column = assert_cast<ColumnAggregateFunction &>(*minmax_count_columns[min_pos]);
             auto & max_column = assert_cast<ColumnAggregateFunction &>(*minmax_count_columns[max_pos]);
-            const auto & range = part->minmax_idx.hyperrectangle[i];
+            const auto & range = part->minmax_idx->hyperrectangle[i];
             insert(min_column, range.left);
             insert(max_column, range.right);
         }
@@ -4269,9 +4324,16 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
 
     const auto & query_ptr = query_info.query;
 
-    // Currently projections don't support final yet.
-    if (auto * select = query_ptr->as<ASTSelectQuery>(); select && select->final())
-        return false;
+    if (auto * select = query_ptr->as<ASTSelectQuery>(); select)
+    {
+        // Currently projections don't support final yet.
+        if (select->final())
+            return false;
+
+        // Currently projections don't support ARRAY JOIN yet.
+        if (select->arrayJoinExpressionList().first)
+            return false;
+    }
 
     // Currently projections don't support sampling yet.
     if (settings.parallel_replicas_count > 1)
@@ -5011,7 +5073,7 @@ MergeTreeData::CurrentlyMovingPartsTagger::~CurrentlyMovingPartsTagger()
     }
 }
 
-bool MergeTreeData::scheduleDataMovingJob(IBackgroundJobExecutor & executor)
+bool MergeTreeData::scheduleDataMovingJob(BackgroundJobsAssignee & assignee)
 {
     if (parts_mover.moves_blocker.isCancelled())
         return false;
@@ -5020,10 +5082,11 @@ bool MergeTreeData::scheduleDataMovingJob(IBackgroundJobExecutor & executor)
     if (moving_tagger->parts_to_move.empty())
         return false;
 
-    executor.execute({[this, moving_tagger] () mutable
-    {
-        return moveParts(moving_tagger);
-    }, PoolType::MOVE});
+    assignee.scheduleMoveTask(ExecutableLambdaAdapter::create(
+        [this, moving_tagger] () mutable
+        {
+            return moveParts(moving_tagger);
+        }, moves_assignee_trigger, getStorageID()));
     return true;
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 9d1a337b7c2..bdebd5e9187 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -3,6 +3,7 @@
 #include <Common/SimpleIncrement.h>
 #include <Common/MultiVersion.h>
 #include <Storages/IStorage.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
@@ -57,7 +58,6 @@ class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 using ManyExpressionActions = std::vector<ExpressionActionsPtr>;
 class MergeTreeDeduplicationLog;
-class IBackgroundJobExecutor;
 
 namespace ErrorCodes
 {
@@ -273,6 +273,8 @@ public:
         void clear() { precommitted_parts.clear(); }
     };
 
+    using TransactionUniquePtr = std::unique_ptr<Transaction>;
+
     using PathWithDisk = std::pair<String, DiskPtr>;
 
     struct PartsTemporaryRename : private boost::noncopyable
@@ -827,9 +829,9 @@ public:
     PinnedPartUUIDsPtr getPinnedPartUUIDs() const;
 
     /// Schedules background job to like merge/mutate/fetch an executor
-    virtual bool scheduleDataProcessingJob(IBackgroundJobExecutor & executor) = 0;
+    virtual bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) = 0;
     /// Schedules job to move parts between disks/volumes and so on.
-    bool scheduleDataMovingJob(IBackgroundJobExecutor & executor);
+    bool scheduleDataMovingJob(BackgroundJobsAssignee & assignee);
     bool areBackgroundMovesNeeded() const;
 
     /// Lock part in zookeeper for shared data in several nodes
@@ -859,6 +861,7 @@ protected:
     friend struct ReplicatedMergeTreeTableMetadata;
     friend class StorageReplicatedMergeTree;
     friend class MergeTreeDataWriter;
+    friend class MergeTask;
 
     bool require_part_metadata;
 
@@ -923,6 +926,23 @@ protected:
 
     MergeTreePartsMover parts_mover;
 
+    /// Executors are common for both ReplicatedMergeTree and plain MergeTree
+    /// but they are being started and finished in derived classes, so let them be protected.
+    ///
+    /// Why there are two executors, not one? Or an executor for each kind of operation?
+    /// It is historically formed.
+    /// Another explanation is that moving operations are common for Replicated and Plain MergeTree classes.
+    /// Task that schedules this operations is executed with its own timetable and triggered in a specific places in code.
+    /// And for ReplicatedMergeTree we don't have LogEntry type for this operation.
+    BackgroundJobsAssignee background_operations_assignee;
+    BackgroundJobsAssignee background_moves_assignee;
+
+    /// Strongly connected with two fields above.
+    /// Every task that is finished will ask to assign a new one into an executor.
+    /// These callbacks will be passed to the constructor of each task.
+    std::function<void(bool)> common_assignee_trigger;
+    std::function<void(bool)> moves_assignee_trigger;
+
     using DataPartIteratorByInfo = DataPartsIndexes::index<TagByInfo>::type::iterator;
     using DataPartIteratorByStateAndInfo = DataPartsIndexes::index<TagByStateAndInfo>::type::iterator;
 
@@ -1128,4 +1148,12 @@ struct CurrentlySubmergingEmergingTagger
     ~CurrentlySubmergingEmergingTagger();
 };
 
+
+/// TODO: move it somewhere
+[[ maybe_unused ]] static bool needSyncPart(size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
+{
+    return ((settings.min_rows_to_fsync_after_merge && input_rows >= settings.min_rows_to_fsync_after_merge)
+        || (settings.min_compressed_bytes_to_fsync_after_merge && input_bytes >= settings.min_compressed_bytes_to_fsync_after_merge));
+}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 18691c5b571..bf3d98e3fcf 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -9,6 +9,12 @@
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeProgress.h>
+#include <Storages/MergeTree/MergeTask.h>
+
 #include <DataStreams/TTLBlockInputStream.h>
 #include <DataStreams/TTLCalcInputStream.h>
 #include <DataStreams/DistinctSortedBlockInputStream.h>
@@ -40,7 +46,6 @@
 
 #include <boost/algorithm/string/replace.hpp>
 
-
 namespace ProfileEvents
 {
     extern const Event MergedRows;
@@ -60,9 +65,7 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int DIRECTORY_ALREADY_EXISTS;
     extern const int LOGICAL_ERROR;
-    extern const int ABORTED;
 }
 
 /// Do not start to merge parts, if free space is less than sum size of parts times specified coefficient.
@@ -74,87 +77,6 @@ static const double DISK_USAGE_COEFFICIENT_TO_SELECT = 2;
 ///  because between selecting parts to merge and doing merge, amount of free space could have decreased.
 static const double DISK_USAGE_COEFFICIENT_TO_RESERVE = 1.1;
 
-void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_)
-{
-    if (parts_.empty())
-        return;
-
-    size_t sum_rows = 0;
-    size_t sum_bytes_uncompressed = 0;
-    MergeTreeDataPartType future_part_type = MergeTreeDataPartType::UNKNOWN;
-    for (const auto & part : parts_)
-    {
-        sum_rows += part->rows_count;
-        sum_bytes_uncompressed += part->getTotalColumnsSize().data_uncompressed;
-        future_part_type = std::min(future_part_type, part->getType());
-    }
-
-    /// NOTE: We don't support merging into an in-memory part yet.
-    auto chosen_type = parts_.front()->storage.choosePartTypeOnDisk(sum_bytes_uncompressed, sum_rows);
-    future_part_type = std::min(future_part_type, chosen_type);
-    assign(std::move(parts_), future_part_type);
-}
-
-void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type)
-{
-    if (parts_.empty())
-        return;
-
-    for (const MergeTreeData::DataPartPtr & part : parts_)
-    {
-        const MergeTreeData::DataPartPtr & first_part = parts_.front();
-
-        if (part->partition.value != first_part->partition.value)
-            throw Exception(
-                "Attempting to merge parts " + first_part->name + " and " + part->name + " that are in different partitions",
-                ErrorCodes::LOGICAL_ERROR);
-    }
-
-    parts = std::move(parts_);
-
-    UInt32 max_level = 0;
-    Int64 max_mutation = 0;
-    for (const auto & part : parts)
-    {
-        max_level = std::max(max_level, part->info.level);
-        max_mutation = std::max(max_mutation, part->info.mutation);
-    }
-
-    type = future_part_type;
-    part_info.partition_id = parts.front()->info.partition_id;
-    part_info.min_block = parts.front()->info.min_block;
-    part_info.max_block = parts.back()->info.max_block;
-    part_info.level = max_level + 1;
-    part_info.mutation = max_mutation;
-
-    if (parts.front()->storage.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
-    {
-        DayNum min_date = DayNum(std::numeric_limits<UInt16>::max());
-        DayNum max_date = DayNum(std::numeric_limits<UInt16>::min());
-        for (const auto & part : parts)
-        {
-            /// NOTE: getting min and max dates from part names (instead of part data) because we want
-            /// the merged part name be determined only by source part names.
-            /// It is simpler this way when the real min and max dates for the block range can change
-            /// (e.g. after an ALTER DELETE command).
-            DayNum part_min_date;
-            DayNum part_max_date;
-            MergeTreePartInfo::parseMinMaxDatesFromPartName(part->name, part_min_date, part_max_date);
-            min_date = std::min(min_date, part_min_date);
-            max_date = std::max(max_date, part_max_date);
-        }
-
-        name = part_info.getPartNameV0(min_date, max_date);
-    }
-    else
-        name = part_info.getPartName();
-}
-
-void FutureMergedMutatedPart::updatePath(const MergeTreeData & storage, const ReservationPtr & reservation)
-{
-    path = storage.getFullPathOnDisk(reservation->getDisk()) + name + "/";
-}
-
 MergeTreeDataMergerMutator::MergeTreeDataMergerMutator(MergeTreeData & data_, size_t background_pool_size_)
     : data(data_), background_pool_size(background_pool_size_), log(&Poco::Logger::get(data.getLogName() + " (MergerMutator)"))
 {
@@ -172,7 +94,7 @@ UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge() const
 UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge(size_t pool_size, size_t pool_used) const
 {
     if (pool_used > pool_size)
-        throw Exception("Logical error: invalid arguments passed to getMaxSourcePartsSize: pool_used > pool_size", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: invalid arguments passed to getMaxSourcePartsSize: pool_used = {} > pool_size = {}", pool_used, pool_size);
 
     size_t free_entries = pool_size - pool_used;
     const auto data_settings = data.getSettings();
@@ -210,7 +132,7 @@ UInt64 MergeTreeDataMergerMutator::getMaxSourcePartSizeForMutation() const
 }
 
 SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
-    FutureMergedMutatedPart & future_part,
+    FutureMergedMutatedPartPtr future_part,
     bool aggressive,
     size_t max_total_size_to_merge,
     const AllowedMergingPredicate & can_merge_callback,
@@ -339,7 +261,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
         parts_to_merge = delete_ttl_selector.select(parts_ranges, max_total_size_to_merge);
         if (!parts_to_merge.empty())
         {
-            future_part.merge_type = MergeType::TTL_DELETE;
+            future_part->merge_type = MergeType::TTL_DELETE;
         }
         else if (metadata_snapshot->hasAnyRecompressionTTL())
         {
@@ -351,7 +273,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
 
             parts_to_merge = recompress_ttl_selector.select(parts_ranges, max_total_size_to_merge);
             if (!parts_to_merge.empty())
-                future_part.merge_type = MergeType::TTL_RECOMPRESS;
+                future_part->merge_type = MergeType::TTL_RECOMPRESS;
         }
     }
 
@@ -388,12 +310,12 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
     }
 
     LOG_DEBUG(log, "Selected {} parts from {} to {}", parts.size(), parts.front()->name, parts.back()->name);
-    future_part.assign(std::move(parts));
+    future_part->assign(std::move(parts));
     return SelectPartsDecision::SELECTED;
 }
 
 SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinPartition(
-    FutureMergedMutatedPart & future_part,
+    FutureMergedMutatedPartPtr future_part,
     UInt64 & available_disk_space,
     const AllowedMergingPredicate & can_merge,
     const String & partition_id,
@@ -465,7 +387,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinParti
     }
 
     LOG_DEBUG(log, "Selected {} parts from {} to {}", parts.size(), parts.front()->name, parts.back()->name);
-    future_part.assign(std::move(parts));
+    future_part->assign(std::move(parts));
 
     available_disk_space -= required_disk_space;
     return SelectPartsDecision::SELECTED;
@@ -489,951 +411,63 @@ MergeTreeData::DataPartsVector MergeTreeDataMergerMutator::selectAllPartsFromPar
     return parts_from_partition;
 }
 
-
-/// PK columns are sorted and merged, ordinary columns are gathered using info from merge step
-static void extractMergingAndGatheringColumns(
-    const NamesAndTypesList & storage_columns,
-    const ExpressionActionsPtr & sorting_key_expr,
-    const IndicesDescription & indexes,
-    const MergeTreeData::MergingParams & merging_params,
-    NamesAndTypesList & gathering_columns, Names & gathering_column_names,
-    NamesAndTypesList & merging_columns, Names & merging_column_names)
-{
-    Names sort_key_columns_vec = sorting_key_expr->getRequiredColumns();
-    std::set<String> key_columns(sort_key_columns_vec.cbegin(), sort_key_columns_vec.cend());
-    for (const auto & index : indexes)
-    {
-        Names index_columns_vec = index.expression->getRequiredColumns();
-        std::copy(index_columns_vec.cbegin(), index_columns_vec.cend(),
-                  std::inserter(key_columns, key_columns.end()));
-    }
-
-    /// Force sign column for Collapsing mode
-    if (merging_params.mode == MergeTreeData::MergingParams::Collapsing)
-        key_columns.emplace(merging_params.sign_column);
-
-    /// Force version column for Replacing mode
-    if (merging_params.mode == MergeTreeData::MergingParams::Replacing)
-        key_columns.emplace(merging_params.version_column);
-
-    /// Force sign column for VersionedCollapsing mode. Version is already in primary key.
-    if (merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing)
-        key_columns.emplace(merging_params.sign_column);
-
-    /// Force to merge at least one column in case of empty key
-    if (key_columns.empty())
-        key_columns.emplace(storage_columns.front().name);
-
-    /// TODO: also force "summing" and "aggregating" columns to make Horizontal merge only for such columns
-
-    for (const auto & column : storage_columns)
-    {
-        if (key_columns.count(column.name))
-        {
-            merging_columns.emplace_back(column);
-            merging_column_names.emplace_back(column.name);
-        }
-        else
-        {
-            gathering_columns.emplace_back(column);
-            gathering_column_names.emplace_back(column.name);
-        }
-    }
-}
-
-/* Allow to compute more accurate progress statistics */
-class ColumnSizeEstimator
-{
-    MergeTreeData::DataPart::ColumnToSize map;
-public:
-
-    /// Stores approximate size of columns in bytes
-    /// Exact values are not required since it used for relative values estimation (progress).
-    size_t sum_total = 0;
-    size_t sum_index_columns = 0;
-    size_t sum_ordinary_columns = 0;
-
-    ColumnSizeEstimator(const MergeTreeData::DataPart::ColumnToSize & map_, const Names & key_columns, const Names & ordinary_columns)
-        : map(map_)
-    {
-        for (const auto & name : key_columns)
-            if (!map.count(name)) map[name] = 0;
-        for (const auto & name : ordinary_columns)
-            if (!map.count(name)) map[name] = 0;
-
-        for (const auto & name : key_columns)
-            sum_index_columns += map.at(name);
-
-        for (const auto & name : ordinary_columns)
-            sum_ordinary_columns += map.at(name);
-
-        sum_total = std::max(static_cast<decltype(sum_index_columns)>(1), sum_index_columns + sum_ordinary_columns);
-    }
-
-    Float64 columnWeight(const String & column) const
-    {
-        return static_cast<Float64>(map.at(column)) / sum_total;
-    }
-
-    Float64 keyColumnsWeight() const
-    {
-        return static_cast<Float64>(sum_index_columns) / sum_total;
-    }
-};
-
-/** Progress callback.
-  * What it should update:
-  * - approximate progress
-  * - amount of read rows
-  * - various metrics
-  * - time elapsed for current merge.
-  */
-
-/// Auxiliary struct that for each merge stage stores its current progress.
-/// A stage is: the horizontal stage + a stage for each gathered column (if we are doing a
-/// Vertical merge) or a mutation of a single part. During a single stage all rows are read.
-struct MergeStageProgress
-{
-    explicit MergeStageProgress(Float64 weight_)
-        : is_first(true) , weight(weight_)
-    {
-    }
-
-    MergeStageProgress(Float64 initial_progress_, Float64 weight_)
-        : initial_progress(initial_progress_), is_first(false), weight(weight_)
-    {
-    }
-
-    Float64 initial_progress = 0.0;
-    bool is_first;
-    Float64 weight;
-
-    UInt64 total_rows = 0;
-    UInt64 rows_read = 0;
-};
-
-class MergeProgressCallback
-{
-public:
-    MergeProgressCallback(
-        MergeList::Entry & merge_entry_, UInt64 & watch_prev_elapsed_, MergeStageProgress & stage_)
-        : merge_entry(merge_entry_)
-        , watch_prev_elapsed(watch_prev_elapsed_)
-        , stage(stage_)
-    {
-        updateWatch();
-    }
-
-    MergeList::Entry & merge_entry;
-    UInt64 & watch_prev_elapsed;
-    MergeStageProgress & stage;
-
-    void updateWatch()
-    {
-        UInt64 watch_curr_elapsed = merge_entry->watch.elapsed();
-        ProfileEvents::increment(ProfileEvents::MergesTimeMilliseconds, (watch_curr_elapsed - watch_prev_elapsed) / 1000000);
-        watch_prev_elapsed = watch_curr_elapsed;
-    }
-
-    void operator() (const Progress & value)
-    {
-        ProfileEvents::increment(ProfileEvents::MergedUncompressedBytes, value.read_bytes);
-        if (stage.is_first)
-        {
-            ProfileEvents::increment(ProfileEvents::MergedRows, value.read_rows);
-            ProfileEvents::increment(ProfileEvents::Merge);
-        }
-        updateWatch();
-
-        merge_entry->bytes_read_uncompressed += value.read_bytes;
-        if (stage.is_first)
-            merge_entry->rows_read += value.read_rows;
-
-        stage.total_rows += value.total_rows_to_read;
-        stage.rows_read += value.read_rows;
-        if (stage.total_rows > 0)
-        {
-            merge_entry->progress.store(
-                stage.initial_progress + stage.weight * stage.rows_read / stage.total_rows,
-                std::memory_order_relaxed);
-        }
-    }
-};
-
-static bool needSyncPart(size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
-{
-    return ((settings.min_rows_to_fsync_after_merge && input_rows >= settings.min_rows_to_fsync_after_merge)
-        || (settings.min_compressed_bytes_to_fsync_after_merge && input_bytes >= settings.min_compressed_bytes_to_fsync_after_merge));
-}
-
-
 /// parts should be sorted.
-MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTemporaryPart(
-    const FutureMergedMutatedPart & future_part,
+MergeTaskPtr MergeTreeDataMergerMutator::mergePartsToTemporaryPart(
+    FutureMergedMutatedPartPtr future_part,
     const StorageMetadataPtr & metadata_snapshot,
-    MergeList::Entry & merge_entry,
-    TableLockHolder & holder,
+    MergeList::Entry * merge_entry,
+    TableLockHolder holder,
     time_t time_of_merge,
     ContextPtr context,
-    const ReservationPtr & space_reservation,
+    ReservationSharedPtr space_reservation,
     bool deduplicate,
     const Names & deduplicate_by_columns,
     const MergeTreeData::MergingParams & merging_params,
-    const IMergeTreeDataPart * parent_part,
-    const String & prefix)
+    const IMergeTreeDataPart * /*parent_part*/,
+    const String & /*prefix*/)
 {
-    const String tmp_prefix = parent_part ? prefix : "tmp_merge_";
-
-    if (merges_blocker.isCancelled())
-        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
-
-    /// We don't want to perform merge assigned with TTL as normal merge, so
-    /// throw exception
-    if (isTTLMergeType(future_part.merge_type) && ttl_merges_blocker.isCancelled())
-        throw Exception("Cancelled merging parts with TTL", ErrorCodes::ABORTED);
-
-    const MergeTreeData::DataPartsVector & parts = future_part.parts;
-
-    LOG_DEBUG(log, "Merging {} parts: from {} to {} into {}", parts.size(), parts.front()->name, parts.back()->name, future_part.type.toString());
-    if (deduplicate)
-    {
-        if (deduplicate_by_columns.empty())
-            LOG_DEBUG(log, "DEDUPLICATE BY all columns");
-        else
-            LOG_DEBUG(log, "DEDUPLICATE BY ('{}')", fmt::join(deduplicate_by_columns, "', '"));
-    }
-
-    auto disk = space_reservation->getDisk();
-    String part_path = data.relative_data_path;
-    String new_part_tmp_path = part_path + tmp_prefix + future_part.name + (parent_part ? ".proj" : "") + "/";
-    if (disk->exists(new_part_tmp_path))
-        throw Exception("Directory " + fullPath(disk, new_part_tmp_path) + " already exists", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
-
-
-    Names all_column_names = metadata_snapshot->getColumns().getNamesOfPhysical();
-    NamesAndTypesList storage_columns = metadata_snapshot->getColumns().getAllPhysical();
-    const auto data_settings = data.getSettings();
-
-    NamesAndTypesList gathering_columns;
-    NamesAndTypesList merging_columns;
-    Names gathering_column_names, merging_column_names;
-    extractMergingAndGatheringColumns(
-        storage_columns,
-        metadata_snapshot->getSortingKey().expression,
-        metadata_snapshot->getSecondaryIndices(),
+    (void)holder;
+    return std::make_shared<MergeTask>(
+        future_part,
+        const_cast<StorageMetadataPtr &>(metadata_snapshot),
+        merge_entry,
+        time_of_merge,
+        context,
+        space_reservation,
+        deduplicate,
+        deduplicate_by_columns,
         merging_params,
-        gathering_columns,
-        gathering_column_names,
-        merging_columns,
-        merging_column_names);
-
-    auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + future_part.name, disk, 0);
-    MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(
-        future_part.name,
-        future_part.type,
-        future_part.part_info,
-        single_disk_volume,
-        tmp_prefix + future_part.name + (parent_part ? ".proj" : ""),
-        parent_part);
-
-    new_data_part->uuid = future_part.uuid;
-    new_data_part->setColumns(storage_columns);
-    new_data_part->partition.assign(future_part.getPartition());
-    new_data_part->is_temp = parent_part == nullptr;
-
-    bool need_remove_expired_values = false;
-    bool force_ttl = false;
-    for (const auto & part : parts)
-    {
-        if (metadata_snapshot->hasAnyTTL() && !part->checkAllTTLCalculated(metadata_snapshot))
-        {
-            LOG_INFO(log, "Some TTL values were not calculated for part {}. Will calculate them forcefully during merge.", part->name);
-            need_remove_expired_values = true;
-            force_ttl = true;
-        }
-        else
-        {
-            new_data_part->ttl_infos.update(part->ttl_infos);
-        }
-    }
-
-    const auto & part_min_ttl = new_data_part->ttl_infos.part_min_ttl;
-    if (part_min_ttl && part_min_ttl <= time_of_merge)
-        need_remove_expired_values = true;
-
-    if (need_remove_expired_values && ttl_merges_blocker.isCancelled())
-    {
-        LOG_INFO(log, "Part {} has values with expired TTL, but merges with TTL are cancelled.", new_data_part->name);
-        need_remove_expired_values = false;
-    }
-
-    size_t sum_input_rows_upper_bound = merge_entry->total_rows_count;
-    size_t sum_compressed_bytes_upper_bound = merge_entry->total_size_bytes_compressed;
-    MergeAlgorithm chosen_merge_algorithm = chooseMergeAlgorithm(
-        parts, sum_input_rows_upper_bound, gathering_columns, deduplicate, need_remove_expired_values, merging_params);
-    merge_entry->merge_algorithm.store(chosen_merge_algorithm, std::memory_order_relaxed);
-
-    LOG_DEBUG(log, "Selected MergeAlgorithm: {}", toString(chosen_merge_algorithm));
-
-    /// Note: this is done before creating input streams, because otherwise data.data_parts_mutex
-    /// (which is locked in data.getTotalActiveSizeInBytes())
-    /// (which is locked in shared mode when input streams are created) and when inserting new data
-    /// the order is reverse. This annoys TSan even though one lock is locked in shared mode and thus
-    /// deadlock is impossible.
-    auto compression_codec = data.getCompressionCodecForPart(merge_entry->total_size_bytes_compressed, new_data_part->ttl_infos, time_of_merge);
-
-    auto tmp_disk = context->getTemporaryVolume()->getDisk();
-    std::unique_ptr<TemporaryFile> rows_sources_file;
-    std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf;
-    std::unique_ptr<WriteBuffer> rows_sources_write_buf;
-    std::optional<ColumnSizeEstimator> column_sizes;
-
-    SyncGuardPtr sync_guard;
-
-    if (chosen_merge_algorithm == MergeAlgorithm::Vertical)
-    {
-        rows_sources_file = createTemporaryFile(tmp_disk->getPath());
-        rows_sources_uncompressed_write_buf = tmp_disk->writeFile(fileName(rows_sources_file->path()));
-        rows_sources_write_buf = std::make_unique<CompressedWriteBuffer>(*rows_sources_uncompressed_write_buf);
-
-        MergeTreeData::DataPart::ColumnToSize merged_column_to_size;
-        for (const MergeTreeData::DataPartPtr & part : parts)
-            part->accumulateColumnSizes(merged_column_to_size);
-
-        column_sizes = ColumnSizeEstimator(merged_column_to_size, merging_column_names, gathering_column_names);
-
-        if (data.getSettings()->fsync_part_directory)
-            sync_guard = disk->getDirectorySyncGuard(new_part_tmp_path);
-    }
-    else
-    {
-        merging_columns = storage_columns;
-        merging_column_names = all_column_names;
-        gathering_columns.clear();
-        gathering_column_names.clear();
-    }
-
-    /** Read from all parts, merge and write into a new one.
-      * In passing, we calculate expression for sorting.
-      */
-    Pipes pipes;
-    UInt64 watch_prev_elapsed = 0;
-
-    /// We count total amount of bytes in parts
-    /// and use direct_io if there is more than min_merge_bytes_to_use_direct_io
-    bool read_with_direct_io = false;
-    if (data_settings->min_merge_bytes_to_use_direct_io != 0)
-    {
-        size_t total_size = 0;
-        for (const auto & part : parts)
-        {
-            total_size += part->getBytesOnDisk();
-            if (total_size >= data_settings->min_merge_bytes_to_use_direct_io)
-            {
-                LOG_DEBUG(log, "Will merge parts reading files in O_DIRECT");
-                read_with_direct_io = true;
-
-                break;
-            }
-        }
-    }
-
-    MergeStageProgress horizontal_stage_progress(
-        column_sizes ? column_sizes->keyColumnsWeight() : 1.0);
-
-    for (const auto & part : parts)
-    {
-        auto input = std::make_unique<MergeTreeSequentialSource>(
-            data, metadata_snapshot, part, merging_column_names, read_with_direct_io, true);
-
-        input->setProgressCallback(
-            MergeProgressCallback(merge_entry, watch_prev_elapsed, horizontal_stage_progress));
-
-        Pipe pipe(std::move(input));
-
-        if (metadata_snapshot->hasSortingKey())
-        {
-            pipe.addSimpleTransform([&metadata_snapshot](const Block & header)
-            {
-                return std::make_shared<ExpressionTransform>(header, metadata_snapshot->getSortingKey().expression);
-            });
-        }
-
-        pipes.emplace_back(std::move(pipe));
-    }
-
-    Names sort_columns = metadata_snapshot->getSortingKeyColumns();
-    SortDescription sort_description;
-    size_t sort_columns_size = sort_columns.size();
-    sort_description.reserve(sort_columns_size);
-
-    Names partition_key_columns = metadata_snapshot->getPartitionKey().column_names;
-
-    Block header = pipes.at(0).getHeader();
-    for (size_t i = 0; i < sort_columns_size; ++i)
-        sort_description.emplace_back(header.getPositionByName(sort_columns[i]), 1, 1);
-
-    /// The order of the streams is important: when the key is matched, the elements go in the order of the source stream number.
-    /// In the merged part, the lines with the same key must be in the ascending order of the identifier of original part,
-    ///  that is going in insertion order.
-    ProcessorPtr merged_transform;
-
-    /// If merge is vertical we cannot calculate it
-    bool blocks_are_granules_size = (chosen_merge_algorithm == MergeAlgorithm::Vertical);
-
-    UInt64 merge_block_size = data_settings->merge_max_block_size;
-    switch (merging_params.mode)
-    {
-        case MergeTreeData::MergingParams::Ordinary:
-            merged_transform = std::make_unique<MergingSortedTransform>(
-                header, pipes.size(), sort_description, merge_block_size, 0, false, rows_sources_write_buf.get(), true, blocks_are_granules_size);
-            break;
-
-        case MergeTreeData::MergingParams::Collapsing:
-            merged_transform = std::make_unique<CollapsingSortedTransform>(
-                header, pipes.size(), sort_description, merging_params.sign_column, false,
-                merge_block_size, rows_sources_write_buf.get(), blocks_are_granules_size);
-            break;
-
-        case MergeTreeData::MergingParams::Summing:
-            merged_transform = std::make_unique<SummingSortedTransform>(
-                header, pipes.size(), sort_description, merging_params.columns_to_sum, partition_key_columns, merge_block_size);
-            break;
-
-        case MergeTreeData::MergingParams::Aggregating:
-            merged_transform = std::make_unique<AggregatingSortedTransform>(
-                header, pipes.size(), sort_description, merge_block_size);
-            break;
-
-        case MergeTreeData::MergingParams::Replacing:
-            merged_transform = std::make_unique<ReplacingSortedTransform>(
-                header, pipes.size(), sort_description, merging_params.version_column,
-                merge_block_size, rows_sources_write_buf.get(), blocks_are_granules_size);
-            break;
-
-        case MergeTreeData::MergingParams::Graphite:
-            merged_transform = std::make_unique<GraphiteRollupSortedTransform>(
-                header, pipes.size(), sort_description, merge_block_size,
-                merging_params.graphite_params, time_of_merge);
-            break;
-
-        case MergeTreeData::MergingParams::VersionedCollapsing:
-            merged_transform = std::make_unique<VersionedCollapsingTransform>(
-                header, pipes.size(), sort_description, merging_params.sign_column,
-                merge_block_size, rows_sources_write_buf.get(), blocks_are_granules_size);
-            break;
-    }
-
-    QueryPipeline pipeline;
-    pipeline.init(Pipe::unitePipes(std::move(pipes)));
-    pipeline.addTransform(std::move(merged_transform));
-    pipeline.setMaxThreads(1);
-    BlockInputStreamPtr merged_stream = std::make_shared<PipelineExecutingBlockInputStream>(std::move(pipeline));
-
-    if (deduplicate)
-        merged_stream = std::make_shared<DistinctSortedBlockInputStream>(merged_stream, sort_description, SizeLimits(), 0 /*limit_hint*/, deduplicate_by_columns);
-
-    if (need_remove_expired_values)
-    {
-        LOG_DEBUG(log, "Outdated rows found in source parts, TTLs processing enabled for merge");
-        merged_stream = std::make_shared<TTLBlockInputStream>(merged_stream, data, metadata_snapshot, new_data_part, time_of_merge, force_ttl);
-    }
-
-    if (metadata_snapshot->hasSecondaryIndices())
-    {
-        const auto & indices = metadata_snapshot->getSecondaryIndices();
-        merged_stream = std::make_shared<ExpressionBlockInputStream>(
-            merged_stream, indices.getSingleExpressionForIndices(metadata_snapshot->getColumns(), data.getContext()));
-        merged_stream = std::make_shared<MaterializingBlockInputStream>(merged_stream);
-    }
-
-    const auto & index_factory = MergeTreeIndexFactory::instance();
-    MergedBlockOutputStream to{
-        new_data_part,
-        metadata_snapshot,
-        merging_columns,
-        index_factory.getMany(metadata_snapshot->getSecondaryIndices()),
-        compression_codec,
-        blocks_are_granules_size};
-
-    merged_stream->readPrefix();
-    to.writePrefix();
-
-    size_t rows_written = 0;
-    const size_t initial_reservation = space_reservation ? space_reservation->getSize() : 0;
-
-    auto is_cancelled = [&]()
-    {
-        return merges_blocker.isCancelled()
-            || (need_remove_expired_values && ttl_merges_blocker.isCancelled())
-            || merge_entry->is_cancelled.load(std::memory_order_relaxed);
-    };
-
-    Block block;
-    while (!is_cancelled() && (block = merged_stream->read()))
-    {
-        rows_written += block.rows();
-
-        to.write(block);
-
-        merge_entry->rows_written = merged_stream->getProfileInfo().rows;
-        merge_entry->bytes_written_uncompressed = merged_stream->getProfileInfo().bytes;
-
-        /// Reservation updates is not performed yet, during the merge it may lead to higher free space requirements
-        if (space_reservation && sum_input_rows_upper_bound)
-        {
-            /// The same progress from merge_entry could be used for both algorithms (it should be more accurate)
-            /// But now we are using inaccurate row-based estimation in Horizontal case for backward compatibility
-            Float64 progress = (chosen_merge_algorithm == MergeAlgorithm::Horizontal)
-                ? std::min(1., 1. * rows_written / sum_input_rows_upper_bound)
-                : std::min(1., merge_entry->progress.load(std::memory_order_relaxed));
-
-            space_reservation->update(static_cast<size_t>((1. - progress) * initial_reservation));
-        }
-    }
-
-    merged_stream->readSuffix();
-    merged_stream.reset();
-
-    if (merges_blocker.isCancelled())
-        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
-
-    if (need_remove_expired_values && ttl_merges_blocker.isCancelled())
-        throw Exception("Cancelled merging parts with expired TTL", ErrorCodes::ABORTED);
-
-    bool need_sync = needSyncPart(sum_input_rows_upper_bound, sum_compressed_bytes_upper_bound, *data_settings);
-    MergeTreeData::DataPart::Checksums checksums_gathered_columns;
-
-    /// Gather ordinary columns
-    if (chosen_merge_algorithm == MergeAlgorithm::Vertical)
-    {
-        size_t sum_input_rows_exact = merge_entry->rows_read;
-        merge_entry->columns_written = merging_column_names.size();
-        merge_entry->progress.store(column_sizes->keyColumnsWeight(), std::memory_order_relaxed);
-
-        BlockInputStreams column_part_streams(parts.size());
-
-        auto it_name_and_type = gathering_columns.cbegin();
-
-        rows_sources_write_buf->next();
-        rows_sources_uncompressed_write_buf->next();
-        /// Ensure data has written to disk.
-        rows_sources_uncompressed_write_buf->finalize();
-
-        size_t rows_sources_count = rows_sources_write_buf->count();
-        /// In special case, when there is only one source part, and no rows were skipped, we may have
-        /// skipped writing rows_sources file. Otherwise rows_sources_count must be equal to the total
-        /// number of input rows.
-        if ((rows_sources_count > 0 || parts.size() > 1) && sum_input_rows_exact != rows_sources_count)
-            throw Exception("Number of rows in source parts (" + toString(sum_input_rows_exact)
-                + ") differs from number of bytes written to rows_sources file (" + toString(rows_sources_count)
-                + "). It is a bug.", ErrorCodes::LOGICAL_ERROR);
-
-        CompressedReadBufferFromFile rows_sources_read_buf(tmp_disk->readFile(fileName(rows_sources_file->path())));
-        IMergedBlockOutputStream::WrittenOffsetColumns written_offset_columns;
-
-        for (size_t column_num = 0, gathering_column_names_size = gathering_column_names.size();
-            column_num < gathering_column_names_size;
-            ++column_num, ++it_name_and_type)
-        {
-            const String & column_name = it_name_and_type->name;
-            Names column_names{column_name};
-            Float64 progress_before = merge_entry->progress.load(std::memory_order_relaxed);
-
-            MergeStageProgress column_progress(progress_before, column_sizes->columnWeight(column_name));
-            for (size_t part_num = 0; part_num < parts.size(); ++part_num)
-            {
-                auto column_part_source = std::make_shared<MergeTreeSequentialSource>(
-                    data, metadata_snapshot, parts[part_num], column_names, read_with_direct_io, true);
-
-                column_part_source->setProgressCallback(
-                    MergeProgressCallback(merge_entry, watch_prev_elapsed, column_progress));
-
-                QueryPipeline column_part_pipeline;
-                column_part_pipeline.init(Pipe(std::move(column_part_source)));
-                column_part_pipeline.setMaxThreads(1);
-
-                column_part_streams[part_num] =
-                        std::make_shared<PipelineExecutingBlockInputStream>(std::move(column_part_pipeline));
-            }
-
-            rows_sources_read_buf.seek(0, 0);
-            ColumnGathererStream column_gathered_stream(column_name, column_part_streams, rows_sources_read_buf);
-
-            MergedColumnOnlyOutputStream column_to(
-                new_data_part,
-                metadata_snapshot,
-                column_gathered_stream.getHeader(),
-                compression_codec,
-                /// we don't need to recalc indices here
-                /// because all of them were already recalculated and written
-                /// as key part of vertical merge
-                std::vector<MergeTreeIndexPtr>{},
-                &written_offset_columns,
-                to.getIndexGranularity());
-
-            size_t column_elems_written = 0;
-
-            column_to.writePrefix();
-            while (!merges_blocker.isCancelled() && (block = column_gathered_stream.read()))
-            {
-                column_elems_written += block.rows();
-                column_to.write(block);
-            }
-
-            if (merges_blocker.isCancelled())
-                throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
-
-            column_gathered_stream.readSuffix();
-            auto changed_checksums = column_to.writeSuffixAndGetChecksums(new_data_part, checksums_gathered_columns, need_sync);
-            checksums_gathered_columns.add(std::move(changed_checksums));
-
-            if (rows_written != column_elems_written)
-            {
-                throw Exception("Written " + toString(column_elems_written) + " elements of column " + column_name +
-                                ", but " + toString(rows_written) + " rows of PK columns", ErrorCodes::LOGICAL_ERROR);
-            }
-
-            /// NOTE: 'progress' is modified by single thread, but it may be concurrently read from MergeListElement::getInfo() (StorageSystemMerges).
-
-            merge_entry->columns_written += 1;
-            merge_entry->bytes_written_uncompressed += column_gathered_stream.getProfileInfo().bytes;
-            merge_entry->progress.store(progress_before + column_sizes->columnWeight(column_name), std::memory_order_relaxed);
-        }
-    }
-
-    for (const auto & part : parts)
-        new_data_part->minmax_idx.merge(part->minmax_idx);
-
-    /// Print overall profiling info. NOTE: it may duplicates previous messages
-    {
-        double elapsed_seconds = merge_entry->watch.elapsedSeconds();
-        LOG_DEBUG(log,
-            "Merge sorted {} rows, containing {} columns ({} merged, {} gathered) in {} sec., {} rows/sec., {}/sec.",
-            merge_entry->rows_read,
-            all_column_names.size(),
-            merging_column_names.size(),
-            gathering_column_names.size(),
-            elapsed_seconds,
-            merge_entry->rows_read / elapsed_seconds,
-            ReadableSize(merge_entry->bytes_read_uncompressed / elapsed_seconds));
-    }
-
-    for (const auto & projection : metadata_snapshot->getProjections())
-    {
-        MergeTreeData::DataPartsVector projection_parts;
-        for (const auto & part : parts)
-        {
-            auto it = part->getProjectionParts().find(projection.name);
-            if (it != part->getProjectionParts().end())
-                projection_parts.push_back(it->second);
-        }
-        if (projection_parts.size() < parts.size())
-        {
-            LOG_DEBUG(log, "Projection {} is not merged because some parts don't have it", projection.name);
-            continue;
-        }
-
-        LOG_DEBUG(
-            log,
-            "Selected {} projection_parts from {} to {}",
-            projection_parts.size(),
-            projection_parts.front()->name,
-            projection_parts.back()->name);
-
-        FutureMergedMutatedPart projection_future_part;
-        projection_future_part.assign(std::move(projection_parts));
-        projection_future_part.name = projection.name;
-        projection_future_part.path = future_part.path + "/" + projection.name + ".proj/";
-        projection_future_part.part_info = {"all", 0, 0, 0};
-
-        MergeTreeData::MergingParams projection_merging_params;
-        projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
-        if (projection.type == ProjectionDescription::Type::Aggregate)
-            projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
-
-        // TODO Should we use a new merge_entry for projection?
-        auto merged_projection_part = mergePartsToTemporaryPart(
-            projection_future_part,
-            projection.metadata,
-            merge_entry,
-            holder,
-            time_of_merge,
-            context,
-            space_reservation,
-            deduplicate,
-            deduplicate_by_columns,
-            projection_merging_params,
-            new_data_part.get());
-        new_data_part->addProjectionPart(projection.name, std::move(merged_projection_part));
-    }
-
-    if (chosen_merge_algorithm != MergeAlgorithm::Vertical)
-        to.writeSuffixAndFinalizePart(new_data_part, need_sync);
-    else
-        to.writeSuffixAndFinalizePart(new_data_part, need_sync, &storage_columns, &checksums_gathered_columns);
-
-    return new_data_part;
+        nullptr,
+        "",
+        &data,
+        &merges_blocker,
+        &ttl_merges_blocker);
 }
 
 
-MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTemporaryPart(
-    const FutureMergedMutatedPart & future_part,
-    const StorageMetadataPtr & metadata_snapshot,
-    const MutationCommands & commands,
-    MergeListEntry & merge_entry,
+MutateTaskPtr MergeTreeDataMergerMutator::mutatePartToTemporaryPart(
+    FutureMergedMutatedPartPtr future_part,
+    StorageMetadataPtr metadata_snapshot,
+    MutationCommandsConstPtr commands,
+    MergeListEntry * merge_entry,
     time_t time_of_mutation,
     ContextPtr context,
-    const ReservationPtr & space_reservation,
+    ReservationSharedPtr space_reservation,
     TableLockHolder & holder)
 {
-    checkOperationIsNotCanceled(merge_entry);
-
-    if (future_part.parts.size() != 1)
-        throw Exception("Trying to mutate " + toString(future_part.parts.size()) + " parts, not one. "
-            "This is a bug.", ErrorCodes::LOGICAL_ERROR);
-
-    CurrentMetrics::Increment num_mutations{CurrentMetrics::PartMutation};
-    const auto & source_part = future_part.parts[0];
-    auto storage_from_source_part = StorageFromMergeTreeDataPart::create(source_part);
-
-    auto context_for_reading = Context::createCopy(context);
-    context_for_reading->setSetting("max_streams_to_max_threads_ratio", 1);
-    context_for_reading->setSetting("max_threads", 1);
-    /// Allow mutations to work when force_index_by_date or force_primary_key is on.
-    context_for_reading->setSetting("force_index_by_date", false);
-    context_for_reading->setSetting("force_primary_key", false);
-
-    MutationCommands commands_for_part;
-    for (const auto & command : commands)
-    {
-        if (command.partition == nullptr || future_part.parts[0]->info.partition_id == data.getPartitionIDFromQuery(
-                command.partition, context_for_reading))
-            commands_for_part.emplace_back(command);
-    }
-
-    if (source_part->isStoredOnDisk() && !isStorageTouchedByMutations(
-        storage_from_source_part, metadata_snapshot, commands_for_part, Context::createCopy(context_for_reading)))
-    {
-        LOG_TRACE(log, "Part {} doesn't change up to mutation version {}", source_part->name, future_part.part_info.mutation);
-        return data.cloneAndLoadDataPartOnSameDisk(source_part, "tmp_clone_", future_part.part_info, metadata_snapshot);
-    }
-    else
-    {
-        LOG_TRACE(log, "Mutating part {} to mutation version {}", source_part->name, future_part.part_info.mutation);
-    }
-
-    BlockInputStreamPtr in = nullptr;
-    Block updated_header;
-    std::unique_ptr<MutationsInterpreter> interpreter;
-
-    const auto data_settings = data.getSettings();
-    MutationCommands for_interpreter;
-    MutationCommands for_file_renames;
-
-    splitMutationCommands(source_part, commands_for_part, for_interpreter, for_file_renames);
-
-    UInt64 watch_prev_elapsed = 0;
-    MergeStageProgress stage_progress(1.0);
-
-    NamesAndTypesList storage_columns = metadata_snapshot->getColumns().getAllPhysical();
-    NameSet materialized_indices;
-    NameSet materialized_projections;
-    MutationsInterpreter::MutationKind::MutationKindEnum mutation_kind
-        = MutationsInterpreter::MutationKind::MutationKindEnum::MUTATE_UNKNOWN;
-
-    if (!for_interpreter.empty())
-    {
-        interpreter = std::make_unique<MutationsInterpreter>(
-            storage_from_source_part, metadata_snapshot, for_interpreter, context_for_reading, true);
-        materialized_indices = interpreter->grabMaterializedIndices();
-        materialized_projections = interpreter->grabMaterializedProjections();
-        mutation_kind = interpreter->getMutationKind();
-        in = interpreter->execute();
-        updated_header = interpreter->getUpdatedHeader();
-        in->setProgressCallback(MergeProgressCallback(merge_entry, watch_prev_elapsed, stage_progress));
-    }
-
-    auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + future_part.name, space_reservation->getDisk(), 0);
-    auto new_data_part = data.createPart(
-        future_part.name, future_part.type, future_part.part_info, single_disk_volume, "tmp_mut_" + future_part.name);
-
-    new_data_part->uuid = future_part.uuid;
-    new_data_part->is_temp = true;
-    new_data_part->ttl_infos = source_part->ttl_infos;
-
-    /// It shouldn't be changed by mutation.
-    new_data_part->index_granularity_info = source_part->index_granularity_info;
-    new_data_part->setColumns(getColumnsForNewDataPart(source_part, updated_header, storage_columns, for_file_renames));
-    new_data_part->partition.assign(source_part->partition);
-
-    auto disk = new_data_part->volume->getDisk();
-    String new_part_tmp_path = new_data_part->getFullRelativePath();
-
-    SyncGuardPtr sync_guard;
-    if (data.getSettings()->fsync_part_directory)
-        sync_guard = disk->getDirectorySyncGuard(new_part_tmp_path);
-
-    /// Don't change granularity type while mutating subset of columns
-    auto mrk_extension = source_part->index_granularity_info.is_adaptive ? getAdaptiveMrkExtension(new_data_part->getType())
-                                                                         : getNonAdaptiveMrkExtension();
-    bool need_sync = needSyncPart(source_part->rows_count, source_part->getBytesOnDisk(), *data_settings);
-    auto execute_ttl_type = ExecuteTTLType::NONE;
-
-    if (in)
-        execute_ttl_type = shouldExecuteTTL(metadata_snapshot, interpreter->getColumnDependencies());
-
-    /// All columns from part are changed and may be some more that were missing before in part
-    /// TODO We can materialize compact part without copying data
-    if (!isWidePart(source_part)
-        || (mutation_kind == MutationsInterpreter::MutationKind::MUTATE_OTHER && interpreter && interpreter->isAffectingAllColumns()))
-    {
-        disk->createDirectories(new_part_tmp_path);
-
-        /// Note: this is done before creating input streams, because otherwise data.data_parts_mutex
-        /// (which is locked in data.getTotalActiveSizeInBytes())
-        /// (which is locked in shared mode when input streams are created) and when inserting new data
-        /// the order is reverse. This annoys TSan even though one lock is locked in shared mode and thus
-        /// deadlock is impossible.
-        auto compression_codec = data.getCompressionCodecForPart(source_part->getBytesOnDisk(), source_part->ttl_infos, time_of_mutation);
-
-        auto part_indices = getIndicesForNewDataPart(metadata_snapshot->getSecondaryIndices(), for_file_renames);
-        auto part_projections = getProjectionsForNewDataPart(metadata_snapshot->getProjections(), for_file_renames);
-
-        mutateAllPartColumns(
-            new_data_part,
-            metadata_snapshot,
-            part_indices,
-            part_projections,
-            in,
-            time_of_mutation,
-            compression_codec,
-            merge_entry,
-            execute_ttl_type,
-            need_sync,
-            space_reservation,
-            holder,
-            context);
-
-        /// no finalization required, because mutateAllPartColumns use
-        /// MergedBlockOutputStream which finilaze all part fields itself
-    }
-    else /// TODO: check that we modify only non-key columns in this case.
-    {
-        /// We will modify only some of the columns. Other columns and key values can be copied as-is.
-        NameSet updated_columns;
-        for (const auto & name_type : updated_header.getNamesAndTypesList())
-            updated_columns.emplace(name_type.name);
-
-        auto indices_to_recalc = getIndicesToRecalculate(
-            in, updated_columns, metadata_snapshot, context, materialized_indices, source_part);
-        auto projections_to_recalc = getProjectionsToRecalculate(
-            updated_columns, metadata_snapshot, materialized_projections, source_part);
-
-        NameSet files_to_skip = collectFilesToSkip(
-            source_part,
-            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 (execute_ttl_type != ExecuteTTLType::NONE)
-            files_to_skip.insert("ttl.txt");
-
-        disk->createDirectories(new_part_tmp_path);
-
-        /// Create hardlinks for unchanged files
-        for (auto it = disk->iterateDirectory(source_part->getFullRelativePath()); it->isValid(); it->next())
-        {
-            if (files_to_skip.count(it->name()))
-                continue;
-
-            String destination = new_part_tmp_path;
-            String file_name = it->name();
-            auto rename_it = std::find_if(files_to_rename.begin(), files_to_rename.end(), [&file_name](const auto & rename_pair)
-            {
-                return rename_pair.first == file_name;
-            });
-            if (rename_it != files_to_rename.end())
-            {
-                if (rename_it->second.empty())
-                    continue;
-                destination += rename_it->second;
-            }
-            else
-            {
-                destination += it->name();
-            }
-
-            if (!disk->isDirectory(it->path()))
-                disk->createHardLink(it->path(), destination);
-            else if (!startsWith("tmp_", it->name())) // ignore projection tmp merge dir
-            {
-                // it's a projection part directory
-                disk->createDirectories(destination);
-                for (auto p_it = disk->iterateDirectory(it->path()); p_it->isValid(); p_it->next())
-                {
-                    String p_destination = destination + "/";
-                    String p_file_name = p_it->name();
-                    p_destination += p_it->name();
-                    disk->createHardLink(p_it->path(), p_destination);
-                }
-            }
-        }
-
-        merge_entry->columns_written = storage_columns.size() - updated_header.columns();
-
-        new_data_part->checksums = source_part->checksums;
-
-        auto compression_codec = source_part->default_codec;
-
-        if (in)
-        {
-            mutateSomePartColumns(
-                source_part,
-                metadata_snapshot,
-                indices_to_recalc,
-                projections_to_recalc,
-                updated_header,
-                new_data_part,
-                in,
-                time_of_mutation,
-                compression_codec,
-                merge_entry,
-                execute_ttl_type,
-                need_sync,
-                space_reservation,
-                holder,
-                context);
-        }
-
-        for (const auto & [rename_from, rename_to] : files_to_rename)
-        {
-            if (rename_to.empty() && new_data_part->checksums.files.count(rename_from))
-            {
-                new_data_part->checksums.files.erase(rename_from);
-            }
-            else if (new_data_part->checksums.files.count(rename_from))
-            {
-                new_data_part->checksums.files[rename_to] = new_data_part->checksums.files[rename_from];
-
-                new_data_part->checksums.files.erase(rename_from);
-            }
-        }
-
-        finalizeMutatedPart(source_part, new_data_part, execute_ttl_type, compression_codec);
-    }
-
-    return new_data_part;
+    return std::make_shared<MutateTask>(
+        future_part,
+        metadata_snapshot,
+        commands,
+        merge_entry,
+        time_of_mutation,
+        context,
+        space_reservation,
+        holder,
+        data,
+        *this,
+        merges_blocker
+    );
 }
 
 
@@ -1635,131 +669,6 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
 }
 
 
-NameToNameVector MergeTreeDataMergerMutator::collectFilesForRenames(
-    MergeTreeData::DataPartPtr source_part, const MutationCommands & commands_for_removes, const String & mrk_extension)
-{
-    /// Collect counts for shared streams of different columns. As an example, Nested columns have shared stream with array sizes.
-    std::map<String, size_t> stream_counts;
-    for (const NameAndTypePair & column : source_part->getColumns())
-    {
-        auto serialization = source_part->getSerializationForColumn(column);
-        serialization->enumerateStreams(
-            [&](const ISerialization::SubstreamPath & substream_path)
-            {
-                ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
-            },
-            {});
-    }
-
-    NameToNameVector rename_vector;
-    /// Remove old data
-    for (const auto & command : commands_for_removes)
-    {
-        if (command.type == MutationCommand::Type::DROP_INDEX)
-        {
-            if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx2"))
-            {
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx2", "");
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
-            }
-            else if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx"))
-            {
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx", "");
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
-            }
-        }
-        else if (command.type == MutationCommand::Type::DROP_PROJECTION)
-        {
-            if (source_part->checksums.has(command.column_name + ".proj"))
-                rename_vector.emplace_back(command.column_name + ".proj", "");
-        }
-        else if (command.type == MutationCommand::Type::DROP_COLUMN)
-        {
-            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
-            {
-                String stream_name = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
-                /// Delete files if they are no longer shared with another column.
-                if (--stream_counts[stream_name] == 0)
-                {
-                    rename_vector.emplace_back(stream_name + ".bin", "");
-                    rename_vector.emplace_back(stream_name + mrk_extension, "");
-                }
-            };
-
-            auto column = source_part->getColumns().tryGetByName(command.column_name);
-            if (column)
-            {
-                auto serialization = source_part->getSerializationForColumn(*column);
-                serialization->enumerateStreams(callback);
-            }
-        }
-        else if (command.type == MutationCommand::Type::RENAME_COLUMN)
-        {
-            String escaped_name_from = escapeForFileName(command.column_name);
-            String escaped_name_to = escapeForFileName(command.rename_to);
-
-            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
-            {
-                String stream_from = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
-
-                String stream_to = boost::replace_first_copy(stream_from, escaped_name_from, escaped_name_to);
-
-                if (stream_from != stream_to)
-                {
-                    rename_vector.emplace_back(stream_from + ".bin", stream_to + ".bin");
-                    rename_vector.emplace_back(stream_from + mrk_extension, stream_to + mrk_extension);
-                }
-            };
-
-            auto column = source_part->getColumns().tryGetByName(command.column_name);
-            if (column)
-            {
-                auto serialization = source_part->getSerializationForColumn(*column);
-                serialization->enumerateStreams(callback);
-            }
-        }
-    }
-
-    return rename_vector;
-}
-
-NameSet MergeTreeDataMergerMutator::collectFilesToSkip(
-    const MergeTreeDataPartPtr & source_part,
-    const Block & updated_header,
-    const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-    const String & mrk_extension,
-    const std::set<ProjectionDescriptionRawPtr> & projections_to_recalc)
-{
-    NameSet files_to_skip = source_part->getFileNamesWithoutChecksums();
-
-    /// Skip updated files
-    for (const auto & entry : updated_header)
-    {
-        ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
-        {
-            String stream_name = ISerialization::getFileNameForStream({entry.name, entry.type}, substream_path);
-            files_to_skip.insert(stream_name + ".bin");
-            files_to_skip.insert(stream_name + mrk_extension);
-        };
-
-        auto serialization = source_part->getSerializationForColumn({entry.name, entry.type});
-        serialization->enumerateStreams(callback);
-    }
-
-    for (const auto & index : indices_to_recalc)
-    {
-        files_to_skip.insert(index->getFileName() + ".idx");
-        files_to_skip.insert(index->getFileName() + ".idx2");
-        files_to_skip.insert(index->getFileName() + mrk_extension);
-    }
-
-    for (const auto & projection : projections_to_recalc)
-        files_to_skip.insert(projection->getDirectoryName());
-
-    return files_to_skip;
-}
-
-
 NamesAndTypesList MergeTreeDataMergerMutator::getColumnsForNewDataPart(
     MergeTreeData::DataPartPtr source_part,
     const Block & updated_header,
@@ -1841,145 +750,6 @@ NamesAndTypesList MergeTreeDataMergerMutator::getColumnsForNewDataPart(
     return storage_columns;
 }
 
-MergeTreeIndices MergeTreeDataMergerMutator::getIndicesForNewDataPart(
-    const IndicesDescription & all_indices,
-    const MutationCommands & commands_for_removes)
-{
-    NameSet removed_indices;
-    for (const auto & command : commands_for_removes)
-        if (command.type == MutationCommand::DROP_INDEX)
-            removed_indices.insert(command.column_name);
-
-    MergeTreeIndices new_indices;
-    for (const auto & index : all_indices)
-        if (!removed_indices.count(index.name))
-            new_indices.push_back(MergeTreeIndexFactory::instance().get(index));
-
-    return new_indices;
-}
-
-std::vector<ProjectionDescriptionRawPtr> 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);
-
-    std::vector<ProjectionDescriptionRawPtr> new_projections;
-    for (const auto & projection : all_projections)
-        if (!removed_projections.count(projection.name))
-            new_projections.push_back(&projection);
-
-    return new_projections;
-}
-
-std::set<MergeTreeIndexPtr> MergeTreeDataMergerMutator::getIndicesToRecalculate(
-    BlockInputStreamPtr & input_stream,
-    const NameSet & updated_columns,
-    const StorageMetadataPtr & metadata_snapshot,
-    ContextPtr context,
-    const NameSet & materialized_indices,
-    const MergeTreeData::DataPartPtr & source_part)
-{
-    /// Checks if columns used in skipping indexes modified.
-    const auto & index_factory = MergeTreeIndexFactory::instance();
-    std::set<MergeTreeIndexPtr> indices_to_recalc;
-    ASTPtr indices_recalc_expr_list = std::make_shared<ASTExpressionList>();
-    const auto & indices = metadata_snapshot->getSecondaryIndices();
-
-    for (size_t i = 0; i < indices.size(); ++i)
-    {
-        const auto & index = indices[i];
-
-        bool has_index =
-            source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx") ||
-            source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx2");
-        // If we ask to materialize and it already exists
-        if (!has_index && materialized_indices.count(index.name))
-        {
-            if (indices_to_recalc.insert(index_factory.get(index)).second)
-            {
-                ASTPtr expr_list = index.expression_list_ast->clone();
-                for (const auto & expr : expr_list->children)
-                    indices_recalc_expr_list->children.push_back(expr->clone());
-            }
-        }
-        // If some dependent columns gets mutated
-        else
-        {
-            bool mutate = false;
-            const auto & index_cols = index.expression->getRequiredColumns();
-            for (const auto & col : index_cols)
-            {
-                if (updated_columns.count(col))
-                {
-                    mutate = true;
-                    break;
-                }
-            }
-            if (mutate && indices_to_recalc.insert(index_factory.get(index)).second)
-            {
-                ASTPtr expr_list = index.expression_list_ast->clone();
-                for (const auto & expr : expr_list->children)
-                    indices_recalc_expr_list->children.push_back(expr->clone());
-            }
-        }
-    }
-
-    if (!indices_to_recalc.empty() && input_stream)
-    {
-        auto indices_recalc_syntax = TreeRewriter(context).analyze(indices_recalc_expr_list, input_stream->getHeader().getNamesAndTypesList());
-        auto indices_recalc_expr = ExpressionAnalyzer(
-                indices_recalc_expr_list,
-                indices_recalc_syntax, context).getActions(false);
-
-        /// We can update only one column, but some skip idx expression may depend on several
-        /// columns (c1 + c2 * c3). It works because this stream was created with help of
-        /// MutationsInterpreter which knows about skip indices and stream 'in' already has
-        /// all required columns.
-        /// TODO move this logic to single place.
-        input_stream = std::make_shared<MaterializingBlockInputStream>(
-            std::make_shared<ExpressionBlockInputStream>(input_stream, indices_recalc_expr));
-    }
-    return indices_to_recalc;
-}
-
-std::set<ProjectionDescriptionRawPtr> 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.
-    std::set<ProjectionDescriptionRawPtr> projections_to_recalc;
-    for (const auto & projection : metadata_snapshot->getProjections())
-    {
-        // If we ask to materialize and it doesn't exist
-        if (!source_part->checksums.has(projection.name + ".proj") && materialized_projections.count(projection.name))
-        {
-            projections_to_recalc.insert(&projection);
-        }
-        else
-        {
-            // If some dependent columns gets mutated
-            bool mutate = false;
-            const auto & projection_cols = projection.required_columns;
-            for (const auto & col : projection_cols)
-            {
-                if (updated_columns.count(col))
-                {
-                    mutate = true;
-                    break;
-                }
-            }
-            if (mutate)
-                projections_to_recalc.insert(&projection);
-        }
-    }
-    return projections_to_recalc;
-}
 
 ExecuteTTLType MergeTreeDataMergerMutator::shouldExecuteTTL(const StorageMetadataPtr & metadata_snapshot, const ColumnDependencies & dependencies)
 {
@@ -1999,343 +769,5 @@ ExecuteTTLType MergeTreeDataMergerMutator::shouldExecuteTTL(const StorageMetadat
     return has_ttl_expression ? ExecuteTTLType::RECALCULATE : ExecuteTTLType::NONE;
 }
 
-// 1. get projection pipeline and a sink to write parts
-// 2. build an executor that can write block to the input stream (actually we can write through it to generate as many parts as possible)
-// 3. finalize the pipeline so that all parts are merged into one part
-void MergeTreeDataMergerMutator::writeWithProjections(
-    MergeTreeData::MutableDataPartPtr new_data_part,
-    const StorageMetadataPtr & metadata_snapshot,
-    const std::vector<ProjectionDescriptionRawPtr> & 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;
-    const auto & settings = context->getSettingsRef();
-    for (size_t i = 0, size = projections_to_build.size(); i < size; ++i)
-    {
-        // If the parent part is an in-memory part, squash projection output into one block and
-        // build in-memory projection because we don't support merging into a new in-memory part.
-        // Otherwise we split the materialization into multiple stages similar to the process of
-        // INSERT SELECT query.
-        if (new_data_part->getType() == MergeTreeDataPartType::IN_MEMORY)
-            projection_squashes.emplace_back(0, 0);
-        else
-            projection_squashes.emplace_back(settings.min_insert_block_size_rows, settings.min_insert_block_size_bytes);
-    }
-
-    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];
-            auto projection_block = projection_squashes[i].add(projection.calculate(block, context));
-            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];
-        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 std::vector<ProjectionDescriptionRawPtr> & projections_to_build,
-    BlockInputStreamPtr mutating_stream,
-    time_t time_of_mutation,
-    const CompressionCodecPtr & compression_codec,
-    MergeListEntry & merge_entry,
-    ExecuteTTLType execute_ttl_type,
-    bool need_sync,
-    const ReservationPtr & space_reservation,
-    TableLockHolder & holder,
-    ContextPtr context)
-{
-    if (mutating_stream == nullptr)
-        throw Exception("Cannot mutate part columns with uninitialized mutations stream. It's a bug", ErrorCodes::LOGICAL_ERROR);
-
-    if (metadata_snapshot->hasPrimaryKey() || metadata_snapshot->hasSecondaryIndices())
-        mutating_stream = std::make_shared<MaterializingBlockInputStream>(
-            std::make_shared<ExpressionBlockInputStream>(mutating_stream, data.getPrimaryKeyAndSkipIndicesExpression(metadata_snapshot)));
-
-    if (execute_ttl_type == ExecuteTTLType::NORMAL)
-        mutating_stream = std::make_shared<TTLBlockInputStream>(mutating_stream, data, metadata_snapshot, new_data_part, time_of_mutation, true);
-
-    if (execute_ttl_type == ExecuteTTLType::RECALCULATE)
-        mutating_stream = std::make_shared<TTLCalcInputStream>(mutating_stream, data, metadata_snapshot, new_data_part, time_of_mutation, true);
-
-    IMergeTreeDataPart::MinMaxIndex minmax_idx;
-
-    MergedBlockOutputStream out{
-        new_data_part,
-        metadata_snapshot,
-        new_data_part->getColumns(),
-        skip_indices,
-        compression_codec};
-
-    mutating_stream->readPrefix();
-    out.writePrefix();
-
-    writeWithProjections(
-        new_data_part,
-        metadata_snapshot,
-        projections_to_build,
-        mutating_stream,
-        out,
-        time_of_mutation,
-        merge_entry,
-        space_reservation,
-        holder,
-        context,
-        &minmax_idx);
-
-    new_data_part->minmax_idx = std::move(minmax_idx);
-    mutating_stream->readSuffix();
-    out.writeSuffixAndFinalizePart(new_data_part, need_sync);
-}
-
-void MergeTreeDataMergerMutator::mutateSomePartColumns(
-    const MergeTreeDataPartPtr & source_part,
-    const StorageMetadataPtr & metadata_snapshot,
-    const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-    const std::set<ProjectionDescriptionRawPtr> & projections_to_recalc,
-    const Block & mutation_header,
-    MergeTreeData::MutableDataPartPtr new_data_part,
-    BlockInputStreamPtr mutating_stream,
-    time_t time_of_mutation,
-    const CompressionCodecPtr & compression_codec,
-    MergeListEntry & merge_entry,
-    ExecuteTTLType execute_ttl_type,
-    bool need_sync,
-    const ReservationPtr & space_reservation,
-    TableLockHolder & holder,
-    ContextPtr context)
-{
-    if (mutating_stream == nullptr)
-        throw Exception("Cannot mutate part columns with uninitialized mutations stream. It's a bug", ErrorCodes::LOGICAL_ERROR);
-
-    if (execute_ttl_type == ExecuteTTLType::NORMAL)
-        mutating_stream = std::make_shared<TTLBlockInputStream>(mutating_stream, data, metadata_snapshot, new_data_part, time_of_mutation, true);
-
-    if (execute_ttl_type == ExecuteTTLType::RECALCULATE)
-        mutating_stream = std::make_shared<TTLCalcInputStream>(mutating_stream, data, metadata_snapshot, new_data_part, time_of_mutation, true);
-
-    IMergedBlockOutputStream::WrittenOffsetColumns unused_written_offsets;
-    MergedColumnOnlyOutputStream out(
-        new_data_part,
-        metadata_snapshot,
-        mutation_header,
-        compression_codec,
-        std::vector<MergeTreeIndexPtr>(indices_to_recalc.begin(), indices_to_recalc.end()),
-        nullptr,
-        source_part->index_granularity,
-        &source_part->index_granularity_info
-    );
-
-    mutating_stream->readPrefix();
-    out.writePrefix();
-
-    std::vector<ProjectionDescriptionRawPtr> projections_to_build(projections_to_recalc.begin(), projections_to_recalc.end());
-    writeWithProjections(
-        new_data_part,
-        metadata_snapshot,
-        projections_to_build,
-        mutating_stream,
-        out,
-        time_of_mutation,
-        merge_entry,
-        space_reservation,
-        holder,
-        context);
-
-    mutating_stream->readSuffix();
-
-    auto changed_checksums = out.writeSuffixAndGetChecksums(new_data_part, new_data_part->checksums, need_sync);
-
-    new_data_part->checksums.add(std::move(changed_checksums));
-}
-
-void MergeTreeDataMergerMutator::finalizeMutatedPart(
-    const MergeTreeDataPartPtr & source_part,
-    MergeTreeData::MutableDataPartPtr new_data_part,
-    ExecuteTTLType execute_ttl_type,
-    const CompressionCodecPtr & codec)
-{
-    auto disk = new_data_part->volume->getDisk();
-
-    if (new_data_part->uuid != UUIDHelpers::Nil)
-    {
-        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
-        HashingWriteBuffer out_hashing(*out);
-        writeUUIDText(new_data_part->uuid, out_hashing);
-        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
-        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_hash = out_hashing.getHash();
-    }
-
-    if (execute_ttl_type != ExecuteTTLType::NONE)
-    {
-        /// Write a file with ttl infos in json format.
-        auto out_ttl = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "ttl.txt", 4096);
-        HashingWriteBuffer out_hashing(*out_ttl);
-        new_data_part->ttl_infos.write(out_hashing);
-        new_data_part->checksums.files["ttl.txt"].file_size = out_hashing.count();
-        new_data_part->checksums.files["ttl.txt"].file_hash = out_hashing.getHash();
-    }
-
-    {
-        /// Write file with checksums.
-        auto out_checksums = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "checksums.txt", 4096);
-        new_data_part->checksums.write(*out_checksums);
-    } /// close fd
-
-    {
-        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME, 4096);
-        DB::writeText(queryToString(codec->getFullCodecDesc()), *out);
-    }
-
-    {
-        /// Write a file with a description of columns.
-        auto out_columns = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "columns.txt", 4096);
-        new_data_part->getColumns().writeText(*out_columns);
-    } /// close fd
-
-    new_data_part->rows_count = source_part->rows_count;
-    new_data_part->index_granularity = source_part->index_granularity;
-    new_data_part->index = source_part->index;
-    new_data_part->minmax_idx = source_part->minmax_idx;
-    new_data_part->modification_time = time(nullptr);
-    new_data_part->loadProjections(false, false);
-    new_data_part->setBytesOnDisk(
-        MergeTreeData::DataPart::calculateTotalSizeOnDisk(new_data_part->volume->getDisk(), new_data_part->getFullRelativePath()));
-    new_data_part->default_codec = codec;
-    new_data_part->calculateColumnsSizesOnDisk();
-    new_data_part->storage.lockSharedData(*new_data_part);
-}
-
-bool MergeTreeDataMergerMutator::checkOperationIsNotCanceled(const MergeListEntry & merge_entry) const
-{
-    if (merges_blocker.isCancelled() || merge_entry->is_cancelled)
-        throw Exception("Cancelled mutating parts", ErrorCodes::ABORTED);
-
-    return true;
-}
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index b78d2364f2a..cda8cfd2c57 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -1,13 +1,16 @@
 #pragma once
 
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/MutationCommands.h>
 #include <atomic>
 #include <functional>
+
 #include <Common/ActionBlocker.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MutationCommands.h>
 #include <Storages/MergeTree/TTLMergeSelector.h>
 #include <Storages/MergeTree/MergeAlgorithm.h>
 #include <Storages/MergeTree/MergeType.h>
+#include <Storages/MergeTree/MergeTask.h>
+#include <Storages/MergeTree/MutateTask.h>
 #include <Storages/MergeTree/IMergedBlockOutputStream.h>
 
 
@@ -30,38 +33,6 @@ enum class ExecuteTTLType
     RECALCULATE= 2,
 };
 
-/// Auxiliary struct holding metainformation for the future merged or mutated part.
-struct FutureMergedMutatedPart
-{
-    String name;
-    UUID uuid = UUIDHelpers::Nil;
-    String path;
-    MergeTreeDataPartType type;
-    MergeTreePartInfo part_info;
-    MergeTreeData::DataPartsVector parts;
-    MergeType merge_type = MergeType::REGULAR;
-
-    const MergeTreePartition & getPartition() const { return parts.front()->partition; }
-
-    FutureMergedMutatedPart() = default;
-
-    explicit FutureMergedMutatedPart(MergeTreeData::DataPartsVector parts_)
-    {
-        assign(std::move(parts_));
-    }
-
-    FutureMergedMutatedPart(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type)
-    {
-        assign(std::move(parts_), future_part_type);
-    }
-
-    void assign(MergeTreeData::DataPartsVector parts_);
-    void assign(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type);
-
-    void updatePath(const MergeTreeData & storage, const ReservationPtr & reservation);
-};
-
-
 /** Can select parts for background processes and do them.
  * Currently helps with merges, mutations and moves
  */
@@ -95,7 +66,7 @@ public:
       *  - A part that already merges with something in one place, you can not start to merge into something else in another place.
       */
     SelectPartsDecision selectPartsToMerge(
-        FutureMergedMutatedPart & future_part,
+        FutureMergedMutatedPartPtr future_part,
         bool aggressive,
         size_t max_total_size_to_merge,
         const AllowedMergingPredicate & can_merge,
@@ -108,7 +79,7 @@ public:
       * and without expired TTL won't be merged with itself.
       */
     SelectPartsDecision selectAllPartsToMergeWithinPartition(
-        FutureMergedMutatedPart & future_part,
+        FutureMergedMutatedPartPtr future_part,
         UInt64 & available_disk_space,
         const AllowedMergingPredicate & can_merge,
         const String & partition_id,
@@ -117,24 +88,21 @@ public:
         String * out_disable_reason = nullptr,
         bool optimize_skip_merged_partitions = false);
 
-    /** Merge the parts.
+    /** Creates a task to merge parts.
       * If `reservation != nullptr`, now and then reduces the size of the reserved space
       *  is approximately proportional to the amount of data already written.
       *
-      * Creates and returns a temporary part.
-      * To end the merge, call the function renameMergedTemporaryPart.
-      *
       * time_of_merge - the time when the merge was assigned.
       * Important when using ReplicatedGraphiteMergeTree to provide the same merge on replicas.
       */
-    MergeTreeData::MutableDataPartPtr mergePartsToTemporaryPart(
-        const FutureMergedMutatedPart & future_part,
+    MergeTaskPtr mergePartsToTemporaryPart(
+        FutureMergedMutatedPartPtr future_part,
         const StorageMetadataPtr & metadata_snapshot,
-        MergeListEntry & merge_entry,
-        TableLockHolder & table_lock_holder,
+        MergeListEntry * merge_entry,
+        TableLockHolder table_lock_holder,
         time_t time_of_merge,
         ContextPtr context,
-        const ReservationPtr & space_reservation,
+        ReservationSharedPtr space_reservation,
         bool deduplicate,
         const Names & deduplicate_by_columns,
         const MergeTreeData::MergingParams & merging_params,
@@ -142,14 +110,14 @@ public:
         const String & prefix = "");
 
     /// Mutate a single data part with the specified commands. Will create and return a temporary part.
-    MergeTreeData::MutableDataPartPtr mutatePartToTemporaryPart(
-        const FutureMergedMutatedPart & future_part,
-        const StorageMetadataPtr & metadata_snapshot,
-        const MutationCommands & commands,
-        MergeListEntry & merge_entry,
+    MutateTaskPtr mutatePartToTemporaryPart(
+        FutureMergedMutatedPartPtr future_part,
+        StorageMetadataPtr metadata_snapshot,
+        MutationCommandsConstPtr commands,
+        MergeListEntry * merge_entry,
         time_t time_of_mutation,
         ContextPtr context,
-        const ReservationPtr & space_reservation,
+        ReservationSharedPtr space_reservation,
         TableLockHolder & table_lock_holder);
 
     MergeTreeData::DataPartPtr renameMergedTemporaryPart(
@@ -166,6 +134,8 @@ private:
       */
     MergeTreeData::DataPartsVector selectAllPartsFromPartition(const String & partition_id);
 
+    friend class MutateTask;
+
     /** Split mutation commands into two parts:
       * First part should be executed by mutations interpreter.
       * Other is just simple drop/renames, so they can be executed without interpreter.
@@ -176,21 +146,6 @@ private:
         MutationCommands & for_interpreter,
         MutationCommands & for_file_renames);
 
-    /// Apply commands to source_part i.e. remove and rename some columns in
-    /// source_part and return set of files, that have to be removed or renamed
-    /// from filesystem and in-memory checksums. Ordered result is important,
-    /// because we can apply renames that affects each other: x -> z, y -> x.
-    static NameToNameVector collectFilesForRenames(MergeTreeData::DataPartPtr source_part, const MutationCommands & commands_for_removes, const String & mrk_extension);
-
-    /// Files, that we don't need to remove and don't need to hardlink, for example columns.txt and checksums.txt.
-    /// Because we will generate new versions of them after we perform mutation.
-    static NameSet collectFilesToSkip(
-        const MergeTreeDataPartPtr & source_part,
-        const Block & updated_header,
-        const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-        const String & mrk_extension,
-        const std::set<ProjectionDescriptionRawPtr> & projections_to_recalc);
-
     /// Get the columns list of the resulting part in the same order as storage_columns.
     static NamesAndTypesList getColumnsForNewDataPart(
         MergeTreeData::DataPartPtr source_part,
@@ -198,87 +153,8 @@ private:
         NamesAndTypesList storage_columns,
         const MutationCommands & commands_for_removes);
 
-    /// Get skip indices, that should exists in the resulting data part.
-    static MergeTreeIndices getIndicesForNewDataPart(
-        const IndicesDescription & all_indices,
-        const MutationCommands & commands_for_removes);
-
-    static std::vector<ProjectionDescriptionRawPtr> getProjectionsForNewDataPart(
-        const ProjectionsDescription & all_projections,
-        const MutationCommands & commands_for_removes);
-
-    static ExecuteTTLType shouldExecuteTTL(const StorageMetadataPtr & metadata_snapshot, const ColumnDependencies & dependencies);
-
-    /// Return set of indices which should be recalculated during mutation also
-    /// wraps input stream into additional expression stream
-    static std::set<MergeTreeIndexPtr> getIndicesToRecalculate(
-        BlockInputStreamPtr & input_stream,
-        const NameSet & updated_columns,
-        const StorageMetadataPtr & metadata_snapshot,
-        ContextPtr context,
-        const NameSet & materialized_indices,
-        const MergeTreeData::DataPartPtr & source_part);
-
-    static std::set<ProjectionDescriptionRawPtr> 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 std::vector<ProjectionDescriptionRawPtr> & 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 std::vector<ProjectionDescriptionRawPtr> & projections_to_build,
-        BlockInputStreamPtr mutating_stream,
-        time_t time_of_mutation,
-        const CompressionCodecPtr & compression_codec,
-        MergeListEntry & merge_entry,
-        ExecuteTTLType execute_ttl_type,
-        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<ProjectionDescriptionRawPtr> & projections_to_recalc,
-        const Block & mutation_header,
-        MergeTreeData::MutableDataPartPtr new_data_part,
-        BlockInputStreamPtr mutating_stream,
-        time_t time_of_mutation,
-        const CompressionCodecPtr & compression_codec,
-        MergeListEntry & merge_entry,
-        ExecuteTTLType execute_ttl_type,
-        bool need_sync,
-        const ReservationPtr & space_reservation,
-        TableLockHolder & holder,
-        ContextPtr context);
-
-    /// Initialize and write to disk new part fields like checksums, columns,
-    /// etc.
-    static void finalizeMutatedPart(
-        const MergeTreeDataPartPtr & source_part,
-        MergeTreeData::MutableDataPartPtr new_data_part,
-        ExecuteTTLType execute_ttl_type,
-        const CompressionCodecPtr & codec);
+    static ExecuteTTLType shouldExecuteTTL(
+        const StorageMetadataPtr & metadata_snapshot, const ColumnDependencies & dependencies);
 
 public :
     /** Is used to cancel all merges and mutations. On cancel() call all currently running actions will throw exception soon.
@@ -297,9 +173,6 @@ private:
         bool need_remove_expired_values,
         const MergeTreeData::MergingParams & merging_params) const;
 
-    bool checkOperationIsNotCanceled(const MergeListEntry & merge_entry) const;
-
-
 private:
     MergeTreeData & data;
     const size_t background_pool_size;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
index d2484cf3536..11e080fda6c 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
@@ -49,13 +49,10 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartWide::getReader(
     const ValueSizeMap & avg_value_size_hints,
     const ReadBufferFromFileBase::ProfileCallback & profile_callback) const
 {
-    auto new_settings = reader_settings;
-    new_settings.convert_nested_to_subcolumns = true;
-
     auto ptr = std::static_pointer_cast<const MergeTreeDataPartWide>(shared_from_this());
     return std::make_unique<MergeTreeReaderWide>(
         ptr, columns_to_read, metadata_snapshot, uncompressed_cache,
-        mark_cache, mark_ranges, new_settings,
+        mark_cache, mark_ranges, reader_settings,
         avg_value_size_hints, profile_callback);
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 92529b00faa..d65873e419d 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -163,7 +163,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     LOG_DEBUG(
         log,
         "Choose {} projection {}",
-        ProjectionDescription::typeToString(query_info.projection->desc->type),
+        query_info.projection->desc->type,
         query_info.projection->desc->name);
 
     Pipes pipes;
@@ -267,6 +267,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
         auto many_data = std::make_shared<ManyAggregatedData>(projection_pipe.numOutputPorts() + ordinary_pipe.numOutputPorts());
         size_t counter = 0;
 
+        AggregatorListPtr aggregator_list_ptr = std::make_shared<AggregatorList>();
+
         // TODO apply in_order_optimization here
         auto build_aggregate_pipe = [&](Pipe & pipe, bool projection)
         {
@@ -306,7 +308,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
                     settings.min_count_to_compile_aggregate_expression,
                     header_before_aggregation); // The source header is also an intermediate header
 
-                transform_params = std::make_shared<AggregatingTransformParams>(std::move(params), query_info.projection->aggregate_final);
+                transform_params = std::make_shared<AggregatingTransformParams>(
+                    std::move(params), aggregator_list_ptr, query_info.projection->aggregate_final);
 
                 /// This part is hacky.
                 /// We want AggregatingTransform to work with aggregate states instead of normal columns.
@@ -336,7 +339,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
                     settings.compile_aggregate_expressions,
                     settings.min_count_to_compile_aggregate_expression);
 
-                transform_params = std::make_shared<AggregatingTransformParams>(std::move(params), query_info.projection->aggregate_final);
+                transform_params = std::make_shared<AggregatingTransformParams>(
+                    std::move(params), aggregator_list_ptr, query_info.projection->aggregate_final);
             }
 
             pipe.resize(pipe.numOutputPorts(), true, true);
@@ -1527,7 +1531,7 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
         counters.num_initial_selected_granules += num_granules;
 
         if (minmax_idx_condition && !minmax_idx_condition->checkInHyperrectangle(
-                part->minmax_idx.hyperrectangle, minmax_columns_types).can_be_true)
+                part->minmax_idx->hyperrectangle, minmax_columns_types).can_be_true)
             continue;
 
         counters.num_parts_after_minmax += 1;
@@ -1597,7 +1601,7 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
             counters.num_initial_selected_granules += num_granules;
 
             if (minmax_idx_condition
-                && !minmax_idx_condition->checkInHyperrectangle(part->minmax_idx.hyperrectangle, minmax_columns_types)
+                && !minmax_idx_condition->checkInHyperrectangle(part->minmax_idx->hyperrectangle, minmax_columns_types)
                         .can_be_true)
                 continue;
 
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 180c18ed1b5..95ddf105b79 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -277,8 +277,8 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(
     /// This will generate unique name in scope of current server process.
     Int64 temp_index = data.insert_increment.get();
 
-    IMergeTreeDataPart::MinMaxIndex minmax_idx;
-    minmax_idx.update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+    auto minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
+    minmax_idx->update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
 
     MergeTreePartition partition(std::move(block_with_partition.partition));
 
@@ -286,8 +286,8 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(
     String part_name;
     if (data.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
-        DayNum min_date(minmax_idx.hyperrectangle[data.minmax_idx_date_column_pos].left.get<UInt64>());
-        DayNum max_date(minmax_idx.hyperrectangle[data.minmax_idx_date_column_pos].right.get<UInt64>());
+        DayNum min_date(minmax_idx->hyperrectangle[data.minmax_idx_date_column_pos].left.get<UInt64>());
+        DayNum max_date(minmax_idx->hyperrectangle[data.minmax_idx_date_column_pos].right.get<UInt64>());
 
         const auto & date_lut = DateLUT::instance();
 
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.h b/src/Storages/MergeTree/MergeTreeIOSettings.h
index 8b67ab53b59..aaa8fae7dba 100644
--- a/src/Storages/MergeTree/MergeTreeIOSettings.h
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.h
@@ -18,8 +18,6 @@ struct MergeTreeReaderSettings
     /// If save_marks_in_cache is false, then, if marks are not in cache,
     ///  we will load them but won't save in the cache, to avoid evicting other data.
     bool save_marks_in_cache = false;
-    /// Convert old-style nested (single arrays with same prefix, `n.a`, `n.b`...) to subcolumns of data type Nested.
-    bool convert_nested_to_subcolumns = false;
     /// Validate checksums on reading (should be always enabled in production).
     bool checksum_on_read = true;
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
index 83c29c40c3f..cec09f53cdf 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
@@ -46,20 +46,29 @@ MergeTreeIndexGranulePtr MergeTreeIndexBloomFilter::createIndexGranule() const
 
 bool MergeTreeIndexBloomFilter::mayBenefitFromIndexForIn(const ASTPtr & node) const
 {
-    const String & column_name = node->getColumnName();
+    Names required_columns = index.expression->getRequiredColumns();
+    NameSet required_columns_set(required_columns.begin(), required_columns.end());
 
-    for (const auto & cname : index.column_names)
-        if (column_name == cname)
+    std::vector<ASTPtr> nodes_to_check;
+    nodes_to_check.emplace_back(node);
+
+    while (!nodes_to_check.empty())
+    {
+        auto node_to_check = nodes_to_check.back();
+        nodes_to_check.pop_back();
+
+        const auto & column_name = node_to_check->getColumnName();
+        if (required_columns_set.find(column_name) != required_columns_set.end())
             return true;
 
-    if (const auto * func = typeid_cast<const ASTFunction *>(node.get()))
-    {
-        for (const auto & children : func->arguments->children)
-            if (mayBenefitFromIndexForIn(children))
-                return true;
+        if (const auto * function = typeid_cast<const ASTFunction *>(node_to_check.get()))
+        {
+            auto & function_arguments_children = function->arguments->children;
+            nodes_to_check.insert(nodes_to_check.end(), function_arguments_children.begin(), function_arguments_children.end());
+        }
     }
 
-    return false;
+    return true;
 }
 
 MergeTreeIndexAggregatorPtr MergeTreeIndexBloomFilter::createIndexAggregator() const
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
index 7ca6f9ff1bd..cb617b0ef22 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -1,6 +1,7 @@
 #include <Common/HashTable/ClearableHashMap.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnTuple.h>
@@ -188,7 +189,6 @@ bool MergeTreeIndexConditionBloomFilter::mayBeTrueOnGranule(const MergeTreeIndex
                 const auto & filter = filters[query_index_hash.first];
                 const ColumnPtr & hash_column = query_index_hash.second;
 
-
                 match_rows = maybeTrueOnBloomFilter(&*hash_column,
                                                     filter,
                                                     hash_functions,
@@ -276,7 +276,9 @@ bool MergeTreeIndexConditionBloomFilter::traverseFunction(const ASTPtr & node, B
 
         if (functionIsInOrGlobalInOperator(function->name))
         {
-            if (const auto & prepared_set = getPreparedSet(arguments[1]))
+            auto prepared_set = getPreparedSet(arguments[1]);
+
+            if (prepared_set)
             {
                 if (traverseASTIn(function->name, arguments[0], prepared_set, out))
                     maybe_useful = true;
@@ -285,6 +287,7 @@ bool MergeTreeIndexConditionBloomFilter::traverseFunction(const ASTPtr & node, B
         else if (function->name == "equals" ||
                  function->name == "notEquals" ||
                  function->name == "has" ||
+                 function->name == "mapContains" ||
                  function->name == "indexOf" ||
                  function->name == "hasAny" ||
                  function->name == "hasAll")
@@ -308,14 +311,22 @@ bool MergeTreeIndexConditionBloomFilter::traverseFunction(const ASTPtr & node, B
 }
 
 bool MergeTreeIndexConditionBloomFilter::traverseASTIn(
-    const String & function_name, const ASTPtr & key_ast, const SetPtr & prepared_set, RPNElement & out)
+    const String & function_name,
+    const ASTPtr & key_ast,
+    const SetPtr & prepared_set,
+    RPNElement & out)
 {
     const auto prepared_info = getPreparedSetInfo(prepared_set);
-    return traverseASTIn(function_name, key_ast, prepared_info.type, prepared_info.column, out);
+    return traverseASTIn(function_name, key_ast, prepared_set, prepared_info.type, prepared_info.column, out);
 }
 
 bool MergeTreeIndexConditionBloomFilter::traverseASTIn(
-    const String & function_name, const ASTPtr & key_ast, const DataTypePtr & type, const ColumnPtr & column, RPNElement & out)
+    const String & function_name,
+    const ASTPtr & key_ast,
+    const SetPtr & prepared_set,
+    const DataTypePtr & type,
+    const ColumnPtr & column,
+    RPNElement & out)
 {
     if (header.has(key_ast->getColumnName()))
     {
@@ -352,10 +363,83 @@ bool MergeTreeIndexConditionBloomFilter::traverseASTIn(
             const auto & sub_data_types = tuple_data_type->getElements();
 
             for (size_t index = 0; index < arguments.size(); ++index)
-                match_with_subtype |= traverseASTIn(function_name, arguments[index], sub_data_types[index], sub_columns[index], out);
+                match_with_subtype |= traverseASTIn(function_name, arguments[index], nullptr, sub_data_types[index], sub_columns[index], out);
 
             return match_with_subtype;
         }
+
+        if (function->name == "arrayElement")
+        {
+            /** Try to parse arrayElement for mapKeys index.
+              * It is important to ignore keys like column_map['Key'] IN ('') because if key does not exists in map
+              * we return default value for arrayElement.
+              *
+              * We cannot skip keys that does not exist in map if comparison is with default type value because
+              * that way we skip necessary granules where map key does not exists.
+              */
+
+            if (!prepared_set)
+                return false;
+
+            auto default_column_to_check = type->createColumnConstWithDefaultValue(1)->convertToFullColumnIfConst();
+            ColumnWithTypeAndName default_column_with_type_to_check { default_column_to_check, type, "" };
+            ColumnsWithTypeAndName default_columns_with_type_to_check = {default_column_with_type_to_check};
+            auto set_contains_default_value_predicate_column = prepared_set->execute(default_columns_with_type_to_check, false /*negative*/);
+            const auto & set_contains_default_value_predicate_column_typed = assert_cast<const ColumnUInt8 &>(*set_contains_default_value_predicate_column);
+            bool set_contain_default_value = set_contains_default_value_predicate_column_typed.getData()[0];
+            if (set_contain_default_value)
+                return false;
+
+            const auto & col_name = assert_cast<ASTIdentifier *>(function->arguments.get()->children[0].get())->name();
+            auto map_keys_index_column_name = fmt::format("mapKeys({})", col_name);
+            auto map_values_index_column_name = fmt::format("mapValues({})", col_name);
+
+            if (header.has(map_keys_index_column_name))
+            {
+                /// For mapKeys we serialize key argument with bloom filter
+
+                auto & argument = function->arguments.get()->children[1];
+
+                if (const auto * literal = argument->as<ASTLiteral>())
+                {
+                    size_t position = header.getPositionByName(map_keys_index_column_name);
+                    const DataTypePtr & index_type = header.getByPosition(position).type;
+
+                    auto element_key = literal->value;
+                    const DataTypePtr actual_type = BloomFilter::getPrimitiveType(index_type);
+                    out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithField(actual_type.get(), element_key)));
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else if (header.has(map_values_index_column_name))
+            {
+                /// For mapValues we serialize set with bloom filter
+
+                size_t row_size = column->size();
+                size_t position = header.getPositionByName(map_values_index_column_name);
+                const DataTypePtr & index_type = header.getByPosition(position).type;
+                const auto & array_type = assert_cast<const DataTypeArray &>(*index_type);
+                const auto & array_nested_type = array_type.getNestedType();
+                const auto & converted_column = castColumn(ColumnWithTypeAndName{column, type, ""}, array_nested_type);
+                out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithColumn(array_nested_type, converted_column, 0, row_size)));
+            }
+            else
+            {
+                return false;
+            }
+
+            if (function_name == "in"  || function_name == "globalIn")
+                out.function = RPNElement::FUNCTION_IN;
+
+            if (function_name == "notIn"  || function_name == "globalNotIn")
+                out.function = RPNElement::FUNCTION_NOT_IN;
+
+            return true;
+        }
     }
 
     return false;
@@ -420,7 +504,12 @@ static bool indexOfCanUseBloomFilter(const ASTPtr & parent)
 
 
 bool MergeTreeIndexConditionBloomFilter::traverseASTEquals(
-    const String & function_name, const ASTPtr & key_ast, const DataTypePtr & value_type, const Field & value_field, RPNElement & out, const ASTPtr & parent)
+    const String & function_name,
+    const ASTPtr & key_ast,
+    const DataTypePtr & value_type,
+    const Field & value_field,
+    RPNElement & out,
+    const ASTPtr & parent)
 {
     if (header.has(key_ast->getColumnName()))
     {
@@ -488,6 +577,29 @@ bool MergeTreeIndexConditionBloomFilter::traverseASTEquals(
         return true;
     }
 
+    if (function_name == "mapContains" || function_name == "has")
+    {
+        const auto & col_name = assert_cast<ASTIdentifier *>(key_ast.get())->name();
+        auto map_keys_index_column_name = fmt::format("mapKeys({})", col_name);
+
+        if (!header.has(map_keys_index_column_name))
+            return false;
+
+        size_t position = header.getPositionByName(map_keys_index_column_name);
+        const DataTypePtr & index_type = header.getByPosition(position).type;
+        const auto * array_type = typeid_cast<const DataTypeArray *>(index_type.get());
+
+        if (!array_type)
+            return false;
+
+        out.function = RPNElement::FUNCTION_HAS;
+        const DataTypePtr actual_type = BloomFilter::getPrimitiveType(array_type->getNestedType());
+        Field converted_field = convertFieldToType(value_field, *actual_type, value_type.get());
+        out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithField(actual_type.get(), converted_field)));
+
+        return true;
+    }
+
     if (const auto * function = key_ast->as<ASTFunction>())
     {
         WhichDataType which(value_type);
@@ -509,6 +621,42 @@ bool MergeTreeIndexConditionBloomFilter::traverseASTEquals(
 
             return match_with_subtype;
         }
+
+        if (function->name == "arrayElement")
+        {
+            /** Try to parse arrayElement for mapKeys index.
+              * It is important to ignore keys like column_map['Key'] = '' because if key does not exists in map
+              * we return default value for arrayElement.
+              *
+              * We cannot skip keys that does not exist in map if comparison is with default type value because
+              * that way we skip necessary granules where map key does not exists.
+              */
+            if (value_field == value_type->getDefault())
+                return false;
+
+            const auto & col_name = assert_cast<ASTIdentifier *>(function->arguments.get()->children[0].get())->name();
+
+            auto map_keys_index_column_name = fmt::format("mapKeys({})", col_name);
+
+            if (!header.has(map_keys_index_column_name))
+                return false;
+
+            size_t position = header.getPositionByName(map_keys_index_column_name);
+            const DataTypePtr & index_type = header.getByPosition(position).type;
+            out.function = function_name == "equals" ? RPNElement::FUNCTION_EQUALS : RPNElement::FUNCTION_NOT_EQUALS;
+
+            auto & argument = function->arguments.get()->children[1];
+
+            if (const auto * literal = argument->as<ASTLiteral>())
+            {
+                auto element_key = literal->value;
+                const DataTypePtr actual_type = BloomFilter::getPrimitiveType(index_type);
+                out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithField(actual_type.get(), element_key)));
+                return true;
+            }
+
+            return false;
+        }
     }
 
     return false;
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
index f2bbd047ca1..5c6559ba298 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
@@ -70,13 +70,27 @@ private:
 
     bool traverseFunction(const ASTPtr & node, Block & block_with_constants, RPNElement & out, const ASTPtr & parent);
 
-    bool traverseASTIn(const String & function_name, const ASTPtr & key_ast, const SetPtr & prepared_set, RPNElement & out);
+    bool traverseASTIn(
+        const String & function_name,
+        const ASTPtr & key_ast,
+        const SetPtr & prepared_set,
+        RPNElement & out);
 
     bool traverseASTIn(
-        const String & function_name, const ASTPtr & key_ast, const DataTypePtr & type, const ColumnPtr & column, RPNElement & out);
+        const String & function_name,
+        const ASTPtr & key_ast,
+        const SetPtr & prepared_set,
+        const DataTypePtr & type,
+        const ColumnPtr & column,
+        RPNElement & out);
 
     bool traverseASTEquals(
-        const String & function_name, const ASTPtr & key_ast, const DataTypePtr & value_type, const Field & value_field, RPNElement & out, const ASTPtr & parent);
+        const String & function_name,
+        const ASTPtr & key_ast,
+        const DataTypePtr & value_type,
+        const Field & value_field,
+        RPNElement & out,
+        const ASTPtr & parent);
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index 1c71d77b334..8f43b1606cb 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -3,6 +3,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/UTF8Helpers.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/ExpressionActions.h>
@@ -155,13 +156,40 @@ void MergeTreeIndexAggregatorFullText::update(const Block & block, size_t * pos,
 
     for (size_t col = 0; col < index_columns.size(); ++col)
     {
-        const auto & column = block.getByName(index_columns[col]).column;
-        for (size_t i = 0; i < rows_read; ++i)
+        const auto & column_with_type = block.getByName(index_columns[col]);
+        const auto & column = column_with_type.column;
+        size_t current_position = *pos;
+
+        if (isArray(column_with_type.type))
         {
-            auto ref = column->getDataAt(*pos + i);
-            columnToBloomFilter(ref.data, ref.size, token_extractor, granule->bloom_filters[col]);
+            const auto & column_array = assert_cast<const ColumnArray &>(*column);
+            const auto & column_offsets = column_array.getOffsets();
+            const auto & column_key = column_array.getData();
+
+            for (size_t i = 0; i < rows_read; ++i)
+            {
+                size_t element_start_row = column_offsets[current_position - 1];
+                size_t elements_size = column_offsets[current_position] - element_start_row;
+
+                for (size_t row_num = 0; row_num < elements_size; row_num++)
+                {
+                    auto ref = column_key.getDataAt(element_start_row + row_num);
+                    columnToBloomFilter(ref.data, ref.size, token_extractor, granule->bloom_filters[col]);
+                }
+
+                current_position += 1;
+            }
+        }
+        else
+        {
+            for (size_t i = 0; i < rows_read; ++i)
+            {
+                auto ref = column->getDataAt(current_position + i);
+                columnToBloomFilter(ref.data, ref.size, token_extractor, granule->bloom_filters[col]);
+            }
         }
     }
+
     granule->has_elems = true;
     *pos += rows_read;
 }
@@ -202,6 +230,7 @@ bool MergeTreeConditionFullText::alwaysUnknownOrTrue() const
         }
         else if (element.function == RPNElement::FUNCTION_EQUALS
              || element.function == RPNElement::FUNCTION_NOT_EQUALS
+             || element.function == RPNElement::FUNCTION_HAS
              || element.function == RPNElement::FUNCTION_IN
              || element.function == RPNElement::FUNCTION_NOT_IN
              || element.function == RPNElement::FUNCTION_MULTI_SEARCH
@@ -251,7 +280,8 @@ bool MergeTreeConditionFullText::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx
             rpn_stack.emplace_back(true, true);
         }
         else if (element.function == RPNElement::FUNCTION_EQUALS
-             || element.function == RPNElement::FUNCTION_NOT_EQUALS)
+             || element.function == RPNElement::FUNCTION_NOT_EQUALS
+             || element.function == RPNElement::FUNCTION_HAS)
         {
             rpn_stack.emplace_back(granule->bloom_filters[element.key_column].contains(*element.bloom_filter), true);
 
@@ -378,6 +408,15 @@ bool MergeTreeConditionFullText::atomFromAST(
         else if (!token_extractor->supportLike() && (func_name == "like" || func_name == "notLike"))
             return false;
 
+        if (func_name == "has")
+        {
+            out.key_column = key_column_num;
+            out.function = RPNElement::FUNCTION_HAS;
+            out.bloom_filter = std::make_unique<BloomFilter>(params);
+            stringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
+
+            return true;
+        }
         if (func_name == "notEquals")
         {
             out.key_column = key_column_num;
@@ -837,10 +876,18 @@ MergeTreeIndexPtr bloomFilterIndexCreator(
 
 void bloomFilterIndexValidator(const IndexDescription & index, bool /*attach*/)
 {
-    for (const auto & data_type : index.data_types)
+    for (const auto & index_data_type : index.data_types)
     {
-        if (data_type->getTypeId() != TypeIndex::String && data_type->getTypeId() != TypeIndex::FixedString)
-            throw Exception("Bloom filter index can be used only with `String` or `FixedString` column.", ErrorCodes::INCORRECT_QUERY);
+        WhichDataType data_type(index_data_type);
+
+        if (data_type.isArray())
+        {
+            const auto & array_type = assert_cast<const DataTypeArray &>(*index_data_type);
+            data_type = WhichDataType(array_type.getNestedType());
+        }
+
+        if (!data_type.isString() && !data_type.isFixedString())
+            throw Exception("Bloom filter index can be used only with `String`, `FixedString` column or Array with `String` or `FixedString` values column.", ErrorCodes::INCORRECT_QUERY);
     }
 
     if (index.type == NgramTokenExtractor::getName())
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.h b/src/Storages/MergeTree/MergeTreeIndexFullText.h
index d34cbc61da2..b1c70a9c04f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.h
@@ -112,6 +112,7 @@ private:
             /// Atoms of a Boolean expression.
             FUNCTION_EQUALS,
             FUNCTION_NOT_EQUALS,
+            FUNCTION_HAS,
             FUNCTION_IN,
             FUNCTION_NOT_IN,
             FUNCTION_MULTI_SEARCH,
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.cpp b/src/Storages/MergeTree/MergeTreePartInfo.cpp
index 6a98e666c34..7e140ec2375 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreePartInfo.cpp
@@ -15,13 +15,12 @@ namespace ErrorCodes
 
 MergeTreePartInfo MergeTreePartInfo::fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version)
 {
-    MergeTreePartInfo part_info;
-    if (!tryParsePartName(part_name, &part_info, format_version))
-        throw Exception("Unexpected part name: " + part_name, ErrorCodes::BAD_DATA_PART_NAME);
-    return part_info;
+    if (auto part_opt = tryParsePartName(part_name, format_version))
+        return *part_opt;
+    else
+        throw Exception(ErrorCodes::BAD_DATA_PART_NAME, "Unexpected part name: {}", part_name);
 }
 
-
 void MergeTreePartInfo::validatePartitionID(const String & partition_id, MergeTreeDataFormatVersion format_version)
 {
     if (partition_id.empty())
@@ -43,22 +42,26 @@ void MergeTreePartInfo::validatePartitionID(const String & partition_id, MergeTr
 
 }
 
-bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version)
+std::optional<MergeTreePartInfo> MergeTreePartInfo::tryParsePartName(
+    std::string_view part_name, MergeTreeDataFormatVersion format_version)
 {
     ReadBufferFromString in(part_name);
 
     String partition_id;
+
     if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
         UInt32 min_yyyymmdd = 0;
         UInt32 max_yyyymmdd = 0;
+
         if (!tryReadIntText(min_yyyymmdd, in)
             || !checkChar('_', in)
             || !tryReadIntText(max_yyyymmdd, in)
             || !checkChar('_', in))
         {
-            return false;
+            return std::nullopt;
         }
+
         partition_id = toString(min_yyyymmdd / 100);
     }
     else
@@ -76,9 +79,7 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
 
     /// Sanity check
     if (partition_id.empty())
-    {
-        return false;
-    }
+        return std::nullopt;
 
     Int64 min_block_num = 0;
     Int64 max_block_num = 0;
@@ -91,14 +92,12 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
         || !checkChar('_', in)
         || !tryReadIntText(level, in))
     {
-        return false;
+        return std::nullopt;
     }
 
     /// Sanity check
     if (min_block_num > max_block_num)
-    {
-        return false;
-    }
+        return std::nullopt;
 
     if (!in.eof())
     {
@@ -106,29 +105,30 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
             || !tryReadIntText(mutation, in)
             || !in.eof())
         {
-            return false;
+            return std::nullopt;
         }
     }
 
-    if (part_info)
+    MergeTreePartInfo part_info;
+
+    part_info.partition_id = std::move(partition_id);
+    part_info.min_block = min_block_num;
+    part_info.max_block = max_block_num;
+
+    if (level == LEGACY_MAX_LEVEL)
     {
-        part_info->partition_id = std::move(partition_id);
-        part_info->min_block = min_block_num;
-        part_info->max_block = max_block_num;
-        if (level == LEGACY_MAX_LEVEL)
-        {
-            /// We (accidentally) had two different max levels until 21.6 and it might cause logical errors like
-            /// "Part 20170601_20170630_0_2_999999999 intersects 201706_0_1_4294967295".
-            /// So we replace unexpected max level to make contains(...) method and comparison operators work
-            /// correctly with such virtual parts. On part name serialization we will use legacy max level to keep the name unchanged.
-            part_info->use_leagcy_max_level = true;
-            level = MAX_LEVEL;
-        }
-        part_info->level = level;
-        part_info->mutation = mutation;
+        /// We (accidentally) had two different max levels until 21.6 and it might cause logical errors like
+        /// "Part 20170601_20170630_0_2_999999999 intersects 201706_0_1_4294967295".
+        /// So we replace unexpected max level to make contains(...) method and comparison operators work
+        /// correctly with such virtual parts. On part name serialization we will use legacy max level to keep the name unchanged.
+        part_info.use_leagcy_max_level = true;
+        level = MAX_LEVEL;
     }
 
-    return true;
+    part_info.level = level;
+    part_info.mutation = mutation;
+
+    return part_info;
 }
 
 
@@ -235,55 +235,75 @@ String MergeTreePartInfo::getPartNameV0(DayNum left_date, DayNum right_date) con
     return wb.str();
 }
 
-
-const std::vector<String> DetachedPartInfo::DETACH_REASONS =
-    {
-        "broken",
-        "unexpected",
-        "noquorum",
-        "ignored",
-        "broken-on-start",
-        "clone",
-        "attaching",
-        "deleting",
-        "tmp-fetch",
-    };
-
-bool DetachedPartInfo::tryParseDetachedPartName(const String & dir_name, DetachedPartInfo & part_info,
-                                                MergeTreeDataFormatVersion format_version)
+DetachedPartInfo DetachedPartInfo::parseDetachedPartName(
+    std::string_view dir_name, MergeTreeDataFormatVersion format_version)
 {
+    DetachedPartInfo part_info;
+
     part_info.dir_name = dir_name;
 
-    /// First, try to find known prefix and parse dir_name as <prefix>_<partname>.
+    /// First, try to find known prefix and parse dir_name as <prefix>_<part_name>.
     /// Arbitrary strings are not allowed for partition_id, so known_prefix cannot be confused with partition_id.
-    for (const auto & known_prefix : DETACH_REASONS)
+    for (std::string_view known_prefix : DETACH_REASONS)
     {
-        if (dir_name.starts_with(known_prefix) && known_prefix.size() < dir_name.size() && dir_name[known_prefix.size()] == '_')
+        if (dir_name.starts_with(known_prefix)
+            && known_prefix.size() < dir_name.size()
+            && dir_name[known_prefix.size()] == '_')
         {
             part_info.prefix = known_prefix;
-            String part_name = dir_name.substr(known_prefix.size() + 1);
-            bool parsed = MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version);
-            return part_info.valid_name = parsed;
+
+            const std::string_view part_name = dir_name.substr(known_prefix.size() + 1);
+
+            if (auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+            {
+                part_info.valid_name = true;
+                part_info.addParsedPartInfo(*part_opt);
+            }
+            else
+                part_info.valid_name = false;
+
+            return part_info;
         }
     }
 
     /// Next, try to parse dir_name as <part_name>.
-    if (MergeTreePartInfo::tryParsePartName(dir_name, &part_info, format_version))
-        return part_info.valid_name = true;
+    if (auto part_opt = MergeTreePartInfo::tryParsePartName(dir_name, format_version))
+    {
+        part_info.valid_name = true;
+        part_info.addParsedPartInfo(*part_opt);
+        return part_info;
+    }
 
     /// Next, as <prefix>_<partname>. Use entire name as prefix if it fails.
     part_info.prefix = dir_name;
-    const auto first_separator = dir_name.find_first_of('_');
+
+    const size_t first_separator = dir_name.find_first_of('_');
+
     if (first_separator == String::npos)
-        return part_info.valid_name = false;
+    {
+        part_info.valid_name = false;
+        return part_info;
+    }
 
-    const auto part_name = dir_name.substr(first_separator + 1,
-                                           dir_name.size() - first_separator - 1);
-    if (!MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
-        return part_info.valid_name = false;
+    const std::string_view part_name = dir_name.substr(
+        first_separator + 1,
+        dir_name.size() - first_separator - 1);
 
-    part_info.prefix = dir_name.substr(0, first_separator);
-    return part_info.valid_name = true;
+    if (auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+    {
+        part_info.valid_name = true;
+        part_info.prefix = dir_name.substr(0, first_separator);
+        part_info.addParsedPartInfo(*part_opt);
+    }
+    else
+        part_info.valid_name = false;
+
+    return part_info;
 }
 
+void DetachedPartInfo::addParsedPartInfo(const MergeTreePartInfo& part)
+{
+    // Both class are aggregates so it's ok.
+    static_cast<MergeTreePartInfo &>(*this) = part;
+}
 }
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index 181fef7990c..73761048035 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <limits>
+#include <optional>
 #include <tuple>
 #include <vector>
+#include <array>
 #include <common/types.h>
 #include <common/DayNum.h>
 #include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
@@ -98,7 +100,8 @@ struct MergeTreePartInfo
 
     static MergeTreePartInfo fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version);  // -V1071
 
-    static bool tryParsePartName(const String & part_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version);
+    static std::optional<MergeTreePartInfo> tryParsePartName(
+        std::string_view part_name, MergeTreeDataFormatVersion format_version);
 
     static void parseMinMaxDatesFromPartName(const String & part_name, DayNum & min_date, DayNum & max_date);
 
@@ -122,11 +125,27 @@ struct DetachedPartInfo : public MergeTreePartInfo
     /// If false, MergeTreePartInfo is in invalid state (directory name was not successfully parsed).
     bool valid_name;
 
-    static const std::vector<String> DETACH_REASONS;
+    static constexpr auto DETACH_REASONS = std::to_array<std::string_view>({
+        "broken",
+        "unexpected",
+        "noquorum",
+        "ignored",
+        "broken-on-start",
+        "clone",
+        "attaching",
+        "deleting",
+        "tmp-fetch"
+    });
 
     /// NOTE: It may parse part info incorrectly.
-    /// For example, if prefix contain '_' or if DETACH_REASONS doesn't contain prefix.
-    static bool tryParseDetachedPartName(const String & dir_name, DetachedPartInfo & part_info, MergeTreeDataFormatVersion format_version);
+    /// For example, if prefix contains '_' or if DETACH_REASONS doesn't contain prefix.
+    // This method has different semantics with MergeTreePartInfo::tryParsePartName.
+    // Detached parts are always parsed regardless of their validity.
+    // DetachedPartInfo::valid_name field specifies whether parsing was successful or not.
+    static DetachedPartInfo parseDetachedPartName(std::string_view dir_name, MergeTreeDataFormatVersion format_version);
+
+private:
+    void addParsedPartInfo(const MergeTreePartInfo& part);
 };
 
 using DetachedPartsInfo = std::vector<DetachedPartInfo>;
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 3a8119863cb..c898874f737 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -213,13 +213,20 @@ void MergeTreeReaderCompact::readData(
 
     if (name_and_type.isSubcolumn())
     {
-        auto type_in_storage = name_and_type.getTypeInStorage();
+        const auto & type_in_storage = name_and_type.getTypeInStorage();
         ColumnPtr temp_column = type_in_storage->createColumn();
 
         auto serialization = type_in_storage->getDefaultSerialization();
         serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
         serialization->deserializeBinaryBulkWithMultipleStreams(temp_column, rows_to_read, deserialize_settings, state, nullptr);
-        column = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), *temp_column);
+
+        auto subcolumn = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), *temp_column);
+
+        /// TODO: Avoid extra copying.
+        if (column->empty())
+            column = subcolumn;
+        else
+            column->assumeMutable()->insertRangeFrom(*subcolumn, 0, subcolumn->size());
     }
     else
     {
diff --git a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
index cf5c850daa1..3e81fec5145 100644
--- a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
@@ -11,7 +11,6 @@ namespace ErrorCodes
 {
     extern const int CANNOT_READ_ALL_DATA;
     extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int LOGICAL_ERROR;
 }
 
 
@@ -38,19 +37,6 @@ MergeTreeReaderInMemory::MergeTreeReaderInMemory(
     }
 }
 
-static ColumnPtr getColumnFromBlock(const Block & block, const NameAndTypePair & name_and_type)
-{
-    auto storage_name = name_and_type.getNameInStorage();
-    if (!block.has(storage_name))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Not found column '{}' in block", storage_name);
-
-    const auto & column = block.getByName(storage_name).column;
-    if (name_and_type.isSubcolumn())
-        return name_and_type.getTypeInStorage()->getSubcolumn(name_and_type.getSubcolumnName(), *column);
-
-    return column;
-}
-
 size_t MergeTreeReaderInMemory::readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
 {
     if (!continue_reading)
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index 56ba0f25ded..92a892c963f 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -79,6 +79,7 @@ struct Settings;
     M(Seconds, try_fetch_recompressed_part_timeout, 7200, "Recompression works slow in most cases, so we don't start merge with recompression until this timeout and trying to fetch recompressed part from replica which assigned this merge with recompression.", 0) \
     M(Bool, always_fetch_merged_part, false, "If true, replica never merge parts and always download merged parts from other replicas.", 0) \
     M(UInt64, max_suspicious_broken_parts, 10, "Max broken parts, if more - deny automatic deletion.", 0) \
+    M(UInt64, max_suspicious_broken_parts_bytes, 1ULL * 1024 * 1024 * 1024, "Max size of all broken parts, if more - deny automatic deletion.", 0) \
     M(UInt64, max_files_to_modify_in_alter_columns, 75, "Not apply ALTER if number of files for modification(deletion, addition) more than this.", 0) \
     M(UInt64, max_files_to_remove_in_alter_columns, 50, "Not apply ALTER, if number of files for deletion more than this.", 0) \
     M(Float, replicated_max_ratio_of_wrong_parts, 0.5, "If ratio of wrong parts to total number of parts is less than this - allow to start.", 0) \
@@ -89,6 +90,7 @@ 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, true, "Do not remove old local parts when repairing lost replica.", 0) \
+    M(Bool, detach_not_byte_identical_parts, false, "Do not remove non byte-idential parts for ReplicatedMergeTree, instead detach them (maybe useful for further analysis).", 0) \
     M(UInt64, max_replicated_fetches_network_bandwidth, 0, "The maximum speed of data exchange over the network in bytes per second for replicated fetches. Zero means unlimited.", 0) \
     M(UInt64, max_replicated_sends_network_bandwidth, 0, "The maximum speed of data exchange over the network in bytes per second for replicated sends. Zero means unlimited.", 0) \
     \
diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
index 73c753386a4..c3193ac68b5 100644
--- a/src/Storages/MergeTree/MergeTreeSink.cpp
+++ b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -37,7 +37,7 @@ void MergeTreeSink::consume(Chunk chunk)
             PartLog::addNewPart(storage.getContext(), part, watch.elapsed());
 
             /// Initiate async merge - it will be done if it's good time for merge and if there are space in 'background_pool'.
-            storage.background_executor.triggerTask();
+            storage.background_operations_assignee.trigger();
         }
     }
 }
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index 806c861cf00..1f33f3eb092 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -373,7 +373,7 @@ bool MergeTreeWhereOptimizer::cannotBeMoved(const ASTPtr & ptr, bool is_final) c
 
 void MergeTreeWhereOptimizer::determineArrayJoinedNames(ASTSelectQuery & select)
 {
-    auto array_join_expression_list = select.arrayJoinExpressionList();
+    auto [array_join_expression_list, _] = select.arrayJoinExpressionList();
 
     /// much simplified code from ExpressionAnalyzer::getArrayJoinedColumns()
     if (!array_join_expression_list)
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index 52d598b41f9..3e8aa6af536 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -197,7 +197,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
                 {},
                 CompressionCodecFactory::instance().get("NONE", {}));
 
-            part->minmax_idx.update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+            part->minmax_idx->update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
             part->partition.create(metadata_snapshot, block, 0, context);
             if (metadata_snapshot->hasSortingKey())
                 metadata_snapshot->getSortingKey().expression->execute(block);
diff --git a/src/Storages/MergeTree/MergeType.h b/src/Storages/MergeTree/MergeType.h
index f7e99f98c8c..9c6d4759cd0 100644
--- a/src/Storages/MergeTree/MergeType.h
+++ b/src/Storages/MergeTree/MergeType.h
@@ -7,7 +7,7 @@ namespace DB
 
 /// Type of Merge. Used to control amount of different merges during merges
 /// assignment. Also allows to apply special logic during merge process
-/// (mergePartsToTemporaryPart). Stored in FutureMergedMutatedPart and
+/// Stored in FutureMergedMutatedPart and
 /// ReplicatedMergeTreeLogEntry.
 ///
 /// Order is important, don't try to change it.
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 6de01caa833..31675789257 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -135,8 +135,8 @@ void MergedBlockOutputStream::finalizePartOnDisk(
         if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING || isCompactPart(new_part))
         {
             new_part->partition.store(storage, volume->getDisk(), part_path, checksums);
-            if (new_part->minmax_idx.initialized)
-                new_part->minmax_idx.store(storage, volume->getDisk(), part_path, checksums);
+            if (new_part->minmax_idx->initialized)
+                new_part->minmax_idx->store(storage, volume->getDisk(), part_path, checksums);
             else if (rows_count)
                 throw Exception("MinMax index was not initialized for new non-empty part " + new_part->name
                         + ". It is a bug.", ErrorCodes::LOGICAL_ERROR);
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.h b/src/Storages/MergeTree/MergedBlockOutputStream.h
index 9b76574ac9a..95cc91a8ebc 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.h
@@ -60,4 +60,6 @@ private:
     CompressionCodecPtr default_codec;
 };
 
+using MergedBlockOutputStreamPtr = std::shared_ptr<MergedBlockOutputStream>;
+
 }
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.h b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.h
index 393058dc82e..c82357dfb1d 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.h
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.h
@@ -33,5 +33,7 @@ private:
     Block header;
 };
 
+using MergedColumnOnlyOutputStreamPtr = std::shared_ptr<MergedColumnOnlyOutputStream>;
+
 
 }
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
new file mode 100644
index 00000000000..7cca7012a2c
--- /dev/null
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
@@ -0,0 +1,138 @@
+#include <Storages/MergeTree/MutateFromLogEntryTask.h>
+
+#include <common/logger_useful.h>
+#include <Common/ProfileEvents.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+
+namespace ProfileEvents
+{
+    extern const Event DataAfterMutationDiffersFromReplica;
+    extern const Event ReplicatedPartMutations;
+}
+
+namespace DB
+{
+
+std::pair<bool, ReplicatedMergeMutateTaskBase::PartLogWriter> MutateFromLogEntryTask::prepare()
+{
+    const String & source_part_name = entry.source_parts.at(0);
+    const auto storage_settings_ptr = storage.getSettings();
+    LOG_TRACE(log, "Executing log entry to mutate part {} to {}", source_part_name, entry.new_part_name);
+
+    MergeTreeData::DataPartPtr source_part = storage.getActiveContainingPart(source_part_name);
+    if (!source_part)
+    {
+        LOG_DEBUG(log, "Source part {} for {} is not ready; will try to fetch it instead", source_part_name, entry.new_part_name);
+        return {false, {}};
+    }
+
+    if (source_part->name != source_part_name)
+    {
+        LOG_WARNING(log, "Part " + source_part_name + " is covered by " + source_part->name
+                    + " but should be mutated to " + entry.new_part_name + ". "
+                    + "Possibly the mutation of this part is not needed and will be skipped. This shouldn't happen often.");
+        return {false, {}};
+    }
+
+    /// TODO - some better heuristic?
+    size_t estimated_space_for_result = MergeTreeDataMergerMutator::estimateNeededDiskSpace({source_part});
+
+    if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr)
+        && estimated_space_for_result >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
+    {
+        /// If entry is old enough, and have enough size, and some replica has the desired part,
+        /// then prefer fetching from replica.
+        String replica = storage.findReplicaHavingPart(entry.new_part_name, true);    /// NOTE excessive ZK requests for same data later, may remove.
+        if (!replica.empty())
+        {
+            LOG_DEBUG(log, "Prefer to fetch {} from replica {}", entry.new_part_name, replica);
+            return {false, {}};
+        }
+    }
+
+    new_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, storage.format_version);
+    commands = MutationCommands::create(storage.queue.getMutationCommands(source_part, new_part_info.mutation));
+
+    /// Once we mutate part, we must reserve space on the same disk, because mutations can possibly create hardlinks.
+    /// Can throw an exception.
+    reserved_space = storage.reserveSpace(estimated_space_for_result, source_part->volume);
+
+    table_lock_holder = storage.lockForShare(
+            RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
+    StorageMetadataPtr metadata_snapshot = storage.getInMemoryMetadataPtr();
+
+    transaction_ptr = std::make_unique<MergeTreeData::Transaction>(storage);
+
+    future_mutated_part = std::make_shared<FutureMergedMutatedPart>();
+    future_mutated_part->name = entry.new_part_name;
+    future_mutated_part->uuid = entry.new_part_uuid;
+    future_mutated_part->parts.push_back(source_part);
+    future_mutated_part->part_info = new_part_info;
+    future_mutated_part->updatePath(storage, reserved_space.get());
+    future_mutated_part->type = source_part->getType();
+
+    merge_mutate_entry = storage.getContext()->getMergeList().insert(storage.getStorageID(), future_mutated_part);
+
+    stopwatch_ptr = std::make_unique<Stopwatch>();
+
+    mutate_task = storage.merger_mutator.mutatePartToTemporaryPart(
+            future_mutated_part, metadata_snapshot, commands, merge_mutate_entry.get(),
+            entry.create_time, storage.getContext(), reserved_space, table_lock_holder);
+
+    return {true, [this] (const ExecutionStatus & execution_status)
+    {
+        storage.writePartLog(
+            PartLogElement::MUTATE_PART, execution_status, stopwatch_ptr->elapsed(),
+            entry.new_part_name, new_part, future_mutated_part->parts, merge_mutate_entry.get());
+    }};
+}
+
+
+bool MutateFromLogEntryTask::finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log)
+{
+    new_part = mutate_task->getFuture().get();
+
+    storage.renameTempPartAndReplace(new_part, nullptr, transaction_ptr.get());
+
+    try
+    {
+        storage.checkPartChecksumsAndCommit(*transaction_ptr, new_part);
+    }
+    catch (const Exception & e)
+    {
+        if (MergeTreeDataPartChecksums::isBadChecksumsErrorCode(e.code()))
+        {
+            transaction_ptr->rollback();
+
+            ProfileEvents::increment(ProfileEvents::DataAfterMutationDiffersFromReplica);
+
+            LOG_ERROR(log, "{}. Data after mutation is not byte-identical to data on another replicas. We will download merged part from replica to force byte-identical result.", getCurrentExceptionMessage(false));
+
+            write_part_log(ExecutionStatus::fromCurrentException());
+
+            if (storage.getSettings()->detach_not_byte_identical_parts)
+                storage.forgetPartAndMoveToDetached(std::move(new_part), "mutate-not-byte-identical");
+            else
+                storage.tryRemovePartImmediately(std::move(new_part));
+
+            /// No need to delete the part from ZK because we can be sure that the commit transaction
+            /// didn't go through.
+
+            return false;
+        }
+
+        throw;
+    }
+
+    /** With `ZSESSIONEXPIRED` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
+         * This is not a problem, because in this case the entry will remain in the queue, and we will try again.
+         */
+    storage.merge_selecting_task->schedule();
+    ProfileEvents::increment(ProfileEvents::ReplicatedPartMutations);
+    write_part_log({});
+
+    return true;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.h b/src/Storages/MergeTree/MutateFromLogEntryTask.h
new file mode 100644
index 00000000000..2fa4f0c0388
--- /dev/null
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <common/shared_ptr_helper.h>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MutateTask.h>
+#include <Storages/MergeTree/ReplicatedMergeMutateTaskBase.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
+
+namespace DB
+{
+
+class MutateFromLogEntryTask : public shared_ptr_helper<MutateFromLogEntryTask>, public ReplicatedMergeMutateTaskBase
+{
+public:
+    template <typename Callback>
+    MutateFromLogEntryTask(
+        ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry_,
+        StorageReplicatedMergeTree & storage_,
+        Callback && task_result_callback_)
+        : ReplicatedMergeMutateTaskBase(&Poco::Logger::get("MutateFromLogEntryTask"), storage_, selected_entry_, task_result_callback_) {}
+
+private:
+    std::pair<bool, ReplicatedMergeMutateTaskBase::PartLogWriter> prepare() override;
+    bool finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log) override;
+
+    bool executeInnerTask() override
+    {
+        return mutate_task->execute();
+    }
+
+    TableLockHolder table_lock_holder{nullptr};
+    ReservationSharedPtr reserved_space{nullptr};
+
+    MergeTreePartInfo new_part_info;
+    MutationCommandsConstPtr commands;
+
+    MergeTreeData::TransactionUniquePtr transaction_ptr{nullptr};
+    StopwatchUniquePtr stopwatch_ptr{nullptr};
+
+    MergeTreeData::MutableDataPartPtr new_part{nullptr};
+    FutureMergedMutatedPartPtr future_mutated_part{nullptr};
+
+    MutateTaskPtr mutate_task;
+};
+
+
+}
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
new file mode 100644
index 00000000000..71128b31cdb
--- /dev/null
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
@@ -0,0 +1,106 @@
+#include <Storages/MergeTree/MutatePlainMergeTreeTask.h>
+
+#include <Storages/StorageMergeTree.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
+StorageID MutatePlainMergeTreeTask::getStorageID()
+{
+    return storage.getStorageID();
+}
+
+void MutatePlainMergeTreeTask::onCompleted()
+{
+    bool delay = state == State::SUCCESS;
+    task_result_callback(delay);
+}
+
+
+void MutatePlainMergeTreeTask::prepare()
+{
+    future_part = merge_mutate_entry->future_part;
+
+    merge_list_entry = storage.getContext()->getMergeList().insert(storage.getStorageID(), future_part);
+    stopwatch = std::make_unique<Stopwatch>();
+
+    write_part_log = [this] (const ExecutionStatus & execution_status)
+    {
+        storage.writePartLog(
+            PartLogElement::MUTATE_PART,
+            execution_status,
+            stopwatch->elapsed(),
+            future_part->name,
+            new_part,
+            future_part->parts,
+            merge_list_entry.get());
+    };
+
+    mutate_task = storage.merger_mutator.mutatePartToTemporaryPart(
+            future_part, metadata_snapshot, merge_mutate_entry->commands, merge_list_entry.get(),
+            time(nullptr), storage.getContext(), merge_mutate_entry->tagger->reserved_space, table_lock_holder);
+}
+
+bool MutatePlainMergeTreeTask::executeStep()
+{
+
+    /// Make out memory tracker a parent of current thread memory tracker
+    MemoryTrackerThreadSwitcherPtr switcher;
+    if (merge_list_entry)
+        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(&(*merge_list_entry)->memory_tracker);
+
+    switch (state)
+    {
+        case State::NEED_PREPARE :
+        {
+            prepare();
+            state = State::NEED_EXECUTE;
+            return true;
+        }
+        case State::NEED_EXECUTE :
+        {
+            try
+            {
+                if (mutate_task->execute())
+                    return true;
+
+                new_part = mutate_task->getFuture().get();
+
+                storage.renameTempPartAndReplace(new_part);
+                storage.updateMutationEntriesErrors(future_part, true, "");
+                write_part_log({});
+
+                state = State::NEED_FINISH;
+                return true;
+            }
+            catch (...)
+            {
+                storage.updateMutationEntriesErrors(future_part, false, getCurrentExceptionMessage(false));
+                write_part_log(ExecutionStatus::fromCurrentException());
+                return false;
+            }
+        }
+        case State::NEED_FINISH :
+        {
+            // Nothing to do
+            state = State::SUCCESS;
+            return false;
+        }
+        case State::SUCCESS:
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Task with state SUCCESS mustn't be executed again");
+        }
+    }
+
+    return false;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.h b/src/Storages/MergeTree/MutatePlainMergeTreeTask.h
new file mode 100644
index 00000000000..0b65c202eb6
--- /dev/null
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <functional>
+
+#include <Core/Names.h>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MutateTask.h>
+#include <Storages/MutationCommands.h>
+#include <Storages/MergeTree/MergeMutateSelectedEntry.h>
+
+namespace DB
+{
+
+struct StorageInMemoryMetadata;
+using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
+struct FutureMergedMutatedPart;
+using FutureMergedMutatedPartPtr = std::shared_ptr<FutureMergedMutatedPart>;
+
+class StorageMergeTree;
+
+class MutatePlainMergeTreeTask : public IExecutableTask
+{
+public:
+    template <class Callback>
+    MutatePlainMergeTreeTask(
+        StorageMergeTree & storage_,
+        StorageMetadataPtr metadata_snapshot_,
+        MergeMutateSelectedEntryPtr merge_mutate_entry_,
+        TableLockHolder & table_lock_holder_,
+        Callback && task_result_callback_)
+        : storage(storage_)
+        , metadata_snapshot(metadata_snapshot_)
+        , merge_mutate_entry(merge_mutate_entry_)
+        , table_lock_holder(table_lock_holder_)
+        , task_result_callback(task_result_callback_) {}
+
+    bool executeStep() override;
+
+    void onCompleted() override;
+
+    StorageID getStorageID() override;
+
+private:
+
+    void prepare();
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE,
+        NEED_FINISH,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+
+    StorageMergeTree & storage;
+
+    StorageMetadataPtr metadata_snapshot;
+    MergeMutateSelectedEntryPtr merge_mutate_entry{nullptr};
+    TableLockHolder & table_lock_holder;
+
+    FutureMergedMutatedPartPtr future_part{nullptr};
+    std::unique_ptr<Stopwatch> stopwatch;
+
+    MergeTreeData::MutableDataPartPtr new_part;
+
+    using MergeListEntryPtr = std::unique_ptr<MergeListEntry>;
+    MergeListEntryPtr merge_list_entry;
+
+    std::function<void(const ExecutionStatus & execution_status)> write_part_log;
+
+    IExecutableTask::TaskResultCallback task_result_callback;
+
+    MutateTaskPtr mutate_task;
+};
+
+
+}
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
new file mode 100644
index 00000000000..f48a9285c53
--- /dev/null
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -0,0 +1,1342 @@
+#include <Storages/MergeTree/MutateTask.h>
+
+#include <common/logger_useful.h>
+#include <Common/escapeForFileName.h>
+#include <DataStreams/TTLBlockInputStream.h>
+#include <DataStreams/TTLCalcInputStream.h>
+#include <DataStreams/DistinctSortedBlockInputStream.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/MaterializingBlockInputStream.h>
+#include <DataStreams/ColumnGathererStream.h>
+#include <DataStreams/SquashingBlockInputStream.h>
+#include <Parsers/queryToString.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
+#include <Storages/MergeTree/MergeTreeDataWriter.h>
+#include <Storages/MutationCommands.h>
+#include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric BackgroundPoolTask;
+    extern const Metric PartMutation;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ABORTED;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace MutationHelpers
+{
+
+static bool checkOperationIsNotCanceled(ActionBlocker & merges_blocker, MergeListEntry * mutate_entry)
+{
+    if (merges_blocker.isCancelled() || (*mutate_entry)->is_cancelled)
+        throw Exception("Cancelled mutating parts", ErrorCodes::ABORTED);
+
+    return true;
+}
+
+/** Split mutation commands into two parts:
+*   First part should be executed by mutations interpreter.
+*   Other is just simple drop/renames, so they can be executed without interpreter.
+*/
+static void splitMutationCommands(
+    MergeTreeData::DataPartPtr part,
+    const MutationCommands & commands,
+    MutationCommands & for_interpreter,
+    MutationCommands & for_file_renames)
+{
+    ColumnsDescription part_columns(part->getColumns());
+
+    if (!isWidePart(part))
+    {
+        NameSet mutated_columns;
+        for (const auto & command : commands)
+        {
+            if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
+                || command.type == MutationCommand::Type::MATERIALIZE_COLUMN
+                || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
+                || command.type == MutationCommand::Type::MATERIALIZE_TTL
+                || command.type == MutationCommand::Type::DELETE
+                || command.type == MutationCommand::Type::UPDATE)
+            {
+                for_interpreter.push_back(command);
+                for (const auto & [column_name, expr] : command.column_to_update_expression)
+                    mutated_columns.emplace(column_name);
+
+                if (command.type == MutationCommand::Type::MATERIALIZE_COLUMN)
+                     mutated_columns.emplace(command.column_name);
+            }
+            else if (command.type == MutationCommand::Type::DROP_INDEX || command.type == MutationCommand::Type::DROP_PROJECTION)
+            {
+                for_file_renames.push_back(command);
+            }
+            else if (part_columns.has(command.column_name))
+            {
+                if (command.type == MutationCommand::Type::DROP_COLUMN)
+                {
+                    mutated_columns.emplace(command.column_name);
+                }
+                else if (command.type == MutationCommand::Type::RENAME_COLUMN)
+                {
+                    for_interpreter.push_back(
+                    {
+                        .type = MutationCommand::Type::READ_COLUMN,
+                        .column_name = command.rename_to,
+                    });
+                    mutated_columns.emplace(command.column_name);
+                    part_columns.rename(command.column_name, command.rename_to);
+                }
+            }
+        }
+        /// If it's compact part, then we don't need to actually remove files
+        /// from disk we just don't read dropped columns
+        for (const auto & column : part->getColumns())
+        {
+            if (!mutated_columns.count(column.name))
+                for_interpreter.emplace_back(
+                    MutationCommand{.type = MutationCommand::Type::READ_COLUMN, .column_name = column.name, .data_type = column.type});
+        }
+    }
+    else
+    {
+        for (const auto & command : commands)
+        {
+            if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
+                || command.type == MutationCommand::Type::MATERIALIZE_COLUMN
+                || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
+                || command.type == MutationCommand::Type::MATERIALIZE_TTL
+                || command.type == MutationCommand::Type::DELETE
+                || command.type == MutationCommand::Type::UPDATE)
+            {
+                for_interpreter.push_back(command);
+            }
+            else if (command.type == MutationCommand::Type::DROP_INDEX || command.type == MutationCommand::Type::DROP_PROJECTION)
+            {
+                for_file_renames.push_back(command);
+            }
+            /// If we don't have this column in source part, than we don't need
+            /// to materialize it
+            else if (part_columns.has(command.column_name))
+            {
+                if (command.type == MutationCommand::Type::READ_COLUMN)
+                {
+                    for_interpreter.push_back(command);
+                }
+                else if (command.type == MutationCommand::Type::RENAME_COLUMN)
+                {
+                    part_columns.rename(command.column_name, command.rename_to);
+                    for_file_renames.push_back(command);
+                }
+                else
+                {
+                    for_file_renames.push_back(command);
+                }
+            }
+        }
+    }
+}
+
+
+/// Get skip indices, that should exists in the resulting data part.
+static MergeTreeIndices getIndicesForNewDataPart(
+    const IndicesDescription & all_indices,
+    const MutationCommands & commands_for_removes)
+{
+    NameSet removed_indices;
+    for (const auto & command : commands_for_removes)
+        if (command.type == MutationCommand::DROP_INDEX)
+            removed_indices.insert(command.column_name);
+
+    MergeTreeIndices new_indices;
+    for (const auto & index : all_indices)
+        if (!removed_indices.count(index.name))
+            new_indices.push_back(MergeTreeIndexFactory::instance().get(index));
+
+    return new_indices;
+}
+
+static std::vector<ProjectionDescriptionRawPtr> getProjectionsForNewDataPart(
+    const ProjectionsDescription & all_projections,
+    const MutationCommands & commands_for_removes)
+{
+    NameSet removed_projections;
+    for (const auto & command : commands_for_removes)
+        if (command.type == MutationCommand::DROP_PROJECTION)
+            removed_projections.insert(command.column_name);
+
+    std::vector<ProjectionDescriptionRawPtr> new_projections;
+    for (const auto & projection : all_projections)
+        if (!removed_projections.count(projection.name))
+            new_projections.push_back(&projection);
+
+    return new_projections;
+}
+
+
+/// Return set of indices which should be recalculated during mutation also
+/// wraps input stream into additional expression stream
+static std::set<MergeTreeIndexPtr> getIndicesToRecalculate(
+    BlockInputStreamPtr & input_stream,
+    const NameSet & updated_columns,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
+    const NameSet & materialized_indices,
+    const MergeTreeData::DataPartPtr & source_part)
+{
+    /// Checks if columns used in skipping indexes modified.
+    const auto & index_factory = MergeTreeIndexFactory::instance();
+    std::set<MergeTreeIndexPtr> indices_to_recalc;
+    ASTPtr indices_recalc_expr_list = std::make_shared<ASTExpressionList>();
+    const auto & indices = metadata_snapshot->getSecondaryIndices();
+
+    for (size_t i = 0; i < indices.size(); ++i)
+    {
+        const auto & index = indices[i];
+
+        bool has_index =
+            source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx") ||
+            source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx2");
+        // If we ask to materialize and it already exists
+        if (!has_index && materialized_indices.count(index.name))
+        {
+            if (indices_to_recalc.insert(index_factory.get(index)).second)
+            {
+                ASTPtr expr_list = index.expression_list_ast->clone();
+                for (const auto & expr : expr_list->children)
+                    indices_recalc_expr_list->children.push_back(expr->clone());
+            }
+        }
+        // If some dependent columns gets mutated
+        else
+        {
+            bool mutate = false;
+            const auto & index_cols = index.expression->getRequiredColumns();
+            for (const auto & col : index_cols)
+            {
+                if (updated_columns.count(col))
+                {
+                    mutate = true;
+                    break;
+                }
+            }
+            if (mutate && indices_to_recalc.insert(index_factory.get(index)).second)
+            {
+                ASTPtr expr_list = index.expression_list_ast->clone();
+                for (const auto & expr : expr_list->children)
+                    indices_recalc_expr_list->children.push_back(expr->clone());
+            }
+        }
+    }
+
+    if (!indices_to_recalc.empty() && input_stream)
+    {
+        auto indices_recalc_syntax = TreeRewriter(context).analyze(indices_recalc_expr_list, input_stream->getHeader().getNamesAndTypesList());
+        auto indices_recalc_expr = ExpressionAnalyzer(
+                indices_recalc_expr_list,
+                indices_recalc_syntax, context).getActions(false);
+
+        /// We can update only one column, but some skip idx expression may depend on several
+        /// columns (c1 + c2 * c3). It works because this stream was created with help of
+        /// MutationsInterpreter which knows about skip indices and stream 'in' already has
+        /// all required columns.
+        /// TODO move this logic to single place.
+        input_stream = std::make_shared<MaterializingBlockInputStream>(
+            std::make_shared<ExpressionBlockInputStream>(input_stream, indices_recalc_expr));
+    }
+    return indices_to_recalc;
+}
+
+std::set<ProjectionDescriptionRawPtr> getProjectionsToRecalculate(
+    const NameSet & updated_columns,
+    const StorageMetadataPtr & metadata_snapshot,
+    const NameSet & materialized_projections,
+    const MergeTreeData::DataPartPtr & source_part)
+{
+    /// Checks if columns used in projections modified.
+    std::set<ProjectionDescriptionRawPtr> projections_to_recalc;
+    for (const auto & projection : metadata_snapshot->getProjections())
+    {
+        // If we ask to materialize and it doesn't exist
+        if (!source_part->checksums.has(projection.name + ".proj") && materialized_projections.count(projection.name))
+        {
+            projections_to_recalc.insert(&projection);
+        }
+        else
+        {
+            // If some dependent columns gets mutated
+            bool mutate = false;
+            const auto & projection_cols = projection.required_columns;
+            for (const auto & col : projection_cols)
+            {
+                if (updated_columns.count(col))
+                {
+                    mutate = true;
+                    break;
+                }
+            }
+            if (mutate)
+                projections_to_recalc.insert(&projection);
+        }
+    }
+    return projections_to_recalc;
+}
+
+
+/// Files, that we don't need to remove and don't need to hardlink, for example columns.txt and checksums.txt.
+/// Because we will generate new versions of them after we perform mutation.
+NameSet collectFilesToSkip(
+    const MergeTreeDataPartPtr & source_part,
+    const Block & updated_header,
+    const std::set<MergeTreeIndexPtr> & indices_to_recalc,
+    const String & mrk_extension,
+    const std::set<ProjectionDescriptionRawPtr> & projections_to_recalc)
+{
+    NameSet files_to_skip = source_part->getFileNamesWithoutChecksums();
+
+    /// Skip updated files
+    for (const auto & entry : updated_header)
+    {
+        ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
+        {
+            String stream_name = ISerialization::getFileNameForStream({entry.name, entry.type}, substream_path);
+            files_to_skip.insert(stream_name + ".bin");
+            files_to_skip.insert(stream_name + mrk_extension);
+        };
+
+        auto serialization = source_part->getSerializationForColumn({entry.name, entry.type});
+        serialization->enumerateStreams(callback);
+    }
+    for (const auto & index : indices_to_recalc)
+    {
+        files_to_skip.insert(index->getFileName() + ".idx");
+        files_to_skip.insert(index->getFileName() + mrk_extension);
+    }
+    for (const auto & projection : projections_to_recalc)
+        files_to_skip.insert(projection->getDirectoryName());
+
+    return files_to_skip;
+}
+
+
+/// Apply commands to source_part i.e. remove and rename some columns in
+/// source_part and return set of files, that have to be removed or renamed
+/// from filesystem and in-memory checksums. Ordered result is important,
+/// because we can apply renames that affects each other: x -> z, y -> x.
+static NameToNameVector collectFilesForRenames(
+    MergeTreeData::DataPartPtr source_part, const MutationCommands & commands_for_removes, const String & mrk_extension)
+{
+    /// Collect counts for shared streams of different columns. As an example, Nested columns have shared stream with array sizes.
+    std::map<String, size_t> stream_counts;
+    for (const NameAndTypePair & column : source_part->getColumns())
+    {
+        auto serialization = source_part->getSerializationForColumn(column);
+        serialization->enumerateStreams(
+            [&](const ISerialization::SubstreamPath & substream_path)
+            {
+                ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
+            },
+            {});
+    }
+
+    NameToNameVector rename_vector;
+    /// Remove old data
+    for (const auto & command : commands_for_removes)
+    {
+        if (command.type == MutationCommand::Type::DROP_INDEX)
+        {
+            if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx2"))
+            {
+                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx2", "");
+                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
+            }
+            else if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx"))
+            {
+                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx", "");
+                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
+            }
+        }
+        else if (command.type == MutationCommand::Type::DROP_PROJECTION)
+        {
+            if (source_part->checksums.has(command.column_name + ".proj"))
+                rename_vector.emplace_back(command.column_name + ".proj", "");
+        }
+        else if (command.type == MutationCommand::Type::DROP_COLUMN)
+        {
+            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
+            {
+                String stream_name = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
+                /// Delete files if they are no longer shared with another column.
+                if (--stream_counts[stream_name] == 0)
+                {
+                    rename_vector.emplace_back(stream_name + ".bin", "");
+                    rename_vector.emplace_back(stream_name + mrk_extension, "");
+                }
+            };
+
+            auto column = source_part->getColumns().tryGetByName(command.column_name);
+            if (column)
+            {
+                auto serialization = source_part->getSerializationForColumn(*column);
+                serialization->enumerateStreams(callback);
+            }
+        }
+        else if (command.type == MutationCommand::Type::RENAME_COLUMN)
+        {
+            String escaped_name_from = escapeForFileName(command.column_name);
+            String escaped_name_to = escapeForFileName(command.rename_to);
+
+            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
+            {
+                String stream_from = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
+
+                String stream_to = boost::replace_first_copy(stream_from, escaped_name_from, escaped_name_to);
+
+                if (stream_from != stream_to)
+                {
+                    rename_vector.emplace_back(stream_from + ".bin", stream_to + ".bin");
+                    rename_vector.emplace_back(stream_from + mrk_extension, stream_to + mrk_extension);
+                }
+            };
+
+            auto column = source_part->getColumns().tryGetByName(command.column_name);
+            if (column)
+            {
+                auto serialization = source_part->getSerializationForColumn(*column);
+                serialization->enumerateStreams(callback);
+            }
+        }
+    }
+
+    return rename_vector;
+}
+
+
+/// Initialize and write to disk new part fields like checksums, columns, etc.
+void finalizeMutatedPart(
+    const MergeTreeDataPartPtr & source_part,
+    MergeTreeData::MutableDataPartPtr new_data_part,
+    ExecuteTTLType execute_ttl_type,
+    const CompressionCodecPtr & codec)
+{
+    auto disk = new_data_part->volume->getDisk();
+
+    if (new_data_part->uuid != UUIDHelpers::Nil)
+    {
+        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
+        HashingWriteBuffer out_hashing(*out);
+        writeUUIDText(new_data_part->uuid, out_hashing);
+        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
+        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_hash = out_hashing.getHash();
+    }
+
+    if (execute_ttl_type != ExecuteTTLType::NONE)
+    {
+        /// Write a file with ttl infos in json format.
+        auto out_ttl = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "ttl.txt", 4096);
+        HashingWriteBuffer out_hashing(*out_ttl);
+        new_data_part->ttl_infos.write(out_hashing);
+        new_data_part->checksums.files["ttl.txt"].file_size = out_hashing.count();
+        new_data_part->checksums.files["ttl.txt"].file_hash = out_hashing.getHash();
+    }
+
+    {
+        /// Write file with checksums.
+        auto out_checksums = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "checksums.txt", 4096);
+        new_data_part->checksums.write(*out_checksums);
+    } /// close fd
+
+    {
+        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME, 4096);
+        DB::writeText(queryToString(codec->getFullCodecDesc()), *out);
+    }
+
+    {
+        /// Write a file with a description of columns.
+        auto out_columns = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "columns.txt", 4096);
+        new_data_part->getColumns().writeText(*out_columns);
+    } /// close fd
+
+    new_data_part->rows_count = source_part->rows_count;
+    new_data_part->index_granularity = source_part->index_granularity;
+    new_data_part->index = source_part->index;
+    new_data_part->minmax_idx = source_part->minmax_idx;
+    new_data_part->modification_time = time(nullptr);
+    new_data_part->loadProjections(false, false);
+    new_data_part->setBytesOnDisk(
+        MergeTreeData::DataPart::calculateTotalSizeOnDisk(new_data_part->volume->getDisk(), new_data_part->getFullRelativePath()));
+    new_data_part->default_codec = codec;
+    new_data_part->calculateColumnsSizesOnDisk();
+    new_data_part->storage.lockSharedData(*new_data_part);
+}
+
+}
+
+struct MutationContext
+{
+    MergeTreeData * data;
+    MergeTreeDataMergerMutator * mutator;
+    ActionBlocker * merges_blocker;
+    TableLockHolder * holder;
+    MergeListEntry * mutate_entry;
+
+    Poco::Logger * log{&Poco::Logger::get("MutateTask")};
+
+    FutureMergedMutatedPartPtr future_part;
+    MergeTreeData::DataPartPtr source_part;
+
+    StorageMetadataPtr metadata_snapshot;
+    MutationCommandsConstPtr commands;
+    time_t time_of_mutation;
+    ContextPtr context;
+    ReservationSharedPtr space_reservation;
+
+    CompressionCodecPtr compression_codec;
+
+    std::unique_ptr<CurrentMetrics::Increment> num_mutations;
+
+    BlockInputStreamPtr mutating_stream{nullptr}; // in
+    Block updated_header;
+
+    std::unique_ptr<MutationsInterpreter> interpreter;
+    UInt64 watch_prev_elapsed{0};
+    std::unique_ptr<MergeStageProgress> stage_progress{nullptr};
+
+    MutationCommands commands_for_part;
+    MutationCommands for_interpreter;
+    MutationCommands for_file_renames;
+
+    NamesAndTypesList storage_columns;
+    NameSet materialized_indices;
+    NameSet materialized_projections;
+    MutationsInterpreter::MutationKind::MutationKindEnum mutation_kind
+        = MutationsInterpreter::MutationKind::MutationKindEnum::MUTATE_UNKNOWN;
+
+    VolumePtr single_disk_volume;
+    MergeTreeData::MutableDataPartPtr new_data_part;
+    DiskPtr disk;
+    String new_part_tmp_path;
+
+    SyncGuardPtr sync_guard;
+    IMergedBlockOutputStreamPtr out{nullptr};
+
+    String mrk_extension;
+
+    std::vector<ProjectionDescriptionRawPtr> projections_to_build;
+    IMergeTreeDataPart::MinMaxIndexPtr minmax_idx{nullptr};
+
+    NameSet updated_columns;
+    std::set<MergeTreeIndexPtr> indices_to_recalc;
+    std::set<ProjectionDescriptionRawPtr> projections_to_recalc;
+    NameSet files_to_skip;
+    NameToNameVector files_to_rename;
+
+    bool need_sync;
+    ExecuteTTLType execute_ttl_type{ExecuteTTLType::NONE};
+};
+
+using MutationContextPtr = std::shared_ptr<MutationContext>;
+
+
+class MergeProjectionPartsTask : public IExecutableTask
+{
+public:
+
+    MergeProjectionPartsTask(
+        String name_,
+        MergeTreeData::MutableDataPartsVector && parts_,
+        const ProjectionDescription & projection_,
+        size_t & block_num_,
+        MutationContextPtr ctx_
+        )
+        : name(std::move(name_))
+        , parts(std::move(parts_))
+        , projection(projection_)
+        , block_num(block_num_)
+        , ctx(ctx_)
+        , log(&Poco::Logger::get("MergeProjectionPartsTask"))
+        {
+            LOG_DEBUG(log, "Selected {} projection_parts from {} to {}", parts.size(), parts.front()->name, parts.back()->name);
+            level_parts[current_level] = std::move(parts);
+        }
+
+    void onCompleted() override {}
+    StorageID getStorageID() override { return {"Mutate", "Task"}; }
+
+    bool executeStep() override
+    {
+        auto & current_level_parts = level_parts[current_level];
+        auto & next_level_parts = level_parts[next_level];
+
+        MergeTreeData::MutableDataPartsVector selected_parts;
+        while (selected_parts.size() < max_parts_to_merge_in_one_level && !current_level_parts.empty())
+        {
+            selected_parts.push_back(std::move(current_level_parts.back()));
+            current_level_parts.pop_back();
+        }
+
+        if (selected_parts.empty())
+        {
+            if (next_level_parts.empty())
+            {
+                LOG_WARNING(log, "There is no projection parts merged");
+
+                /// Task is finished
+                return false;
+            }
+            current_level = next_level;
+            ++next_level;
+        }
+        else if (selected_parts.size() == 1)
+        {
+            if (next_level_parts.empty())
+            {
+                LOG_DEBUG(log, "Merged a projection part in level {}", current_level);
+                selected_parts[0]->renameTo(projection.name + ".proj", true);
+                selected_parts[0]->name = projection.name;
+                selected_parts[0]->is_temp = false;
+                ctx->new_data_part->addProjectionPart(name, std::move(selected_parts[0]));
+
+                /// Task is finished
+                return false;
+            }
+            else
+            {
+                LOG_DEBUG(log, "Forwarded part {} in level {} to next level", selected_parts[0]->name, current_level);
+                next_level_parts.push_back(std::move(selected_parts[0]));
+            }
+        }
+        else if (selected_parts.size() > 1)
+        {
+            // Generate a unique part name
+            ++block_num;
+            auto projection_future_part = std::make_shared<FutureMergedMutatedPart>();
+            MergeTreeData::DataPartsVector const_selected_parts(
+                std::make_move_iterator(selected_parts.begin()), std::make_move_iterator(selected_parts.end()));
+            projection_future_part->assign(std::move(const_selected_parts));
+            projection_future_part->name = fmt::format("{}_{}", projection.name, ++block_num);
+            projection_future_part->part_info = {"all", 0, 0, 0};
+
+            MergeTreeData::MergingParams projection_merging_params;
+            projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
+            if (projection.type == ProjectionDescription::Type::Aggregate)
+                projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
+
+            LOG_DEBUG(log, "Merged {} parts in level {} to {}", selected_parts.size(), current_level, projection_future_part->name);
+            auto tmp_part_merge_task = ctx->mutator->mergePartsToTemporaryPart(
+                projection_future_part,
+                ctx->metadata_snapshot,
+                ctx->mutate_entry,
+                *ctx->holder,
+                ctx->time_of_mutation,
+                ctx->context,
+                ctx->space_reservation,
+                false, // TODO Do we need deduplicate for projections
+                {},
+                projection_merging_params,
+                ctx->new_data_part.get(),
+                "tmp_merge_");
+
+            next_level_parts.push_back(executeHere(tmp_part_merge_task));
+
+            next_level_parts.back()->is_temp = true;
+        }
+
+        /// Need execute again
+        return true;
+    }
+private:
+    String name;
+    MergeTreeData::MutableDataPartsVector parts;
+    const ProjectionDescription & projection;
+    size_t & block_num;
+    MutationContextPtr ctx;
+
+    Poco::Logger * log;
+
+    std::map<size_t, MergeTreeData::MutableDataPartsVector> level_parts;
+    size_t current_level = 0;
+    size_t next_level = 1;
+
+    /// TODO(nikitamikhaylov): make this constant a setting
+    static constexpr size_t max_parts_to_merge_in_one_level = 10;
+};
+
+
+// This class is responsible for:
+// 1. get projection pipeline and a sink to write parts
+// 2. build an executor that can write block to the input stream (actually we can write through it to generate as many parts as possible)
+// 3. finalize the pipeline so that all parts are merged into one part
+
+// In short it executed a mutation for the part an original part and for its every projection
+
+/**
+ *
+ * An overview of how the process of mutation works for projections:
+ *
+ * The mutation for original parts is executed block by block,
+ * but additionally we execute a SELECT query for each projection over a current block.
+ * And we store results to a map : ProjectionName -> ArrayOfParts.
+ *
+ * Then, we have to merge all parts for each projection. But we will have constraint:
+ * We cannot execute merge on more than 10 parts simulatiously.
+ * So we build a tree of merges. At the beginning all the parts have level 0.
+ * At each step we take not bigger than 10 parts from the same level
+ * and merge it into a bigger part with incremented level.
+ */
+class PartMergerWriter
+{
+public:
+
+    explicit PartMergerWriter(MutationContextPtr ctx_)
+        : ctx(ctx_), projections(ctx->metadata_snapshot->projections)
+    {
+    }
+
+    bool execute()
+    {
+        switch (state)
+        {
+            case State::NEED_PREPARE:
+            {
+                prepare();
+
+                state = State::NEED_MUTATE_ORIGINAL_PART;
+                return true;
+            }
+            case State::NEED_MUTATE_ORIGINAL_PART:
+            {
+                if (mutateOriginalPartAndPrepareProjections())
+                    return true;
+
+                state = State::NEED_MERGE_PROJECTION_PARTS;
+                return true;
+            }
+            case State::NEED_MERGE_PROJECTION_PARTS:
+            {
+                if (iterateThroughAllProjections())
+                    return true;
+
+                state = State::SUCCESS;
+                return true;
+            }
+            case State::SUCCESS:
+            {
+                return false;
+            }
+        }
+        return false;
+    }
+
+private:
+    void prepare();
+    bool mutateOriginalPartAndPrepareProjections();
+    bool iterateThroughAllProjections();
+    void constructTaskForProjectionPartsMerge();
+    void finalize();
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_MUTATE_ORIGINAL_PART,
+        NEED_MERGE_PROJECTION_PARTS,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+    MutationContextPtr ctx;
+
+    Block block;
+    size_t block_num = 0;
+
+    using ProjectionNameToItsBlocks = std::map<String, MergeTreeData::MutableDataPartsVector>;
+    ProjectionNameToItsBlocks projection_parts;
+    std::move_iterator<ProjectionNameToItsBlocks::iterator> projection_parts_iterator;
+
+    std::vector<SquashingTransform> projection_squashes;
+    const ProjectionsDescription & projections;
+
+    ExecutableTaskPtr merge_projection_parts_task_ptr;
+};
+
+
+void PartMergerWriter::prepare()
+{
+    const auto & settings = ctx->context->getSettingsRef();
+
+    for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
+    {
+        // If the parent part is an in-memory part, squash projection output into one block and
+        // build in-memory projection because we don't support merging into a new in-memory part.
+        // Otherwise we split the materialization into multiple stages similar to the process of
+        // INSERT SELECT query.
+        if (ctx->new_data_part->getType() == MergeTreeDataPartType::IN_MEMORY)
+            projection_squashes.emplace_back(0, 0);
+        else
+            projection_squashes.emplace_back(settings.min_insert_block_size_rows, settings.min_insert_block_size_bytes);
+    }
+}
+
+
+bool PartMergerWriter::mutateOriginalPartAndPrepareProjections()
+{
+    if (MutationHelpers::checkOperationIsNotCanceled(*ctx->merges_blocker, ctx->mutate_entry) && (block = ctx->mutating_stream->read()))
+    {
+        if (ctx->minmax_idx)
+            ctx->minmax_idx->update(block, ctx->data->getMinMaxColumnsNames(ctx->metadata_snapshot->getPartitionKey()));
+
+        ctx->out->write(block);
+
+        for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
+        {
+            const auto & projection = *ctx->projections_to_build[i];
+            auto projection_block = projection_squashes[i].add(projection.calculate(block, ctx->context));
+            if (projection_block)
+                projection_parts[projection.name].emplace_back(MergeTreeDataWriter::writeTempProjectionPart(
+                    *ctx->data, ctx->log, projection_block, projection, ctx->new_data_part.get(), ++block_num));
+        }
+
+        (*ctx->mutate_entry)->rows_written += block.rows();
+        (*ctx->mutate_entry)->bytes_written_uncompressed += block.bytes();
+
+        /// Need execute again
+        return true;
+    }
+
+    // Write the last block
+    for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
+    {
+        const auto & projection = *ctx->projections_to_build[i];
+        auto & projection_squash = projection_squashes[i];
+        auto projection_block = projection_squash.add({});
+        if (projection_block)
+        {
+            projection_parts[projection.name].emplace_back(
+                MergeTreeDataWriter::writeTempProjectionPart(*ctx->data, ctx->log, projection_block, projection, ctx->new_data_part.get(), ++block_num));
+        }
+    }
+
+    projection_parts_iterator = std::make_move_iterator(projection_parts.begin());
+
+    /// Maybe there are no projections ?
+    if (projection_parts_iterator != std::make_move_iterator(projection_parts.end()))
+        constructTaskForProjectionPartsMerge();
+
+    /// Let's move on to the next stage
+    return false;
+}
+
+
+void PartMergerWriter::constructTaskForProjectionPartsMerge()
+{
+    auto && [name, parts] = *projection_parts_iterator;
+    const auto & projection = projections.get(name);
+
+    merge_projection_parts_task_ptr = std::make_unique<MergeProjectionPartsTask>
+    (
+        name,
+        std::move(parts),
+        projection,
+        block_num,
+        ctx
+    );
+}
+
+
+bool PartMergerWriter::iterateThroughAllProjections()
+{
+    /// In case if there are no projections we didn't construct a task
+    if (!merge_projection_parts_task_ptr)
+        return false;
+
+    if (merge_projection_parts_task_ptr->executeStep())
+        return true;
+
+    ++projection_parts_iterator;
+
+    if (projection_parts_iterator == std::make_move_iterator(projection_parts.end()))
+        return false;
+
+    constructTaskForProjectionPartsMerge();
+
+    return true;
+}
+
+class MutateAllPartColumnsTask : public IExecutableTask
+{
+public:
+
+    explicit MutateAllPartColumnsTask(MutationContextPtr ctx_) : ctx(ctx_) {}
+
+    void onCompleted() override {}
+    StorageID getStorageID() override { return {"Mutate", "Task"}; }
+
+    bool executeStep() override
+    {
+        switch (state)
+        {
+            case State::NEED_PREPARE:
+            {
+                prepare();
+
+                state = State::NEED_EXECUTE;
+                return true;
+            }
+            case State::NEED_EXECUTE:
+            {
+                if (part_merger_writer_task->execute())
+                    return true;
+
+                state = State::NEED_FINALIZE;
+                return true;
+            }
+            case State::NEED_FINALIZE:
+            {
+                finalize();
+
+                state = State::SUCCESS;
+                return true;
+            }
+            case State::SUCCESS:
+            {
+                return false;
+            }
+        }
+        return false;
+    }
+
+private:
+
+    void prepare()
+    {
+        ctx->disk->createDirectories(ctx->new_part_tmp_path);
+
+        /// Note: this is done before creating input streams, because otherwise data.data_parts_mutex
+        /// (which is locked in data.getTotalActiveSizeInBytes())
+        /// (which is locked in shared mode when input streams are created) and when inserting new data
+        /// the order is reverse. This annoys TSan even though one lock is locked in shared mode and thus
+        /// deadlock is impossible.
+        ctx->compression_codec = ctx->data->getCompressionCodecForPart(ctx->source_part->getBytesOnDisk(), ctx->source_part->ttl_infos, ctx->time_of_mutation);
+
+        auto skip_part_indices = MutationHelpers::getIndicesForNewDataPart(ctx->metadata_snapshot->getSecondaryIndices(), ctx->for_file_renames);
+        ctx->projections_to_build = MutationHelpers::getProjectionsForNewDataPart(ctx->metadata_snapshot->getProjections(), ctx->for_file_renames);
+
+        if (ctx->mutating_stream == nullptr)
+            throw Exception("Cannot mutate part columns with uninitialized mutations stream. It's a bug", ErrorCodes::LOGICAL_ERROR);
+
+        if (ctx->metadata_snapshot->hasPrimaryKey() || ctx->metadata_snapshot->hasSecondaryIndices())
+            ctx->mutating_stream = std::make_shared<MaterializingBlockInputStream>(
+                std::make_shared<ExpressionBlockInputStream>(ctx->mutating_stream, ctx->data->getPrimaryKeyAndSkipIndicesExpression(ctx->metadata_snapshot)));
+
+        if (ctx->execute_ttl_type == ExecuteTTLType::NORMAL)
+            ctx->mutating_stream = std::make_shared<TTLBlockInputStream>(ctx->mutating_stream, *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+
+        if (ctx->execute_ttl_type == ExecuteTTLType::RECALCULATE)
+            ctx->mutating_stream = std::make_shared<TTLCalcInputStream>(ctx->mutating_stream, *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+
+        ctx->minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
+
+        ctx->out = std::make_shared<MergedBlockOutputStream>(
+            ctx->new_data_part,
+            ctx->metadata_snapshot,
+            ctx->new_data_part->getColumns(),
+            skip_part_indices,
+            ctx->compression_codec);
+
+        ctx->mutating_stream->readPrefix();
+        ctx->out->writePrefix();
+
+        part_merger_writer_task = std::make_unique<PartMergerWriter>(ctx);
+    }
+
+
+    void finalize()
+    {
+        ctx->new_data_part->minmax_idx = std::move(ctx->minmax_idx);
+        ctx->mutating_stream->readSuffix();
+
+        static_pointer_cast<MergedBlockOutputStream>(ctx->out)->writeSuffixAndFinalizePart(ctx->new_data_part, ctx->need_sync);
+    }
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE,
+        NEED_FINALIZE,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+
+    MutationContextPtr ctx;
+
+    std::unique_ptr<PartMergerWriter> part_merger_writer_task;
+};
+
+class MutateSomePartColumnsTask : public IExecutableTask
+{
+public:
+    explicit MutateSomePartColumnsTask(MutationContextPtr ctx_) : ctx(ctx_) {}
+
+    void onCompleted() override {}
+    StorageID getStorageID() override { return {"Mutate", "Task"}; }
+
+    bool executeStep() override
+    {
+        switch (state)
+        {
+            case State::NEED_PREPARE:
+            {
+                prepare();
+
+                state = State::NEED_EXECUTE;
+                return true;
+            }
+            case State::NEED_EXECUTE:
+            {
+                if (part_merger_writer_task && part_merger_writer_task->execute())
+                    return true;
+
+                state = State::NEED_FINALIZE;
+                return true;
+            }
+            case State::NEED_FINALIZE:
+            {
+                finalize();
+
+                state = State::SUCCESS;
+                return true;
+            }
+            case State::SUCCESS:
+            {
+                return false;
+            }
+        }
+        return false;
+    }
+
+private:
+
+    void prepare()
+    {
+        if (ctx->execute_ttl_type != ExecuteTTLType::NONE)
+            ctx->files_to_skip.insert("ttl.txt");
+
+        ctx->disk->createDirectories(ctx->new_part_tmp_path);
+
+        /// Create hardlinks for unchanged files
+        for (auto it = ctx->disk->iterateDirectory(ctx->source_part->getFullRelativePath()); it->isValid(); it->next())
+        {
+            if (ctx->files_to_skip.count(it->name()))
+                continue;
+
+            String destination = ctx->new_part_tmp_path;
+            String file_name = it->name();
+
+            auto rename_it = std::find_if(ctx->files_to_rename.begin(), ctx->files_to_rename.end(), [&file_name](const auto & rename_pair)
+            {
+                return rename_pair.first == file_name;
+            });
+            if (rename_it != ctx->files_to_rename.end())
+            {
+                if (rename_it->second.empty())
+                    continue;
+                destination += rename_it->second;
+            }
+            else
+            {
+                destination += it->name();
+            }
+
+            if (!ctx->disk->isDirectory(it->path()))
+                ctx->disk->createHardLink(it->path(), destination);
+            else if (!startsWith("tmp_", it->name())) // ignore projection tmp merge dir
+            {
+                // it's a projection part directory
+                ctx->disk->createDirectories(destination);
+                for (auto p_it = ctx->disk->iterateDirectory(it->path()); p_it->isValid(); p_it->next())
+                {
+                    String p_destination = destination + "/";
+                    String p_file_name = p_it->name();
+                    p_destination += p_it->name();
+                    ctx->disk->createHardLink(p_it->path(), p_destination);
+                }
+            }
+        }
+
+        (*ctx->mutate_entry)->columns_written = ctx->storage_columns.size() - ctx->updated_header.columns();
+
+        ctx->new_data_part->checksums = ctx->source_part->checksums;
+
+        ctx->compression_codec = ctx->source_part->default_codec;
+
+        if (ctx->mutating_stream)
+        {
+            if (ctx->mutating_stream == nullptr)
+                throw Exception("Cannot mutate part columns with uninitialized mutations stream. It's a bug", ErrorCodes::LOGICAL_ERROR);
+
+            if (ctx->execute_ttl_type == ExecuteTTLType::NORMAL)
+                ctx->mutating_stream = std::make_shared<TTLBlockInputStream>(ctx->mutating_stream, *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+
+            if (ctx->execute_ttl_type == ExecuteTTLType::RECALCULATE)
+                ctx->mutating_stream = std::make_shared<TTLCalcInputStream>(ctx->mutating_stream, *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+
+            ctx->out = std::make_shared<MergedColumnOnlyOutputStream>(
+                ctx->new_data_part,
+                ctx->metadata_snapshot,
+                ctx->updated_header,
+                ctx->compression_codec,
+                std::vector<MergeTreeIndexPtr>(ctx->indices_to_recalc.begin(), ctx->indices_to_recalc.end()),
+                nullptr,
+                ctx->source_part->index_granularity,
+                &ctx->source_part->index_granularity_info
+            );
+
+            ctx->mutating_stream->readPrefix();
+            ctx->out->writePrefix();
+            ctx->projections_to_build = std::vector<ProjectionDescriptionRawPtr>{ctx->projections_to_recalc.begin(), ctx->projections_to_recalc.end()};
+
+            part_merger_writer_task = std::make_unique<PartMergerWriter>(ctx);
+        }
+    }
+
+
+    void finalize()
+    {
+        if (ctx->mutating_stream)
+        {
+            ctx->mutating_stream->readSuffix();
+
+            auto changed_checksums =
+                static_pointer_cast<MergedColumnOnlyOutputStream>(ctx->out)->writeSuffixAndGetChecksums(
+                    ctx->new_data_part, ctx->new_data_part->checksums, ctx->need_sync);
+            ctx->new_data_part->checksums.add(std::move(changed_checksums));
+        }
+
+        for (const auto & [rename_from, rename_to] : ctx->files_to_rename)
+        {
+            if (rename_to.empty() && ctx->new_data_part->checksums.files.count(rename_from))
+            {
+                ctx->new_data_part->checksums.files.erase(rename_from);
+            }
+            else if (ctx->new_data_part->checksums.files.count(rename_from))
+            {
+                ctx->new_data_part->checksums.files[rename_to] = ctx->new_data_part->checksums.files[rename_from];
+                ctx->new_data_part->checksums.files.erase(rename_from);
+            }
+        }
+
+        MutationHelpers::finalizeMutatedPart(ctx->source_part, ctx->new_data_part, ctx->execute_ttl_type, ctx->compression_codec);
+    }
+
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE,
+        NEED_FINALIZE,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+    MutationContextPtr ctx;
+    MergedColumnOnlyOutputStreamPtr out;
+
+    std::unique_ptr<PartMergerWriter> part_merger_writer_task{nullptr};
+};
+
+
+MutateTask::MutateTask(
+    FutureMergedMutatedPartPtr future_part_,
+    StorageMetadataPtr metadata_snapshot_,
+    MutationCommandsConstPtr commands_,
+    MergeListEntry * mutate_entry_,
+    time_t time_of_mutation_,
+    ContextPtr context_,
+    ReservationSharedPtr space_reservation_,
+    TableLockHolder & table_lock_holder_,
+    MergeTreeData & data_,
+    MergeTreeDataMergerMutator & mutator_,
+    ActionBlocker & merges_blocker_)
+    : ctx(std::make_shared<MutationContext>())
+{
+    ctx->data = &data_;
+    ctx->mutator = &mutator_;
+    ctx->merges_blocker = &merges_blocker_;
+    ctx->holder = &table_lock_holder_;
+    ctx->mutate_entry = mutate_entry_;
+    ctx->commands = commands_;
+    ctx->context = context_;
+    ctx->time_of_mutation = time_of_mutation_;
+    ctx->future_part = future_part_;
+    ctx->metadata_snapshot = metadata_snapshot_;
+    ctx->space_reservation = space_reservation_;
+    ctx->storage_columns = metadata_snapshot_->getColumns().getAllPhysical();
+}
+
+
+bool MutateTask::execute()
+{
+
+    switch (state)
+    {
+        case State::NEED_PREPARE:
+        {
+            if (!prepare())
+                return false;
+
+            state = State::NEED_EXECUTE;
+            return true;
+        }
+        case State::NEED_EXECUTE:
+        {
+            if (task->executeStep())
+                return true;
+
+            promise.set_value(ctx->new_data_part);
+            return false;
+        }
+    }
+    return false;
+}
+
+
+bool MutateTask::prepare()
+{
+    MutationHelpers::checkOperationIsNotCanceled(*ctx->merges_blocker, ctx->mutate_entry);
+
+    if (ctx->future_part->parts.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to mutate {} parts, not one. "
+            "This is a bug.", toString(ctx->future_part->parts.size()));
+
+    ctx->num_mutations = std::make_unique<CurrentMetrics::Increment>(CurrentMetrics::PartMutation);
+    ctx->source_part = ctx->future_part->parts[0];
+    auto storage_from_source_part = StorageFromMergeTreeDataPart::create(ctx->source_part);
+
+    auto context_for_reading = Context::createCopy(ctx->context);
+    context_for_reading->setSetting("max_streams_to_max_threads_ratio", 1);
+    context_for_reading->setSetting("max_threads", 1);
+    /// Allow mutations to work when force_index_by_date or force_primary_key is on.
+    context_for_reading->setSetting("force_index_by_date", false);
+    context_for_reading->setSetting("force_primary_key", false);
+
+    for (const auto & command : *ctx->commands)
+    {
+        if (command.partition == nullptr || ctx->future_part->parts[0]->info.partition_id == ctx->data->getPartitionIDFromQuery(
+                command.partition, context_for_reading))
+            ctx->commands_for_part.emplace_back(command);
+    }
+
+    if (ctx->source_part->isStoredOnDisk() && !isStorageTouchedByMutations(
+        storage_from_source_part, ctx->metadata_snapshot, ctx->commands_for_part, Context::createCopy(context_for_reading)))
+    {
+        LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {}", ctx->source_part->name, ctx->future_part->part_info.mutation);
+        promise.set_value(ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_clone_", ctx->future_part->part_info, ctx->metadata_snapshot));
+        return false;
+    }
+    else
+    {
+        LOG_TRACE(ctx->log, "Mutating part {} to mutation version {}", ctx->source_part->name, ctx->future_part->part_info.mutation);
+    }
+
+    MutationHelpers::splitMutationCommands(ctx->source_part, ctx->commands_for_part, ctx->for_interpreter, ctx->for_file_renames);
+
+    ctx->stage_progress = std::make_unique<MergeStageProgress>(1.0);
+
+    if (!ctx->for_interpreter.empty())
+    {
+        ctx->interpreter = std::make_unique<MutationsInterpreter>(
+            storage_from_source_part, ctx->metadata_snapshot, ctx->for_interpreter, context_for_reading, true);
+        ctx->materialized_indices = ctx->interpreter->grabMaterializedIndices();
+        ctx->materialized_projections = ctx->interpreter->grabMaterializedProjections();
+        ctx->mutation_kind = ctx->interpreter->getMutationKind();
+        ctx->mutating_stream = ctx->interpreter->execute();
+        ctx->updated_header = ctx->interpreter->getUpdatedHeader();
+        ctx->mutating_stream->setProgressCallback(MergeProgressCallback(*ctx->mutate_entry, ctx->watch_prev_elapsed, *ctx->stage_progress));
+    }
+
+    ctx->single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + ctx->future_part->name, ctx->space_reservation->getDisk(), 0);
+    ctx->new_data_part = ctx->data->createPart(
+        ctx->future_part->name, ctx->future_part->type, ctx->future_part->part_info, ctx->single_disk_volume, "tmp_mut_" + ctx->future_part->name);
+
+    ctx->new_data_part->uuid = ctx->future_part->uuid;
+    ctx->new_data_part->is_temp = true;
+    ctx->new_data_part->ttl_infos = ctx->source_part->ttl_infos;
+
+    /// It shouldn't be changed by mutation.
+    ctx->new_data_part->index_granularity_info = ctx->source_part->index_granularity_info;
+    ctx->new_data_part->setColumns(MergeTreeDataMergerMutator::getColumnsForNewDataPart(ctx->source_part, ctx->updated_header, ctx->storage_columns, ctx->for_file_renames));
+    ctx->new_data_part->partition.assign(ctx->source_part->partition);
+
+    ctx->disk = ctx->new_data_part->volume->getDisk();
+    ctx->new_part_tmp_path = ctx->new_data_part->getFullRelativePath();
+
+    if (ctx->data->getSettings()->fsync_part_directory)
+        ctx->sync_guard = ctx->disk->getDirectorySyncGuard(ctx->new_part_tmp_path);
+
+    /// Don't change granularity type while mutating subset of columns
+    ctx->mrk_extension = ctx->source_part->index_granularity_info.is_adaptive ? getAdaptiveMrkExtension(ctx->new_data_part->getType())
+                                                                         : getNonAdaptiveMrkExtension();
+
+    const auto data_settings = ctx->data->  getSettings();
+    ctx->need_sync = needSyncPart(ctx->source_part->rows_count, ctx->source_part->getBytesOnDisk(), *data_settings);
+    ctx->execute_ttl_type = ExecuteTTLType::NONE;
+
+    if (ctx->mutating_stream)
+        ctx->execute_ttl_type = MergeTreeDataMergerMutator::shouldExecuteTTL(ctx->metadata_snapshot, ctx->interpreter->getColumnDependencies());
+
+
+    /// All columns from part are changed and may be some more that were missing before in part
+    /// TODO We can materialize compact part without copying data
+    if (!isWidePart(ctx->source_part)
+        || (ctx->mutation_kind == MutationsInterpreter::MutationKind::MUTATE_OTHER && ctx->interpreter && ctx->interpreter->isAffectingAllColumns()))
+    {
+        task = std::make_unique<MutateAllPartColumnsTask>(ctx);
+    }
+    else /// TODO: check that we modify only non-key columns in this case.
+    {
+
+        /// We will modify only some of the columns. Other columns and key values can be copied as-is.
+        for (const auto & name_type : ctx->updated_header.getNamesAndTypesList())
+            ctx->updated_columns.emplace(name_type.name);
+
+        ctx->indices_to_recalc = MutationHelpers::getIndicesToRecalculate(
+            ctx->mutating_stream, ctx->updated_columns, ctx->metadata_snapshot, ctx->context, ctx->materialized_indices, ctx->source_part);
+        ctx->projections_to_recalc = MutationHelpers::getProjectionsToRecalculate(
+            ctx->updated_columns, ctx->metadata_snapshot, ctx->materialized_projections, ctx->source_part);
+
+        ctx->files_to_skip = MutationHelpers::collectFilesToSkip(
+            ctx->source_part,
+            ctx->updated_header,
+            ctx->indices_to_recalc,
+            ctx->mrk_extension,
+            ctx->projections_to_recalc);
+        ctx->files_to_rename = MutationHelpers::collectFilesForRenames(ctx->source_part, ctx->for_file_renames, ctx->mrk_extension);
+
+        if (ctx->indices_to_recalc.empty() &&
+            ctx->projections_to_recalc.empty() &&
+            ctx->mutation_kind != MutationsInterpreter::MutationKind::MUTATE_OTHER
+            && ctx->files_to_rename.empty())
+        {
+            LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {} (optimized)", ctx->source_part->name, ctx->future_part->part_info.mutation);
+            promise.set_value(ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_clone_", ctx->future_part->part_info, ctx->metadata_snapshot));
+            return false;
+        }
+
+        task = std::make_unique<MutateSomePartColumnsTask>(ctx);
+    }
+
+    return true;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MutateTask.h b/src/Storages/MergeTree/MutateTask.h
new file mode 100644
index 00000000000..79c3bff213a
--- /dev/null
+++ b/src/Storages/MergeTree/MutateTask.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeProgress.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/IMergedBlockOutputStream.h>
+#include <Storages/MutationCommands.h>
+#include <Interpreters/MutationsInterpreter.h>
+
+
+namespace DB
+{
+
+
+class MutateTask;
+using MutateTaskPtr = std::shared_ptr<MutateTask>;\
+
+
+class MergeTreeDataMergerMutator;
+
+struct MutationContext;
+
+class MutateTask
+{
+public:
+    MutateTask(
+        FutureMergedMutatedPartPtr future_part_,
+        StorageMetadataPtr metadata_snapshot_,
+        MutationCommandsConstPtr commands_,
+        MergeListEntry * mutate_entry_,
+        time_t time_of_mutation_,
+        ContextPtr context_,
+        ReservationSharedPtr space_reservation_,
+        TableLockHolder & table_lock_holder_,
+        MergeTreeData & data_,
+        MergeTreeDataMergerMutator & mutator_,
+        ActionBlocker & merges_blocker_);
+
+    bool execute();
+
+    std::future<MergeTreeData::MutableDataPartPtr> getFuture()
+    {
+        return promise.get_future();
+    }
+
+private:
+
+    bool prepare();
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE
+    };
+
+    State state{State::NEED_PREPARE};
+
+
+    std::promise<MergeTreeData::MutableDataPartPtr> promise;
+
+    std::shared_ptr<MutationContext> ctx;
+    ExecutableTaskPtr task;
+
+};
+
+[[ maybe_unused]] static MergeTreeData::MutableDataPartPtr executeHere(MutateTaskPtr task)
+{
+    while (task->execute()) {}
+    return task->getFuture().get();
+}
+
+}
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
new file mode 100644
index 00000000000..36852dd8247
--- /dev/null
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
@@ -0,0 +1,241 @@
+#include <Storages/MergeTree/ReplicatedMergeMutateTaskBase.h>
+
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NO_REPLICA_HAS_PART;
+    extern const int LOGICAL_ERROR;
+    extern const int ABORTED;
+    extern const int PART_IS_TEMPORARILY_LOCKED;
+}
+
+StorageID ReplicatedMergeMutateTaskBase::getStorageID()
+{
+    return storage.getStorageID();
+}
+
+void ReplicatedMergeMutateTaskBase::onCompleted()
+{
+    bool successfully_executed = state == State::SUCCESS;
+    task_result_callback(successfully_executed);
+}
+
+
+bool ReplicatedMergeMutateTaskBase::executeStep()
+{
+    std::exception_ptr saved_exception;
+
+    try
+    {
+        /// We don't have any backoff for failed entries
+        /// we just count amount of tries for each of them.
+
+        try
+        {
+            return executeImpl();
+        }
+        catch (const Exception & e)
+        {
+            if (e.code() == ErrorCodes::NO_REPLICA_HAS_PART)
+            {
+                /// If no one has the right part, probably not all replicas work; We will not write to log with Error level.
+                LOG_INFO(log, e.displayText());
+            }
+            else if (e.code() == ErrorCodes::ABORTED)
+            {
+                /// Interrupted merge or downloading a part is not an error.
+                LOG_INFO(log, e.message());
+            }
+            else if (e.code() == ErrorCodes::PART_IS_TEMPORARILY_LOCKED)
+            {
+                /// Part cannot be added temporarily
+                LOG_INFO(log, e.displayText());
+                storage.cleanup_thread.wakeup();
+            }
+            else
+                tryLogCurrentException(log, __PRETTY_FUNCTION__);
+
+            /** This exception will be written to the queue element, and it can be looked up using `system.replication_queue` table.
+                 * The thread that performs this action will sleep a few seconds after the exception.
+                 * See `queue.processEntry` function.
+                 */
+            throw;
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, __PRETTY_FUNCTION__);
+            throw;
+        }
+
+    }
+    catch (...)
+    {
+        saved_exception = std::current_exception();
+    }
+
+
+    if (saved_exception)
+    {
+        std::lock_guard lock(storage.queue.state_mutex);
+
+        auto & log_entry = selected_entry->log_entry;
+
+        log_entry->exception = saved_exception;
+
+        if (log_entry->type == ReplicatedMergeTreeLogEntryData::MUTATE_PART)
+        {
+            /// Record the exception in the system.mutations table.
+            Int64 result_data_version = MergeTreePartInfo::fromPartName(log_entry->new_part_name, storage.queue.format_version)
+                .getDataVersion();
+            auto source_part_info = MergeTreePartInfo::fromPartName(
+                log_entry->source_parts.at(0), storage.queue.format_version);
+
+            auto in_partition = storage.queue.mutations_by_partition.find(source_part_info.partition_id);
+            if (in_partition != storage.queue.mutations_by_partition.end())
+            {
+                auto mutations_begin_it = in_partition->second.upper_bound(source_part_info.getDataVersion());
+                auto mutations_end_it = in_partition->second.upper_bound(result_data_version);
+                for (auto it = mutations_begin_it; it != mutations_end_it; ++it)
+                {
+                    ReplicatedMergeTreeQueue::MutationStatus & status = *it->second;
+                    status.latest_failed_part = log_entry->source_parts.at(0);
+                    status.latest_failed_part_info = source_part_info;
+                    status.latest_fail_time = time(nullptr);
+                    status.latest_fail_reason = getExceptionMessage(saved_exception, false);
+                }
+            }
+        }
+
+    }
+
+    return false;
+}
+
+
+bool ReplicatedMergeMutateTaskBase::executeImpl()
+{
+    MemoryTrackerThreadSwitcherPtr switcher;
+    if (merge_mutate_entry)
+        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(&(*merge_mutate_entry)->memory_tracker);
+
+    auto remove_processed_entry = [&] () -> bool
+    {
+        try
+        {
+            storage.queue.removeProcessedEntry(storage.getZooKeeper(), selected_entry->log_entry);
+            state = State::SUCCESS;
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+
+        return false;
+    };
+
+
+    auto execute_fetch = [&] () -> bool
+    {
+        if (storage.executeFetch(entry))
+            return remove_processed_entry();
+
+        return false;
+    };
+
+
+    switch (state)
+    {
+        case State::NEED_PREPARE :
+        {
+            {
+                auto res = checkExistingPart();
+                /// Depending on condition there is no need to execute a merge
+                if (res == CheckExistingPartResult::PART_EXISTS)
+                    return remove_processed_entry();
+            }
+
+            bool res = false;
+            std::tie(res, part_log_writer) = prepare();
+
+            /// Avoid resheduling, execute fetch here, in the same thread.
+            if (!res)
+                return execute_fetch();
+
+            state = State::NEED_EXECUTE_INNER_MERGE;
+            return true;
+        }
+        case State::NEED_EXECUTE_INNER_MERGE :
+        {
+            try
+            {
+                if (!executeInnerTask())
+                {
+                    state = State::NEED_FINALIZE;
+                    return true;
+                }
+            }
+            catch (...)
+            {
+                if (part_log_writer)
+                    part_log_writer(ExecutionStatus::fromCurrentException());
+                throw;
+            }
+
+            return true;
+        }
+        case State::NEED_FINALIZE :
+        {
+            try
+            {
+                if (!finalize(part_log_writer))
+                    return execute_fetch();
+            }
+            catch (...)
+            {
+                if (part_log_writer)
+                    part_log_writer(ExecutionStatus::fromCurrentException());
+                throw;
+            }
+
+            return remove_processed_entry();
+        }
+        case State::SUCCESS :
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Do not call execute on previously succeeded task");
+        }
+    }
+    return false;
+}
+
+
+ReplicatedMergeMutateTaskBase::CheckExistingPartResult ReplicatedMergeMutateTaskBase::checkExistingPart()
+{
+    /// If we already have this part or a part covering it, we do not need to do anything.
+    /// The part may be still in the PreCommitted -> Committed transition so we first search
+    /// among PreCommitted parts to definitely find the desired part if it exists.
+    MergeTreeData::DataPartPtr existing_part = storage.getPartIfExists(entry.new_part_name, {MergeTreeDataPartState::PreCommitted});
+
+    if (!existing_part)
+        existing_part = storage.getActiveContainingPart(entry.new_part_name);
+
+    /// Even if the part is local, it (in exceptional cases) may not be in ZooKeeper. Let's check that it is there.
+    if (existing_part && storage.getZooKeeper()->exists(fs::path(storage.replica_path) / "parts" / existing_part->name))
+    {
+        LOG_DEBUG(log, "Skipping action for part {} because part {} already exists.", entry.new_part_name, existing_part->name);
+
+        /// We will exit from all the execution process
+        return CheckExistingPartResult::PART_EXISTS;
+    }
+
+
+    return CheckExistingPartResult::OK;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
new file mode 100644
index 00000000000..d56cd7bea15
--- /dev/null
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
@@ -0,0 +1,80 @@
+#pragma once
+
+#include <common/logger_useful.h>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+
+namespace DB
+{
+
+class StorageReplicatedMergeTree;
+
+/**
+ * This is used as a base of MergeFromLogEntryTask and MutateFromLogEntryTaskBase
+ */
+class ReplicatedMergeMutateTaskBase : public IExecutableTask
+{
+public:
+    template <class Callback>
+    ReplicatedMergeMutateTaskBase(
+        Poco::Logger * log_,
+        StorageReplicatedMergeTree & storage_,
+        ReplicatedMergeTreeQueue::SelectedEntryPtr & selected_entry_,
+        Callback && task_result_callback_)
+        : selected_entry(selected_entry_)
+        , entry(*selected_entry->log_entry)
+        , log(log_)
+        , storage(storage_)
+        /// This is needed to ask an asssignee to assign a new merge/mutate operation
+        /// It takes bool argument and true means that current task is successfully executed.
+        , task_result_callback(task_result_callback_) {}
+
+    ~ReplicatedMergeMutateTaskBase() override = default;
+    void onCompleted() override;
+    StorageID getStorageID() override;
+    bool executeStep() override;
+
+protected:
+    using PartLogWriter =  std::function<void(const ExecutionStatus &)>;
+
+    virtual std::pair<bool, PartLogWriter> prepare() = 0;
+    virtual bool finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log) = 0;
+
+    /// Will execute a part of inner MergeTask or MutateTask
+    virtual bool executeInnerTask() = 0;
+
+    /// This is important not to execute the same mutation in parallel
+    /// selected_entry is a RAII class, so the time of living must be the same as for the whole task
+    ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry;
+    ReplicatedMergeTreeLogEntry & entry;
+    MergeList::EntryPtr merge_mutate_entry{nullptr};
+    Poco::Logger * log;
+    StorageReplicatedMergeTree & storage;
+
+private:
+
+    enum class CheckExistingPartResult
+    {
+        PART_EXISTS,
+        OK
+    };
+
+    CheckExistingPartResult checkExistingPart();
+    bool executeImpl() ;
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE_INNER_MERGE,
+        NEED_FINALIZE,
+
+        SUCCESS
+    };
+
+    PartLogWriter part_log_writer{};
+    State state{State::NEED_PREPARE};
+    IExecutableTask::TaskResultCallback task_result_callback;
+};
+
+}
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
index f6a19173f77..e157985964f 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
@@ -58,7 +58,6 @@ public:
 
     /// returns the replica name
     /// and it's not current replica should do the merge
-    /// used in shouldExecuteLogEntry and in tryExecuteMerge
     std::optional<String> pickReplicaToExecuteMerge(const ReplicatedMergeTreeLogEntryData & entry);
 
     /// checks (in zookeeper) if the picked replica finished the merge
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index 0efa83237ca..7df7d45ff3c 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -111,6 +111,18 @@ ReplicatedMergeTreePartCheckThread::MissingPartSearchResult ReplicatedMergeTreeP
     bool found_part_with_the_same_max_block = false;
 
     Strings replicas = zookeeper->getChildren(storage.zookeeper_path + "/replicas");
+    /// Move our replica to the end of replicas
+    for (auto it = replicas.begin(); it != replicas.end(); ++it)
+    {
+        String replica_path = storage.zookeeper_path + "/replicas/" + *it;
+        if (replica_path == storage.replica_path)
+        {
+            std::iter_swap(it, replicas.rbegin());
+            break;
+        }
+    }
+
+    /// Check all replicas and our replica must be this last one
     for (const String & replica : replicas)
     {
         String replica_path = storage.zookeeper_path + "/replicas/" + replica;
@@ -146,7 +158,7 @@ ReplicatedMergeTreePartCheckThread::MissingPartSearchResult ReplicatedMergeTreeP
                 if (found_part_with_the_same_min_block && found_part_with_the_same_max_block)
                 {
                     /// FIXME It may never appear
-                    LOG_WARNING(log, "Found parts with the same min block and with the same max block as the missing part {}. Hoping that it will eventually appear as a result of a merge.", part_name);
+                    LOG_WARNING(log, "Found parts with the same min block and with the same max block as the missing part {} on replica {}. Hoping that it will eventually appear as a result of a merge.", part_name, replica);
                     return MissingPartSearchResult::FoundAndDontNeedFetch;
                 }
             }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index c71a79d2009..a25d517b4cd 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -55,14 +55,31 @@ void ReplicatedMergeTreeQueue::clear()
     mutation_pointer.clear();
 }
 
-void ReplicatedMergeTreeQueue::initialize(const MergeTreeData::DataParts & parts)
+void ReplicatedMergeTreeQueue::initialize(zkutil::ZooKeeperPtr zookeeper)
 {
     std::lock_guard lock(state_mutex);
-    for (const auto & part : parts)
+
+    LOG_TRACE(log, "Initializing parts in queue");
+
+    /// Get current parts state from zookeeper
+    Strings parts = zookeeper->getChildren(replica_path + "/parts");
+    for (const auto & part_name : parts)
     {
-        current_parts.add(part->name, nullptr);
-        virtual_parts.add(part->name, nullptr);
+        LOG_TEST(log, "Adding part {} to current and virtual parts", part_name);
+        current_parts.add(part_name, nullptr);
+        virtual_parts.add(part_name, nullptr);
     }
+
+    /// Drop parts can negatively affect virtual parts. So when we load parts
+    /// from zookeeper we can break invariant with virtual parts. To fix this we
+    /// have it here.
+    for (const LogEntryPtr & entry : queue)
+    {
+        if (entry->isDropPart(format_version))
+            virtual_parts.removePartAndCoveredParts(*entry->getDropRange(format_version));
+    }
+
+    LOG_TRACE(log, "Queue initialized");
 }
 
 bool ReplicatedMergeTreeQueue::isVirtualPart(const MergeTreeData::DataPartPtr & data_part) const
@@ -144,7 +161,10 @@ bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
             updated = true;
         }
 
-        zookeeper->tryGet(fs::path(replica_path) / "mutation_pointer", mutation_pointer);
+        {  /// Mutation pointer is a part of "state" and must be updated with state mutex
+            std::lock_guard lock(state_mutex);
+            zookeeper->tryGet(fs::path(replica_path) / "mutation_pointer", mutation_pointer);
+        }
     }
 
     updateTimesInZooKeeper(zookeeper, min_unprocessed_insert_time_changed, {});
@@ -160,7 +180,11 @@ void ReplicatedMergeTreeQueue::insertUnlocked(
     const LogEntryPtr & entry, std::optional<time_t> & min_unprocessed_insert_time_changed,
     std::lock_guard<std::mutex> & state_lock)
 {
-    for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
+    auto entry_virtual_parts = entry->getVirtualPartNames(format_version);
+
+    LOG_TEST(log, "Insert entry {} to queue with type {} with virtual parts [{}]", entry->znode_name, entry->typeToString(), fmt::join(entry_virtual_parts, ", "));
+
+    for (const String & virtual_part_name : entry_virtual_parts)
     {
         virtual_parts.add(virtual_part_name, nullptr);
         /// Don't add drop range parts to mutations
@@ -224,6 +248,11 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
     std::optional<time_t> & max_processed_insert_time_changed,
     std::unique_lock<std::mutex> & state_lock)
 {
+
+    auto entry_virtual_parts = entry->getVirtualPartNames(format_version);
+    LOG_TEST(log, "Removing {} entry {} from queue with type {} with virtual parts [{}]",
+             is_successful ? "successful" : "unsuccessful",
+             entry->znode_name, entry->typeToString(), fmt::join(entry_virtual_parts, ", "));
     /// Update insert times.
     if (entry->type == LogEntry::GET_PART || entry->type == LogEntry::ATTACH_PART)
     {
@@ -251,6 +280,7 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
     {
         if (!entry->actual_new_part_name.empty())
         {
+            LOG_TEST(log, "Entry {} has actual new part name {}, removing it from mutations", entry->znode_name, entry->actual_new_part_name);
             /// We don't add bigger fetched part to current_parts because we
             /// have an invariant `virtual_parts` = `current_parts` + `queue`.
             ///
@@ -261,7 +291,9 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
             removeCoveredPartsFromMutations(entry->actual_new_part_name, /*remove_part = */ false, /*remove_covered_parts = */ true);
         }
 
-        for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
+        LOG_TEST(log, "Adding parts [{}] to current parts", fmt::join(entry_virtual_parts, ", "));
+
+        for (const String & virtual_part_name : entry_virtual_parts)
         {
             current_parts.add(virtual_part_name, nullptr);
 
@@ -272,14 +304,21 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
 
         if (auto drop_range_part_name = entry->getDropRange(format_version))
         {
+
             MergeTreePartInfo drop_range_info = MergeTreePartInfo::fromPartName(*drop_range_part_name, format_version);
 
             /// DROP PART doesn't have virtual parts so remove from current
             /// parts all covered parts.
             if (entry->isDropPart(format_version))
+            {
+                LOG_TEST(log, "Removing drop part from current and virtual parts {}", *drop_range_part_name);
                 current_parts.removePartAndCoveredParts(*drop_range_part_name);
+            }
             else
+            {
+                LOG_TEST(log, "Removing drop range from current and virtual parts {}", *drop_range_part_name);
                 current_parts.remove(*drop_range_part_name);
+            }
 
             virtual_parts.remove(*drop_range_part_name);
 
@@ -304,7 +343,9 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
             drop_ranges.removeDropRange(entry);
         }
 
-        for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
+        LOG_TEST(log, "Removing unsuccessful entry {} virtual parts [{}]", entry->znode_name, fmt::join(entry_virtual_parts, ", "));
+
+        for (const String & virtual_part_name : entry_virtual_parts)
         {
             /// This part will never appear, so remove it from virtual parts
             virtual_parts.remove(virtual_part_name);
@@ -321,6 +362,9 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
 void ReplicatedMergeTreeQueue::removeCoveredPartsFromMutations(const String & part_name, bool remove_part, bool remove_covered_parts)
 {
     auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
+
+    LOG_TEST(log, "Removing part {} from mutations (remove_part: {}, remove_covered_parts: {})", part_name, remove_part, remove_covered_parts);
+
     auto in_partition = mutations_by_partition.find(part_info.partition_id);
     if (in_partition == mutations_by_partition.end())
         return;
@@ -358,11 +402,17 @@ void ReplicatedMergeTreeQueue::removeCoveredPartsFromMutations(const String & pa
 
 void ReplicatedMergeTreeQueue::addPartToMutations(const String & part_name)
 {
+
+    LOG_TEST(log, "Adding part {} to mutations", part_name);
+
     auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
 
     /// Do not add special virtual parts to parts_to_do
     if (part_info.isFakeDropRangePart())
+    {
+        LOG_TEST(log, "Part {} is fake drop range part, will not add it to mutations", part_name);
         return;
+    }
 
     auto in_partition = mutations_by_partition.find(part_info.partition_id);
     if (in_partition == mutations_by_partition.end())
@@ -624,7 +674,7 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
             }
         }
 
-        storage.background_executor.triggerTask();
+        storage.background_operations_assignee.trigger();
     }
 
     return stat.version;
@@ -713,7 +763,7 @@ void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, C
     }
 
     if (some_active_mutations_were_killed)
-        storage.background_executor.triggerTask();
+        storage.background_operations_assignee.trigger();
 
     if (!entries_to_load.empty())
     {
@@ -847,7 +897,7 @@ ReplicatedMergeTreeMutationEntryPtr ReplicatedMergeTreeQueue::removeMutation(
     }
 
     if (mutation_was_active)
-        storage.background_executor.triggerTask();
+        storage.background_operations_assignee.trigger();
 
     return entry;
 }
@@ -1251,6 +1301,37 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
             out_postpone_reason = fmt::format(format_str, entry.znode_name, entry.typeToString(), entry.new_part_name);
             return false;
         }
+
+        if (entry.isDropPart(format_version))
+        {
+            /// We should avoid reordering of REPLACE_RANGE and DROP PART (DROP_RANGE),
+            /// because if replace_range_entry->new_part_names contains drop_range_entry->new_part_name
+            /// and we execute DROP PART before REPLACE_RANGE, then DROP PART will be no-op
+            /// (because part is not created yet, so there is nothing to drop;
+            /// DROP_RANGE does not cover all parts of REPLACE_RANGE, so removePartProducingOpsInRange(...) will not remove anything too)
+            /// and part will never be removed. Replicas may diverge due to such reordering.
+            /// We don't need to do anything for other entry types, because removePartProducingOpsInRange(...) will remove them as expected.
+
+            auto drop_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, format_version);
+            for (const auto & replace_entry : queue)
+            {
+                if (replace_entry->type != LogEntry::REPLACE_RANGE)
+                    continue;
+
+                for (const auto & new_part_name : replace_entry->replace_range_entry->new_part_names)
+                {
+                    auto new_part_info = MergeTreePartInfo::fromPartName(new_part_name, format_version);
+                    if (!new_part_info.isDisjoint(drop_part_info))
+                    {
+                        const char * format_str = "Not executing log entry {} of type {} for part {} "
+                                                  "because it probably depends on {} (REPLACE_RANGE).";
+                        LOG_TRACE(log, format_str, entry.znode_name, entry.typeToString(), entry.new_part_name, replace_entry->znode_name);
+                        out_postpone_reason = fmt::format(format_str, entry.znode_name, entry.typeToString(), entry.new_part_name, replace_entry->znode_name);
+                        return false;
+                    }
+                }
+            }
+        }
     }
 
     return true;
@@ -1410,33 +1491,7 @@ bool ReplicatedMergeTreeQueue::processEntry(
     if (saved_exception)
     {
         std::lock_guard lock(state_mutex);
-
         entry->exception = saved_exception;
-
-        if (entry->type == ReplicatedMergeTreeLogEntryData::MUTATE_PART)
-        {
-            /// Record the exception in the system.mutations table.
-            Int64 result_data_version = MergeTreePartInfo::fromPartName(entry->new_part_name, format_version)
-                .getDataVersion();
-            auto source_part_info = MergeTreePartInfo::fromPartName(
-                entry->source_parts.at(0), format_version);
-
-            auto in_partition = mutations_by_partition.find(source_part_info.partition_id);
-            if (in_partition != mutations_by_partition.end())
-            {
-                auto mutations_begin_it = in_partition->second.upper_bound(source_part_info.getDataVersion());
-                auto mutations_end_it = in_partition->second.upper_bound(result_data_version);
-                for (auto it = mutations_begin_it; it != mutations_end_it; ++it)
-                {
-                    MutationStatus & status = *it->second;
-                    status.latest_failed_part = entry->source_parts.at(0);
-                    status.latest_failed_part_info = source_part_info;
-                    status.latest_fail_time = time(nullptr);
-                    status.latest_fail_reason = getExceptionMessage(saved_exception, false);
-                }
-            }
-        }
-
         return false;
     }
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index 57e1e658665..30c8bafcf6e 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -31,6 +31,8 @@ class ReplicatedMergeTreeQueue
 private:
     friend class CurrentlyExecuting;
     friend class ReplicatedMergeTreeMergePredicate;
+    friend class MergeFromLogEntryTask;
+    friend class ReplicatedMergeMutateTaskBase;
 
     using LogEntry = ReplicatedMergeTreeLogEntry;
     using LogEntryPtr = LogEntry::Ptr;
@@ -277,8 +279,8 @@ public:
     /// Clears queue state
     void clear();
 
-    /// Put a set of (already existing) parts in virtual_parts.
-    void initialize(const MergeTreeData::DataParts & parts);
+    /// Get set of parts from zookeeper
+    void initialize(zkutil::ZooKeeperPtr zookeeper);
 
     /** Inserts an action to the end of the queue.
       * To restore broken parts during operation.
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index 5c19f4166fa..16597fc4be9 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -174,6 +174,8 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
 
         try
         {
+            storage.queue.initialize(zookeeper);
+
             storage.queue.load(zookeeper);
 
             /// pullLogsToQueue() after we mark replica 'is_active' (and after we repair if it was lost);
@@ -204,7 +206,7 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
         storage.partial_shutdown_event.reset();
 
         /// Start queue processing
-        storage.background_executor.start();
+        storage.background_operations_assignee.start();
 
         storage.queue_updating_task->activateAndSchedule();
         storage.mutations_updating_task->activateAndSchedule();
@@ -389,7 +391,7 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown()
         auto fetch_lock = storage.fetcher.blocker.cancel();
         auto merge_lock = storage.merger_mutator.merges_blocker.cancel();
         auto move_lock = storage.parts_mover.moves_blocker.cancel();
-        storage.background_executor.finish();
+        storage.background_operations_assignee.finish();
     }
 
     LOG_TRACE(log, "Threads finished");
diff --git a/src/Storages/MergeTree/tests/gtest_executor.cpp b/src/Storages/MergeTree/tests/gtest_executor.cpp
new file mode 100644
index 00000000000..394977aaf5b
--- /dev/null
+++ b/src/Storages/MergeTree/tests/gtest_executor.cpp
@@ -0,0 +1,155 @@
+#include <gtest/gtest.h>
+
+#include <atomic>
+#include <barrier>
+#include <memory>
+#include <random>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
+
+using namespace DB;
+
+namespace CurrentMetrics
+{
+    extern const Metric BackgroundPoolTask;
+}
+
+std::random_device device;
+
+class FakeExecutableTask : public IExecutableTask
+{
+public:
+    explicit FakeExecutableTask(String name_) : generator(device()), distribution(0, 5), name(name_)
+    {
+    }
+
+    bool executeStep() override
+    {
+        auto sleep_time = distribution(generator);
+        std::this_thread::sleep_for(std::chrono::milliseconds(5 * sleep_time));
+
+        auto choice = distribution(generator);
+        if (choice == 0)
+            throw std::runtime_error("Unlucky...");
+
+        return false;
+    }
+
+    StorageID getStorageID() override
+    {
+        return {"test", name};
+    }
+
+    void onCompleted() override
+    {
+        auto choice = distribution(generator);
+        if (choice == 0)
+            throw std::runtime_error("Unlucky...");
+    }
+
+private:
+    std::mt19937 generator;
+    std::uniform_int_distribution<> distribution;
+
+    String name;
+    std::function<void()> on_completed;
+};
+
+
+TEST(Executor, RemoveTasks)
+{
+    const size_t tasks_kinds = 25;
+    const size_t batch = 100;
+
+    auto executor = DB::MergeTreeBackgroundExecutor::create
+    (
+        DB::MergeTreeBackgroundExecutor::Type::MERGE_MUTATE,
+        tasks_kinds,
+        tasks_kinds * batch,
+        CurrentMetrics::BackgroundPoolTask
+    );
+
+    for (size_t i = 0; i < batch; ++i)
+        for (size_t j = 0; j < tasks_kinds; ++j)
+            ASSERT_TRUE(
+                executor->trySchedule(std::make_shared<FakeExecutableTask>(std::to_string(j)))
+            );
+
+    std::vector<std::thread> threads(batch);
+
+    auto remover_routine = [&] ()
+    {
+        for (size_t j = 0; j < tasks_kinds; ++j)
+            executor->removeTasksCorrespondingToStorage({"test", std::to_string(j)});
+    };
+
+    for (auto & thread : threads)
+        thread = std::thread(remover_routine);
+
+    for (auto & thread : threads)
+        thread.join();
+
+    ASSERT_EQ(executor->activeCount(), 0);
+    ASSERT_EQ(executor->pendingCount(), 0);
+    ASSERT_EQ(CurrentMetrics::values[CurrentMetrics::BackgroundPoolTask], 0);
+
+    executor->wait();
+}
+
+
+TEST(Executor, RemoveTasksStress)
+{
+    const size_t tasks_kinds = 25;
+    const size_t batch = 100;
+    const size_t schedulers_count = 5;
+    const size_t removers_count = 5;
+
+    auto executor = DB::MergeTreeBackgroundExecutor::create
+    (
+        DB::MergeTreeBackgroundExecutor::Type::MERGE_MUTATE,
+        tasks_kinds,
+        tasks_kinds * batch * (schedulers_count + removers_count),
+        CurrentMetrics::BackgroundPoolTask
+    );
+
+    std::barrier barrier(schedulers_count + removers_count);
+
+    auto scheduler_routine = [&] ()
+    {
+        barrier.arrive_and_wait();
+        for (size_t i = 0; i < batch; ++i)
+            for (size_t j = 0; j < tasks_kinds; ++j)
+                executor->trySchedule(std::make_shared<FakeExecutableTask>(std::to_string(j)));
+    };
+
+    auto remover_routine = [&] ()
+    {
+        barrier.arrive_and_wait();
+        for (size_t j = 0; j < tasks_kinds; ++j)
+            executor->removeTasksCorrespondingToStorage({"test", std::to_string(j)});
+    };
+
+    std::vector<std::thread> schedulers(schedulers_count);
+    for (auto & scheduler : schedulers)
+        scheduler = std::thread(scheduler_routine);
+
+    std::vector<std::thread> removers(removers_count);
+    for (auto & remover : removers)
+        remover = std::thread(remover_routine);
+
+    for (auto & scheduler : schedulers)
+        scheduler.join();
+
+    for (auto & remover : removers)
+        remover.join();
+
+    for (size_t j = 0; j < tasks_kinds; ++j)
+        executor->removeTasksCorrespondingToStorage({"test", std::to_string(j)});
+
+    ASSERT_EQ(executor->activeCount(), 0);
+    ASSERT_EQ(executor->pendingCount(), 0);
+    ASSERT_EQ(CurrentMetrics::values[CurrentMetrics::BackgroundPoolTask], 0);
+
+    executor->wait();
+}
diff --git a/src/Storages/MutationCommands.h b/src/Storages/MutationCommands.h
index 1f087ee8716..41d3dbfee27 100644
--- a/src/Storages/MutationCommands.h
+++ b/src/Storages/MutationCommands.h
@@ -1,14 +1,16 @@
 #pragma once
 
+#include <optional>
+#include <vector>
+#include <memory>
+#include <unordered_map>
+
+#include <common/shared_ptr_helper.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Storages/IStorage_fwd.h>
 #include <DataTypes/IDataType.h>
 #include <Core/Names.h>
 
-#include <optional>
-#include <unordered_map>
-
-
 namespace DB
 {
 
@@ -68,7 +70,7 @@ struct MutationCommand
 };
 
 /// Multiple mutation commands, possible from different ALTER queries
-class MutationCommands : public std::vector<MutationCommand>
+class MutationCommands : public shared_ptr_helper<MutationCommands>, public std::vector<MutationCommand>
 {
 public:
     std::shared_ptr<ASTExpressionList> ast() const;
@@ -77,4 +79,6 @@ public:
     void readText(ReadBuffer & in);
 };
 
+using MutationCommandsConstPtr = std::shared_ptr<MutationCommands>;
+
 }
diff --git a/src/Storages/MySQL/MySQLSettings.h b/src/Storages/MySQL/MySQLSettings.h
index da8723c2ea6..872b0607e20 100644
--- a/src/Storages/MySQL/MySQLSettings.h
+++ b/src/Storages/MySQL/MySQLSettings.h
@@ -17,6 +17,7 @@ class ASTStorage;
 #define LIST_OF_MYSQL_SETTINGS(M) \
     M(UInt64, connection_pool_size, 16, "Size of connection pool (if all connections are in use, the query will wait until some connection will be freed).", 0) \
     M(UInt64, connection_max_tries, 3, "Number of retries for pool with failover", 0) \
+    M(UInt64, connection_wait_timeout, 5, "Timeout (in seconds) for waiting for free connection (in case of there is already connection_pool_size active connections), 0 - do not wait.", 0) \
     M(Bool, connection_auto_close, true, "Auto-close connection after query execution, i.e. disable connection reuse.", 0) \
 
 DECLARE_SETTINGS_TRAITS(MySQLSettingsTraits, LIST_OF_MYSQL_SETTINGS)
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
index 1fc279bff23..e7b5fa8256c 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
@@ -8,6 +8,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
+#include <Common/SettingsChanges.h>
 
 
 namespace DB
@@ -26,8 +27,9 @@ MaterializedPostgreSQLConsumer::MaterializedPostgreSQLConsumer(
     const std::string & start_lsn,
     const size_t max_block_size_,
     bool allow_automatic_update_,
-    Storages storages_)
-    : log(&Poco::Logger::get("PostgreSQLReaplicaConsumer"))
+    Storages storages_,
+    const String & name_for_logger)
+    : log(&Poco::Logger::get("PostgreSQLReplicaConsumer(" + name_for_logger + ")"))
     , context(context_)
     , replication_slot_name(replication_slot_name_)
     , publication_name(publication_name_)
@@ -270,12 +272,13 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
         case 'I': // Insert
         {
             Int32 relation_id = readInt32(replication_message, pos, size);
+            const auto & table_name = relation_id_to_name[relation_id];
+            assert(!table_name.empty());
 
-            if (!isSyncAllowed(relation_id))
+            if (!isSyncAllowed(relation_id, table_name))
                 return;
 
             Int8 new_tuple = readInt8(replication_message, pos, size);
-            const auto & table_name = relation_id_to_name[relation_id];
             auto buffer = buffers.find(table_name);
             assert(buffer != buffers.end());
 
@@ -287,11 +290,12 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
         case 'U': // Update
         {
             Int32 relation_id = readInt32(replication_message, pos, size);
+            const auto & table_name = relation_id_to_name[relation_id];
+            assert(!table_name.empty());
 
-            if (!isSyncAllowed(relation_id))
+            if (!isSyncAllowed(relation_id, table_name))
                 return;
 
-            const auto & table_name = relation_id_to_name[relation_id];
             auto buffer = buffers.find(table_name);
             assert(buffer != buffers.end());
 
@@ -335,14 +339,15 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
         case 'D': // Delete
         {
             Int32 relation_id = readInt32(replication_message, pos, size);
+            const auto & table_name = relation_id_to_name[relation_id];
+            assert(!table_name.empty());
 
-            if (!isSyncAllowed(relation_id))
+            if (!isSyncAllowed(relation_id, table_name))
                 return;
 
              /// 0 or 1 if replica identity is set to full. For now only default replica identity is supported (with primary keys).
             readInt8(replication_message, pos, size);
 
-            const auto & table_name = relation_id_to_name[relation_id];
             auto buffer = buffers.find(table_name);
             assert(buffer != buffers.end());
             readTupleData(buffer->second, replication_message, pos, size, PostgreSQLQuery::DELETE);
@@ -357,8 +362,6 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
             constexpr size_t transaction_commit_timestamp_len = 8;
             pos += unused_flags_len + commit_lsn_len + transaction_end_lsn_len + transaction_commit_timestamp_len;
 
-            LOG_DEBUG(log, "Current lsn: {} = {}", current_lsn, getLSNValue(current_lsn)); /// Will be removed
-
             final_lsn = current_lsn;
             break;
         }
@@ -371,7 +374,7 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
             readString(replication_message, pos, size, relation_namespace);
             readString(replication_message, pos, size, relation_name);
 
-            if (!isSyncAllowed(relation_id))
+            if (!isSyncAllowed(relation_id, relation_name))
                 return;
 
             if (storages.find(relation_name) == storages.end())
@@ -433,7 +436,7 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
 
                 if (new_relation_definition)
                 {
-                    current_schema_data.column_identifiers.emplace_back(std::make_tuple(data_type_id, type_modifier));
+                    current_schema_data.column_identifiers.emplace_back(std::make_pair(data_type_id, type_modifier));
                 }
                 else
                 {
@@ -522,15 +525,35 @@ String MaterializedPostgreSQLConsumer::advanceLSN(std::shared_ptr<pqxx::nontrans
 /// Sync for some table might not be allowed if:
 /// 1. Table schema changed and might break synchronization.
 /// 2. There is no storage for this table. (As a result of some exception or incorrect pg_publication)
-bool MaterializedPostgreSQLConsumer::isSyncAllowed(Int32 relation_id)
+/// 3. A new table was added to replication, it was loaded via snapshot, but consumer has not yet
+///    read wal up to the lsn position of snapshot, from which table was loaded.
+bool MaterializedPostgreSQLConsumer::isSyncAllowed(Int32 relation_id, const String & relation_name)
 {
-    auto table_with_lsn = skip_list.find(relation_id);
+    if (deleted_tables.contains(relation_name))
+        return false;
+
+    auto new_table_with_lsn = waiting_list.find(relation_name);
+
+    if (new_table_with_lsn != waiting_list.end())
+    {
+        auto table_start_lsn = new_table_with_lsn->second;
+        assert(!table_start_lsn.empty());
+
+        if (getLSNValue(current_lsn) >= getLSNValue(table_start_lsn))
+        {
+            LOG_TRACE(log, "Synchronization is started for table: {} (start_lsn: {})", relation_name, table_start_lsn);
+            waiting_list.erase(new_table_with_lsn);
+            return true;
+        }
+    }
+
+    auto skipped_table_with_lsn = skip_list.find(relation_id);
 
     /// Table is not present in a skip list - allow synchronization.
-    if (table_with_lsn == skip_list.end())
+    if (skipped_table_with_lsn == skip_list.end())
         return true;
 
-    const auto & table_start_lsn = table_with_lsn->second;
+    const auto & table_start_lsn = skipped_table_with_lsn->second;
 
     /// Table is in a skip list and has not yet received a valid lsn == it has not been reloaded.
     if (table_start_lsn.empty())
@@ -544,7 +567,7 @@ bool MaterializedPostgreSQLConsumer::isSyncAllowed(Int32 relation_id)
         LOG_TRACE(log, "Synchronization is resumed for table: {} (start_lsn: {})",
                 relation_id_to_name[relation_id], table_start_lsn);
 
-        skip_list.erase(table_with_lsn);
+        skip_list.erase(skipped_table_with_lsn);
 
         return true;
     }
@@ -576,6 +599,51 @@ void MaterializedPostgreSQLConsumer::markTableAsSkipped(Int32 relation_id, const
 }
 
 
+void MaterializedPostgreSQLConsumer::addNested(const String & postgres_table_name, StoragePtr nested_storage, const String & table_start_lsn)
+{
+    /// Cache new pointer to replacingMergeTree table.
+    storages.emplace(postgres_table_name, nested_storage);
+
+    /// Add new in-memory buffer.
+    buffers.emplace(postgres_table_name, Buffer(nested_storage));
+
+    /// Replication consumer will read wall and check for currently processed table whether it is allowed to start applying
+    /// changes to this table.
+    waiting_list[postgres_table_name] = table_start_lsn;
+}
+
+
+void MaterializedPostgreSQLConsumer::updateNested(const String & table_name, StoragePtr nested_storage, Int32 table_id, const String & table_start_lsn)
+{
+    /// Cache new pointer to replacingMergeTree table.
+    storages[table_name] = nested_storage;
+
+    /// Create a new empty buffer (with updated metadata), where data is first loaded before syncing into actual table.
+    auto & buffer = buffers.find(table_name)->second;
+    buffer.createEmptyBuffer(nested_storage);
+
+    /// Set start position to valid lsn. Before it was an empty string. Further read for table allowed, if it has a valid lsn.
+    skip_list[table_id] = table_start_lsn;
+}
+
+
+void MaterializedPostgreSQLConsumer::removeNested(const String & postgres_table_name)
+{
+    storages.erase(postgres_table_name);
+    buffers.erase(postgres_table_name);
+    deleted_tables.insert(postgres_table_name);
+}
+
+
+void MaterializedPostgreSQLConsumer::setSetting(const SettingChange & setting)
+{
+    if (setting.name == "materialized_postgresql_max_block_size")
+        max_block_size = setting.value.safeGet<UInt64>();
+    else if (setting.name == "materialized_postgresql_allow_automatic_update")
+        allow_automatic_update = setting.value.safeGet<bool>();
+}
+
+
 /// Read binary changes from replication slot via COPY command (starting from current lsn in a slot).
 bool MaterializedPostgreSQLConsumer::readFromReplicationSlot()
 {
@@ -700,21 +768,10 @@ bool MaterializedPostgreSQLConsumer::consume(std::vector<std::pair<Int32, String
     /// Read up to max_block_size changed (approximately - in same cases might be more).
     /// false: no data was read, reschedule.
     /// true: some data was read, schedule as soon as possible.
-    return readFromReplicationSlot();
+    auto read_next = readFromReplicationSlot();
+    LOG_TRACE(log, "LSN: {}", final_lsn);
+    return read_next;
 }
 
 
-void MaterializedPostgreSQLConsumer::updateNested(const String & table_name, StoragePtr nested_storage, Int32 table_id, const String & table_start_lsn)
-{
-    /// Cache new pointer to replacingMergeTree table.
-    storages[table_name] = nested_storage;
-
-    /// Create a new empty buffer (with updated metadata), where data is first loaded before syncing into actual table.
-    auto & buffer = buffers.find(table_name)->second;
-    buffer.createEmptyBuffer(nested_storage);
-
-    /// Set start position to valid lsn. Before it was an empty string. Further read for table allowed, if it has a valid lsn.
-    skip_list[table_id] = table_start_lsn;
-}
-
 }
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
index 8f3224784f1..88f4ff4b4da 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
@@ -13,6 +13,7 @@
 
 namespace DB
 {
+struct SettingChange;
 
 class MaterializedPostgreSQLConsumer
 {
@@ -27,7 +28,8 @@ public:
             const String & start_lsn,
             const size_t max_block_size_,
             bool allow_automatic_update_,
-            Storages storages_);
+            Storages storages_,
+            const String & name_for_logger);
 
     bool consume(std::vector<std::pair<Int32, String>> & skipped_tables);
 
@@ -35,6 +37,12 @@ public:
     /// process if it was skipped due to schema changes.
     void updateNested(const String & table_name, StoragePtr nested_storage, Int32 table_id, const String & table_start_lsn);
 
+    void addNested(const String & postgres_table_name, StoragePtr nested_storage, const String & table_start_lsn);
+
+    void removeNested(const String & postgres_table_name);
+
+    void setSetting(const SettingChange & setting);
+
 private:
     /// Read approximarely up to max_block_size changes from WAL.
     bool readFromReplicationSlot();
@@ -45,7 +53,7 @@ private:
 
     void processReplicationMessage(const char * replication_message, size_t size);
 
-    bool isSyncAllowed(Int32 relation_id);
+    bool isSyncAllowed(Int32 relation_id, const String & relation_name);
 
     struct Buffer
     {
@@ -105,15 +113,18 @@ private:
     /// current_lsn converted from String to Int64 via getLSNValue().
     UInt64 lsn_value;
 
-    const size_t max_block_size;
+    size_t max_block_size;
     bool allow_automatic_update;
 
     String table_to_insert;
 
     /// List of tables which need to be synced after last replication stream.
+    /// Holds `postgres_table_name` set.
     std::unordered_set<std::string> tables_to_sync;
 
+    /// `postgres_table_name` -> ReplacingMergeTree table.
     Storages storages;
+    /// `postgres_table_name` -> In-memory buffer.
     Buffers buffers;
 
     std::unordered_map<Int32, String> relation_id_to_name;
@@ -133,6 +144,7 @@ private:
     /// if relation definition has changed since the last relation definition message.
     std::unordered_map<Int32, SchemaData> schema_data;
 
+    /// `postgres_relation_id` -> `start_lsn`
     /// skip_list contains relation ids for tables on which ddl was performed, which can break synchronization.
     /// This breaking changes are detected in replication stream in according replication message and table is added to skip list.
     /// After it is finished, a temporary replication slot is created with 'export snapshot' option, and start_lsn is returned.
@@ -142,5 +154,16 @@ private:
     /// No needed message, related to reloaded table will be missed, because messages are not consumed in the meantime,
     /// i.e. we will not miss the first start_lsn position for reloaded table.
     std::unordered_map<Int32, String> skip_list;
+
+    /// `postgres_table_name` -> `start_lsn`
+    /// For dynamically added tables. A new table is loaded via snapshot and we get a start lsn position.
+    /// Once consumer reaches this position, it starts applying replication messages to this table.
+    /// Inside replication handler we have to ensure that replication consumer does not read data from wal
+    /// while the process of adding a table to replication is not finished,
+    /// because we might go beyond this start lsn position before consumer knows that a new table was added.
+    std::unordered_map<String, String> waiting_list;
+
+    /// Since replication may be some time behind, we need to ensure that replication messages for deleted tables are ignored.
+    std::unordered_set<String> deleted_tables;
 };
 }
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
index 1bda6d13e11..456ca2c514e 100644
--- a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
@@ -11,18 +11,20 @@
 #include <Common/setThreadName.h>
 #include <Interpreters/Context.h>
 #include <DataStreams/copyData.h>
+#include <Databases/DatabaseOnDisk.h>
 
 
 namespace DB
 {
 
-static const auto RESCHEDULE_MS = 500;
+static const auto RESCHEDULE_MS = 1000;
 static const auto BACKOFF_TRESHOLD_MS = 10000;
 
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
+    extern const int POSTGRESQL_REPLICATION_INTERNAL_ERROR;
 }
 
 PostgreSQLReplicationHandler::PostgreSQLReplicationHandler(
@@ -45,7 +47,6 @@ PostgreSQLReplicationHandler::PostgreSQLReplicationHandler(
     , is_materialized_postgresql_database(is_materialized_postgresql_database_)
     , tables_list(replication_settings.materialized_postgresql_tables_list)
     , user_provided_snapshot(replication_settings.materialized_postgresql_snapshot)
-    , connection(std::make_shared<postgres::Connection>(connection_info_))
     , milliseconds_to_wait(RESCHEDULE_MS)
 {
     replication_slot = replication_settings.materialized_postgresql_replication_slot;
@@ -77,7 +78,8 @@ void PostgreSQLReplicationHandler::waitConnectionAndStart()
 {
     try
     {
-        connection->connect(); /// Will throw pqxx::broken_connection if no connection at the moment
+        postgres::Connection connection(connection_info);
+        connection.connect(); /// Will throw pqxx::broken_connection if no connection at the moment
         startSynchronization(false);
     }
     catch (const pqxx::broken_connection & pqxx_error)
@@ -102,14 +104,9 @@ void PostgreSQLReplicationHandler::shutdown()
 
 void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
 {
-    {
-        pqxx::work tx(connection->getRef());
-        createPublicationIfNeeded(tx);
-        tx.commit();
-    }
-
     postgres::Connection replication_connection(connection_info, /* replication */true);
     pqxx::nontransaction tx(replication_connection.getRef());
+    createPublicationIfNeeded(tx);
 
     /// List of nested tables (table_name -> nested_storage), which is passed to replication consumer.
     std::unordered_map<String, StoragePtr> nested_storages;
@@ -120,9 +117,12 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
     /// 2. if replication slot already exist, start_lsn is read from pg_replication_slots as
     ///    `confirmed_flush_lsn` - the address (LSN) up to which the logical slot's consumer has confirmed receiving data.
     ///    Data older than this is not available anymore.
-    ///    TODO: more tests
     String snapshot_name, start_lsn;
 
+    /// Also lets have a separate non-replication connection, because we need two parallel transactions and
+    /// one connection can have one transaction at a time.
+    auto tmp_connection = std::make_shared<postgres::Connection>(connection_info);
+
     auto initial_sync = [&]()
     {
         LOG_TRACE(log, "Starting tables sync load");
@@ -144,7 +144,7 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
         {
             try
             {
-                nested_storages[table_name] = loadFromSnapshot(snapshot_name, table_name, storage->as <StorageMaterializedPostgreSQL>());
+                nested_storages[table_name] = loadFromSnapshot(*tmp_connection, snapshot_name, table_name, storage->as<StorageMaterializedPostgreSQL>());
             }
             catch (Exception & e)
             {
@@ -186,6 +186,8 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
             auto * materialized_storage = storage->as <StorageMaterializedPostgreSQL>();
             try
             {
+                /// FIXME: Looks like it is possible we might get here if there is no nested storage or at least nested storage id field might be empty.
+                ///        Caught it somehow when doing something else incorrectly, but do not see any reason how it could happen.
                 /// Try load nested table, set materialized table metadata.
                 nested_storages[table_name] = materialized_storage->prepare();
             }
@@ -209,13 +211,14 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
     /// Handler uses it only for loadFromSnapshot and shutdown methods.
     consumer = std::make_shared<MaterializedPostgreSQLConsumer>(
             context,
-            connection,
+            std::move(tmp_connection),
             replication_slot,
             publication_name,
             start_lsn,
             max_block_size,
             allow_automatic_update,
-            nested_storages);
+            nested_storages,
+            (is_materialized_postgresql_database ? remote_database_name : remote_database_name + '.' + tables_list));
 
     consumer_task->activateAndSchedule();
 
@@ -224,10 +227,19 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
 }
 
 
-StoragePtr PostgreSQLReplicationHandler::loadFromSnapshot(String & snapshot_name, const String & table_name,
+ASTPtr PostgreSQLReplicationHandler::getCreateNestedTableQuery(StorageMaterializedPostgreSQL * storage, const String & table_name)
+{
+    postgres::Connection connection(connection_info);
+    pqxx::nontransaction tx(connection.getRef());
+    auto table_structure = std::make_unique<PostgreSQLTableStructure>(fetchPostgreSQLTableStructure(tx, table_name, true, true, true));
+    return storage->getCreateNestedTableQuery(std::move(table_structure));
+}
+
+
+StoragePtr PostgreSQLReplicationHandler::loadFromSnapshot(postgres::Connection & connection, String & snapshot_name, const String & table_name,
                                                           StorageMaterializedPostgreSQL * materialized_storage)
 {
-    auto tx = std::make_shared<pqxx::ReplicationTransaction>(connection->getRef());
+    auto tx = std::make_shared<pqxx::ReplicationTransaction>(connection.getRef());
 
     std::string query_str = fmt::format("SET TRANSACTION SNAPSHOT '{}'", snapshot_name);
     tx->exec(query_str);
@@ -312,7 +324,7 @@ void PostgreSQLReplicationHandler::consumerFunc()
 }
 
 
-bool PostgreSQLReplicationHandler::isPublicationExist(pqxx::work & tx)
+bool PostgreSQLReplicationHandler::isPublicationExist(pqxx::nontransaction & tx)
 {
     std::string query_str = fmt::format("SELECT exists (SELECT 1 FROM pg_publication WHERE pubname = '{}')", publication_name);
     pqxx::result result{tx.exec(query_str)};
@@ -321,7 +333,7 @@ bool PostgreSQLReplicationHandler::isPublicationExist(pqxx::work & tx)
 }
 
 
-void PostgreSQLReplicationHandler::createPublicationIfNeeded(pqxx::work & tx)
+void PostgreSQLReplicationHandler::createPublicationIfNeeded(pqxx::nontransaction & tx)
 {
     auto publication_exists = isPublicationExist(tx);
 
@@ -332,7 +344,7 @@ void PostgreSQLReplicationHandler::createPublicationIfNeeded(pqxx::work & tx)
                     "Publication {} already exists, but it is a CREATE query, not ATTACH. Publication will be dropped",
                     publication_name);
 
-        connection->execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
+        dropPublication(tx);
     }
 
     if (!is_attach || !publication_exists)
@@ -413,7 +425,7 @@ void PostgreSQLReplicationHandler::createReplicationSlot(
         pqxx::result result{tx.exec(query_str)};
         start_lsn = result[0][1].as<std::string>();
         snapshot_name = result[0][2].as<std::string>();
-        LOG_TRACE(log, "Created replication slot: {}, start lsn: {}", replication_slot, start_lsn);
+        LOG_TRACE(log, "Created replication slot: {}, start lsn: {}, snapshot: {}", replication_slot, start_lsn, snapshot_name);
     }
     catch (Exception & e)
     {
@@ -448,16 +460,41 @@ void PostgreSQLReplicationHandler::dropPublication(pqxx::nontransaction & tx)
 }
 
 
+void PostgreSQLReplicationHandler::addTableToPublication(pqxx::nontransaction & ntx, const String & table_name)
+{
+    std::string query_str = fmt::format("ALTER PUBLICATION {} ADD TABLE ONLY {}", publication_name, doubleQuoteString(table_name));
+    ntx.exec(query_str);
+    LOG_TRACE(log, "Added table `{}` to publication `{}`", table_name, publication_name);
+}
+
+
+void PostgreSQLReplicationHandler::removeTableFromPublication(pqxx::nontransaction & ntx, const String & table_name)
+{
+    std::string query_str = fmt::format("ALTER PUBLICATION {} DROP TABLE ONLY {}", publication_name, doubleQuoteString(table_name));
+    ntx.exec(query_str);
+    LOG_TRACE(log, "Removed table `{}` from publication `{}`", table_name, publication_name);
+}
+
+
+void PostgreSQLReplicationHandler::setSetting(const SettingChange & setting)
+{
+    consumer_task->deactivate();
+    consumer->setSetting(setting);
+    consumer_task->activateAndSchedule();
+}
+
+
 void PostgreSQLReplicationHandler::shutdownFinal()
 {
     try
     {
         shutdown();
 
-        connection->execWithRetry([&](pqxx::nontransaction & tx){ dropPublication(tx); });
+        postgres::Connection connection(connection_info);
+        connection.execWithRetry([&](pqxx::nontransaction & tx){ dropPublication(tx); });
         String last_committed_lsn;
 
-        connection->execWithRetry([&](pqxx::nontransaction & tx)
+        connection.execWithRetry([&](pqxx::nontransaction & tx)
         {
             if (isReplicationSlotExist(tx, last_committed_lsn, /* temporary */true))
                 dropReplicationSlot(tx, /* temporary */true);
@@ -466,7 +503,7 @@ void PostgreSQLReplicationHandler::shutdownFinal()
         if (user_managed_slot)
             return;
 
-        connection->execWithRetry([&](pqxx::nontransaction & tx)
+        connection.execWithRetry([&](pqxx::nontransaction & tx)
         {
             if (isReplicationSlotExist(tx, last_committed_lsn, /* temporary */false))
                 dropReplicationSlot(tx, /* temporary */false);
@@ -482,12 +519,17 @@ void PostgreSQLReplicationHandler::shutdownFinal()
 
 
 /// Used by MaterializedPostgreSQL database engine.
-NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection & connection_)
+NameSet PostgreSQLReplicationHandler::fetchRequiredTables()
 {
-    pqxx::work tx(connection_.getRef());
+    postgres::Connection connection(connection_info);
     NameSet result_tables;
+    bool publication_exists_before_startup;
+
+    {
+        pqxx::nontransaction tx(connection.getRef());
+        publication_exists_before_startup = isPublicationExist(tx);
+    }
 
-    bool publication_exists_before_startup = isPublicationExist(tx);
     LOG_DEBUG(log, "Publication exists: {}, is attach: {}", publication_exists_before_startup, is_attach);
 
     Strings expected_tables;
@@ -508,7 +550,7 @@ NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection &
                         "Publication {} already exists, but it is a CREATE query, not ATTACH. Publication will be dropped",
                         publication_name);
 
-            connection->execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
+            connection.execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
         }
         else
         {
@@ -518,13 +560,20 @@ NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection &
                             "Publication {} already exists and tables list is empty. Assuming publication is correct.",
                             publication_name);
 
-                result_tables = fetchPostgreSQLTablesList(tx, postgres_schema);
+                {
+                    pqxx::nontransaction tx(connection.getRef());
+                    result_tables = fetchPostgreSQLTablesList(tx, postgres_schema);
+                }
             }
             /// Check tables list from publication is the same as expected tables list.
             /// If not - drop publication and return expected tables list.
             else
             {
-                result_tables = fetchTablesFromPublication(tx);
+                {
+                    pqxx::work tx(connection.getRef());
+                    result_tables = fetchTablesFromPublication(tx);
+                }
+
                 NameSet diff;
                 std::set_symmetric_difference(expected_tables.begin(), expected_tables.end(),
                                               result_tables.begin(), result_tables.end(),
@@ -543,7 +592,7 @@ NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection &
                                 "Publication {} already exists, but specified tables list differs from publication tables list in tables: {}.",
                                 publication_name, diff_tables);
 
-                    connection->execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
+                    connection.execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
                 }
             }
         }
@@ -560,11 +609,13 @@ NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection &
             /// Fetch all tables list from database. Publication does not exist yet, which means
             /// that no replication took place. Publication will be created in
             /// startSynchronization method.
-            result_tables = fetchPostgreSQLTablesList(tx, postgres_schema);
+            {
+                pqxx::nontransaction tx(connection.getRef());
+                result_tables = fetchPostgreSQLTablesList(tx, postgres_schema);
+            }
         }
     }
 
-    tx.commit();
     return result_tables;
 }
 
@@ -591,6 +642,88 @@ PostgreSQLTableStructurePtr PostgreSQLReplicationHandler::fetchTableStructure(
 }
 
 
+void PostgreSQLReplicationHandler::addTableToReplication(StorageMaterializedPostgreSQL * materialized_storage, const String & postgres_table_name)
+{
+    /// Note: we have to ensure that replication consumer task is stopped when we reload table, because otherwise
+    /// it can read wal beyond start lsn position (from which this table is being loaded), which will result in losing data.
+    consumer_task->deactivate();
+    try
+    {
+        LOG_TRACE(log, "Adding table `{}` to replication", postgres_table_name);
+        postgres::Connection replication_connection(connection_info, /* replication */true);
+        String snapshot_name, start_lsn;
+        StoragePtr nested_storage;
+
+        {
+            pqxx::nontransaction tx(replication_connection.getRef());
+            if (isReplicationSlotExist(tx, start_lsn, /* temporary */true))
+                dropReplicationSlot(tx, /* temporary */true);
+            createReplicationSlot(tx, start_lsn, snapshot_name, /* temporary */true);
+
+            /// Protect against deadlock.
+            auto nested = DatabaseCatalog::instance().tryGetTable(materialized_storage->getNestedStorageID(), materialized_storage->getNestedTableContext());
+            if (!nested)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Internal table was not created");
+
+            {
+                postgres::Connection tmp_connection(connection_info);
+                nested_storage = loadFromSnapshot(tmp_connection, snapshot_name, postgres_table_name, materialized_storage);
+            }
+            auto nested_table_id = nested_storage->getStorageID();
+            materialized_storage->setNestedStorageID(nested_table_id);
+            nested_storage = materialized_storage->prepare();
+        }
+
+        {
+            pqxx::nontransaction tx(replication_connection.getRef());
+            addTableToPublication(tx, postgres_table_name);
+        }
+
+        /// Pass storage to consumer and lsn position, from which to start receiving replication messages for this table.
+        consumer->addNested(postgres_table_name, nested_storage, start_lsn);
+        LOG_TRACE(log, "Table `{}` successfully added to replication", postgres_table_name);
+    }
+    catch (...)
+    {
+        consumer_task->activate();
+        consumer_task->scheduleAfter(RESCHEDULE_MS);
+
+        auto error_message = getCurrentExceptionMessage(false);
+        throw Exception(ErrorCodes::POSTGRESQL_REPLICATION_INTERNAL_ERROR,
+                        "Failed to add table `{}` to replication. Info: {}", postgres_table_name, error_message);
+    }
+    consumer_task->activateAndSchedule();
+}
+
+
+void PostgreSQLReplicationHandler::removeTableFromReplication(const String & postgres_table_name)
+{
+    consumer_task->deactivate();
+    try
+    {
+        postgres::Connection replication_connection(connection_info, /* replication */true);
+
+        {
+            pqxx::nontransaction tx(replication_connection.getRef());
+            removeTableFromPublication(tx, postgres_table_name);
+        }
+
+        /// Pass storage to consumer and lsn position, from which to start receiving replication messages for this table.
+        consumer->removeNested(postgres_table_name);
+    }
+    catch (...)
+    {
+        consumer_task->activate();
+        consumer_task->scheduleAfter(RESCHEDULE_MS);
+
+        auto error_message = getCurrentExceptionMessage(false);
+        throw Exception(ErrorCodes::POSTGRESQL_REPLICATION_INTERNAL_ERROR,
+                        "Failed to remove table `{}` from replication. Info: {}", postgres_table_name, error_message);
+    }
+    consumer_task->activateAndSchedule();
+}
+
+
 void PostgreSQLReplicationHandler::reloadFromSnapshot(const std::vector<std::pair<Int32, String>> & relation_data)
 {
     /// If table schema has changed, the table stops consuming changes from replication stream.
@@ -608,6 +741,7 @@ void PostgreSQLReplicationHandler::reloadFromSnapshot(const std::vector<std::pai
             dropReplicationSlot(tx, /* temporary */true);
 
         createReplicationSlot(tx, start_lsn, snapshot_name, /* temporary */true);
+        postgres::Connection tmp_connection(connection_info);
 
         for (const auto & [relation_id, table_name] : relation_data)
         {
@@ -618,7 +752,7 @@ void PostgreSQLReplicationHandler::reloadFromSnapshot(const std::vector<std::pai
             auto temp_materialized_storage = materialized_storage->createTemporary();
 
             /// This snapshot is valid up to the end of the transaction, which exported it.
-            StoragePtr temp_nested_storage = loadFromSnapshot(snapshot_name, table_name,
+            StoragePtr temp_nested_storage = loadFromSnapshot(tmp_connection, snapshot_name, table_name,
                                                               temp_materialized_storage->as <StorageMaterializedPostgreSQL>());
 
             auto table_id = materialized_storage->getNestedStorageID();
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
index eacf6b69b3b..2c680a6b18d 100644
--- a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
@@ -4,17 +4,14 @@
 #include "MaterializedPostgreSQLSettings.h"
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 #include <Core/PostgreSQL/Utils.h>
+#include <Parsers/ASTCreateQuery.h>
 
 
 namespace DB
 {
 
-/// IDEA: There is ALTER PUBLICATION command to dynamically add and remove tables for replicating (the command is transactional).
-///       (Probably, if in a replication stream comes a relation name, which does not currently
-///       exist in CH, it can be loaded via snapshot while stream is stopped and then comparing wal positions with
-///       current lsn and table start lsn.
-
 class StorageMaterializedPostgreSQL;
+struct SettingChange;
 
 class PostgreSQLReplicationHandler
 {
@@ -42,24 +39,36 @@ public:
     void addStorage(const std::string & table_name, StorageMaterializedPostgreSQL * storage);
 
     /// Fetch list of tables which are going to be replicated. Used for database engine.
-    NameSet fetchRequiredTables(postgres::Connection & connection_);
+    NameSet fetchRequiredTables();
 
     /// Start replication setup immediately.
     void startSynchronization(bool throw_on_error);
 
+    ASTPtr getCreateNestedTableQuery(StorageMaterializedPostgreSQL * storage, const String & table_name);
+
+    void addTableToReplication(StorageMaterializedPostgreSQL * storage, const String & postgres_table_name);
+
+    void removeTableFromReplication(const String & postgres_table_name);
+
+    void setSetting(const SettingChange & setting);
+
 private:
     using MaterializedStorages = std::unordered_map<String, StorageMaterializedPostgreSQL *>;
 
     /// Methods to manage Publication.
 
-    bool isPublicationExist(pqxx::work & tx);
+    bool isPublicationExist(pqxx::nontransaction & tx);
 
-    void createPublicationIfNeeded(pqxx::work & tx);
+    void createPublicationIfNeeded(pqxx::nontransaction & tx);
 
     NameSet fetchTablesFromPublication(pqxx::work & tx);
 
     void dropPublication(pqxx::nontransaction & ntx);
 
+    void addTableToPublication(pqxx::nontransaction & ntx, const String & table_name);
+
+    void removeTableFromPublication(pqxx::nontransaction & ntx, const String & table_name);
+
     /// Methods to manage Replication Slots.
 
     bool isReplicationSlotExist(pqxx::nontransaction & tx, String & start_lsn, bool temporary = false);
@@ -74,7 +83,7 @@ private:
 
     void consumerFunc();
 
-    StoragePtr loadFromSnapshot(std::string & snapshot_name, const String & table_name, StorageMaterializedPostgreSQL * materialized_storage);
+    StoragePtr loadFromSnapshot(postgres::Connection & connection, std::string & snapshot_name, const String & table_name, StorageMaterializedPostgreSQL * materialized_storage);
 
     void reloadFromSnapshot(const std::vector<std::pair<Int32, String>> & relation_data);
 
@@ -112,9 +121,6 @@ private:
 
     String replication_slot, publication_name;
 
-    /// Shared between replication_consumer and replication_handler, but never accessed concurrently.
-    std::shared_ptr<postgres::Connection> connection;
-
     /// Replication consumer. Manages decoding of replication stream and syncing into tables.
     std::shared_ptr<MaterializedPostgreSQLConsumer> consumer;
 
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index 73a685af9b4..1b17e6c0c6e 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -1,10 +1,11 @@
 #include "StorageMaterializedPostgreSQL.h"
 
 #if USE_LIBPQXX
+#include <common/logger_useful.h>
 #include <Common/Macros.h>
-#include <Core/Settings.h>
 #include <Common/parseAddress.h>
 #include <Common/assert_cast.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeArray.h>
@@ -20,8 +21,8 @@
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Storages/StorageFactory.h>
-#include <common/logger_useful.h>
 #include <Storages/ReadFinalForExternalReplicaStorage.h>
+#include <Storages/StoragePostgreSQL.h>
 #include <Core/PostgreSQL/Connection.h>
 
 
@@ -30,7 +31,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
 }
@@ -51,6 +51,7 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
     std::unique_ptr<MaterializedPostgreSQLSettings> replication_settings)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(remote_database_name, remote_table_name_) + ")"))
     , is_materialized_postgresql_database(false)
     , has_nested(false)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
@@ -90,12 +91,18 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
 /// For the case of MaterializePosgreSQL database engine.
 /// It is used when nested ReplacingMergeeTree table has not yet be created by replication thread.
 /// In this case this storage can't be used for read queries.
-StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(const StorageID & table_id_, ContextPtr context_)
+StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
+        const StorageID & table_id_,
+        ContextPtr context_,
+        const String & postgres_database_name,
+        const String & postgres_table_name)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(postgres_database_name, postgres_table_name) + ")"))
     , is_materialized_postgresql_database(true)
     , has_nested(false)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
+    , nested_table_id(table_id_)
 {
 }
 
@@ -103,9 +110,14 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(const StorageID & t
 /// Constructor for MaterializedPostgreSQL table engine - for the case of MaterializePosgreSQL database engine.
 /// It is used when nested ReplacingMergeeTree table has already been created by replication thread.
 /// This storage is ready to handle read queries.
-StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(StoragePtr nested_storage_, ContextPtr context_)
+StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
+        StoragePtr nested_storage_,
+        ContextPtr context_,
+        const String & postgres_database_name,
+        const String & postgres_table_name)
     : IStorage(nested_storage_->getStorageID())
     , WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(postgres_database_name, postgres_table_name) + ")"))
     , is_materialized_postgresql_database(true)
     , has_nested(true)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
@@ -131,7 +143,7 @@ StoragePtr StorageMaterializedPostgreSQL::createTemporary() const
     }
 
     auto new_context = Context::createCopy(context);
-    return StorageMaterializedPostgreSQL::create(tmp_table_id, new_context);
+    return StorageMaterializedPostgreSQL::create(tmp_table_id, new_context, "", table_id.table_name);
 }
 
 
@@ -171,9 +183,13 @@ StorageID StorageMaterializedPostgreSQL::getNestedStorageID() const
 
 void StorageMaterializedPostgreSQL::createNestedIfNeeded(PostgreSQLTableStructurePtr table_structure)
 {
+    if (tryGetNested())
+        return;
+
     const auto ast_create = getCreateNestedTableQuery(std::move(table_structure));
     auto table_id = getStorageID();
     auto tmp_nested_table_id = StorageID(table_id.database_name, getNestedTableName());
+    LOG_DEBUG(log, "Creating clickhouse table for postgresql table {}", table_id.getNameForLogs());
 
     try
     {
@@ -455,21 +471,6 @@ void registerStorageMaterializedPostgreSQL(StorageFactory & factory)
 {
     auto creator_fn = [](const StorageFactory::Arguments & args)
     {
-        ASTs & engine_args = args.engine_args;
-        bool has_settings = args.storage_def->settings;
-        auto postgresql_replication_settings = std::make_unique<MaterializedPostgreSQLSettings>();
-
-        if (has_settings)
-            postgresql_replication_settings->loadFromQuery(*args.storage_def);
-
-        if (engine_args.size() != 5)
-            throw Exception("Storage MaterializedPostgreSQL requires 5 parameters: "
-                            "PostgreSQL('host:port', 'database', 'table', 'username', 'password'",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getContext());
-
         StorageInMemoryMetadata metadata;
         metadata.setColumns(args.columns);
         metadata.setConstraints(args.constraints);
@@ -485,20 +486,19 @@ void registerStorageMaterializedPostgreSQL(StorageFactory & factory)
         else
             metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->order_by->ptr(), metadata.columns, args.getContext());
 
-        auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 5432);
-        const String & remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-
-        /// No connection is made here, see Storages/PostgreSQL/PostgreSQLConnection.cpp
+        auto configuration = StoragePostgreSQL::getConfiguration(args.engine_args, args.getContext());
         auto connection_info = postgres::formatConnectionString(
-            remote_database,
-            parsed_host_port.first,
-            parsed_host_port.second,
-            engine_args[3]->as<ASTLiteral &>().value.safeGet<String>(),
-            engine_args[4]->as<ASTLiteral &>().value.safeGet<String>());
+            configuration.database, configuration.host, configuration.port,
+            configuration.username, configuration.password);
+
+        bool has_settings = args.storage_def->settings;
+        auto postgresql_replication_settings = std::make_unique<MaterializedPostgreSQLSettings>();
+
+        if (has_settings)
+            postgresql_replication_settings->loadFromQuery(*args.storage_def);
 
         return StorageMaterializedPostgreSQL::create(
-                args.table_id, args.attach, remote_database, remote_table, connection_info,
+                args.table_id, args.attach, configuration.database, configuration.table, connection_info,
                 metadata, args.getContext(),
                 std::move(postgresql_replication_settings));
     };
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
index becb4f6ba10..62bc6ed713f 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
@@ -49,7 +49,6 @@ namespace DB
  *
  * All database methods, apart from tryGetTable(), are devoted only to nested table.
  * NOTE: It makes sense to allow rename method for MaterializedPostgreSQL table via database method.
- * TODO: Make sure replication-to-table data channel is done only by relation_id.
  *
  * Also main table has the same InMemoryMetadata as its nested table, so if metadata of nested table changes - main table also has
  * to update its metadata, because all read requests are passed to MaterializedPostgreSQL table and then it redirects read
@@ -57,7 +56,7 @@ namespace DB
  *
  * When there is a need to update table structure, there will be created a new MaterializedPostgreSQL table with its own nested table,
  * it will have updated table schema and all data will be loaded from scratch in the background, while previous table with outadted table
- * structure will still serve read requests. When data is loaded, nested tables will be swapped, metadata of metarialzied table will be
+ * structure will still serve read requests. When data is loaded, nested tables will be swapped, metadata of materialized table will be
  * updated according to nested table.
  *
 **/
@@ -67,9 +66,11 @@ class StorageMaterializedPostgreSQL final : public shared_ptr_helper<StorageMate
     friend struct shared_ptr_helper<StorageMaterializedPostgreSQL>;
 
 public:
-    StorageMaterializedPostgreSQL(const StorageID & table_id_, ContextPtr context_);
+    StorageMaterializedPostgreSQL(const StorageID & table_id_, ContextPtr context_,
+                                const String & postgres_database_name, const String & postgres_table_name);
 
-    StorageMaterializedPostgreSQL(StoragePtr nested_storage_, ContextPtr context_);
+    StorageMaterializedPostgreSQL(StoragePtr nested_storage_, ContextPtr context_,
+                                const String & postgres_database_name, const String & postgres_table_name);
 
     String getName() const override { return "MaterializedPostgreSQL"; }
 
@@ -123,6 +124,8 @@ public:
 
     bool supportsFinal() const override { return true; }
 
+    ASTPtr getCreateNestedTableQuery(PostgreSQLTableStructurePtr table_structure);
+
 protected:
     StorageMaterializedPostgreSQL(
         const StorageID & table_id_,
@@ -140,10 +143,10 @@ private:
 
     ASTPtr getColumnDeclaration(const DataTypePtr & data_type) const;
 
-    ASTPtr getCreateNestedTableQuery(PostgreSQLTableStructurePtr table_structure);
-
     String getNestedTableName() const;
 
+    Poco::Logger * log;
+
     /// Not nullptr only for single MaterializedPostgreSQL storage, because for MaterializedPostgreSQL
     /// database engine there is one replication handler for all tables.
     std::unique_ptr<PostgreSQLReplicationHandler> replication_handler;
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
index 2d40ddfc99d..b07fd5183c9 100644
--- a/src/Storages/ProjectionsDescription.cpp
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -27,20 +27,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 };
 
-const char * ProjectionDescription::typeToString(Type type)
-{
-    switch (type)
-    {
-        case Type::Normal:
-            return "normal";
-        case Type::Aggregate:
-            return "aggregate";
-    }
-
-    __builtin_unreachable();
-}
-
-
 bool ProjectionDescription::isPrimaryKeyColumnPossiblyWrappedInFunctions(const ASTPtr & node) const
 {
     const String column_name = node->getColumnName();
@@ -68,8 +54,6 @@ ProjectionDescription ProjectionDescription::clone() const
     other.name = name;
     other.type = type;
     other.required_columns = required_columns;
-    other.column_names = column_names;
-    other.data_types = data_types;
     other.sample_block = sample_block;
     other.sample_block_for_keys = sample_block_for_keys;
     other.metadata = metadata;
@@ -125,31 +109,16 @@ ProjectionDescription::getProjectionFromAST(const ASTPtr & definition_ast, const
     result.required_columns = select.getRequiredColumns();
     result.sample_block = select.getSampleBlock();
 
-    const auto & analysis_result = select.getAnalysisResult();
-    if (analysis_result.need_aggregate)
-    {
-        for (const auto & key : select.getQueryAnalyzer()->aggregationKeys())
-            result.sample_block_for_keys.insert({nullptr, key.type, key.name});
-    }
-
-    for (size_t i = 0; i < result.sample_block.columns(); ++i)
-    {
-        const auto & column_with_type_name = result.sample_block.getByPosition(i);
-
-        if (column_with_type_name.column && isColumnConst(*column_with_type_name.column))
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Projections cannot contain constant columns: {}", column_with_type_name.name);
-
-        result.column_names.emplace_back(column_with_type_name.name);
-        result.data_types.emplace_back(column_with_type_name.type);
-    }
-
     StorageInMemoryMetadata metadata;
-    metadata.setColumns(ColumnsDescription(result.sample_block.getNamesAndTypesList()));
-    metadata.partition_key = KeyDescription::getSortingKeyFromAST({}, metadata.columns, query_context, {});
+    metadata.partition_key = KeyDescription::buildEmptyKey();
 
     const auto & query_select = result.query_ast->as<const ASTSelectQuery &>();
     if (select.hasAggregation())
     {
+        if (query.orderBy())
+            throw Exception(
+                "When aggregation is used in projection, ORDER BY cannot be specified", ErrorCodes::ILLEGAL_PROJECTION);
+
         result.type = ProjectionDescription::Type::Aggregate;
         if (const auto & group_expression_list = query_select.groupBy())
         {
@@ -170,25 +139,37 @@ ProjectionDescription::getProjectionFromAST(const ASTPtr & definition_ast, const
                 function_node->children.push_back(function_node->arguments);
                 order_expression = function_node;
             }
-            metadata.sorting_key = KeyDescription::getSortingKeyFromAST(order_expression, metadata.columns, query_context, {});
-            metadata.primary_key = KeyDescription::getKeyFromAST(order_expression, metadata.columns, query_context);
+            auto columns_with_state = ColumnsDescription(result.sample_block.getNamesAndTypesList());
+            metadata.sorting_key = KeyDescription::getSortingKeyFromAST(order_expression, columns_with_state, query_context, {});
+            metadata.primary_key = KeyDescription::getKeyFromAST(order_expression, columns_with_state, query_context);
+            metadata.primary_key.definition_ast = nullptr;
         }
         else
         {
-            metadata.sorting_key = KeyDescription::getSortingKeyFromAST({}, metadata.columns, query_context, {});
-            metadata.primary_key = KeyDescription::getKeyFromAST({}, metadata.columns, query_context);
+            metadata.sorting_key = KeyDescription::buildEmptyKey();
+            metadata.primary_key = KeyDescription::buildEmptyKey();
         }
-        if (query.orderBy())
-            throw Exception(
-                "When aggregation is used in projection, ORDER BY cannot be specified", ErrorCodes::ILLEGAL_PROJECTION);
+        for (const auto & key : select.getQueryAnalyzer()->aggregationKeys())
+            result.sample_block_for_keys.insert({nullptr, key.type, key.name});
     }
     else
     {
         result.type = ProjectionDescription::Type::Normal;
-        metadata.sorting_key = KeyDescription::getSortingKeyFromAST(query.orderBy(), metadata.columns, query_context, {});
-        metadata.primary_key = KeyDescription::getKeyFromAST(query.orderBy(), metadata.columns, query_context);
+        metadata.sorting_key = KeyDescription::getSortingKeyFromAST(query.orderBy(), columns, query_context, {});
+        metadata.primary_key = KeyDescription::getKeyFromAST(query.orderBy(), columns, query_context);
+        metadata.primary_key.definition_ast = nullptr;
     }
-    metadata.primary_key.definition_ast = nullptr;
+
+    auto block = result.sample_block;
+    for (const auto & [name, type] : metadata.sorting_key.expression->getRequiredColumnsWithTypes())
+        block.insertUnique({nullptr, type, name});
+    for (const auto & column_with_type_name : block)
+    {
+        if (column_with_type_name.column && isColumnConst(*column_with_type_name.column))
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Projections cannot contain constant columns: {}", column_with_type_name.name);
+    }
+
+    metadata.setColumns(ColumnsDescription(block.getNamesAndTypesList()));
     result.metadata = std::make_shared<StorageInMemoryMetadata>(metadata);
     return result;
 }
@@ -217,24 +198,12 @@ ProjectionDescription::getMinMaxCountProjection(const ColumnsDescription & colum
         result.query_ast, query_context, storage, {}, SelectQueryOptions{QueryProcessingStage::WithMergeableState}.modify().ignoreAlias());
     result.required_columns = select.getRequiredColumns();
     result.sample_block = select.getSampleBlock();
-
-    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);
-    }
     result.type = ProjectionDescription::Type::Aggregate;
     StorageInMemoryMetadata metadata;
     metadata.setColumns(ColumnsDescription(result.sample_block.getNamesAndTypesList()));
-    metadata.partition_key = KeyDescription::getSortingKeyFromAST({}, metadata.columns, query_context, {});
-    metadata.sorting_key = KeyDescription::getSortingKeyFromAST({}, metadata.columns, query_context, {});
-    metadata.primary_key = KeyDescription::getKeyFromAST({}, metadata.columns, query_context);
-    metadata.primary_key.definition_ast = nullptr;
+    metadata.partition_key = KeyDescription::buildEmptyKey();
+    metadata.sorting_key = KeyDescription::buildEmptyKey();
+    metadata.primary_key = KeyDescription::buildEmptyKey();
     result.metadata = std::make_shared<StorageInMemoryMetadata>(metadata);
     result.is_minmax_count_projection = true;
     return result;
diff --git a/src/Storages/ProjectionsDescription.h b/src/Storages/ProjectionsDescription.h
index e35fbd72f22..b9c11cb0771 100644
--- a/src/Storages/ProjectionsDescription.h
+++ b/src/Storages/ProjectionsDescription.h
@@ -30,8 +30,6 @@ struct ProjectionDescription
 
     static constexpr const char * MINMAX_COUNT_PROJECTION_NAME = "_minmax_count_projection";
 
-    static const char * typeToString(Type type);
-
     /// Definition AST of projection
     ASTPtr definition_ast;
 
@@ -49,12 +47,6 @@ struct ProjectionDescription
 
     Names getRequiredColumns() const { return required_columns; }
 
-    /// Names of projection columns (not to be confused with required columns)
-    Names column_names;
-
-    /// Data types of projection columns
-    DataTypes data_types;
-
     /// Sample block with projection columns. (NOTE: columns in block are empty, but not nullptr)
     Block sample_block;
 
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
index 6c3d3a53c21..74cdbbdee37 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
@@ -3,13 +3,9 @@
 #include <Formats/FormatFactory.h>
 #include <Interpreters/Context.h>
 #include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Processors/Executors/StreamingFormatExecutor.h>
 #include <Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h>
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 namespace DB
 {
 
@@ -87,56 +83,11 @@ Block RabbitMQBlockInputStream::readImpl()
 
     finished = true;
 
-    MutableColumns result_columns = non_virtual_header.cloneEmptyColumns();
     MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
-
     auto input_format = FormatFactory::instance().getInputFormat(
             storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
 
-    InputPort port(input_format->getPort().getHeader(), input_format.get());
-    connect(input_format->getPort(), port);
-    port.setNeeded();
-
-    auto read_rabbitmq_message = [&]
-    {
-        size_t new_rows = 0;
-
-        while (true)
-        {
-            auto status = input_format->prepare();
-
-            switch (status)
-            {
-                case IProcessor::Status::Ready:
-                    input_format->work();
-                    break;
-
-                case IProcessor::Status::Finished:
-                    input_format->resetParser();
-                    return new_rows;
-
-                case IProcessor::Status::PortFull:
-                {
-                    auto chunk = port.pull();
-
-                    auto chunk_rows = chunk.getNumRows();
-                    new_rows += chunk_rows;
-
-                    auto columns = chunk.detachColumns();
-
-                    for (size_t i = 0, s = columns.size(); i < s; ++i)
-                    {
-                        result_columns[i]->insertRangeFrom(*columns[i], 0, columns[i]->size());
-                    }
-                    break;
-                }
-                case IProcessor::Status::NeedData:
-                case IProcessor::Status::Async:
-                case IProcessor::Status::ExpandPipeline:
-                    throw Exception("Source processor returned status " + IProcessor::statusToName(status), ErrorCodes::LOGICAL_ERROR);
-            }
-        }
-    };
+    StreamingFormatExecutor executor(non_virtual_header, input_format);
 
     size_t total_rows = 0;
 
@@ -145,7 +96,7 @@ Block RabbitMQBlockInputStream::readImpl()
         if (buffer->eof())
             break;
 
-        auto new_rows = read_rabbitmq_message();
+        auto new_rows = executor.execute();
 
         if (new_rows)
         {
@@ -180,7 +131,7 @@ Block RabbitMQBlockInputStream::readImpl()
     if (total_rows == 0)
         return Block();
 
-    auto result_block  = non_virtual_header.cloneWithColumns(std::move(result_columns));
+    auto result_block  = non_virtual_header.cloneWithColumns(executor.getResultColumns());
     auto virtual_block = virtual_header.cloneWithColumns(std::move(virtual_columns));
 
     for (const auto & column : virtual_block.getColumnsWithTypeAndName())
diff --git a/src/Storages/RabbitMQ/RabbitMQConnection.cpp b/src/Storages/RabbitMQ/RabbitMQConnection.cpp
new file mode 100644
index 00000000000..1fec7aec08a
--- /dev/null
+++ b/src/Storages/RabbitMQ/RabbitMQConnection.cpp
@@ -0,0 +1,125 @@
+#include "RabbitMQConnection.h"
+
+#include <common/logger_useful.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace DB
+{
+
+static const auto CONNECT_SLEEP = 200;
+static const auto RETRIES_MAX = 20;
+
+
+RabbitMQConnection::RabbitMQConnection(const RabbitMQConfiguration & configuration_, Poco::Logger * log_)
+    : configuration(configuration_)
+    , log(log_)
+    , event_handler(loop.getLoop(), log)
+{
+}
+
+String RabbitMQConnection::connectionInfoForLog() const
+{
+    return configuration.host + ':' + toString(configuration.port);
+}
+
+bool RabbitMQConnection::isConnected()
+{
+    std::lock_guard lock(mutex);
+    return isConnectedImpl();
+}
+
+bool RabbitMQConnection::connect()
+{
+    std::lock_guard lock(mutex);
+    connectImpl();
+    return isConnectedImpl();
+}
+
+bool RabbitMQConnection::reconnect()
+{
+    std::lock_guard lock(mutex);
+    if (isConnectedImpl())
+        return true;
+
+    disconnectImpl();
+
+    /// This will force immediate closure if not yet closed
+    if (!connection->closed())
+        connection->close(true);
+
+    LOG_DEBUG(log, "Trying to restore connection to {}", connectionInfoForLog());
+    connectImpl();
+
+    return isConnectedImpl();
+}
+
+ChannelPtr RabbitMQConnection::createChannel()
+{
+    std::lock_guard lock(mutex);
+    return std::make_unique<AMQP::TcpChannel>(connection.get());
+}
+
+void RabbitMQConnection::disconnect(bool immediately)
+{
+    std::lock_guard lock(mutex);
+    disconnectImpl(immediately);
+}
+
+void RabbitMQConnection::heartbeat()
+{
+    std::lock_guard lock(mutex);
+    connection->heartbeat();
+}
+
+bool RabbitMQConnection::closed()
+{
+    std::lock_guard lock(mutex);
+    return connection->closed();
+}
+
+bool RabbitMQConnection::isConnectedImpl() const
+{
+    return event_handler.connectionRunning() && connection->usable();
+}
+
+void RabbitMQConnection::connectImpl()
+{
+    if (configuration.connection_string.empty())
+    {
+        LOG_DEBUG(log, "Connecting to: {}:{} (user: {})", configuration.host, configuration.port, configuration.username);
+        AMQP::Login login(configuration.username, configuration.password);
+        AMQP::Address address(configuration.host, configuration.port, login, configuration.vhost, configuration.secure);
+        connection = std::make_unique<AMQP::TcpConnection>(&event_handler, address);
+    }
+    else
+    {
+        AMQP::Address address(configuration.connection_string);
+        connection = std::make_unique<AMQP::TcpConnection>(&event_handler, address);
+    }
+
+    auto cnt_retries = 0;
+    while (true)
+    {
+        event_handler.iterateLoop();
+
+        if (connection->ready() || cnt_retries++ == RETRIES_MAX)
+            break;
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
+    }
+}
+
+void RabbitMQConnection::disconnectImpl(bool immediately)
+{
+    connection->close(immediately);
+
+    /** Connection is not closed immediately (firstly, all pending operations are completed, and then
+     *  an AMQP closing-handshake is  performed). But cannot open a new connection until previous one is properly closed
+     */
+    size_t cnt_retries = 0;
+    while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
+        event_handler.iterateLoop();
+}
+
+}
diff --git a/src/Storages/RabbitMQ/RabbitMQConnection.h b/src/Storages/RabbitMQ/RabbitMQConnection.h
new file mode 100644
index 00000000000..acc3c48f85b
--- /dev/null
+++ b/src/Storages/RabbitMQ/RabbitMQConnection.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <Storages/RabbitMQ/UVLoop.h>
+#include <Storages/RabbitMQ/RabbitMQHandler.h>
+
+
+namespace DB
+{
+
+struct RabbitMQConfiguration
+{
+    String host;
+    UInt16 port;
+    String username;
+    String password;
+    String vhost;
+
+    bool secure;
+    String connection_string;
+};
+
+class RabbitMQConnection
+{
+public:
+    RabbitMQConnection(const RabbitMQConfiguration & configuration_, Poco::Logger * log_);
+
+    bool isConnected();
+
+    bool connect();
+
+    bool reconnect();
+
+    void disconnect(bool immediately = false);
+
+    void heartbeat();
+
+    bool closed();
+
+    ChannelPtr createChannel();
+
+    /// RabbitMQHandler is thread safe. Any public methods can be called concurrently.
+    RabbitMQHandler & getHandler() { return event_handler; }
+
+    String connectionInfoForLog() const;
+
+private:
+    bool isConnectedImpl() const;
+
+    void connectImpl();
+
+    void disconnectImpl(bool immediately = false);
+
+    RabbitMQConfiguration configuration;
+    Poco::Logger * log;
+
+    UVLoop loop;
+    RabbitMQHandler event_handler;
+
+    std::unique_ptr<AMQP::TcpConnection> connection;
+    std::mutex mutex;
+};
+
+using RabbitMQConnectionPtr = std::unique_ptr<RabbitMQConnection>;
+
+}
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.h b/src/Storages/RabbitMQ/RabbitMQHandler.h
index 78ccf56dec2..52db4a1a8f9 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.h
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.h
@@ -17,6 +17,7 @@ namespace Loop
     static const UInt8 STOP = 2;
 }
 
+using ChannelPtr = std::unique_ptr<AMQP::TcpChannel>;
 
 class RabbitMQHandler : public AMQP::LibUvHandler
 {
@@ -40,8 +41,8 @@ public:
 
     void stopLoop();
 
-    bool connectionRunning() { return connection_running.load(); }
-    bool loopRunning() { return loop_running.load(); }
+    bool connectionRunning() const { return connection_running.load(); }
+    bool loopRunning() const { return loop_running.load(); }
 
     void updateLoopState(UInt8 state) { loop_state.store(state); }
     UInt8 getLoopState() { return loop_state.load(); }
@@ -55,4 +56,6 @@ private:
     std::mutex startup_mutex;
 };
 
+using RabbitMQHandlerPtr = std::shared_ptr<RabbitMQHandler>;
+
 }
diff --git a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
index 195f7b46c37..96ea5217c56 100644
--- a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
+++ b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
@@ -16,7 +16,7 @@ namespace DB
 
 ReadBufferFromRabbitMQConsumer::ReadBufferFromRabbitMQConsumer(
         ChannelPtr consumer_channel_,
-        HandlerPtr event_handler_,
+        RabbitMQHandler & event_handler_,
         std::vector<String> & queues_,
         size_t channel_id_base_,
         const String & channel_base_,
@@ -35,8 +35,6 @@ ReadBufferFromRabbitMQConsumer::ReadBufferFromRabbitMQConsumer(
         , stopped(stopped_)
         , received(queue_size_)
 {
-    if (consumer_channel)
-        setupChannel();
 }
 
 
@@ -122,6 +120,12 @@ void ReadBufferFromRabbitMQConsumer::updateAckTracker(AckTracker record_info)
 
 void ReadBufferFromRabbitMQConsumer::setupChannel()
 {
+    if (!consumer_channel)
+        return;
+
+    /// We mark initialized only once.
+    initialized = true;
+
     wait_subscription.store(true);
 
     consumer_channel->onReady([&]()
@@ -159,7 +163,7 @@ bool ReadBufferFromRabbitMQConsumer::needChannelUpdate()
 
 void ReadBufferFromRabbitMQConsumer::iterateEventLoop()
 {
-    event_handler->iterateLoop();
+    event_handler.iterateLoop();
 }
 
 
diff --git a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
index ccc8e56db5e..4725f92d65c 100644
--- a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
+++ b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
@@ -15,16 +15,13 @@ namespace Poco
 namespace DB
 {
 
-using ChannelPtr = std::shared_ptr<AMQP::TcpChannel>;
-using HandlerPtr = std::shared_ptr<RabbitMQHandler>;
-
 class ReadBufferFromRabbitMQConsumer : public ReadBuffer
 {
 
 public:
     ReadBufferFromRabbitMQConsumer(
             ChannelPtr consumer_channel_,
-            HandlerPtr event_handler_,
+            RabbitMQHandler & event_handler_,
             std::vector<String> & queues_,
             size_t channel_id_base_,
             const String & channel_base_,
@@ -78,6 +75,12 @@ public:
     auto getMessageID() const { return current.message_id; }
     auto getTimestamp() const { return current.timestamp; }
 
+    void initialize()
+    {
+        if (!initialized)
+            setupChannel();
+    }
+
 private:
     bool nextImpl() override;
 
@@ -85,7 +88,7 @@ private:
     void iterateEventLoop();
 
     ChannelPtr consumer_channel;
-    HandlerPtr event_handler;
+    RabbitMQHandler & event_handler; /// Used concurrently, but is thread safe.
     std::vector<String> queues;
     const String channel_base;
     const size_t channel_id_base;
@@ -102,6 +105,9 @@ private:
 
     AckTracker last_inserted_record_info;
     UInt64 prev_tag = 0, channel_id_counter = 0;
+
+    /// Has initial setup after constructor been made?
+    bool initialized = false;
 };
 
 }
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index 2b37ca0763d..c0853dd0ad2 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -37,8 +37,6 @@
 namespace DB
 {
 
-static const auto CONNECT_SLEEP = 200;
-static const auto RETRIES_MAX = 20;
 static const uint32_t QUEUE_SIZE = 100000;
 static const auto MAX_FAILED_READ_ATTEMPTS = 10;
 static const auto RESCHEDULE_MS = 500;
@@ -73,41 +71,45 @@ StorageRabbitMQ::StorageRabbitMQ(
         const StorageID & table_id_,
         ContextPtr context_,
         const ColumnsDescription & columns_,
-        std::unique_ptr<RabbitMQSettings> rabbitmq_settings_)
+        std::unique_ptr<RabbitMQSettings> rabbitmq_settings_,
+        bool is_attach_)
         : IStorage(table_id_)
         , WithContext(context_->getGlobalContext())
         , rabbitmq_settings(std::move(rabbitmq_settings_))
-        , exchange_name(rabbitmq_settings->rabbitmq_exchange_name.value)
-        , format_name(rabbitmq_settings->rabbitmq_format.value)
-        , exchange_type(defineExchangeType(rabbitmq_settings->rabbitmq_exchange_type.value))
-        , routing_keys(parseSettings(rabbitmq_settings->rabbitmq_routing_key_list.value))
+        , exchange_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_name))
+        , format_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_format))
+        , exchange_type(defineExchangeType(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_type)))
+        , routing_keys(parseSettings(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_routing_key_list)))
         , row_delimiter(rabbitmq_settings->rabbitmq_row_delimiter.value)
-        , schema_name(rabbitmq_settings->rabbitmq_schema.value)
+        , schema_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_schema))
         , num_consumers(rabbitmq_settings->rabbitmq_num_consumers.value)
         , num_queues(rabbitmq_settings->rabbitmq_num_queues.value)
-        , queue_base(rabbitmq_settings->rabbitmq_queue_base.value)
-        , queue_settings_list(parseSettings(rabbitmq_settings->rabbitmq_queue_settings_list.value))
+        , queue_base(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_queue_base))
+        , queue_settings_list(parseSettings(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_queue_settings_list)))
         , persistent(rabbitmq_settings->rabbitmq_persistent.value)
         , use_user_setup(rabbitmq_settings->rabbitmq_queue_consume.value)
         , hash_exchange(num_consumers > 1 || num_queues > 1)
         , log(&Poco::Logger::get("StorageRabbitMQ (" + table_id_.table_name + ")"))
-        , address(rabbitmq_settings->rabbitmq_host_port.value)
-        , parsed_address(parseAddress(address, 5672))
-        , login_password(std::make_pair(
-                    getContext()->getConfigRef().getString("rabbitmq.username"),
-                    getContext()->getConfigRef().getString("rabbitmq.password")))
-        , vhost(getContext()->getConfigRef().getString("rabbitmq.vhost", rabbitmq_settings->rabbitmq_vhost.value))
-        , connection_string(rabbitmq_settings->rabbitmq_address)
-        , secure(rabbitmq_settings->rabbitmq_secure.value)
         , semaphore(0, num_consumers)
         , unique_strbase(getRandomName())
         , queue_size(std::max(QUEUE_SIZE, static_cast<uint32_t>(getMaxBlockSize())))
         , milliseconds_to_wait(RESCHEDULE_MS)
+        , is_attach(is_attach_)
 {
-    event_handler = std::make_shared<RabbitMQHandler>(loop.getLoop(), log);
-    if (secure)
+    auto parsed_address = parseAddress(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_host_port), 5672);
+    configuration =
+    {
+        .host = parsed_address.first,
+        .port = parsed_address.second,
+        .username = getContext()->getConfigRef().getString("rabbitmq.username"),
+        .password = getContext()->getConfigRef().getString("rabbitmq.password"),
+        .vhost = getContext()->getConfigRef().getString("rabbitmq.vhost", getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_vhost)),
+        .secure = rabbitmq_settings->rabbitmq_secure.value,
+        .connection_string = getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_address)
+    };
+
+    if (configuration.secure)
         SSL_library_init();
-    restoreConnection(false);
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -116,17 +118,6 @@ StorageRabbitMQ::StorageRabbitMQ(
     rabbitmq_context = addSettings(getContext());
     rabbitmq_context->makeQueryContext();
 
-    /// One looping task for all consumers as they share the same connection == the same handler == the same event loop
-    event_handler->updateLoopState(Loop::STOP);
-    looping_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQLoopingTask", [this]{ loopingFunc(); });
-    looping_task->deactivate();
-
-    streaming_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
-    streaming_task->deactivate();
-
-    connection_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
-    connection_task->deactivate();
-
     if (queue_base.empty())
     {
         /* Make sure that local exchange name is unique for each table and is not the same as client's exchange name. It also needs to
@@ -151,6 +142,31 @@ StorageRabbitMQ::StorageRabbitMQ(
     }
 
     bridge_exchange = sharding_exchange + "_bridge";
+
+    try
+    {
+        connection = std::make_unique<RabbitMQConnection>(configuration, log);
+        if (connection->connect())
+            initRabbitMQ();
+        else if (!is_attach)
+            throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "Cannot connect to {}", connection->connectionInfoForLog());
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        if (!is_attach)
+            throw;
+    }
+
+    /// One looping task for all consumers as they share the same connection == the same handler == the same event loop
+    looping_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQLoopingTask", [this]{ loopingFunc(); });
+    looping_task->deactivate();
+
+    streaming_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
+    streaming_task->deactivate();
+
+    connection_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
+    connection_task->deactivate();
 }
 
 
@@ -197,7 +213,7 @@ String StorageRabbitMQ::getTableBasedName(String name, const StorageID & table_i
 }
 
 
-std::shared_ptr<Context> StorageRabbitMQ::addSettings(ContextPtr local_context) const
+ContextMutablePtr StorageRabbitMQ::addSettings(ContextPtr local_context) const
 {
     auto modified_context = Context::createCopy(local_context);
     modified_context->setSetting("input_format_skip_unknown_fields", true);
@@ -222,14 +238,19 @@ std::shared_ptr<Context> StorageRabbitMQ::addSettings(ContextPtr local_context)
 
 void StorageRabbitMQ::loopingFunc()
 {
-    if (event_handler->connectionRunning())
-        event_handler->startLoop();
+    if (!rabbit_is_ready)
+        return;
+    if (connection->isConnected())
+        connection->getHandler().startLoop();
 }
 
 
 void StorageRabbitMQ::connectionFunc()
 {
-    if (restoreConnection(true))
+    if (rabbit_is_ready)
+        return;
+
+    if (connection->reconnect())
         initRabbitMQ();
     else
         connection_task->scheduleAfter(RESCHEDULE_MS);
@@ -242,7 +263,9 @@ void StorageRabbitMQ::connectionFunc()
 void StorageRabbitMQ::deactivateTask(BackgroundSchedulePool::TaskHolder & task, bool wait, bool stop_loop)
 {
     if (stop_loop)
-        event_handler->updateLoopState(Loop::STOP);
+    {
+        connection->getHandler().updateLoopState(Loop::STOP);
+    }
 
     std::unique_lock<std::mutex> lock(task_mutex, std::defer_lock);
     if (lock.try_lock())
@@ -268,7 +291,7 @@ size_t StorageRabbitMQ::getMaxBlockSize() const
 
 void StorageRabbitMQ::initRabbitMQ()
 {
-    if (stream_cancelled)
+    if (stream_cancelled || rabbit_is_ready)
         return;
 
     if (use_user_setup)
@@ -278,19 +301,28 @@ void StorageRabbitMQ::initRabbitMQ()
         return;
     }
 
-    AMQP::TcpChannel rabbit_channel(connection.get());
+    try
+    {
+        auto rabbit_channel = connection->createChannel();
 
-    /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
+        /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
 
-    initExchange(rabbit_channel);
-    bindExchange(rabbit_channel);
+        initExchange(*rabbit_channel);
+        bindExchange(*rabbit_channel);
 
-    for (const auto i : collections::range(0, num_queues))
-        bindQueue(i + 1, rabbit_channel);
+        for (const auto i : collections::range(0, num_queues))
+            bindQueue(i + 1, *rabbit_channel);
 
-    LOG_TRACE(log, "RabbitMQ setup completed");
-    rabbit_is_ready = true;
-    rabbit_channel.close();
+        LOG_TRACE(log, "RabbitMQ setup completed");
+        rabbit_is_ready = true;
+        rabbit_channel->close();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        if (!is_attach)
+            throw;
+    }
 }
 
 
@@ -380,7 +412,7 @@ void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
         }
 
         rabbit_channel.bindExchange(exchange_name, bridge_exchange, routing_keys[0], bind_headers)
-        .onSuccess([&]() { event_handler->stopLoop(); })
+        .onSuccess([&]() { connection->getHandler().stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -392,7 +424,7 @@ void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
     else if (exchange_type == AMQP::ExchangeType::fanout || exchange_type == AMQP::ExchangeType::consistent_hash)
     {
         rabbit_channel.bindExchange(exchange_name, bridge_exchange, routing_keys[0])
-        .onSuccess([&]() { event_handler->stopLoop(); })
+        .onSuccess([&]() { connection->getHandler().stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -410,7 +442,7 @@ void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
             {
                 ++bound_keys;
                 if (bound_keys == routing_keys.size())
-                    event_handler->stopLoop();
+                    connection->getHandler().stopLoop();
             })
             .onError([&](const char * message)
             {
@@ -422,7 +454,7 @@ void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
         }
     }
 
-    event_handler->startBlockingLoop();
+    connection->getHandler().startBlockingLoop();
 }
 
 
@@ -441,7 +473,7 @@ void StorageRabbitMQ::bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_chann
         * fanout exchange it can be arbitrary
         */
         rabbit_channel.bindQueue(consumer_exchange, queue_name, std::to_string(queue_id))
-        .onSuccess([&] { event_handler->stopLoop(); })
+        .onSuccess([&] { connection->getHandler().stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -507,57 +539,22 @@ void StorageRabbitMQ::bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_chann
     /// AMQP::autodelete setting is not allowed, because in case of server restart there will be no consumers
     /// and deleting queues should not take place.
     rabbit_channel.declareQueue(queue_name, AMQP::durable, queue_settings).onSuccess(success_callback).onError(error_callback);
-    event_handler->startBlockingLoop();
-}
-
-
-bool StorageRabbitMQ::restoreConnection(bool reconnecting)
-{
-    size_t cnt_retries = 0;
-
-    if (reconnecting)
-    {
-        connection->close(); /// Connection might be unusable, but not closed
-
-        /* Connection is not closed immediately (firstly, all pending operations are completed, and then
-         * an AMQP closing-handshake is  performed). But cannot open a new connection until previous one is properly closed
-         */
-        while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
-            event_handler->iterateLoop();
-
-        /// This will force immediate closure if not yet closed
-        if (!connection->closed())
-            connection->close(true);
-
-        LOG_TRACE(log, "Trying to restore connection to " + address);
-    }
-
-    auto amqp_address = connection_string.empty() ? AMQP::Address(parsed_address.first, parsed_address.second,
-                                                    AMQP::Login(login_password.first, login_password.second), vhost, secure)
-                                                  : AMQP::Address(connection_string);
-    connection = std::make_unique<AMQP::TcpConnection>(event_handler.get(), amqp_address);
-
-    cnt_retries = 0;
-    while (!connection->ready() && !stream_cancelled && cnt_retries++ != RETRIES_MAX)
-    {
-        event_handler->iterateLoop();
-        std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
-    }
-
-    return event_handler->connectionRunning();
+    connection->getHandler().startBlockingLoop();
 }
 
 
 bool StorageRabbitMQ::updateChannel(ChannelPtr & channel)
 {
-    if (event_handler->connectionRunning())
+    try
     {
-        channel = std::make_shared<AMQP::TcpChannel>(connection.get());
-        return true;
+        channel = connection->createChannel();
+        return channel->usable();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        return false;
     }
-
-    channel = nullptr;
-    return false;
 }
 
 
@@ -576,11 +573,11 @@ void StorageRabbitMQ::unbindExchange()
     std::call_once(flag, [&]()
     {
         streaming_task->deactivate();
-        event_handler->updateLoopState(Loop::STOP);
+        connection->getHandler().updateLoopState(Loop::STOP);
         looping_task->deactivate();
 
-        AMQP::TcpChannel rabbit_channel(connection.get());
-        rabbit_channel.removeExchange(bridge_exchange)
+        auto rabbit_channel = connection->createChannel();
+        rabbit_channel->removeExchange(bridge_exchange)
         .onSuccess([&]()
         {
             exchange_removed.store(true);
@@ -592,9 +589,9 @@ void StorageRabbitMQ::unbindExchange()
 
         while (!exchange_removed.load())
         {
-            event_handler->iterateLoop();
+            connection->getHandler().iterateLoop();
         }
-        rabbit_channel.close();
+        rabbit_channel->close();
     });
 }
 
@@ -618,13 +615,16 @@ Pipe StorageRabbitMQ::read(
     auto modified_context = addSettings(local_context);
     auto block_size = getMaxBlockSize();
 
-    if (!event_handler->connectionRunning())
+    if (!connection->isConnected())
     {
-        if (event_handler->loopRunning())
+        if (connection->getHandler().loopRunning())
             deactivateTask(looping_task, false, true);
-        restoreConnection(true);
+        if (!connection->reconnect())
+            throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "No connection to {}", connection->connectionInfoForLog());
     }
 
+    initializeBuffers();
+
     Pipes pipes;
     pipes.reserve(num_created_consumers);
 
@@ -638,7 +638,7 @@ Pipe StorageRabbitMQ::read(
         pipes.emplace_back(std::make_shared<SourceFromInputStream>(converting_stream));
     }
 
-    if (!event_handler->loopRunning() && event_handler->connectionRunning())
+    if (!connection->getHandler().loopRunning() && connection->isConnected())
         looping_task->activateAndSchedule();
 
     LOG_DEBUG(log, "Starting reading {} streams", pipes.size());
@@ -656,16 +656,35 @@ SinkToStoragePtr StorageRabbitMQ::write(const ASTPtr &, const StorageMetadataPtr
 
 void StorageRabbitMQ::startup()
 {
-    if (event_handler->connectionRunning())
-        initRabbitMQ();
-    else
-        connection_task->activateAndSchedule();
+    if (!rabbit_is_ready)
+    {
+        if (connection->isConnected())
+        {
+            try
+            {
+                initRabbitMQ();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(log);
+                if (!is_attach)
+                    throw;
+            }
+        }
+        else
+        {
+            connection_task->activateAndSchedule();
+        }
+    }
 
     for (size_t i = 0; i < num_consumers; ++i)
     {
         try
         {
-            pushReadBuffer(createReadBuffer());
+            auto buffer = createReadBuffer();
+            if (rabbit_is_ready)
+                buffer->initialize();
+            pushReadBuffer(std::move(buffer));
             ++num_created_consumers;
         }
         catch (const AMQP::Exception & e)
@@ -675,7 +694,7 @@ void StorageRabbitMQ::startup()
         }
     }
 
-    event_handler->updateLoopState(Loop::RUN);
+    connection->getHandler().updateLoopState(Loop::RUN);
     streaming_task->activateAndSchedule();
 }
 
@@ -693,25 +712,28 @@ void StorageRabbitMQ::shutdown()
     deactivateTask(streaming_task, true, false);
     deactivateTask(looping_task, true, true);
 
-    if (drop_table)
+    /// Just a paranoid try catch, it is not actually needed.
+    try
     {
-        for (auto & buffer : buffers)
-            buffer->closeChannel();
-        cleanupRabbitMQ();
+        if (drop_table)
+        {
+            for (auto & buffer : buffers)
+                buffer->closeChannel();
+
+            cleanupRabbitMQ();
+        }
+
+        /// It is important to close connection here - before removing consumer buffers, because
+        /// it will finish and clean callbacks, which might use those buffers data.
+        connection->disconnect();
+
+        for (size_t i = 0; i < num_created_consumers; ++i)
+            popReadBuffer();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
     }
-
-    /// It is important to close connection here - before removing consumer buffers, because
-    /// it will finish and clean callbacks, which might use those buffers data.
-    connection->close();
-
-    /// Connection is not closed immediately - it requires the loop to shutdown it properly and to
-    /// finish all callbacks.
-    size_t cnt_retries = 0;
-    while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
-        event_handler->iterateLoop();
-
-    for (size_t i = 0; i < num_created_consumers; ++i)
-        popReadBuffer();
 }
 
 
@@ -722,7 +744,8 @@ void StorageRabbitMQ::cleanupRabbitMQ() const
     if (use_user_setup)
         return;
 
-    if (!event_handler->connectionRunning())
+    connection->heartbeat();
+    if (!connection->isConnected())
     {
         String queue_names;
         for (const auto & queue : queues)
@@ -738,27 +761,27 @@ void StorageRabbitMQ::cleanupRabbitMQ() const
         return;
     }
 
-    AMQP::TcpChannel rabbit_channel(connection.get());
+    auto rabbit_channel = connection->createChannel();
     for (const auto & queue : queues)
     {
         /// AMQP::ifunused is needed, because it is possible to share queues between multiple tables and dropping
         /// on of them should not affect others.
         /// AMQP::ifempty is not used on purpose.
 
-        rabbit_channel.removeQueue(queue, AMQP::ifunused)
+        rabbit_channel->removeQueue(queue, AMQP::ifunused)
         .onSuccess([&](uint32_t num_messages)
         {
             LOG_TRACE(log, "Successfully deleted queue {}, messages contained {}", queue, num_messages);
-            event_handler->stopLoop();
+            connection->getHandler().stopLoop();
         })
         .onError([&](const char * message)
         {
             LOG_ERROR(log, "Failed to delete queue {}. Error message: {}", queue, message);
-            event_handler->stopLoop();
+            connection->getHandler().stopLoop();
         });
     }
-    event_handler->startBlockingLoop();
-    rabbit_channel.close();
+    connection->getHandler().startBlockingLoop();
+    rabbit_channel->close();
 
     /// Also there is no need to cleanup exchanges as they were created with AMQP::autodelete option. Once queues
     /// are removed, exchanges will also be cleaned.
@@ -801,12 +824,9 @@ ConsumerBufferPtr StorageRabbitMQ::popReadBuffer(std::chrono::milliseconds timeo
 
 ConsumerBufferPtr StorageRabbitMQ::createReadBuffer()
 {
-    ChannelPtr consumer_channel;
-    if (event_handler->connectionRunning())
-        consumer_channel = std::make_shared<AMQP::TcpChannel>(connection.get());
-
+    ChannelPtr consumer_channel = connection->createChannel();
     return std::make_shared<ReadBufferFromRabbitMQConsumer>(
-        consumer_channel, event_handler, queues, ++consumer_id,
+        std::move(consumer_channel), connection->getHandler(), queues, ++consumer_id,
         unique_strbase, log, row_delimiter, queue_size, stream_cancelled);
 }
 
@@ -814,7 +834,7 @@ ConsumerBufferPtr StorageRabbitMQ::createReadBuffer()
 ProducerBufferPtr StorageRabbitMQ::createWriteBuffer()
 {
     return std::make_shared<WriteBufferToRabbitMQProducer>(
-        parsed_address, getContext(), login_password, vhost, routing_keys, exchange_name, exchange_type,
+        configuration, getContext(), routing_keys, exchange_name, exchange_type,
         producer_id.fetch_add(1), persistent, wait_confirm, log,
         row_delimiter ? std::optional<char>{row_delimiter} : std::nullopt, 1, 1024);
 }
@@ -848,10 +868,24 @@ bool StorageRabbitMQ::checkDependencies(const StorageID & table_id)
 }
 
 
+void StorageRabbitMQ::initializeBuffers()
+{
+    assert(rabbit_is_ready);
+    if (!initialized)
+    {
+        for (const auto & buffer : buffers)
+            buffer->initialize();
+        initialized = true;
+    }
+}
+
+
 void StorageRabbitMQ::streamingToViewsFunc()
 {
-    if (rabbit_is_ready && (event_handler->connectionRunning() || restoreConnection(true)))
+    if (rabbit_is_ready && (connection->isConnected() || connection->reconnect()))
     {
+        initializeBuffers();
+
         try
         {
             auto table_id = getStorageID();
@@ -876,7 +910,7 @@ void StorageRabbitMQ::streamingToViewsFunc()
                         /// Reschedule with backoff.
                         if (milliseconds_to_wait < BACKOFF_TRESHOLD)
                             milliseconds_to_wait *= 2;
-                        event_handler->updateLoopState(Loop::STOP);
+                        connection->getHandler().updateLoopState(Loop::STOP);
                         break;
                     }
                     else
@@ -888,7 +922,7 @@ void StorageRabbitMQ::streamingToViewsFunc()
                     auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time);
                     if (duration.count() > MAX_THREAD_WORK_DURATION_MS)
                     {
-                        event_handler->updateLoopState(Loop::STOP);
+                        connection->getHandler().updateLoopState(Loop::STOP);
                         LOG_TRACE(log, "Reschedule streaming. Thread work duration limit exceeded.");
                         break;
                     }
@@ -958,9 +992,9 @@ bool StorageRabbitMQ::streamToViews()
 
     std::atomic<bool> stub = {false};
 
-    if (!event_handler->loopRunning())
+    if (!connection->getHandler().loopRunning())
     {
-        event_handler->updateLoopState(Loop::RUN);
+        connection->getHandler().updateLoopState(Loop::RUN);
         looping_task->activateAndSchedule();
     }
 
@@ -972,13 +1006,14 @@ bool StorageRabbitMQ::streamToViews()
     deactivateTask(looping_task, false, true);
     size_t queue_empty = 0;
 
-    if (!event_handler->connectionRunning())
+    if (!connection->isConnected())
     {
         if (stream_cancelled)
             return true;
 
-        if (restoreConnection(true))
+        if (connection->reconnect())
         {
+            LOG_DEBUG(log, "Connection restored, updating channels");
             for (auto & stream : streams)
                 stream->as<RabbitMQBlockInputStream>()->updateChannel();
         }
@@ -1007,7 +1042,10 @@ bool StorageRabbitMQ::streamToViews()
                     buffer->updateAckTracker();
 
                     if (updateChannel(buffer->getChannel()))
+                    {
+                        LOG_TRACE(log, "Connection is active, but channel update is needed");
                         buffer->setupChannel();
+                    }
                 }
             }
 
@@ -1026,12 +1064,12 @@ bool StorageRabbitMQ::streamToViews()
             if (!stream->as<RabbitMQBlockInputStream>()->sendAck())
             {
                 /// Iterate loop to activate error callbacks if they happened
-                event_handler->iterateLoop();
-                if (!event_handler->connectionRunning())
+                connection->getHandler().iterateLoop();
+                if (!connection->isConnected())
                     break;
             }
 
-            event_handler->iterateLoop();
+            connection->getHandler().iterateLoop();
         }
     }
 
@@ -1044,7 +1082,7 @@ bool StorageRabbitMQ::streamToViews()
     }
     else
     {
-        event_handler->updateLoopState(Loop::RUN);
+        connection->getHandler().updateLoopState(Loop::RUN);
         looping_task->activateAndSchedule();
     }
 
@@ -1072,7 +1110,7 @@ void registerStorageRabbitMQ(StorageFactory & factory)
         if (!rabbitmq_settings->rabbitmq_format.changed)
             throw Exception("You must specify `rabbitmq_format` setting", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        return StorageRabbitMQ::create(args.table_id, args.getContext(), args.columns, std::move(rabbitmq_settings));
+        return StorageRabbitMQ::create(args.table_id, args.getContext(), args.columns, std::move(rabbitmq_settings), args.attach);
     };
 
     factory.registerStorage("RabbitMQ", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index 48a907cab2c..64a78b235e3 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -7,9 +7,8 @@
 #include <mutex>
 #include <atomic>
 #include <Storages/RabbitMQ/Buffer_fwd.h>
-#include <Storages/RabbitMQ/RabbitMQHandler.h>
 #include <Storages/RabbitMQ/RabbitMQSettings.h>
-#include <Storages/RabbitMQ/UVLoop.h>
+#include <Storages/RabbitMQ/RabbitMQConnection.h>
 #include <Common/thread_local_rng.h>
 #include <amqpcpp/libuv.h>
 #include <uv.h>
@@ -19,8 +18,6 @@
 namespace DB
 {
 
-using ChannelPtr = std::shared_ptr<AMQP::TcpChannel>;
-
 class StorageRabbitMQ final: public shared_ptr_helper<StorageRabbitMQ>, public IStorage, WithContext
 {
     friend struct shared_ptr_helper<StorageRabbitMQ>;
@@ -76,7 +73,8 @@ protected:
             const StorageID & table_id_,
             ContextPtr context_,
             const ColumnsDescription & columns_,
-            std::unique_ptr<RabbitMQSettings> rabbitmq_settings_);
+            std::unique_ptr<RabbitMQSettings> rabbitmq_settings_,
+            bool is_attach_);
 
 private:
     ContextMutablePtr rabbitmq_context;
@@ -103,16 +101,9 @@ private:
 
     bool hash_exchange;
     Poco::Logger * log;
-    String address;
-    std::pair<String, UInt16> parsed_address;
-    std::pair<String, String> login_password;
-    String vhost;
-    String connection_string;
-    bool secure;
 
-    UVLoop loop;
-    std::shared_ptr<RabbitMQHandler> event_handler;
-    std::unique_ptr<AMQP::TcpConnection> connection; /// Connection for all consumers
+    RabbitMQConnectionPtr connection; /// Connection for all consumers
+    RabbitMQConfiguration configuration;
 
     size_t num_created_consumers = 0;
     Poco::Semaphore semaphore;
@@ -143,8 +134,11 @@ private:
     std::atomic<bool> stream_cancelled{false};
     size_t read_attempts = 0;
     mutable bool drop_table = false;
+    bool is_attach;
 
     ConsumerBufferPtr createReadBuffer();
+    void initializeBuffers();
+    bool initialized = false;
 
     /// Functions working in the background
     void streamingToViewsFunc();
@@ -155,7 +149,7 @@ private:
     static AMQP::ExchangeType defineExchangeType(String exchange_type_);
     static String getTableBasedName(String name, const StorageID & table_id);
 
-    std::shared_ptr<Context> addSettings(ContextPtr context) const;
+    ContextMutablePtr addSettings(ContextPtr context) const;
     size_t getMaxBlockSize() const;
     void deactivateTask(BackgroundSchedulePool::TaskHolder & task, bool wait, bool stop_loop);
 
@@ -166,11 +160,10 @@ private:
     void bindExchange(AMQP::TcpChannel & rabbit_channel);
     void bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_channel);
 
-    bool restoreConnection(bool reconnecting);
     bool streamToViews();
     bool checkDependencies(const StorageID & table_id);
 
-    String getRandomName() const
+    static String getRandomName()
     {
         std::uniform_int_distribution<int> distribution('a', 'z');
         String random_str(32, ' ');
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
index be7f1fe508a..65dd1a6ab72 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
@@ -15,8 +15,6 @@
 namespace DB
 {
 
-static const auto CONNECT_SLEEP = 200;
-static const auto RETRIES_MAX = 20;
 static const auto BATCH = 1000;
 static const auto RETURNED_LIMIT = 50000;
 
@@ -26,10 +24,8 @@ namespace ErrorCodes
 }
 
 WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
-        std::pair<String, UInt16> & parsed_address_,
+        const RabbitMQConfiguration & configuration_,
         ContextPtr global_context,
-        const std::pair<String, String> & login_password_,
-        const String & vhost_,
         const Names & routing_keys_,
         const String & exchange_name_,
         const AMQP::ExchangeType exchange_type_,
@@ -41,9 +37,7 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
         size_t rows_per_message,
         size_t chunk_size_)
         : WriteBuffer(nullptr, 0)
-        , parsed_address(parsed_address_)
-        , login_password(login_password_)
-        , vhost(vhost_)
+        , connection(configuration_, log_)
         , routing_keys(routing_keys_)
         , exchange_name(exchange_name_)
         , exchange_type(exchange_type_)
@@ -57,20 +51,10 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
         , max_rows(rows_per_message)
         , chunk_size(chunk_size_)
 {
-    event_handler = std::make_unique<RabbitMQHandler>(loop.getLoop(), log);
-
-    if (setupConnection(false))
-    {
+    if (connection.connect())
         setupChannel();
-    }
     else
-    {
-        if (!connection->closed())
-             connection->close(true);
-
-        throw Exception("Cannot connect to RabbitMQ host: " + parsed_address.first + ", port: " + std::to_string(parsed_address.second),
-                ErrorCodes::CANNOT_CONNECT_RABBITMQ);
-    }
+        throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "Cannot connect to RabbitMQ {}", connection.connectionInfoForLog());
 
     writing_task = global_context->getSchedulePool().createTask("RabbitMQWritingTask", [this]{ writingFunc(); });
     writing_task->deactivate();
@@ -92,15 +76,7 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
 WriteBufferToRabbitMQProducer::~WriteBufferToRabbitMQProducer()
 {
     writing_task->deactivate();
-    connection->close();
-
-    size_t cnt_retries = 0;
-    while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
-    {
-        event_handler->iterateLoop();
-        std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
-    }
-
+    connection.disconnect();
     assert(rows == 0);
 }
 
@@ -131,42 +107,9 @@ void WriteBufferToRabbitMQProducer::countRow()
 }
 
 
-bool WriteBufferToRabbitMQProducer::setupConnection(bool reconnecting)
-{
-    size_t cnt_retries = 0;
-
-    if (reconnecting)
-    {
-        connection->close();
-
-        while (!connection->closed() && ++cnt_retries != RETRIES_MAX)
-            event_handler->iterateLoop();
-
-        if (!connection->closed())
-            connection->close(true);
-
-        LOG_TRACE(log, "Trying to set up connection");
-    }
-
-    connection = std::make_unique<AMQP::TcpConnection>(event_handler.get(),
-            AMQP::Address(
-                parsed_address.first, parsed_address.second,
-                AMQP::Login(login_password.first, login_password.second), vhost));
-
-    cnt_retries = 0;
-    while (!connection->ready() && ++cnt_retries != RETRIES_MAX)
-    {
-        event_handler->iterateLoop();
-        std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
-    }
-
-    return event_handler->connectionRunning();
-}
-
-
 void WriteBufferToRabbitMQProducer::setupChannel()
 {
-    producer_channel = std::make_unique<AMQP::TcpChannel>(connection.get());
+    producer_channel = connection.createChannel();
 
     producer_channel->onError([&](const char * message)
     {
@@ -322,8 +265,11 @@ void WriteBufferToRabbitMQProducer::writingFunc()
 
         if (wait_num.load() && delivery_record.empty() && payloads.empty() && returned.empty())
             wait_all = false;
-        else if ((!producer_channel->usable() && event_handler->connectionRunning()) || (!event_handler->connectionRunning() && setupConnection(true)))
-            setupChannel();
+        else if (!producer_channel->usable())
+        {
+            if (connection.reconnect())
+                setupChannel();
+        }
     }
 
     LOG_DEBUG(log, "Producer on channel {} completed", channel_id);
@@ -355,7 +301,7 @@ void WriteBufferToRabbitMQProducer::reinitializeChunks()
 
 void WriteBufferToRabbitMQProducer::iterateEventLoop()
 {
-    event_handler->iterateLoop();
+    connection.getHandler().iterateLoop();
 }
 
 }
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
index 452cc38d751..8ed1ea643f3 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
@@ -6,8 +6,7 @@
 #include <mutex>
 #include <atomic>
 #include <amqpcpp.h>
-#include <Storages/RabbitMQ/RabbitMQHandler.h>
-#include <Storages/RabbitMQ/UVLoop.h>
+#include <Storages/RabbitMQ/RabbitMQConnection.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/Names.h>
@@ -19,14 +18,12 @@ class WriteBufferToRabbitMQProducer : public WriteBuffer
 {
 public:
     WriteBufferToRabbitMQProducer(
-            std::pair<String, UInt16> & parsed_address_,
+            const RabbitMQConfiguration & configuration_,
             ContextPtr global_context,
-            const std::pair<String, String> & login_password_,
-            const String & vhost_,
             const Names & routing_keys_,
             const String & exchange_name_,
             const AMQP::ExchangeType exchange_type_,
-            const size_t channel_id_,
+            const size_t channel_id_base_,
             const bool persistent_,
             std::atomic<bool> & wait_confirm_,
             Poco::Logger * log_,
@@ -48,14 +45,12 @@ private:
 
     void iterateEventLoop();
     void writingFunc();
-    bool setupConnection(bool reconnecting);
     void setupChannel();
     void removeRecord(UInt64 received_delivery_tag, bool multiple, bool republish);
     void publish(ConcurrentBoundedQueue<std::pair<UInt64, String>> & message, bool republishing);
 
-    std::pair<String, UInt16> parsed_address;
-    const std::pair<String, String> login_password;
-    const String vhost;
+    RabbitMQConnection connection;
+
     const Names routing_keys;
     const String exchange_name;
     AMQP::ExchangeType exchange_type;
@@ -70,9 +65,6 @@ private:
     AMQP::Table key_arguments;
     BackgroundSchedulePool::TaskHolder writing_task;
 
-    UVLoop loop;
-    std::unique_ptr<RabbitMQHandler> event_handler;
-    std::unique_ptr<AMQP::TcpConnection> connection;
     std::unique_ptr<AMQP::TcpChannel> producer_channel;
     bool producer_ready = false;
 
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index e9136bb5d05..d7844c28def 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -161,13 +161,7 @@ protected:
         columns.reserve(column_names_and_types.size());
 
         for (const auto & elem : column_names_and_types)
-        {
-            const auto & current_column = buffer.data.getByName(elem.getNameInStorage()).column;
-            if (elem.isSubcolumn())
-                columns.emplace_back(elem.getTypeInStorage()->getSubcolumn(elem.getSubcolumnName(), *current_column));
-            else
-                columns.emplace_back(std::move(current_column));
-        }
+            columns.emplace_back(getColumnFromBlock(buffer.data, elem));
 
         UInt64 size = columns.at(0)->size();
         res.setColumns(std::move(columns), size);
@@ -1021,11 +1015,13 @@ void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, Context
     auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
diff --git a/src/Storages/StorageDictionary.cpp b/src/Storages/StorageDictionary.cpp
index c8bbb703999..c8bc215dd6c 100644
--- a/src/Storages/StorageDictionary.cpp
+++ b/src/Storages/StorageDictionary.cpp
@@ -193,10 +193,6 @@ void StorageDictionary::startup()
 
 void StorageDictionary::removeDictionaryConfigurationFromRepository()
 {
-    if (remove_repository_callback_executed)
-        return;
-
-    remove_repository_callback_executed = true;
     remove_repository_callback.reset();
 }
 
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index d074dec2c34..c7693bdae9a 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -73,7 +73,6 @@ private:
     Poco::Timestamp update_time;
     LoadablesConfigurationPtr configuration;
 
-    std::atomic<bool> remove_repository_callback_executed = false;
     scope_guard remove_repository_callback;
 
     void removeDictionaryConfigurationFromRepository();
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index df7d568deb9..c8df0e89e29 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -785,8 +785,9 @@ void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, Co
             && command.type != AlterCommand::Type::COMMENT_COLUMN
             && command.type != AlterCommand::Type::RENAME_COLUMN)
 
-            throw Exception("Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
@@ -1332,7 +1333,12 @@ void registerStorageDistributed(StorageFactory & factory)
         String remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
 
         const auto & sharding_key = engine_args.size() >= 4 ? engine_args[3] : nullptr;
-        const auto & storage_policy = engine_args.size() >= 5 ? engine_args[4]->as<ASTLiteral &>().value.safeGet<String>() : "default";
+        String storage_policy = "default";
+        if (engine_args.size() >= 5)
+        {
+            engine_args[4] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[4], local_context);
+            storage_policy = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+        }
 
         /// Check that sharding_key exists in the table and has numeric type.
         if (sharding_key)
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index 4b0aaf6caea..56b410a3ea4 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -56,7 +56,7 @@ StorageExecutable::StorageExecutable(
     const std::vector<String> & arguments_,
     const String & format_,
     const std::vector<ASTPtr> & input_queries_,
-    const ExecutablePoolSettings & pool_settings_,
+    const ExecutableSettings & settings_,
     const ColumnsDescription & columns,
     const ConstraintsDescription & constraints)
     : IStorage(table_id_)
@@ -64,9 +64,9 @@ StorageExecutable::StorageExecutable(
     , arguments(arguments_)
     , format(format_)
     , input_queries(input_queries_)
-    , pool_settings(pool_settings_)
+    , settings(settings_)
     /// If pool size == 0 then there is no size restrictions. Poco max size of semaphore is integer type.
-    , process_pool(std::make_shared<ProcessPool>(pool_settings.pool_size == 0 ? std::numeric_limits<int>::max() : pool_settings.pool_size))
+    , process_pool(std::make_shared<ProcessPool>(settings.pool_size == 0 ? std::numeric_limits<int>::max() : settings.pool_size))
     , log(&Poco::Logger::get("StorageExecutablePool"))
 {
     StorageInMemoryMetadata storage_metadata;
@@ -114,15 +114,15 @@ Pipe StorageExecutable::read(
     {
         bool result = process_pool->tryBorrowObject(process, [&config, this]()
         {
-            config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, pool_settings.command_termination_timeout };
+            config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, settings.command_termination_timeout };
             auto shell_command = ShellCommand::execute(config);
             return shell_command;
-        }, pool_settings.max_command_execution_time * 10000);
+        }, settings.max_command_execution_time * 1000);
 
         if (!result)
             throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
                 "Could not get process from pool, max command execution timeout exceeded {} seconds",
-                pool_settings.max_command_execution_time);
+                settings.max_command_execution_time);
     }
     else
     {
@@ -137,6 +137,8 @@ Pipe StorageExecutable::read(
         BlockInputStreamPtr input_stream = inputs[i];
         WriteBufferFromFile * write_buffer = nullptr;
 
+        bool send_chunk_header = settings.send_chunk_header;
+
         if (i == 0)
         {
             write_buffer = &process->in;
@@ -151,14 +153,22 @@ Pipe StorageExecutable::read(
             write_buffer = &it->second;
         }
 
-        ShellCommandSource::SendDataTask task = [input_stream, write_buffer, context, is_executable_pool, this]()
+        ShellCommandSource::SendDataTask task = [input_stream, write_buffer, context, is_executable_pool, send_chunk_header, this]()
         {
             auto output_stream = context->getOutputStream(format, *write_buffer, input_stream->getHeader().cloneEmpty());
             input_stream->readPrefix();
             output_stream->writePrefix();
 
             while (auto block = input_stream->read())
+            {
+                if (send_chunk_header)
+                {
+                    writeText(block.rows(), *write_buffer);
+                    writeChar('\n', *write_buffer);
+                }
+
                 output_stream->write(block);
+            }
 
             input_stream->readSuffix();
             output_stream->writeSuffix();
@@ -183,7 +193,7 @@ Pipe StorageExecutable::read(
         configuration.read_number_of_rows_from_process_output = true;
     }
 
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, format, std::move(sample_block), std::move(process), log, std::move(tasks), configuration, process_pool));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, format, std::move(sample_block), std::move(process), std::move(tasks), configuration, process_pool));
     return pipe;
 }
 
@@ -232,7 +242,7 @@ void registerStorageExecutable(StorageFactory & factory)
             if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
                 max_command_execution_time = max_execution_time_seconds;
 
-            ExecutablePoolSettings pool_settings;
+            ExecutableSettings pool_settings;
             pool_settings.max_command_execution_time = max_command_execution_time;
             if (args.storage_def->settings)
                 pool_settings.loadFromQuery(*args.storage_def);
diff --git a/src/Storages/StorageExecutable.h b/src/Storages/StorageExecutable.h
index dd986ee3956..c67891d876f 100644
--- a/src/Storages/StorageExecutable.h
+++ b/src/Storages/StorageExecutable.h
@@ -4,7 +4,7 @@
 #include <common/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 #include <DataStreams/ShellCommandSource.h>
-#include <Storages/ExecutablePoolSettings.h>
+#include <Storages/ExecutableSettings.h>
 
 
 namespace DB
@@ -55,7 +55,7 @@ protected:
         const std::vector<String> & arguments_,
         const String & format_,
         const std::vector<ASTPtr> & input_queries_,
-        const ExecutablePoolSettings & pool_settings_,
+        const ExecutableSettings & settings_,
         const ColumnsDescription & columns,
         const ConstraintsDescription & constraints);
 
@@ -64,7 +64,7 @@ private:
     std::vector<String> arguments;
     String format;
     std::vector<ASTPtr> input_queries;
-    ExecutablePoolSettings pool_settings;
+    ExecutableSettings settings;
     std::shared_ptr<ProcessPool> process_pool;
     Poco::Logger * log;
 };
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
index f20e49fe23a..52f8262398c 100644
--- a/src/Storages/StorageExternalDistributed.cpp
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -15,6 +15,7 @@
 #include <Storages/MySQL/MySQLSettings.h>
 #include <Storages/StoragePostgreSQL.h>
 #include <Storages/StorageURL.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <common/logger_useful.h>
 
 
@@ -31,10 +32,7 @@ StorageExternalDistributed::StorageExternalDistributed(
     const StorageID & table_id_,
     ExternalStorageEngine table_engine,
     const String & cluster_description,
-    const String & remote_database,
-    const String & remote_table,
-    const String & username,
-    const String & password,
+    const ExternalDataSourceConfiguration & configuration,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
@@ -66,15 +64,16 @@ StorageExternalDistributed::StorageExternalDistributed(
                 addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 3306);
 
                 mysqlxx::PoolWithFailover pool(
-                    remote_database,
+                    configuration.database,
                     addresses,
-                    username, password);
+                    configuration.username,
+                    configuration.password);
 
                 shard = StorageMySQL::create(
                     table_id_,
                     std::move(pool),
-                    remote_database,
-                    remote_table,
+                    configuration.database,
+                    configuration.table,
                     /* replace_query = */ false,
                     /* on_duplicate_clause = */ "",
                     columns_,
@@ -90,15 +89,16 @@ StorageExternalDistributed::StorageExternalDistributed(
             case ExternalStorageEngine::PostgreSQL:
             {
                 addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 5432);
+                StoragePostgreSQLConfiguration postgres_conf;
+                postgres_conf.set(configuration);
+                postgres_conf.addresses = addresses;
 
                 auto pool = std::make_shared<postgres::PoolWithFailover>(
-                    remote_database,
-                    addresses,
-                    username, password,
+                    postgres_conf,
                     context->getSettingsRef().postgresql_connection_pool_size,
                     context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
-                shard = StoragePostgreSQL::create(table_id_, std::move(pool), remote_table, columns_, constraints_, String{});
+                shard = StoragePostgreSQL::create(table_id_, std::move(pool), configuration.table, columns_, constraints_, String{});
                 break;
             }
 #endif
@@ -113,13 +113,10 @@ StorageExternalDistributed::StorageExternalDistributed(
     }
 
 #else
-    (void)table_engine;
-    (void)remote_database;
-    (void)remote_table;
-    (void)username;
-    (void)password;
-    (void)shards_descriptions;
+    (void)configuration;
+    (void)cluster_description;
     (void)addresses;
+    (void)table_engine;
 #endif
 }
 
@@ -207,64 +204,113 @@ void registerStorageExternalDistributed(StorageFactory & factory)
     factory.registerStorage("ExternalDistributed", [](const StorageFactory::Arguments & args)
     {
         ASTs & engine_args = args.engine_args;
+        if (engine_args.size() < 2)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine ExternalDistributed must have at least 2 arguments: engine_name, named_collection and/or description");
 
-        if (engine_args.size() != 6)
-            throw Exception(
-                "Storage MySQLiDistributed requires 5 parameters: ExternalDistributed('engine_name', 'cluster_description', database, table, 'user', 'password').",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
-
-        const String & engine_name = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & addresses_description = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-
+        auto engine_name = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         StorageExternalDistributed::ExternalStorageEngine table_engine;
         if (engine_name == "URL")
-        {
             table_engine = StorageExternalDistributed::ExternalStorageEngine::URL;
+        else if (engine_name == "MySQL")
+            table_engine = StorageExternalDistributed::ExternalStorageEngine::MySQL;
+        else if (engine_name == "PostgreSQL")
+            table_engine = StorageExternalDistributed::ExternalStorageEngine::PostgreSQL;
+        else
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "External storage engine {} is not supported for StorageExternalDistributed. Supported engines are: MySQL, PostgreSQL, URL",
+                engine_name);
+
+        ASTs inner_engine_args(engine_args.begin() + 1, engine_args.end());
+        String cluster_description;
+
+        if (engine_name == "URL")
+        {
+            URLBasedDataSourceConfiguration configuration;
+            if (auto named_collection = getURLBasedDataSourceConfiguration(inner_engine_args, args.getLocalContext()))
+            {
+                auto [common_configuration, storage_specific_args] = named_collection.value();
+                configuration.set(common_configuration);
+
+                for (const auto & [name, value] : storage_specific_args)
+                {
+                    if (name == "description")
+                        cluster_description = value.safeGet<String>();
+                    else
+                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                        "Unknown key-value argument {} for table engine URL", name);
+                }
+
+                if (cluster_description.empty())
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Engine ExternalDistribued must have `description` key-value argument or named collection parameter");
+            }
+            else
+            {
+                for (auto & engine_arg : engine_args)
+                    engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+
+                cluster_description = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.format = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.compression_method = "auto";
+                if (engine_args.size() == 4)
+                    configuration.compression_method = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+            }
 
-            const String & format_name = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-            String compression_method = "auto";
-            if (engine_args.size() == 4)
-                compression_method = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
 
             auto format_settings = StorageURL::getFormatSettingsFromArgs(args);
 
             return StorageExternalDistributed::create(
-                addresses_description,
+                cluster_description,
                 args.table_id,
-                format_name,
+                configuration.format,
                 format_settings,
-                compression_method,
+                configuration.compression_method,
                 args.columns,
                 args.constraints,
                 args.getContext());
         }
         else
         {
-            if (engine_name == "MySQL")
-                table_engine = StorageExternalDistributed::ExternalStorageEngine::MySQL;
-            else if (engine_name == "PostgreSQL")
-                table_engine = StorageExternalDistributed::ExternalStorageEngine::PostgreSQL;
-            else
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "External storage engine {} is not supported for StorageExternalDistributed. Supported engines are: MySQL, PostgreSQL, URL",
-                    engine_name);
+            ExternalDataSourceConfiguration configuration;
+            if (auto named_collection = getExternalDataSourceConfiguration(inner_engine_args, args.getLocalContext()))
+            {
+                auto [common_configuration, storage_specific_args] = named_collection.value();
+                configuration.set(common_configuration);
+
+                for (const auto & [name, value] : storage_specific_args)
+                {
+                    if (name == "description")
+                        cluster_description = value.safeGet<String>();
+                    else
+                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                        "Unknown key-value argument {} for table function URL", name);
+                }
+
+                if (cluster_description.empty())
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Engine ExternalDistribued must have `description` key-value argument or named collection parameter");
+            }
+            else
+            {
+                if (engine_args.size() != 6)
+                    throw Exception(
+                        "Storage ExternalDistributed requires 5 parameters: "
+                        "ExternalDistributed('engine_name', 'cluster_description', 'database', 'table', 'user', 'password').",
+                        ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+                cluster_description = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.database = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.table = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.username = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.password = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+            }
 
-            const String & remote_database = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-            const String & remote_table = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
-            const String & username = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
-            const String & password = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
 
             return StorageExternalDistributed::create(
                 args.table_id,
                 table_engine,
-                addresses_description,
-                remote_database,
-                remote_table,
-                username,
-                password,
+                cluster_description,
+                configuration,
                 args.columns,
                 args.constraints,
                 args.comment,
diff --git a/src/Storages/StorageExternalDistributed.h b/src/Storages/StorageExternalDistributed.h
index c85276c09dd..9f04133d63d 100644
--- a/src/Storages/StorageExternalDistributed.h
+++ b/src/Storages/StorageExternalDistributed.h
@@ -11,11 +11,13 @@
 namespace DB
 {
 
+struct ExternalDataSourceConfiguration;
+
 /// Storages MySQL and PostgreSQL use ConnectionPoolWithFailover and support multiple replicas.
 /// This class unites multiple storages with replicas into multiple shards with replicas.
 /// A query to external database is passed to one replica on each shard, the result is united.
 /// Replicas on each shard have the same priority, traversed replicas are moved to the end of the queue.
-/// TODO: try `load_balancing` setting for replicas priorities same way as for table function `remote`
+/// Similar approach is used for URL storage.
 class StorageExternalDistributed final : public shared_ptr_helper<StorageExternalDistributed>, public DB::IStorage
 {
     friend struct shared_ptr_helper<StorageExternalDistributed>;
@@ -44,10 +46,7 @@ protected:
         const StorageID & table_id_,
         ExternalStorageEngine table_engine,
         const String & cluster_description,
-        const String & remote_database_,
-        const String & remote_table_,
-        const String & username,
-        const String & password,
+        const ExternalDataSourceConfiguration & configuration,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
index 795bb8f7131..a8912d44f2c 100644
--- a/src/Storages/StorageInMemoryMetadata.h
+++ b/src/Storages/StorageInMemoryMetadata.h
@@ -43,7 +43,7 @@ struct StorageInMemoryMetadata
     TTLColumnsDescription column_ttls_by_name;
     /// TTL expressions for table (Move and Rows)
     TTLTableDescription table_ttl;
-    /// SETTINGS expression. Supported for MergeTree, Buffer and Kafka.
+    /// SETTINGS expression. Supported for MergeTree, Buffer, Kafka, RabbitMQ.
     ASTPtr settings_changes;
     /// SELECT QUERY. Supported for MaterializedView and View (have to support LiveView).
     SelectQueryDescription select;
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index f72f6fee180..907e06fb4f6 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -308,9 +308,8 @@ void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & command
         for (const auto & command : commands)
         {
             if (!command.isCommentAlter() && command.type != AlterCommand::MODIFY_QUERY)
-                throw Exception(
-                    "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                    ErrorCodes::NOT_IMPLEMENTED);
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                    command.type, getName());
         }
     }
     else
@@ -318,9 +317,8 @@ void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & command
         for (const auto & command : commands)
         {
             if (!command.isCommentAlter())
-                throw Exception(
-                    "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                    ErrorCodes::NOT_IMPLEMENTED);
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                    command.type, getName());
         }
     }
 }
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index 6ec3c6c8ac6..4eafaa5c5c5 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -65,15 +65,7 @@ protected:
 
         /// Add only required columns to `res`.
         for (const auto & elem : column_names_and_types)
-        {
-            auto current_column = src.getByName(elem.getNameInStorage()).column;
-            current_column = current_column->decompress();
-
-            if (elem.isSubcolumn())
-                columns.emplace_back(elem.getTypeInStorage()->getSubcolumn(elem.getSubcolumnName(), *current_column));
-            else
-                columns.emplace_back(std::move(current_column));
-        }
+            columns.emplace_back(getColumnFromBlock(src, elem));
 
         return Chunk(std::move(columns), src.rows());
     }
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index d537ef05cdb..c1066329e6f 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -625,11 +625,13 @@ void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, ContextP
     auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 898e990f7d3..e2a0c36b463 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -1,5 +1,7 @@
 #include "StorageMergeTree.h"
 
+#include <optional>
+
 #include <Databases/IDatabase.h>
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
@@ -21,13 +23,13 @@
 #include <Storages/PartitionCommands.h>
 #include <Storages/MergeTree/MergeTreeSink.h>
 #include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
+#include <Storages/MergeTree/MergePlainMergeTreeTask.h>
 #include <Storages/MergeTree/PartitionPruner.h>
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/checkDataPart.h>
 #include <Processors/Pipe.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <optional>
 
 namespace CurrentMetrics
 {
@@ -37,6 +39,7 @@ namespace CurrentMetrics
 namespace DB
 {
 
+
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
@@ -82,9 +85,6 @@ StorageMergeTree::StorageMergeTree(
     , reader(*this)
     , writer(*this)
     , merger_mutator(*this, getContext()->getSettingsRef().background_pool_size)
-    , background_executor(*this, getContext())
-    , background_moves_executor(*this, getContext())
-
 {
     loadDataParts(has_force_restore_data_flag);
 
@@ -113,9 +113,13 @@ void StorageMergeTree::startup()
     time_after_previous_cleanup_parts.restart();
     time_after_previous_cleanup_temporary_directories.restart();
 
+    /// Do not schedule any background jobs if current storage has static data files.
+    if (isStaticStorage())
+        return;
+
     try
     {
-        background_executor.start();
+        background_operations_assignee.start();
         startBackgroundMovesIfNeeded();
     }
     catch (...)
@@ -153,8 +157,8 @@ void StorageMergeTree::shutdown()
     merger_mutator.merges_blocker.cancelForever();
     parts_mover.moves_blocker.cancelForever();
 
-    background_executor.finish();
-    background_moves_executor.finish();
+    background_operations_assignee.finish();
+    background_moves_assignee.finish();
 
     try
     {
@@ -243,7 +247,7 @@ void StorageMergeTree::drop()
 {
     shutdown();
     /// In case there is read-only disk we cannot allow to call dropAllData(), but dropping tables is allowed.
-    if (isReadOnly())
+    if (isStaticStorage())
         return;
     dropAllData();
 }
@@ -326,8 +330,8 @@ void StorageMergeTree::alter(
 
 
 /// While exists, marks parts as 'currently_merging_mutating_parts' and reserves free space on filesystem.
-StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
-    FutureMergedMutatedPart & future_part_,
+CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
+    FutureMergedMutatedPartPtr future_part_,
     size_t total_size,
     StorageMergeTree & storage_,
     const StorageMetadataPtr & metadata_snapshot,
@@ -338,12 +342,12 @@ StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
 
     /// if we mutate part, than we should reserve space on the same disk, because mutations possible can create hardlinks
     if (is_mutation)
-        reserved_space = storage.tryReserveSpace(total_size, future_part_.parts[0]->volume);
+        reserved_space = storage.tryReserveSpace(total_size, future_part->parts[0]->volume);
     else
     {
         IMergeTreeDataPart::TTLInfos ttl_infos;
         size_t max_volume_index = 0;
-        for (auto & part_ptr : future_part_.parts)
+        for (auto & part_ptr : future_part->parts)
         {
             ttl_infos.update(part_ptr->ttl_infos);
             max_volume_index = std::max(max_volume_index, storage.getStoragePolicy()->getVolumeIndexByDisk(part_ptr->volume->getDisk()));
@@ -353,9 +357,9 @@ StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
             metadata_snapshot,
             total_size,
             max_volume_index,
-            future_part.name,
-            future_part.part_info,
-            future_part.parts,
+            future_part->name,
+            future_part->part_info,
+            future_part->parts,
             &tagger,
             &ttl_infos);
 
@@ -367,26 +371,26 @@ StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
     if (!reserved_space)
     {
         if (is_mutation)
-            throw Exception("Not enough space for mutating part '" + future_part.parts[0]->name + "'", ErrorCodes::NOT_ENOUGH_SPACE);
+            throw Exception("Not enough space for mutating part '" + future_part->parts[0]->name + "'", ErrorCodes::NOT_ENOUGH_SPACE);
         else
             throw Exception("Not enough space for merging parts", ErrorCodes::NOT_ENOUGH_SPACE);
     }
 
-    future_part_.updatePath(storage, reserved_space);
+    future_part->updatePath(storage, reserved_space.get());
 
-    for (const auto & part : future_part.parts)
+    for (const auto & part : future_part->parts)
     {
         if (storage.currently_merging_mutating_parts.count(part))
             throw Exception("Tagging already tagged part " + part->name + ". This is a bug.", ErrorCodes::LOGICAL_ERROR);
     }
-    storage.currently_merging_mutating_parts.insert(future_part.parts.begin(), future_part.parts.end());
+    storage.currently_merging_mutating_parts.insert(future_part->parts.begin(), future_part->parts.end());
 }
 
-StorageMergeTree::CurrentlyMergingPartsTagger::~CurrentlyMergingPartsTagger()
+CurrentlyMergingPartsTagger::~CurrentlyMergingPartsTagger()
 {
     std::lock_guard lock(storage.currently_processing_in_background_mutex);
 
-    for (const auto & part : future_part.parts)
+    for (const auto & part : future_part->parts)
     {
         if (!storage.currently_merging_mutating_parts.count(part))
             std::terminate();
@@ -414,17 +418,17 @@ Int64 StorageMergeTree::startMutation(const MutationCommands & commands, String
 
         LOG_INFO(log, "Added mutation: {}", mutation_file_name);
     }
-    background_executor.triggerTask();
+    background_operations_assignee.trigger();
     return version;
 }
 
 
-void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPart result_part, bool is_successful, const String & exception_message)
+void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPartPtr result_part, bool is_successful, const String & exception_message)
 {
     /// Update the information about failed parts in the system.mutations table.
 
-    Int64 sources_data_version = result_part.parts.at(0)->info.getDataVersion();
-    Int64 result_data_version = result_part.part_info.getDataVersion();
+    Int64 sources_data_version = result_part->parts.at(0)->info.getDataVersion();
+    Int64 result_data_version = result_part->part_info.getDataVersion();
     if (sources_data_version != result_data_version)
     {
         std::lock_guard lock(currently_processing_in_background_mutex);
@@ -436,7 +440,7 @@ void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPart resul
             MergeTreeMutationEntry & entry = it->second;
             if (is_successful)
             {
-                if (!entry.latest_failed_part.empty() && result_part.part_info.contains(entry.latest_failed_part_info))
+                if (!entry.latest_failed_part.empty() && result_part->part_info.contains(entry.latest_failed_part_info))
                 {
                     entry.latest_failed_part.clear();
                     entry.latest_failed_part_info = MergeTreePartInfo();
@@ -446,8 +450,8 @@ void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPart resul
             }
             else
             {
-                entry.latest_failed_part = result_part.parts.at(0)->name;
-                entry.latest_failed_part_info = result_part.parts.at(0)->info;
+                entry.latest_failed_part = result_part->parts.at(0)->name;
+                entry.latest_failed_part_info = result_part->parts.at(0)->info;
                 entry.latest_fail_time = time(nullptr);
                 entry.latest_fail_reason = exception_message;
             }
@@ -640,7 +644,7 @@ CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
     }
 
     /// Maybe there is another mutation that was blocked by the killed one. Try to execute it immediately.
-    background_executor.triggerTask();
+    background_operations_assignee.trigger();
 
     return CancellationCode::CancelSent;
 }
@@ -681,7 +685,7 @@ void StorageMergeTree::loadMutations()
         increment.value = std::max(Int64(increment.value.load()), current_mutations_by_version.rbegin()->first);
 }
 
-std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMerge(
+std::shared_ptr<MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMerge(
     const StorageMetadataPtr & metadata_snapshot,
     bool aggressive,
     const String & partition_id,
@@ -694,10 +698,10 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
 {
     auto data_settings = getSettings();
 
-    FutureMergedMutatedPart future_part;
+    auto future_part = std::make_shared<FutureMergedMutatedPart>();
 
     if (storage_settings.get()->assign_part_uuids)
-        future_part.uuid = UUIDHelpers::generateV4();
+        future_part->uuid = UUIDHelpers::generateV4();
 
     /// You must call destructor with unlocked `currently_processing_in_background_mutex`.
     CurrentlyMergingPartsTaggerPtr merging_tagger;
@@ -787,11 +791,11 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     }
 
     /// Account TTL merge here to avoid exceeding the max_number_of_merges_with_ttl_in_pool limit
-    if (isTTLMergeType(future_part.merge_type))
+    if (isTTLMergeType(future_part->merge_type))
         getContext()->getMergeList().bookMergeWithTTL();
 
-    merging_tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace(future_part.parts), *this, metadata_snapshot, false);
-    return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(merging_tagger), MutationCommands{});
+    merging_tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace(future_part->parts), *this, metadata_snapshot, false);
+    return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(merging_tagger), MutationCommands::create());
 }
 
 bool StorageMergeTree::merge(
@@ -834,76 +838,33 @@ bool StorageMergeTree::merge(
     if (!merge_mutate_entry)
         return false;
 
-    return mergeSelectedParts(metadata_snapshot, deduplicate, deduplicate_by_columns, *merge_mutate_entry, table_lock_holder);
-}
 
-bool StorageMergeTree::mergeSelectedParts(
-    const StorageMetadataPtr & metadata_snapshot,
-    bool deduplicate,
-    const Names & deduplicate_by_columns,
-    MergeMutateSelectedEntry & merge_mutate_entry,
-    TableLockHolder & table_lock_holder)
-{
-    auto & future_part = merge_mutate_entry.future_part;
-    Stopwatch stopwatch;
-    MutableDataPartPtr new_part;
+    /// Copying a vector of columns `deduplicate bu columns.
+    auto task = std::make_shared<MergePlainMergeTreeTask>(
+        *this, metadata_snapshot, deduplicate, deduplicate_by_columns, merge_mutate_entry, table_lock_holder, [](bool){});
 
-    auto merge_list_entry = getContext()->getMergeList().insert(getStorageID(), future_part);
-
-    auto write_part_log = [&] (const ExecutionStatus & execution_status)
-    {
-        writePartLog(
-            PartLogElement::MERGE_PARTS,
-            execution_status,
-            stopwatch.elapsed(),
-            future_part.name,
-            new_part,
-            future_part.parts,
-            merge_list_entry.get());
-    };
-
-    try
-    {
-        new_part = merger_mutator.mergePartsToTemporaryPart(
-            future_part,
-            metadata_snapshot,
-            *(merge_list_entry),
-            table_lock_holder,
-            time(nullptr),
-            getContext(),
-            merge_mutate_entry.tagger->reserved_space,
-            deduplicate,
-            deduplicate_by_columns,
-            merging_params);
-
-        merger_mutator.renameMergedTemporaryPart(new_part, future_part.parts, nullptr);
-        write_part_log({});
-    }
-    catch (...)
-    {
-        write_part_log(ExecutionStatus::fromCurrentException());
-        throw;
-    }
+    executeHere(task);
 
     return true;
 }
 
+
 bool StorageMergeTree::partIsAssignedToBackgroundOperation(const DataPartPtr & part) const
 {
     std::lock_guard background_processing_lock(currently_processing_in_background_mutex);
     return currently_merging_mutating_parts.count(part);
 }
 
-std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMutate(
+std::shared_ptr<MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMutate(
     const StorageMetadataPtr & metadata_snapshot, String * /* disable_reason */, TableLockHolder & /* table_lock_holder */)
 {
     size_t max_ast_elements = getContext()->getSettingsRef().max_expanded_ast_elements;
 
-    FutureMergedMutatedPart future_part;
+    auto future_part = std::make_shared<FutureMergedMutatedPart>();
     if (storage_settings.get()->assign_part_uuids)
-        future_part.uuid = UUIDHelpers::generateV4();
+        future_part->uuid = UUIDHelpers::generateV4();
 
-    MutationCommands commands;
+    auto commands = MutationCommands::create();
 
     CurrentlyMergingPartsTaggerPtr tagger;
 
@@ -982,18 +943,18 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
                 break;
 
             current_ast_elements += commands_size;
-            commands.insert(commands.end(), it->second.commands.begin(), it->second.commands.end());
+            commands->insert(commands->end(), it->second.commands.begin(), it->second.commands.end());
         }
 
-        if (!commands.empty())
+        if (!commands->empty())
         {
             auto new_part_info = part->info;
             new_part_info.mutation = current_mutations_by_version.rbegin()->first;
 
-            future_part.parts.push_back(part);
-            future_part.part_info = new_part_info;
-            future_part.name = part->getNewName(new_part_info);
-            future_part.type = part->getType();
+            future_part->parts.push_back(part);
+            future_part->part_info = new_part_info;
+            future_part->name = part->getNewName(new_part_info);
+            future_part->type = part->getType();
 
             tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace({part}), *this, metadata_snapshot, true);
             return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(tagger), commands);
@@ -1017,18 +978,20 @@ bool StorageMergeTree::mutateSelectedPart(const StorageMetadataPtr & metadata_sn
             PartLogElement::MUTATE_PART,
             execution_status,
             stopwatch.elapsed(),
-            future_part.name,
+            future_part->name,
             new_part,
-            future_part.parts,
+            future_part->parts,
             merge_list_entry.get());
     };
 
     try
     {
-        new_part = merger_mutator.mutatePartToTemporaryPart(
-            future_part, metadata_snapshot, merge_mutate_entry.commands, *(merge_list_entry),
+        auto task = merger_mutator.mutatePartToTemporaryPart(
+            future_part, metadata_snapshot, merge_mutate_entry.commands, merge_list_entry.get(),
             time(nullptr), getContext(), merge_mutate_entry.tagger->reserved_space, table_lock_holder);
 
+        new_part = executeHere(task);
+
         renameTempPartAndReplace(new_part);
 
         updateMutationEntriesErrors(future_part, true, "");
@@ -1044,17 +1007,19 @@ bool StorageMergeTree::mutateSelectedPart(const StorageMetadataPtr & metadata_sn
     return true;
 }
 
-bool StorageMergeTree::scheduleDataProcessingJob(IBackgroundJobExecutor & executor) //-V657
+bool StorageMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) //-V657
 {
     if (shutdown_called)
         return false;
 
+    assert(!isStaticStorage());
+
     auto metadata_snapshot = getInMemoryMetadataPtr();
     std::shared_ptr<MergeMutateSelectedEntry> merge_entry, mutate_entry;
 
     auto share_lock = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
 
-    bool has_mutations;
+    bool has_mutations = false;
     {
         std::unique_lock lock(currently_processing_in_background_mutex);
         if (merger_mutator.merges_blocker.isCancelled())
@@ -1062,60 +1027,60 @@ bool StorageMergeTree::scheduleDataProcessingJob(IBackgroundJobExecutor & execut
 
         merge_entry = selectPartsToMerge(metadata_snapshot, false, {}, false, nullptr, share_lock, lock);
         if (!merge_entry)
+        {
             mutate_entry = selectPartsToMutate(metadata_snapshot, nullptr, share_lock);
-
-        has_mutations = !current_mutations_by_version.empty();
-    }
-
-    if (!mutate_entry && has_mutations)
-    {
-        /// Notify in case of errors
-        std::lock_guard lock(mutation_wait_mutex);
-        mutation_wait_event.notify_all();
+            has_mutations = !current_mutations_by_version.empty();
+        }
     }
 
     if (merge_entry)
     {
-        executor.execute({[this, metadata_snapshot, merge_entry, share_lock] () mutable
-        {
-            return mergeSelectedParts(metadata_snapshot, false, {}, *merge_entry, share_lock);
-        }, PoolType::MERGE_MUTATE});
+        auto task = std::make_shared<MergePlainMergeTreeTask>(*this, metadata_snapshot, false, Names{}, merge_entry, share_lock, common_assignee_trigger);
+        assignee.scheduleMergeMutateTask(task);
         return true;
     }
     if (mutate_entry)
     {
-        executor.execute({[this, metadata_snapshot, merge_entry, mutate_entry, share_lock] () mutable
-        {
-            return mutateSelectedPart(metadata_snapshot, *mutate_entry, share_lock);
-        }, PoolType::MERGE_MUTATE});
+        auto task = std::make_shared<MutatePlainMergeTreeTask>(*this, metadata_snapshot, mutate_entry, share_lock, common_assignee_trigger);
+        assignee.scheduleMergeMutateTask(task);
         return true;
     }
-    bool executed = false;
+    if (has_mutations)
+    {
+        /// Notify in case of errors if no mutation was successfully selected.
+        /// Otherwise, notification will occur after any of mutations complete.
+        std::lock_guard lock(mutation_wait_mutex);
+        mutation_wait_event.notify_all();
+    }
+
+    bool scheduled = false;
     if (time_after_previous_cleanup_temporary_directories.compareAndRestartDeferred(getContext()->getSettingsRef().merge_tree_clear_old_temporary_directories_interval_seconds))
     {
-        executor.execute({[this, share_lock] ()
-        {
-            clearOldTemporaryDirectories(getSettings()->temporary_directories_lifetime.totalSeconds());
-            return true;
-        }, PoolType::MERGE_MUTATE});
-        executed = true;
+        assignee.scheduleMergeMutateTask(ExecutableLambdaAdapter::create(
+            [this, share_lock] ()
+            {
+                clearOldTemporaryDirectories(getSettings()->temporary_directories_lifetime.totalSeconds());
+                return true;
+            }, common_assignee_trigger, getStorageID()));
+        scheduled = true;
     }
-    if (time_after_previous_cleanup_parts.compareAndRestartDeferred(getContext()->getSettingsRef().merge_tree_clear_old_parts_interval_seconds))
+    if (auto lock = time_after_previous_cleanup_parts.compareAndRestartDeferred(getContext()->getSettingsRef().merge_tree_clear_old_parts_interval_seconds))
     {
-        executor.execute({[this, share_lock] ()
-        {
-            /// All use relative_data_path which changes during rename
-            /// so execute under share lock.
-            clearOldPartsFromFilesystem();
-            clearOldWriteAheadLogs();
-            clearOldMutations();
-            clearEmptyParts();
-            return true;
-        }, PoolType::MERGE_MUTATE});
-        executed = true;
+        assignee.scheduleMergeMutateTask(ExecutableLambdaAdapter::create(
+            [this, share_lock] ()
+            {
+                /// All use relative_data_path which changes during rename
+                /// so execute under share lock.
+                clearOldPartsFromFilesystem();
+                clearOldWriteAheadLogs();
+                clearOldMutations();
+                clearEmptyParts();
+                return true;
+            }, common_assignee_trigger, getStorageID()));
+        scheduled = true;
      }
 
-    return executed;
+    return scheduled;
 }
 
 Int64 StorageMergeTree::getCurrentMutationVersion(
@@ -1566,9 +1531,9 @@ ActionLock StorageMergeTree::getActionLock(StorageActionBlockType action_type)
 void StorageMergeTree::onActionLockRemove(StorageActionBlockType action_type)
 {
     if (action_type == ActionLocks::PartsMerge ||  action_type == ActionLocks::PartsTTLMerge)
-        background_executor.triggerTask();
+        background_operations_assignee.trigger();
     else if (action_type == ActionLocks::PartsMove)
-        background_moves_executor.triggerTask();
+        background_moves_assignee.trigger();
 }
 
 CheckResults StorageMergeTree::checkData(const ASTPtr & query, ContextPtr local_context)
@@ -1646,7 +1611,7 @@ MutationCommands StorageMergeTree::getFirstAlterMutationCommandsForPart(const Da
 void StorageMergeTree::startBackgroundMovesIfNeeded()
 {
     if (areBackgroundMovesNeeded())
-        background_moves_executor.start();
+        background_moves_assignee.start();
 }
 
 std::unique_ptr<MergeTreeSettings> StorageMergeTree::getDefaultSettings() const
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index e2dbc217135..08cce514d71 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -13,10 +13,12 @@
 #include <Storages/MergeTree/MergeTreeMutationEntry.h>
 #include <Storages/MergeTree/MergeTreeMutationStatus.h>
 #include <Storages/MergeTree/MergeTreeDeduplicationLog.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/MergePlainMergeTreeTask.h>
+#include <Storages/MergeTree/MutatePlainMergeTreeTask.h>
 
 #include <Disks/StoragePolicy.h>
 #include <Common/SimpleIncrement.h>
-#include <Storages/MergeTree/BackgroundJobsExecutor.h>
 
 
 namespace DB
@@ -96,9 +98,10 @@ public:
 
     RestoreDataTasks restoreFromBackup(const BackupPtr & backup, const String & data_path_in_backup, const ASTs & partitions, ContextMutablePtr context) override;
 
-    bool scheduleDataProcessingJob(IBackgroundJobExecutor & executor) override;
+    bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) override;
 
     MergeTreeDeduplicationLog * getDeduplicationLog() { return deduplication_log.get(); }
+
 private:
 
     /// Mutex and condvar for synchronous mutations wait
@@ -108,8 +111,6 @@ private:
     MergeTreeDataSelectExecutor reader;
     MergeTreeDataWriter writer;
     MergeTreeDataMergerMutator merger_mutator;
-    BackgroundJobsExecutor background_executor;
-    BackgroundMovesExecutor background_moves_executor;
 
     std::unique_ptr<MergeTreeDeduplicationLog> deduplication_log;
 
@@ -136,6 +137,7 @@ private:
 
     std::atomic<bool> shutdown_called {false};
 
+private:
     void loadMutations();
 
     /// Load and initialize deduplication logs. Even if deduplication setting
@@ -160,38 +162,8 @@ private:
     /// Wait until mutation with version will finish mutation for all parts
     void waitForMutation(Int64 version, const String & file_name);
 
-    struct CurrentlyMergingPartsTagger
-    {
-        FutureMergedMutatedPart future_part;
-        ReservationPtr reserved_space;
-        StorageMergeTree & storage;
-        // Optional tagger to maintain volatile parts for the JBOD balancer
-        std::optional<CurrentlySubmergingEmergingTagger> tagger;
-
-        CurrentlyMergingPartsTagger(
-            FutureMergedMutatedPart & future_part_,
-            size_t total_size,
-            StorageMergeTree & storage_,
-            const StorageMetadataPtr & metadata_snapshot,
-            bool is_mutation);
-
-        ~CurrentlyMergingPartsTagger();
-    };
-
-    using CurrentlyMergingPartsTaggerPtr = std::unique_ptr<CurrentlyMergingPartsTagger>;
     friend struct CurrentlyMergingPartsTagger;
 
-    struct MergeMutateSelectedEntry
-    {
-        FutureMergedMutatedPart future_part;
-        CurrentlyMergingPartsTaggerPtr tagger;
-        MutationCommands commands;
-        MergeMutateSelectedEntry(const FutureMergedMutatedPart & future_part_, CurrentlyMergingPartsTaggerPtr && tagger_, const MutationCommands & commands_)
-            : future_part(future_part_)
-            , tagger(std::move(tagger_))
-            , commands(commands_)
-        {}
-    };
 
     std::shared_ptr<MergeMutateSelectedEntry> selectPartsToMerge(
         const StorageMetadataPtr & metadata_snapshot,
@@ -204,7 +176,6 @@ private:
         bool optimize_skip_merged_partitions = false,
         SelectPartsDecision * select_decision_out = nullptr);
 
-    bool mergeSelectedParts(const StorageMetadataPtr & metadata_snapshot, bool deduplicate, const Names & deduplicate_by_columns, MergeMutateSelectedEntry & entry, TableLockHolder & table_lock_holder);
 
     std::shared_ptr<MergeMutateSelectedEntry> selectPartsToMutate(const StorageMetadataPtr & metadata_snapshot, String * disable_reason, TableLockHolder & table_lock_holder);
     bool mutateSelectedPart(const StorageMetadataPtr & metadata_snapshot, MergeMutateSelectedEntry & entry, TableLockHolder & table_lock_holder);
@@ -228,7 +199,7 @@ private:
     /// Update mutation entries after part mutation execution. May reset old
     /// errors if mutation was successful. Otherwise update last_failed* fields
     /// in mutation entries.
-    void updateMutationEntriesErrors(FutureMergedMutatedPart result_part, bool is_successful, const String & exception_message);
+    void updateMutationEntriesErrors(FutureMergedMutatedPartPtr result_part, bool is_successful, const String & exception_message);
 
     /// Return empty optional if mutation was killed. Otherwise return partially
     /// filled mutation status with information about error (latest_fail*) and
@@ -245,6 +216,8 @@ private:
     friend class MergeTreeProjectionBlockOutputStream;
     friend class MergeTreeSink;
     friend class MergeTreeData;
+    friend class MergePlainMergeTreeTask;
+    friend class MutatePlainMergeTreeTask;
 
 
 protected:
diff --git a/src/Storages/StorageMongoDB.cpp b/src/Storages/StorageMongoDB.cpp
index 3bdef7fd295..2a1f7cc2aa9 100644
--- a/src/Storages/StorageMongoDB.cpp
+++ b/src/Storages/StorageMongoDB.cpp
@@ -24,6 +24,7 @@ namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int MONGODB_CANNOT_AUTHENTICATE;
+    extern const int BAD_ARGUMENTS;
 }
 
 StorageMongoDB::StorageMongoDB(
@@ -102,42 +103,72 @@ Pipe StorageMongoDB::read(
     return Pipe(std::make_shared<MongoDBSource>(connection, createCursor(database_name, collection_name, sample_block), sample_block, max_block_size, true));
 }
 
-void registerStorageMongoDB(StorageFactory & factory)
-{
-    factory.registerStorage("MongoDB", [](const StorageFactory::Arguments & args)
-    {
-        ASTs & engine_args = args.engine_args;
 
+StorageMongoDBConfiguration StorageMongoDB::getConfiguration(ASTs engine_args, ContextPtr context)
+{
+    StorageMongoDBConfiguration configuration;
+    if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
+
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "collection")
+                configuration.collection = arg_value.safeGet<String>();
+            else if (arg_name == "options")
+                configuration.options = arg_value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Unexpected key-value argument."
+                        "Got: {}, but expected one of:"
+                        "host, port, username, password, database, table, options.", arg_name);
+        }
+    }
+    else
+    {
         if (engine_args.size() < 5 || engine_args.size() > 6)
             throw Exception(
                 "Storage MongoDB requires from 5 to 6 parameters: MongoDB('host:port', database, collection, 'user', 'password' [, 'options']).",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
 
         /// 27017 is the default MongoDB port.
         auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 27017);
 
-        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & collection = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
-
-        String options;
+        configuration.host = parsed_host_port.first;
+        configuration.port = parsed_host_port.second;
+        configuration.database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.collection = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
 
         if (engine_args.size() >= 6)
-            options = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.options = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+
+    }
+
+    return configuration;
+}
+
+
+void registerStorageMongoDB(StorageFactory & factory)
+{
+    factory.registerStorage("MongoDB", [](const StorageFactory::Arguments & args)
+    {
+        auto configuration = StorageMongoDB::getConfiguration(args.engine_args, args.getLocalContext());
 
         return StorageMongoDB::create(
             args.table_id,
-            parsed_host_port.first,
-            parsed_host_port.second,
-            remote_database,
-            collection,
-            username,
-            password,
-            options,
+            configuration.host,
+            configuration.port,
+            configuration.database,
+            configuration.collection,
+            configuration.username,
+            configuration.password,
+            configuration.options,
             args.columns,
             args.constraints,
             args.comment);
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index 3014b88a9ca..c925418c888 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -3,6 +3,7 @@
 #include <common/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 #include <Poco/MongoDB/Connection.h>
 
@@ -42,6 +43,8 @@ public:
         size_t max_block_size,
         unsigned num_streams) override;
 
+    static StorageMongoDBConfiguration getConfiguration(ASTs engine_args, ContextPtr context);
+
 private:
     void connectIfNotConnected();
 
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index 79bb1f59cc7..7f08dfbfe99 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -234,64 +234,91 @@ SinkToStoragePtr StorageMySQL::write(const ASTPtr & /*query*/, const StorageMeta
         local_context->getSettingsRef().mysql_max_rows_to_insert);
 }
 
-void registerStorageMySQL(StorageFactory & factory)
-{
-    factory.registerStorage("MySQL", [](const StorageFactory::Arguments & args)
-    {
-        ASTs & engine_args = args.engine_args;
 
+StorageMySQLConfiguration StorageMySQL::getConfiguration(ASTs engine_args, ContextPtr context_)
+{
+    StorageMySQLConfiguration configuration;
+
+    if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context_))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
+        configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
+
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "replace_query")
+                configuration.replace_query = arg_value.safeGet<bool>();
+            else if (arg_name == "on_duplicate_clause")
+                configuration.on_duplicate_clause = arg_value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Unexpected key-value argument."
+                        "Got: {}, but expected one of:"
+                        "host, port, username, password, database, table, replace_query, on_duplicate_clause.", arg_name);
+        }
+    }
+    else
+    {
         if (engine_args.size() < 5 || engine_args.size() > 7)
             throw Exception(
                 "Storage MySQL requires 5-7 parameters: MySQL('host:port' (or 'addresses_pattern'), database, table, 'user', 'password'[, replace_query, 'on_duplicate_clause']).",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context_);
 
-        /// 3306 is the default MySQL port.
-        const String & host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
-        size_t max_addresses = args.getContext()->getSettingsRef().glob_expansion_max_elements;
+        const auto & host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        size_t max_addresses = context_->getSettingsRef().glob_expansion_max_elements;
 
-        /// TODO: move some arguments from the arguments to the SETTINGS.
-        MySQLSettings mysql_settings;
+        configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
+        configuration.database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (engine_args.size() >= 6)
+            configuration.replace_query = engine_args[5]->as<ASTLiteral &>().value.safeGet<UInt64>();
+        if (engine_args.size() == 7)
+            configuration.on_duplicate_clause = engine_args[6]->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
+    if (configuration.replace_query && !configuration.on_duplicate_clause.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Only one of 'replace_query' and 'on_duplicate_clause' can be specified, or none of them");
+
+    return configuration;
+}
+
+
+void registerStorageMySQL(StorageFactory & factory)
+{
+    factory.registerStorage("MySQL", [](const StorageFactory::Arguments & args)
+    {
+        auto configuration = StorageMySQL::getConfiguration(args.engine_args, args.getLocalContext());
+
+        MySQLSettings mysql_settings; /// TODO: move some arguments from the arguments to the SETTINGS.
         if (args.storage_def->settings)
-        {
             mysql_settings.loadFromQuery(*args.storage_def);
-        }
 
         if (!mysql_settings.connection_pool_size)
             throw Exception("connection_pool_size cannot be zero.", ErrorCodes::BAD_ARGUMENTS);
 
-        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
-        mysqlxx::PoolWithFailover pool(remote_database, addresses,
-            username, password,
+        mysqlxx::PoolWithFailover pool(
+            configuration.database, configuration.addresses,
+            configuration.username, configuration.password,
             MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
             mysql_settings.connection_pool_size,
-            mysql_settings.connection_max_tries);
-
-        bool replace_query = false;
-        std::string on_duplicate_clause;
-        if (engine_args.size() >= 6)
-            replace_query = engine_args[5]->as<ASTLiteral &>().value.safeGet<UInt64>();
-        if (engine_args.size() == 7)
-            on_duplicate_clause = engine_args[6]->as<ASTLiteral &>().value.safeGet<String>();
-
-        if (replace_query && !on_duplicate_clause.empty())
-            throw Exception(
-                "Only one of 'replace_query' and 'on_duplicate_clause' can be specified, or none of them",
-                ErrorCodes::BAD_ARGUMENTS);
+            mysql_settings.connection_max_tries,
+            mysql_settings.connection_wait_timeout);
 
         return StorageMySQL::create(
             args.table_id,
             std::move(pool),
-            remote_database,
-            remote_table,
-            replace_query,
-            on_duplicate_clause,
+            configuration.database,
+            configuration.table,
+            configuration.replace_query,
+            configuration.on_duplicate_clause,
             args.columns,
             args.constraints,
             args.comment,
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index 70d7a4455b1..2aad915e073 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -10,6 +10,7 @@
 
 #include <Storages/IStorage.h>
 #include <Storages/MySQL/MySQLSettings.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <mysqlxx/PoolWithFailover.h>
 
 
@@ -50,6 +51,8 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
+    static StorageMySQLConfiguration getConfiguration(ASTs engine_args, ContextPtr context_);
+
 private:
     friend class StorageMySQLSink;
 
diff --git a/src/Storages/StorageNull.cpp b/src/Storages/StorageNull.cpp
index 85f0daf3fa8..3076ec733b7 100644
--- a/src/Storages/StorageNull.cpp
+++ b/src/Storages/StorageNull.cpp
@@ -41,11 +41,13 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPt
     auto name_deps = getDependentViewsByColumn(context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index 3617e964734..d4fedaf78c8 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -3,43 +3,51 @@
 #if USE_LIBPQXX
 #include <DataStreams/PostgreSQLSource.h>
 
-#include <Storages/StorageFactory.h>
-#include <Storages/transformQueryForExternalDatabase.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/Context.h>
+#include <Common/parseAddress.h>
+#include <Common/assert_cast.h>
+#include <Common/parseRemoteDescription.h>
+#include <Core/Settings.h>
+
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeNullable.h>
+
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnDecimal.h>
-#include <Core/Settings.h>
-#include <Common/parseAddress.h>
-#include <Common/assert_cast.h>
-#include <Parsers/ASTLiteral.h>
 #include <Columns/ColumnNullable.h>
+
 #include <Formats/FormatFactory.h>
 #include <Formats/FormatSettings.h>
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <Common/parseRemoteDescription.h>
-#include <Processors/Pipe.h>
-#include <Processors/Sinks/SinkToStorage.h>
+
 #include <IO/WriteHelpers.h>
-#include <Parsers/getInsertQuery.h>
 #include <IO/Operators.h>
 
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/Context.h>
+
+#include <Parsers/getInsertQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+
+#include <Processors/Sinks/SinkToStorage.h>
+
+#include <Storages/StorageFactory.h>
+#include <Storages/transformQueryForExternalDatabase.h>
+
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int NOT_IMPLEMENTED;
+    extern const int BAD_ARGUMENTS;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 StoragePostgreSQL::StoragePostgreSQL(
@@ -376,53 +384,80 @@ SinkToStoragePtr StoragePostgreSQL::write(
 }
 
 
+StoragePostgreSQLConfiguration StoragePostgreSQL::getConfiguration(ASTs engine_args, ContextPtr context)
+{
+    StoragePostgreSQLConfiguration configuration;
+    if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+
+        configuration.set(common_configuration);
+        configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
+
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "on_conflict")
+                configuration.on_conflict = arg_value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Unexpected key-value argument."
+                        "Got: {}, but expected one of:"
+                        "host, port, username, password, database, table, schema, on_conflict.", arg_name);
+        }
+    }
+    else
+    {
+        if (engine_args.size() < 5 || engine_args.size() > 7)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Storage PostgreSQL requires from 5 to 7 parameters: "
+                            "PostgreSQL('host:port', 'database', 'table', 'username', 'password' [, 'schema', 'ON CONFLICT ...']. Got: {}",
+                            engine_args.size());
+
+        for (auto & engine_arg : engine_args)
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+
+        const auto & host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+
+        configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
+        if (configuration.addresses.size() == 1)
+        {
+            configuration.host = configuration.addresses[0].first;
+            configuration.port = configuration.addresses[0].second;
+        }
+
+        configuration.database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (engine_args.size() >= 6)
+            configuration.schema = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+        if (engine_args.size() >= 7)
+            configuration.on_conflict = engine_args[6]->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
+    return configuration;
+}
+
+
 void registerStoragePostgreSQL(StorageFactory & factory)
 {
     factory.registerStorage("PostgreSQL", [](const StorageFactory::Arguments & args)
     {
-        ASTs & engine_args = args.engine_args;
-
-        if (engine_args.size() < 5 || engine_args.size() > 7)
-            throw Exception("Storage PostgreSQL requires from 5 to 7 parameters: "
-                            "PostgreSQL('host:port', 'database', 'table', 'username', 'password' [, 'schema', 'ON CONFLICT ...']",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
-
-        auto host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        /// Split into replicas if needed.
-        size_t max_addresses = args.getContext()->getSettingsRef().glob_expansion_max_elements;
-        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
-
-        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
-
-        String remote_table_schema, on_conflict;
-        if (engine_args.size() >= 6)
-            remote_table_schema = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
-        if (engine_args.size() >= 7)
-            on_conflict = engine_args[6]->as<ASTLiteral &>().value.safeGet<String>();
-
-        auto pool = std::make_shared<postgres::PoolWithFailover>(
-            remote_database,
-            addresses,
-            username,
-            password,
+        auto configuration = StoragePostgreSQL::getConfiguration(args.engine_args, args.getLocalContext());
+        auto pool = std::make_shared<postgres::PoolWithFailover>(configuration,
             args.getContext()->getSettingsRef().postgresql_connection_pool_size,
             args.getContext()->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
         return StoragePostgreSQL::create(
             args.table_id,
             std::move(pool),
-            remote_table,
+            configuration.table,
             args.columns,
             args.constraints,
             args.comment,
-            remote_table_schema,
-            on_conflict);
+            configuration.schema,
+            configuration.on_conflict);
     },
     {
         .source_access_type = AccessType::POSTGRES,
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index a12b52e6e48..31797dc4cb4 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -10,12 +10,12 @@
 #include <Storages/IStorage.h>
 #include <DataStreams/IBlockOutputStream.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace DB
 {
 
-
 class StoragePostgreSQL final : public shared_ptr_helper<StoragePostgreSQL>, public IStorage
 {
     friend struct shared_ptr_helper<StoragePostgreSQL>;
@@ -43,6 +43,8 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
+    static StoragePostgreSQLConfiguration getConfiguration(ASTs engine_args, ContextPtr context);
+
 private:
     friend class PostgreSQLBlockOutputStream;
 
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index dcb1913f8b7..e67947ae811 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -17,6 +17,7 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeList.h>
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
 #include <Storages/MergeTree/PinnedPartUUIDs.h>
 #include <Storages/MergeTree/PartitionPruner.h>
@@ -27,6 +28,8 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h>
 #include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
+#include <Storages/MergeTree/MergeFromLogEntryTask.h>
+#include <Storages/MergeTree/MutateFromLogEntryTask.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Storages/MergeTree/MergeTreeReaderCompact.h>
 
@@ -125,7 +128,6 @@ namespace ErrorCodes
     extern const int PARTITION_DOESNT_EXIST;
     extern const int UNFINISHED;
     extern const int RECEIVED_ERROR_TOO_MANY_REQUESTS;
-    extern const int BAD_DATA_PART_NAME;
     extern const int PART_IS_TEMPORARILY_LOCKED;
     extern const int CANNOT_ASSIGN_OPTIMIZE;
     extern const int KEEPER_EXCEPTION;
@@ -283,8 +285,6 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     , merge_strategy_picker(*this)
     , queue(*this, merge_strategy_picker)
     , fetcher(*this)
-    , background_executor(*this, getContext())
-    , background_moves_executor(*this, getContext())
     , cleanup_thread(*this)
     , part_check_thread(*this)
     , restarting_thread(*this)
@@ -961,7 +961,9 @@ void StorageReplicatedMergeTree::checkTableStructure(const String & zookeeper_pr
     const ColumnsDescription & old_columns = metadata_snapshot->getColumns();
     if (columns_from_zk != old_columns)
     {
-        throw Exception("Table columns structure in ZooKeeper is different from local table structure", ErrorCodes::INCOMPATIBLE_COLUMNS);
+        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS,
+            "Table columns structure in ZooKeeper is different from local table structure. Local columns:\n"
+            "{}\nZookeeper columns:\n{}", old_columns.toString(), columns_from_zk.toString());
     }
 }
 
@@ -1162,10 +1164,8 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
     const UInt64 parts_to_fetch_blocks = std::accumulate(parts_to_fetch.cbegin(), parts_to_fetch.cend(), 0,
         [&](UInt64 acc, const String& part_name)
         {
-            MergeTreePartInfo part_info;
-
-            if (MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
-                return acc + part_info.getBlocksCount();
+            if (const auto part_info = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+                return acc + part_info->getBlocksCount();
 
             LOG_ERROR(log, "Unexpected part name: {}", part_name);
             return acc;
@@ -1225,34 +1225,24 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
 
         Coordination::Requests ops;
 
-        String has_replica = findReplicaHavingPart(part_name, true);
-        if (!has_replica.empty())
+        LOG_ERROR(log, "Removing locally missing part from ZooKeeper and queueing a fetch: {}", part_name);
+        time_t part_create_time = 0;
+        Coordination::ExistsResponse exists_resp = exists_futures[i].get();
+        if (exists_resp.error == Coordination::Error::ZOK)
         {
-            LOG_ERROR(log, "Removing locally missing part from ZooKeeper and queueing a fetch: {}", part_name);
-            time_t part_create_time = 0;
-            Coordination::ExistsResponse exists_resp = exists_futures[i].get();
-            if (exists_resp.error == Coordination::Error::ZOK)
-            {
-                part_create_time = exists_resp.stat.ctime / 1000;
-                removePartFromZooKeeper(part_name, ops, exists_resp.stat.numChildren > 0);
-            }
-            LogEntry log_entry;
-            log_entry.type = LogEntry::GET_PART;
-            log_entry.source_replica = "";
-            log_entry.new_part_name = part_name;
-            log_entry.create_time = part_create_time;
-
-            /// We assume that this occurs before the queue is loaded (queue.initialize).
-            ops.emplace_back(zkutil::makeCreateRequest(
-                fs::path(replica_path) / "queue/queue-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
-            enqueue_futures.emplace_back(zookeeper->asyncMulti(ops));
-        }
-        else
-        {
-            LOG_ERROR(log, "Not found active replica having part {}", part_name);
-            enqueuePartForCheck(part_name);
+            part_create_time = exists_resp.stat.ctime / 1000;
+            removePartFromZooKeeper(part_name, ops, exists_resp.stat.numChildren > 0);
         }
+        LogEntry log_entry;
+        log_entry.type = LogEntry::GET_PART;
+        log_entry.source_replica = "";
+        log_entry.new_part_name = part_name;
+        log_entry.create_time = part_create_time;
 
+        /// We assume that this occurs before the queue is loaded (queue.initialize).
+        ops.emplace_back(zkutil::makeCreateRequest(
+            fs::path(replica_path) / "queue/queue-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
+        enqueue_futures.emplace_back(zookeeper->asyncMulti(ops));
     }
 
     for (auto & future : enqueue_futures)
@@ -1455,13 +1445,12 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::attachPartHelperFo
     for (const DiskPtr & disk : getStoragePolicy()->getDisks())
         for (const auto it = disk->iterateDirectory(fs::path(relative_data_path) / "detached/"); it->isValid(); it->next())
         {
-            MergeTreePartInfo part_info;
+            const auto part_info = MergeTreePartInfo::tryParsePartName(it->name(), format_version);
 
-            if (!MergeTreePartInfo::tryParsePartName(it->name(), &part_info, format_version) ||
-                part_info.partition_id != actual_part_info.partition_id)
+            if (!part_info || part_info->partition_id != actual_part_info.partition_id)
                 continue;
 
-            const String part_old_name = part_info.getPartName();
+            const String part_old_name = part_info->getPartName();
             const String part_path = fs::path("detached") / part_old_name;
 
             const VolumePtr volume = std::make_shared<SingleDiskVolume>("volume_" + part_old_name, disk);
@@ -1560,7 +1549,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
         return true;    /// NOTE Deletion from `virtual_parts` is not done, but it is only necessary for merge.
     }
 
-    bool do_fetch = false;
+    // bool do_fetch = false;
 
     switch (entry.type)
     {
@@ -1568,17 +1557,12 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
             /// We surely don't have this part locally as we've checked it before, so download it.
             [[fallthrough]];
         case LogEntry::GET_PART:
-            do_fetch = true;
-            break;
+            return executeFetch(entry);
+            // do_fetch = true;
         case LogEntry::MERGE_PARTS:
-            /// Sometimes it's better to fetch the merged part instead of merging,
-            /// e.g when we don't have all the source parts.
-            do_fetch = !tryExecuteMerge(entry);
-            break;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Merge has to be executed by another function");
         case LogEntry::MUTATE_PART:
-            /// Sometimes it's better to fetch mutated part instead of merging.
-            do_fetch = !tryExecutePartMutation(entry);
-            break;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Mutation has to be executed by another function");
         case LogEntry::ALTER_METADATA:
             return executeMetadataAlter(entry);
         case LogEntry::SYNC_PINNED_PART_UUIDS:
@@ -1591,374 +1575,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected log entry type: {}", static_cast<int>(entry.type));
     }
 
-    if (do_fetch)
-        return executeFetch(entry);
-
-    return true;
-}
-
-bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
-{
-    LOG_TRACE(log, "Executing log entry to merge parts {} to {}",
-        fmt::join(entry.source_parts, ", "), entry.new_part_name);
-
-    const auto storage_settings_ptr = getSettings();
-
-    if (storage_settings_ptr->always_fetch_merged_part)
-    {
-        LOG_INFO(log, "Will fetch part {} because setting 'always_fetch_merged_part' is true", entry.new_part_name);
-        return false;
-    }
-
-    if (entry.merge_type == MergeType::TTL_RECOMPRESS &&
-        (time(nullptr) - entry.create_time) <= storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds() &&
-        entry.source_replica != replica_name)
-    {
-        LOG_INFO(log, "Will try to fetch part {} until '{}' because this part assigned to recompression merge. "
-            "Source replica {} will try to merge this part first", entry.new_part_name,
-            DateLUT::instance().timeToString(entry.create_time + storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds()), entry.source_replica);
-        return false;
-    }
-
-    /// In some use cases merging can be more expensive than fetching
-    /// and it may be better to spread merges tasks across the replicas
-    /// instead of doing exactly the same merge cluster-wise
-    std::optional<String> replica_to_execute_merge;
-    bool replica_to_execute_merge_picked = false;
-
-    if (merge_strategy_picker.shouldMergeOnSingleReplica(entry))
-    {
-        replica_to_execute_merge = merge_strategy_picker.pickReplicaToExecuteMerge(entry);
-        replica_to_execute_merge_picked = true;
-
-        if (replica_to_execute_merge)
-        {
-            LOG_DEBUG(log,
-                "Prefer fetching part {} from replica {} due to execute_merges_on_single_replica_time_threshold",
-                entry.new_part_name, replica_to_execute_merge.value());
-
-            return false;
-        }
-    }
-
-    DataPartsVector parts;
-
-    for (const String & source_part_name : entry.source_parts)
-    {
-        DataPartPtr source_part_or_covering = getActiveContainingPart(source_part_name);
-
-        if (!source_part_or_covering)
-        {
-            /// We do not have one of source parts locally, try to take some already merged part from someone.
-            LOG_DEBUG(log, "Don't have all parts for merge {}; will try to fetch it instead", entry.new_part_name);
-            return false;
-        }
-
-        if (source_part_or_covering->name != source_part_name)
-        {
-            /// We do not have source part locally, but we have some covering part. Possible options:
-            /// 1. We already have merged part (source_part_or_covering->name == new_part_name)
-            /// 2. We have some larger merged part which covers new_part_name (and therefore it covers source_part_name too)
-            /// 3. We have two intersecting parts, both cover source_part_name. It's logical error.
-            /// TODO Why 1 and 2 can happen? Do we need more assertions here or somewhere else?
-            constexpr const char * message = "Part {} is covered by {} but should be merged into {}. This shouldn't happen often.";
-            LOG_WARNING(log, message, source_part_name, source_part_or_covering->name, entry.new_part_name);
-            if (!source_part_or_covering->info.contains(MergeTreePartInfo::fromPartName(entry.new_part_name, format_version)))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, message, source_part_name, source_part_or_covering->name, entry.new_part_name);
-            return false;
-        }
-
-        parts.push_back(source_part_or_covering);
-    }
-
-    /// All source parts are found locally, we can execute merge
-
-    if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr))
-    {
-        /// If entry is old enough, and have enough size, and part are exists in any replica,
-        ///  then prefer fetching of merged part from replica.
-
-        size_t sum_parts_bytes_on_disk = 0;
-        for (const auto & part : parts)
-            sum_parts_bytes_on_disk += part->getBytesOnDisk();
-
-        if (sum_parts_bytes_on_disk >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
-        {
-            String replica = findReplicaHavingPart(entry.new_part_name, true);    /// NOTE excessive ZK requests for same data later, may remove.
-            if (!replica.empty())
-            {
-                LOG_DEBUG(log, "Prefer to fetch {} from replica {}", entry.new_part_name, replica);
-                return false;
-            }
-        }
-    }
-
-    /// Start to make the main work
-    size_t estimated_space_for_merge = MergeTreeDataMergerMutator::estimateNeededDiskSpace(parts);
-
-    /// Can throw an exception while reserving space.
-    IMergeTreeDataPart::TTLInfos ttl_infos;
-    size_t max_volume_index = 0;
-    for (auto & part_ptr : parts)
-    {
-        ttl_infos.update(part_ptr->ttl_infos);
-        max_volume_index = std::max(max_volume_index, getStoragePolicy()->getVolumeIndexByDisk(part_ptr->volume->getDisk()));
-    }
-    auto table_lock = lockForShare(RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
-
-    StorageMetadataPtr metadata_snapshot = getInMemoryMetadataPtr();
-    FutureMergedMutatedPart future_merged_part(parts, entry.new_part_type);
-    if (future_merged_part.name != entry.new_part_name)
-    {
-        throw Exception("Future merged part name " + backQuote(future_merged_part.name) + " differs from part name in log entry: "
-            + backQuote(entry.new_part_name), ErrorCodes::BAD_DATA_PART_NAME);
-    }
-
-    std::optional<CurrentlySubmergingEmergingTagger> tagger;
-    ReservationPtr reserved_space = balancedReservation(
-        metadata_snapshot,
-        estimated_space_for_merge,
-        max_volume_index,
-        future_merged_part.name,
-        future_merged_part.part_info,
-        future_merged_part.parts,
-        &tagger,
-        &ttl_infos);
-
-    if (!reserved_space)
-        reserved_space
-            = reserveSpacePreferringTTLRules(metadata_snapshot, estimated_space_for_merge, ttl_infos, time(nullptr), max_volume_index);
-
-    future_merged_part.uuid = entry.new_part_uuid;
-    future_merged_part.updatePath(*this, reserved_space);
-    future_merged_part.merge_type = entry.merge_type;
-
-    if (reserved_space->getDisk()->supportZeroCopyReplication()
-        && storage_settings_ptr->allow_remote_fs_zero_copy_replication
-        && merge_strategy_picker.shouldMergeOnSingleReplicaShared(entry))
-    {
-        if (!replica_to_execute_merge_picked)
-            replica_to_execute_merge = merge_strategy_picker.pickReplicaToExecuteMerge(entry);
-
-        if (replica_to_execute_merge)
-        {
-            LOG_DEBUG(log,
-                "Prefer fetching part {} from replica {} due to remote_fs_execute_merges_on_single_replica_time_threshold",
-                entry.new_part_name, replica_to_execute_merge.value());
-            return false;
-        }
-    }
-
-    /// Account TTL merge
-    if (isTTLMergeType(future_merged_part.merge_type))
-        getContext()->getMergeList().bookMergeWithTTL();
-
-    auto table_id = getStorageID();
-
-    /// Add merge to list
-    MergeList::EntryPtr merge_entry = getContext()->getMergeList().insert(getStorageID(), future_merged_part);
-
-    Transaction transaction(*this);
-    MutableDataPartPtr part;
-
-    Stopwatch stopwatch;
-
-    auto write_part_log = [&] (const ExecutionStatus & execution_status)
-    {
-        writePartLog(
-            PartLogElement::MERGE_PARTS, execution_status, stopwatch.elapsed(),
-            entry.new_part_name, part, parts, merge_entry.get());
-    };
-
-    try
-    {
-        part = merger_mutator.mergePartsToTemporaryPart(
-            future_merged_part,
-            metadata_snapshot,
-            *merge_entry,
-            table_lock,
-            entry.create_time,
-            getContext(),
-            reserved_space,
-            entry.deduplicate,
-            entry.deduplicate_by_columns,
-            merging_params);
-
-        merger_mutator.renameMergedTemporaryPart(part, parts, &transaction);
-
-        try
-        {
-            checkPartChecksumsAndCommit(transaction, part);
-        }
-        catch (const Exception & e)
-        {
-            if (MergeTreeDataPartChecksums::isBadChecksumsErrorCode(e.code()))
-            {
-                transaction.rollback();
-
-                ProfileEvents::increment(ProfileEvents::DataAfterMergeDiffersFromReplica);
-
-                LOG_ERROR(log,
-                    "{}. Data after merge is not byte-identical to data on another replicas. There could be several"
-                    " reasons: 1. Using newer version of compression library after server update. 2. Using another"
-                    " compression method. 3. Non-deterministic compression algorithm (highly unlikely). 4."
-                    " Non-deterministic merge algorithm due to logical error in code. 5. Data corruption in memory due"
-                    " to bug in code. 6. Data corruption in memory due to hardware issue. 7. Manual modification of"
-                    " source data after server startup. 8. Manual modification of checksums stored in ZooKeeper. 9."
-                    " Part format related settings like 'enable_mixed_granularity_parts' are different on different"
-                    " replicas. We will download merged part from replica to force byte-identical result.",
-                    getCurrentExceptionMessage(false));
-
-                write_part_log(ExecutionStatus::fromCurrentException());
-
-                tryRemovePartImmediately(std::move(part));
-                /// No need to delete the part from ZK because we can be sure that the commit transaction
-                /// didn't go through.
-
-                return false;
-            }
-
-            throw;
-        }
-
-        /** Removing old parts from ZK and from the disk is delayed - see ReplicatedMergeTreeCleanupThread, clearOldParts.
-          */
-
-        /** With `ZSESSIONEXPIRED` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
-          * This is not a problem, because in this case the merge will remain in the queue, and we will try again.
-          */
-        merge_selecting_task->schedule();
-        ProfileEvents::increment(ProfileEvents::ReplicatedPartMerges);
-
-        write_part_log({});
-
-        return true;
-    }
-    catch (...)
-    {
-        write_part_log(ExecutionStatus::fromCurrentException());
-        throw;
-    }
-}
-
-bool StorageReplicatedMergeTree::tryExecutePartMutation(const StorageReplicatedMergeTree::LogEntry & entry)
-{
-    const String & source_part_name = entry.source_parts.at(0);
-    const auto storage_settings_ptr = getSettings();
-    LOG_TRACE(log, "Executing log entry to mutate part {} to {}", source_part_name, entry.new_part_name);
-
-    DataPartPtr source_part = getActiveContainingPart(source_part_name);
-    if (!source_part)
-    {
-        LOG_DEBUG(log, "Source part {} for {} is not ready; will try to fetch it instead", source_part_name, entry.new_part_name);
-        return false;
-    }
-
-    if (source_part->name != source_part_name)
-    {
-        LOG_WARNING(log, "Part " + source_part_name + " is covered by " + source_part->name
-                    + " but should be mutated to " + entry.new_part_name + ". "
-                    + "Possibly the mutation of this part is not needed and will be skipped. This shouldn't happen often.");
-        return false;
-    }
-
-    /// TODO - some better heuristic?
-    size_t estimated_space_for_result = MergeTreeDataMergerMutator::estimateNeededDiskSpace({source_part});
-
-    if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr)
-        && estimated_space_for_result >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
-    {
-        /// If entry is old enough, and have enough size, and some replica has the desired part,
-        /// then prefer fetching from replica.
-        String replica = findReplicaHavingPart(entry.new_part_name, true);    /// NOTE excessive ZK requests for same data later, may remove.
-        if (!replica.empty())
-        {
-            LOG_DEBUG(log, "Prefer to fetch {} from replica {}", entry.new_part_name, replica);
-            return false;
-        }
-    }
-
-    MergeTreePartInfo new_part_info = MergeTreePartInfo::fromPartName(
-        entry.new_part_name, format_version);
-    MutationCommands commands = queue.getMutationCommands(source_part, new_part_info.mutation);
-
-    /// Once we mutate part, we must reserve space on the same disk, because mutations can possibly create hardlinks.
-    /// Can throw an exception.
-    ReservationPtr reserved_space = reserveSpace(estimated_space_for_result, source_part->volume);
-
-    auto table_lock = lockForShare(
-            RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
-    StorageMetadataPtr metadata_snapshot = getInMemoryMetadataPtr();
-
-    MutableDataPartPtr new_part;
-    Transaction transaction(*this);
-
-    FutureMergedMutatedPart future_mutated_part;
-    future_mutated_part.name = entry.new_part_name;
-    future_mutated_part.uuid = entry.new_part_uuid;
-    future_mutated_part.parts.push_back(source_part);
-    future_mutated_part.part_info = new_part_info;
-    future_mutated_part.updatePath(*this, reserved_space);
-    future_mutated_part.type = source_part->getType();
-
-    MergeList::EntryPtr merge_entry = getContext()->getMergeList().insert(getStorageID(), future_mutated_part);
-
-    Stopwatch stopwatch;
-
-    auto write_part_log = [&] (const ExecutionStatus & execution_status)
-    {
-        writePartLog(
-            PartLogElement::MUTATE_PART, execution_status, stopwatch.elapsed(),
-            entry.new_part_name, new_part, future_mutated_part.parts, merge_entry.get());
-    };
-
-    try
-    {
-        new_part = merger_mutator.mutatePartToTemporaryPart(
-            future_mutated_part, metadata_snapshot, commands, *merge_entry,
-            entry.create_time, getContext(), reserved_space, table_lock);
-        renameTempPartAndReplace(new_part, nullptr, &transaction);
-
-        try
-        {
-            checkPartChecksumsAndCommit(transaction, new_part);
-        }
-        catch (const Exception & e)
-        {
-            if (MergeTreeDataPartChecksums::isBadChecksumsErrorCode(e.code()))
-            {
-                transaction.rollback();
-
-                ProfileEvents::increment(ProfileEvents::DataAfterMutationDiffersFromReplica);
-
-                LOG_ERROR(log, "{}. Data after mutation is not byte-identical to data on another replicas. We will download merged part from replica to force byte-identical result.", getCurrentExceptionMessage(false));
-
-                write_part_log(ExecutionStatus::fromCurrentException());
-
-                tryRemovePartImmediately(std::move(new_part));
-                /// No need to delete the part from ZK because we can be sure that the commit transaction
-                /// didn't go through.
-
-                return false;
-            }
-
-            throw;
-        }
-
-        /** With `ZSESSIONEXPIRED` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
-          * This is not a problem, because in this case the entry will remain in the queue, and we will try again.
-          */
-        merge_selecting_task->schedule();
-        ProfileEvents::increment(ProfileEvents::ReplicatedPartMutations);
-        write_part_log({});
-
-        return true;
-    }
-    catch (...)
-    {
-        write_part_log(ExecutionStatus::fromCurrentException());
-        throw;
-    }
+    // return true;
 }
 
 
@@ -2197,7 +1814,11 @@ void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
         auto data_parts_lock = lockParts();
         parts_to_remove = removePartsInRangeFromWorkingSet(drop_range_info, true, data_parts_lock);
         if (parts_to_remove.empty())
+        {
+            if (!drop_range_info.isFakeDropRangePart())
+                LOG_INFO(log, "Log entry {} tried to drop single part {}, but part does not exist", entry.znode_name, entry.new_part_name);
             return;
+        }
     }
 
     if (entry.detach)
@@ -3129,9 +2750,9 @@ ReplicatedMergeTreeQueue::SelectedEntryPtr StorageReplicatedMergeTree::selectQue
     return selected;
 }
 
+
 bool StorageReplicatedMergeTree::processQueueEntry(ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry)
 {
-
     LogEntryPtr & entry = selected_entry->log_entry;
     return queue.processEntry([this]{ return getZooKeeper(); }, entry, [&](LogEntryPtr & entry_to_process)
     {
@@ -3174,7 +2795,7 @@ bool StorageReplicatedMergeTree::processQueueEntry(ReplicatedMergeTreeQueue::Sel
     });
 }
 
-bool StorageReplicatedMergeTree::scheduleDataProcessingJob(IBackgroundJobExecutor & executor)
+bool StorageReplicatedMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assignee)
 {
     /// If replication queue is stopped exit immediately as we successfully executed the task
     if (queue.actions_blocker.isCancelled())
@@ -3186,21 +2807,37 @@ bool StorageReplicatedMergeTree::scheduleDataProcessingJob(IBackgroundJobExecuto
     if (!selected_entry)
         return false;
 
+    auto job_type = selected_entry->log_entry->type;
+
     /// Depending on entry type execute in fetches (small) pool or big merge_mutate pool
-    if (selected_entry->log_entry->type == LogEntry::GET_PART)
+    if (job_type == LogEntry::GET_PART)
     {
-        executor.execute({[this, selected_entry] () mutable
-        {
-            return processQueueEntry(selected_entry);
-        }, PoolType::FETCH});
+        assignee.scheduleFetchTask(ExecutableLambdaAdapter::create(
+            [this, selected_entry] () mutable
+            {
+                return processQueueEntry(selected_entry);
+            }, common_assignee_trigger, getStorageID()));
+        return true;
+    }
+    else if (job_type == LogEntry::MERGE_PARTS)
+    {
+        auto task = MergeFromLogEntryTask::create(selected_entry, *this, common_assignee_trigger);
+        assignee.scheduleMergeMutateTask(task);
+        return true;
+    }
+    else if (job_type == LogEntry::MUTATE_PART)
+    {
+        auto task = MutateFromLogEntryTask::create(selected_entry, *this, common_assignee_trigger);
+        assignee.scheduleMergeMutateTask(task);
         return true;
     }
     else
     {
-        executor.execute({[this, selected_entry] () mutable
-        {
-            return processQueueEntry(selected_entry);
-        }, PoolType::MERGE_MUTATE});
+        assignee.scheduleMergeMutateTask(ExecutableLambdaAdapter::create(
+            [this, selected_entry] () mutable
+            {
+                return processQueueEntry(selected_entry);
+            }, common_assignee_trigger, getStorageID()));
         return true;
     }
 }
@@ -3280,24 +2917,24 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
             bool merge_with_ttl_allowed = merges_and_mutations_queued.merges_with_ttl < storage_settings_ptr->max_replicated_merges_with_ttl_in_queue &&
                 getTotalMergesWithTTLInMergeList() < storage_settings_ptr->max_number_of_merges_with_ttl_in_pool;
 
-            FutureMergedMutatedPart future_merged_part;
+            auto future_merged_part = std::make_shared<FutureMergedMutatedPart>();
             if (storage_settings.get()->assign_part_uuids)
-                future_merged_part.uuid = UUIDHelpers::generateV4();
+                future_merged_part->uuid = UUIDHelpers::generateV4();
 
             if (max_source_parts_size_for_merge > 0 &&
                 merger_mutator.selectPartsToMerge(future_merged_part, false, max_source_parts_size_for_merge, merge_pred, merge_with_ttl_allowed, nullptr) == SelectPartsDecision::SELECTED)
             {
                 create_result = createLogEntryToMergeParts(
                     zookeeper,
-                    future_merged_part.parts,
-                    future_merged_part.name,
-                    future_merged_part.uuid,
-                    future_merged_part.type,
+                    future_merged_part->parts,
+                    future_merged_part->name,
+                    future_merged_part->uuid,
+                    future_merged_part->type,
                     deduplicate,
                     deduplicate_by_columns,
                     nullptr,
                     merge_pred.getVersion(),
-                    future_merged_part.merge_type);
+                    future_merged_part->merge_type);
             }
             /// If there are many mutations in queue, it may happen, that we cannot enqueue enough merges to merge all new parts
             else if (max_source_part_size_for_mutation > 0 && queue.countMutations() > 0
@@ -3316,7 +2953,7 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
 
                     create_result = createLogEntryToMutatePart(
                         *part,
-                        future_merged_part.uuid,
+                        future_merged_part->uuid,
                         desired_mutation_version->first,
                         desired_mutation_version->second,
                         merge_pred.getVersion());
@@ -4291,8 +3928,6 @@ void StorageReplicatedMergeTree::startup()
 
     try
     {
-        queue.initialize(getDataParts());
-
         InterserverIOEndpointPtr data_parts_exchange_ptr = std::make_shared<DataPartsExchange::Service>(*this);
         [[maybe_unused]] auto prev_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, data_parts_exchange_ptr);
         assert(prev_ptr == nullptr);
@@ -4336,7 +3971,7 @@ void StorageReplicatedMergeTree::shutdown()
     parts_mover.moves_blocker.cancelForever();
 
     restarting_thread.shutdown();
-    background_executor.finish();
+    background_operations_assignee.finish();
     part_moves_between_shards_orchestrator.shutdown();
 
     {
@@ -4346,7 +3981,7 @@ void StorageReplicatedMergeTree::shutdown()
         /// MUTATE, etc. query.
         queue.pull_log_blocker.cancelForever();
     }
-    background_moves_executor.finish();
+    background_moves_assignee.finish();
 
     auto data_parts_exchange_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, InterserverIOEndpointPtr{});
     if (data_parts_exchange_ptr)
@@ -4601,10 +4236,10 @@ bool StorageReplicatedMergeTree::optimize(
                     std::lock_guard merge_selecting_lock(merge_selecting_mutex);
                     ReplicatedMergeTreeMergePredicate can_merge = queue.getMergePredicate(zookeeper);
 
-                    FutureMergedMutatedPart future_merged_part;
+                    auto future_merged_part = std::make_shared<FutureMergedMutatedPart>();
 
                     if (storage_settings.get()->assign_part_uuids)
-                        future_merged_part.uuid = UUIDHelpers::generateV4();
+                        future_merged_part->uuid = UUIDHelpers::generateV4();
 
                     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);
@@ -4614,10 +4249,10 @@ bool StorageReplicatedMergeTree::optimize(
 
                     ReplicatedMergeTreeLogEntryData merge_entry;
                     CreateMergeEntryResult create_result = createLogEntryToMergeParts(
-                        zookeeper, future_merged_part.parts,
-                        future_merged_part.name, future_merged_part.uuid, future_merged_part.type,
+                        zookeeper, future_merged_part->parts,
+                        future_merged_part->name, future_merged_part->uuid, future_merged_part->type,
                         deduplicate, deduplicate_by_columns,
-                        &merge_entry, can_merge.getVersion(), future_merged_part.merge_type);
+                        &merge_entry, can_merge.getVersion(), future_merged_part->merge_type);
 
                     if (create_result == CreateMergeEntryResult::MissingPart)
                         return handle_noop("Can't create merge queue node in ZooKeeper, because some parts are missing");
@@ -4641,9 +4276,9 @@ bool StorageReplicatedMergeTree::optimize(
                 std::lock_guard merge_selecting_lock(merge_selecting_mutex);
                 ReplicatedMergeTreeMergePredicate can_merge = queue.getMergePredicate(zookeeper);
 
-                FutureMergedMutatedPart future_merged_part;
+                auto future_merged_part = std::make_shared<FutureMergedMutatedPart>();
                 if (storage_settings.get()->assign_part_uuids)
-                    future_merged_part.uuid = UUIDHelpers::generateV4();
+                    future_merged_part->uuid = UUIDHelpers::generateV4();
 
                 String disable_reason;
                 SelectPartsDecision select_decision = SelectPartsDecision::CANNOT_SELECT;
@@ -4676,10 +4311,10 @@ bool StorageReplicatedMergeTree::optimize(
 
                 ReplicatedMergeTreeLogEntryData merge_entry;
                 CreateMergeEntryResult create_result = createLogEntryToMergeParts(
-                    zookeeper, future_merged_part.parts,
-                    future_merged_part.name, future_merged_part.uuid, future_merged_part.type,
+                    zookeeper, future_merged_part->parts,
+                    future_merged_part->name, future_merged_part->uuid, future_merged_part->type,
                     deduplicate, deduplicate_by_columns,
-                    &merge_entry, can_merge.getVersion(), future_merged_part.merge_type);
+                    &merge_entry, can_merge.getVersion(), future_merged_part->merge_type);
 
                 if (create_result == CreateMergeEntryResult::MissingPart)
                     return handle_noop("Can't create merge queue node in ZooKeeper, because some parts are missing");
@@ -4992,7 +4627,8 @@ void StorageReplicatedMergeTree::alter(
         else if (rc == Coordination::Error::ZBADVERSION)
         {
             if (results[0]->error != Coordination::Error::ZOK)
-                throw Exception("Metadata on replica is not up to date with common metadata in Zookeeper. Cannot alter",
+                throw Exception("Metadata on replica is not up to date with common metadata in Zookeeper. It means that this replica still not applied some of previous alters."
+                                " Probably too many alters executing concurrently (highly not recommended). You can retry this error",
                     ErrorCodes::CANNOT_ASSIGN_ALTER);
 
             /// Cannot retry automatically, because some zookeeper ops were lost on the first attempt. Will retry on DDLWorker-level.
@@ -5098,7 +4734,7 @@ void StorageReplicatedMergeTree::restoreMetadataInZooKeeper()
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
-    const DataPartsVector all_parts = getDataPartsVector(IMergeTreeDataPart::all_part_states);
+    const DataPartsVector all_parts = getAllDataPartsVector();
     Strings active_parts_names;
 
     /// Why all parts (not only Committed) are moved to detached/:
@@ -5948,7 +5584,7 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, Conte
     ///
     /// Leader replica records its decisions to the replication log (/log directory in ZK) in the form of
     /// MUTATE_PART entries and all replicas then execute them in the background pool
-    /// (see tryExecutePartMutation() function). When a replica encounters a MUTATE_PART command, it is
+    /// (see MutateTask class). When a replica encounters a MUTATE_PART command, it is
     /// guaranteed that the corresponding mutation entry is already loaded (when we pull entries from
     /// replication log into the replica queue, we also load mutation entries). Note that just as with merges
     /// the replica can decide not to do the mutation locally and fetch the mutated part from another replica
@@ -6032,7 +5668,18 @@ void StorageReplicatedMergeTree::waitMutation(const String & znode_name, size_t
     auto zookeeper = getZooKeeper();
     Strings replicas;
     if (mutations_sync == 2) /// wait for all replicas
+    {
         replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
+        /// This replica should be first, to ensure that the mutation will be loaded into memory
+        for (auto it = replicas.begin(); it != replicas.end(); ++it)
+        {
+            if (*it == replica_name)
+            {
+                std::iter_swap(it, replicas.rbegin());
+                break;
+            }
+        }
+    }
     else if (mutations_sync == 1) /// just wait for ourself
         replicas.push_back(replica_name);
 
@@ -6303,6 +5950,7 @@ void StorageReplicatedMergeTree::getClearBlocksInPartitionOps(
 
     String partition_prefix = partition_id + "_";
     zkutil::AsyncResponses<Coordination::GetResponse> get_futures;
+
     for (const String & block_id : blocks)
     {
         if (startsWith(block_id, partition_prefix))
@@ -6321,9 +5969,10 @@ void StorageReplicatedMergeTree::getClearBlocksInPartitionOps(
             continue;
 
         ReadBufferFromString buf(result.data);
-        MergeTreePartInfo part_info;
-        bool parsed = MergeTreePartInfo::tryParsePartName(result.data, &part_info, format_version);
-        if (!parsed || (min_block_num <= part_info.min_block && part_info.max_block <= max_block_num))
+
+        const auto part_info = MergeTreePartInfo::tryParsePartName(result.data, format_version);
+
+        if (!part_info || (min_block_num <= part_info->min_block && part_info->max_block <= max_block_num))
             ops.emplace_back(zkutil::makeRemoveRequest(path, -1));
     }
 }
@@ -6946,9 +6595,9 @@ void StorageReplicatedMergeTree::onActionLockRemove(StorageActionBlockType actio
     if (action_type == ActionLocks::PartsMerge || action_type == ActionLocks::PartsTTLMerge
         || action_type == ActionLocks::PartsFetch || action_type == ActionLocks::PartsSend
         || action_type == ActionLocks::ReplicationQueue)
-        background_executor.triggerTask();
+        background_operations_assignee.trigger();
     else if (action_type == ActionLocks::PartsMove)
-        background_moves_executor.triggerTask();
+        background_moves_assignee.trigger();
 }
 
 bool StorageReplicatedMergeTree::waitForShrinkingQueueSize(size_t queue_size, UInt64 max_wait_milliseconds)
@@ -6960,7 +6609,7 @@ bool StorageReplicatedMergeTree::waitForShrinkingQueueSize(size_t queue_size, UI
 
     /// This is significant, because the execution of this task could be delayed at BackgroundPool.
     /// And we force it to be executed.
-    background_executor.triggerTask();
+    background_operations_assignee.trigger();
 
     Poco::Event target_size_event;
     auto callback = [&target_size_event, queue_size] (size_t new_queue_size)
@@ -7194,7 +6843,7 @@ MutationCommands StorageReplicatedMergeTree::getFirstAlterMutationCommandsForPar
 void StorageReplicatedMergeTree::startBackgroundMovesIfNeeded()
 {
     if (areBackgroundMovesNeeded())
-        background_moves_executor.start();
+        background_moves_assignee.start();
 }
 
 std::unique_ptr<MergeTreeSettings> StorageReplicatedMergeTree::getDefaultSettings() const
@@ -7415,12 +7064,15 @@ bool StorageReplicatedMergeTree::checkIfDetachedPartExists(const String & part_n
 bool StorageReplicatedMergeTree::checkIfDetachedPartitionExists(const String & partition_name)
 {
     fs::directory_iterator dir_end;
+
     for (const std::string & path : getDataPaths())
     {
         for (fs::directory_iterator dir_it{fs::path(path) / "detached/"}; dir_it != dir_end; ++dir_it)
         {
-            MergeTreePartInfo part_info;
-            if (MergeTreePartInfo::tryParsePartName(dir_it->path().filename(), &part_info, format_version) && part_info.partition_id == partition_name)
+            const String file_name = dir_it->path().filename().string();
+            auto part_info = MergeTreePartInfo::tryParsePartName(file_name, format_version);
+
+            if (part_info && part_info->partition_id == partition_name)
                 return true;
         }
     }
@@ -7445,8 +7097,8 @@ bool StorageReplicatedMergeTree::createEmptyPartInsteadOfLost(zkutil::ZooKeeperP
     ReservationPtr reservation = reserveSpacePreferringTTLRules(metadata_snapshot, 0, move_ttl_infos, time(nullptr), 0, true);
     VolumePtr volume = getStoragePolicy()->getVolume(0);
 
-    IMergeTreeDataPart::MinMaxIndex minmax_idx;
-    minmax_idx.update(block, getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+    auto minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
+    minmax_idx->update(block, getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
 
     auto new_data_part = createPart(
         lost_part_name,
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index 3440a7d81b5..e76a54ac5ec 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -21,6 +21,8 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
 #include <Storages/MergeTree/LeaderElection.h>
 #include <Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/MergeFromLogEntryTask.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/PartLog.h>
@@ -29,7 +31,7 @@
 #include <Common/Throttler.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Processors/Pipe.h>
-#include <Storages/MergeTree/BackgroundJobsExecutor.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
 
 
 namespace DB
@@ -218,7 +220,7 @@ public:
                                               const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, Poco::Logger * logger);
 
     /// Schedules job to execute in background pool (merge, mutate, drop range and so on)
-    bool scheduleDataProcessingJob(IBackgroundJobExecutor & executor) override;
+    bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) override;
 
     /// Checks that fetches are not disabled with action blocker and pool for fetches
     /// is not overloaded
@@ -282,6 +284,9 @@ private:
     friend class ReplicatedMergeTreeQueue;
     friend class PartMovesBetweenShardsOrchestrator;
     friend class MergeTreeData;
+    friend class MergeFromLogEntryTask;
+    friend class MutateFromLogEntryTask;
+    friend class ReplicatedMergeMutateTaskBase;
 
     using MergeStrategyPicker = ReplicatedMergeTreeMergeStrategyPicker;
     using LogEntry = ReplicatedMergeTreeLogEntry;
@@ -350,9 +355,6 @@ private:
     int metadata_version = 0;
     /// Threads.
 
-    BackgroundJobsExecutor background_executor;
-    BackgroundMovesExecutor background_moves_executor;
-
     /// A task that keeps track of the updates in the logs of all replicas and loads them into the queue.
     bool queue_update_in_progress = false;
     BackgroundSchedulePool::TaskHolder queue_updating_task;
@@ -473,19 +475,11 @@ private:
 
     void executeDropRange(const LogEntry & entry);
 
-    /// Do the merge or recommend to make the fetch instead of the merge
-    bool tryExecuteMerge(const LogEntry & entry);
-
     /// Execute alter of table metadata. Set replica/metadata and replica/columns
     /// nodes in zookeeper and also changes in memory metadata.
     /// New metadata and columns values stored in entry.
     bool executeMetadataAlter(const LogEntry & entry);
 
-    /// Execute MUTATE_PART entry. Part name and mutation commands
-    /// stored in entry. This function relies on MergerMutator class.
-    bool tryExecutePartMutation(const LogEntry & entry);
-
-
     /// Fetch part from other replica (inserted or merged/mutated)
     /// NOTE: Attention! First of all tries to find covering part on other replica
     /// and set it into entry.actual_new_part_name. After that tries to fetch this new covering part.
@@ -515,6 +509,9 @@ private:
 
     ReplicatedMergeTreeQueue::SelectedEntryPtr selectQueueEntry();
 
+
+    MergeFromLogEntryTaskPtr getTaskToProcessMergeQueueEntry(ReplicatedMergeTreeQueue::SelectedEntryPtr entry);
+
     bool processQueueEntry(ReplicatedMergeTreeQueue::SelectedEntryPtr entry);
 
     /// Postcondition:
@@ -608,7 +605,6 @@ private:
     std::unordered_set<String> currently_fetching_parts;
     std::mutex currently_fetching_parts_mutex;
 
-
     /// With the quorum being tracked, add a replica to the quorum for the part.
     void updateQuorum(const String & part_name, bool is_parallel);
 
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 1b22d96dc80..ae4e523d2d8 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -732,20 +732,70 @@ void StorageS3::updateClientAndAuthSettings(ContextPtr ctx, StorageS3::ClientAut
     upd.auth_settings = std::move(settings);
 }
 
-void registerStorageS3Impl(const String & name, StorageFactory & factory)
-{
-    factory.registerStorage(name, [](const StorageFactory::Arguments & args)
-    {
-        ASTs & engine_args = args.engine_args;
 
+StorageS3Configuration StorageS3::getConfiguration(ASTs & engine_args, ContextPtr local_context)
+{
+    StorageS3Configuration configuration;
+
+    if (auto named_collection = getURLBasedDataSourceConfiguration(engine_args, local_context))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
+
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "access_key_id")
+                configuration.access_key_id = arg_value.safeGet<String>();
+            else if (arg_name == "secret_access_key")
+                configuration.secret_access_key = arg_value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Unknown key-value argument `{}` for StorageS3, expected: url, [access_key_id, secret_access_key], name of used format and [compression_method].",
+                    arg_name);
+        }
+    }
+    else
+    {
         if (engine_args.size() < 2 || engine_args.size() > 5)
             throw Exception(
                 "Storage S3 requires 2 to 5 arguments: url, [access_key_id, secret_access_key], name of used format and [compression_method].",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, local_context);
 
+        configuration.url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        if (engine_args.size() >= 4)
+        {
+            configuration.access_key_id = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.secret_access_key = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        }
+
+        if (engine_args.size() == 3 || engine_args.size() == 5)
+        {
+            configuration.compression_method = engine_args.back()->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.format = engine_args[engine_args.size() - 2]->as<ASTLiteral &>().value.safeGet<String>();
+        }
+        else
+        {
+            configuration.compression_method = "auto";
+            configuration.format = engine_args.back()->as<ASTLiteral &>().value.safeGet<String>();
+        }
+    }
+
+    return configuration;
+}
+
+
+void registerStorageS3Impl(const String & name, StorageFactory & factory)
+{
+    factory.registerStorage(name, [](const StorageFactory::Arguments & args)
+    {
+        auto & engine_args = args.engine_args;
+        if (engine_args.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
+
+        auto configuration = StorageS3::getConfiguration(engine_args, args.getLocalContext());
         // Use format settings from global server context + settings from
         // the SETTINGS clause of the create query. Settings from current
         // session and user are ignored.
@@ -760,9 +810,7 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             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.
@@ -774,42 +822,18 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             format_settings = getFormatSettings(args.getContext());
         }
 
-        String url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        Poco::URI uri (url);
-        S3::URI s3_uri (uri);
-
-        String access_key_id;
-        String secret_access_key;
-        if (engine_args.size() >= 4)
-        {
-            access_key_id = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-            secret_access_key = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        }
-
-        UInt64 max_single_read_retries = args.getLocalContext()->getSettingsRef().s3_max_single_read_retries;
-        UInt64 min_upload_part_size = args.getLocalContext()->getSettingsRef().s3_min_upload_part_size;
-        UInt64 max_single_part_upload_size = args.getLocalContext()->getSettingsRef().s3_max_single_part_upload_size;
-        UInt64 max_connections = args.getLocalContext()->getSettingsRef().s3_max_connections;
-
-        String compression_method;
-        String format_name;
-        if (engine_args.size() == 3 || engine_args.size() == 5)
-        {
-            compression_method = engine_args.back()->as<ASTLiteral &>().value.safeGet<String>();
-            format_name = engine_args[engine_args.size() - 2]->as<ASTLiteral &>().value.safeGet<String>();
-        }
-        else
-        {
-            compression_method = "auto";
-            format_name = engine_args.back()->as<ASTLiteral &>().value.safeGet<String>();
-        }
+        S3::URI s3_uri(Poco::URI(configuration.url));
+        auto max_single_read_retries = args.getLocalContext()->getSettingsRef().s3_max_single_read_retries;
+        auto min_upload_part_size = args.getLocalContext()->getSettingsRef().s3_min_upload_part_size;
+        auto max_single_part_upload_size = args.getLocalContext()->getSettingsRef().s3_max_single_part_upload_size;
+        auto max_connections = args.getLocalContext()->getSettingsRef().s3_max_connections;
 
         return StorageS3::create(
             s3_uri,
-            access_key_id,
-            secret_access_key,
+            configuration.access_key_id,
+            configuration.secret_access_key,
             args.table_id,
-            format_name,
+            configuration.format,
             max_single_read_retries,
             min_upload_part_size,
             max_single_part_upload_size,
@@ -819,7 +843,7 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             args.comment,
             args.getContext(),
             format_settings,
-            compression_method);
+            configuration.compression_method);
     },
     {
         .supports_settings = true,
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index cfd7e496928..d51581be74b 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -18,6 +18,7 @@
 #include <IO/S3Common.h>
 #include <IO/CompressionMethod.h>
 #include <Interpreters/Context.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 namespace Aws::S3
 {
@@ -141,6 +142,8 @@ public:
 
     bool supportsPartitionBy() const override;
 
+    static StorageS3Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context);
+
 private:
 
     friend class StorageS3Cluster;
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index ba2ed4c55cd..a278b9d3dec 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -15,7 +15,6 @@
 #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>
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 1aa5ac7f236..81820ce5e1d 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -6,7 +6,6 @@
 #include <Parsers/ASTLiteral.h>
 
 #include <IO/ReadHelpers.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/WriteBufferFromHTTP.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ConnectionTimeouts.h>
@@ -32,8 +31,10 @@ namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int NETWORK_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
+
 IStorageURLBase::IStorageURLBase(
     const Poco::URI & uri_,
     ContextPtr /*context_*/,
@@ -43,8 +44,9 @@ IStorageURLBase::IStorageURLBase(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
-    const String & compression_method_)
-    : IStorage(table_id_), uri(uri_), compression_method(compression_method_), format_name(format_name_), format_settings(format_settings_)
+    const String & compression_method_,
+    const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_)
+    : IStorage(table_id_), uri(uri_), compression_method(compression_method_), format_name(format_name_), format_settings(format_settings_), headers(headers_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -69,10 +71,14 @@ namespace
             const ColumnsDescription & columns,
             UInt64 max_block_size,
             const ConnectionTimeouts & timeouts,
-            const CompressionMethod compression_method)
+            const CompressionMethod compression_method,
+            const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_ = {})
             : SourceWithProgress(sample_block), name(std::move(name_))
         {
-            ReadWriteBufferFromHTTP::HTTPHeaderEntries header;
+            ReadWriteBufferFromHTTP::HTTPHeaderEntries headers;
+
+            for (const auto & header : headers_)
+                headers.emplace_back(header);
 
             // Propagate OpenTelemetry trace context, if any, downstream.
             if (CurrentThread::isInitialized())
@@ -80,12 +86,12 @@ namespace
                 const auto & thread_trace_context = CurrentThread::get().thread_trace_context;
                 if (thread_trace_context.trace_id != UUID())
                 {
-                    header.emplace_back("traceparent",
+                    headers.emplace_back("traceparent",
                         thread_trace_context.composeTraceparentHeader());
 
                     if (!thread_trace_context.tracestate.empty())
                     {
-                        header.emplace_back("tracestate",
+                        headers.emplace_back("tracestate",
                             thread_trace_context.tracestate);
                     }
                 }
@@ -100,7 +106,7 @@ namespace
                     context->getSettingsRef().max_http_get_redirects,
                     Poco::Net::HTTPBasicCredentials{},
                     DBMS_DEFAULT_BUFFER_SIZE,
-                    header,
+                    headers,
                     context->getRemoteHostFilter()),
                 compression_method);
 
@@ -237,7 +243,8 @@ Pipe IStorageURLBase::read(
         metadata_snapshot->getColumns(),
         max_block_size,
         ConnectionTimeouts::getHTTPTimeouts(local_context),
-        chooseCompressionMethod(request_uri.getPath(), compression_method)));
+        chooseCompressionMethod(request_uri.getPath(), compression_method),
+        headers));
 }
 
 
@@ -312,8 +319,9 @@ StorageURL::StorageURL(
     const ConstraintsDescription & constraints_,
     const String & comment,
     ContextPtr context_,
-    const String & compression_method_)
-    : IStorageURLBase(uri_, context_, table_id_, format_name_, format_settings_, columns_, constraints_, comment, compression_method_)
+    const String & compression_method_,
+    const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_)
+    : IStorageURLBase(uri_, context_, table_id_, format_name_, format_settings_, columns_, constraints_, comment, compression_method_, headers_)
 {
     context_->getRemoteHostFilter().checkURL(uri);
 }
@@ -375,45 +383,73 @@ FormatSettings StorageURL::getFormatSettingsFromArgs(const StorageFactory::Argum
     return format_settings;
 }
 
+URLBasedDataSourceConfiguration StorageURL::getConfiguration(ASTs & args, ContextPtr local_context)
+{
+    URLBasedDataSourceConfiguration configuration;
+
+    if (auto named_collection = getURLBasedDataSourceConfiguration(args, local_context))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
+
+        if (!storage_specific_args.empty())
+        {
+            String illegal_args;
+            for (const auto & arg : storage_specific_args)
+            {
+                if (!illegal_args.empty())
+                    illegal_args += ", ";
+                illegal_args += arg.first;
+            }
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown arguments {} for table function URL", illegal_args);
+        }
+    }
+    else
+    {
+        if (args.size() != 2 && args.size() != 3)
+            throw Exception(
+                "Storage URL requires 2 or 3 arguments: url, name of used format and optional compression method.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        for (auto & arg : args)
+            arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, local_context);
+
+        configuration.url = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.format = args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        if (args.size() == 3)
+            configuration.compression_method = args[2]->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
+    return configuration;
+}
+
 
 void registerStorageURL(StorageFactory & factory)
 {
     factory.registerStorage("URL", [](const StorageFactory::Arguments & args)
     {
         ASTs & engine_args = args.engine_args;
-
-        if (engine_args.size() != 2 && engine_args.size() != 3)
-            throw Exception(
-                "Storage URL requires 2 or 3 arguments: url, name of used format and optional compression method.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[0], args.getLocalContext());
-
-        const String & url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        Poco::URI uri(url);
-
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
-
-        const String & format_name = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-
-        String compression_method = "auto";
-        if (engine_args.size() == 3)
-        {
-            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.getLocalContext());
-            compression_method = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        }
-
+        auto configuration = StorageURL::getConfiguration(engine_args, args.getLocalContext());
         auto format_settings = StorageURL::getFormatSettingsFromArgs(args);
+        Poco::URI uri(configuration.url);
+
+        ReadWriteBufferFromHTTP::HTTPHeaderEntries headers;
+        for (const auto & [header, value] : configuration.headers)
+        {
+            auto value_literal = value.safeGet<String>();
+            headers.emplace_back(std::make_pair(header, value_literal));
+        }
 
         return StorageURL::create(
             uri,
             args.table_id,
-            format_name,
+            configuration.format,
             format_settings,
             args.columns,
             args.constraints,
             args.comment,
             args.getContext(),
-            compression_method);
+            configuration.compression_method,
+            headers);
     },
     {
         .supports_settings = true,
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 7d61661b68d..930272ab1aa 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -6,7 +6,9 @@
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Formats/FormatSettings.h>
 #include <IO/CompressionMethod.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
 #include <Storages/StorageFactory.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace DB
@@ -44,7 +46,8 @@ protected:
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
-        const String & compression_method_);
+        const String & compression_method_,
+        const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_ = {});
 
     Poco::URI uri;
     String compression_method;
@@ -54,6 +57,7 @@ protected:
     // For `url` table function, we use settings from current query context.
     // In this case, format_settings is not set.
     std::optional<FormatSettings> format_settings;
+    ReadWriteBufferFromHTTP::HTTPHeaderEntries headers;
 
     virtual std::string getReadMethod() const;
 
@@ -113,7 +117,8 @@ public:
         const ConstraintsDescription & constraints_,
         const String & comment,
         ContextPtr context_,
-        const String & compression_method_);
+        const String & compression_method_,
+        const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_ = {});
 
     String getName() const override
     {
@@ -126,6 +131,8 @@ public:
     }
 
     static FormatSettings getFormatSettingsFromArgs(const StorageFactory::Arguments & args);
+
+    static URLBasedDataSourceConfiguration getConfiguration(ASTs & args, ContextPtr context);
 };
 
 
@@ -152,6 +159,13 @@ public:
         size_t max_block_size,
         unsigned num_streams) override;
 
+    struct Configuration
+    {
+        String url;
+        String compression_method = "auto";
+        std::vector<std::pair<String, String>> headers;
+    };
+
 private:
     std::vector<Poco::URI> uri_options;
 };
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 790b925f891..e4b0e57a563 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -158,8 +158,8 @@ void StorageView::read(
     {
         throw DB::Exception(ErrorCodes::INCORRECT_QUERY,
                             "Query from view {} returned Nullable column having not Nullable type in structure. "
-                            "If query from view has JOIN, it may be cause by different values of 'json_use_nulls' setting. "
-                            "You may explicitly specify 'json_use_nulls' in 'CREATE VIEW' query to avoid this error",
+                            "If query from view has JOIN, it may be cause by different values of 'join_use_nulls' setting. "
+                            "You may explicitly specify 'join_use_nulls' in 'CREATE VIEW' query to avoid this error",
                             getStorageID().getFullTableName());
     }
 
diff --git a/src/Storages/System/CMakeLists.txt b/src/Storages/System/CMakeLists.txt
index 7e350932038..2e909c03f5d 100644
--- a/src/Storages/System/CMakeLists.txt
+++ b/src/Storages/System/CMakeLists.txt
@@ -2,6 +2,8 @@
 # You can also regenerate it manually this way:
 # execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/StorageSystemContributors.sh")
 
+include(${ClickHouse_SOURCE_DIR}/cmake/embed_binary.cmake)
+
 set (CONFIG_BUILD "${CMAKE_CURRENT_BINARY_DIR}/StorageSystemBuildOptions.generated.cpp")
 get_property (BUILD_COMPILE_DEFINITIONS DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
 get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
@@ -41,7 +43,16 @@ list (APPEND storages_system_sources ${GENERATED_TIMEZONES_SRC})
 # Overlength strings
 set_source_files_properties(${GENERATED_LICENSES_SRC} PROPERTIES COMPILE_FLAGS -w)
 
+clickhouse_embed_binaries(
+        TARGET information_schema_metadata
+        RESOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/InformationSchema/"
+        RESOURCES schemata.sql tables.sql views.sql columns.sql
+)
+
 add_library(clickhouse_storages_system ${storages_system_headers} ${storages_system_sources})
+
+add_dependencies(clickhouse_storages_system information_schema_metadata)
+
 target_link_libraries(clickhouse_storages_system PRIVATE
     dbms
     common
@@ -49,4 +60,5 @@ target_link_libraries(clickhouse_storages_system PRIVATE
     clickhouse_common_zookeeper
     clickhouse_parsers
     Poco::JSON
+    INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:information_schema_metadata> -Wl,${NO_WHOLE_ARCHIVE}"
 )
diff --git a/src/Storages/System/InformationSchema/columns.sql b/src/Storages/System/InformationSchema/columns.sql
new file mode 100644
index 00000000000..1b71ea58f57
--- /dev/null
+++ b/src/Storages/System/InformationSchema/columns.sql
@@ -0,0 +1,74 @@
+ATTACH VIEW columns
+(
+    `table_catalog` String,
+    `table_schema` String,
+    `table_name` String,
+    `column_name` String,
+    `ordinal_position` UInt64,
+    `column_default` String,
+    `is_nullable` UInt8,
+    `data_type` String,
+    `character_maximum_length` Nullable(UInt64),
+    `character_octet_length` Nullable(UInt64),
+    `numeric_precision` Nullable(UInt64),
+    `numeric_precision_radix` Nullable(UInt64),
+    `numeric_scale` Nullable(UInt64),
+    `datetime_precision` Nullable(UInt64),
+    `character_set_catalog` Nullable(String),
+    `character_set_schema` Nullable(String),
+    `character_set_name` Nullable(String),
+    `collation_catalog` Nullable(String),
+    `collation_schema` Nullable(String),
+    `collation_name` Nullable(String),
+    `domain_catalog` Nullable(String),
+    `domain_schema` Nullable(String),
+    `domain_name` Nullable(String),
+    `TABLE_CATALOG` String ALIAS table_catalog,
+    `TABLE_SCHEMA` String ALIAS table_schema,
+    `TABLE_NAME` String ALIAS table_name,
+    `COLUMN_NAME` String ALIAS column_name,
+    `ORDINAL_POSITION` UInt64 ALIAS ordinal_position,
+    `COLUMN_DEFAULT` String ALIAS column_default,
+    `IS_NULLABLE` UInt8 ALIAS is_nullable,
+    `DATA_TYPE` String ALIAS data_type,
+    `CHARACTER_MAXIMUM_LENGTH` Nullable(UInt64) ALIAS character_maximum_length,
+    `CHARACTER_OCTET_LENGTH` Nullable(UInt64) ALIAS character_octet_length,
+    `NUMERIC_PRECISION` Nullable(UInt64) ALIAS numeric_precision,
+    `NUMERIC_PRECISION_RADIX` Nullable(UInt64) ALIAS numeric_precision_radix,
+    `NUMERIC_SCALE` Nullable(UInt64) ALIAS numeric_scale,
+    `DATETIME_PRECISION` Nullable(UInt64) ALIAS datetime_precision,
+    `CHARACTER_SET_CATALOG` Nullable(String) ALIAS character_set_catalog,
+    `CHARACTER_SET_SCHEMA` Nullable(String) ALIAS character_set_schema,
+    `CHARACTER_SET_NAME` Nullable(String) ALIAS character_set_name,
+    `COLLATION_CATALOG` Nullable(String) ALIAS collation_catalog,
+    `COLLATION_SCHEMA` Nullable(String) ALIAS collation_schema,
+    `COLLATION_NAME` Nullable(String) ALIAS collation_name,
+    `DOMAIN_CATALOG` Nullable(String) ALIAS domain_catalog,
+    `DOMAIN_SCHEMA` Nullable(String) ALIAS domain_schema,
+    `DOMAIN_NAME` Nullable(String) ALIAS domain_name
+) AS
+SELECT
+    database AS table_catalog,
+    database AS table_schema,
+    table AS table_name,
+    name AS column_name,
+    position AS ordinal_position,
+    default_expression AS column_default,
+    type LIKE 'Nullable(%)' AS is_nullable,
+    type AS data_type,
+    character_octet_length AS character_maximum_length,
+    character_octet_length,
+    numeric_precision,
+    numeric_precision_radix,
+    numeric_scale,
+    datetime_precision,
+    NULL AS character_set_catalog,
+    NULL AS character_set_schema,
+    NULL AS character_set_name,
+    NULL AS collation_catalog,
+    NULL AS collation_schema,
+    NULL AS collation_name,
+    NULL AS domain_catalog,
+    NULL AS domain_schema,
+    NULL AS domain_name
+FROM system.columns
diff --git a/src/Storages/System/InformationSchema/schemata.sql b/src/Storages/System/InformationSchema/schemata.sql
new file mode 100644
index 00000000000..9686fcbf4fa
--- /dev/null
+++ b/src/Storages/System/InformationSchema/schemata.sql
@@ -0,0 +1,26 @@
+ATTACH VIEW schemata
+(
+    `catalog_name` String,
+    `schema_name` String,
+    `schema_owner` String,
+    `default_character_set_catalog` Nullable(String),
+    `default_character_set_schema` Nullable(String),
+    `default_character_set_name` Nullable(String),
+    `sql_path` Nullable(String),
+    `CATALOG_NAME` String ALIAS catalog_name,
+    `SCHEMA_NAME` String ALIAS schema_name,
+    `SCHEMA_OWNER` String ALIAS schema_owner,
+    `DEFAULT_CHARACTER_SET_CATALOG` Nullable(String) ALIAS default_character_set_catalog,
+    `DEFAULT_CHARACTER_SET_SCHEMA` Nullable(String) ALIAS default_character_set_schema,
+    `DEFAULT_CHARACTER_SET_NAME` Nullable(String) ALIAS default_character_set_name,
+    `SQL_PATH` Nullable(String) ALIAS sql_path
+) AS
+SELECT
+    name AS catalog_name,
+    name AS schema_name,
+    'default' AS schema_owner,
+    NULL AS default_character_set_catalog,
+    NULL AS default_character_set_schema,
+    NULL AS default_character_set_name,
+    NULL AS sql_path
+FROM system.databases
diff --git a/src/Storages/System/InformationSchema/tables.sql b/src/Storages/System/InformationSchema/tables.sql
new file mode 100644
index 00000000000..8eea3713923
--- /dev/null
+++ b/src/Storages/System/InformationSchema/tables.sql
@@ -0,0 +1,17 @@
+ATTACH VIEW tables
+(
+    `table_catalog` String,
+    `table_schema` String,
+    `table_name` String,
+    `table_type` Enum8('BASE TABLE' = 1, 'VIEW' = 2, 'FOREIGN TABLE' = 3, 'LOCAL TEMPORARY' = 4, 'SYSTEM VIEW' = 5),
+    `TABLE_CATALOG` String ALIAS table_catalog,
+    `TABLE_SCHEMA` String ALIAS table_schema,
+    `TABLE_NAME` String ALIAS table_name,
+    `TABLE_TYPE` Enum8('BASE TABLE' = 1, 'VIEW' = 2, 'FOREIGN TABLE' = 3, 'LOCAL TEMPORARY' = 4, 'SYSTEM VIEW' = 5) ALIAS table_type
+) AS
+SELECT
+    database AS table_catalog,
+    database AS table_schema,
+    name AS table_name,
+    multiIf(is_temporary, 4, engine like '%View', 2, engine LIKE 'System%', 5, has_own_data = 0, 3, 1) AS table_type
+FROM system.tables
diff --git a/src/Storages/System/InformationSchema/views.sql b/src/Storages/System/InformationSchema/views.sql
new file mode 100644
index 00000000000..c5ecebfceac
--- /dev/null
+++ b/src/Storages/System/InformationSchema/views.sql
@@ -0,0 +1,36 @@
+ATTACH VIEW views
+(
+    `table_catalog` String,
+    `table_schema` String,
+    `table_name` String,
+    `view_definition` String,
+    `check_option` String,
+    `is_updatable` Enum8('NO' = 0, 'YES' = 1),
+    `is_insertable_into` Enum8('NO' = 0, 'YES' = 1),
+    `is_trigger_updatable` Enum8('NO' = 0, 'YES' = 1),
+    `is_trigger_deletable` Enum8('NO' = 0, 'YES' = 1),
+    `is_trigger_insertable_into` Enum8('NO' = 0, 'YES' = 1),
+    `TABLE_CATALOG` String ALIAS table_catalog,
+    `TABLE_SCHEMA` String ALIAS table_schema,
+    `TABLE_NAME` String ALIAS table_name,
+    `VIEW_DEFINITION` String ALIAS view_definition,
+    `CHECK_OPTION` String ALIAS check_option,
+    `IS_UPDATABLE` Enum8('NO' = 0, 'YES' = 1) ALIAS is_updatable,
+    `IS_INSERTABLE_INTO` Enum8('NO' = 0, 'YES' = 1) ALIAS is_insertable_into,
+    `IS_TRIGGER_UPDATABLE` Enum8('NO' = 0, 'YES' = 1) ALIAS is_trigger_updatable,
+    `IS_TRIGGER_DELETABLE` Enum8('NO' = 0, 'YES' = 1) ALIAS is_trigger_deletable,
+    `IS_TRIGGER_INSERTABLE_INTO` Enum8('NO' = 0, 'YES' = 1) ALIAS is_trigger_insertable_into
+) AS
+SELECT
+    database AS table_catalog,
+    database AS table_schema,
+    name AS table_name,
+    as_select AS view_definition,
+    'NONE' AS check_option,
+    0 AS is_updatable,
+    engine = 'MaterializedView' AS is_insertable_into,
+    0 AS is_trigger_updatable,
+    0 AS is_trigger_deletable,
+    0 AS is_trigger_insertable_into
+FROM system.tables
+WHERE engine LIKE '%View'
diff --git a/src/Storages/System/StorageSystemAsynchronousInserts.cpp b/src/Storages/System/StorageSystemAsynchronousInserts.cpp
new file mode 100644
index 00000000000..0fa6c1b653c
--- /dev/null
+++ b/src/Storages/System/StorageSystemAsynchronousInserts.cpp
@@ -0,0 +1,109 @@
+#include <Storages/System/StorageSystemAsynchronousInserts.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/AsynchronousInsertQueue.h>
+#include <Interpreters/Context.h>
+#include <Parsers/queryToString.h>
+#include <Core/DecimalFunctions.h>
+#include <Parsers/ASTInsertQuery.h>
+
+namespace DB
+{
+
+static constexpr auto TIME_SCALE = 6;
+
+NamesAndTypesList StorageSystemAsynchronousInserts::getNamesAndTypes()
+{
+    return
+    {
+        {"query", std::make_shared<DataTypeString>()},
+        {"database", std::make_shared<DataTypeString>()},
+        {"table", std::make_shared<DataTypeString>()},
+        {"format", std::make_shared<DataTypeString>()},
+        {"first_update", std::make_shared<DataTypeDateTime64>(TIME_SCALE)},
+        {"last_update", std::make_shared<DataTypeDateTime64>(TIME_SCALE)},
+        {"total_bytes", std::make_shared<DataTypeUInt64>()},
+        {"entries.query_id", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"entries.bytes", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
+        {"entries.finished", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt8>())},
+        {"entries.exception", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+    };
+}
+
+void StorageSystemAsynchronousInserts::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+{
+    using namespace std::chrono;
+
+    auto * insert_queue = context->getAsynchronousInsertQueue();
+    if (!insert_queue)
+        return;
+
+    auto queue = insert_queue->getQueue();
+    for (const auto & [key, elem] : queue)
+    {
+        std::lock_guard lock(elem->mutex);
+
+        if (!elem->data)
+            continue;
+
+        auto time_in_microseconds = [](const time_point<steady_clock> & timestamp)
+        {
+            auto time_diff = duration_cast<microseconds>(steady_clock::now() - timestamp);
+            auto time_us = (system_clock::now() - time_diff).time_since_epoch().count();
+
+            DecimalUtils::DecimalComponents<DateTime64> components{time_us / 1'000'000, time_us % 1'000'000};
+            return DecimalField(DecimalUtils::decimalFromComponents<DateTime64>(components, TIME_SCALE), TIME_SCALE);
+        };
+
+        const auto & insert_query = key.query->as<const ASTInsertQuery &>();
+        size_t i = 0;
+
+        res_columns[i++]->insert(queryToString(insert_query));
+        res_columns[i++]->insert(insert_query.table_id.getDatabaseName());
+        res_columns[i++]->insert(insert_query.table_id.getTableName());
+        res_columns[i++]->insert(insert_query.format);
+        res_columns[i++]->insert(time_in_microseconds(elem->data->first_update));
+        res_columns[i++]->insert(time_in_microseconds(elem->data->last_update));
+        res_columns[i++]->insert(elem->data->size);
+
+        Array arr_query_id;
+        Array arr_bytes;
+        Array arr_finished;
+        Array arr_exception;
+
+        for (const auto & entry : elem->data->entries)
+        {
+            arr_query_id.push_back(entry->query_id);
+            arr_bytes.push_back(entry->bytes.size());
+            arr_finished.push_back(entry->isFinished());
+
+            if (auto exception = entry->getException())
+            {
+                try
+                {
+                    std::rethrow_exception(exception);
+                }
+                catch (const Exception & e)
+                {
+                    arr_exception.push_back(e.displayText());
+                }
+                catch (...)
+                {
+                    arr_exception.push_back("Unknown exception");
+                }
+            }
+            else
+                arr_exception.push_back("");
+        }
+
+        res_columns[i++]->insert(arr_query_id);
+        res_columns[i++]->insert(arr_bytes);
+        res_columns[i++]->insert(arr_finished);
+        res_columns[i++]->insert(arr_exception);
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemAsynchronousInserts.h b/src/Storages/System/StorageSystemAsynchronousInserts.h
new file mode 100644
index 00000000000..0d7cbbe4eaf
--- /dev/null
+++ b/src/Storages/System/StorageSystemAsynchronousInserts.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <common/shared_ptr_helper.h>
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+namespace DB
+{
+
+/** Implements the system table `asynhronous_inserts`,
+ *  which contains information about pending asynchronous inserts in queue.
+*/
+class StorageSystemAsynchronousInserts final :
+    public shared_ptr_helper<StorageSystemAsynchronousInserts>,
+    public IStorageSystemOneBlock<StorageSystemAsynchronousInserts>
+{
+public:
+    std::string getName() const override { return "AsynchronousInserts"; }
+    static NamesAndTypesList getNamesAndTypes();
+
+protected:
+    friend struct shared_ptr_helper<StorageSystemAsynchronousInserts>;
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index 0058b58f537..cefc5587014 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -5,6 +5,8 @@
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypeDateTime64.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTSelectQuery.h>
@@ -44,6 +46,12 @@ StorageSystemColumns::StorageSystemColumns(const StorageID & table_id_)
         { "is_in_primary_key",   std::make_shared<DataTypeUInt8>() },
         { "is_in_sampling_key",  std::make_shared<DataTypeUInt8>() },
         { "compression_codec",   std::make_shared<DataTypeString>() },
+        { "character_octet_length",     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "numeric_precision",          std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "numeric_precision_radix",    std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "numeric_scale",              std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "datetime_precision",         std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+
     }));
     setInMemoryMetadata(storage_metadata);
 }
@@ -218,6 +226,60 @@ protected:
                         res_columns[res_index++]->insertDefault();
                 }
 
+                /// character_octet_length makes sense for FixedString only
+                DataTypePtr not_nullable_type = removeNullable(column.type);
+                if (columns_mask[src_index++])
+                {
+                    if (isFixedString(not_nullable_type))
+                        res_columns[res_index++]->insert(not_nullable_type->getSizeOfValueInMemory());
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
+                /// numeric_precision
+                if (columns_mask[src_index++])
+                {
+                    if (isInteger(not_nullable_type))
+                        res_columns[res_index++]->insert(not_nullable_type->getSizeOfValueInMemory() * 8);  /// radix is 2
+                    else if (isDecimal(not_nullable_type))
+                        res_columns[res_index++]->insert(getDecimalPrecision(*not_nullable_type));  /// radix is 10
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
+                /// numeric_precision_radix
+                if (columns_mask[src_index++])
+                {
+                    if (isInteger(not_nullable_type))
+                        res_columns[res_index++]->insert(2);
+                    else if (isDecimal(not_nullable_type))
+                        res_columns[res_index++]->insert(10);
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
+                /// numeric_scale
+                if (columns_mask[src_index++])
+                {
+                    if (isInteger(not_nullable_type))
+                        res_columns[res_index++]->insert(0);
+                    else if (isDecimal(not_nullable_type))
+                        res_columns[res_index++]->insert(getDecimalScale(*not_nullable_type));
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
+                /// datetime_precision
+                if (columns_mask[src_index++])
+                {
+                    if (isDateTime64(not_nullable_type))
+                        res_columns[res_index++]->insert(assert_cast<const DataTypeDateTime64 &>(*not_nullable_type).getScale());
+                    else if (isDateOrDate32(not_nullable_type) || isDateTime(not_nullable_type) || isDateTime64(not_nullable_type))
+                        res_columns[res_index++]->insert(0);
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
                 ++rows_count;
             }
         }
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index bed8eadc19c..a097e08871d 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -15,6 +15,7 @@ const char * auto_contributors[] {
     "adevyatova",
     "ageraab",
     "Ahmed Dardery",
+    "Aimiyoo",
     "akazz",
     "Akazz",
     "akonyaev",
@@ -33,6 +34,7 @@ const char * auto_contributors[] {
     "alesapin",
     "Alex",
     "Alexander Avdonkin",
+    "Alexander Bezpiatov",
     "Alexander Burmak",
     "Alexander Ermolaev",
     "Alexander Gololobov",
@@ -43,6 +45,7 @@ const char * auto_contributors[] {
     "Alexander Krasheninnikov",
     "Alexander Kuranoff",
     "Alexander Kuzmenkov",
+    "Alexander Lodin",
     "Alexander Lukin",
     "Alexander Makarov",
     "Alexander Marshalov",
@@ -54,6 +57,7 @@ const char * auto_contributors[] {
     "Alexander Sapin",
     "Alexander Tokmakov",
     "Alexander Tretiakov",
+    "Alexandra",
     "Alexandra Latysheva",
     "Alexandre Snarskii",
     "Alexandr Kondratev",
@@ -63,6 +67,7 @@ const char * auto_contributors[] {
     "Alexei Averchenko",
     "Alexey",
     "Alexey Arno",
+    "Alexey Boykov",
     "Alexey Dushechkin",
     "Alexey Elymanov",
     "Alexey Ilyukhov",
@@ -95,12 +100,14 @@ const char * auto_contributors[] {
     "Anatoly Pugachev",
     "ana-uvarova",
     "AnaUvarova",
+    "Andr0901",
     "Andreas Hunkeler",
     "AndreevDm",
     "Andrei Bodrov",
     "Andrei Chulkov",
     "andrei-karpliuk",
     "Andrei Nekrashevich",
+    "ANDREI STAROVEROV",
     "Andrew Grigorev",
     "Andrew Onyshchuk",
     "andrewsg",
@@ -115,10 +122,12 @@ const char * auto_contributors[] {
     "Andrey Skobtsov",
     "Andrey Urusov",
     "Andrey Z",
+    "Andy Liang",
     "Andy Yang",
     "Anmol Arora",
     "Anna",
     "Anna Shakhova",
+    "anneji-dev",
     "annvsh",
     "anrodigina",
     "Anthony N. Simon",
@@ -140,6 +149,7 @@ const char * auto_contributors[] {
     "aprudaev",
     "Ariel Robaldo",
     "Arsen Hakobyan",
+    "Arslan G",
     "ArtCorp",
     "Artem Andreenko",
     "Artemeey",
@@ -155,6 +165,7 @@ const char * auto_contributors[] {
     "artpaul",
     "Artur",
     "Artur Beglaryan",
+    "Artur Filatenkov",
     "AsiaKorushkina",
     "asiana21",
     "atereh",
@@ -192,11 +203,14 @@ const char * auto_contributors[] {
     "Boris Granveaud",
     "Bowen Masco",
     "bo zeng",
+    "Braulio Valdivielso",
     "Brett Hoerner",
     "BSD_Conqueror",
     "bseng",
     "Bulat Gaifullin",
     "Carbyn",
+    "caspian",
+    "Caspian",
     "cekc",
     "centos7",
     "champtar",
@@ -263,6 +277,7 @@ const char * auto_contributors[] {
     "Dmitrii Raev",
     "dmitriiut",
     "Dmitriy",
+    "Dmitriy Lushnikov",
     "Dmitry",
     "Dmitry Belyavtsev",
     "Dmitry Bilunov",
@@ -281,6 +296,7 @@ const char * auto_contributors[] {
     "Dongdong Yang",
     "DoomzD",
     "Dr. Strange Looker",
+    "DuckSoft",
     "d.v.semenov",
     "eaxdev",
     "eejoin",
@@ -328,6 +344,7 @@ const char * auto_contributors[] {
     "favstovol",
     "FawnD2",
     "FeehanG",
+    "feihengye",
     "felixoid",
     "felixxdu",
     "feng lv",
@@ -335,6 +352,7 @@ const char * auto_contributors[] {
     "fessmage",
     "FgoDt",
     "fibersel",
+    "Filatenkov Artur",
     "filimonov",
     "filipe",
     "Filipe Caixeta",
@@ -361,6 +379,7 @@ const char * auto_contributors[] {
     "George",
     "George3d6",
     "George G",
+    "Georgy Ginzburg",
     "Gervasio Varela",
     "ggerogery",
     "giordyb",
@@ -386,15 +405,18 @@ const char * auto_contributors[] {
     "hchen9",
     "hcz",
     "heng zhao",
+    "hermano",
     "hexiaoting",
     "Hiroaki Nakamura",
     "hotid",
+    "huangzhaowei",
     "HuFuwang",
     "Hui Wang",
     "hustnn",
     "huzhichengdd",
     "ice1x",
     "idfer",
+    "igomac",
     "igor",
     "Igor",
     "Igor Hatarist",
@@ -404,6 +426,7 @@ const char * auto_contributors[] {
     "Igr",
     "Igr Mineev",
     "ikarishinjieva",
+    "Ikko Ashimine",
     "ikopylov",
     "Ildar Musin",
     "Ildus Kurbangaliev",
@@ -437,23 +460,29 @@ const char * auto_contributors[] {
     "Ivan Starkov",
     "ivanzhukov",
     "Ivan Zhukov",
+    "ivoleg",
     "Jack Song",
     "JackyWoo",
     "Jacob Hayes",
     "jakalletti",
+    "Jakub Kuklis",
     "JaosnHsieh",
+    "jasine",
     "Jason",
+    "Jason Keirstead",
     "javartisan",
     "javi",
     "javi santana",
     "Javi Santana",
     "Javi santana bot",
     "Jean Baptiste Favre",
+    "Jeffrey Dang",
     "jennyma",
     "jetgm",
     "Jiading Guo",
     "Jiang Tao",
     "jianmei zhang",
+    "jkuklis",
     "Jochen Schalanda",
     "John",
     "John Hummel",
@@ -467,15 +496,18 @@ const char * auto_contributors[] {
     "Keiji Yoshida",
     "Ken Chen",
     "Kevin Chiang",
+    "Kevin Michel",
     "kevin wan",
     "Kiran",
     "Kirill Danshin",
+    "Kirill Ershov",
     "kirillikoff",
     "Kirill Malev",
     "Kirill Shvakov",
     "kmeaw",
     "Koblikov Mihail",
     "KochetovNicolai",
+    "kolsys",
     "Konstantin Grabar",
     "Konstantin Lebedev",
     "Konstantin Malanchev",
@@ -492,6 +524,7 @@ const char * auto_contributors[] {
     "Kseniia Sumarokova",
     "kshvakov",
     "kssenii",
+    "Ky Li",
     "l",
     "l1tsolaiki",
     "lalex",
@@ -502,6 +535,7 @@ const char * auto_contributors[] {
     "Leopold Schabel",
     "leozhang",
     "Lev Borodin",
+    "levie",
     "levushkin aleksej",
     "levysh",
     "Lewinma",
@@ -509,6 +543,7 @@ const char * auto_contributors[] {
     "libenwang",
     "lichengxiang",
     "linceyou",
+    "listar",
     "litao91",
     "liu-bov",
     "Liu Cong",
@@ -521,6 +556,7 @@ const char * auto_contributors[] {
     "long2ice",
     "Lopatin Konstantin",
     "Loud_Scream",
+    "lthaooo",
     "ltybc-coder",
     "luc1ph3r",
     "Lucid Dreams",
@@ -529,12 +565,14 @@ const char * auto_contributors[] {
     "Lv Feng",
     "M0r64n",
     "madianjun",
+    "MagiaGroz",
     "maiha",
     "Maksim",
     "Maksim Fedotov",
     "Maksim Kita",
     "Maks Skorokhod",
     "malkfilipp",
+    "Malte",
     "manmitya",
     "maqroll",
     "Marat IDRISOV",
@@ -595,6 +633,7 @@ const char * auto_contributors[] {
     "Michal Lisowski",
     "michon470",
     "MicrochipQ",
+    "Miguel Fernández",
     "miha-g",
     "Mihail Fandyushin",
     "Mikahil Nacharov",
@@ -617,10 +656,12 @@ const char * auto_contributors[] {
     "MikuSugar",
     "Milad Arabi",
     "millb",
+    "Misko Lee",
     "mnkonkova",
     "Mohammad Hossein Sekhavat",
     "morty",
     "moscas",
+    "Mostafa Dahab",
     "MovElb",
     "Mr.General",
     "Murat Kabilov",
@@ -634,11 +675,14 @@ const char * auto_contributors[] {
     "nauta",
     "nautaa",
     "Neeke Gao",
+    "neng.liu",
     "Neng Liu",
+    "NengLiu",
     "never lee",
     "NeZeD [Mac Pro]",
     "nicelulu",
     "Nickita",
+    "Nickita Taranov",
     "Nickolay Yastrebov",
     "nickzhwang",
     "Nicolae Vartolomei",
@@ -684,6 +728,9 @@ const char * auto_contributors[] {
     "Olga Khvostikova",
     "olgarev",
     "Olga Revyakina",
+    "OmarBazaraa",
+    "Onehr7",
+    "OnePiece",
     "orantius",
     "Orivej Desh",
     "Oskar Wojciski",
@@ -701,6 +748,7 @@ const char * auto_contributors[] {
     "Pavel Yakunin",
     "Pavlo Bashynskiy",
     "Pawel Rog",
+    "pdv-ru",
     "Peng Jian",
     "Persiyanov Dmitriy Andreevich",
     "Pervakov Grigorii",
@@ -728,6 +776,7 @@ const char * auto_contributors[] {
     "Ramazan Polat",
     "Raúl Marín",
     "Ravengg",
+    "Realist007",
     "redclusive",
     "RedClusive",
     "RegulusZ",
@@ -749,12 +798,15 @@ const char * auto_contributors[] {
     "Roman Peshkurov",
     "Roman Tsisyk",
     "romanzhukov",
+    "Roman Zhukov",
     "root",
     "roverxu",
+    "ruct",
     "Ruslan",
     "Ruslan Savchenko",
     "Russ Frank",
     "Ruzal Ibragimov",
+    "ryzuo",
     "Sabyanin Maxim",
     "SaltTan",
     "Sami Kerola",
@@ -763,6 +815,7 @@ const char * auto_contributors[] {
     "satanson",
     "Saulius Valatka",
     "sdk2",
+    "Sean Haynes",
     "Sébastien Launay",
     "serebrserg",
     "Sergei Bocharov",
@@ -839,12 +892,15 @@ const char * auto_contributors[] {
     "TCeason",
     "Tema Novikov",
     "templarzq",
+    "terrylin",
     "The-Alchemist",
+    "Thomas Berdy",
     "Tiaonmmn",
     "tiger.yan",
     "tison",
     "TiunovNN",
     "Tobias Adamson",
+    "Tobias Lins",
     "Tom Bombadil",
     "topvisor",
     "Tsarkova Anastasia",
@@ -863,6 +919,7 @@ const char * auto_contributors[] {
     "VadimPE",
     "Vadim Plakhtinskiy",
     "Vadim Skipin",
+    "Vadim Volodin",
     "Val",
     "Valera Ryaboshapko",
     "Vasilyev Nikita",
@@ -877,12 +934,15 @@ const char * auto_contributors[] {
     "Veloman Yunkan",
     "Veniamin Gvozdikov",
     "Veselkov Konstantin",
+    "vgocoder",
     "vic",
     "vicdashkov",
+    "vicgao",
     "Victor",
     "Victor Tarnavsky",
     "Viktor Taranenko",
     "vinity",
+    "Vitalii S",
     "Vitaliy Fedorchenko",
     "Vitaliy Karnienko",
     "Vitaliy Kozlovskiy",
@@ -891,12 +951,14 @@ const char * auto_contributors[] {
     "Vitaly",
     "Vitaly Baranov",
     "Vitaly Samigullin",
+    "Vitaly Stoyan",
     "vitstn",
     "vivarum",
     "Vivien Maisonneuve",
     "Vlad Arkhipov",
     "Vladimir",
     "Vladimir Bunchuk",
+    "Vladimir C",
     "Vladimir Ch",
     "Vladimir Chebotarev",
     "vladimir golovchenko",
@@ -925,6 +987,7 @@ const char * auto_contributors[] {
     "wzl",
     "Xianda Ke",
     "Xiang Zhou",
+    "xiedeyantu",
     "xPoSx",
     "Yağızcan Değirmenci",
     "yang",
@@ -938,6 +1001,7 @@ const char * auto_contributors[] {
     "Yiğit Konur",
     "yiguolei",
     "Yingchun Lai",
+    "Yingfan Chen",
     "yingjinghan",
     "ylchou",
     "Y Lu",
@@ -966,6 +1030,8 @@ const char * auto_contributors[] {
     "Zhichang Yu",
     "Zhichun Wu",
     "Zhipeng",
+    "ZhiYong Wang",
+    "zhongyuankai",
     "zhukai",
     "Zijie Lu",
     "zlx19950903",
@@ -994,6 +1060,7 @@ const char * auto_contributors[] {
     "曲正鹏",
     "未来星___费",
     "极客青年",
+    "董海镔",
     "谢磊",
     "贾顺名(Jarvis)",
     "陈小玉",
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
index 5b9ed938e22..1df8b43515e 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
@@ -1,23 +1,14 @@
-#include <algorithm>
-#include <filesystem>
-
-#include "StorageSystemDDLWorkerQueue.h"
-
-#include <Columns/ColumnArray.h>
+#include <Storages/System/StorageSystemDDLWorkerQueue.h>
 #include <Interpreters/DDLTask.h>
-
-#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeMap.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Storages/SelectQueryInfo.h>
+#include <Interpreters/ZooKeeperLog.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/ParserQuery.h>
 #include <Parsers/parseQuery.h>
@@ -25,207 +16,334 @@
 
 namespace fs = std::filesystem;
 
-enum Status
-{
-    ACTIVE,
-    FINISHED,
-    UNKNOWN,
-    ERRORED
-};
 
 namespace DB
 {
-std::vector<std::pair<String, Int8>> getStatusEnumsAndValues()
+
+enum class Status
+{
+    INACTIVE,
+    ACTIVE,
+    FINISHED,
+    REMOVING,
+    UNKNOWN,
+};
+
+using GetResponseFuture = std::future<Coordination::GetResponse>;
+using ListResponseFuture = std::future<Coordination::ListResponse>;
+using GetResponseFutures = std::vector<GetResponseFuture>;
+using ListResponseFutures = std::vector<ListResponseFuture>;
+
+static std::vector<std::pair<String, Int8>> getStatusEnumsAndValues()
 {
     return std::vector<std::pair<String, Int8>>{
-        {"Active", static_cast<Int8>(Status::ACTIVE)},
-        {"Finished", static_cast<Int8>(Status::FINISHED)},
-        {"Unknown", static_cast<Int8>(Status::UNKNOWN)},
-        {"Errored", static_cast<Int8>(Status::ERRORED)},
+        {"Inactive",    static_cast<Int8>(Status::INACTIVE)},
+        {"Active",      static_cast<Int8>(Status::ACTIVE)},
+        {"Finished",    static_cast<Int8>(Status::FINISHED)},
+        {"Removing",    static_cast<Int8>(Status::REMOVING)},
+        {"Unknown",     static_cast<Int8>(Status::UNKNOWN)},
     };
 }
 
-
-std::vector<std::pair<String, Int8>> getZooKeeperErrorEnumsAndValues()
-{
-    return std::vector<std::pair<String, Int8>>{
-        {"ZOK", static_cast<Int8>(Coordination::Error::ZOK)},
-        {"ZSYSTEMERROR", static_cast<Int8>(Coordination::Error::ZSYSTEMERROR)},
-        {"ZRUNTIMEINCONSISTENCY", static_cast<Int8>(Coordination::Error::ZRUNTIMEINCONSISTENCY)},
-        {"ZDATAINCONSISTENCY", static_cast<Int8>(Coordination::Error::ZDATAINCONSISTENCY)},
-        {"ZCONNECTIONLOSS", static_cast<Int8>(Coordination::Error::ZCONNECTIONLOSS)},
-        {"ZMARSHALLINGERROR", static_cast<Int8>(Coordination::Error::ZMARSHALLINGERROR)},
-        {"ZUNIMPLEMENTED", static_cast<Int8>(Coordination::Error::ZUNIMPLEMENTED)},
-        {"ZOPERATIONTIMEOUT", static_cast<Int8>(Coordination::Error::ZOPERATIONTIMEOUT)},
-        {"ZBADARGUMENTS", static_cast<Int8>(Coordination::Error::ZBADARGUMENTS)},
-        {"ZINVALIDSTATE", static_cast<Int8>(Coordination::Error::ZINVALIDSTATE)},
-        {"ZAPIERROR", static_cast<Int8>(Coordination::Error::ZAPIERROR)},
-        {"ZNONODE", static_cast<Int8>(Coordination::Error::ZNONODE)},
-        {"ZNOAUTH", static_cast<Int8>(Coordination::Error::ZNOAUTH)},
-        {"ZBADVERSION", static_cast<Int8>(Coordination::Error::ZBADVERSION)},
-        {"ZNOCHILDRENFOREPHEMERALS", static_cast<Int8>(Coordination::Error::ZNOCHILDRENFOREPHEMERALS)},
-        {"ZNODEEXISTS", static_cast<Int8>(Coordination::Error::ZNODEEXISTS)},
-        {"ZNOTEMPTY", static_cast<Int8>(Coordination::Error::ZNOTEMPTY)},
-        {"ZSESSIONEXPIRED", static_cast<Int8>(Coordination::Error::ZSESSIONEXPIRED)},
-        {"ZINVALIDCALLBACK", static_cast<Int8>(Coordination::Error::ZINVALIDCALLBACK)},
-        {"ZINVALIDACL", static_cast<Int8>(Coordination::Error::ZINVALIDACL)},
-        {"ZAUTHFAILED", static_cast<Int8>(Coordination::Error::ZAUTHFAILED)},
-        {"ZCLOSING", static_cast<Int8>(Coordination::Error::ZCLOSING)},
-        {"ZNOTHING", static_cast<Int8>(Coordination::Error::ZNOTHING)},
-        {"ZSESSIONMOVED", static_cast<Int8>(Coordination::Error::ZSESSIONMOVED)},
-    };
-}
-
-
 NamesAndTypesList StorageSystemDDLWorkerQueue::getNamesAndTypes()
 {
     return {
-        {"entry", std::make_shared<DataTypeString>()},
-        {"host_name", std::make_shared<DataTypeString>()},
-        {"host_address", std::make_shared<DataTypeString>()},
-        {"port", std::make_shared<DataTypeUInt16>()},
-        {"status", std::make_shared<DataTypeEnum8>(getStatusEnumsAndValues())},
-        {"cluster", std::make_shared<DataTypeString>()},
-        {"query", std::make_shared<DataTypeString>()},
-        {"initiator", std::make_shared<DataTypeString>()},
-        {"query_start_time", std::make_shared<DataTypeDateTime>()},
-        {"query_finish_time", std::make_shared<DataTypeDateTime>()},
-        {"query_duration_ms", std::make_shared<DataTypeUInt64>()},
-        {"exception_code", std::make_shared<DataTypeEnum8>(getZooKeeperErrorEnumsAndValues())},
+        {"entry",               std::make_shared<DataTypeString>()},
+        {"entry_version",       std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt8>())},
+        {"initiator_host",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
+        {"initiator_port",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt16>())},
+        {"cluster",             std::make_shared<DataTypeString>()},
+        {"query",               std::make_shared<DataTypeString>()},
+        {"settings",            std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>())},
+        {"query_create_time",   std::make_shared<DataTypeDateTime>()},
+
+        {"host",                std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
+        {"port",                std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt16>())},
+        {"status",              std::make_shared<DataTypeNullable>(std::make_shared<DataTypeEnum8>(getStatusEnumsAndValues()))},
+        {"exception_code",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt16>())},
+        {"exception_text",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
+        {"query_finish_time",   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
+        {"query_duration_ms",   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
     };
 }
 
-static String clusterNameFromDDLQuery(ContextPtr context, const DDLLogEntry & entry)
+static String clusterNameFromDDLQuery(ContextPtr context, const DDLTask & task)
 {
-    const char * begin = entry.query.data();
-    const char * end = begin + entry.query.size();
-    ASTPtr query;
-    ASTQueryWithOnCluster * query_on_cluster;
+    const char * begin = task.entry.query.data();
+    const char * end = begin + task.entry.query.size();
     String cluster_name;
     ParserQuery parser_query(end);
-    String description;
-    query = parseQuery(parser_query, begin, end, description, 0, context->getSettingsRef().max_parser_depth);
-    if (query && (query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query.get())))
+    String description = fmt::format("from {}", task.entry_path);
+    ASTPtr query = parseQuery(parser_query, begin, end, description,
+                              context->getSettingsRef().max_query_size, context->getSettingsRef().max_parser_depth);
+    if (const auto * query_on_cluster = dynamic_cast<const ASTQueryWithOnCluster *>(query.get()))
         cluster_name = query_on_cluster->cluster;
     return cluster_name;
 }
 
+static void fillCommonColumns(MutableColumns & res_columns, size_t & col, const DDLTask & task, const String & cluster_name, UInt64 query_create_time_ms)
+{
+    /// entry
+    res_columns[col++]->insert(task.entry_name);
+
+    /// entry_version
+    res_columns[col++]->insert(task.entry.version);
+
+    if (task.entry.initiator.empty())
+    {
+        /// initiator_host
+        res_columns[col++]->insert(Field{});
+        /// initiator_port
+        res_columns[col++]->insert(Field{});
+    }
+    else
+    {
+        HostID initiator = HostID::fromString(task.entry.initiator);
+        /// initiator_host
+        res_columns[col++]->insert(initiator.host_name);
+        /// initiator_port
+        res_columns[col++]->insert(initiator.port);
+    }
+
+    /// cluster
+    res_columns[col++]->insert(cluster_name);
+
+    /// query
+    res_columns[col++]->insert(task.entry.query);
+
+    Map settings_map;
+    if (task.entry.settings)
+    {
+        for (const auto & change : *task.entry.settings)
+        {
+            Tuple pair;
+            pair.push_back(change.name);
+            pair.push_back(toString(change.value));
+            settings_map.push_back(std::move(pair));
+        }
+    }
+
+    /// settings
+    res_columns[col++]->insert(settings_map);
+
+    res_columns[col++]->insert(static_cast<UInt64>(query_create_time_ms / 1000));
+}
+
+static void repeatValuesInCommonColumns(MutableColumns & res_columns, size_t num_filled_columns)
+{
+    if (res_columns[num_filled_columns - 1]->size() == res_columns[num_filled_columns]->size() + 1)
+    {
+        /// Common columns are already filled
+        return;
+    }
+
+    /// Copy values from previous row
+    assert(res_columns[num_filled_columns - 1]->size() == res_columns[num_filled_columns]->size());
+    for (size_t filled_col = 0; filled_col < num_filled_columns; ++filled_col)
+        res_columns[filled_col]->insert((*res_columns[filled_col])[res_columns[filled_col]->size() - 1]);
+}
+
+static void fillHostnameColumns(MutableColumns & res_columns, size_t & col, const HostID & host_id)
+{
+    /// NOTE host_id.host_name can be a domain name or an IP address
+    /// We could try to resolve domain name or reverse resolve an address and add two separate columns,
+    /// but seems like it's not really needed, so we show host_id.host_name as is.
+
+    /// host
+    res_columns[col++]->insert(host_id.host_name);
+
+    /// port
+    res_columns[col++]->insert(host_id.port);
+}
+
+static void fillStatusColumnsWithNulls(MutableColumns & res_columns, size_t & col, Status status)
+{
+    /// status
+    res_columns[col++]->insert(static_cast<Int8>(status));
+    /// exception_code
+    res_columns[col++]->insert(Field{});
+    /// exception_text
+    res_columns[col++]->insert(Field{});
+    /// query_finish_time
+    res_columns[col++]->insert(Field{});
+    /// query_duration_ms
+    res_columns[col++]->insert(Field{});
+}
+
+static void fillStatusColumns(MutableColumns & res_columns, size_t & col,
+                                GetResponseFuture & finished_data_future,
+                                UInt64 query_create_time_ms)
+{
+    auto maybe_finished_status = finished_data_future.get();
+    if (maybe_finished_status.error == Coordination::Error::ZNONODE)
+        return fillStatusColumnsWithNulls(res_columns, col, Status::REMOVING);
+
+    /// asyncTryGet should throw on other error codes
+    assert(maybe_finished_status.error == Coordination::Error::ZOK);
+
+    /// status
+    res_columns[col++]->insert(static_cast<Int8>(Status::FINISHED));
+
+    auto execution_status = ExecutionStatus::fromText(maybe_finished_status.data);
+    /// exception_code
+    res_columns[col++]->insert(execution_status.code);
+    /// exception_text
+    res_columns[col++]->insert(execution_status.message);
+
+    UInt64 query_finish_time_ms = maybe_finished_status.stat.ctime;
+    /// query_finish_time
+    res_columns[col++]->insert(static_cast<UInt64>(query_finish_time_ms / 1000));
+    /// query_duration_ms
+    res_columns[col++]->insert(static_cast<UInt64>(query_finish_time_ms - query_create_time_ms));
+}
+
+
 void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     zkutil::ZooKeeperPtr zookeeper = context->getZooKeeper();
-    Coordination::Error zk_exception_code = Coordination::Error::ZOK;
-    String ddl_zookeeper_path = config.getString("distributed_ddl.path", "/clickhouse/task_queue/ddl/");
-    String ddl_query_path;
+    fs::path ddl_zookeeper_path = context->getConfigRef().getString("distributed_ddl.path", "/clickhouse/task_queue/ddl/");
 
-    // this is equivalent to query zookeeper at the `ddl_zookeeper_path`
-    /* [zk: localhost:2181(CONNECTED) 51] ls /clickhouse/task_queue/ddl
-       [query-0000000000, query-0000000001, query-0000000002, query-0000000003, query-0000000004]
-    */
+    Strings ddl_task_paths = zookeeper->getChildren(ddl_zookeeper_path);
 
-    zkutil::Strings queries;
+    GetResponseFutures ddl_task_futures;
+    ListResponseFutures active_nodes_futures;
+    ListResponseFutures finished_nodes_futures;
 
-    Coordination::Error code = zookeeper->tryGetChildren(ddl_zookeeper_path, queries);
-    // if there is an error here, just register the code.
-    // the queries will be empty and so there will be nothing to fill the table
-    if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
-        zk_exception_code = code;
-
-    const auto clusters = context->getClusters();
-    for (const auto & name_and_cluster : clusters->getContainer())
+    for (const auto & task_path : ddl_task_paths)
     {
-        const ClusterPtr & cluster = name_and_cluster.second;
-        const auto & shards_info = cluster->getShardsInfo();
-        const auto & addresses_with_failover = cluster->getShardsAddresses();
-        for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
+        ddl_task_futures.push_back(zookeeper->asyncTryGet(ddl_zookeeper_path / task_path));
+        /// List status dirs. Active host may become finished, so we list active first.
+        active_nodes_futures.push_back(zookeeper->asyncTryGetChildrenNoThrow(ddl_zookeeper_path / task_path / "active"));
+        finished_nodes_futures.push_back(zookeeper->asyncTryGetChildrenNoThrow(ddl_zookeeper_path / task_path / "finished"));
+    }
+
+    for (size_t i = 0; i < ddl_task_paths.size(); ++i)
+    {
+        auto maybe_task = ddl_task_futures[i].get();
+        if (maybe_task.error != Coordination::Error::ZOK)
         {
-            const auto & shard_addresses = addresses_with_failover[shard_index];
-            const auto & shard_info = shards_info[shard_index];
-            const auto pool_status = shard_info.pool->getStatus();
-            for (size_t replica_index = 0; replica_index < shard_addresses.size(); ++replica_index)
+            /// Task is removed
+            assert(maybe_task.error == Coordination::Error::ZNONODE);
+            continue;
+        }
+
+        DDLTask task{ddl_task_paths[i], ddl_zookeeper_path / ddl_task_paths[i]};
+        try
+        {
+            task.entry.parse(maybe_task.data);
+        }
+        catch (Exception & e)
+        {
+            e.addMessage("On parsing DDL entry {}: {}", task.entry_path, maybe_task.data);
+            throw;
+        }
+
+        String cluster_name = clusterNameFromDDLQuery(context, task);
+        UInt64 query_create_time_ms = maybe_task.stat.ctime;
+
+        size_t col = 0;
+        fillCommonColumns(res_columns, col, task, cluster_name, query_create_time_ms);
+
+        /// At first we process finished nodes, to avoid duplication if some host was active
+        /// and suddenly become finished during status dirs listing.
+        /// Then we process active (but not finished) hosts.
+        /// And then we process the rest hosts from task.entry.hosts list.
+        /// NOTE: It's not guaranteed that task.entry.hosts contains all host ids from status dirs.
+        std::unordered_set<String> processed_hosts;
+
+        /// Race condition with DDLWorker::cleanupQueue(...) is possible.
+        /// We may get incorrect list of finished nodes if task is currently removing.
+        /// To avoid showing INACTIVE status for hosts that have actually executed query,
+        /// we will detect if someone is removing task and show special REMOVING status.
+        /// Also we should distinguish it from another case when status dirs are not created yet (extremely rare case).
+        bool is_removing_task = false;
+
+        auto maybe_finished_hosts = finished_nodes_futures[i].get();
+        if (maybe_finished_hosts.error == Coordination::Error::ZOK)
+        {
+            GetResponseFutures finished_status_futures;
+            for (const auto & host_id_str : maybe_finished_hosts.names)
+                finished_status_futures.push_back(zookeeper->asyncTryGet(fs::path(task.entry_path) / "finished" / host_id_str));
+
+            for (size_t host_idx = 0; host_idx < maybe_finished_hosts.names.size(); ++host_idx)
             {
-                /*  Dir contents of every query will be similar to
-                 [zk: localhost:2181(CONNECTED) 53] ls /clickhouse/task_queue/ddl/query-0000000004
-                [active, finished]
-                */
-                std::vector<std::future<Coordination::GetResponse>> futures;
-                futures.reserve(queries.size());
-                for (const String & q : queries)
-                {
-                    futures.push_back(zookeeper->asyncTryGet(fs::path(ddl_zookeeper_path) / q));
-                }
-                for (size_t query_id = 0; query_id < queries.size(); query_id++)
-                {
-                    Int64 query_finish_time = 0;
-                    size_t i = 0;
-                    res_columns[i++]->insert(queries[query_id]); // entry
-                    const auto & address = shard_addresses[replica_index];
-                    res_columns[i++]->insert(address.host_name);
-                    auto resolved = address.getResolvedAddress();
-                    res_columns[i++]->insert(resolved ? resolved->host().toString() : String()); // host_address
-                    res_columns[i++]->insert(address.port);
-                    ddl_query_path = fs::path(ddl_zookeeper_path) / queries[query_id];
-
-                    zkutil::Strings active_nodes;
-                    zkutil::Strings finished_nodes;
-
-                    code = zookeeper->tryGetChildren(fs::path(ddl_query_path) / "active", active_nodes);
-                    if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
-                        zk_exception_code = code;
-
-                    code = zookeeper->tryGetChildren(fs::path(ddl_query_path) / "finished", finished_nodes);
-                    if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
-                        zk_exception_code = code;
-
-                    /* status:
-                 * active: If the hostname:port entry is present under active path.
-                 * finished: If the hostname:port entry is present under the finished path.
-                 * errored: If the hostname:port entry is present under the finished path but the error count is not 0.
-                 * unknown: If the above cases don't hold true, then status is unknown.
-                 */
-                    if (std::find(active_nodes.begin(), active_nodes.end(), address.toString()) != active_nodes.end())
-                    {
-                        res_columns[i++]->insert(static_cast<Int8>(Status::ACTIVE));
-                    }
-                    else if (std::find(finished_nodes.begin(), finished_nodes.end(), address.toString()) != finished_nodes.end())
-                    {
-                        if (pool_status[replica_index].error_count != 0)
-                        {
-                            res_columns[i++]->insert(static_cast<Int8>(Status::ERRORED));
-                        }
-                        else
-                        {
-                            res_columns[i++]->insert(static_cast<Int8>(Status::FINISHED));
-                        }
-                        // regardless of the status finished or errored, the node host_name:port entry was found under the /finished path
-                        // & should be able to get the contents of the znode at /finished path.
-                        auto res_fn = zookeeper->asyncTryGet(fs::path(ddl_query_path) / "finished");
-                        auto stat_fn = res_fn.get().stat;
-                        query_finish_time = stat_fn.mtime;
-                    }
-                    else
-                    {
-                        res_columns[i++]->insert(static_cast<Int8>(Status::UNKNOWN));
-                    }
-
-                    Coordination::GetResponse res;
-                    res = futures[query_id].get();
-
-                    auto query_start_time = res.stat.mtime;
-
-                    DDLLogEntry entry;
-                    entry.parse(res.data);
-                    String cluster_name = clusterNameFromDDLQuery(context, entry);
-
-                    res_columns[i++]->insert(cluster_name);
-                    res_columns[i++]->insert(entry.query);
-                    res_columns[i++]->insert(entry.initiator);
-                    res_columns[i++]->insert(UInt64(query_start_time / 1000));
-                    res_columns[i++]->insert(UInt64(query_finish_time / 1000));
-                    res_columns[i++]->insert(UInt64(query_finish_time - query_start_time));
-                    res_columns[i++]->insert(static_cast<Int8>(zk_exception_code));
-                }
+                const auto & host_id_str = maybe_finished_hosts.names[host_idx];
+                HostID host_id = HostID::fromString(host_id_str);
+                repeatValuesInCommonColumns(res_columns, col);
+                size_t rest_col = col;
+                fillHostnameColumns(res_columns, rest_col, host_id);
+                fillStatusColumns(res_columns, rest_col, finished_status_futures[host_idx], query_create_time_ms);
+                processed_hosts.insert(host_id_str);
             }
         }
+        else if (maybe_finished_hosts.error == Coordination::Error::ZNONODE)
+        {
+            /// Rare case: Either status dirs are not created yet or already removed.
+            /// We can distinguish it by checking if task node exists, because "query-xxx" and "query-xxx/finished"
+            /// are removed in single multi-request
+            is_removing_task = !zookeeper->exists(task.entry_path);
+        }
+        else
+        {
+            throw Coordination::Exception(maybe_finished_hosts.error, fs::path(task.entry_path) / "finished");
+        }
+
+        /// Process active nodes
+        auto maybe_active_hosts = active_nodes_futures[i].get();
+        if (maybe_active_hosts.error == Coordination::Error::ZOK)
+        {
+            for (const auto & host_id_str : maybe_active_hosts.names)
+            {
+                if (processed_hosts.contains(host_id_str))
+                    continue;
+
+                HostID host_id = HostID::fromString(host_id_str);
+                repeatValuesInCommonColumns(res_columns, col);
+                size_t rest_col = col;
+                fillHostnameColumns(res_columns, rest_col, host_id);
+                fillStatusColumnsWithNulls(res_columns, rest_col, Status::ACTIVE);
+                processed_hosts.insert(host_id_str);
+            }
+        }
+        else if (maybe_active_hosts.error == Coordination::Error::ZNONODE)
+        {
+            /// Rare case: Either status dirs are not created yet or task is currently removing.
+            /// When removing a task, at first we remove "query-xxx/active" (not recursively),
+            /// then recursively remove everything except "query-xxx/finished"
+            /// and then remove "query-xxx" and "query-xxx/finished".
+            is_removing_task = is_removing_task ||
+                (zookeeper->exists(fs::path(task.entry_path) / "finished") && !zookeeper->exists(fs::path(task.entry_path) / "active")) ||
+                !zookeeper->exists(task.entry_path);
+        }
+        else
+        {
+            throw Coordination::Exception(maybe_active_hosts.error, fs::path(task.entry_path) / "active");
+        }
+
+        /// Process the rest hosts
+        for (const auto & host_id : task.entry.hosts)
+        {
+            if (processed_hosts.contains(host_id.toString()))
+                continue;
+
+            Status status = is_removing_task ? Status::REMOVING : Status::INACTIVE;
+            repeatValuesInCommonColumns(res_columns, col);
+            size_t rest_col = col;
+            fillHostnameColumns(res_columns, rest_col, host_id);
+            fillStatusColumnsWithNulls(res_columns, rest_col, status);
+            processed_hosts.insert(host_id.toString());
+        }
+
+        if (processed_hosts.empty())
+        {
+            /// We don't know any hosts, just fill the rest columns with nulls.
+            /// host
+            res_columns[col++]->insert(Field{});
+            /// port
+            res_columns[col++]->insert(Field{});
+            fillStatusColumnsWithNulls(res_columns, col, Status::UNKNOWN);
+        }
     }
 }
+
 }
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.h b/src/Storages/System/StorageSystemDDLWorkerQueue.h
index 891ba4db509..9c29172f0f5 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.h
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.h
@@ -1,12 +1,8 @@
 #pragma once
-
-#include <Poco/Util/Application.h>
-#include <Poco/Util/LayeredConfiguration.h>
-
 #include <Interpreters/DDLWorker.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 #include <common/shared_ptr_helper.h>
-
+#include <future>
 
 namespace DB
 {
@@ -19,10 +15,9 @@ class StorageSystemDDLWorkerQueue final : public shared_ptr_helper<StorageSystem
                                           public IStorageSystemOneBlock<StorageSystemDDLWorkerQueue>
 {
     friend struct shared_ptr_helper<StorageSystemDDLWorkerQueue>;
-    Poco::Util::LayeredConfiguration & config = Poco::Util::Application::instance().config();
 
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemFunctions.cpp b/src/Storages/System/StorageSystemFunctions.cpp
index f19cffee37c..b3f1231bd1a 100644
--- a/src/Storages/System/StorageSystemFunctions.cpp
+++ b/src/Storages/System/StorageSystemFunctions.cpp
@@ -1,24 +1,34 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeEnum.h>
 #include <Parsers/queryToString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/UserDefinedFunctionFactory.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
+#include <Interpreters/UserDefinedExecutableFunctionFactory.h>
 #include <Storages/System/StorageSystemFunctions.h>
 
 namespace DB
 {
+
+enum class FunctionOrigin : Int8
+{
+    SYSTEM = 0,
+    SQL_USER_DEFINED = 1,
+    EXECUTABLE_USER_DEFINED = 2
+};
+
 namespace
 {
     template <typename Factory>
-    void fillRow(MutableColumns & res_columns, const String & name, UInt64 is_aggregate, const String & create_query, const Factory & f)
+    void fillRow(MutableColumns & res_columns, const String & name, UInt64 is_aggregate, const String & create_query, FunctionOrigin function_origin, const Factory & f)
     {
         res_columns[0]->insert(name);
         res_columns[1]->insert(is_aggregate);
 
-        if constexpr (std::is_same_v<Factory, UserDefinedFunctionFactory>)
+        if constexpr (std::is_same_v<Factory, UserDefinedSQLFunctionFactory> || std::is_same_v<Factory, UserDefinedExecutableFunctionFactory>)
         {
             res_columns[2]->insert(false);
             res_columns[3]->insertDefault();
@@ -33,9 +43,19 @@ namespace
         }
 
         res_columns[4]->insert(create_query);
+        res_columns[5]->insert(static_cast<Int8>(function_origin));
     }
 }
 
+std::vector<std::pair<String, Int8>> getOriginEnumsAndValues()
+{
+    return std::vector<std::pair<String, Int8>>{
+        {"System", static_cast<Int8>(FunctionOrigin::SYSTEM)},
+        {"SQLUserDefined", static_cast<Int8>(FunctionOrigin::SQL_USER_DEFINED)},
+        {"ExecutableUserDefined", static_cast<Int8>(FunctionOrigin::EXECUTABLE_USER_DEFINED)}
+    };
+}
+
 NamesAndTypesList StorageSystemFunctions::getNamesAndTypes()
 {
     return {
@@ -43,32 +63,40 @@ NamesAndTypesList StorageSystemFunctions::getNamesAndTypes()
         {"is_aggregate", std::make_shared<DataTypeUInt8>()},
         {"case_insensitive", std::make_shared<DataTypeUInt8>()},
         {"alias_to", std::make_shared<DataTypeString>()},
-        {"create_query", std::make_shared<DataTypeString>()}
+        {"create_query", std::make_shared<DataTypeString>()},
+        {"origin", std::make_shared<DataTypeEnum8>(getOriginEnumsAndValues())}
     };
 }
 
-void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     const auto & functions_factory = FunctionFactory::instance();
     const auto & function_names = functions_factory.getAllRegisteredNames();
     for (const auto & function_name : function_names)
     {
-        fillRow(res_columns, function_name, UInt64(0), "", functions_factory);
+        fillRow(res_columns, function_name, UInt64(0), "", FunctionOrigin::SYSTEM, functions_factory);
     }
 
     const auto & aggregate_functions_factory = AggregateFunctionFactory::instance();
     const auto & aggregate_function_names = aggregate_functions_factory.getAllRegisteredNames();
     for (const auto & function_name : aggregate_function_names)
     {
-        fillRow(res_columns, function_name, UInt64(1), "", aggregate_functions_factory);
+        fillRow(res_columns, function_name, UInt64(1), "", FunctionOrigin::SYSTEM, aggregate_functions_factory);
     }
 
-    const auto & user_defined_functions_factory = UserDefinedFunctionFactory::instance();
-    const auto & user_defined_functions_names = user_defined_functions_factory.getAllRegisteredNames();
-    for (const auto & function_name : user_defined_functions_names)
+    const auto & user_defined_sql_functions_factory = UserDefinedSQLFunctionFactory::instance();
+    const auto & user_defined_sql_functions_names = user_defined_sql_functions_factory.getAllRegisteredNames();
+    for (const auto & function_name : user_defined_sql_functions_names)
     {
-        auto create_query = queryToString(user_defined_functions_factory.get(function_name));
-        fillRow(res_columns, function_name, UInt64(0), create_query, user_defined_functions_factory);
+        auto create_query = queryToString(user_defined_sql_functions_factory.get(function_name));
+        fillRow(res_columns, function_name, UInt64(0), create_query, FunctionOrigin::SQL_USER_DEFINED, user_defined_sql_functions_factory);
+    }
+
+    const auto & user_defined_executable_functions_factory = UserDefinedExecutableFunctionFactory::instance();
+    const auto & user_defined_executable_functions_names = user_defined_executable_functions_factory.getRegisteredNames(context);
+    for (const auto & function_name : user_defined_executable_functions_names)
+    {
+        fillRow(res_columns, function_name, UInt64(0), "", FunctionOrigin::EXECUTABLE_USER_DEFINED, user_defined_executable_functions_factory);
     }
 }
 }
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index dba05d44969..e79978463dd 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -265,7 +265,7 @@ void StorageSystemParts::processNextStorage(
         /// _state column should be the latest.
         /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
-            columns[res_index++]->insert(IMergeTreeDataPart::stateToString(part_state));
+            columns[res_index++]->insert(IMergeTreeDataPart::stateString(part_state));
     }
 }
 
diff --git a/src/Storages/System/StorageSystemProcesses.cpp b/src/Storages/System/StorageSystemProcesses.cpp
index e2685af7718..5e6ba37226c 100644
--- a/src/Storages/System/StorageSystemProcesses.cpp
+++ b/src/Storages/System/StorageSystemProcesses.cpp
@@ -73,7 +73,9 @@ NamesAndAliases StorageSystemProcesses::getNamesAndAliases()
     return
     {
         {"ProfileEvents.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(ProfileEvents)"},
-        {"ProfileEvents.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())}, "mapValues(ProfileEvents)"}
+        {"ProfileEvents.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())}, "mapValues(ProfileEvents)"},
+        {"Settings.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(Settings)" },
+        {"Settings.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapValues(Settings)"}
     };
 }
 
diff --git a/src/Storages/System/StorageSystemProjectionParts.cpp b/src/Storages/System/StorageSystemProjectionParts.cpp
index 7ae8a91ad60..378437bd4ec 100644
--- a/src/Storages/System/StorageSystemProjectionParts.cpp
+++ b/src/Storages/System/StorageSystemProjectionParts.cpp
@@ -282,7 +282,7 @@ void StorageSystemProjectionParts::processNextStorage(
         /// _state column should be the latest.
         /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
-            columns[res_index++]->insert(IMergeTreeDataPart::stateToString(part_state));
+            columns[res_index++]->insert(IMergeTreeDataPart::stateString(part_state));
     }
 }
 
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.h b/src/Storages/System/StorageSystemReplicatedFetches.h
index b7336dbf437..1e17ac4941c 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.h
+++ b/src/Storages/System/StorageSystemReplicatedFetches.h
@@ -11,7 +11,7 @@ namespace DB
 class Context;
 
 /// system.replicated_fetches table. Takes data from context.getReplicatedFetchList()
-class StorageSystemReplicatedFetches final : public shared_ptr_helper<StorageSystemReplicatedFetches>, public IStorageSystemOneBlock<StorageSystemReplicatedFetches >
+class StorageSystemReplicatedFetches final : public shared_ptr_helper<StorageSystemReplicatedFetches>, public IStorageSystemOneBlock<StorageSystemReplicatedFetches>
 {
     friend struct shared_ptr_helper<StorageSystemReplicatedFetches>;
 public:
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index 48dfadd2b3c..26caed55961 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -6,6 +6,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Interpreters/Context.h>
+#include <common/EnumReflection.h>
 
 
 namespace DB
@@ -68,7 +69,7 @@ Pipe StorageSystemStoragePolicies::read(
             for (const auto & disk_ptr : volumes[i]->getDisks())
                 disks.push_back(disk_ptr->getName());
             col_disks->insert(disks);
-            col_volume_type->insert(volumeTypeToString(volumes[i]->getType()));
+            col_volume_type->insert(magic_enum::enum_name(volumes[i]->getType()));
             col_max_part_size->insert(volumes[i]->max_data_part_size);
             col_move_factor->insert(policy_ptr->getMoveFactor());
             col_prefer_not_to_merge->insert(volumes[i]->areMergesAvoided() ? 1 : 0);
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index 1d38ca6ebbb..f1f7fa4fa08 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -47,6 +47,7 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
         {"dependencies_table", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"create_table_query", std::make_shared<DataTypeString>()},
         {"engine_full", std::make_shared<DataTypeString>()},
+        {"as_select", std::make_shared<DataTypeString>()},
         {"partition_key", std::make_shared<DataTypeString>()},
         {"sorting_key", std::make_shared<DataTypeString>()},
         {"primary_key", std::make_shared<DataTypeString>()},
@@ -57,6 +58,7 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
         {"lifetime_rows", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
         {"lifetime_bytes", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
         {"comment", std::make_shared<DataTypeString>()},
+        {"has_own_data", std::make_shared<DataTypeUInt8>()},
     }));
     setInMemoryMetadata(storage_metadata);
 }
@@ -209,6 +211,10 @@ protected:
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insert(table.second->getName());
 
+                        // as_select
+                        if (columns_mask[src_index++])
+                            res_columns[res_index++]->insertDefault();
+
                         // partition_key
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insertDefault();
@@ -248,6 +254,10 @@ protected:
                         // comment
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insertDefault();
+
+                        // has_own_data
+                        if (columns_mask[src_index++])
+                            res_columns[res_index++]->insertDefault();
                     }
                 }
 
@@ -355,15 +365,15 @@ protected:
                         res_columns[res_index++]->insert(dependencies_table_name_array);
                 }
 
-                if (columns_mask[src_index] || columns_mask[src_index + 1])
+                if (columns_mask[src_index] || columns_mask[src_index + 1] || columns_mask[src_index + 2])
                 {
                     ASTPtr ast = database->tryGetCreateTableQuery(table_name, context);
+                    auto * ast_create = ast ? ast->as<ASTCreateQuery>() : nullptr;
 
-                    if (ast && !context->getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
+                    if (ast_create && !context->getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
                     {
-                        auto & create = ast->as<ASTCreateQuery &>();
-                        create.uuid = UUIDHelpers::Nil;
-                        create.to_inner_uuid = UUIDHelpers::Nil;
+                        ast_create->uuid = UUIDHelpers::Nil;
+                        ast_create->to_inner_uuid = UUIDHelpers::Nil;
                     }
 
                     if (columns_mask[src_index++])
@@ -373,24 +383,28 @@ protected:
                     {
                         String engine_full;
 
-                        if (ast)
+                        if (ast_create && ast_create->storage)
                         {
-                            const auto & ast_create = ast->as<ASTCreateQuery &>();
-                            if (ast_create.storage)
-                            {
-                                engine_full = queryToString(*ast_create.storage);
+                            engine_full = queryToString(*ast_create->storage);
 
-                                static const char * const extra_head = " ENGINE = ";
-                                if (startsWith(engine_full, extra_head))
-                                    engine_full = engine_full.substr(strlen(extra_head));
-                            }
+                            static const char * const extra_head = " ENGINE = ";
+                            if (startsWith(engine_full, extra_head))
+                                engine_full = engine_full.substr(strlen(extra_head));
                         }
 
                         res_columns[res_index++]->insert(engine_full);
                     }
+
+                    if (columns_mask[src_index++])
+                    {
+                        String as_select;
+                        if (ast_create && ast_create->select)
+                            as_select = queryToString(*ast_create->select);
+                        res_columns[res_index++]->insert(as_select);
+                    }
                 }
                 else
-                    src_index += 2;
+                    src_index += 3;
 
                 StorageMetadataPtr metadata_snapshot;
                 if (table)
@@ -483,6 +497,14 @@ protected:
                     else
                         res_columns[res_index++]->insertDefault();
                 }
+
+                if (columns_mask[src_index++])
+                {
+                    if (table)
+                        res_columns[res_index++]->insert(table->storesDataOnDisk());
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
             }
         }
 
diff --git a/src/Storages/System/StorageSystemViews.cpp b/src/Storages/System/StorageSystemViews.cpp
deleted file mode 100644
index 0bb2724b358..00000000000
--- a/src/Storages/System/StorageSystemViews.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <Storages/System/StorageSystemViews.h>
-#include <DataTypes/DataTypeString.h>
-#include <Access/ContextAccess.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/QueryViewsLog.h>
-#include <DataTypes/DataTypeEnum.h>
-#include <Storages/StorageMaterializedView.h>
-#include <Storages/LiveView/StorageLiveView.h>
-
-namespace DB
-{
-
-class Context;
-
-NamesAndTypesList StorageSystemViews::getNamesAndTypes()
-{
-    auto view_type_datatype = std::make_shared<DataTypeEnum8>(DataTypeEnum8::Values{
-        {"Default", static_cast<Int8>(QueryViewsLogElement::ViewType::DEFAULT)},
-        {"Materialized", static_cast<Int8>(QueryViewsLogElement::ViewType::MATERIALIZED)},
-        {"Live", static_cast<Int8>(QueryViewsLogElement::ViewType::LIVE)}});
-
-    return {
-        {"database", std::make_shared<DataTypeString>()},
-        {"name", std::make_shared<DataTypeString>()},
-        {"main_dependency_database", std::make_shared<DataTypeString>()},
-        {"main_dependency_table", std::make_shared<DataTypeString>()},
-        {"view_type", std::move(view_type_datatype)},
-    };
-}
-
-void StorageSystemViews::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
-{
-    const auto access = context->getAccess();
-    const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
-
-    for (const auto & [table_id, view_ids] : DatabaseCatalog::instance().getViewDependencies())
-    {
-        const bool check_access_for_tables = check_access_for_databases && !access->isGranted(AccessType::SHOW_TABLES, table_id.database_name);
-
-        if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, table_id.database_name, table_id.table_name))
-            continue;
-
-        size_t col_num;
-        for (const auto & view_id : view_ids)
-        {
-            auto view_ptr = DatabaseCatalog::instance().getTable(view_id, context);
-            QueryViewsLogElement::ViewType type = QueryViewsLogElement::ViewType::DEFAULT;
-
-            if (typeid_cast<const StorageMaterializedView *>(view_ptr.get()))
-            {
-                type = QueryViewsLogElement::ViewType::MATERIALIZED;
-            }
-            else if (typeid_cast<const StorageLiveView *>(view_ptr.get()))
-            {
-                type = QueryViewsLogElement::ViewType::LIVE;
-            }
-
-            col_num = 0;
-            res_columns[col_num++]->insert(view_id.database_name);
-            res_columns[col_num++]->insert(view_id.table_name);
-            res_columns[col_num++]->insert(table_id.database_name);
-            res_columns[col_num++]->insert(table_id.table_name);
-            res_columns[col_num++]->insert(type);
-        }
-    }
-}
-
-}
diff --git a/src/Storages/System/StorageSystemViews.h b/src/Storages/System/StorageSystemViews.h
deleted file mode 100644
index 67fcb79067e..00000000000
--- a/src/Storages/System/StorageSystemViews.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <common/shared_ptr_helper.h>
-#include <Storages/System/IStorageSystemOneBlock.h>
-
-namespace DB
-{
-
-class StorageSystemViews final : public shared_ptr_helper<StorageSystemViews>, public IStorageSystemOneBlock<StorageSystemViews>
-{
-    friend struct shared_ptr_helper<StorageSystemViews>;
-protected:
-    using IStorageSystemOneBlock::IStorageSystemOneBlock;
-
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
-
-public:
-    std::string getName() const override { return "SystemViews"; }
-
-    static NamesAndTypesList getNamesAndTypes();
-
-};
-
-}
diff --git a/src/Storages/System/attachInformationSchemaTables.cpp b/src/Storages/System/attachInformationSchemaTables.cpp
new file mode 100644
index 00000000000..a94b15ba3b4
--- /dev/null
+++ b/src/Storages/System/attachInformationSchemaTables.cpp
@@ -0,0 +1,57 @@
+#include <Databases/DatabaseOnDisk.h>
+#include <Storages/System/attachInformationSchemaTables.h>
+#include <Storages/System/attachSystemTablesImpl.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/parseQuery.h>
+#include <common/getResource.h>
+
+namespace DB
+{
+
+/// View structures are taken from http://www.contrib.andrew.cmu.edu/~shadow/sql/sql1992.txt
+
+static void createInformationSchemaView(ContextMutablePtr context, IDatabase & database, const String & view_name)
+{
+    try
+    {
+        assert(database.getDatabaseName() == DatabaseCatalog::INFORMATION_SCHEMA ||
+               database.getDatabaseName() == DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE);
+        if (database.getEngineName() != "Memory")
+            return;
+        bool is_uppercase = database.getDatabaseName() == DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE;
+
+        String metadata_resource_name = view_name + ".sql";
+        auto attach_query = getResource(metadata_resource_name);
+        if (attach_query.empty())
+            return;
+
+        ParserCreateQuery parser;
+        ASTPtr ast = parseQuery(parser, attach_query.data(), attach_query.data() + attach_query.size(),
+                                "Attach query from embedded resource " + metadata_resource_name,
+                                DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+
+        auto & ast_create = ast->as<ASTCreateQuery &>();
+        assert(view_name == ast_create.table);
+        if (is_uppercase)
+            ast_create.table = Poco::toUpper(view_name);
+
+        StoragePtr view = createTableFromAST(ast_create, database.getDatabaseName(),
+                                             database.getTableDataPath(ast_create), context, true).second;
+
+        database.createTable(context, ast_create.table, view, ast);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void attachInformationSchema(ContextMutablePtr context, IDatabase & information_schema_database)
+{
+    createInformationSchemaView(context, information_schema_database, "schemata");
+    createInformationSchemaView(context, information_schema_database, "tables");
+    createInformationSchemaView(context, information_schema_database, "views");
+    createInformationSchemaView(context, information_schema_database, "columns");
+}
+
+}
diff --git a/src/Storages/System/attachInformationSchemaTables.h b/src/Storages/System/attachInformationSchemaTables.h
new file mode 100644
index 00000000000..9bb5623128a
--- /dev/null
+++ b/src/Storages/System/attachInformationSchemaTables.h
@@ -0,0 +1,11 @@
+#pragma once
+#include <Interpreters/Context_fwd.h>
+
+namespace DB
+{
+
+class IDatabase;
+
+void attachInformationSchema(ContextMutablePtr context, IDatabase & information_schema_database);
+
+}
diff --git a/src/Storages/System/attachSystemTables.cpp b/src/Storages/System/attachSystemTables.cpp
index 3656a239adb..4950a742dc9 100644
--- a/src/Storages/System/attachSystemTables.cpp
+++ b/src/Storages/System/attachSystemTables.cpp
@@ -44,7 +44,6 @@
 #include <Storages/System/StorageSystemTableEngines.h>
 #include <Storages/System/StorageSystemTableFunctions.h>
 #include <Storages/System/StorageSystemTables.h>
-#include <Storages/System/StorageSystemViews.h>
 #include <Storages/System/StorageSystemZooKeeper.h>
 #include <Storages/System/StorageSystemContributors.h>
 #include <Storages/System/StorageSystemErrors.h>
@@ -74,6 +73,7 @@
 #include <Storages/System/StorageSystemQuotasUsage.h>
 #include <Storages/System/StorageSystemUserDirectories.h>
 #include <Storages/System/StorageSystemPrivileges.h>
+#include <Storages/System/StorageSystemAsynchronousInserts.h>
 
 #ifdef OS_LINUX
 #include <Storages/System/StorageSystemStackTrace.h>
@@ -96,7 +96,6 @@ void attachSystemTablesLocal(IDatabase & system_database)
     attach<StorageSystemZeros>(system_database, "zeros_mt", true);
     attach<StorageSystemDatabases>(system_database, "databases");
     attach<StorageSystemTables>(system_database, "tables");
-    attach<StorageSystemViews>(system_database, "views");
     attach<StorageSystemColumns>(system_database, "columns");
     attach<StorageSystemFunctions>(system_database, "functions");
     attach<StorageSystemEvents>(system_database, "events");
@@ -167,6 +166,7 @@ void attachSystemTablesServer(IDatabase & system_database, bool has_zookeeper)
     attach<StorageSystemMacros>(system_database, "macros");
     attach<StorageSystemReplicatedFetches>(system_database, "replicated_fetches");
     attach<StorageSystemPartMovesBetweenShards>(system_database, "part_moves_between_shards");
+    attach<StorageSystemAsynchronousInserts>(system_database, "asynchronous_inserts");
 
     if (has_zookeeper)
         attach<StorageSystemZooKeeper>(system_database, "zookeeper");
diff --git a/src/Storages/System/attachSystemTablesImpl.h b/src/Storages/System/attachSystemTablesImpl.h
index 78e944f7d27..1fdf677699a 100644
--- a/src/Storages/System/attachSystemTablesImpl.h
+++ b/src/Storages/System/attachSystemTablesImpl.h
@@ -9,6 +9,7 @@ namespace DB
 template<typename StorageT, typename... StorageArgs>
 void attach(IDatabase & system_database, const String & table_name, StorageArgs && ... args)
 {
+    assert(system_database.getDatabaseName() == DatabaseCatalog::SYSTEM_DATABASE);
     if (system_database.getUUID() == UUIDHelpers::Nil)
     {
         /// Attach to Ordinary database
diff --git a/src/Storages/tests/gtest_columns_description_normalize.cpp b/src/Storages/tests/gtest_columns_description_normalize.cpp
new file mode 100644
index 00000000000..d6c5aa8073b
--- /dev/null
+++ b/src/Storages/tests/gtest_columns_description_normalize.cpp
@@ -0,0 +1,25 @@
+#include <Storages/ColumnsDescription.h>
+#include <Common/tests/gtest_global_register.h>
+
+#include <gtest/gtest.h>
+
+using namespace DB;
+
+TEST(ColumnsDescription, Normalize)
+{
+    constexpr auto columns = "columns format version: 1\n"
+                             "3 columns:\n"
+                             "`a` UInt32\n"
+                             "`b` String\tDEFAULT\tIf(a = 0, 'true', 'false')\n"
+                             "`c` String\tDEFAULT\tcAsT(a, 'String')\n";
+
+    constexpr auto columns_normalized = "columns format version: 1\n"
+                                        "3 columns:\n"
+                                        "`a` UInt32\n"
+                                        "`b` String\tDEFAULT\tif(a = 0, 'true', 'false')\n"
+                                        "`c` String\tDEFAULT\tcast(a, 'String')\n";
+
+    tryRegisterFunctions();
+
+    ASSERT_EQ(ColumnsDescription::parse(columns), ColumnsDescription::parse(columns_normalized));
+}
diff --git a/src/Storages/tests/gtest_transform_query_for_external_database.cpp b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
index 1d4cad576fa..13e1ca882af 100644
--- a/src/Storages/tests/gtest_transform_query_for_external_database.cpp
+++ b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
@@ -104,12 +104,12 @@ static void check(
     SelectQueryInfo query_info;
     SelectQueryOptions select_options;
     query_info.syntax_analyzer_result
-        = TreeRewriter(state.context).analyzeSelect(ast, state.getColumns(), select_options, state.getTables(table_num));
+        = TreeRewriter(state.context).analyzeSelect(ast, DB::TreeRewriterResult(state.getColumns()), select_options, state.getTables(table_num));
     query_info.query = ast;
     std::string transformed_query = transformQueryForExternalDatabase(
         query_info, state.getColumns(), IdentifierQuotingStyle::DoubleQuotes, "test", "table", state.context);
 
-    EXPECT_EQ(transformed_query, expected);
+    EXPECT_EQ(transformed_query, expected) << query;
 }
 
 
@@ -128,6 +128,18 @@ TEST(TransformQueryForExternalDatabase, InWithSingleElement)
           R"(SELECT "column" FROM "test"."table" WHERE "column" NOT IN ('hello', 'world'))");
 }
 
+TEST(TransformQueryForExternalDatabase, InWithMultipleColumns)
+{
+    const State & state = State::instance();
+
+    check(state, 1,
+          "SELECT column FROM test.table WHERE (1,1) IN ((1,1))",
+          R"(SELECT "column" FROM "test"."table" WHERE 1)");
+    check(state, 1,
+          "SELECT field, value FROM test.table WHERE (field, value) IN (('foo', 'bar'))",
+          R"(SELECT "field", "value" FROM "test"."table" WHERE ("field", "value") IN (('foo', 'bar')))");
+}
+
 TEST(TransformQueryForExternalDatabase, InWithTable)
 {
     const State & state = State::instance();
@@ -207,3 +219,33 @@ TEST(TransformQueryForExternalDatabase, ForeignColumnInWhere)
           "WHERE column > 2 AND (apply_id = 1 OR table2.num = 1) AND table2.attr != ''",
           R"(SELECT "column", "apply_id" FROM "test"."table" WHERE ("column" > 2) AND ("apply_id" = 1))");
 }
+
+TEST(TransformQueryForExternalDatabase, NoStrict)
+{
+    const State & state = State::instance();
+
+    check(state, 1,
+          "SELECT field FROM table WHERE field IN (SELECT attr FROM table2)",
+          R"(SELECT "field" FROM "test"."table")");
+}
+
+TEST(TransformQueryForExternalDatabase, Strict)
+{
+    const State & state = State::instance();
+    state.context->setSetting("external_table_strict_query", true);
+
+    check(state, 1,
+          "SELECT field FROM table WHERE field = '1'",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" = '1')");
+    check(state, 1,
+          "SELECT field FROM table WHERE field IN ('1', '2')",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" IN ('1', '2'))");
+    check(state, 1,
+          "SELECT field FROM table WHERE field LIKE '%test%'",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" LIKE '%test%')");
+
+    /// removeUnknownSubexpressionsFromWhere() takes place
+    EXPECT_THROW(check(state, 1, "SELECT field FROM table WHERE field IN (SELECT attr FROM table2)", ""), Exception);
+    /// !isCompatible() takes place
+    EXPECT_THROW(check(state, 1, "SELECT column FROM test.table WHERE left(column, 10) = RIGHT(column, 10) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello'", ""), Exception);
+}
diff --git a/src/Storages/transformQueryForExternalDatabase.cpp b/src/Storages/transformQueryForExternalDatabase.cpp
index 4e299c5a357..96510585600 100644
--- a/src/Storages/transformQueryForExternalDatabase.cpp
+++ b/src/Storages/transformQueryForExternalDatabase.cpp
@@ -9,6 +9,7 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/Context.h>
 #include <IO/WriteBufferFromString.h>
 #include <Storages/transformQueryForExternalDatabase.h>
 #include <Storages/MergeTree/KeyCondition.h>
@@ -20,6 +21,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int INCORRECT_QUERY;
 }
 
 namespace
@@ -105,9 +107,9 @@ void dropAliases(ASTPtr & node)
 }
 
 
-bool isCompatible(const IAST & node)
+bool isCompatible(IAST & node)
 {
-    if (const auto * function = node.as<ASTFunction>())
+    if (auto * function = node.as<ASTFunction>())
     {
         if (function->parameters)   /// Parametric aggregate functions
             return false;
@@ -135,8 +137,14 @@ bool isCompatible(const IAST & node)
 
         /// A tuple with zero or one elements is represented by a function tuple(x) and is not compatible,
         /// but a normal tuple with more than one element is represented as a parenthesized expression (x, y) and is perfectly compatible.
-        if (name == "tuple" && function->arguments->children.size() <= 1)
-            return false;
+        /// So to support tuple with zero or one elements we can clear function name to get (x) instead of tuple(x)
+        if (name == "tuple")
+        {
+            if (function->arguments->children.size() <= 1)
+            {
+                function->name.clear();
+            }
+        }
 
         /// If the right hand side of IN is a table identifier (example: x IN table), then it's not compatible.
         if ((name == "in" || name == "notIn")
@@ -242,6 +250,7 @@ String transformQueryForExternalDatabase(
 {
     auto clone_query = query_info.query->clone();
     const Names used_columns = query_info.syntax_analyzer_result->requiredSourceColumns();
+    bool strict = context->getSettingsRef().external_table_strict_query;
 
     auto select = std::make_shared<ASTSelectQuery>();
 
@@ -269,6 +278,10 @@ String transformQueryForExternalDatabase(
         {
             select->setExpression(ASTSelectQuery::Expression::WHERE, std::move(original_where));
         }
+        else if (strict)
+        {
+            throw Exception("Query contains non-compatible expressions (and external_table_strict_query=true)", ErrorCodes::INCORRECT_QUERY);
+        }
         else if (const auto * function = original_where->as<ASTFunction>())
         {
             if (function->name == "and")
@@ -286,6 +299,10 @@ String transformQueryForExternalDatabase(
             }
         }
     }
+    else if (strict && original_where)
+    {
+        throw Exception("Query contains non-compatible expressions (and external_table_strict_query=true)", ErrorCodes::INCORRECT_QUERY);
+    }
 
     ASTPtr select_ptr = select;
     dropAliases(select_ptr);
diff --git a/src/Storages/transformQueryForExternalDatabase.h b/src/Storages/transformQueryForExternalDatabase.h
index 215afab8b30..6f7d6af5319 100644
--- a/src/Storages/transformQueryForExternalDatabase.h
+++ b/src/Storages/transformQueryForExternalDatabase.h
@@ -22,6 +22,9 @@ class IAST;
   * that contain only compatible expressions.
   *
   * Compatible expressions are comparisons of identifiers, constants, and logical operations on them.
+  *
+  * Throws INCORRECT_QUERY if external_table_strict_query (from context settings)
+  * is set and some expression from WHERE is not compatible.
   */
 String transformQueryForExternalDatabase(
     const SelectQueryInfo & query_info,
diff --git a/src/Storages/ya.make b/src/Storages/ya.make
deleted file mode 100644
index 5b246cf5aca..00000000000
--- a/src/Storages/ya.make
+++ /dev/null
@@ -1,231 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/sparsehash
-    contrib/libs/poco/MongoDB
-)
-
-
-SRCS(
-    AlterCommands.cpp
-    ColumnDefault.cpp
-    ColumnsDescription.cpp
-    ConstraintsDescription.cpp
-    Distributed/DirectoryMonitor.cpp
-    Distributed/DistributedSettings.cpp
-    Distributed/DistributedSink.cpp
-    ExecutablePoolSettings.cpp
-    IStorage.cpp
-    IndicesDescription.cpp
-    JoinSettings.cpp
-    KeyDescription.cpp
-    LiveView/StorageLiveView.cpp
-    LiveView/TemporaryLiveViewCleaner.cpp
-    MemorySettings.cpp
-    MergeTree/ActiveDataPartSet.cpp
-    MergeTree/AllMergeSelector.cpp
-    MergeTree/BackgroundJobsExecutor.cpp
-    MergeTree/BoolMask.cpp
-    MergeTree/DataPartsExchange.cpp
-    MergeTree/DropPartsRanges.cpp
-    MergeTree/EphemeralLockInZooKeeper.cpp
-    MergeTree/IMergeTreeDataPart.cpp
-    MergeTree/IMergeTreeDataPartWriter.cpp
-    MergeTree/IMergeTreeReader.cpp
-    MergeTree/IMergedBlockOutputStream.cpp
-    MergeTree/KeyCondition.cpp
-    MergeTree/LevelMergeSelector.cpp
-    MergeTree/MergeAlgorithm.cpp
-    MergeTree/MergeList.cpp
-    MergeTree/MergeTreeBaseSelectProcessor.cpp
-    MergeTree/MergeTreeBlockReadUtils.cpp
-    MergeTree/MergeTreeData.cpp
-    MergeTree/MergeTreeDataMergerMutator.cpp
-    MergeTree/MergeTreeDataPartChecksum.cpp
-    MergeTree/MergeTreeDataPartCompact.cpp
-    MergeTree/MergeTreeDataPartInMemory.cpp
-    MergeTree/MergeTreeDataPartTTLInfo.cpp
-    MergeTree/MergeTreeDataPartType.cpp
-    MergeTree/MergeTreeDataPartUUID.cpp
-    MergeTree/MergeTreeDataPartWide.cpp
-    MergeTree/MergeTreeDataPartWriterCompact.cpp
-    MergeTree/MergeTreeDataPartWriterInMemory.cpp
-    MergeTree/MergeTreeDataPartWriterOnDisk.cpp
-    MergeTree/MergeTreeDataPartWriterWide.cpp
-    MergeTree/MergeTreeDataSelectExecutor.cpp
-    MergeTree/MergeTreeDataWriter.cpp
-    MergeTree/MergeTreeDeduplicationLog.cpp
-    MergeTree/MergeTreeInOrderSelectProcessor.cpp
-    MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
-    MergeTree/MergeTreeIndexBloomFilter.cpp
-    MergeTree/MergeTreeIndexConditionBloomFilter.cpp
-    MergeTree/MergeTreeIndexFullText.cpp
-    MergeTree/MergeTreeIndexGranularity.cpp
-    MergeTree/MergeTreeIndexGranularityInfo.cpp
-    MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
-    MergeTree/MergeTreeIndexMinMax.cpp
-    MergeTree/MergeTreeIndexReader.cpp
-    MergeTree/MergeTreeIndexSet.cpp
-    MergeTree/MergeTreeIndices.cpp
-    MergeTree/MergeTreeMarksLoader.cpp
-    MergeTree/MergeTreeMutationEntry.cpp
-    MergeTree/MergeTreeMutationStatus.cpp
-    MergeTree/MergeTreePartInfo.cpp
-    MergeTree/MergeTreePartition.cpp
-    MergeTree/MergeTreePartsMover.cpp
-    MergeTree/MergeTreeRangeReader.cpp
-    MergeTree/MergeTreeReadPool.cpp
-    MergeTree/MergeTreeReaderCompact.cpp
-    MergeTree/MergeTreeReaderInMemory.cpp
-    MergeTree/MergeTreeReaderStream.cpp
-    MergeTree/MergeTreeReaderWide.cpp
-    MergeTree/MergeTreeReverseSelectProcessor.cpp
-    MergeTree/MergeTreeSelectProcessor.cpp
-    MergeTree/MergeTreeSequentialSource.cpp
-    MergeTree/MergeTreeSettings.cpp
-    MergeTree/MergeTreeSink.cpp
-    MergeTree/MergeTreeThreadSelectProcessor.cpp
-    MergeTree/MergeTreeWhereOptimizer.cpp
-    MergeTree/MergeTreeWriteAheadLog.cpp
-    MergeTree/MergeType.cpp
-    MergeTree/MergedBlockOutputStream.cpp
-    MergeTree/MergedColumnOnlyOutputStream.cpp
-    MergeTree/PartMovesBetweenShardsOrchestrator.cpp
-    MergeTree/PartitionPruner.cpp
-    MergeTree/PinnedPartUUIDs.cpp
-    MergeTree/ReplicatedFetchList.cpp
-    MergeTree/ReplicatedMergeTreeAddress.cpp
-    MergeTree/ReplicatedMergeTreeAltersSequence.cpp
-    MergeTree/ReplicatedMergeTreeCleanupThread.cpp
-    MergeTree/ReplicatedMergeTreeLogEntry.cpp
-    MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
-    MergeTree/ReplicatedMergeTreeMutationEntry.cpp
-    MergeTree/ReplicatedMergeTreePartCheckThread.cpp
-    MergeTree/ReplicatedMergeTreePartHeader.cpp
-    MergeTree/ReplicatedMergeTreeQueue.cpp
-    MergeTree/ReplicatedMergeTreeRestartingThread.cpp
-    MergeTree/ReplicatedMergeTreeSink.cpp
-    MergeTree/ReplicatedMergeTreeTableMetadata.cpp
-    MergeTree/SimpleMergeSelector.cpp
-    MergeTree/TTLMergeSelector.cpp
-    MergeTree/checkDataPart.cpp
-    MergeTree/localBackup.cpp
-    MergeTree/registerStorageMergeTree.cpp
-    MutationCommands.cpp
-    MySQL/MySQLSettings.cpp
-    PartitionCommands.cpp
-    ProjectionsDescription.cpp
-    ReadFinalForExternalReplicaStorage.cpp
-    ReadInOrderOptimizer.cpp
-    SelectQueryDescription.cpp
-    SetSettings.cpp
-    StorageBuffer.cpp
-    StorageDictionary.cpp
-    StorageDistributed.cpp
-    StorageExecutable.cpp
-    StorageExternalDistributed.cpp
-    StorageFactory.cpp
-    StorageFile.cpp
-    StorageGenerateRandom.cpp
-    StorageInMemoryMetadata.cpp
-    StorageInput.cpp
-    StorageJoin.cpp
-    StorageLog.cpp
-    StorageLogSettings.cpp
-    StorageMaterializedMySQL.cpp
-    StorageMaterializedView.cpp
-    StorageMemory.cpp
-    StorageMerge.cpp
-    StorageMergeTree.cpp
-    StorageMongoDB.cpp
-    StorageMongoDBSocketFactory.cpp
-    StorageMySQL.cpp
-    StorageNull.cpp
-    StorageReplicatedMergeTree.cpp
-    StorageSQLite.cpp
-    StorageSet.cpp
-    StorageStripeLog.cpp
-    StorageTinyLog.cpp
-    StorageURL.cpp
-    StorageValues.cpp
-    StorageView.cpp
-    StorageXDBC.cpp
-    System/StorageSystemAggregateFunctionCombinators.cpp
-    System/StorageSystemAsynchronousMetrics.cpp
-    System/StorageSystemBuildOptions.cpp
-    System/StorageSystemClusters.cpp
-    System/StorageSystemCollations.cpp
-    System/StorageSystemColumns.cpp
-    System/StorageSystemContributors.cpp
-    System/StorageSystemContributors.generated.cpp
-    System/StorageSystemCurrentRoles.cpp
-    System/StorageSystemDDLWorkerQueue.cpp
-    System/StorageSystemDataSkippingIndices.cpp
-    System/StorageSystemDataTypeFamilies.cpp
-    System/StorageSystemDatabases.cpp
-    System/StorageSystemDetachedParts.cpp
-    System/StorageSystemDictionaries.cpp
-    System/StorageSystemDisks.cpp
-    System/StorageSystemDistributionQueue.cpp
-    System/StorageSystemEnabledRoles.cpp
-    System/StorageSystemErrors.cpp
-    System/StorageSystemEvents.cpp
-    System/StorageSystemFormats.cpp
-    System/StorageSystemFunctions.cpp
-    System/StorageSystemGrants.cpp
-    System/StorageSystemGraphite.cpp
-    System/StorageSystemMacros.cpp
-    System/StorageSystemMergeTreeSettings.cpp
-    System/StorageSystemMerges.cpp
-    System/StorageSystemMetrics.cpp
-    System/StorageSystemModels.cpp
-    System/StorageSystemMutations.cpp
-    System/StorageSystemNumbers.cpp
-    System/StorageSystemOne.cpp
-    System/StorageSystemPartMovesBetweenShards.cpp
-    System/StorageSystemParts.cpp
-    System/StorageSystemPartsBase.cpp
-    System/StorageSystemPartsColumns.cpp
-    System/StorageSystemPrivileges.cpp
-    System/StorageSystemProcesses.cpp
-    System/StorageSystemProjectionParts.cpp
-    System/StorageSystemProjectionPartsColumns.cpp
-    System/StorageSystemQuotaLimits.cpp
-    System/StorageSystemQuotaUsage.cpp
-    System/StorageSystemQuotas.cpp
-    System/StorageSystemQuotasUsage.cpp
-    System/StorageSystemReplicas.cpp
-    System/StorageSystemReplicatedFetches.cpp
-    System/StorageSystemReplicationQueue.cpp
-    System/StorageSystemRoleGrants.cpp
-    System/StorageSystemRoles.cpp
-    System/StorageSystemRowPolicies.cpp
-    System/StorageSystemSettings.cpp
-    System/StorageSystemSettingsProfileElements.cpp
-    System/StorageSystemSettingsProfiles.cpp
-    System/StorageSystemStackTrace.cpp
-    System/StorageSystemStoragePolicies.cpp
-    System/StorageSystemTableEngines.cpp
-    System/StorageSystemTableFunctions.cpp
-    System/StorageSystemTables.cpp
-    System/StorageSystemUserDirectories.cpp
-    System/StorageSystemUsers.cpp
-    System/StorageSystemViews.cpp
-    System/StorageSystemWarnings.cpp
-    System/StorageSystemZeros.cpp
-    System/StorageSystemZooKeeper.cpp
-    System/attachSystemTables.cpp
-    TTLDescription.cpp
-    VirtualColumnUtils.cpp
-    extractKeyExpressionList.cpp
-    getStructureOfRemoteTable.cpp
-    registerStorages.cpp
-    transformQueryForExternalDatabase.cpp
-
-)
-
-END()
diff --git a/src/Storages/ya.make.in b/src/Storages/ya.make.in
deleted file mode 100644
index 9a31eef3836..00000000000
--- a/src/Storages/ya.make.in
+++ /dev/null
@@ -1,16 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/sparsehash
-    contrib/libs/poco/MongoDB
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | grep -v -P 'Kafka|RabbitMQ|S3|HDFS|Licenses|TimeZones|RocksDB|PostgreSQL' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/TableFunctions/ITableFunctionFileLike.h b/src/TableFunctions/ITableFunctionFileLike.h
index 7c96ce610b3..2069f02b0dd 100644
--- a/src/TableFunctions/ITableFunctionFileLike.h
+++ b/src/TableFunctions/ITableFunctionFileLike.h
@@ -12,6 +12,15 @@ class Context;
  */
 class ITableFunctionFileLike : public ITableFunction
 {
+
+protected:
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+
+    String filename;
+    String format;
+    String structure;
+    String compression_method = "auto";
+
 private:
     StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
 
@@ -21,13 +30,6 @@ private:
 
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
-    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
-
     bool hasStaticStructure() const override { return true; }
-
-    String filename;
-    String format;
-    String structure;
-    String compression_method = "auto";
 };
 }
diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp
index 09f9cf8b1f5..005a689f895 100644
--- a/src/TableFunctions/TableFunctionMySQL.cpp
+++ b/src/TableFunctions/TableFunctionMySQL.cpp
@@ -34,8 +34,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_TABLE;
 }
 
@@ -46,46 +44,19 @@ void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, ContextPtr
     if (!args_func.arguments)
         throw Exception("Table function 'mysql' must have arguments.", ErrorCodes::LOGICAL_ERROR);
 
-    ASTs & args = args_func.arguments->children;
-
-    if (args.size() < 5 || args.size() > 7)
-        throw Exception("Table function 'mysql' requires 5-7 parameters: MySQL('host:port', database, table, 'user', 'password'[, replace_query, 'on_duplicate_clause']).",
-            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    String host_port = args[0]->as<ASTLiteral &>().value.safeGet<String>();
-    remote_database_name = args[1]->as<ASTLiteral &>().value.safeGet<String>();
-    remote_table_name = args[2]->as<ASTLiteral &>().value.safeGet<String>();
-    user_name = args[3]->as<ASTLiteral &>().value.safeGet<String>();
-    password = args[4]->as<ASTLiteral &>().value.safeGet<String>();
-
-    /// Split into replicas if needed. 3306 is the default MySQL port number
-    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-    auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
-    pool.emplace(remote_database_name, addresses, user_name, password);
-
-    if (args.size() >= 6)
-        replace_query = args[5]->as<ASTLiteral &>().value.safeGet<UInt64>() > 0;
-    if (args.size() == 7)
-        on_duplicate_clause = args[6]->as<ASTLiteral &>().value.safeGet<String>();
-
-    if (replace_query && !on_duplicate_clause.empty())
-        throw Exception(
-            "Only one of 'replace_query' and 'on_duplicate_clause' can be specified, or none of them",
-            ErrorCodes::BAD_ARGUMENTS);
+    configuration = StorageMySQL::getConfiguration(args_func.arguments->children, context);
+    pool.emplace(configuration->database, configuration->addresses, configuration->username, configuration->password);
 }
 
 ColumnsDescription TableFunctionMySQL::getActualTableStructure(ContextPtr context) const
 {
     const auto & settings = context->getSettingsRef();
-    const auto tables_and_columns = fetchTablesColumnsList(*pool, remote_database_name, {remote_table_name}, settings, settings.mysql_datatypes_support_level);
+    const auto tables_and_columns = fetchTablesColumnsList(*pool, configuration->database, {configuration->table}, settings, settings.mysql_datatypes_support_level);
 
-    const auto columns = tables_and_columns.find(remote_table_name);
+    const auto columns = tables_and_columns.find(configuration->table);
     if (columns == tables_and_columns.end())
-        throw Exception("MySQL table " + (remote_database_name.empty() ? "" : (backQuote(remote_database_name) + "."))
-            + backQuote(remote_table_name) + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
+        throw Exception("MySQL table " + (configuration->database.empty() ? "" : (backQuote(configuration->database) + "."))
+            + backQuote(configuration->table) + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
 
     return columns->second;
 }
@@ -101,10 +72,10 @@ StoragePtr TableFunctionMySQL::executeImpl(
     auto res = StorageMySQL::create(
         StorageID(getDatabaseName(), table_name),
         std::move(*pool),
-        remote_database_name,
-        remote_table_name,
-        replace_query,
-        on_duplicate_clause,
+        configuration->database,
+        configuration->table,
+        configuration->replace_query,
+        configuration->on_duplicate_clause,
         columns,
         ConstraintsDescription{},
         String{},
diff --git a/src/TableFunctions/TableFunctionMySQL.h b/src/TableFunctions/TableFunctionMySQL.h
index 64c7d56cf2a..78e84dfed29 100644
--- a/src/TableFunctions/TableFunctionMySQL.h
+++ b/src/TableFunctions/TableFunctionMySQL.h
@@ -5,6 +5,7 @@
 
 #if USE_MYSQL
 #include <TableFunctions/ITableFunction.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <mysqlxx/Pool.h>
 
 
@@ -30,14 +31,8 @@ private:
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    String remote_database_name;
-    String remote_table_name;
-    String user_name;
-    String password;
-    bool replace_query = false;
-    String on_duplicate_clause;
-
     mutable std::optional<mysqlxx::PoolWithFailover> pool;
+    std::optional<StorageMySQLConfiguration> configuration;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.cpp b/src/TableFunctions/TableFunctionPostgreSQL.cpp
index 568cc6171fd..980066622c8 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.cpp
+++ b/src/TableFunctions/TableFunctionPostgreSQL.cpp
@@ -21,7 +21,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
 }
 
@@ -33,12 +32,12 @@ StoragePtr TableFunctionPostgreSQL::executeImpl(const ASTPtr & /*ast_function*/,
     auto result = std::make_shared<StoragePostgreSQL>(
         StorageID(getDatabaseName(), table_name),
         connection_pool,
-        remote_table_name,
+        configuration->table,
         columns,
         ConstraintsDescription{},
         String{},
-        remote_table_schema,
-        on_conflict);
+        configuration->schema,
+        configuration->on_conflict);
 
     result->startup();
     return result;
@@ -51,8 +50,8 @@ ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(ContextPtr c
     auto connection_holder = connection_pool->get();
     auto columns = fetchPostgreSQLTableStructure(
             connection_holder->get(),
-            remote_table_schema.empty() ? doubleQuoteString(remote_table_name)
-                                        : doubleQuoteString(remote_table_schema) + '.' + doubleQuoteString(remote_table_name),
+            configuration->schema.empty() ? doubleQuoteString(configuration->table)
+                                          : doubleQuoteString(configuration->schema) + '.' + doubleQuoteString(configuration->table),
             use_nulls).columns;
 
     return ColumnsDescription{*columns};
@@ -62,37 +61,13 @@ ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(ContextPtr c
 void TableFunctionPostgreSQL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto & func_args = ast_function->as<ASTFunction &>();
-
     if (!func_args.arguments)
         throw Exception("Table function 'PostgreSQL' must have arguments.", ErrorCodes::BAD_ARGUMENTS);
 
-    ASTs & args = func_args.arguments->children;
-
-    if (args.size() < 5 || args.size() > 7)
-        throw Exception("Table function 'PostgreSQL' requires from 5 to 7 parameters: "
-                        "PostgreSQL('host:port', 'database', 'table', 'user', 'password', [, 'schema', 'ON CONFLICT ...']).",
-            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    /// Split into replicas if needed. 5432 is a default postgresql port.
-    const auto & host_port = args[0]->as<ASTLiteral &>().value.safeGet<String>();
-    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-    auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
-
-    remote_table_name = args[2]->as<ASTLiteral &>().value.safeGet<String>();
-
-    if (args.size() >= 6)
-        remote_table_schema = args[5]->as<ASTLiteral &>().value.safeGet<String>();
-    if (args.size() >= 7)
-        on_conflict = args[6]->as<ASTLiteral &>().value.safeGet<String>();
-
-    connection_pool = std::make_shared<postgres::PoolWithFailover>(
-        args[1]->as<ASTLiteral &>().value.safeGet<String>(),
-        addresses,
-        args[3]->as<ASTLiteral &>().value.safeGet<String>(),
-        args[4]->as<ASTLiteral &>().value.safeGet<String>());
+    configuration.emplace(StoragePostgreSQL::getConfiguration(func_args.arguments->children, context));
+    connection_pool = std::make_shared<postgres::PoolWithFailover>(*configuration,
+        context->getSettingsRef().postgresql_connection_pool_size,
+        context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 }
 
 
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.h b/src/TableFunctions/TableFunctionPostgreSQL.h
index e3810a0e391..ff363e3a6cf 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.h
+++ b/src/TableFunctions/TableFunctionPostgreSQL.h
@@ -6,6 +6,7 @@
 #if USE_LIBPQXX
 #include <TableFunctions/ITableFunction.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace DB
@@ -27,9 +28,8 @@ private:
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    String connection_str;
-    String remote_table_name, remote_table_schema, on_conflict;
     postgres::PoolWithFailoverPtr connection_pool;
+    std::optional<StoragePostgreSQLConfiguration> configuration;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 08f61a49fa5..3c39e3f2ec0 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -93,14 +93,8 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
 
         ++arg_num;
 
-        size_t dot = remote_database.find('.');
-        if (dot != String::npos)
-        {
-            /// NOTE Bad - do not support identifiers in backquotes.
-            remote_table = remote_database.substr(dot + 1);
-            remote_database = remote_database.substr(0, dot);
-        }
-        else
+        auto qualified_name = QualifiedTableName::parseFromString(remote_database);
+        if (qualified_name.database.empty())
         {
             if (arg_num >= args.size())
             {
@@ -108,11 +102,15 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
             }
             else
             {
+                std::swap(qualified_name.database, qualified_name.table);
                 args[arg_num] = evaluateConstantExpressionOrIdentifierAsLiteral(args[arg_num], context);
-                remote_table = args[arg_num]->as<ASTLiteral &>().value.safeGet<String>();
+                qualified_name.table = args[arg_num]->as<ASTLiteral &>().value.safeGet<String>();
                 ++arg_num;
             }
         }
+
+        remote_database = std::move(qualified_name.database);
+        remote_table = std::move(qualified_name.table);
     }
 
     /// Cluster function may have sharding key for insert
diff --git a/src/TableFunctions/TableFunctionS3.cpp b/src/TableFunctions/TableFunctionS3.cpp
index 9878ed72560..4faf3f15aa4 100644
--- a/src/TableFunctions/TableFunctionS3.cpp
+++ b/src/TableFunctions/TableFunctionS3.cpp
@@ -3,13 +3,13 @@
 #if USE_AWS_S3
 
 #include <IO/S3Common.h>
-#include <Storages/StorageS3.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/Context.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionS3.h>
 #include <TableFunctions/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTLiteral.h>
+#include <Storages/StorageS3.h>
 #include "registerTableFunctions.h"
 
 
@@ -38,51 +38,75 @@ void TableFunctionS3::parseArguments(const ASTPtr & ast_function, ContextPtr con
         throw Exception("Table function '" + getName() + "' must have arguments.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
     ASTs & args = args_func.at(0)->children;
+    StorageS3Configuration configuration;
 
-    if (args.size() < 3 || args.size() > 6)
-        throw Exception(message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    /// Size -> argument indexes
-    static auto size_to_args = std::map<size_t, std::map<String, size_t>>
+    if (auto named_collection = getURLBasedDataSourceConfiguration(args, context))
     {
-        {3, {{"format", 1}, {"structure", 2}}},
-        {4, {{"format", 1}, {"structure", 2}, {"compression_method", 3}}},
-        {5, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}}},
-        {6, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}, {"compression_method", 5}}}
-    };
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
 
-    /// This argument is always the first
-    filename = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "access_key_id")
+                configuration.access_key_id = arg_value.safeGet<String>();
+            else if (arg_name == "secret_access_key")
+                configuration.secret_access_key = arg_value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                                "Unknown key-value argument `{}` for StorageS3, expected: "
+                                "url, [access_key_id, secret_access_key], name of used format, structure and [compression_method].",
+                                arg_name);
+        }
+    }
+    else
+    {
+        if (args.size() < 3 || args.size() > 6)
+            throw Exception(message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-    auto & args_to_idx = size_to_args[args.size()];
+        for (auto & arg : args)
+            arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
 
-    if (args_to_idx.contains("format"))
-        format = args[args_to_idx["format"]]->as<ASTLiteral &>().value.safeGet<String>();
+        /// Size -> argument indexes
+        static auto size_to_args = std::map<size_t, std::map<String, size_t>>
+        {
+            {3, {{"format", 1}, {"structure", 2}}},
+            {4, {{"format", 1}, {"structure", 2}, {"compression_method", 3}}},
+            {5, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}}},
+            {6, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}, {"compression_method", 5}}}
+        };
 
-    if (args_to_idx.contains("structure"))
-        structure = args[args_to_idx["structure"]]->as<ASTLiteral &>().value.safeGet<String>();
+        /// This argument is always the first
+        configuration.url = args[0]->as<ASTLiteral &>().value.safeGet<String>();
 
-    if (args_to_idx.contains("compression_method"))
-        compression_method = args[args_to_idx["compression_method"]]->as<ASTLiteral &>().value.safeGet<String>();
+        auto & args_to_idx = size_to_args[args.size()];
 
-    if (args_to_idx.contains("access_key_id"))
-        access_key_id = args[args_to_idx["access_key_id"]]->as<ASTLiteral &>().value.safeGet<String>();
+        if (args_to_idx.contains("format"))
+            configuration.format = args[args_to_idx["format"]]->as<ASTLiteral &>().value.safeGet<String>();
 
-    if (args_to_idx.contains("secret_access_key"))
-        secret_access_key = args[args_to_idx["secret_access_key"]]->as<ASTLiteral &>().value.safeGet<String>();
+        if (args_to_idx.contains("structure"))
+            configuration.structure = args[args_to_idx["structure"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (args_to_idx.contains("compression_method"))
+            configuration.compression_method = args[args_to_idx["compression_method"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (args_to_idx.contains("access_key_id"))
+            configuration.access_key_id = args[args_to_idx["access_key_id"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (args_to_idx.contains("secret_access_key"))
+            configuration.secret_access_key = args[args_to_idx["secret_access_key"]]->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
+    s3_configuration = std::move(configuration);
 }
 
 ColumnsDescription TableFunctionS3::getActualTableStructure(ContextPtr context) const
 {
-    return parseColumnsListFromString(structure, context);
+    return parseColumnsListFromString(s3_configuration->structure, context);
 }
 
 StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
-    Poco::URI uri (filename);
+    Poco::URI uri (s3_configuration->url);
     S3::URI s3_uri (uri);
     UInt64 max_single_read_retries = context->getSettingsRef().s3_max_single_read_retries;
     UInt64 min_upload_part_size = context->getSettingsRef().s3_min_upload_part_size;
@@ -91,10 +115,10 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, Context
 
     StoragePtr storage = StorageS3::create(
         s3_uri,
-        access_key_id,
-        secret_access_key,
+        s3_configuration->access_key_id,
+        s3_configuration->secret_access_key,
         StorageID(getDatabaseName(), table_name),
-        format,
+        s3_configuration->format,
         max_single_read_retries,
         min_upload_part_size,
         max_single_part_upload_size,
@@ -105,7 +129,7 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, Context
         context,
         /// No format_settings for table function S3
         std::nullopt,
-        compression_method);
+        s3_configuration->compression_method);
 
     storage->startup();
 
diff --git a/src/TableFunctions/TableFunctionS3.h b/src/TableFunctions/TableFunctionS3.h
index 1835fa3daa9..8d4c1391236 100644
--- a/src/TableFunctions/TableFunctionS3.h
+++ b/src/TableFunctions/TableFunctionS3.h
@@ -5,6 +5,7 @@
 #if USE_AWS_S3
 
 #include <TableFunctions/ITableFunction.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace DB
@@ -36,12 +37,7 @@ protected:
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    String filename;
-    String format;
-    String structure;
-    String access_key_id;
-    String secret_access_key;
-    String compression_method = "auto";
+    std::optional<StorageS3Configuration> s3_configuration;
 };
 
 class TableFunctionCOS : public TableFunctionS3
diff --git a/src/TableFunctions/TableFunctionURL.cpp b/src/TableFunctions/TableFunctionURL.cpp
index a1fe142bea6..4b78862a269 100644
--- a/src/TableFunctions/TableFunctionURL.cpp
+++ b/src/TableFunctions/TableFunctionURL.cpp
@@ -4,6 +4,7 @@
 #include <Access/AccessFlags.h>
 #include <Formats/FormatFactory.h>
 #include <Poco/URI.h>
+#include <Parsers/ASTFunction.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageURL.h>
 #include <TableFunctions/TableFunctionFactory.h>
@@ -12,6 +13,48 @@
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+void TableFunctionURL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
+{
+    const auto & func_args = ast_function->as<ASTFunction &>();
+    if (!func_args.arguments)
+        throw Exception("Table function 'URL' must have arguments.", ErrorCodes::BAD_ARGUMENTS);
+
+    URLBasedDataSourceConfiguration configuration;
+    if (auto with_named_collection = getURLBasedDataSourceConfiguration(func_args.arguments->children, context))
+    {
+        auto [common_configuration, storage_specific_args] = with_named_collection.value();
+        configuration.set(common_configuration);
+
+        if (!storage_specific_args.empty())
+        {
+            String illegal_args;
+            for (const auto & arg : storage_specific_args)
+            {
+                if (!illegal_args.empty())
+                    illegal_args += ", ";
+                illegal_args += arg.first;
+            }
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown arguments {} for table function URL", illegal_args);
+        }
+
+        filename = configuration.url;
+        format = configuration.format;
+        structure = configuration.structure;
+        compression_method = configuration.compression_method;
+    }
+    else
+    {
+        ITableFunctionFileLike::parseArguments(ast_function, context);
+    }
+}
+
+
 StoragePtr TableFunctionURL::getStorage(
     const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
     const std::string & table_name, const String & compression_method_) const
diff --git a/src/TableFunctions/TableFunctionURL.h b/src/TableFunctions/TableFunctionURL.h
index fde361e8bbb..c35db9f9c8b 100644
--- a/src/TableFunctions/TableFunctionURL.h
+++ b/src/TableFunctions/TableFunctionURL.h
@@ -19,6 +19,9 @@ public:
         return name;
     }
 
+protected:
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+
 private:
     StoragePtr getStorage(
         const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
diff --git a/src/TableFunctions/ya.make b/src/TableFunctions/ya.make
deleted file mode 100644
index 3f616cc3750..00000000000
--- a/src/TableFunctions/ya.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    ITableFunction.cpp
-    ITableFunctionFileLike.cpp
-    ITableFunctionXDBC.cpp
-    TableFunctionDictionary.cpp
-    TableFunctionExecutable.cpp
-    TableFunctionFactory.cpp
-    TableFunctionFile.cpp
-    TableFunctionGenerateRandom.cpp
-    TableFunctionInput.cpp
-    TableFunctionMerge.cpp
-    TableFunctionMySQL.cpp
-    TableFunctionNull.cpp
-    TableFunctionNumbers.cpp
-    TableFunctionRemote.cpp
-    TableFunctionSQLite.cpp
-    TableFunctionURL.cpp
-    TableFunctionValues.cpp
-    TableFunctionView.cpp
-    TableFunctionZeros.cpp
-    parseColumnsListForTableFunction.cpp
-    registerTableFunctions.cpp
-
-)
-
-END()
diff --git a/src/TableFunctions/ya.make.in b/src/TableFunctions/ya.make.in
deleted file mode 100644
index 6f351b3f646..00000000000
--- a/src/TableFunctions/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -P 'S3|HDFS|PostgreSQL' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/ya.make b/src/ya.make
deleted file mode 100644
index fb6f077502b..00000000000
--- a/src/ya.make
+++ /dev/null
@@ -1,32 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Access
-    clickhouse/src/AggregateFunctions
-    clickhouse/src/Backups
-    clickhouse/src/Bridge
-    clickhouse/src/Client
-    clickhouse/src/Columns
-    clickhouse/src/Common
-    clickhouse/src/Compression
-    clickhouse/src/Coordination
-    clickhouse/src/Core
-    clickhouse/src/Databases
-    clickhouse/src/DataStreams
-    clickhouse/src/DataTypes
-    clickhouse/src/Formats
-    clickhouse/src/Dictionaries
-    clickhouse/src/Disks
-    clickhouse/src/Functions
-    clickhouse/src/Interpreters
-    clickhouse/src/IO
-    clickhouse/src/Parsers
-    clickhouse/src/Processors
-    clickhouse/src/Server
-    clickhouse/src/Storages
-    clickhouse/src/TableFunctions
-)
-
-END()
diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index 52a101728ea..6222e4f61bc 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -1,7 +1,7 @@
 {
     "build_config": [
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "deb",
@@ -12,7 +12,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "performance",
@@ -22,7 +22,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "gcc-10",
+            "compiler": "gcc-11",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -32,7 +32,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "address",
             "package-type": "deb",
@@ -42,7 +42,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "undefined",
             "package-type": "deb",
@@ -52,7 +52,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "thread",
             "package-type": "deb",
@@ -62,7 +62,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "memory",
             "package-type": "deb",
@@ -72,7 +72,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "debug",
             "sanitizer": "",
             "package-type": "deb",
@@ -82,7 +82,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "gcc-10",
+            "compiler": "gcc-11",
             "build-type": "",
             "sanitizer": "",
             "package-type": "deb",
@@ -92,7 +92,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -104,7 +104,7 @@
     ],
     "special_build_config": [
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "debug",
             "sanitizer": "",
             "package-type": "deb",
@@ -114,7 +114,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -124,7 +124,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11-darwin",
+            "compiler": "clang-13-darwin",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -134,7 +134,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11-aarch64",
+            "compiler": "clang-13-aarch64",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -144,7 +144,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11-freebsd",
+            "compiler": "clang-13-freebsd",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -154,7 +154,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11-darwin-aarch64",
+            "compiler": "clang-13-darwin-aarch64",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -167,7 +167,7 @@
     "tests_config": {
         "Functional stateful tests (address)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -179,7 +179,7 @@
         },
         "Functional stateful tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -191,7 +191,7 @@
         },
         "Functional stateful tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -203,7 +203,7 @@
         },
         "Functional stateful tests (ubsan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -215,7 +215,7 @@
         },
         "Functional stateful tests (debug)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -227,7 +227,7 @@
         },
         "Functional stateful tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -239,7 +239,7 @@
         },
         "Functional stateful tests (release, DatabaseOrdinary)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -251,7 +251,7 @@
         },
         "Functional stateful tests (release, DatabaseReplicated)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -263,7 +263,7 @@
         },
         "Functional stateless tests (address)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -275,7 +275,7 @@
         },
         "Functional stateless tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -287,7 +287,7 @@
         },
         "Functional stateless tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -299,7 +299,7 @@
         },
         "Functional stateless tests (ubsan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -311,7 +311,7 @@
         },
         "Functional stateless tests (debug)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -323,7 +323,7 @@
         },
         "Functional stateless tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -335,7 +335,7 @@
         },
         "Functional stateless tests (pytest)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -347,7 +347,7 @@
         },
         "Functional stateless tests (unbundled)": {
             "required_build_properties": {
-                "compiler": "gcc-10",
+                "compiler": "gcc-11",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -359,7 +359,7 @@
         },
         "Functional stateless tests (release, wide parts enabled)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -371,7 +371,7 @@
         },
         "Functional stateless tests (release, DatabaseOrdinary)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -383,7 +383,7 @@
         },
         "Functional stateless tests (release, DatabaseReplicated)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -395,7 +395,7 @@
         },
         "Stress test (address)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -407,7 +407,7 @@
         },
         "Stress test (thread)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -419,7 +419,7 @@
         },
         "Stress test (undefined)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -431,7 +431,7 @@
         },
         "Stress test (memory)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -443,7 +443,7 @@
         },
         "Stress test (debug)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -455,7 +455,7 @@
         },
         "Integration tests (asan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -467,7 +467,7 @@
         },
         "Integration tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -479,7 +479,7 @@
         },
         "Integration tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -491,7 +491,7 @@
         },
         "Integration tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -503,7 +503,7 @@
         },
         "Integration tests flaky check (asan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -515,7 +515,7 @@
         },
         "Compatibility check": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -527,7 +527,7 @@
         },
         "Split build smoke test": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -539,7 +539,7 @@
         },
         "Testflows check": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -551,7 +551,7 @@
         },
         "Unit tests release gcc": {
             "required_build_properties": {
-                "compiler": "gcc-10",
+                "compiler": "gcc-11",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -563,7 +563,7 @@
         },
         "Unit tests release clang": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -575,7 +575,7 @@
         },
         "Unit tests ASAN": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -587,7 +587,7 @@
         },
         "Unit tests MSAN": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -599,7 +599,7 @@
         },
         "Unit tests TSAN": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -611,7 +611,7 @@
         },
         "Unit tests UBSAN": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -623,7 +623,7 @@
         },
         "AST fuzzer (debug)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -635,7 +635,7 @@
         },
         "AST fuzzer (ASan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -647,7 +647,7 @@
         },
         "AST fuzzer (MSan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -659,7 +659,7 @@
         },
         "AST fuzzer (TSan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -671,7 +671,7 @@
         },
         "AST fuzzer (UBSan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -683,7 +683,7 @@
         },
         "Release": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -695,7 +695,7 @@
         },
         "Functional stateless tests flaky check (address)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -704,6 +704,18 @@
                 "clang-tidy": "disable",
                 "with_coverage": false
             }
+        },
+        "ClickHouse Keeper Jepsen": {
+            "required_build_properties": {
+                "compiler": "clang-13",
+                "package_type": "binary",
+                "build_type": "relwithdebuginfo",
+                "sanitizer": "none",
+                "bundled": "bundled",
+                "splitted": "unsplitted",
+                "clang-tidy": "disable",
+                "with_coverage": false
+            }
         }
     }
 }
diff --git a/tests/clickhouse-client.xml b/tests/clickhouse-client.xml
deleted file mode 100644
index b00c16f2c99..00000000000
--- a/tests/clickhouse-client.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<yandex>
-    <insert_format_max_block_size>100000</insert_format_max_block_size>
-</yandex>
\ No newline at end of file
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index f3a41ba6a25..470b88de574 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -1,17 +1,19 @@
 #!/usr/bin/env python3
 
+# pylint: disable=too-many-return-statements
+import enum
 import shutil
 import sys
 import os
 import os.path
 import signal
 import re
-import json
 import copy
 import traceback
+import math
 
 from argparse import ArgumentParser
-from typing import Tuple, Union, Optional, TextIO
+from typing import Tuple, Union, Optional, TextIO, Dict, Set, List
 import shlex
 import subprocess
 from subprocess import Popen
@@ -43,19 +45,10 @@ except ImportError:
 DISTRIBUTED_DDL_TIMEOUT_MSG = "is executing longer than distributed_ddl_task_timeout"
 
 MESSAGES_TO_RETRY = [
-    "DB::Exception: ZooKeeper session has been expired",
-    "Coordination::Exception: Session expired",
-    "Coordination::Exception: Connection loss",
-    "Coordination::Exception: Operation timeout",
-    "DB::Exception: Session expired",
-    "DB::Exception: Connection loss",
-    "DB::Exception: Operation timeout",
-    "Operation timed out",
     "ConnectionPoolWithFailover: Connection failed at try",
     "DB::Exception: New table appeared in database being dropped or detached. Try again",
     "is already started to be removing by another replica right now",
     "DB::Exception: Cannot enqueue query",
-    "Shutdown is called for table", # It happens in SYSTEM SYNC REPLICA query if session with ZooKeeper is being reinitialized.
     DISTRIBUTED_DDL_TIMEOUT_MSG  # FIXME
 ]
 
@@ -83,76 +76,6 @@ def stop_tests():
             os.killpg(os.getpgid(os.getpid()), signal.SIGTERM)
             signal.signal(signal.SIGTERM, signal.SIG_DFL)
 
-def json_minify(string):
-    """
-    Removes all js-style comments from json string. Allows to have comments in skip_list.json.
-    The code was taken from https://github.com/getify/JSON.minify/tree/python under the MIT license.
-    """
-
-    tokenizer = re.compile(r'"|(/\*)|(\*/)|(//)|\n|\r')
-    end_slashes_re = re.compile(r'(\\)*$')
-
-    in_string = False
-    in_multi = False
-    in_single = False
-
-    new_str = []
-    index = 0
-
-    for match in re.finditer(tokenizer, string):
-        if not (in_multi or in_single):
-            tmp = string[index:match.start()]
-            new_str.append(tmp)
-        else:
-            # Replace comments with white space so that the JSON parser reports
-            # the correct column numbers on parsing errors.
-            new_str.append(' ' * (match.start() - index))
-
-        index = match.end()
-        val = match.group()
-
-        if val == '"' and not (in_multi or in_single):
-            escaped = end_slashes_re.search(string, 0, match.start())
-
-            # start of string or unescaped quote character to end string
-            if not in_string or (escaped is None or len(escaped.group()) % 2 == 0):  # noqa
-                in_string = not in_string
-            index -= 1  # include " character in next catch
-        elif not (in_string or in_multi or in_single):
-            if val == '/*':
-                in_multi = True
-            elif val == '//':
-                in_single = True
-        elif val == '*/' and in_multi and not (in_string or in_single):
-            in_multi = False
-            new_str.append(' ' * len(val))
-        elif val in '\r\n' and not (in_multi or in_string) and in_single:
-            in_single = False
-        elif not in_multi or in_single:  # noqa
-            new_str.append(val)
-
-        if val in '\r\n':
-            new_str.append(val)
-        elif in_multi or in_single:
-            new_str.append(' ' * len(val))
-
-    new_str.append(string[index:])
-    return ''.join(new_str)
-
-
-def remove_control_characters(s):
-    """
-    https://github.com/html5lib/html5lib-python/issues/96#issuecomment-43438438
-    """
-    def str_to_int(s, default, base=10):
-        if int(s, base) < 0x10000:
-            return chr(int(s, base))
-        return default
-    s = re.sub(r"&#(\d+);?", lambda c: str_to_int(c.group(1), c.group(0)), s)
-    s = re.sub(r"&#[xX]([0-9a-fA-F]+);?", lambda c: str_to_int(c.group(1), c.group(0), base=16), s)
-    s = re.sub(r"[\x00-\x08\x0b\x0e-\x1f\x7f]", "", s)
-    return s
-
 
 def get_db_engine(args, database_name):
     if args.replicated_database:
@@ -164,138 +87,30 @@ def get_db_engine(args, database_name):
     return ""   # Will use default engine
 
 
-def configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file):
-    testcase_args = copy.deepcopy(args)
+def get_zookeeper_session_uptime(args):
+    try:
+        query = b"SELECT zookeeperSessionUptime()"
 
-    testcase_args.testcase_start_time = datetime.now()
-    testcase_basename = os.path.basename(case_file)
-    testcase_args.testcase_client = f"{testcase_args.client} --log_comment='{testcase_basename}'"
+        if args.replicated_database:
+            query = b"SELECT min(materialize(zookeeperSessionUptime())) " \
+                    b"FROM clusterAllReplicas('test_cluster_database_replicated', system.one) "
 
-    if testcase_args.database:
-        database = testcase_args.database
-        os.environ.setdefault("CLICKHOUSE_DATABASE", database)
-        os.environ.setdefault("CLICKHOUSE_TMP", suite_tmp_dir)
-    else:
-        # If --database is not specified, we will create temporary database with unique name
-        # And we will recreate and drop it for each test
-        def random_str(length=6):
-            alphabet = string.ascii_lowercase + string.digits
-            return ''.join(random.choice(alphabet) for _ in range(length))
-        database = 'test_{suffix}'.format(suffix=random_str())
+        clickhouse_proc = open_client_process(args.client)
 
-        with open(stderr_file, 'w') as stderr:
-            client_cmd = testcase_args.testcase_client + " " \
-                + get_additional_client_options(args)
+        (stdout, _) = clickhouse_proc.communicate((query), timeout=20)
 
-            clickhouse_proc_create = open_client_process(
-                universal_newlines=True,
-                client_args=client_cmd,
-                stderr_file=stderr)
-
-            try:
-                clickhouse_proc_create.communicate(("CREATE DATABASE " + database + get_db_engine(testcase_args, database)), timeout=testcase_args.timeout)
-            except TimeoutExpired:
-                total_time = (datetime.now() - testcase_args.testcase_start_time).total_seconds()
-                return clickhouse_proc_create, "", "Timeout creating database {} before test".format(database), total_time
-
-        os.environ["CLICKHOUSE_DATABASE"] = database
-        # Set temporary directory to match the randomly generated database,
-        # because .sh tests also use it for temporary files and we want to avoid
-        # collisions.
-        testcase_args.test_tmp_dir = os.path.join(suite_tmp_dir, database)
-        os.mkdir(testcase_args.test_tmp_dir)
-        os.environ.setdefault("CLICKHOUSE_TMP", testcase_args.test_tmp_dir)
-
-    testcase_args.testcase_database = database
-
-    return testcase_args
-
-def run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file):
-    client = args.testcase_client
-    start_time = args.testcase_start_time
-    database = args.testcase_database
-
-    # This is for .sh tests
-    os.environ["CLICKHOUSE_LOG_COMMENT"] = case_file
-
-    params = {
-        'client': client + ' --database=' + database,
-        'logs_level': server_logs_level,
-        'options': client_options,
-        'test': case_file,
-        'stdout': stdout_file,
-        'stderr': stderr_file,
-    }
-
-    # >> append to stderr (but not stdout since it is not used there),
-    # because there are also output of per test database creation
-    if not args.database:
-        pattern = '{test} > {stdout} 2>> {stderr}'
-    else:
-        pattern = '{test} > {stdout} 2> {stderr}'
-
-    if ext == '.sql':
-        pattern = "{client} --send_logs_level={logs_level} --testmode --multiquery {options} < " + pattern
-
-    command = pattern.format(**params)
-
-    proc = Popen(command, shell=True, env=os.environ)
-
-    while (datetime.now() - start_time).total_seconds() < args.timeout and proc.poll() is None:
-        sleep(0.01)
-
-    need_drop_database = not args.database
-    if need_drop_database and args.no_drop_if_fail:
-        maybe_passed = (proc.returncode == 0) and (proc.stderr is None) and (proc.stdout is None or 'Exception' not in proc.stdout)
-        need_drop_database = not maybe_passed
-
-    if need_drop_database:
-        with open(stderr_file, 'a') as stderr:
-            clickhouse_proc_create = open_client_process(client, universal_newlines=True, stderr_file=stderr)
-
-        seconds_left = max(args.timeout - (datetime.now() - start_time).total_seconds(), 20)
-
-        try:
-            drop_database_query = "DROP DATABASE " + database
-            if args.replicated_database:
-                drop_database_query += " ON CLUSTER test_cluster_database_replicated"
-            clickhouse_proc_create.communicate((drop_database_query), timeout=seconds_left)
-        except TimeoutExpired:
-            # kill test process because it can also hung
-            if proc.returncode is None:
-                try:
-                    proc.kill()
-                except OSError as e:
-                    if e.errno != ESRCH:
-                        raise
-
-            total_time = (datetime.now() - start_time).total_seconds()
-            return clickhouse_proc_create, "", f"Timeout dropping database {database} after test", total_time
-
-        shutil.rmtree(args.test_tmp_dir)
-
-    total_time = (datetime.now() - start_time).total_seconds()
-
-    # Normalize randomized database names in stdout, stderr files.
-    os.system("LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=stdout_file))
-    if args.hide_db_name:
-        os.system("LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=stderr_file))
-    if args.replicated_database:
-        os.system("LC_ALL=C sed -i -e 's|/auto_{{shard}}||g' {file}".format(file=stdout_file))
-        os.system("LC_ALL=C sed -i -e 's|auto_{{replica}}||g' {file}".format(file=stdout_file))
-
-    # Normalize hostname in stdout file.
-    os.system("LC_ALL=C sed -i -e 's/{hostname}/localhost/g' {file}".format(hostname=socket.gethostname(), file=stdout_file))
-
-    stdout = open(stdout_file, 'rb').read() if os.path.exists(stdout_file) else b''
-    stdout = str(stdout, errors='replace', encoding='utf-8')
-    stderr = open(stderr_file, 'rb').read() if os.path.exists(stderr_file) else b''
-    stderr = str(stderr, errors='replace', encoding='utf-8')
-
-    return proc, stdout, stderr, total_time
+        return int(stdout.decode('utf-8').strip())
+    except:
+        return None
 
 
-def need_retry(stdout, stderr):
+def need_retry(args, stdout, stderr, total_time):
+    # Sometimes we may get unexpected exception like "Replica is readonly" or "Shutdown is called for table"
+    # instead of "Session expired" or "Connection loss"
+    # Retry if session was expired during test execution
+    session_uptime = get_zookeeper_session_uptime(args)
+    if session_uptime is not None and session_uptime < math.ceil(total_time):
+        return True
     return any(msg in stdout for msg in MESSAGES_TO_RETRY) or any(msg in stderr for msg in MESSAGES_TO_RETRY)
 
 
@@ -414,89 +229,609 @@ def colored(text, args, color=None, on_color=None, attrs=None):
         return text
 
 
+class TestStatus(enum.Enum):
+    FAIL = "FAIL"
+    UNKNOWN = "UNKNOWN"
+    OK = "OK"
+    SKIPPED = "SKIPPED"
+
+
+class FailureReason(enum.Enum):
+    # FAIL reasons
+    TIMEOUT = "Timeout!"
+    SERVER_DIED = "server died"
+    EXIT_CODE = "return code: "
+    STDERR = "having stderror: "
+    EXCEPTION = "having having exception in stdout: "
+    RESULT_DIFF = "result differs with reference: "
+    TOO_LONG = "Test runs too long (> 60s). Make it faster."
+
+    # SKIPPED reasons
+    DISABLED = "disabled"
+    SKIP = "skip"
+    NO_JINJA = "no jinja"
+    NO_ZOOKEEPER = "no zookeeper"
+    NO_SHARD = "no shard"
+    FAST_ONLY = "running fast tests only"
+    NO_LONG = "not running long tests"
+    REPLICATED_DB = "replicated-database"
+    BUILD = "not running for current build"
+
+    # UNKNOWN reasons
+    NO_REFERENCE = "no reference file"
+    INTERNAL_ERROR = "Test internal error: "
+
+
+class TestResult:
+    def __init__(self, case_name: str, status: TestStatus, reason: Optional[FailureReason], total_time: float, description: str):
+        self.case_name: str = case_name
+        self.status: TestStatus = status
+        self.reason: Optional[FailureReason] = reason
+        self.total_time: float = total_time
+        self.description: str = description
+        self.need_retry: bool = False
+
+    def check_if_need_retry(self, args, stdout, stderr, runs_count):
+        if self.status != TestStatus.FAIL:
+            return
+        if not need_retry(args, stdout, stderr, self.total_time):
+            return
+        if MAX_RETRIES < runs_count:
+            return
+        self.need_retry = True
+
+
+class TestCase:
+    @staticmethod
+    def get_reference_file(suite_dir, name):
+        """
+        Returns reference file name for specified test
+        """
+
+        name = removesuffix(name, ".gen")
+        for ext in ['.reference', '.gen.reference']:
+            reference_file = os.path.join(suite_dir, name) + ext
+            if os.path.isfile(reference_file):
+                return reference_file
+        return None
+
+    @staticmethod
+    def configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file):
+        testcase_args = copy.deepcopy(args)
+
+        testcase_args.testcase_start_time = datetime.now()
+        testcase_basename = os.path.basename(case_file)
+        testcase_args.testcase_client = f"{testcase_args.client} --log_comment='{testcase_basename}'"
+
+        if testcase_args.database:
+            database = testcase_args.database
+            os.environ.setdefault("CLICKHOUSE_DATABASE", database)
+            os.environ.setdefault("CLICKHOUSE_TMP", suite_tmp_dir)
+        else:
+            # If --database is not specified, we will create temporary database with unique name
+            # And we will recreate and drop it for each test
+            def random_str(length=6):
+                alphabet = string.ascii_lowercase + string.digits
+                return ''.join(random.choice(alphabet) for _ in range(length))
+
+            database = 'test_{suffix}'.format(suffix=random_str())
+
+            with open(stderr_file, 'w') as stderr:
+                client_cmd = testcase_args.testcase_client + " " \
+                             + get_additional_client_options(args)
+
+                clickhouse_proc_create = open_client_process(
+                    universal_newlines=True,
+                    client_args=client_cmd,
+                    stderr_file=stderr)
+
+                try:
+                    clickhouse_proc_create.communicate(
+                        ("CREATE DATABASE " + database + get_db_engine(testcase_args, database)),
+                        timeout=testcase_args.timeout)
+                except TimeoutExpired:
+                    total_time = (datetime.now() - testcase_args.testcase_start_time).total_seconds()
+                    return clickhouse_proc_create, "", "Timeout creating database {} before test".format(
+                        database), total_time
+
+            os.environ["CLICKHOUSE_DATABASE"] = database
+            # Set temporary directory to match the randomly generated database,
+            # because .sh tests also use it for temporary files and we want to avoid
+            # collisions.
+            testcase_args.test_tmp_dir = os.path.join(suite_tmp_dir, database)
+            os.mkdir(testcase_args.test_tmp_dir)
+            os.environ.setdefault("CLICKHOUSE_TMP", testcase_args.test_tmp_dir)
+
+        testcase_args.testcase_database = database
+
+        return testcase_args
+
+    def __init__(self, suite, case: str, args, is_concurrent: bool):
+        self.case: str = case   # case file name
+        self.tags: Set[str] = suite.all_tags[case] if case in suite.all_tags else set()
+
+        self.case_file: str = os.path.join(suite.suite_path, case)
+        (self.name, self.ext) = os.path.splitext(case)
+
+        file_suffix = ('.' + str(os.getpid())) if is_concurrent and args.test_runs > 1 else ''
+        self.reference_file = self.get_reference_file(suite.suite_path, self.name)
+        self.stdout_file = os.path.join(suite.suite_tmp_path, self.name) + file_suffix + '.stdout'
+        self.stderr_file = os.path.join(suite.suite_tmp_path, self.name) + file_suffix + '.stderr'
+
+        self.testcase_args = None
+        self.runs_count = 0
+
+    # should skip test, should increment skipped_total, skip reason
+    def should_skip_test(self, suite) -> Optional[FailureReason]:
+        tags = self.tags
+
+        if tags and ('disabled' in tags) and not args.disabled:
+            return FailureReason.DISABLED
+
+        elif os.path.exists(os.path.join(suite.suite_path, self.name) + '.disabled') and not args.disabled:
+            return FailureReason.DISABLED
+
+        elif args.skip and any(s in self.name for s in args.skip):
+            return FailureReason.SKIP
+
+        elif not USE_JINJA and self.ext.endswith("j2"):
+            return FailureReason.NO_JINJA
+
+        elif tags and (('zookeeper' in tags) or ('replica' in tags)) and not args.zookeeper:
+            return FailureReason.NO_ZOOKEEPER
+
+        elif tags and (('shard' in tags) or ('distributed' in tags) or ('global' in tags)) and not args.shard:
+            return FailureReason.NO_SHARD
+
+        elif tags and ('no-fasttest' in tags) and args.fast_tests_only:
+            return FailureReason.FAST_ONLY
+
+        elif tags and (('long' in tags) or ('deadlock' in tags) or ('race' in tags)) and args.no_long:
+            # Tests for races and deadlocks usually are run in a loop for a significant amount of time
+            return FailureReason.NO_LONG
+
+        elif tags and ('no-replicated-database' in tags) and args.replicated_database:
+            return FailureReason.REPLICATED_DB
+
+        elif tags:
+            for build_flag in args.build_flags:
+                if 'no-' + build_flag in tags:
+                    return FailureReason.BUILD
+
+        return None
+
+    def process_result_impl(self, proc, stdout: str, stderr: str, total_time: float):
+        description = ""
+
+        if proc.returncode is None:
+            try:
+                proc.kill()
+            except OSError as e:
+                if e.errno != ESRCH:
+                    raise
+
+            if stderr:
+                description += stderr
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.TIMEOUT, total_time, description)
+
+        if proc.returncode != 0:
+            reason = FailureReason.EXIT_CODE
+            description += str(proc.returncode)
+
+            if stderr:
+                description += "\n"
+                description += stderr
+
+            # Stop on fatal errors like segmentation fault. They are sent to client via logs.
+            if ' <Fatal> ' in stderr:
+                reason = FailureReason.SERVER_DIED
+
+            if self.testcase_args.stop \
+                    and ('Connection refused' in stderr or 'Attempt to read after eof' in stderr) \
+                    and 'Received exception from server' not in stderr:
+                reason = FailureReason.SERVER_DIED
+
+            if os.path.isfile(self.stdout_file):
+                description += ", result:\n\n"
+                description += '\n'.join(open(self.stdout_file).read().split('\n')[:100])
+                description += '\n'
+
+            description += "\nstdout:\n{}\n".format(stdout)
+            return TestResult(self.name, TestStatus.FAIL, reason, total_time, description)
+
+        if stderr:
+            description += "\n{}\n".format('\n'.join(stderr.split('\n')[:100]))
+            description += "\nstdout:\n{}\n".format(stdout)
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.STDERR, total_time, description)
+
+        if 'Exception' in stdout:
+            description += "\n{}\n".format('\n'.join(stdout.split('\n')[:100]))
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.EXCEPTION, total_time, description)
+
+        if '@@SKIP@@' in stdout:
+            skip_reason = stdout.replace('@@SKIP@@', '').rstrip("\n")
+            description += " - "
+            description += skip_reason
+            return TestResult(self.name, TestStatus.SKIPPED, FailureReason.SKIP, total_time, description)
+
+        if self.reference_file is None:
+            return TestResult(self.name, TestStatus.UNKNOWN, FailureReason.NO_REFERENCE, total_time, description)
+
+        result_is_different = subprocess.call(['diff', '-q', self.reference_file, self.stdout_file], stdout=PIPE)
+
+        if result_is_different:
+            diff = Popen(['diff', '-U', str(self.testcase_args.unified), self.reference_file, self.stdout_file], stdout=PIPE,
+                         universal_newlines=True).communicate()[0]
+            description += "\n{}\n".format(diff)
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.RESULT_DIFF, total_time, description)
+
+        if self.testcase_args.test_runs > 1 and total_time > 60 and 'long' not in self.name:
+            # We're in Flaky Check mode, check the run time as well while we're at it.
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.TOO_LONG, total_time, description)
+
+        if os.path.exists(self.stdout_file):
+            os.remove(self.stdout_file)
+        if os.path.exists(self.stderr_file):
+            os.remove(self.stderr_file)
+
+        return TestResult(self.name, TestStatus.OK, None, total_time, description)
+
+    @staticmethod
+    def print_test_time(test_time) -> str:
+        if args.print_time:
+            return " {0:.2f} sec.".format(test_time)
+        else:
+            return ''
+
+    def process_result(self, result: TestResult, messages):
+        description_full = messages[result.status]
+        description_full += self.print_test_time(result.total_time)
+        if result.reason is not None:
+            description_full += " - "
+            description_full += result.reason.value
+
+        description_full += result.description
+        description_full += "\n"
+
+        if result.status == TestStatus.FAIL:
+            description_full += 'Database: ' + self.testcase_args.testcase_database
+
+        result.description = description_full
+        return result
+
+    @staticmethod
+    def send_test_name_failed(suite: str, case: str) -> bool:
+        clickhouse_proc = open_client_process(args.client, universal_newlines=True)
+
+        failed_to_check = False
+
+        pid = os.getpid()
+        query = f"SELECT 'Running test {suite}/{case} from pid={pid}';"
+
+        try:
+            clickhouse_proc.communicate((query), timeout=20)
+        except:
+            failed_to_check = True
+
+        return failed_to_check or clickhouse_proc.returncode != 0
+
+    def run_single_test(self, server_logs_level, client_options):
+        args = self.testcase_args
+        client = args.testcase_client
+        start_time = args.testcase_start_time
+        database = args.testcase_database
+
+        # This is for .sh tests
+        os.environ["CLICKHOUSE_LOG_COMMENT"] = self.case_file
+
+        params = {
+            'client': client + ' --database=' + database,
+            'logs_level': server_logs_level,
+            'options': client_options,
+            'test': self.case_file,
+            'stdout': self.stdout_file,
+            'stderr': self.stderr_file,
+        }
+
+        # >> append to stderr (but not stdout since it is not used there),
+        # because there are also output of per test database creation
+        if not args.database:
+            pattern = '{test} > {stdout} 2>> {stderr}'
+        else:
+            pattern = '{test} > {stdout} 2> {stderr}'
+
+        if self.ext == '.sql':
+            pattern = "{client} --send_logs_level={logs_level} --testmode --multiquery {options} < " + pattern
+
+        command = pattern.format(**params)
+
+        proc = Popen(command, shell=True, env=os.environ)
+
+        while (datetime.now() - start_time).total_seconds() < args.timeout and proc.poll() is None:
+            sleep(0.01)
+
+        need_drop_database = not args.database
+        if need_drop_database and args.no_drop_if_fail:
+            maybe_passed = (proc.returncode == 0) and (proc.stderr is None) and (
+                        proc.stdout is None or 'Exception' not in proc.stdout)
+            need_drop_database = not maybe_passed
+
+        if need_drop_database:
+            with open(self.stderr_file, 'a') as stderr:
+                clickhouse_proc_create = open_client_process(client, universal_newlines=True, stderr_file=stderr)
+
+            seconds_left = max(args.timeout - (datetime.now() - start_time).total_seconds(), 20)
+
+            try:
+                drop_database_query = "DROP DATABASE " + database
+                if args.replicated_database:
+                    drop_database_query += " ON CLUSTER test_cluster_database_replicated"
+                clickhouse_proc_create.communicate((drop_database_query), timeout=seconds_left)
+            except TimeoutExpired:
+                # kill test process because it can also hung
+                if proc.returncode is None:
+                    try:
+                        proc.kill()
+                    except OSError as e:
+                        if e.errno != ESRCH:
+                            raise
+
+                total_time = (datetime.now() - start_time).total_seconds()
+                return clickhouse_proc_create, "", f"Timeout dropping database {database} after test", total_time
+
+            shutil.rmtree(args.test_tmp_dir)
+
+        total_time = (datetime.now() - start_time).total_seconds()
+
+        # Normalize randomized database names in stdout, stderr files.
+        os.system("LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=self.stdout_file))
+        if args.hide_db_name:
+            os.system(
+                "LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=self.stderr_file))
+        if args.replicated_database:
+            os.system("LC_ALL=C sed -i -e 's|/auto_{{shard}}||g' {file}".format(file=self.stdout_file))
+            os.system("LC_ALL=C sed -i -e 's|auto_{{replica}}||g' {file}".format(file=self.stdout_file))
+
+        # Normalize hostname in stdout file.
+        os.system("LC_ALL=C sed -i -e 's/{hostname}/localhost/g' {file}".format(hostname=socket.gethostname(),
+                                                                                file=self.stdout_file))
+
+        stdout = open(self.stdout_file, 'rb').read() if os.path.exists(self.stdout_file) else b''
+        stdout = str(stdout, errors='replace', encoding='utf-8')
+        stderr = open(self.stderr_file, 'rb').read() if os.path.exists(self.stderr_file) else b''
+        stderr = str(stderr, errors='replace', encoding='utf-8')
+
+        return proc, stdout, stderr, total_time
+
+    def run(self, args, suite, client_options, server_logs_level):
+        try:
+            skip_reason = self.should_skip_test(suite)
+            if skip_reason is not None:
+                return TestResult(self.name, TestStatus.SKIPPED, skip_reason, 0., "")
+
+            if args.testname and self.send_test_name_failed(suite, self.case):
+                description = "\nServer does not respond to health check\n"
+                return TestResult(self.name, TestStatus.FAIL, FailureReason.SERVER_DIED, 0., description)
+
+            self.runs_count += 1
+            self.testcase_args = self.configure_testcase_args(args, self.case_file, suite.suite_tmp_path, self.stderr_file)
+            proc, stdout, stderr, total_time = self.run_single_test(server_logs_level, client_options)
+
+            result = self.process_result_impl(proc, stdout, stderr, total_time)
+            result.check_if_need_retry(args, stdout, stderr, self.runs_count)
+            return result
+        except KeyboardInterrupt as e:
+            raise e
+        except:
+            exc_type, exc_value, tb = sys.exc_info()
+            exc_name = exc_type.__name__
+            traceback_str = "\n".join(traceback.format_tb(tb, 10))
+            description = f"{exc_name}\n{exc_value}\n{traceback_str}"
+            return TestResult(self.name, TestStatus.UNKNOWN, FailureReason.INTERNAL_ERROR, 0., description)
+
+
+class TestSuite:
+    @staticmethod
+    def tests_in_suite_key_func(item: str) -> int:
+        if args.order == 'random':
+            return random.random()
+
+        reverse = 1 if args.order == 'asc' else -1
+
+        if -1 == item.find('_'):
+            return 99998
+
+        prefix, _ = item.split('_', 1)
+
+        try:
+            return reverse * int(prefix)
+        except ValueError:
+            return 99997
+
+    @staticmethod
+    def render_test_template(j2env, suite_dir, test_name):
+        """
+        Render template for test and reference file if needed
+        """
+
+        if j2env is None:
+            return test_name
+
+        test_base_name = removesuffix(test_name, ".sql.j2", ".sql")
+
+        reference_file_name = test_base_name + ".reference.j2"
+        reference_file_path = os.path.join(suite_dir, reference_file_name)
+        if os.path.isfile(reference_file_path):
+            tpl = j2env.get_template(reference_file_name)
+            tpl.stream().dump(os.path.join(suite_dir, test_base_name) + ".gen.reference")
+
+        if test_name.endswith(".sql.j2"):
+            tpl = j2env.get_template(test_name)
+            generated_test_name = test_base_name + ".gen.sql"
+            tpl.stream().dump(os.path.join(suite_dir, generated_test_name))
+            return generated_test_name
+
+        return test_name
+
+    @staticmethod
+    def read_test_tags(suite_dir: str, all_tests: List[str]) -> Dict[str, Set[str]]:
+        def get_comment_sign(filename):
+            if filename.endswith('.sql') or filename.endswith('.sql.j2'):
+                return '--'
+            elif filename.endswith('.sh') or filename.endswith('.py') or filename.endswith('.expect'):
+                return '#'
+            else:
+                raise Exception(f'Unknown file_extension: {filename}')
+
+        def parse_tags_from_line(line, comment_sign):
+            if not line.startswith(comment_sign):
+                return None
+            tags_str = line[len(comment_sign):].lstrip()
+            tags_prefix = "Tags:"
+            if not tags_str.startswith(tags_prefix):
+                return None
+            tags_str = tags_str[len(tags_prefix):]
+            tags = tags_str.split(',')
+            tags = {tag.strip() for tag in tags}
+            return tags
+
+        def is_shebang(line):
+            return line.startswith('#!')
+
+        def load_tags_from_file(filepath):
+            with open(filepath, 'r') as file:
+                try:
+                    line = file.readline()
+                    if is_shebang(line):
+                        line = file.readline()
+                except UnicodeDecodeError:
+                    return []
+            return parse_tags_from_line(line, get_comment_sign(filepath))
+
+        all_tags = {}
+        start_time = datetime.now()
+        for test_name in all_tests:
+            tags = load_tags_from_file(os.path.join(suite_dir, test_name))
+            if tags:
+                all_tags[test_name] = tags
+        elapsed = (datetime.now() - start_time).total_seconds()
+        if elapsed > 1:
+            print(f"Tags for suite {suite_dir} read in {elapsed:.2f} seconds")
+        return all_tags
+
+    def __init__(self, args, suite_path: str, suite_tmp_path: str, suite: str):
+        self.args = args
+        self.suite_path: str = suite_path
+        self.suite_tmp_path: str = suite_tmp_path
+        self.suite: str = suite
+
+        self.all_tests: List[str] = self.get_tests_list(self.tests_in_suite_key_func)
+        self.all_tags: Dict[str, Set[str]] = self.read_test_tags(self.suite_path, self.all_tests)
+
+        self.sequential_tests = []
+        self.parallel_tests = []
+        for test_name in self.all_tests:
+            if self.is_sequential_test(test_name):
+                self.sequential_tests.append(test_name)
+            else:
+                self.parallel_tests.append(test_name)
+
+    def is_sequential_test(self, test_name):
+        if args.sequential:
+            if any(s in test_name for s in args.sequential):
+                return True
+
+        if test_name not in self.all_tags:
+            return False
+
+        return ('no-parallel' in self.all_tags[test_name]) or ('sequential' in self.all_tags[test_name])
+
+    def get_tests_list(self, sort_key):
+        """
+        Return list of tests file names to run
+        """
+
+        all_tests = list(self.get_selected_tests())
+        all_tests = all_tests * self.args.test_runs
+        all_tests.sort(key=sort_key)
+        return all_tests
+
+    def get_selected_tests(self):
+        """
+        Find all files with tests, filter, render templates
+        """
+
+        j2env = jinja2.Environment(
+            loader=jinja2.FileSystemLoader(self.suite_path),
+            keep_trailing_newline=True,
+        ) if USE_JINJA else None
+
+        for test_name in os.listdir(self.suite_path):
+            if not is_test_from_dir(self.suite_path, test_name):
+                continue
+            if self.args.test and not any(re.search(pattern, test_name) for pattern in self.args.test):
+                continue
+            if USE_JINJA and test_name.endswith(".gen.sql"):
+                continue
+            test_name = self.render_test_template(j2env, self.suite_path, test_name)
+            yield test_name
+
+    @staticmethod
+    def readTestSuite(args, suite_dir_name: str):
+        def is_data_present():
+            clickhouse_proc = open_client_process(args.client)
+            (stdout, stderr) = clickhouse_proc.communicate(b"EXISTS TABLE test.hits")
+            if clickhouse_proc.returncode != 0:
+                raise CalledProcessError(clickhouse_proc.returncode, args.client, stderr)
+
+            return stdout.startswith(b'1')
+
+        base_dir = os.path.abspath(args.queries)
+        tmp_dir = os.path.abspath(args.tmp)
+        suite_path = os.path.join(base_dir, suite_dir_name)
+
+        suite_re_obj = re.search('^[0-9]+_(.*)$', suite_dir_name)
+        if not suite_re_obj:  # skip .gitignore and so on
+            return None
+
+        suite_tmp_path = os.path.join(tmp_dir, suite_dir_name)
+        if not os.path.exists(suite_tmp_path):
+            os.makedirs(suite_tmp_path)
+
+        suite = suite_re_obj.group(1)
+
+        if not os.path.isdir(suite_path):
+            return None
+
+        if 'stateful' in suite and not args.no_stateful and not is_data_present():
+            print("Won't run stateful tests because test data wasn't loaded.")
+            return None
+        if 'stateless' in suite and args.no_stateless:
+            print("Won't run stateless tests because they were manually disabled.")
+            return None
+        if 'stateful' in suite and args.no_stateful:
+            print("Won't run stateful tests because they were manually disabled.")
+            return None
+
+        return TestSuite(args, suite_path, suite_tmp_path, suite)
+
+
 stop_time = None
-exit_code = multiprocessing.Value("i", 0)
-server_died = multiprocessing.Event()
-stop_tests_triggered_lock = multiprocessing.Lock()
-stop_tests_triggered = multiprocessing.Event()
-queue = multiprocessing.Queue(maxsize=1)
+exit_code = None
+server_died = None
+stop_tests_triggered_lock = None
+stop_tests_triggered = None
+queue = None
+multiprocessing_manager = None
+restarted_tests = None
 
-
-def print_test_time(test_time) -> str:
-    if args.print_time:
-        return " {0:.2f} sec.".format(test_time)
-    else:
-        return ''
-
-
-def should_skip_test_by_name(name: str, test_ext: str) -> Tuple[bool, str]:
-    if args.skip and any(s in name for s in args.skip):
-        return True, "skip"
-
-    if not args.zookeeper and ('zookeeper' in name or 'replica' in name):
-        return True, "no zookeeper"
-
-    if not args.shard and \
-        ('shard' in name or 'distributed' in name or 'global' in name):
-        return True, "no shard"
-
-    # Tests for races and deadlocks usually are run in a loop for a significant
-    # amount of time
-    if args.no_long and \
-        ('long' in name or 'deadlock' in name or 'race' in name):
-        return True, "no long"
-
-    if not USE_JINJA and test_ext.endswith("j2"):
-        return True, "no jinja"
-
-    return False, ""
-
-
-def should_skip_disabled_test(name: str, suite_dir: str) -> Tuple[bool, str]:
-    disabled_file = os.path.join(suite_dir, name) + '.disabled'
-
-    if os.path.exists(disabled_file) and not args.disabled:
-        return True, open(disabled_file, 'r').read()
-
-    return False, ""
-
-
-# should skip test, should increment skipped_total, skip reason
-def should_skip_test(name: str, test_ext: str, suite_dir: str) -> Tuple[bool, bool, str]:
-    should_skip, skip_reason = should_skip_test_by_name(name, test_ext)
-
-    if should_skip:
-        return True, True, skip_reason
-
-    should_skip, skip_reason = should_skip_disabled_test(name, suite_dir)
-
-    return should_skip, False, skip_reason
-
-
-def send_test_name_failed(suite: str, case: str) -> bool:
-    clickhouse_proc = open_client_process(args.client, universal_newlines=True)
-
-    failed_to_check = False
-
-    pid = os.getpid()
-    query = f"SELECT 'Running test {suite}/{case} from pid={pid}';"
-
-    try:
-        clickhouse_proc.communicate((query), timeout=20)
-    except:
-        failed_to_check = True
-
-    return failed_to_check or clickhouse_proc.returncode != 0
-
-
-restarted_tests = []  # (test, stderr)
-
-# def run_tests_array(all_tests, suite, suite_dir, suite_tmp_dir, run_total):
+# def run_tests_array(all_tests: List[str], num_tests: int, test_suite: TestSuite):
 def run_tests_array(all_tests_with_params):
-    all_tests, num_tests, suite, suite_dir, suite_tmp_dir = all_tests_with_params
+    all_tests, num_tests, test_suite = all_tests_with_params
     global stop_time
     global exit_code
     global server_died
+    global restarted_tests
 
     OP_SQUARE_BRACKET = colored("[", args, attrs=['bold'])
     CL_SQUARE_BRACKET = colored("]", args, attrs=['bold'])
@@ -506,10 +841,11 @@ def run_tests_array(all_tests_with_params):
     MSG_OK = OP_SQUARE_BRACKET + colored(" OK ", args, "green", attrs=['bold']) + CL_SQUARE_BRACKET
     MSG_SKIPPED = OP_SQUARE_BRACKET + colored(" SKIPPED ", args, "cyan", attrs=['bold']) + CL_SQUARE_BRACKET
 
+    MESSAGES = {TestStatus.FAIL: MSG_FAIL, TestStatus.UNKNOWN: MSG_UNKNOWN, TestStatus.OK: MSG_OK, TestStatus.SKIPPED: MSG_SKIPPED}
+
     passed_total = 0
     skipped_total = 0
     failures_total = 0
-    failures = 0
     failures_chain = 0
     start_time = datetime.now()
 
@@ -520,7 +856,7 @@ def run_tests_array(all_tests_with_params):
     if num_tests > 0:
         about = 'about ' if is_concurrent else ''
         proc_name = multiprocessing.current_process().name
-        print(f"\nRunning {about}{num_tests} {suite} tests ({proc_name}).\n")
+        print(f"\nRunning {about}{num_tests} {test_suite.suite} tests ({proc_name}).\n")
 
     while True:
         if is_concurrent:
@@ -542,182 +878,56 @@ def run_tests_array(all_tests_with_params):
             stop_tests()
             break
 
-        case_file = os.path.join(suite_dir, case)
-        (name, ext) = os.path.splitext(case)
+        test_case = TestCase(test_suite, case, args, is_concurrent)
 
         try:
-            status = ''
+            description = ''
             if not is_concurrent:
                 sys.stdout.flush()
-                sys.stdout.write("{0:72}".format(removesuffix(name, ".gen", ".sql") + ": "))
+                sys.stdout.write("{0:72}".format(removesuffix(test_case.name, ".gen", ".sql") + ": "))
                 # This flush is needed so you can see the test name of the long
                 # running test before it will finish. But don't do it in parallel
                 # mode, so that the lines don't mix.
                 sys.stdout.flush()
             else:
-                status = "{0:72}".format(removesuffix(name, ".gen", ".sql") + ": ")
+                description = "{0:72}".format(removesuffix(test_case.name, ".gen", ".sql") + ": ")
 
-            skip_test, increment_skip_count, skip_reason = \
-                should_skip_test(name, ext, suite_dir)
+            while True:
+                test_result = test_case.run(args, test_suite, client_options, server_logs_level)
+                test_result = test_case.process_result(test_result, MESSAGES)
+                if not test_result.need_retry:
+                    break
+                restarted_tests.append(test_result)
 
-            if skip_test:
-                status += MSG_SKIPPED + f" - {skip_reason}\n"
-
-                if increment_skip_count:
-                    skipped_total += 1
-            else:
-                if args.testname and send_test_name_failed(suite, case):
-                    failures += 1
-                    print("Server does not respond to health check")
+            if test_result.status == TestStatus.OK:
+                passed_total += 1
+                failures_chain = 0
+            elif test_result.status == TestStatus.FAIL:
+                failures_total += 1
+                failures_chain += 1
+                if test_result.reason == FailureReason.SERVER_DIED:
                     server_died.set()
                     stop_tests()
-                    break
 
-                file_suffix = ('.' + str(os.getpid())) if is_concurrent and args.test_runs > 1 else ''
-                reference_file = get_reference_file(suite_dir, name)
-                stdout_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stdout'
-                stderr_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stderr'
+            elif test_result.status == TestStatus.SKIPPED:
+                skipped_total += 1
 
-                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)
+            description += test_result.description
 
-                if proc.returncode is None:
-                    try:
-                        proc.kill()
-                    except OSError as e:
-                        if e.errno != ESRCH:
-                            raise
+            if description and not description.endswith('\n'):
+                description += '\n'
 
-                    failures += 1
-                    status += MSG_FAIL
-                    status += print_test_time(total_time)
-                    status += " - Timeout!\n"
-                    if stderr:
-                        status += stderr
-                    status += 'Database: ' + testcase_args.testcase_database
-                else:
-                    counter = 1
-                    while need_retry(stdout, stderr):
-                        restarted_tests.append((case_file, stderr))
-                        testcase_args = configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file)
-                        proc, stdout, stderr, total_time = run_single_test(testcase_args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file)
-                        sleep(2**counter)
-                        counter += 1
-                        if MAX_RETRIES < counter:
-                            if args.replicated_database:
-                                if DISTRIBUTED_DDL_TIMEOUT_MSG in stderr:
-                                    server_died.set()
-                            break
-
-                    if proc.returncode != 0:
-                        failures += 1
-                        failures_chain += 1
-                        status += MSG_FAIL
-                        status += print_test_time(total_time)
-                        status += ' - return code {}\n'.format(proc.returncode)
-
-                        if stderr:
-                            status += stderr
-
-                        # Stop on fatal errors like segmentation fault. They are sent to client via logs.
-                        if ' <Fatal> ' in stderr:
-                            server_died.set()
-
-                        if testcase_args.stop \
-                            and ('Connection refused' in stderr or 'Attempt to read after eof' in stderr) \
-                            and 'Received exception from server' not in stderr:
-                            server_died.set()
-
-                        if os.path.isfile(stdout_file):
-                            status += ", result:\n\n"
-                            status += '\n'.join(
-                                open(stdout_file).read().split('\n')[:100])
-                            status += '\n'
-
-                        status += "\nstdout:\n{}\n".format(stdout)
-                        status += 'Database: ' + testcase_args.testcase_database
-
-                    elif stderr:
-                        failures += 1
-                        failures_chain += 1
-                        status += MSG_FAIL
-                        status += print_test_time(total_time)
-                        status += " - having stderror:\n{}\n".format(
-                            '\n'.join(stderr.split('\n')[:100]))
-                        status += "\nstdout:\n{}\n".format(stdout)
-                        status += 'Database: ' + testcase_args.testcase_database
-                    elif 'Exception' in stdout:
-                        failures += 1
-                        failures_chain += 1
-                        status += MSG_FAIL
-                        status += print_test_time(total_time)
-                        status += " - having exception in stdout:\n{}\n".format(
-                            '\n'.join(stdout.split('\n')[:100]))
-                        status += 'Database: ' + testcase_args.testcase_database
-                    elif '@@SKIP@@' in stdout:
-                        skipped_total += 1
-                        skip_reason = stdout.replace('@@SKIP@@', '').rstrip("\n")
-                        status += MSG_SKIPPED + f" - {skip_reason}\n"
-                    elif reference_file is None:
-                        status += MSG_UNKNOWN
-                        status += print_test_time(total_time)
-                        status += " - no reference file\n"
-                        status += 'Database: ' + testcase_args.testcase_database
-                    else:
-                        result_is_different = subprocess.call(['diff', '-q', reference_file, stdout_file], stdout=PIPE)
-
-                        if result_is_different:
-                            diff = Popen(['diff', '-U', str(testcase_args.unified), reference_file, stdout_file], stdout=PIPE, universal_newlines=True).communicate()[0]
-                            failures += 1
-                            status += MSG_FAIL
-                            status += print_test_time(total_time)
-                            status += " - result differs with reference:\n{}\n".format(diff)
-                            status += 'Database: ' + testcase_args.testcase_database
-                        else:
-                            if testcase_args.test_runs > 1 and total_time > 60 and 'long' not in name:
-                                # We're in Flaky Check mode, check the run time as well while we're at it.
-                                failures += 1
-                                failures_chain += 1
-                                status += MSG_FAIL
-                                status += print_test_time(total_time)
-                                status += " - Test runs too long (> 60s). Make it faster.\n"
-                                status += 'Database: ' + testcase_args.testcase_database
-                            else:
-                                passed_total += 1
-                                failures_chain = 0
-                                status += MSG_OK
-                                status += print_test_time(total_time)
-                                status += "\n"
-                                if os.path.exists(stdout_file):
-                                    os.remove(stdout_file)
-                                if os.path.exists(stderr_file):
-                                    os.remove(stderr_file)
-
-            if status and not status.endswith('\n'):
-                status += '\n'
-
-            sys.stdout.write(status)
+            sys.stdout.write(description)
             sys.stdout.flush()
         except KeyboardInterrupt as e:
             print(colored("Break tests execution", args, "red"))
             stop_tests()
             raise e
-        except:
-            exc_type, exc_value, tb = sys.exc_info()
-            failures += 1
-
-            exc_name = exc_type.__name__
-            traceback_str = "\n".join(traceback.format_tb(tb, 10))
-
-            print(f"{MSG_FAIL} - Test internal error: {exc_name}")
-            print(f"{exc_value}\n{traceback_str}")
 
         if failures_chain >= 20:
             stop_tests()
             break
 
-    failures_total = failures_total + failures
-
     if failures_total > 0:
         print(colored(f"\nHaving {failures_total} errors! {passed_total} tests passed."
             f" {skipped_total} tests skipped. {(datetime.now() - start_time).total_seconds():.2f} s elapsed"
@@ -758,18 +968,12 @@ def check_server_started(client, retry_count):
             sleep(0.5)
             continue
 
-        # FIXME Some old comment, maybe now CH supports Python3 ?
-        # We can't print this, because for some reason this is python 2,
-        # and args appeared in 3.3. To hell with it.
-        # print(''.join(clickhouse_proc.args))
-
-        # Other kind of error, fail.
-
         code: int = clickhouse_proc.returncode
 
         print(f"\nClient invocation failed with code {code}:\n\
             stdout: {stdout}\n\
-            stderr: {stderr}")
+            stderr: {stderr}\n\
+            args: {''.join(clickhouse_proc.args)}\n")
 
         sys.stdout.flush()
 
@@ -782,16 +986,15 @@ def check_server_started(client, retry_count):
 
 
 class BuildFlags():
-    THREAD = 'thread-sanitizer'
-    ADDRESS = 'address-sanitizer'
-    UNDEFINED = 'ub-sanitizer'
-    MEMORY = 'memory-sanitizer'
-    DEBUG = 'debug-build'
-    UNBUNDLED = 'unbundled-build'
-    RELEASE = 'release-build'
-    DATABASE_ORDINARY = 'database-ordinary'
+    THREAD = 'tsan'
+    ADDRESS = 'asan'
+    UNDEFINED = 'ubsan'
+    MEMORY = 'msan'
+    DEBUG = 'debug'
+    UNBUNDLED = 'unbundled'
+    RELEASE = 'release'
+    ORDINARY_DATABASE = 'ordinary-database'
     POLYMORPHIC_PARTS = 'polymorphic-parts'
-    DATABASE_REPLICATED = 'database-replicated'
 
 
 def collect_build_flags(client):
@@ -836,7 +1039,7 @@ def collect_build_flags(client):
 
     if clickhouse_proc.returncode == 0:
         if b'Ordinary' in stdout:
-            result.append(BuildFlags.DATABASE_ORDINARY)
+            result.append(BuildFlags.ORDINARY_DATABASE)
     else:
         raise Exception("Cannot get information about build from server errorcode {}, stderr {}".format(clickhouse_proc.returncode, stderr))
 
@@ -867,23 +1070,6 @@ def suite_key_func(item: str) -> Union[int, Tuple[int, str]]:
         return 99997, ''
 
 
-def tests_in_suite_key_func(item: str) -> int:
-    if args.order == 'random':
-        return random.random()
-
-    reverse = 1 if args.order == 'asc' else -1
-
-    if -1 == item.find('_'):
-        return 99998
-
-    prefix, _ = item.split('_', 1)
-
-    try:
-        return reverse * int(prefix)
-    except ValueError:
-        return 99997
-
-
 def extract_key(key: str) -> str:
     return subprocess.getstatusoutput(
         args.extract_from_config +
@@ -901,14 +1087,13 @@ def open_client_process(
         universal_newlines=True if universal_newlines else None)
 
 
-
-def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_tests, sequential_tests, parallel):
-    if jobs > 1 and len(parallel_tests) > 0:
-        print("Found", len(parallel_tests), "parallel tests and", len(sequential_tests), "sequential tests")
+def do_run_tests(jobs, test_suite: TestSuite, parallel):
+    if jobs > 1 and len(test_suite.parallel_tests) > 0:
+        print("Found", len(test_suite.parallel_tests), "parallel tests and", len(test_suite.sequential_tests), "sequential tests")
         run_n, run_total = parallel.split('/')
         run_n = float(run_n)
         run_total = float(run_total)
-        tests_n = len(parallel_tests)
+        tests_n = len(test_suite.parallel_tests)
         if run_total > tests_n:
             run_total = tests_n
 
@@ -917,15 +1102,15 @@ def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_test
         if jobs > run_total:
             run_total = jobs
 
-        batch_size = max(1, len(parallel_tests) // jobs)
+        batch_size = max(1, len(test_suite.parallel_tests) // jobs)
         parallel_tests_array = []
         for _ in range(jobs):
-            parallel_tests_array.append((None, batch_size, suite, suite_dir, suite_tmp_dir))
+            parallel_tests_array.append((None, batch_size, test_suite))
 
         with closing(multiprocessing.Pool(processes=jobs)) as pool:
             pool.map_async(run_tests_array, parallel_tests_array)
 
-            for suit in parallel_tests:
+            for suit in test_suite.parallel_tests:
                 queue.put(suit)
 
             for _ in range(jobs):
@@ -935,11 +1120,11 @@ def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_test
 
         pool.join()
 
-        run_tests_array((sequential_tests, len(sequential_tests), suite, suite_dir, suite_tmp_dir))
-        return len(sequential_tests) + len(parallel_tests)
+        run_tests_array((test_suite.sequential_tests, len(test_suite.sequential_tests), test_suite))
+        return len(test_suite.sequential_tests) + len(test_suite.parallel_tests)
     else:
-        num_tests = len(all_tests)
-        run_tests_array((all_tests, num_tests, suite, suite_dir, suite_tmp_dir))
+        num_tests = len(test_suite.all_tests)
+        run_tests_array((test_suite.all_tests, num_tests, test_suite))
         return num_tests
 
 
@@ -964,112 +1149,27 @@ def removesuffix(text, *suffixes):
     return text
 
 
-def render_test_template(j2env, suite_dir, test_name):
-    """
-    Render template for test and reference file if needed
-    """
-
-    if j2env is None:
-        return test_name
-
-    test_base_name = removesuffix(test_name, ".sql.j2", ".sql")
-
-    reference_file_name = test_base_name + ".reference.j2"
-    reference_file_path = os.path.join(suite_dir, reference_file_name)
-    if os.path.isfile(reference_file_path):
-        tpl = j2env.get_template(reference_file_name)
-        tpl.stream().dump(os.path.join(suite_dir, test_base_name) + ".gen.reference")
-
-    if test_name.endswith(".sql.j2"):
-        tpl = j2env.get_template(test_name)
-        generated_test_name = test_base_name + ".gen.sql"
-        tpl.stream().dump(os.path.join(suite_dir, generated_test_name))
-        return generated_test_name
-
-    return test_name
-
-
-def get_selected_tests(suite_dir, patterns):
-    """
-    Find all files with tests, filter, render templates
-    """
-
-    j2env = jinja2.Environment(
-        loader=jinja2.FileSystemLoader(suite_dir),
-        keep_trailing_newline=True,
-    ) if USE_JINJA else None
-
-    for test_name in os.listdir(suite_dir):
-        if not is_test_from_dir(suite_dir, test_name):
-            continue
-        if patterns and not any(re.search(pattern, test_name) for pattern in patterns):
-            continue
-        if USE_JINJA and test_name.endswith(".gen.sql"):
-            continue
-        test_name = render_test_template(j2env, suite_dir, test_name)
-        yield test_name
-
-
-def get_tests_list(suite_dir, patterns, test_runs, sort_key):
-    """
-    Return list of tests file names to run
-    """
-
-    all_tests = list(get_selected_tests(suite_dir, patterns))
-    all_tests = all_tests * test_runs
-    all_tests.sort(key=sort_key)
-    return all_tests
-
-
-def get_reference_file(suite_dir, name):
-    """
-    Returns reference file name for specified test
-    """
-
-    name = removesuffix(name, ".gen")
-    for ext in ['.reference', '.gen.reference']:
-        reference_file = os.path.join(suite_dir, name) + ext
-        if os.path.isfile(reference_file):
-            return reference_file
-    return None
-
-
 def main(args):
     global server_died
     global stop_time
     global exit_code
     global server_logs_level
-
-    def is_data_present():
-        clickhouse_proc = open_client_process(args.client)
-        (stdout, stderr) = clickhouse_proc.communicate(b"EXISTS TABLE test.hits")
-        if clickhouse_proc.returncode != 0:
-            raise CalledProcessError(clickhouse_proc.returncode, args.client, stderr)
-
-        return stdout.startswith(b'1')
+    global restarted_tests
 
     if not check_server_started(args.client, args.server_check_retries):
-        raise Exception(
-            "Server is not responding. Cannot execute 'SELECT 1' query. \
-            If you are using split build, you have to specify -c option.")
+        msg = "Server is not responding. Cannot execute 'SELECT 1' query. \
+            If you are using split build, you have to specify -c option."
+        if args.hung_check:
+            print(msg)
+            pid = get_server_pid()
+            print("Got server pid", pid)
+            print_stacktraces()
+        raise Exception(msg)
 
-    build_flags = collect_build_flags(args.client)
-
-    if args.replicated_database:
-        build_flags.append(BuildFlags.DATABASE_REPLICATED)
-
-    if args.use_skip_list:
-        tests_to_skip_from_list = collect_tests_to_skip(args.skip_list_path, build_flags)
-    else:
-        tests_to_skip_from_list = set()
+    args.build_flags = collect_build_flags(args.client)
 
     if args.skip:
-        args.skip = set(args.skip) | tests_to_skip_from_list
-    else:
-        args.skip = tests_to_skip_from_list
-
-    if args.use_skip_list and not args.sequential:
-        args.sequential = collect_sequential_list(args.skip_list_path)
+        args.skip = set(args.skip)
 
     base_dir = os.path.abspath(args.queries)
     tmp_dir = os.path.abspath(args.tmp)
@@ -1102,13 +1202,17 @@ def main(args):
     def create_common_database(args, db_name):
         create_database_retries = 0
         while create_database_retries < MAX_RETRIES:
+            start_time = datetime.now()
+
             client_cmd = args.client + " " + get_additional_client_options(args)
 
             clickhouse_proc_create = open_client_process(client_cmd, universal_newlines=True)
 
             (stdout, stderr) = clickhouse_proc_create.communicate(("CREATE DATABASE IF NOT EXISTS " + db_name + get_db_engine(args, db_name)))
 
-            if not need_retry(stdout, stderr):
+            total_time = (datetime.now() - start_time).total_seconds()
+
+            if not need_retry(args, stdout, stderr, total_time):
                 break
             create_database_retries += 1
 
@@ -1123,44 +1227,14 @@ def main(args):
         if server_died.is_set():
             break
 
-        suite_dir = os.path.join(base_dir, suite)
-        suite_re_obj = re.search('^[0-9]+_(.*)$', suite)
-        if not suite_re_obj:  # skip .gitignore and so on
+        test_suite = TestSuite.readTestSuite(args, suite)
+        if test_suite is None:
             continue
 
-        suite_tmp_dir = os.path.join(tmp_dir, suite)
-        if not os.path.exists(suite_tmp_dir):
-            os.makedirs(suite_tmp_dir)
+        total_tests_run += do_run_tests(args.jobs, test_suite, args.parallel)
 
-        suite = suite_re_obj.group(1)
-
-        if os.path.isdir(suite_dir):
-            if 'stateful' in suite and not args.no_stateful and not is_data_present():
-                print("Won't run stateful tests because test data wasn't loaded.")
-                continue
-            if 'stateless' in suite and args.no_stateless:
-                print("Won't run stateless tests because they were manually disabled.")
-                continue
-            if 'stateful' in suite and args.no_stateful:
-                print("Won't run stateful tests because they were manually disabled.")
-                continue
-
-            all_tests = get_tests_list(
-                suite_dir, args.test, args.test_runs, tests_in_suite_key_func)
-
-            jobs = args.jobs
-
-            parallel_tests = []
-            sequential_tests = []
-
-            for test in all_tests:
-                if any(s in test for s in args.sequential):
-                    sequential_tests.append(test)
-                else:
-                    parallel_tests.append(test)
-
-            total_tests_run += do_run_tests(
-                jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_tests, sequential_tests, args.parallel)
+    if server_died.is_set():
+        exit_code.value = 1
 
     if args.hung_check:
 
@@ -1187,8 +1261,12 @@ def main(args):
     if len(restarted_tests) > 0:
         print("\nSome tests were restarted:\n")
 
-        for (test_case, stderr) in restarted_tests:
-            print(test_case + "\n" + stderr + "\n")
+        for test_result in restarted_tests:
+            print("\n{0:72}: ".format(test_result.case_name))
+            # replace it with lowercase to avoid parsing retried tests as failed
+            for status in TestStatus:
+                test_result.description = test_result.description.replace(status.value, status.value.lower())
+            print(test_result.description)
 
     if total_tests_run == 0:
         print("No tests were run.")
@@ -1229,43 +1307,16 @@ def get_additional_client_options_url(args):
     return ''
 
 
-def collect_tests_to_skip(skip_list_path, build_flags):
-    result = set([])
-
-    if not os.path.exists(skip_list_path):
-        return result
-
-    with open(skip_list_path, 'r') as skip_list_file:
-        content = skip_list_file.read()
-
-        # allows to have comments in skip_list.json
-        skip_dict = json.loads(json_minify(content))
-
-        for build_flag in build_flags:
-            result |= set(skip_dict[build_flag])
-
-    count = len(result)
-
-    if count > 0:
-        print(f"Found file with skip-list {skip_list_path}, {count} test will be skipped")
-
-    return result
-
-
-def collect_sequential_list(skip_list_path):
-    if not os.path.exists(skip_list_path):
-        return set([])
-
-    with open(skip_list_path, 'r') as skip_list_file:
-        content = skip_list_file.read()
-        # allows to have comments in skip_list.json
-        skip_dict = json.loads(json_minify(content))
-        if 'parallel' in skip_dict:
-            return skip_dict['parallel']
-        return set([])
-
-
 if __name__ == '__main__':
+    stop_time = None
+    exit_code = multiprocessing.Value("i", 0)
+    server_died = multiprocessing.Event()
+    stop_tests_triggered_lock = multiprocessing.Lock()
+    stop_tests_triggered = multiprocessing.Event()
+    queue = multiprocessing.Queue(maxsize=1)
+    multiprocessing_manager = multiprocessing.Manager()
+    restarted_tests = multiprocessing_manager.list()
+
     # Move to a new process group and kill it at exit so that we don't have any
     # infinite tests processes left
     # (new process group is required to avoid killing some parent processes)
@@ -1305,10 +1356,9 @@ if __name__ == '__main__':
     parser.add_argument('--test-runs', default=1, nargs='?', type=int, help='Run each test many times (useful for e.g. flaky check)')
     parser.add_argument('-U', '--unified', default=3, type=int, help='output NUM lines of unified context')
     parser.add_argument('-r', '--server-check-retries', default=30, type=int, help='Num of tries to execute SELECT 1 before tests started')
-    parser.add_argument('--skip-list-path', help="Path to skip-list file")
-    parser.add_argument('--use-skip-list', action='store_true', default=False, help="Use skip list to skip tests if found")
     parser.add_argument('--db-engine', help='Database engine name')
     parser.add_argument('--replicated-database', action='store_true', default=False, help='Run tests with Replicated database engine')
+    parser.add_argument('--fast-tests-only', action='store_true', default=False, help='Run only fast tests (the tests without the "no-fasttest" tag)')
     parser.add_argument('--no-stateless', action='store_true', help='Disable all stateless tests')
     parser.add_argument('--no-stateful', action='store_true', help='Disable all stateful tests')
     parser.add_argument('--skip', nargs='+', help="Skip these tests")
@@ -1355,12 +1405,6 @@ if __name__ == '__main__':
 
     print("Using queries from '" + args.queries + "' directory")
 
-    if args.skip_list_path is None:
-        args.skip_list_path = os.path.join(args.queries, 'skip_list.json')
-
-    if args.sequential is None:
-        args.sequential = set([])
-
     if args.tmp is None:
         args.tmp = args.queries
     if args.client is None:
diff --git a/tests/client-test.xml b/tests/client-test.xml
deleted file mode 100644
index ee84d41911f..00000000000
--- a/tests/client-test.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- Config for connecting to test server in Arcadia -->
-<yandex>
-    <tcp_port>59000</tcp_port>
-    <tcp_port_secure>59440</tcp_port_secure>
-    <openSSL>
-        <client>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-            <verificationMode>none</verificationMode>
-            <invalidCertificateHandler>
-                <name>AcceptCertificateHandler</name>
-            </invalidCertificateHandler>
-        </client>
-    </openSSL>
-</yandex>
\ No newline at end of file
diff --git a/tests/config/config.d/encryption.xml b/tests/config/config.d/encryption.xml
index 216021ae744..b1b84cf46c8 100644
--- a/tests/config/config.d/encryption.xml
+++ b/tests/config/config.d/encryption.xml
@@ -1,6 +1,10 @@
 <yandex>
-    <encryption>
-        <!-- "Some fixed key that is at least 16 bytes long" in Base64 -->
-        <key_command>echo "U29tZSBmaXhlZCBrZXkgdGhhdCBpcyBhdCBsZWFzdCAxNiBieXRlcyBsb25n"</key_command>
-    </encryption>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key_hex>a32902703dab1cedd7ff7287067787ca</key_hex>
+        </aes_128_gcm_siv>
+        <aes_256_gcm_siv>
+            <key_hex>a32902703dab1cedd7ff7287067787caa32902703dab1cedd7ff7287067787ca</key_hex>
+        </aes_256_gcm_siv>
+    </encryption_codecs>
 </yandex>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 67cc4ef99d6..df62cba0ea9 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -45,6 +45,7 @@ ln -sf $SRC_PATH/users.d/access_management.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/database_atomic_drop_detach_sync.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/opentelemetry.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/remote_queries.xml $DEST_SERVER_PATH/users.d/
+ln -sf $SRC_PATH/users.d/session_log_test.xml $DEST_SERVER_PATH/users.d/
 
 # FIXME DataPartsExchange may hang for http_send_timeout seconds
 # when nobody is going to read from the other side of socket (due to "Fetching of part was cancelled"),
@@ -56,6 +57,7 @@ ln -sf $SRC_PATH/strings_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/decimals_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/executable_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/executable_pool_dictionary.xml $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/test_function.xml $DEST_SERVER_PATH/
 
 ln -sf $SRC_PATH/top_level_domains $DEST_SERVER_PATH/
 
diff --git a/tests/config/test_function.xml b/tests/config/test_function.xml
new file mode 100644
index 00000000000..2e31c9677ec
--- /dev/null
+++ b/tests/config/test_function.xml
@@ -0,0 +1,16 @@
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function</name>
+        <return_type>UInt64</return_type>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <format>TabSeparated</format>
+        <command>cd /; clickhouse-local --input-format TabSeparated --output-format TabSeparated --structure 'x UInt64, y UInt64' --query "SELECT x + y FROM table"</command>
+        <lifetime>0</lifetime>
+    </function>
+</functions>
diff --git a/tests/config/users.d/session_log_test.xml b/tests/config/users.d/session_log_test.xml
new file mode 100644
index 00000000000..5061963fe22
--- /dev/null
+++ b/tests/config/users.d/session_log_test.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!-- User and profile to be used in sesson_log tests, to make sure that list of user's profiles is logged correctly -->
+<yandex>
+    <profiles>
+        <session_log_test_xml_profile>
+            <!--
+            can't be readonly since we need to modify some
+            user settings in queries initiated by test.
+            <readonly>1</readonly>
+            -->
+            <send_logs_level>none</send_logs_level>
+        </session_log_test_xml_profile>
+    </profiles>
+    <roles>
+        <session_log_test_xml_role>
+        </session_log_test_xml_role>
+    </roles>
+
+    <users>
+        <session_log_test_xml_user>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::1</ip>
+                <ip>127.0.0.1</ip>
+            </networks>
+            <profile>session_log_test_xml_profile</profile>
+            <quota>default</quota>
+        </session_log_test_xml_user>
+    </users>
+</yandex>
diff --git a/tests/decimals_dictionary.xml b/tests/decimals_dictionary.xml
deleted file mode 120000
index 15f5b3800b3..00000000000
--- a/tests/decimals_dictionary.xml
+++ /dev/null
@@ -1 +0,0 @@
-config/decimals_dictionary.xml
\ No newline at end of file
diff --git a/tests/executable_pool_dictionary.xml b/tests/executable_pool_dictionary.xml
deleted file mode 120000
index 83f18b95f20..00000000000
--- a/tests/executable_pool_dictionary.xml
+++ /dev/null
@@ -1 +0,0 @@
-config/executable_pool_dictionary.xml
\ No newline at end of file
diff --git a/tests/external_models/catboost/data/build_catboost.sh b/tests/external_models/catboost/data/build_catboost.sh
deleted file mode 100755
index 50a3fb43ef8..00000000000
--- a/tests/external_models/catboost/data/build_catboost.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-cd $DIR
-git clone https://github.com/catboost/catboost.git
-
-
-cd "${DIR}/catboost/catboost/libs/model_interface"
-../../../ya make -r  -o "${DIR}/build/lib" -j4
-cd $DIR
-ln -sf "${DIR}/build/lib/catboost/libs/model_interface/libcatboostmodel.so" libcatboostmodel.so
-
-cd "${DIR}/catboost/catboost/python-package/catboost"
-../../../ya make -r -DUSE_ARCADIA_PYTHON=no -DOS_SDK=local -DPYTHON_CONFIG=python2-config -j4
-cd $DIR
-ln -sf "${DIR}/catboost/catboost/python-package" python-package
diff --git a/tests/external_models/catboost/helpers/client.py b/tests/external_models/catboost/helpers/client.py
deleted file mode 100644
index ecf44a0b65c..00000000000
--- a/tests/external_models/catboost/helpers/client.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import subprocess
-import threading
-import os
-
-
-class ClickHouseClient:
-    def __init__(self, binary_path, port):
-        self.binary_path = binary_path
-        self.port = port
-
-    def query(self, query, timeout=10, pipe=None):
-
-        result = []
-        process = []
-
-        def run(path, port, text, result, in_pipe, process):
-
-            if in_pipe is None:
-                in_pipe = subprocess.PIPE
-
-            pipe = subprocess.Popen([path, 'client', '--port', str(port), '-q', text],
-                                    stdin=in_pipe, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
-            process.append(pipe)
-            stdout_data, stderr_data = pipe.communicate()
-
-            if stderr_data:
-                raise Exception('Error while executing query: {}\nstdout:\n{}\nstderr:\n{}'
-                                .format(text, stdout_data, stderr_data))
-
-            result.append(stdout_data)
-
-        thread = threading.Thread(target=run, args=(self.binary_path, self.port, query, result, pipe, process))
-        thread.start()
-        thread.join(timeout)
-        if thread.isAlive():
-            if len(process):
-                process[0].kill()
-            thread.join()
-            raise Exception('timeout exceed for query: ' + query)
-
-        if len(result):
-            return result[0]
diff --git a/tests/external_models/catboost/helpers/generate.py b/tests/external_models/catboost/helpers/generate.py
deleted file mode 100644
index a7c1f3d9e98..00000000000
--- a/tests/external_models/catboost/helpers/generate.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import numpy as np
-
-
-def generate_uniform_int_column(size, low, high, seed=0):
-    np.random.seed(seed)
-    return np.random.randint(low, high, size)
-
-
-def generate_uniform_float_column(size, low, high, seed=0):
-    np.random.seed(seed)
-    return np.random.random(size) * (high - low) + low
-
-
-def generate_uniform_string_column(size, samples, seed):
-    return np.array(samples)[generate_uniform_int_column(size, 0, len(samples), seed)]
diff --git a/tests/external_models/catboost/helpers/server.py b/tests/external_models/catboost/helpers/server.py
deleted file mode 100644
index 8248b16e6df..00000000000
--- a/tests/external_models/catboost/helpers/server.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import subprocess
-import threading
-import socket
-import time
-
-
-class ClickHouseServer:
-    def __init__(self, binary_path, config_path, stdout_file=None, stderr_file=None, shutdown_timeout=10):
-        self.binary_path = binary_path
-        self.config_path = config_path
-        self.pipe = None
-        self.stdout_file = stdout_file
-        self.stderr_file = stderr_file
-        self.shutdown_timeout = shutdown_timeout
-
-    def start(self):
-        cmd = [self.binary_path, 'server', '--config', self.config_path]
-        out_pipe = None
-        err_pipe = None
-        if self.stdout_file is not None:
-            out_pipe = open(self.stdout_file, 'w')
-        if self.stderr_file is not None:
-            err_pipe = open(self.stderr_file, 'w')
-        self.pipe = subprocess.Popen(cmd, stdout=out_pipe, stderr=err_pipe)
-
-    def wait_for_request(self, port, timeout=1):
-        try:
-            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            # is not working
-            # s.settimeout(timeout)
-
-            step = 0.01
-            for iter in range(int(timeout / step)):
-                if s.connect_ex(('localhost', port)) == 0:
-                    return
-                time.sleep(step)
-
-            s.connect(('localhost', port))
-        except socket.error as socketerror:
-            print("Error: ", socketerror)
-            raise
-
-    def shutdown(self, timeout=10):
-
-        def wait(pipe):
-            pipe.wait()
-
-        if self.pipe is not None:
-            self.pipe.terminate()
-            thread = threading.Thread(target=wait, args=(self.pipe,))
-            thread.start()
-            thread.join(timeout)
-            if thread.isAlive():
-                self.pipe.kill()
-                thread.join()
-
-            if self.pipe.stdout is not None:
-                self.pipe.stdout.close()
-            if self.pipe.stderr is not None:
-                self.pipe.stderr.close()
-
-    def __enter__(self):
-        self.start()
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self.shutdown(self.shutdown_timeout)
diff --git a/tests/external_models/catboost/helpers/server_with_models.py b/tests/external_models/catboost/helpers/server_with_models.py
deleted file mode 100644
index e00da7b7027..00000000000
--- a/tests/external_models/catboost/helpers/server_with_models.py
+++ /dev/null
@@ -1,168 +0,0 @@
-from .server import ClickHouseServer
-from .client import ClickHouseClient
-from .table import ClickHouseTable
-import os
-import errno
-from shutil import rmtree
-
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CATBOOST_ROOT = os.path.dirname(SCRIPT_DIR)
-
-CLICKHOUSE_CONFIG = \
-'''
-<yandex>
-    <timezone>Europe/Moscow</timezone>
-    <listen_host>::</listen_host>
-    <path>{path}</path>
-    <tmp_path>{tmp_path}</tmp_path>
-    <models_config>{models_config}</models_config>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <users_config>users.xml</users_config>
-    <tcp_port>{tcp_port}</tcp_port>
-    <catboost_dynamic_library_path>{catboost_dynamic_library_path}</catboost_dynamic_library_path>
-    <logger>
-        <level>trace</level>
-        <log>{path}/clickhouse-server.log</log>
-        <errorlog>{path}/clickhouse-server.err.log</errorlog>
-        <size>never</size>
-        <count>50</count>
-    </logger>
-</yandex>
-'''
-
-CLICKHOUSE_USERS = \
-'''
-<yandex>
-    <profiles>
-        <default>
-        </default>
-	<readonly>
-            <readonly>1</readonly>
-        </readonly>
-    </profiles>
-
-    <users>
-        <readonly>
-            <password></password>
-            <profile>readonly</profile>
-            <quota>default</quota>
-        </readonly>
-
-        <default>
-            <password></password>
-            <profile>default</profile>
-            <quota>default</quota>
-            <networks incl="networks" replace="replace">
-                <ip>::1</ip>
-                <ip>127.0.0.1</ip>
-            </networks>
-
-        </default>
-    </users>
-
-    <quotas>
-        <default>
-        </default>
-    </quotas>
-</yandex>
-'''
-
-CATBOOST_MODEL_CONFIG = \
-'''
-<models>
-    <model>
-        <type>catboost</type>
-        <name>{name}</name>
-        <path>{path}</path>
-        <lifetime>0</lifetime>
-    </model>
-</models>
-'''
-
-
-class ClickHouseServerWithCatboostModels:
-    def __init__(self, name, binary_path, port, shutdown_timeout=10, clean_folder=False):
-        self.models = {}
-        self.name = name
-        self.binary_path = binary_path
-        self.port = port
-        self.shutdown_timeout = shutdown_timeout
-        self.clean_folder = clean_folder
-        self.root = os.path.join(CATBOOST_ROOT, 'data', 'servers')
-        self.config_path = os.path.join(self.root, 'config.xml')
-        self.users_path = os.path.join(self.root, 'users.xml')
-        self.models_dir = os.path.join(self.root, 'models')
-        self.server = None
-
-    def _get_server(self):
-        stdout_file = os.path.join(self.root, 'server_stdout.txt')
-        stderr_file = os.path.join(self.root, 'server_stderr.txt')
-        return ClickHouseServer(self.binary_path, self.config_path, stdout_file, stderr_file, self.shutdown_timeout)
-
-    def add_model(self, model_name, model):
-        self.models[model_name] = model
-
-    def apply_model(self, name, df, cat_feature_names):
-        names = list(df)
-        float_feature_names = tuple(name for name in names if name not in cat_feature_names)
-        with ClickHouseTable(self.server, self.port, name, df) as table:
-            return table.apply_model(name, cat_feature_names, float_feature_names)
-
-    def _create_root(self):
-        try:
-            os.makedirs(self.root)
-        except OSError as exc:  # Python >2.5
-            if exc.errno == errno.EEXIST and os.path.isdir(self.root):
-                pass
-            else:
-                raise
-
-    def _clean_root(self):
-        rmtree(self.root)
-
-    def _save_config(self):
-        params = {
-            'tcp_port': self.port,
-            'path': os.path.join(self.root, 'clickhouse'),
-            'tmp_path': os.path.join(self.root, 'clickhouse', 'tmp'),
-            'models_config': os.path.join(self.models_dir, '*_model.xml'),
-            'catboost_dynamic_library_path': os.path.join(CATBOOST_ROOT, 'data', 'libcatboostmodel.so')
-        }
-        config = CLICKHOUSE_CONFIG.format(**params)
-
-        with open(self.config_path, 'w') as f:
-            f.write(config)
-
-        with open(self.users_path, 'w') as f:
-            f.write(CLICKHOUSE_USERS)
-
-    def _save_models(self):
-        if not os.path.exists(self.models_dir):
-            os.makedirs(self.models_dir)
-
-        for name, model in list(self.models.items()):
-            model_path = os.path.join(self.models_dir, name + '.cbm')
-            config_path = os.path.join(self.models_dir, name + '_model.xml')
-            params = {
-                'name': name,
-                'path': model_path
-            }
-            config = CATBOOST_MODEL_CONFIG.format(**params)
-            with open(config_path, 'w') as f:
-                f.write(config)
-
-            model.save_model(model_path)
-
-    def __enter__(self):
-        self._create_root()
-        self._save_config()
-        self._save_models()
-        self.server = self._get_server().__enter__()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        res = self.server.__exit__(exc_type, exc_val, exc_tb)
-        if self.clean_folder:
-            self._clean_root()
-        return res
-
diff --git a/tests/external_models/catboost/helpers/table.py b/tests/external_models/catboost/helpers/table.py
deleted file mode 100644
index 5f9b828c9f3..00000000000
--- a/tests/external_models/catboost/helpers/table.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from .server import ClickHouseServer
-from .client import ClickHouseClient
-from pandas import DataFrame
-import os
-import threading
-import tempfile
-
-
-class ClickHouseTable:
-    def __init__(self, server, port, table_name, df):
-        self.server = server
-        self.port = port
-        self.table_name = table_name
-        self.df = df
-
-        if not isinstance(self.server, ClickHouseServer):
-            raise Exception('Expected ClickHouseServer, got ' + repr(self.server))
-        if not isinstance(self.df, DataFrame):
-            raise Exception('Expected DataFrame, got ' + repr(self.df))
-
-        self.server.wait_for_request(port)
-        self.client = ClickHouseClient(server.binary_path, port)
-
-    def _convert(self, name):
-        types_map = {
-            'float64': 'Float64',
-            'int64': 'Int64',
-            'float32': 'Float32',
-            'int32': 'Int32'
-        }
-
-        if name in types_map:
-            return types_map[name]
-        return 'String'
-
-    def _create_table_from_df(self):
-        self.client.query('create database if not exists test')
-        self.client.query('drop table if exists test.{}'.format(self.table_name))
-
-        column_types = list(self.df.dtypes)
-        column_names = list(self.df)
-        schema = ', '.join((name + ' ' + self._convert(str(t)) for name, t in zip(column_names, column_types)))
-        print('schema:', schema)
-
-        create_query = 'create table test.{} (date Date DEFAULT today(), {}) engine = MergeTree(date, (date), 8192)'
-        self.client.query(create_query.format(self.table_name, schema))
-
-        insert_query = 'insert into test.{} ({}) format CSV'
-
-        with tempfile.TemporaryFile() as tmp_file:
-            self.df.to_csv(tmp_file, header=False, index=False)
-            tmp_file.seek(0)
-            self.client.query(insert_query.format(self.table_name, ', '.join(column_names)), pipe=tmp_file)
-
-    def apply_model(self, model_name, float_columns, cat_columns):
-        columns = ', '.join(list(float_columns) + list(cat_columns))
-        query = "select modelEvaluate('{}', {}) from test.{} format TSV"
-        result = self.client.query(query.format(model_name, columns, self.table_name))
-
-        def parse_row(row):
-            values = tuple(map(float, list(filter(len, list(map(str.strip, row.replace('(', '').replace(')', '').split(',')))))))
-            return values if len(values) != 1 else values[0]
-
-        return tuple(map(parse_row, list(filter(len, list(map(str.strip, result.split('\n')))))))
-
-    def _drop_table(self):
-        self.client.query('drop table test.{}'.format(self.table_name))
-
-    def __enter__(self):
-        self._create_table_from_df()
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self._drop_table()
diff --git a/tests/external_models/catboost/helpers/train.py b/tests/external_models/catboost/helpers/train.py
deleted file mode 100644
index 34a6f8e958b..00000000000
--- a/tests/external_models/catboost/helpers/train.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import os
-import sys
-from pandas import DataFrame
-
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CATBOOST_ROOT = os.path.dirname(SCRIPT_DIR)
-CATBOOST_PYTHON_DIR = os.path.join(CATBOOST_ROOT, 'data', 'python-package')
-
-if CATBOOST_PYTHON_DIR not in sys.path:
-    sys.path.append(CATBOOST_PYTHON_DIR)
-
-
-import catboost
-from catboost import CatBoostClassifier
-
-
-def train_catboost_model(df, target, cat_features, params, verbose=True):
-
-    if not isinstance(df, DataFrame):
-        raise Exception('DataFrame object expected, but got ' + repr(df))
-
-    print('features:', df.columns.tolist())
-
-    cat_features_index = list(df.columns.get_loc(feature) for feature in cat_features)
-    print('cat features:', cat_features_index)
-    model = CatBoostClassifier(**params)
-    model.fit(df, target, cat_features=cat_features_index, verbose=verbose)
-    return model
diff --git a/tests/external_models/catboost/pytest.ini b/tests/external_models/catboost/pytest.ini
deleted file mode 100644
index a40472347fb..00000000000
--- a/tests/external_models/catboost/pytest.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pytest]
-python_files = test.py
-norecursedirs=data
diff --git a/tests/external_models/catboost/test_apply_catboost_model/test.py b/tests/external_models/catboost/test_apply_catboost_model/test.py
deleted file mode 100644
index d266393bf48..00000000000
--- a/tests/external_models/catboost/test_apply_catboost_model/test.py
+++ /dev/null
@@ -1,294 +0,0 @@
-from helpers.server_with_models import ClickHouseServerWithCatboostModels
-from helpers.generate import generate_uniform_string_column, generate_uniform_float_column, generate_uniform_int_column
-from helpers.train import train_catboost_model
-import os
-import numpy as np
-from pandas import DataFrame
-
-
-PORT = int(os.environ.get('CLICKHOUSE_TESTS_PORT', '9000'))
-CLICKHOUSE_TESTS_SERVER_BIN_PATH = os.environ.get('CLICKHOUSE_TESTS_SERVER_BIN_PATH', '/usr/bin/clickhouse')
-
-
-def add_noise_to_target(target, seed, threshold=0.05):
-    col = generate_uniform_float_column(len(target), 0., 1., seed + 1) < threshold
-    return target * (1 - col) + (1 - target) * col
-
-
-def check_predictions(test_name, target, pred_python, pred_ch, acc_threshold):
-    ch_class = pred_ch.astype(int)
-    python_class = pred_python.astype(int)
-    if not np.array_equal(ch_class, python_class):
-        raise Exception('Got different results:\npython:\n' + str(python_class) + '\nClickHouse:\n' + str(ch_class))
-
-    acc = 1 - np.sum(np.abs(ch_class - np.array(target))) / (len(target) + .0)
-    assert acc >= acc_threshold
-    print(test_name, 'accuracy: {:.10f}'.format(acc))
-
-
-def test_apply_float_features_only():
-
-    name = 'test_apply_float_features_only'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_float_column(size, 0., 1., seed + 3)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            return 1 if (row['a'] > .3 and row['b'] > .3) or (row['c'] < .4 and row['a'] * row['b'] > 0.1) else 0
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 4,
-        'depth': 2,
-        'learning_rate': 1,
-        'loss_function': 'Logloss'
-    }
-
-    model = train_catboost_model(train_df, train_target, [], params)
-    pred_python = model.predict(test_df)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = (np.array(server.apply_model(name, test_df, [])) > 0).astype(int)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
-
-
-def test_apply_float_features_with_string_cat_features():
-
-    name = 'test_apply_float_features_with_string_cat_features'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_string_column(size, ['a', 'b', 'c'], seed + 3),
-            'd': generate_uniform_string_column(size, ['e', 'f', 'g'], seed + 4)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            return 1 if (row['a'] > .3 and row['b'] > .3 and row['c'] != 'a') \
-                        or (row['a'] * row['b'] > 0.1 and row['c'] != 'b' and row['d'] != 'e') else 0
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 6,
-        'depth': 2,
-        'learning_rate': 1,
-        'loss_function': 'Logloss'
-    }
-
-    model = train_catboost_model(train_df, train_target, ['c', 'd'], params)
-    pred_python = model.predict(test_df)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = (np.array(server.apply_model(name, test_df, [])) > 0).astype(int)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
-
-
-def test_apply_float_features_with_int_cat_features():
-
-    name = 'test_apply_float_features_with_int_cat_features'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_int_column(size, 1, 4, seed + 3),
-            'd': generate_uniform_int_column(size, 1, 4, seed + 4)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            return 1 if (row['a'] > .3 and row['b'] > .3 and row['c'] != 1) \
-                        or (row['a'] * row['b'] > 0.1 and row['c'] != 2 and row['d'] != 3) else 0
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 6,
-        'depth': 4,
-        'learning_rate': 1,
-        'loss_function': 'Logloss'
-    }
-
-    model = train_catboost_model(train_df, train_target, ['c', 'd'], params)
-    pred_python = model.predict(test_df)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = (np.array(server.apply_model(name, test_df, [])) > 0).astype(int)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
-
-
-def test_apply_float_features_with_mixed_cat_features():
-
-    name = 'test_apply_float_features_with_mixed_cat_features'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_string_column(size, ['a', 'b', 'c'], seed + 3),
-            'd': generate_uniform_int_column(size, 1, 4, seed + 4)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            return 1 if (row['a'] > .3 and row['b'] > .3 and row['c'] != 'a') \
-                        or (row['a'] * row['b'] > 0.1 and row['c'] != 'b' and row['d'] != 2) else 0
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 6,
-        'depth': 4,
-        'learning_rate': 1,
-        'loss_function': 'Logloss'
-    }
-
-    model = train_catboost_model(train_df, train_target, ['c', 'd'], params)
-    pred_python = model.predict(test_df)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = (np.array(server.apply_model(name, test_df, [])) > 0).astype(int)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
-
-
-def test_apply_multiclass():
-
-    name = 'test_apply_float_features_with_mixed_cat_features'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_string_column(size, ['a', 'b', 'c'], seed + 3),
-            'd': generate_uniform_int_column(size, 1, 4, seed + 4)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            if row['a'] > .3 and row['b'] > .3 and row['c'] != 'a':
-                return 0
-            elif row['a'] * row['b'] > 0.1 and row['c'] != 'b' and row['d'] != 2:
-                return 1
-            else:
-                return 2
-
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 10,
-        'depth': 4,
-        'learning_rate': 1,
-        'loss_function': 'MultiClass'
-    }
-
-    model = train_catboost_model(train_df, train_target, ['c', 'd'], params)
-    pred_python = model.predict(test_df)[:,0].astype(int)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = np.argmax(np.array(server.apply_model(name, test_df, [])), axis=1)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
diff --git a/tests/integration/README.md b/tests/integration/README.md
index ed96eafdef8..1b1e7f3e052 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -66,7 +66,7 @@ For tests that use common docker compose files you may need to set up their path
 ### Running with runner script
 
 The only requirement is fresh configured docker and
-docker pull yandex/clickhouse-integration-tests-runner
+docker pull clickhouse/integration-tests-runner
 
 Notes:
 * If you want to run integration tests without `sudo` you have to add your user to docker group `sudo usermod -aG docker $USER`. [More information](https://docs.docker.com/install/linux/linux-postinstall/) about docker configuration.
@@ -122,7 +122,7 @@ You can just open shell inside a container by overwritting the command:
 The main container used for integration tests lives in `docker/test/integration/Dockerfile`. Rebuild it with
 ```
 cd docker/test/integration
-docker build -t yandex/clickhouse-integration-test .
+docker build -t clickhouse/integration-test .
 ```
 
 The helper container used by the `runner` script is in `docker/test/integration/runner/Dockerfile`.
diff --git a/tests/integration/ci-runner.py b/tests/integration/ci-runner.py
index bf7549a83c4..f17eb84e5f3 100755
--- a/tests/integration/ci-runner.py
+++ b/tests/integration/ci-runner.py
@@ -207,11 +207,11 @@ class ClickhouseIntegrationTestsRunner:
 
     @staticmethod
     def get_images_names():
-        return ["yandex/clickhouse-integration-tests-runner", "yandex/clickhouse-mysql-golang-client",
-                "yandex/clickhouse-mysql-java-client", "yandex/clickhouse-mysql-js-client",
-                "yandex/clickhouse-mysql-php-client", "yandex/clickhouse-postgresql-java-client",
-                "yandex/clickhouse-integration-test", "yandex/clickhouse-kerberos-kdc",
-                "yandex/clickhouse-integration-helper", ]
+        return ["clickhouse/integration-tests-runner", "clickhouse/mysql-golang-client",
+                "clickhouse/mysql-java-client", "clickhouse/mysql-js-client",
+                "clickhouse/mysql-php-client", "clickhouse/postgresql-java-client",
+                "clickhouse/integration-test", "clickhouse/kerberos-kdc",
+                "clickhouse/integration-helper", ]
 
 
     def _can_run_with(self, path, opt):
@@ -343,7 +343,7 @@ class ClickhouseIntegrationTestsRunner:
         image_cmd = ''
         if self._can_run_with(os.path.join(repo_path, "tests/integration", "runner"), '--docker-image-version'):
             for img in self.get_images_names():
-                if img == "yandex/clickhouse-integration-tests-runner":
+                if img == "clickhouse/integration-tests-runner":
                     runner_version = self.get_single_image_version()
                     logging.info("Can run with custom docker image version %s", runner_version)
                     image_cmd += ' --docker-image-version={} '.format(runner_version)
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 165e2175cf2..e56c0d4f3c2 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -532,7 +532,7 @@ class ClickHouseCluster:
             binary_path = binary_path[:-len('-server')]
 
         env_variables['keeper_binary'] = binary_path
-        env_variables['image'] = "yandex/clickhouse-integration-test:" + self.docker_base_tag
+        env_variables['image'] = "clickhouse/integration-test:" + self.docker_base_tag
         env_variables['user'] = str(os.getuid())
         env_variables['keeper_fs'] = 'bind'
         for i in range(1, 4):
@@ -757,10 +757,10 @@ class ClickHouseCluster:
                      with_odbc_drivers=False, with_postgres=False, with_postgres_cluster=False, with_hdfs=False,
                      with_kerberized_hdfs=False, with_mongo=False, with_mongo_secure=False, with_nginx=False,
                      with_redis=False, with_minio=False, with_cassandra=False, with_jdbc_bridge=False,
-                     hostname=None, env_variables=None, image="yandex/clickhouse-integration-test", tag=None,
+                     hostname=None, env_variables=None, image="clickhouse/integration-test", tag=None,
                      stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None,
                      zookeeper_docker_compose_path=None, minio_certs_dir=None, use_keeper=True,
-                     main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True):
+                     main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True, config_root_name="yandex"):
 
         """Add an instance to the cluster.
 
@@ -832,7 +832,8 @@ class ClickHouseCluster:
             main_config_name=main_config_name,
             users_config_name=users_config_name,
             copy_common_configs=copy_common_configs,
-            tmpfs=tmpfs or [])
+            tmpfs=tmpfs or [],
+            config_root_name=config_root_name)
 
         docker_compose_yml_dir = get_docker_compose_path()
 
@@ -1658,6 +1659,9 @@ class ClickHouseCluster:
 
                 if instance.contains_in_log("Fatal", from_host=True):
                     fatal_log = instance.grep_in_log("Fatal", from_host=True)
+                    if 'Child process was terminated by signal 9 (KILL)' in fatal_log:
+                        fatal_log = None
+                        continue
                     logging.error("Crash in instance %s fatal log %s", name, fatal_log)
 
             try:
@@ -1801,8 +1805,8 @@ class ClickHouseInstance:
             clickhouse_start_command=CLICKHOUSE_START_COMMAND,
             main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True,
             hostname=None, env_variables=None,
-            image="yandex/clickhouse-integration-test", tag="latest",
-            stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None):
+            image="clickhouse/integration-test", tag="latest",
+            stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None, config_root_name="yandex"):
 
         self.name = name
         self.base_cmd = cluster.base_cmd
@@ -1875,6 +1879,7 @@ class ClickHouseInstance:
         self.ipv6_address = ipv6_address
         self.with_installed_binary = with_installed_binary
         self.is_up = False
+        self.config_root_name = config_root_name
 
 
     def is_built_with_sanitizer(self, sanitizer_name=''):
@@ -2219,9 +2224,8 @@ class ClickHouseInstance:
             finally:
                 sock.close()
 
-    @staticmethod
-    def dict_to_xml(dictionary):
-        xml_str = dict2xml(dictionary, wrap="yandex", indent="  ", newlines=True)
+    def dict_to_xml(self, dictionary):
+        xml_str = dict2xml(dictionary, wrap=self.config_root_name, indent="  ", newlines=True)
         return xml_str
 
     @property
@@ -2304,15 +2308,22 @@ class ClickHouseInstance:
         dictionaries_dir = p.abspath(p.join(instance_config_dir, 'dictionaries'))
         os.mkdir(dictionaries_dir)
 
+        def write_embedded_config(name, dest_dir):
+            with open(p.join(HELPERS_DIR, name), 'r') as f:
+                data = f.read()
+                data = data.replace('yandex', self.config_root_name)
+                with open(p.join(dest_dir, name), 'w') as r:
+                    r.write(data)
 
         logging.debug("Copy common configuration from helpers")
         # The file is named with 0_ prefix to be processed before other configuration overloads.
         if self.copy_common_configs:
-            shutil.copy(p.join(HELPERS_DIR, '0_common_instance_config.xml'), self.config_d_dir)
+            write_embedded_config('0_common_instance_config.xml', self.config_d_dir)
+
+        write_embedded_config('0_common_instance_users.xml', users_d_dir)
 
-        shutil.copy(p.join(HELPERS_DIR, '0_common_instance_users.xml'), users_d_dir)
         if len(self.custom_dictionaries_paths):
-            shutil.copy(p.join(HELPERS_DIR, '0_common_enable_dictionaries.xml'), self.config_d_dir)
+            write_embedded_config('0_common_enable_dictionaries.xml', self.config_d_dir)
 
         logging.debug("Generate and write macros file")
         macros = self.macros.copy()
diff --git a/tests/integration/helpers/network.py b/tests/integration/helpers/network.py
index 040d49b992f..af0942c9b94 100644
--- a/tests/integration/helpers/network.py
+++ b/tests/integration/helpers/network.py
@@ -195,21 +195,21 @@ class _NetworkManager:
                         print("Error removing network blocade container, will try again", str(ex))
                         time.sleep(i)
 
-            image = subprocess.check_output("docker images -q yandex/clickhouse-integration-helper 2>/dev/null", shell=True)
+            image = subprocess.check_output("docker images -q clickhouse/integration-helper 2>/dev/null", shell=True)
             if not image.strip():
                 print("No network image helper, will try download")
                 # for some reason docker api may hang if image doesn't exist, so we download it
                 # before running
                 for i in range(5):
                     try:
-                        subprocess.check_call("docker pull yandex/clickhouse-integration-helper", shell=True)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+                        subprocess.check_call("docker pull clickhouse/integration-helper", shell=True)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
                         break
                     except:
                         time.sleep(i)
                 else:
-                    raise Exception("Cannot pull yandex/clickhouse-integration-helper image")
+                    raise Exception("Cannot pull clickhouse/integration-helper image")
 
-            self._container = self._docker_client.containers.run('yandex/clickhouse-integration-helper',
+            self._container = self._docker_client.containers.run('clickhouse/integration-helper',
                                                                  auto_remove=True,
                                                                  command=('sleep %s' % self.container_exit_timeout),
                                                                  detach=True, network_mode='host')
diff --git a/tests/integration/runner b/tests/integration/runner
index 2143d7ebf29..3ff982a9913 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -19,7 +19,7 @@ CONFIG_DIR_IN_REPO = "programs/server"
 INTERGATION_DIR_IN_REPO = "tests/integration"
 SRC_DIR_IN_REPO = "src"
 
-DIND_INTEGRATION_TESTS_IMAGE_NAME = "yandex/clickhouse-integration-tests-runner"
+DIND_INTEGRATION_TESTS_IMAGE_NAME = "clickhouse/integration-tests-runner"
 
 def check_args_and_update_paths(args):
     if args.clickhouse_root:
@@ -225,19 +225,19 @@ if __name__ == "__main__":
     if args.docker_compose_images_tags is not None:
         for img_tag in args.docker_compose_images_tags:
             [image, tag] = img_tag.split(":")
-            if image == "yandex/clickhouse-mysql-golang-client":
+            if image == "clickhouse/mysql-golang-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_GOLANG_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-java-client":
+            elif image == "clickhouse/mysql-java-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_JAVA_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-js-client":
+            elif image == "clickhouse/mysql-js-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_JS_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-php-client":
+            elif image == "clickhouse/mysql-php-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_PHP_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-postgresql-java-client":
+            elif image == "clickhouse/postgresql-java-client":
                 env_tags += "-e {}={} ".format("DOCKER_POSTGRESQL_JAVA_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-integration-test":
+            elif image == "clickhouse/integration-test":
                 env_tags += "-e {}={} ".format("DOCKER_BASE_TAG", tag)
-            elif image == "yandex/clickhouse-kerberos-kdc":
+            elif image == "clickhouse/kerberos-kdc":
                 env_tags += "-e {}={}".format("DOCKER_KERBEROS_KDC_TAG", tag)
             else:
                 logging.info("Unknown image %s" % (image))
diff --git a/tests/integration/test_MemoryTracking/configs/no_system_log.xml b/tests/integration/test_MemoryTracking/configs/no_system_log.xml
index 7e235458d39..e9b98fb6f0e 100644
--- a/tests/integration/test_MemoryTracking/configs/no_system_log.xml
+++ b/tests/integration/test_MemoryTracking/configs/no_system_log.xml
@@ -1,7 +1,17 @@
 <yandex>
-    <metric_log remove="remove"/>
     <query_masking_rules remove="remove"/>
+
     <query_thread_log remove="remove"/>
+    <query_log remove="remove" />
+    <query_views_log remove="remove" />
+    <metric_log remove="remove"/>
     <text_log remove="remove"/>
     <trace_log remove="remove"/>
+    <asynchronous_metric_log remove="remove" />
+    <session_log remove="remove" />
+    <part_log remove="remove" />
+    <crash_log remove="remove" />
+    <opentelemetry_span_log remove="remove" />
+    <!-- just in case it will be enabled by default -->
+    <zookeeper_log remove="remove" />
 </yandex>
diff --git a/tests/integration/test_MemoryTracking/configs/users.d/overrides.xml b/tests/integration/test_MemoryTracking/configs/users.d/overrides.xml
new file mode 100644
index 00000000000..4cc9c058193
--- /dev/null
+++ b/tests/integration/test_MemoryTracking/configs/users.d/overrides.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <profiles>
+        <default>
+            <query_profiler_real_time_period_ns>0</query_profiler_real_time_period_ns>
+            <query_profiler_cpu_time_period_ns>0</query_profiler_cpu_time_period_ns>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_MemoryTracking/test.py b/tests/integration/test_MemoryTracking/test.py
index 1ee528eaa8d..59b30b8f08b 100644
--- a/tests/integration/test_MemoryTracking/test.py
+++ b/tests/integration/test_MemoryTracking/test.py
@@ -11,6 +11,8 @@ cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance('node', main_configs=[
     'configs/no_system_log.xml',
     'configs/asynchronous_metrics_update_period_s.xml',
+], user_configs=[
+    'configs/users.d/overrides.xml',
 ])
 
 @pytest.fixture(scope='module', autouse=True)
@@ -23,8 +25,6 @@ def start_cluster():
 
 query_settings = {
     'max_threads': 1,
-    'query_profiler_real_time_period_ns': 0,
-    'query_profiler_cpu_time_period_ns': 0,
     'log_queries': 0,
 }
 sample_query = "SELECT groupArray(repeat('a', 1000)) FROM numbers(10000) GROUP BY number%10 FORMAT JSON"
diff --git a/tests/external_models/catboost/helpers/__init__.py b/tests/integration/test_codec_encrypted/__init__.py
similarity index 100%
rename from tests/external_models/catboost/helpers/__init__.py
rename to tests/integration/test_codec_encrypted/__init__.py
diff --git a/tests/integration/test_codec_encrypted/test.py b/tests/integration/test_codec_encrypted/test.py
new file mode 100644
index 00000000000..5d47948ac3c
--- /dev/null
+++ b/tests/integration/test_codec_encrypted/test.py
@@ -0,0 +1,73 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
+from helpers.test_tools import assert_eq_with_retry
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance('node')
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def make_storage_with_key(id):
+        node.exec_in_container(["bash", "-c" , """cat > /etc/clickhouse-server/config.d/storage_keys_config.xml << EOF
+<?xml version="1.0"?>
+<yandex>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key_hex id="0">83e84e9a4eb11535c0670dc62d808ee0</key_hex>
+            <key id="1">abcdefghijklmnop</key>
+            <current_key_id>{cur_id}</current_key_id>
+        </aes_128_gcm_siv>
+        <aes_256_gcm_siv>
+            <key_hex id="0">83e84e9a4eb11535c0670dc62d808ee083e84e9a4eb11535c0670dc62d808ee0</key_hex>
+            <key id="1">abcdefghijklmnopabcdefghijklmnop</key>
+            <current_key_id>{cur_id}</current_key_id>
+        </aes_256_gcm_siv>
+    </encryption_codecs>
+</yandex>
+EOF""".format(cur_id=id)])
+        node.query("SYSTEM RELOAD CONFIG")
+
+def test_different_keys(start_cluster):
+    make_storage_with_key(0)
+    node.query("""
+        CREATE TABLE encrypted_test_128 (
+            id Int64,
+            data String Codec(AES_128_GCM_SIV)
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        """)
+
+    node.query("""
+        CREATE TABLE encrypted_test_256 (
+            id Int64,
+            data String Codec(AES_256_GCM_SIV)
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        """)
+    
+    node.query("INSERT INTO encrypted_test_128 VALUES (0,'data'),(1,'data')")
+    select_query = "SELECT * FROM encrypted_test_128 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+    make_storage_with_key(1)
+    node.query("INSERT INTO encrypted_test_128 VALUES (3,'text'),(4,'text')")
+    select_query = "SELECT * FROM encrypted_test_128 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data'),(3,'text'),(4,'text')"
+
+    node.query("INSERT INTO encrypted_test_256 VALUES (0,'data'),(1,'data')")
+    select_query = "SELECT * FROM encrypted_test_256 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+    make_storage_with_key(1)
+    node.query("INSERT INTO encrypted_test_256 VALUES (3,'text'),(4,'text')")
+    select_query = "SELECT * FROM encrypted_test_256 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data'),(3,'text'),(4,'text')"
diff --git a/tests/integration/test_concurrent_ttl_merges/test.py b/tests/integration/test_concurrent_ttl_merges/test.py
index efa93220d55..3e25398d633 100644
--- a/tests/integration/test_concurrent_ttl_merges/test.py
+++ b/tests/integration/test_concurrent_ttl_merges/test.py
@@ -140,7 +140,6 @@ def test_limited_ttl_merges_in_empty_pool_replicated(started_cluster):
 
 def test_limited_ttl_merges_two_replicas(started_cluster):
     # Actually this test quite fast and often we cannot catch any merges.
-    # To check for sure just add some sleeps in mergePartsToTemporaryPart
     node1.query("DROP TABLE IF EXISTS replicated_ttl_2")
     node2.query("DROP TABLE IF EXISTS replicated_ttl_2")
 
diff --git a/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml b/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
index d8ead517c86..a83e775e504 100644
--- a/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
+++ b/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
@@ -2,6 +2,6 @@ user_directories:
   users_xml:
     path: users.xml
   local_directory:
-    path: access/
+    path: /var/lib/clickhouse/access/
   "@replace": replace
 
diff --git a/tests/integration/test_config_xml_main/configs/config.d/path.yaml b/tests/integration/test_config_xml_main/configs/config.d/path.yaml
index 3e26e8906ee..7fd5b1a0478 100644
--- a/tests/integration/test_config_xml_main/configs/config.d/path.yaml
+++ b/tests/integration/test_config_xml_main/configs/config.d/path.yaml
@@ -1,18 +1,18 @@
 path:
-  - ./
+  - /var/lib/clickhouse
   - "@replace": replace
 tmp_path:
-  - ./tmp/
+  - /var/lib/clickhouse/tmp/
   - "@replace": replace
 user_files_path:
-  - ./user_files/
+  - /var/lib/clickhouse/user_files/
   - "@replace": replace
 format_schema_path:
-  - ./format_schemas/
+  - /var/lib/clickhouse/format_schemas/
   - "@replace": replace
 access_control_path:
-  - ./access/
+  - /var/lib/clickhouse/access/
   - "@replace": replace
 top_level_domains_path:
-  - ./top_level_domains/
+  - /var/lib/clickhouse/top_level_domains/
   - "@replace": replace
diff --git a/tests/integration/test_config_xml_main/configs/config.xml b/tests/integration/test_config_xml_main/configs/config.xml
index 3b5dab50ffe..a2c69c34e0a 100644
--- a/tests/integration/test_config_xml_main/configs/config.xml
+++ b/tests/integration/test_config_xml_main/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -64,10 +64,10 @@
 
     <mmap_cache_size>1000</mmap_cache_size>
 
-    <path>/var/lib/clickhouse/</path>
+    <path>./</path>
 
-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+    <tmp_path>./tmp/</tmp_path>
+    <user_files_path>./user_files/</user_files_path>
     <ldap_servers>
     </ldap_servers>
     <user_directories>
@@ -274,4 +274,4 @@
         <anonymize>false</anonymize>
         <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
     </send_crash_reports>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_main/configs/embedded.xml b/tests/integration/test_config_xml_main/configs/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/tests/integration/test_config_xml_main/configs/embedded.xml
+++ b/tests/integration/test_config_xml_main/configs/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_main/configs/users.xml b/tests/integration/test_config_xml_main/configs/users.xml
index b473413bdfa..ac785c12577 100644
--- a/tests/integration/test_config_xml_main/configs/users.xml
+++ b/tests/integration/test_config_xml_main/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -16,4 +16,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_main/test.py b/tests/integration/test_config_xml_main/test.py
index 052f9adb01f..11efb5e283c 100644
--- a/tests/integration/test_config_xml_main/test.py
+++ b/tests/integration/test_config_xml_main/test.py
@@ -32,7 +32,7 @@ def test_xml_main_conf():
     all_userd = ['configs/users.d/allow_introspection_functions.yaml',
                 'configs/users.d/log_queries.yaml']
 
-    node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False)
+    node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False, config_root_name='clickhouse')
 
     try:
         cluster.start()
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
index ce2e23839ef..90a0a0ac3fb 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
@@ -2,6 +2,6 @@ user_directories:
   users_xml:
     path: users.yaml
   local_directory:
-    path: access/
+    path: /var/lib/clickhouse/access/
   "@replace": replace
 
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
index b21df47bc85..cee4d338231 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -20,4 +20,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
index 2c34585437b..e541c39aff4 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <logger>
         <!-- Disable rotation
              https://pocoproject.org/docs/Poco.FileChannel.html
         -->
         <size>never</size>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
index 0ca9f162416..ea829d15975 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <metric_log>
         <database>system</database>
         <table>metric_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
         <collect_interval_milliseconds>1000</collect_interval_milliseconds>
     </metric_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
index 6c6fc9c6982..ce9847a49fb 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <part_log>
         <database>system</database>
         <table>part_log</table>
 
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
index 3e26e8906ee..7fd5b1a0478 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
@@ -1,18 +1,18 @@
 path:
-  - ./
+  - /var/lib/clickhouse
   - "@replace": replace
 tmp_path:
-  - ./tmp/
+  - /var/lib/clickhouse/tmp/
   - "@replace": replace
 user_files_path:
-  - ./user_files/
+  - /var/lib/clickhouse/user_files/
   - "@replace": replace
 format_schema_path:
-  - ./format_schemas/
+  - /var/lib/clickhouse/format_schemas/
   - "@replace": replace
 access_control_path:
-  - ./access/
+  - /var/lib/clickhouse/access/
   - "@replace": replace
 top_level_domains_path:
-  - ./top_level_domains/
+  - /var/lib/clickhouse/top_level_domains/
   - "@replace": replace
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
index 5a854848f3d..690d62b9a2b 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- Config for test server -->
-<yandex>
+<clickhouse>
     <query_masking_rules>
         <rule>
             <regexp>TOPSECRET.TOPSECRET</regexp>
             <replace>[hidden]</replace>
         </rule>
     </query_masking_rules>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
index 109e35afc37..a5033abf154 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster_with_incorrect_pw>
              <shard>
@@ -18,4 +18,4 @@
              </shard>
          </test_cluster_with_incorrect_pw>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
index 06ed7fcd39f..4fa529a6180 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>localhost</host>
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
index e6a2b6d5324..660e8d7937d 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -64,10 +64,10 @@
 
     <mmap_cache_size>1000</mmap_cache_size>
 
-    <path>/var/lib/clickhouse/</path>
+    <path>./</path>
 
-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+    <tmp_path>./tmp/</tmp_path>
+    <user_files_path>./user_files/</user_files_path>
     <ldap_servers>
     </ldap_servers>
     <user_directories>
@@ -274,4 +274,4 @@
         <anonymize>false</anonymize>
         <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
     </send_crash_reports>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
index b94e95bc043..cfde1b4525d 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_introspection_functions>1</allow_introspection_functions>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/test.py b/tests/integration/test_config_xml_yaml_mix/test.py
index 90ee8a2dea5..86cd68b3378 100644
--- a/tests/integration/test_config_xml_yaml_mix/test.py
+++ b/tests/integration/test_config_xml_yaml_mix/test.py
@@ -32,7 +32,7 @@ def test_extra_yaml_mix():
                 'configs/users.d/log_queries.yaml']
 
     node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False,
-    users_config_name="users.yaml", copy_common_configs=False)
+                                users_config_name="users.yaml", copy_common_configs=False, config_root_name="clickhouse")
 
     try:
         cluster.start()
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml b/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml
index ce2e23839ef..90a0a0ac3fb 100644
--- a/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml
@@ -2,6 +2,6 @@ user_directories:
   users_xml:
     path: users.yaml
   local_directory:
-    path: access/
+    path: /var/lib/clickhouse/access/
   "@replace": replace
 
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/path.yaml b/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
index 3e26e8906ee..7fd5b1a0478 100644
--- a/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
@@ -1,18 +1,18 @@
 path:
-  - ./
+  - /var/lib/clickhouse
   - "@replace": replace
 tmp_path:
-  - ./tmp/
+  - /var/lib/clickhouse/tmp/
   - "@replace": replace
 user_files_path:
-  - ./user_files/
+  - /var/lib/clickhouse/user_files/
   - "@replace": replace
 format_schema_path:
-  - ./format_schemas/
+  - /var/lib/clickhouse/format_schemas/
   - "@replace": replace
 access_control_path:
-  - ./access/
+  - /var/lib/clickhouse/access/
   - "@replace": replace
 top_level_domains_path:
-  - ./top_level_domains/
+  - /var/lib/clickhouse/top_level_domains/
   - "@replace": replace
diff --git a/tests/integration/test_config_yaml_full/configs/config.yaml b/tests/integration/test_config_yaml_full/configs/config.yaml
index 619a3735269..5958d463d21 100644
--- a/tests/integration/test_config_yaml_full/configs/config.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.yaml
@@ -48,9 +48,9 @@ total_memory_tracker_sample_probability: 0
 uncompressed_cache_size: 8589934592
 mark_cache_size: 5368709120
 mmap_cache_size: 1000
-path: /var/lib/clickhouse/
-tmp_path: /var/lib/clickhouse/tmp/
-user_files_path: /var/lib/clickhouse/user_files/
+path: ./
+tmp_path: ./tmp
+user_files_path: ./user_files/
 ldap_servers: ''
 user_directories:
   users_xml:
diff --git a/tests/integration/test_config_yaml_full/test.py b/tests/integration/test_config_yaml_full/test.py
index bc4fa40384c..e8bf21754e0 100644
--- a/tests/integration/test_config_yaml_full/test.py
+++ b/tests/integration/test_config_yaml_full/test.py
@@ -31,7 +31,7 @@ def test_yaml_full_conf():
                 'configs/users.d/log_queries.yaml']
 
     node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd,
-                                with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml", copy_common_configs=False)
+                                with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml", copy_common_configs=False, config_root_name="clickhouse")
 
     try:
         cluster.start()
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml b/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
index b61f89bd904..7b2815b5ce9 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
     <user_directories replace="replace">
         <users_xml>
@@ -7,7 +7,7 @@
         </users_xml>
         <local_directory>
             <!-- Path to folder where users created by SQL commands are stored. -->
-            <path>access/</path>
+            <path>/var/lib/clickhouse/access/</path>
         </local_directory>
     </user_directories>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml b/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
index b21df47bc85..cee4d338231 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -20,4 +20,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml b/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
index 227c53647f3..70d2f014380 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <logger>
         <console>true</console>
         <log remove="remove"/>
         <errorlog remove="remove"/>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml b/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
index 2c34585437b..e541c39aff4 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <logger>
         <!-- Disable rotation
              https://pocoproject.org/docs/Poco.FileChannel.html
         -->
         <size>never</size>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/macros.xml b/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
index 4902b12bc81..657082fe8ae 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <macros>
         <test>Hello, world!</test>
         <shard>s1</shard>
@@ -6,4 +6,4 @@
         <default_path_test>/clickhouse/tables/{database}/{shard}/</default_path_test>
         <default_name_test>table_{table}</default_name_test>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml b/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
index 0ca9f162416..ea829d15975 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <metric_log>
         <database>system</database>
         <table>metric_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
         <collect_interval_milliseconds>1000</collect_interval_milliseconds>
     </metric_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml b/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
index aecbf9e0ba7..ce88408876f 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
 
         <![CDATA[
@@ -46,4 +46,4 @@
         </two_shards_one_local_one_remote_at_port_9001>
 
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml b/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
index 6c6fc9c6982..ce9847a49fb 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <part_log>
         <database>system</database>
         <table>part_log</table>
 
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/path.xml b/tests/integration/test_config_yaml_main/configs/config.d/path.xml
index 466ed0d1663..25d8f6780d2 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/path.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/path.xml
@@ -1,8 +1,8 @@
-<yandex>
-    <path replace="replace">./</path>
-    <tmp_path replace="replace">./tmp/</tmp_path>
-    <user_files_path replace="replace">./user_files/</user_files_path>
-    <format_schema_path replace="replace">./format_schemas/</format_schema_path>
-    <access_control_path replace="replace">./access/</access_control_path>
-    <top_level_domains_path replace="replace">./top_level_domains/</top_level_domains_path>
-</yandex>
+<clickhouse>
+    <path replace="replace">/var/lib/clickhouse</path>
+    <tmp_path replace="replace">/var/lib/clickhouse/tmp/</tmp_path>
+    <user_files_path replace="replace">/var/lib/clickhouse/user_files/</user_files_path>
+    <format_schema_path replace="replace">/var/lib/clickhouse/format_schemas/</format_schema_path>
+    <access_control_path replace="replace">/var/lib/clickhouse/access/</access_control_path>
+    <top_level_domains_path replace="replace">/var/lib/clickhouse/top_level_domains/</top_level_domains_path>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml b/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
index 5a854848f3d..690d62b9a2b 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- Config for test server -->
-<yandex>
+<clickhouse>
     <query_masking_rules>
         <rule>
             <regexp>TOPSECRET.TOPSECRET</regexp>
             <replace>[hidden]</replace>
         </rule>
     </query_masking_rules>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml b/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
index 19046054c16..733eb2370ca 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <tcp_with_proxy_port>9010</tcp_with_proxy_port>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml b/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
index 109e35afc37..a5033abf154 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster_with_incorrect_pw>
              <shard>
@@ -18,4 +18,4 @@
              </shard>
          </test_cluster_with_incorrect_pw>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml b/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
index 3699a23578c..dce4942d952 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <text_log>
         <database>system</database>
         <table>text_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </text_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml b/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
index 06ed7fcd39f..4fa529a6180 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>localhost</host>
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.yaml b/tests/integration/test_config_yaml_main/configs/config.yaml
index e5a36b1e49b..65cbb4b3e81 100644
--- a/tests/integration/test_config_yaml_main/configs/config.yaml
+++ b/tests/integration/test_config_yaml_main/configs/config.yaml
@@ -48,9 +48,9 @@ total_memory_tracker_sample_probability: 0
 uncompressed_cache_size: 8589934592
 mark_cache_size: 5368709120
 mmap_cache_size: 1000
-path: /var/lib/clickhouse/
-tmp_path: /var/lib/clickhouse/tmp/
-user_files_path: /var/lib/clickhouse/user_files/
+path: ./
+tmp_path: ./tmp/
+user_files_path: ./user_files/
 ldap_servers: ''
 user_directories:
   users_xml:
diff --git a/tests/integration/test_config_yaml_main/configs/embedded.xml b/tests/integration/test_config_yaml_main/configs/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/tests/integration/test_config_yaml_main/configs/embedded.xml
+++ b/tests/integration/test_config_yaml_main/configs/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
index b94e95bc043..cfde1b4525d 100644
--- a/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
+++ b/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_introspection_functions>1</allow_introspection_functions>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml b/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
index 25261072ade..755c5478463 100644
--- a/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
+++ b/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <log_queries>1</log_queries>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/test.py b/tests/integration/test_config_yaml_main/test.py
index f4de16c35a2..bb4c8eb8f9f 100644
--- a/tests/integration/test_config_yaml_main/test.py
+++ b/tests/integration/test_config_yaml_main/test.py
@@ -32,7 +32,8 @@ def test_yaml_main_conf():
                 'configs/users.d/log_queries.xml']
 
     node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd,
-    with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml", copy_common_configs=False)
+                                with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml",
+                                copy_common_configs=False, config_root_name="clickhouse")
 
     try:
         cluster.start()
diff --git a/tests/integration/test_dictionaries_dependency_xml/test.py b/tests/integration/test_dictionaries_dependency_xml/test.py
index cfd7d58d574..849fdf57980 100644
--- a/tests/integration/test_dictionaries_dependency_xml/test.py
+++ b/tests/integration/test_dictionaries_dependency_xml/test.py
@@ -6,7 +6,7 @@ DICTIONARY_FILES = ['configs/dictionaries/dep_x.xml', 'configs/dictionaries/dep_
                     'configs/dictionaries/dep_z.xml']
 
 cluster = ClickHouseCluster(__file__)
-instance = cluster.add_instance('instance', dictionaries=DICTIONARY_FILES)
+instance = cluster.add_instance('instance', dictionaries=DICTIONARY_FILES, stay_alive=True)
 
 
 @pytest.fixture(scope="module")
@@ -73,3 +73,45 @@ def test_get_data(started_cluster):
     assert query("SELECT dictGetString('dep_x', 'a', toUInt64(4))") == "ether\n"
     assert query("SELECT dictGetString('dep_y', 'a', toUInt64(4))") == "ether\n"
     assert query("SELECT dictGetString('dep_z', 'a', toUInt64(4))") == "ether\n"
+
+def dependent_tables_assert():
+    res = instance.query("select database || '.' || name from system.tables")
+    assert "system.join" in res
+    assert "default.src" in res
+    assert "dict.dep_y" in res
+    assert "lazy.log" in res
+    assert "test.d" in res
+    assert "default.join" in res
+    assert "a.t" in res
+
+def test_dependent_tables(started_cluster):
+    query = instance.query
+    query("create database lazy engine=Lazy(10)")
+    query("create database a")
+    query("create table lazy.src (n int, m int) engine=Log")
+    query("create dictionary a.d (n int default 0, m int default 42) primary key n "
+          "source(clickhouse(host 'localhost' port tcpPort() user 'default' table 'src' password '' db 'lazy'))"
+          "lifetime(min 1 max 10) layout(flat())")
+    query("create table system.join (n int, m int) engine=Join(any, left, n)")
+    query("insert into system.join values (1, 1)")
+    query("create table src (n int, m default joinGet('system.join', 'm', 1::int),"
+                                   "t default dictGetOrNull('a.d', 'm', toUInt64(3)),"
+                                   "k default dictGet('a.d', 'm', toUInt64(4))) engine=MergeTree order by n")
+    query("create dictionary test.d (n int default 0, m int default 42) primary key n "
+          "source(clickhouse(host 'localhost' port tcpPort() user 'default' table 'src' password '' db 'default'))"
+          "lifetime(min 1 max 10) layout(flat())")
+    query("create table join (n int, m default dictGet('a.d', 'm', toUInt64(3)),"
+                                    "k default dictGet('test.d', 'm', toUInt64(0))) engine=Join(any, left, n)")
+    query("create table lazy.log (n default dictGet(test.d, 'm', toUInt64(0))) engine=Log")
+    query("create table a.t (n default joinGet('system.join', 'm', 1::int),"
+                            "m default dictGet('test.d', 'm', toUInt64(3)),"
+                            "k default joinGet(join, 'm', 1::int)) engine=MergeTree order by n")
+
+    dependent_tables_assert()
+    instance.restart_clickhouse()
+    dependent_tables_assert()
+    query("drop database a")
+    query("drop database lazy")
+    query("drop table src")
+    query("drop table join")
+    query("drop table system.join")
diff --git a/tests/integration/test_dictionaries_mysql/configs/named_collections.xml b/tests/integration/test_dictionaries_mysql/configs/named_collections.xml
new file mode 100644
index 00000000000..0b591579247
--- /dev/null
+++ b/tests/integration/test_dictionaries_mysql/configs/named_collections.xml
@@ -0,0 +1,25 @@
+<yandex>
+    <named_collections>
+        <mysql1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>3306</port>
+            <database>test</database>
+            <table>test_table</table>
+        </mysql1>
+        <mysql2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </mysql2>
+        <mysql3>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>1111</port>
+            <database>test</database>
+            <table>test_table</table>
+        </mysql3>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_dictionaries_mysql/test.py b/tests/integration/test_dictionaries_mysql/test.py
index fa3855d1e16..c1819923523 100644
--- a/tests/integration/test_dictionaries_mysql/test.py
+++ b/tests/integration/test_dictionaries_mysql/test.py
@@ -7,7 +7,7 @@ import time
 import logging
 
 DICTS = ['configs/dictionaries/mysql_dict1.xml', 'configs/dictionaries/mysql_dict2.xml']
-CONFIG_FILES = ['configs/remote_servers.xml']
+CONFIG_FILES = ['configs/remote_servers.xml', 'configs/named_collections.xml']
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance('instance', main_configs=CONFIG_FILES, with_mysql=True, dictionaries=DICTS)
 
@@ -157,6 +157,55 @@ def test_mysql_dictionaries_custom_query_partial_load_complex_key(started_cluste
     execute_mysql_query(mysql_connection, "DROP TABLE test.test_table_2;")
 
 
+def test_predefined_connection_configuration(started_cluster):
+    mysql_connection = get_mysql_conn(started_cluster)
+
+    execute_mysql_query(mysql_connection, "DROP TABLE IF EXISTS test.test_table")
+    execute_mysql_query(mysql_connection, "CREATE TABLE IF NOT EXISTS test.test_table (id Integer, value Integer);")
+    execute_mysql_query(mysql_connection, "INSERT INTO test.test_table VALUES (100, 200);")
+
+    instance.query('''
+    DROP DICTIONARY IF EXISTS dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME mysql1))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = instance.query("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+    assert(int(result) == 200)
+
+    instance.query('''
+    DROP DICTIONARY dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME mysql2))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = instance.query_and_get_error("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+    instance.query('''
+    DROP DICTIONARY dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME unknown_collection))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = instance.query_and_get_error("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+
+    instance.query('''
+    DROP DICTIONARY dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME mysql3 PORT 3306))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = instance.query("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+    assert(int(result) == 200)
+
+
 def create_mysql_db(mysql_connection, name):
     with mysql_connection.cursor() as cursor:
         cursor.execute("DROP DATABASE IF EXISTS {}".format(name))
diff --git a/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml b/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml
new file mode 100644
index 00000000000..676cab2087d
--- /dev/null
+++ b/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml
@@ -0,0 +1,34 @@
+<yandex>
+    <named_collections>
+        <postgres1>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+        </postgres1>
+        <postgres2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+            <schema>test_schema</schema>
+        </postgres2>
+        <postgres3>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>1111</port>
+            <database>postgres</database>
+            <table>test_table</table>
+        </postgres3>
+        <postgres4>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </postgres4>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_dictionaries_postgresql/test.py b/tests/integration/test_dictionaries_postgresql/test.py
index 58a503bd571..8869e9112d1 100644
--- a/tests/integration/test_dictionaries_postgresql/test.py
+++ b/tests/integration/test_dictionaries_postgresql/test.py
@@ -8,7 +8,7 @@ from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1',
-                             main_configs=['configs/config.xml', 'configs/dictionaries/postgres_dict.xml'],
+                             main_configs=['configs/config.xml', 'configs/dictionaries/postgres_dict.xml', 'configs/named_collections.xml'],
                              with_postgres=True, with_postgres_cluster=True)
 
 postgres_dict_table_template = """
@@ -302,6 +302,73 @@ def test_postgres_schema(started_cluster):
     node1.query("DROP DICTIONARY IF EXISTS postgres_dict")
 
 
+def test_predefined_connection_configuration(started_cluster):
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip, port=started_cluster.postgres_port, database=True)
+    cursor = conn.cursor()
+
+    cursor.execute('DROP TABLE IF EXISTS test_table')
+    cursor.execute('CREATE TABLE test_table (id integer, value integer)')
+    cursor.execute('INSERT INTO test_table SELECT i, i FROM generate_series(0, 99) as t(i)')
+
+    node1.query('''
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres1))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 99)
+
+    cursor.execute('DROP SCHEMA IF EXISTS test_schema CASCADE')
+    cursor.execute('CREATE SCHEMA test_schema')
+    cursor.execute('CREATE TABLE test_schema.test_table (id integer, value integer)')
+    cursor.execute('INSERT INTO test_schema.test_table SELECT i, 100 FROM generate_series(0, 99) as t(i)')
+
+    node1.query('''
+    DROP DICTIONARY postgres_dict;
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres1 SCHEMA test_schema))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 100)
+
+    node1.query('''
+    DROP DICTIONARY postgres_dict;
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres2))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 100)
+
+    node1.query('DROP DICTIONARY postgres_dict')
+    node1.query('''
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres4))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query_and_get_error("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+
+    node1.query('''
+    DROP DICTIONARY postgres_dict;
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres1 PORT 5432))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 99)
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
index c074b078dad..8fad4d40483 100644
--- a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
+++ b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
@@ -5,7 +5,6 @@
             <web>
                 <type>web</type>
                 <endpoint>http://nginx:80/test1/</endpoint>
-                <files_prefix>data</files_prefix>
             </web>
         </disks>
         <policies>
diff --git a/tests/integration/test_disk_over_web_server/test.py b/tests/integration/test_disk_over_web_server/test.py
index 78e50dee1bf..b8629fdbe9e 100644
--- a/tests/integration/test_disk_over_web_server/test.py
+++ b/tests/integration/test_disk_over_web_server/test.py
@@ -26,7 +26,7 @@ def cluster():
             print(f'Metadata: {metadata_path}')
 
             node1.exec_in_container(['bash', '-c',
-                                    '/usr/bin/clickhouse static-files-disk-uploader --test-mode --files-prefix data --url http://nginx:80/test1 --metadata-path {}'.format(metadata_path)], user='root')
+                                    '/usr/bin/clickhouse static-files-disk-uploader --test-mode --url http://nginx:80/test1 --metadata-path {}'.format(metadata_path)], user='root')
             parts = metadata_path.split('/')
             uuids.append(parts[3])
             print(f'UUID: {parts[3]}')
diff --git a/tests/integration/test_distributed_load_balancing/test.py b/tests/integration/test_distributed_load_balancing/test.py
index d3ac5c132cd..8a1c282eff2 100644
--- a/tests/integration/test_distributed_load_balancing/test.py
+++ b/tests/integration/test_distributed_load_balancing/test.py
@@ -14,7 +14,7 @@ n2 = cluster.add_instance('n2', main_configs=['configs/remote_servers.xml'])
 n3 = cluster.add_instance('n3', main_configs=['configs/remote_servers.xml'])
 
 nodes = len(cluster.instances)
-queries = nodes * 5
+queries = nodes * 10
 
 
 def bootstrap():
@@ -43,21 +43,21 @@ def bootstrap():
             replicas_cluster,
             currentDatabase(),
             data)
-        """.format())
+        """)
         n.query("""
         CREATE TABLE dist_priority AS data
         Engine=Distributed(
             replicas_priority_cluster,
             currentDatabase(),
             data)
-        """.format())
+        """)
         n.query("""
         CREATE TABLE dist_priority_negative AS data
         Engine=Distributed(
             replicas_priority_negative_cluster,
             currentDatabase(),
             data)
-        """.format())
+        """)
 
 
 def make_uuid():
diff --git a/tests/integration/test_grant_and_revoke/test.py b/tests/integration/test_grant_and_revoke/test.py
index 79fe4bf9f41..b905e4df219 100644
--- a/tests/integration/test_grant_and_revoke/test.py
+++ b/tests/integration/test_grant_and_revoke/test.py
@@ -151,7 +151,7 @@ def test_grant_all_on_table():
     instance.query("GRANT ALL ON test.table TO A WITH GRANT OPTION")
     instance.query("GRANT ALL ON test.table TO B", user='A')
     assert instance.query(
-        "SHOW GRANTS FOR B") == "GRANT SHOW TABLES, SHOW COLUMNS, SHOW DICTIONARIES, SELECT, INSERT, ALTER, CREATE TABLE, CREATE VIEW, CREATE DICTIONARY, DROP TABLE, DROP VIEW, DROP DICTIONARY, TRUNCATE, OPTIMIZE, SYSTEM MERGES, SYSTEM TTL MERGES, SYSTEM FETCHES, SYSTEM MOVES, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM DROP REPLICA, SYSTEM SYNC REPLICA, SYSTEM RESTART REPLICA, SYSTEM RESTORE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON test.table TO B\n"
+        "SHOW GRANTS FOR B") == "GRANT SHOW TABLES, SHOW COLUMNS, SHOW DICTIONARIES, SELECT, INSERT, ALTER TABLE, ALTER VIEW, CREATE TABLE, CREATE VIEW, CREATE DICTIONARY, DROP TABLE, DROP VIEW, DROP DICTIONARY, TRUNCATE, OPTIMIZE, SYSTEM MERGES, SYSTEM TTL MERGES, SYSTEM FETCHES, SYSTEM MOVES, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM DROP REPLICA, SYSTEM SYNC REPLICA, SYSTEM RESTART REPLICA, SYSTEM RESTORE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON test.table TO B\n"
     instance.query("REVOKE ALL ON test.table FROM B", user='A')
     assert instance.query("SHOW GRANTS FOR B") == ""
 
diff --git a/tests/integration/test_grpc_protocol/test.py b/tests/integration/test_grpc_protocol/test.py
index b0c1f8067b6..79879c13c9d 100644
--- a/tests/integration/test_grpc_protocol/test.py
+++ b/tests/integration/test_grpc_protocol/test.py
@@ -356,3 +356,11 @@ def test_cancel_while_generating_output():
     for result in results:
         output += result.output
     assert output == b'0\t0\n1\t0\n2\t0\n3\t0\n'
+
+def test_result_compression():
+    query_info = clickhouse_grpc_pb2.QueryInfo(query="SELECT 0 FROM numbers(1000000)",
+                                               result_compression=clickhouse_grpc_pb2.Compression(algorithm=clickhouse_grpc_pb2.CompressionAlgorithm.GZIP,
+                                                                                                  level=clickhouse_grpc_pb2.CompressionLevel.COMPRESSION_HIGH))
+    stub = clickhouse_grpc_pb2_grpc.ClickHouseStub(main_channel)
+    result = stub.ExecuteQuery(query_info)
+    assert result.output == (b'0\n')*1000000
diff --git a/tests/integration/test_keeper_persistent_log/test.py b/tests/integration/test_keeper_persistent_log/test.py
index 35f38f3ea1b..eec2d4cbbdc 100644
--- a/tests/integration/test_keeper_persistent_log/test.py
+++ b/tests/integration/test_keeper_persistent_log/test.py
@@ -75,6 +75,60 @@ def test_state_after_restart(started_cluster):
         except:
             pass
 
+def test_state_duplicate_restart(started_cluster):
+    try:
+        node_zk = None
+        node_zk2 = None
+        node_zk3 = None
+        node_zk = get_connection_zk("node")
+
+        node_zk.create("/test_state_duplicated_restart", b"somevalue")
+        strs = []
+        for i in range(100):
+            strs.append(random_string(123).encode())
+            node_zk.create("/test_state_duplicated_restart/node" + str(i), strs[i])
+
+        for i in range(100):
+            if i % 7 == 0:
+                node_zk.delete("/test_state_duplicated_restart/node" + str(i))
+
+        node.restart_clickhouse(kill=True)
+
+        node_zk2 = get_connection_zk("node")
+
+        node_zk2.create("/test_state_duplicated_restart/just_test1")
+        node_zk2.create("/test_state_duplicated_restart/just_test2")
+        node_zk2.create("/test_state_duplicated_restart/just_test3")
+
+        node.restart_clickhouse(kill=True)
+
+        node_zk3 = get_connection_zk("node")
+
+        assert node_zk3.get("/test_state_duplicated_restart")[0] == b"somevalue"
+        for i in range(100):
+            if i % 7 == 0:
+                assert node_zk3.exists("/test_state_duplicated_restart/node" + str(i)) is None
+            else:
+                assert len(node_zk3.get("/test_state_duplicated_restart/node" + str(i))[0]) == 123
+                assert node_zk3.get("/test_state_duplicated_restart/node" + str(i))[0] == strs[i]
+    finally:
+        try:
+            if node_zk is not None:
+                node_zk.stop()
+                node_zk.close()
+
+            if node_zk2 is not None:
+                node_zk2.stop()
+                node_zk2.close()
+
+            if node_zk3 is not None:
+                node_zk3.stop()
+                node_zk3.close()
+
+        except:
+            pass
+
+
 
 # http://zookeeper-user.578899.n2.nabble.com/Why-are-ephemeral-nodes-written-to-disk-tp7583403p7583418.html
 def test_ephemeral_after_restart(started_cluster):
diff --git a/tests/integration/test_lost_part_during_startup/__init__.py b/tests/integration/test_lost_part_during_startup/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_lost_part_during_startup/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_lost_part_during_startup/test.py b/tests/integration/test_lost_part_during_startup/test.py
new file mode 100644
index 00000000000..f9d24682354
--- /dev/null
+++ b/tests/integration/test_lost_part_during_startup/test.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+import time
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', with_zookeeper=True, stay_alive=True)
+node2 = cluster.add_instance('node2', with_zookeeper=True, stay_alive=True)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    except Exception as ex:
+        print(ex)
+
+    finally:
+        cluster.shutdown()
+
+def remove_part_from_disk(node, table, part_name):
+    part_path = node.query(
+        "SELECT path FROM system.parts WHERE table = '{}' and name = '{}'".format(table, part_name)).strip()
+    if not part_path:
+        raise Exception("Part " + part_name + "doesn't exist")
+    node.exec_in_container(['bash', '-c', 'rm -r {p}/*'.format(p=part_path)], privileged=True)
+
+
+def test_lost_part_during_startup(start_cluster):
+    for i, node in enumerate([node1, node2]):
+        node.query(f"CREATE TABLE test_lost (value UInt64) Engine = ReplicatedMergeTree('/clickhouse/test_lost', '{i + 1}') ORDER BY tuple()")
+
+    for i in range(4):
+        node2.query(f"INSERT INTO test_lost VALUES({i})")
+
+    node2.query("OPTIMIZE TABLE test_lost FINAL")
+    node1.query("SYSTEM SYNC REPLICA test_lost")
+
+    assert node2.query("SELECT sum(value) FROM test_lost") == str(sum(i for i in range(4))) + '\n'
+    assert node1.query("SELECT sum(value) FROM test_lost") == str(sum(i for i in range(4))) + '\n'
+
+
+    remove_part_from_disk(node2, "test_lost", "all_0_3_1")
+    remove_part_from_disk(node2, "test_lost", "all_1_1_0")
+    remove_part_from_disk(node2, "test_lost", "all_2_2_0")
+
+    node2.stop_clickhouse()
+    node1.stop_clickhouse()
+    node2.start_clickhouse()
+
+    for i in range(10):
+        try:
+            node2.query("INSERT INTO test_lost VALUES(7)")
+            node2.query("INSERT INTO test_lost VALUES(8)")
+            node2.query("INSERT INTO test_lost VALUES(9)")
+            node2.query("INSERT INTO test_lost VALUES(10)")
+            node2.query("INSERT INTO test_lost VALUES(11)")
+            node2.query("INSERT INTO test_lost VALUES(12)")
+
+            node2.query("OPTIMIZE TABLE test_lost FINAL")
+            break
+        except Exception as ex:
+            print("Exception", ex)
+            time.sleep(0.5)
+
+    node1.start_clickhouse()
+    node2.query("SYSTEM SYNC REPLICA test_lost")
+    node1.query("SYSTEM SYNC REPLICA test_lost")
+
+    assert node2.query("SELECT sum(value) FROM test_lost") == str(sum(i for i in range(4)) + sum(i for i in range(7, 13))) + '\n'
+    assert node1.query("SELECT sum(value) FROM test_lost") == str(sum(i for i in range(4)) + sum(i for i in range(7, 13))) + '\n'
diff --git a/tests/queries/__init__.py b/tests/integration/test_max_suspicious_broken_parts/__init__.py
similarity index 100%
rename from tests/queries/__init__.py
rename to tests/integration/test_max_suspicious_broken_parts/__init__.py
diff --git a/tests/integration/test_max_suspicious_broken_parts/test.py b/tests/integration/test_max_suspicious_broken_parts/test.py
new file mode 100644
index 00000000000..31f53fdbc3c
--- /dev/null
+++ b/tests/integration/test_max_suspicious_broken_parts/test.py
@@ -0,0 +1,121 @@
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+# pylint: disable=line-too-long
+
+import pytest
+
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True)
+
+@pytest.fixture(scope='module', autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+def break_part(table, part_name):
+    node.exec_in_container(['bash', '-c', f'rm /var/lib/clickhouse/data/default/{table}/{part_name}/columns.txt'])
+
+def remove_part(table, part_name):
+    node.exec_in_container(['bash', '-c', f'rm -r /var/lib/clickhouse/data/default/{table}/{part_name}'])
+
+def get_count(table):
+    return int(node.query(f'SELECT count() FROM {table}').strip())
+
+def detach_table(table):
+    node.query(f'DETACH TABLE {table}')
+def attach_table(table):
+    node.query(f'ATTACH TABLE {table}')
+
+def check_table(table):
+    rows = 900
+    per_part_rows = 90
+
+    node.query(f'INSERT INTO {table} SELECT * FROM numbers(900)')
+
+    assert get_count(table) == rows
+
+    # break one part, and check that clickhouse will be alive
+    break_part(table, '0_1_1_0')
+    rows -= per_part_rows
+    detach_table(table)
+    attach_table(table)
+    assert get_count(table) == rows
+
+    # break two parts, and check that clickhouse will not start
+    break_part(table, '1_2_2_0')
+    break_part(table, '2_3_3_0')
+    rows -= per_part_rows*2
+    detach_table(table)
+    with pytest.raises(QueryRuntimeException):
+        attach_table(table)
+
+    # now remove one part, and check
+    remove_part(table, '1_2_2_0')
+    attach_table(table)
+    assert get_count(table) == rows
+
+    node.query(f'DROP TABLE {table}')
+
+def test_max_suspicious_broken_parts():
+    node.query("""
+    CREATE TABLE test_max_suspicious_broken_parts (
+        key Int
+    )
+    ENGINE=MergeTree
+    ORDER BY key
+    PARTITION BY key%10
+    SETTINGS
+        max_suspicious_broken_parts = 1;
+    """)
+    check_table('test_max_suspicious_broken_parts')
+
+def test_max_suspicious_broken_parts_bytes():
+    node.query("""
+    CREATE TABLE test_max_suspicious_broken_parts_bytes (
+        key Int
+    )
+    ENGINE=MergeTree
+    ORDER BY key
+    PARTITION BY key%10
+    SETTINGS
+        max_suspicious_broken_parts = 10,
+        /* one part takes ~751 byte, so we allow failure of one part with these limit */
+        max_suspicious_broken_parts_bytes = 1000;
+    """)
+    check_table('test_max_suspicious_broken_parts_bytes')
+
+def test_max_suspicious_broken_parts__wide():
+    node.query("""
+    CREATE TABLE test_max_suspicious_broken_parts__wide (
+        key Int
+    )
+    ENGINE=MergeTree
+    ORDER BY key
+    PARTITION BY key%10
+    SETTINGS
+        min_bytes_for_wide_part = 0,
+        max_suspicious_broken_parts = 1;
+    """)
+    check_table('test_max_suspicious_broken_parts__wide')
+
+def test_max_suspicious_broken_parts_bytes__wide():
+    node.query("""
+    CREATE TABLE test_max_suspicious_broken_parts_bytes__wide (
+        key Int
+    )
+    ENGINE=MergeTree
+    ORDER BY key
+    PARTITION BY key%10
+    SETTINGS
+        min_bytes_for_wide_part = 0,
+        max_suspicious_broken_parts = 10,
+        /* one part takes ~750 byte, so we allow failure of one part with these limit */
+        max_suspicious_broken_parts_bytes = 1000;
+    """)
+    check_table('test_max_suspicious_broken_parts_bytes__wide')
diff --git a/tests/integration/test_mysql_database_engine/configs/named_collections.xml b/tests/integration/test_mysql_database_engine/configs/named_collections.xml
new file mode 100644
index 00000000000..b5e0973d37a
--- /dev/null
+++ b/tests/integration/test_mysql_database_engine/configs/named_collections.xml
@@ -0,0 +1,25 @@
+<yandex>
+    <named_collections>
+        <mysql1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>3306</port>
+            <database>test_database</database>
+            <table>test_table</table>
+        </mysql1>
+        <mysql2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </mysql2>
+        <mysql3>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>1111</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+        </mysql3>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_mysql_database_engine/test.py b/tests/integration/test_mysql_database_engine/test.py
index a093c2a0125..49206ab1abe 100644
--- a/tests/integration/test_mysql_database_engine/test.py
+++ b/tests/integration/test_mysql_database_engine/test.py
@@ -8,7 +8,7 @@ from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-clickhouse_node = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml'], with_mysql=True)
+clickhouse_node = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml', 'configs/named_collections.xml'], with_mysql=True)
 
 
 @pytest.fixture(scope="module")
@@ -404,3 +404,23 @@ def test_mysql_types(started_cluster, case_name, mysql_type, expected_ch_type, m
             execute_query(clickhouse_node,
                           "SELECT value FROM mysql('mysql57:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse')",
                           settings=clickhouse_query_settings)
+
+
+def test_predefined_connection_configuration(started_cluster):
+    with contextlib.closing(MySQLNodeInstance('root', 'clickhouse', started_cluster.mysql_ip, started_cluster.mysql_port)) as mysql_node:
+        mysql_node.query("DROP DATABASE IF EXISTS test_database")
+        mysql_node.query("CREATE DATABASE test_database DEFAULT CHARACTER SET 'utf8'")
+        mysql_node.query('CREATE TABLE `test_database`.`test_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;')
+
+        clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+        clickhouse_node.query("CREATE DATABASE test_database ENGINE = MySQL(mysql1)")
+        clickhouse_node.query("INSERT INTO `test_database`.`test_table` select number from numbers(100)")
+        assert clickhouse_node.query("SELECT count() FROM `test_database`.`test_table`").rstrip() == '100'
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        clickhouse_node.query_and_get_error("CREATE DATABASE test_database ENGINE = MySQL(mysql2)")
+        clickhouse_node.query_and_get_error("CREATE DATABASE test_database ENGINE = MySQL(unknown_collection)")
+        clickhouse_node.query_and_get_error("CREATE DATABASE test_database ENGINE = MySQL(mysql1, 1)")
+
+        clickhouse_node.query("CREATE DATABASE test_database ENGINE = MySQL(mysql1, port=3306)")
+        assert clickhouse_node.query("SELECT count() FROM `test_database`.`test_table`").rstrip() == '100'
diff --git a/tests/integration/test_mysql_protocol/golang.reference b/tests/integration/test_mysql_protocol/golang.reference
index 082149b4644..4069b2a086a 100644
--- a/tests/integration/test_mysql_protocol/golang.reference
+++ b/tests/integration/test_mysql_protocol/golang.reference
@@ -1,7 +1,7 @@
 Columns:
 a
 Column types:
-a BIGINT
+a UNSIGNED BIGINT
 Result:
 0
 1
@@ -10,14 +10,15 @@ name
 a
 Column types:
 name CHAR
-a TINYINT
+a UNSIGNED TINYINT
 Result:
 tables 1
+tables 1
 Columns:
 a
 b
 Column types:
 a CHAR
-b TINYINT
+b UNSIGNED TINYINT
 Result:
 тест 1
diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 070aa9967fc..0b3f6ea95af 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -407,24 +407,24 @@ def test_php_client(started_cluster, php_container):
     code, (stdout, stderr) = php_container.exec_run(
         'php -f test.php {host} {port} default 123'.format(host=started_cluster.get_instance_ip('node'), port=server_port), demux=True)
     assert code == 0
-    assert stdout.decode() == 'tables\n'
+    assert stdout.decode() == 'tables\ntables\n'
 
     code, (stdout, stderr) = php_container.exec_run(
         'php -f test_ssl.php {host} {port} default 123'.format(host=started_cluster.get_instance_ip('node'), port=server_port), demux=True)
     assert code == 0
-    assert stdout.decode() == 'tables\n'
+    assert stdout.decode() == 'tables\ntables\n'
 
     code, (stdout, stderr) = php_container.exec_run(
         'php -f test.php {host} {port} user_with_double_sha1 abacaba'.format(host=started_cluster.get_instance_ip('node'), port=server_port),
         demux=True)
     assert code == 0
-    assert stdout.decode() == 'tables\n'
+    assert stdout.decode() == 'tables\ntables\n'
 
     code, (stdout, stderr) = php_container.exec_run(
         'php -f test_ssl.php {host} {port} user_with_double_sha1 abacaba'.format(host=started_cluster.get_instance_ip('node'), port=server_port),
         demux=True)
     assert code == 0
-    assert stdout.decode() == 'tables\n'
+    assert stdout.decode() == 'tables\ntables\n'
 
 
 def test_mysqljs_client(started_cluster, nodejs_container):
diff --git a/tests/integration/test_postgresql_database_engine/configs/named_collections.xml b/tests/integration/test_postgresql_database_engine/configs/named_collections.xml
new file mode 100644
index 00000000000..f084ee373ec
--- /dev/null
+++ b/tests/integration/test_postgresql_database_engine/configs/named_collections.xml
@@ -0,0 +1,23 @@
+<yandex>
+    <named_collections>
+        <postgres1>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>postgres</database>
+        </postgres1>
+        <postgres2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </postgres2>
+        <postgres3>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>1111</port>
+            <database>postgres</database>
+        </postgres3>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_postgresql_database_engine/test.py b/tests/integration/test_postgresql_database_engine/test.py
index 8768c4037a1..656f655cfb3 100644
--- a/tests/integration/test_postgresql_database_engine/test.py
+++ b/tests/integration/test_postgresql_database_engine/test.py
@@ -7,7 +7,7 @@ from helpers.test_tools import assert_eq_with_retry
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', main_configs=[], with_postgres=True)
+node1 = cluster.add_instance('node1', main_configs=["configs/named_collections.xml"], with_postgres=True)
 
 postgres_table_template = """
     CREATE TABLE IF NOT EXISTS {} (
@@ -208,6 +208,36 @@ def test_postgresql_database_with_schema(started_cluster):
     node1.query("DROP DATABASE test_database")
 
 
+def test_predefined_connection_configuration(started_cluster):
+    cursor = started_cluster.postgres_conn.cursor()
+    cursor.execute(f'DROP TABLE IF EXISTS test_table')
+    cursor.execute(f'CREATE TABLE test_table (a integer PRIMARY KEY, b integer)')
+
+    node1.query("DROP DATABASE IF EXISTS postgres_database")
+    node1.query("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres1)")
+    node1.query("INSERT INTO postgres_database.test_table SELECT number, number from numbers(100)")
+    assert (node1.query(f"SELECT count() FROM postgres_database.test_table").rstrip() == '100')
+
+    cursor.execute('DROP SCHEMA IF EXISTS test_schema')
+    cursor.execute('CREATE SCHEMA test_schema')
+    cursor.execute('CREATE TABLE test_schema.test_table (a integer)')
+
+    node1.query("DROP DATABASE IF EXISTS postgres_database")
+    node1.query("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres1, schema='test_schema')")
+    node1.query("INSERT INTO postgres_database.test_table SELECT number from numbers(200)")
+    assert (node1.query(f"SELECT count() FROM postgres_database.test_table").rstrip() == '200')
+
+    node1.query("DROP DATABASE IF EXISTS postgres_database")
+    node1.query_and_get_error("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres1, 'test_schema')")
+    node1.query_and_get_error("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres2)")
+    node1.query_and_get_error("CREATE DATABASE postgres_database ENGINE = PostgreSQL(unknown_collection)")
+    node1.query("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres3, port=5432)")
+    assert (node1.query(f"SELECT count() FROM postgres_database.test_table").rstrip() == '100')
+
+    node1.query("DROP DATABASE postgres_database")
+    cursor.execute(f'DROP TABLE test_table ')
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_postgresql_replica_database_engine/configs/log_conf.xml b/tests/integration/test_postgresql_replica_database_engine/configs/log_conf.xml
index f9d15e572aa..6dc9fce900a 100644
--- a/tests/integration/test_postgresql_replica_database_engine/configs/log_conf.xml
+++ b/tests/integration/test_postgresql_replica_database_engine/configs/log_conf.xml
@@ -8,4 +8,22 @@
         <stderr>/var/log/clickhouse-server/stderr.log</stderr>
         <stdout>/var/log/clickhouse-server/stdout.log</stdout>
     </logger>
+    <named_collections>
+        <postgres1>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>postgres_database</database>
+            <table>test_table</table>
+        </postgres1>
+        <postgres2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>1111</port>
+            <database>postgres_database</database>
+            <table>test_table</table>
+        </postgres2>
+    </named_collections>
 </yandex>
diff --git a/tests/integration/test_postgresql_replica_database_engine/test.py b/tests/integration/test_postgresql_replica_database_engine/test.py
index 1dd096087ff..d8bf29fa2dd 100644
--- a/tests/integration/test_postgresql_replica_database_engine/test.py
+++ b/tests/integration/test_postgresql_replica_database_engine/test.py
@@ -149,12 +149,10 @@ def check_tables_are_synchronized(table_name, order_by='key', postgres_database=
 def started_cluster():
     try:
         cluster.start()
-        conn = get_postgres_conn(ip=cluster.postgres_ip,
-                                 port=cluster.postgres_port)
+        conn = get_postgres_conn(ip=cluster.postgres_ip, port=cluster.postgres_port)
         cursor = conn.cursor()
         create_postgres_db(cursor, 'postgres_database')
-        create_clickhouse_postgres_db(ip=cluster.postgres_ip,
-                                      port=cluster.postgres_port)
+        create_clickhouse_postgres_db(ip=cluster.postgres_ip, port=cluster.postgres_port)
 
         instance.query("DROP DATABASE IF EXISTS test_database")
         yield cluster
@@ -942,12 +940,11 @@ def test_abrupt_server_restart_while_heavy_replication(started_cluster):
 
 
 def test_quoting(started_cluster):
-    drop_materialized_db()
+    table_name = 'user'
     conn = get_postgres_conn(ip=started_cluster.postgres_ip,
                              port=started_cluster.postgres_port,
                              database=True)
     cursor = conn.cursor()
-    table_name = 'user'
     create_postgres_table(cursor, table_name);
     instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(50)".format(table_name))
     create_materialized_db(ip=started_cluster.postgres_ip, port=started_cluster.postgres_port)
@@ -984,6 +981,159 @@ def test_user_managed_slots(started_cluster):
     drop_replication_slot(replication_connection, slot_name)
 
 
+def test_add_new_table_to_replication(started_cluster):
+    drop_materialized_db()
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip,
+                             port=started_cluster.postgres_port,
+                             database=True)
+    cursor = conn.cursor()
+    NUM_TABLES = 5
+
+    for i in range(NUM_TABLES):
+        create_postgres_table(cursor, 'postgresql_replica_{}'.format(i));
+        instance.query("INSERT INTO postgres_database.postgresql_replica_{} SELECT number, {} from numbers(10000)".format(i, i))
+
+    create_materialized_db(ip=started_cluster.postgres_ip,
+                           port=started_cluster.postgres_port)
+
+    for i in range(NUM_TABLES):
+        table_name = 'postgresql_replica_{}'.format(i)
+        check_tables_are_synchronized(table_name);
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\npostgresql_replica_4\n")
+
+    table_name = 'postgresql_replica_5'
+    create_postgres_table(cursor, table_name)
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000)".format(table_name))
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(") # Check without ip
+    assert(result[-59:] == "\\'postgres_database\\', \\'postgres\\', \\'mysecretpassword\\')\n")
+
+    result = instance.query_and_get_error("ALTER DATABASE test_database MODIFY SETTING materialized_postgresql_tables_list='tabl1'")
+    assert('Changing setting `materialized_postgresql_tables_list` is not allowed' in result)
+
+    result = instance.query_and_get_error("ALTER DATABASE test_database MODIFY SETTING materialized_postgresql_tables='tabl1'")
+    assert('Database engine MaterializedPostgreSQL does not support setting' in result)
+
+    instance.query("ATTACH TABLE test_database.{}".format(table_name));
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\npostgresql_replica_4\npostgresql_replica_5\n")
+
+    check_tables_are_synchronized(table_name);
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000, 10000)".format(table_name))
+    check_tables_are_synchronized(table_name);
+
+    result = instance.query_and_get_error("ATTACH TABLE test_database.{}".format(table_name));
+    assert('Table test_database.postgresql_replica_5 already exists' in result)
+
+    result = instance.query_and_get_error("ATTACH TABLE test_database.unknown_table");
+    assert('PostgreSQL table unknown_table does not exist' in result)
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-180:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_1,postgresql_replica_2,postgresql_replica_3,postgresql_replica_4,postgresql_replica_5\\'\n")
+
+    table_name = 'postgresql_replica_6'
+    create_postgres_table(cursor, table_name)
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000)".format(table_name))
+    instance.query("ATTACH TABLE test_database.{}".format(table_name));
+
+    instance.restart_clickhouse()
+
+    table_name = 'postgresql_replica_7'
+    create_postgres_table(cursor, table_name)
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000)".format(table_name))
+    instance.query("ATTACH TABLE test_database.{}".format(table_name));
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-222:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_1,postgresql_replica_2,postgresql_replica_3,postgresql_replica_4,postgresql_replica_5,postgresql_replica_6,postgresql_replica_7\\'\n")
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\npostgresql_replica_4\npostgresql_replica_5\npostgresql_replica_6\npostgresql_replica_7\n")
+
+    for i in range(NUM_TABLES + 3):
+        table_name = 'postgresql_replica_{}'.format(i)
+        check_tables_are_synchronized(table_name);
+
+    for i in range(NUM_TABLES + 3):
+        cursor.execute('drop table if exists postgresql_replica_{};'.format(i))
+
+
+def test_remove_table_from_replication(started_cluster):
+    drop_materialized_db()
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip,
+                             port=started_cluster.postgres_port,
+                             database=True)
+    cursor = conn.cursor()
+    NUM_TABLES = 5
+
+    for i in range(NUM_TABLES):
+        create_postgres_table(cursor, 'postgresql_replica_{}'.format(i));
+        instance.query("INSERT INTO postgres_database.postgresql_replica_{} SELECT number, {} from numbers(10000)".format(i, i))
+
+    create_materialized_db(ip=started_cluster.postgres_ip,
+                           port=started_cluster.postgres_port)
+
+    for i in range(NUM_TABLES):
+        table_name = 'postgresql_replica_{}'.format(i)
+        check_tables_are_synchronized(table_name);
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\npostgresql_replica_4\n")
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-59:] == "\\'postgres_database\\', \\'postgres\\', \\'mysecretpassword\\')\n")
+
+    table_name = 'postgresql_replica_4'
+    instance.query('DETACH TABLE test_database.{}'.format(table_name));
+    result = instance.query_and_get_error('SELECT * FROM test_database.{}'.format(table_name))
+    assert("doesn't exist" in result)
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\n")
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-138:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_1,postgresql_replica_2,postgresql_replica_3\\'\n")
+
+    instance.query('ATTACH TABLE test_database.{}'.format(table_name));
+    check_tables_are_synchronized(table_name);
+
+    for i in range(NUM_TABLES):
+        table_name = 'postgresql_replica_{}'.format(i)
+        check_tables_are_synchronized(table_name);
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-159:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_1,postgresql_replica_2,postgresql_replica_3,postgresql_replica_4\\'\n")
+
+    table_name = 'postgresql_replica_1'
+    instance.query('DETACH TABLE test_database.{}'.format(table_name));
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-138:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_2,postgresql_replica_3,postgresql_replica_4\\'\n")
+
+    for i in range(NUM_TABLES):
+        cursor.execute('drop table if exists postgresql_replica_{};'.format(i))
+
+
+def test_predefined_connection_configuration(started_cluster):
+    drop_materialized_db()
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip, port=started_cluster.postgres_port, database=True)
+    cursor = conn.cursor()
+    cursor.execute(f'DROP TABLE IF EXISTS test_table')
+    cursor.execute(f'CREATE TABLE test_table (key integer PRIMARY KEY, value integer)')
+
+    instance.query("CREATE DATABASE test_database ENGINE = MaterializedPostgreSQL(postgres1)")
+    check_tables_are_synchronized("test_table");
+    drop_materialized_db()
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_quota/test.py b/tests/integration/test_quota/test.py
index 5f43d581178..4149987996b 100644
--- a/tests/integration/test_quota/test.py
+++ b/tests/integration/test_quota/test.py
@@ -399,9 +399,9 @@ def test_consumption_of_show_tables():
         instance.query("SHOW QUOTA"))
 
 def test_consumption_of_show_databases():
-    assert instance.query("SHOW DATABASES") == "default\nsystem\n"
+    assert instance.query("SHOW DATABASES") == "INFORMATION_SCHEMA\ndefault\ninformation_schema\nsystem\n"
     assert re.match(
-        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N\\t2\\t\\\\N.*",
+        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N\\t4\\t\\\\N.*",
         instance.query("SHOW QUOTA"))
 
 def test_consumption_of_show_clusters():
diff --git a/tests/integration/test_redirect_url_storage/configs/named_collections.xml b/tests/integration/test_redirect_url_storage/configs/named_collections.xml
new file mode 100644
index 00000000000..17cc701344a
--- /dev/null
+++ b/tests/integration/test_redirect_url_storage/configs/named_collections.xml
@@ -0,0 +1,16 @@
+<yandex>
+    <named_collections>
+        <url1>
+            <headers>
+                <header>
+                    <name>Range</name>
+                    <value>bytes=0-1</value>
+                </header>
+                <header>
+                    <name>Access-Control-Request-Method</name>
+                    <value>PUT</value>
+                </header>
+            </headers>
+        </url1>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_redirect_url_storage/test.py b/tests/integration/test_redirect_url_storage/test.py
index c99e5182c91..e2f1982f305 100644
--- a/tests/integration/test_redirect_url_storage/test.py
+++ b/tests/integration/test_redirect_url_storage/test.py
@@ -2,7 +2,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', with_zookeeper=False, with_hdfs=True)
+node1 = cluster.add_instance('node1', main_configs=['configs/named_collections.xml'], with_zookeeper=False, with_hdfs=True)
 
 
 @pytest.fixture(scope="module")
@@ -81,3 +81,17 @@ def test_url_with_redirect_allowed(started_cluster):
     node1.query(
         "create table WebHDFSStorageWithRedirect (id UInt32, name String, weight Float64) ENGINE = URL('http://hdfs1:50070/webhdfs/v1/simple_storage?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', 'TSV')")
     assert node1.query("SET max_http_get_redirects=1; select * from WebHDFSStorageWithRedirect") == "1\tMark\t72.53\n"
+
+
+def test_predefined_connection_configuration(started_cluster):
+    hdfs_api = started_cluster.hdfs_api
+
+    hdfs_api.write_data("/simple_storage", "1\tMark\t72.53\n")
+    assert hdfs_api.read_data("/simple_storage") == "1\tMark\t72.53\n"
+
+    node1.query("drop table if exists WebHDFSStorageWithRedirect")
+    node1.query(
+        "create table WebHDFSStorageWithRedirect (id UInt32, name String, weight Float64) ENGINE = URL(url1, url='http://hdfs1:50070/webhdfs/v1/simple_storage?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', format='TSV')")
+    assert node1.query("SET max_http_get_redirects=1; select * from WebHDFSStorageWithRedirect") == "1\tMark\t72.53\n"
+    result = node1.query("SET max_http_get_redirects=1; select * from url(url1, url='http://hdfs1:50070/webhdfs/v1/simple_storage?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', format='TSV', structure='id UInt32, name String, weight Float64')")
+    assert(result == "1\tMark\t72.53\n")
diff --git a/tests/queries/0_stateless/00763_lock_buffer.reference b/tests/integration/test_replicated_merge_tree_compatibility/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00763_lock_buffer.reference
rename to tests/integration/test_replicated_merge_tree_compatibility/__init__.py
diff --git a/tests/integration/test_replicated_merge_tree_compatibility/test.py b/tests/integration/test_replicated_merge_tree_compatibility/test.py
new file mode 100644
index 00000000000..b56aa5706c9
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_compatibility/test.py
@@ -0,0 +1,55 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', with_zookeeper=True, image='yandex/clickhouse-server', tag='20.12.4.5', stay_alive=True, with_installed_binary=True)
+node2 = cluster.add_instance('node2', with_zookeeper=True, image='yandex/clickhouse-server', tag='20.12.4.5', stay_alive=True, with_installed_binary=True)
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    except Exception as ex:
+        print(ex)
+
+    finally:
+        cluster.shutdown()
+
+def test_replicated_merge_tree_defaults_compatibility(started_cluster):
+    # This test checks, that result of parsing list of columns with defaults
+    # from 'CREATE/ATTACH' is compatible with parsing from zookeeper metadata on different versions.
+    # We create table and write 'columns' node in zookeeper with old version, than restart with new version
+    # drop and try recreate one replica. During startup of table structure is checked between 'CREATE' query and zookeeper.
+
+    create_query = '''
+        CREATE TABLE test.table
+        (
+            a UInt32,
+            b String DEFAULT If(a = 0, 'true', 'false'),
+            c String DEFAULT Cast(a, 'String')
+        )
+        ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/table', '{replica}')
+        ORDER BY a
+    '''
+
+    for node in (node1, node2):
+        node.query("CREATE DATABASE test ENGINE = Ordinary")
+        node.query(create_query.format(replica=node.name))
+
+    node1.query("DETACH TABLE test.table")
+    node2.query("SYSTEM DROP REPLICA 'node1' FROM TABLE test.table")
+    node1.exec_in_container(["bash", "-c", "rm /var/lib/clickhouse/metadata/test/table.sql"])
+    node1.exec_in_container(["bash", "-c", "rm -r /var/lib/clickhouse/data/test/table"])
+
+    zk = cluster.get_kazoo_client('zoo1')
+    exists_replica_1 = zk.exists("/clickhouse/tables/test/table/replicas/node1")
+    assert exists_replica_1 == None
+
+    node1.restart_with_latest_version()
+    node2.restart_with_latest_version()
+
+    node1.query(create_query.format(replica=1))
+    node1.query("EXISTS TABLE test.table") == "1\n"
diff --git a/tests/integration/test_rocksdb_options/configs/rocksdb.xml b/tests/integration/test_rocksdb_options/configs/rocksdb.xml
new file mode 100644
index 00000000000..afb2d2776fc
--- /dev/null
+++ b/tests/integration/test_rocksdb_options/configs/rocksdb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<yandex>
+  <rocksdb>
+    <options>
+        <max_background_jobs>8</max_background_jobs>
+    </options>
+    <column_family_options>
+      <num_levels>2</num_levels>
+    </column_family_options>
+    <tables>
+      <table>
+        <name>test</name>
+        <options>
+          <max_open_files>10000</max_open_files>
+        </options>
+        <column_family_options>
+          <max_bytes_for_level_base>14</max_bytes_for_level_base>
+        </column_family_options>
+      </table>
+    </tables>
+  </rocksdb>
+</yandex>
diff --git a/tests/integration/test_rocksdb_options/configs/rocksdb.yml b/tests/integration/test_rocksdb_options/configs/rocksdb.yml
deleted file mode 100644
index 363ead6f318..00000000000
--- a/tests/integration/test_rocksdb_options/configs/rocksdb.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-rocksdb:
-    options:
-        max_background_jobs: 8
-    column_family_options:
-        num_levels: 2
-    tables:
-        - table:
-              name: test
-              options:
-                  max_open_files: 10000
-              column_family_options:
-                  max_bytes_for_level_base: 14
diff --git a/tests/integration/test_rocksdb_options/test.py b/tests/integration/test_rocksdb_options/test.py
index 286528107b8..6689c232081 100644
--- a/tests/integration/test_rocksdb_options/test.py
+++ b/tests/integration/test_rocksdb_options/test.py
@@ -9,10 +9,10 @@ from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 
-node = cluster.add_instance('node', main_configs=['configs/rocksdb.yml'], stay_alive=True)
+node = cluster.add_instance('node', main_configs=['configs/rocksdb.xml'], stay_alive=True)
 
 
-@pytest.fixture(scope='module', autouse=True)
+@pytest.fixture(scope='module')
 def start_cluster():
     try:
         cluster.start()
@@ -20,66 +20,46 @@ def start_cluster():
     finally:
         cluster.shutdown()
 
-def test_valid_options():
+def test_valid_options(start_cluster):
     node.query("""
     CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     DROP TABLE test;
     """)
 
-def test_invalid_options():
-    node.exec_in_container(['bash', '-c', "sed -i 's/max_background_jobs/no_such_option/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+def test_invalid_options(start_cluster):
+    node.exec_in_container(['bash', '-c', "sed -i 's/max_background_jobs/no_such_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
     with pytest.raises(QueryRuntimeException):
         node.query("""
         CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
         """)
-    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_option/max_background_jobs/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_option/max_background_jobs/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
 
-def test_table_valid_options():
+def test_table_valid_options(start_cluster):
     node.query("""
     CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     DROP TABLE test;
     """)
 
-def test_table_invalid_options():
-    node.exec_in_container(['bash', '-c', "sed -i 's/max_open_files/no_such_table_option/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+def test_table_invalid_options(start_cluster):
+    node.exec_in_container(['bash', '-c', "sed -i 's/max_open_files/no_such_table_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
     with pytest.raises(QueryRuntimeException):
         node.query("""
         CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
         """)
-    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_table_option/max_open_files/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_table_option/max_open_files/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
 
-def test_valid_column_family_options():
+def test_valid_column_family_options(start_cluster):
     node.query("""
     CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     DROP TABLE test;
     """)
 
-def test_invalid_column_family_options():
-    node.exec_in_container(['bash', '-c', "sed -i 's/num_levels/no_such_column_family_option/' /etc/clickhouse-server/config.d/rocksdb.yml"])
-    node.restart_clickhouse()
-    with pytest.raises(QueryRuntimeException):
-        node.query("""
-        CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
-        """)
-    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_column_family_option/num_levels/' /etc/clickhouse-server/config.d/rocksdb.yml"])
-    node.restart_clickhouse()
-
-def test_table_valid_column_family_options():
+def test_table_valid_column_family_options(start_cluster):
     node.query("""
     CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     DROP TABLE test;
     """)
-
-def test_table_invalid_column_family_options():
-    node.exec_in_container(['bash', '-c', "sed -i 's/max_bytes_for_level_base/no_such_table_column_family_option/' /etc/clickhouse-server/config.d/rocksdb.yml"])
-    node.restart_clickhouse()
-    with pytest.raises(QueryRuntimeException):
-        node.query("""
-        CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
-        """)
-    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_table_column_family_option/max_bytes_for_level_base/' /etc/clickhouse-server/config.d/rocksdb.yml"])
-    node.restart_clickhouse()
diff --git a/tests/integration/test_storage_mongodb/configs/named_collections.xml b/tests/integration/test_storage_mongodb/configs/named_collections.xml
new file mode 100644
index 00000000000..fcdcb85bd36
--- /dev/null
+++ b/tests/integration/test_storage_mongodb/configs/named_collections.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <named_collections>
+        <mongo1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mongo1</host>
+            <port>27017</port>
+            <database>test</database>
+            <table>simple_table</table>
+        </mongo1>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_storage_mongodb/test.py b/tests/integration/test_storage_mongodb/test.py
index aeb8419b734..1a5de353d7d 100644
--- a/tests/integration/test_storage_mongodb/test.py
+++ b/tests/integration/test_storage_mongodb/test.py
@@ -11,7 +11,7 @@ def started_cluster(request):
     try:
         cluster = ClickHouseCluster(__file__)
         node = cluster.add_instance('node',
-                                    main_configs=["configs_secure/config.d/ssl_conf.xml"],
+                                    main_configs=["configs_secure/config.d/ssl_conf.xml", "configs/named_collections.xml"],
                                     with_mongo=True,
                                     with_mongo_secure=request.param)
         cluster.start()
@@ -124,3 +124,18 @@ def test_secure_connection(started_cluster):
     assert node.query("SELECT data from simple_mongo_table where key = 42") == hex(42 * 42) + '\n'
     node.query("DROP TABLE simple_mongo_table")
     simple_mongo_table.drop()
+
+@pytest.mark.parametrize('started_cluster', [False], indirect=['started_cluster'])
+def test_predefined_connection_configuration(started_cluster):
+    mongo_connection = get_mongo_connection(started_cluster)
+    db = mongo_connection['test']
+    db.add_user('root', 'clickhouse')
+    simple_mongo_table = db['simple_table']
+    data = []
+    for i in range(0, 100):
+        data.append({'key': i, 'data': hex(i * i)})
+    simple_mongo_table.insert_many(data)
+
+    node = started_cluster.instances['node']
+    node.query("create table simple_mongo_table(key UInt64, data String) engine = MongoDB(mongo1)")
+    simple_mongo_table.drop()
diff --git a/tests/integration/test_storage_mysql/configs/named_collections.xml b/tests/integration/test_storage_mysql/configs/named_collections.xml
new file mode 100644
index 00000000000..45d28d521f7
--- /dev/null
+++ b/tests/integration/test_storage_mysql/configs/named_collections.xml
@@ -0,0 +1,25 @@
+<yandex>
+    <named_collections>
+        <mysql1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>3306</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+        </mysql1>
+        <mysql2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </mysql2>
+        <mysql3>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>1111</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+        </mysql3>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_storage_mysql/test.py b/tests/integration/test_storage_mysql/test.py
index a044528cacf..a81bd876073 100644
--- a/tests/integration/test_storage_mysql/test.py
+++ b/tests/integration/test_storage_mysql/test.py
@@ -3,11 +3,14 @@ from contextlib import contextmanager
 ## sudo -H pip install PyMySQL
 import pymysql.cursors
 import pytest
+import time
+import threading
 from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
 
 cluster = ClickHouseCluster(__file__)
 
-node1 = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml'], with_mysql=True)
+node1 = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml', 'configs/named_collections.xml'], with_mysql=True)
 node2 = cluster.add_instance('node2', main_configs=['configs/remote_servers.xml'], with_mysql_cluster=True)
 node3 = cluster.add_instance('node3', main_configs=['configs/remote_servers.xml'], user_configs=['configs/users.xml'], with_mysql=True)
 
@@ -243,7 +246,7 @@ def test_mysql_distributed(started_cluster):
     node2.query('''
         CREATE TABLE test_replicas
         (id UInt32, name String, age UInt32, money UInt32)
-        ENGINE = MySQL(`mysql{2|3|4}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+        ENGINE = MySQL('mysql{2|3|4}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
 
     # Fill remote tables with different data to be able to check
     nodes = [node1, node2, node2, node2]
@@ -252,13 +255,13 @@ def test_mysql_distributed(started_cluster):
         nodes[i-1].query('''
             CREATE TABLE test_replica{}
             (id UInt32, name String, age UInt32, money UInt32)
-            ENGINE = MySQL(`mysql{}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse');'''.format(i, 57 if i==1 else i))
+            ENGINE = MySQL('mysql{}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse');'''.format(i, 57 if i==1 else i))
         nodes[i-1].query("INSERT INTO test_replica{} (id, name) SELECT number, 'host{}' from numbers(10) ".format(i, i))
 
     # test multiple ports parsing
-    result = node2.query('''SELECT DISTINCT(name) FROM mysql(`mysql{57|2|3}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+    result = node2.query('''SELECT DISTINCT(name) FROM mysql('mysql{57|2|3}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
     assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
-    result = node2.query('''SELECT DISTINCT(name) FROM mysql(`mysql57:3306|mysql2:3306|mysql3:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+    result = node2.query('''SELECT DISTINCT(name) FROM mysql('mysql57:3306|mysql2:3306|mysql3:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
     assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
 
     # check all replicas are traversed
@@ -276,7 +279,7 @@ def test_mysql_distributed(started_cluster):
     node2.query('''
         CREATE TABLE test_shards
         (id UInt32, name String, age UInt32, money UInt32)
-        ENGINE = ExternalDistributed('MySQL', `mysql{57|2}:3306,mysql{3|4}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+        ENGINE = ExternalDistributed('MySQL', 'mysql{57|2}:3306,mysql{3|4}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
 
     # Check only one replica in each shard is used
     result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
@@ -319,6 +322,134 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL
     conn.close()
 
 
+def test_settings_connection_wait_timeout(started_cluster):
+    table_name = 'test_settings_connection_wait_timeout'
+    node1.query(f'DROP TABLE IF EXISTS {table_name}')
+    wait_timeout = 2
+
+    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    drop_mysql_table(conn, table_name)
+    create_mysql_table(conn, table_name)
+
+    node1.query('''
+        CREATE TABLE {}
+        (
+            id UInt32,
+            name String,
+            age UInt32,
+            money UInt32
+        )
+        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')
+        SETTINGS connection_wait_timeout={}, connection_pool_size=1
+        '''.format(table_name, table_name, wait_timeout)
+    )
+
+    node1.query("INSERT INTO {} (id, name) SELECT number, concat('name_', toString(number)) from numbers(10) ".format(table_name))
+
+    def worker():
+        node1.query("SELECT sleepEachRow(1) FROM {}".format(table_name))
+
+    worker_thread = threading.Thread(target=worker)
+    worker_thread.start()
+
+    # ensure that first query started in worker_thread
+    time.sleep(1)
+
+    started = time.time()
+    with pytest.raises(QueryRuntimeException, match=r"Exception: mysqlxx::Pool is full \(connection_wait_timeout is exceeded\)"):
+        node1.query("SELECT sleepEachRow(1) FROM {}".format(table_name))
+    ended = time.time()
+    assert (ended - started) >= wait_timeout
+
+    worker_thread.join()
+
+    drop_mysql_table(conn, table_name)
+    conn.close()
+
+
+def test_predefined_connection_configuration(started_cluster):
+    conn = get_mysql_conn(started_cluster, started_cluster.mysql_ip)
+    table_name = 'test_table'
+    drop_mysql_table(conn, table_name)
+    create_mysql_table(conn, table_name)
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql1);
+    ''')
+    node1.query("INSERT INTO test_table (id, name, money) select number, toString(number), number from numbers(100)")
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql1, replace_query=1);
+    ''')
+    node1.query("INSERT INTO test_table (id, name, money) select number, toString(number), number from numbers(100)")
+    node1.query("INSERT INTO test_table (id, name, money) select number, toString(number), number from numbers(100)")
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query_and_get_error('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql1, query=1);
+    ''')
+    node1.query_and_get_error('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql1, replace_query=1, on_duplicate_clause='kek');
+    ''')
+    node1.query_and_get_error('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(fff);
+    ''')
+    node1.query_and_get_error('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql2);
+    ''')
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql3, port=3306);
+    ''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+
+# Regression for (k, v) IN ((k, v))
+def test_mysql_in(started_cluster):
+    table_name = 'test_mysql_in'
+    node1.query(f'DROP TABLE IF EXISTS {table_name}')
+
+    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    drop_mysql_table(conn, table_name)
+    create_mysql_table(conn, table_name)
+
+    node1.query('''
+        CREATE TABLE {}
+        (
+            id UInt32,
+            name String,
+            age UInt32,
+            money UInt32
+        )
+        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')
+        '''.format(table_name, table_name)
+    )
+
+    node1.query("INSERT INTO {} (id, name) SELECT number, concat('name_', toString(number)) from numbers(10) ".format(table_name))
+    node1.query("SELECT * FROM {} WHERE (id) IN (1)".format(table_name))
+    node1.query("SELECT * FROM {} WHERE (id) IN (1, 2)".format(table_name))
+    node1.query("SELECT * FROM {} WHERE (id, name) IN ((1, 'name_1'))".format(table_name))
+    node1.query("SELECT * FROM {} WHERE (id, name) IN ((1, 'name_1'),(1, 'name_1'))".format(table_name))
+
+    drop_mysql_table(conn, table_name)
+    conn.close()
+
+
 if __name__ == '__main__':
     with contextmanager(started_cluster)() as cluster:
         for name, instance in list(cluster.instances.items()):
diff --git a/tests/integration/test_storage_postgresql/configs/named_collections.xml b/tests/integration/test_storage_postgresql/configs/named_collections.xml
new file mode 100644
index 00000000000..0fedfbe8207
--- /dev/null
+++ b/tests/integration/test_storage_postgresql/configs/named_collections.xml
@@ -0,0 +1,33 @@
+<yandex>
+    <named_collections>
+        <postgres1>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>postgres</database>
+            <table>test_table</table>
+        </postgres1>
+        <postgres2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </postgres2>
+        <postgres3>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>1111</port>
+            <database>postgres</database>
+            <table>test_table</table>
+        </postgres3>
+        <postgres4>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>postgres</database>
+            <table>test_replicas</table>
+        </postgres4>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_storage_postgresql/test.py b/tests/integration/test_storage_postgresql/test.py
index bb0e284eac9..6f43036e64d 100644
--- a/tests/integration/test_storage_postgresql/test.py
+++ b/tests/integration/test_storage_postgresql/test.py
@@ -5,8 +5,8 @@ from multiprocessing.dummy import Pool
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', with_postgres=True)
-node2 = cluster.add_instance('node2', with_postgres_cluster=True)
+node1 = cluster.add_instance('node1', main_configs=['configs/named_collections.xml'], with_postgres=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/named_collections.xml'], with_postgres_cluster=True)
 
 
 @pytest.fixture(scope="module")
@@ -18,7 +18,6 @@ def started_cluster():
     finally:
         cluster.shutdown()
 
-
 def test_postgres_select_insert(started_cluster):
     cursor = started_cluster.postgres_conn.cursor()
     table_name = 'test_many'
@@ -243,9 +242,9 @@ def test_postgres_distributed(started_cluster):
         cursors[i].execute(f"""INSERT INTO test_replicas select i, 'host{i+1}' from generate_series(0, 99) as t(i);""");
 
     # test multiple ports parsing
-    result = node2.query('''SELECT DISTINCT(name) FROM postgresql(`postgres{1|2|3}:5432`, 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+    result = node2.query('''SELECT DISTINCT(name) FROM postgresql('postgres{1|2|3}:5432', 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
     assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
-    result = node2.query('''SELECT DISTINCT(name) FROM postgresql(`postgres2:5431|postgres3:5432`, 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+    result = node2.query('''SELECT DISTINCT(name) FROM postgresql('postgres2:5431|postgres3:5432', 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
     assert(result == 'host3\n' or result == 'host2\n')
 
     # Create storage with with 3 replicas
@@ -253,7 +252,7 @@ def test_postgres_distributed(started_cluster):
     node2.query('''
         CREATE TABLE test_replicas
         (id UInt32, name String)
-        ENGINE = PostgreSQL(`postgres{2|3|4}:5432`, 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+        ENGINE = PostgreSQL('postgres{2|3|4}:5432', 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
 
     # Check all replicas are traversed
     query = "SELECT name FROM ("
@@ -269,12 +268,20 @@ def test_postgres_distributed(started_cluster):
     node2.query('''
         CREATE TABLE test_shards
         (id UInt32, name String, age UInt32, money UInt32)
-        ENGINE = ExternalDistributed('PostgreSQL', `postgres{1|2}:5432,postgres{3|4}:5432`, 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+        ENGINE = ExternalDistributed('PostgreSQL', 'postgres{1|2}:5432,postgres{3|4}:5432', 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
 
     # Check only one replica in each shard is used
     result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
     assert(result == 'host1\nhost3\n')
 
+    node2.query('''
+        CREATE TABLE test_shards2
+        (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE = ExternalDistributed('PostgreSQL', postgres4, description='postgres{1|2}:5432,postgres{3|4}:5432'); ''')
+
+    result = node2.query("SELECT DISTINCT(name) FROM test_shards2 ORDER BY name")
+    assert(result == 'host1\nhost3\n')
+
     # Check all replicas are traversed
     query = "SELECT name FROM ("
     for i in range (3):
@@ -354,6 +361,69 @@ def test_postgres_on_conflict(started_cluster):
     cursor.execute(f'DROP TABLE {table} ')
 
 
+def test_predefined_connection_configuration(started_cluster):
+    cursor = started_cluster.postgres_conn.cursor()
+    cursor.execute(f'DROP TABLE IF EXISTS test_table')
+    cursor.execute(f'CREATE TABLE test_table (a integer PRIMARY KEY, b integer)')
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres1);
+    ''')
+    node1.query(f''' INSERT INTO test_table SELECT number, number from numbers(100)''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query('''
+        DROP TABLE test_table;
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres1, on_conflict='ON CONFLICT DO NOTHING');
+    ''')
+    node1.query(f''' INSERT INTO test_table SELECT number, number from numbers(100)''')
+    node1.query(f''' INSERT INTO test_table SELECT number, number from numbers(100)''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query('DROP TABLE test_table;')
+    node1.query_and_get_error('''
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres1, 'ON CONFLICT DO NOTHING');
+    ''')
+    node1.query_and_get_error('''
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres2);
+    ''')
+    node1.query_and_get_error('''
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(unknown_collection);
+    ''')
+
+    node1.query('''
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres1, port=5432, database='postgres', table='test_table');
+    ''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query('''
+        DROP TABLE test_table;
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres3, port=5432);
+    ''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    assert (node1.query(f"SELECT count() FROM postgresql(postgres1)").rstrip() == '100')
+    node1.query("INSERT INTO TABLE FUNCTION postgresql(postgres1, on_conflict='ON CONFLICT DO NOTHING') SELECT number, number from numbers(100)")
+    assert (node1.query(f"SELECT count() FROM postgresql(postgres1)").rstrip() == '100')
+
+    cursor.execute('DROP SCHEMA IF EXISTS test_schema CASCADE')
+    cursor.execute('CREATE SCHEMA test_schema')
+    cursor.execute('CREATE TABLE test_schema.test_table (a integer)')
+    node1.query("INSERT INTO TABLE FUNCTION postgresql(postgres1, schema='test_schema', on_conflict='ON CONFLICT DO NOTHING') SELECT number from numbers(200)")
+    assert (node1.query(f"SELECT count() FROM postgresql(postgres1, schema='test_schema')").rstrip() == '200')
+
+    cursor.execute('DROP SCHEMA test_schema CASCADE')
+    cursor.execute(f'DROP TABLE test_table ')
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_rabbitmq/test.py b/tests/integration/test_storage_rabbitmq/test.py
index a8efea1c5d6..9e2752438f8 100644
--- a/tests/integration/test_storage_rabbitmq/test.py
+++ b/tests/integration/test_storage_rabbitmq/test.py
@@ -791,6 +791,7 @@ def test_rabbitmq_many_inserts(rabbitmq_cluster):
 
     while True:
         result = instance.query('SELECT count() FROM test.view_many')
+        print(result, messages_num * threads_num)
         if int(result) == messages_num * threads_num:
             break
         time.sleep(1)
@@ -1670,7 +1671,6 @@ def test_rabbitmq_restore_failed_connection_without_losses_2(rabbitmq_cluster):
         channel.basic_publish(exchange='consumer_reconnect', routing_key='', body=messages[msg_id],
                               properties=pika.BasicProperties(delivery_mode=2, message_id=str(msg_id)))
     connection.close()
-
     instance.query('''
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
@@ -1682,6 +1682,7 @@ def test_rabbitmq_restore_failed_connection_without_losses_2(rabbitmq_cluster):
     ''')
 
     while int(instance.query('SELECT count() FROM test.view')) == 0:
+        print(3)
         time.sleep(0.1)
 
     kill_rabbitmq(rabbitmq_cluster.rabbitmq_docker_id)
@@ -1713,6 +1714,7 @@ def test_rabbitmq_commit_on_block_write(rabbitmq_cluster):
     instance.query('''
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
+        DROP TABLE IF EXISTS test.rabbitmq;
         CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -1777,9 +1779,22 @@ def test_rabbitmq_commit_on_block_write(rabbitmq_cluster):
     assert result == 1, 'Messages from RabbitMQ get duplicated!'
 
 
-def test_rabbitmq_no_connection_at_startup(rabbitmq_cluster):
+def test_rabbitmq_no_connection_at_startup_1(rabbitmq_cluster):
     # no connection when table is initialized
     rabbitmq_cluster.pause_container('rabbitmq1')
+    instance.query_and_get_error('''
+        CREATE TABLE test.cs (key UInt64, value UInt64)
+            ENGINE = RabbitMQ
+            SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
+                     rabbitmq_exchange_name = 'cs',
+                     rabbitmq_format = 'JSONEachRow',
+                     rabbitmq_num_consumers = '5',
+                     rabbitmq_row_delimiter = '\\n';
+    ''')
+    rabbitmq_cluster.unpause_container('rabbitmq1')
+
+
+def test_rabbitmq_no_connection_at_startup_2(rabbitmq_cluster):
     instance.query('''
         CREATE TABLE test.cs (key UInt64, value UInt64)
             ENGINE = RabbitMQ
@@ -1796,10 +1811,10 @@ def test_rabbitmq_no_connection_at_startup(rabbitmq_cluster):
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS
             SELECT * FROM test.cs;
     ''')
-    time.sleep(5)
+    instance.query("DETACH TABLE test.cs")
+    rabbitmq_cluster.pause_container('rabbitmq1')
+    instance.query("ATTACH TABLE test.cs")
     rabbitmq_cluster.unpause_container('rabbitmq1')
-    # need to make sure rabbit table made all rabbit setup
-    time.sleep(10)
 
     messages_num = 1000
     credentials = pika.PlainCredentials('root', 'clickhouse')
@@ -2032,18 +2047,19 @@ def test_rabbitmq_queue_consume(rabbitmq_cluster):
     instance.query('DROP TABLE test.rabbitmq_queue')
 
 
-def test_rabbitmq_drop_table_with_unfinished_setup(rabbitmq_cluster):
-    rabbitmq_cluster.pause_container('rabbitmq1')
-    instance.query('''
+def test_rabbitmq_bad_args(rabbitmq_cluster):
+    credentials = pika.PlainCredentials('root', 'clickhouse')
+    parameters = pika.ConnectionParameters(rabbitmq_cluster.rabbitmq_ip, rabbitmq_cluster.rabbitmq_port, '/', credentials)
+    connection = pika.BlockingConnection(parameters)
+    channel = connection.channel()
+    channel.exchange_declare(exchange='f', exchange_type='fanout')
+    instance.query_and_get_error('''
         CREATE TABLE test.drop (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
-                     rabbitmq_exchange_name = 'drop',
+                     rabbitmq_exchange_name = 'f',
                      rabbitmq_format = 'JSONEachRow';
     ''')
-    time.sleep(5)
-    instance.query('DROP TABLE test.drop;')
-    rabbitmq_cluster.unpause_container('rabbitmq1')
 
 
 if __name__ == '__main__':
diff --git a/tests/integration/test_storage_s3/configs/named_collections.xml b/tests/integration/test_storage_s3/configs/named_collections.xml
new file mode 100644
index 00000000000..5af6d84859a
--- /dev/null
+++ b/tests/integration/test_storage_s3/configs/named_collections.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <named_collections>
+        <s3_conf1>
+            <url>http://minio1:9001/root/test_table</url>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+        </s3_conf1>
+    </named_collections>
+</yandex>
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 95b823c8345..2f49b462d19 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -87,7 +87,7 @@ def started_cluster():
         cluster = ClickHouseCluster(__file__)
         cluster.add_instance("restricted_dummy", main_configs=["configs/config_for_test_remote_host_filter.xml"],
                              with_minio=True)
-        cluster.add_instance("dummy", with_minio=True, main_configs=["configs/defaultS3.xml"])
+        cluster.add_instance("dummy", with_minio=True, main_configs=["configs/defaultS3.xml", "configs/named_collections.xml"])
         cluster.add_instance("s3_max_redirects", with_minio=True, main_configs=["configs/defaultS3.xml"],
                              user_configs=["configs/s3_max_redirects.xml"])
         logging.info("Starting cluster...")
@@ -735,3 +735,18 @@ def test_truncate_table(started_cluster):
     assert(len(list(minio.list_objects(started_cluster.minio_bucket, 'truncate/'))) == 0)
     assert instance.query("SELECT * FROM {}".format(name)) == ""
 
+
+def test_predefined_connection_configuration(started_cluster):
+    bucket = started_cluster.minio_bucket
+    instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
+    name = "test_table"
+
+    instance.query("drop table if exists {}".format(name))
+    instance.query("CREATE TABLE {} (id UInt32) ENGINE = S3(s3_conf1, format='CSV')".format(name))
+
+    instance.query("INSERT INTO {} SELECT number FROM numbers(10)".format(name))
+    result = instance.query("SELECT * FROM {}".format(name))
+    assert result == instance.query("SELECT number FROM numbers(10)")
+
+    result = instance.query("SELECT * FROM s3(s3_conf1, format='CSV', structure='id UInt32')")
+    assert result == instance.query("SELECT number FROM numbers(10)")
diff --git a/tests/ints_dictionary.xml b/tests/ints_dictionary.xml
deleted file mode 120000
index 1daa76b8267..00000000000
--- a/tests/ints_dictionary.xml
+++ /dev/null
@@ -1 +0,0 @@
-config/ints_dictionary.xml
\ No newline at end of file
diff --git a/tests/performance/fuse_sumcount.xml b/tests/performance/fuse_sumcount.xml
index b2eb0e678e2..237edb1b970 100644
--- a/tests/performance/fuse_sumcount.xml
+++ b/tests/performance/fuse_sumcount.xml
@@ -6,7 +6,7 @@
          Also test GROUP BY with and without keys, because they might have different
          optimizations. -->
     <settings>
-        <optimize_fuse_sum_count_avg>1</optimize_fuse_sum_count_avg>
+        <optimize_syntax_fuse_functions>1</optimize_syntax_fuse_functions>
     </settings>
 
     <substitutions>
@@ -21,13 +21,13 @@
 
     <query>SELECT sum(number)                             FROM numbers(1000000000) FORMAT Null</query>
     <query>SELECT sum(number), count(number)              FROM numbers(1000000000) FORMAT Null</query>
-    <query>SELECT sum(number), count(number)              FROM numbers(1000000000) SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), count(number)              FROM numbers(1000000000) SETTINGS optimize_syntax_fuse_functions = 0 FORMAT Null</query>
     <query>SELECT sum(number), avg(number), count(number) FROM numbers(1000000000) FORMAT Null</query>
-    <query>SELECT sum(number), avg(number), count(number) FROM numbers(1000000000) SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), avg(number), count(number) FROM numbers(1000000000) SETTINGS optimize_syntax_fuse_functions = 0 FORMAT Null</query>
 
     <query>SELECT sum(number)                             FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
     <query>SELECT sum(number), count(number)              FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
-    <query>SELECT sum(number), count(number)              FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), count(number)              FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_syntax_fuse_functions = 0 FORMAT Null</query>
     <query>SELECT sum(number), avg(number), count(number) FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
-    <query>SELECT sum(number), avg(number), count(number) FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), avg(number), count(number) FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_syntax_fuse_functions = 0 FORMAT Null</query>
 </test>
diff --git a/tests/performance/sum.xml b/tests/performance/sum.xml
index 9bee2a580c3..57b879a360d 100644
--- a/tests/performance/sum.xml
+++ b/tests/performance/sum.xml
@@ -16,4 +16,15 @@
     <query>SELECT sum(toNullable(toFloat64(number))) FROM numbers(100000000)</query>
     <query>SELECT sumKahan(toNullable(toFloat32(number))) FROM numbers(100000000)</query>
     <query>SELECT sumKahan(toNullable(toFloat64(number))) FROM numbers(100000000)</query>
+
+    <!-- Create a table with ~20% null values. Make it random so the branch predictor doesn't do all the work -->
+    <create_query>CREATE TABLE nullfloat32 (x Nullable(Float32)) ENGINE = Memory</create_query>
+    <fill_query>INSERT INTO nullfloat32
+                SELECT IF(rand() % 5 == 0, NULL::Nullable(Float32), toFloat32(number)) as x
+                FROM numbers_mt(200000000)
+                SETTINGS max_threads = 8
+    </fill_query>
+    <query short="1">SELECT sum(x) FROM nullfloat32</query>
+    <query short="1">SELECT sum(x::Nullable(Float64)) FROM nullfloat32</query>
+    <drop_query>DROP TABLE IF EXISTS nullfloat32</drop_query>
 </test>
diff --git a/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql b/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
index defbf1aabc9..8bc1c39b574 100644
--- a/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
+++ b/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT (dummy AS x) - 1 FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql b/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
index f9d1380bae4..7f236212a4c 100644
--- a/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
+++ b/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT count() FROM remote('127.0.0.{2,3}', system, one) WHERE arrayExists((x) -> x = 1, [1, 2, 3])
diff --git a/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql b/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
index b7e672a32b6..84956f0d97e 100644
--- a/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
+++ b/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT quantilesTiming(0.1, 0.5, 0.9)(dummy) FROM remote('127.0.0.{2,3}', system, one) GROUP BY 1 WITH TOTALS
diff --git a/tests/queries/0_stateless/00026_shard_something_distributed.sql b/tests/queries/0_stateless/00026_shard_something_distributed.sql
index aff6d02c1ed..23598edb574 100644
--- a/tests/queries/0_stateless/00026_shard_something_distributed.sql
+++ b/tests/queries/0_stateless/00026_shard_something_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT NOT dummy FROM remote('127.0.0.{2,3}', system, one) WHERE NOT dummy
diff --git a/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql b/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
index 64415c3269c..f16679d6dc3 100644
--- a/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
+++ b/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS big_array;
 CREATE TABLE big_array (x Array(UInt8)) ENGINE=TinyLog;
 SET min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
diff --git a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
index 3360b8da83d..20be34499d5 100755
--- a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
+++ b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00059_shard_global_in.sql b/tests/queries/0_stateless/00059_shard_global_in.sql
index 4da93e0a14a..e9ab21490bf 100644
--- a/tests/queries/0_stateless/00059_shard_global_in.sql
+++ b/tests/queries/0_stateless/00059_shard_global_in.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT number FROM remote('127.0.0.{2,3}', system, numbers) WHERE number GLOBAL IN (SELECT number FROM remote('127.0.0.{2,3}', system, numbers) WHERE number % 2 = 1 LIMIT 10) LIMIT 10;
diff --git a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
index 9901dfad9c8..e8d1a713c21 100644
--- a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_alter1;
 DROP TABLE IF EXISTS replicated_alter2;
 
diff --git a/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql b/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
index 2c3f0dfb0e3..9ee5c4d8915 100644
--- a/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
+++ b/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT toTypeName(1.0) FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00067_replicate_segfault.sql b/tests/queries/0_stateless/00067_replicate_segfault.sql
index bf1a756d887..bf4c90d5adf 100644
--- a/tests/queries/0_stateless/00067_replicate_segfault.sql
+++ b/tests/queries/0_stateless/00067_replicate_segfault.sql
@@ -1,2 +1,4 @@
+-- Tags: replica
+
 SELECT arrayFilter(x -> materialize(0), materialize([0])) AS p, arrayAll(y -> arrayExists(x -> y != x, p), p) AS test;
 SELECT arrayFilter(x -> materialize(0), materialize([''])) AS p, arrayAll(y -> arrayExists(x -> y != x, p), p) AS test;
diff --git a/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql b/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
index 351f18ef4bd..5305c0d05fb 100644
--- a/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
+++ b/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT -(-1) FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql b/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
index efb7ccf5f71..137dfb5b6f0 100644
--- a/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
+++ b/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_show_tables;
 
 CREATE DATABASE test_show_tables;
diff --git a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
index 65247d7b12c..3418d093f70 100644
--- a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
@@ -1,3 +1,7 @@
+-- Tags: long, zookeeper, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Old syntax is not allowed
+-- Tag no-parallel: leftovers
+
 SET optimize_on_insert = 0;
 
 DROP TABLE IF EXISTS merge_tree;
diff --git a/tests/queries/0_stateless/00090_union_race_conditions_1.sh b/tests/queries/0_stateless/00090_union_race_conditions_1.sh
index afec8b5bac9..241436369b1 100755
--- a/tests/queries/0_stateless/00090_union_race_conditions_1.sh
+++ b/tests/queries/0_stateless/00090_union_race_conditions_1.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00091_union_race_conditions_2.sh b/tests/queries/0_stateless/00091_union_race_conditions_2.sh
index 78a6cca2b2b..aadbbe8d7d3 100755
--- a/tests/queries/0_stateless/00091_union_race_conditions_2.sh
+++ b/tests/queries/0_stateless/00091_union_race_conditions_2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00092_union_race_conditions_3.sh b/tests/queries/0_stateless/00092_union_race_conditions_3.sh
index 9be2613f70a..a6f8fa5f6ec 100755
--- a/tests/queries/0_stateless/00092_union_race_conditions_3.sh
+++ b/tests/queries/0_stateless/00092_union_race_conditions_3.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00093_union_race_conditions_4.sh b/tests/queries/0_stateless/00093_union_race_conditions_4.sh
index ab1a025c5b2..3e3713f4024 100755
--- a/tests/queries/0_stateless/00093_union_race_conditions_4.sh
+++ b/tests/queries/0_stateless/00093_union_race_conditions_4.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00094_union_race_conditions_5.sh b/tests/queries/0_stateless/00094_union_race_conditions_5.sh
index b546b6a0092..fcd2b8bebb6 100755
--- a/tests/queries/0_stateless/00094_union_race_conditions_5.sh
+++ b/tests/queries/0_stateless/00094_union_race_conditions_5.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
index b3c0b37e0c0..bcd6cbefaff 100755
--- a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
+++ b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
index 3856da7f214..a2a08105804 100755
--- a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
+++ b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00098_shard_i_union_all.sql b/tests/queries/0_stateless/00098_shard_i_union_all.sql
index b02a468bc82..5151f9ad0e5 100644
--- a/tests/queries/0_stateless/00098_shard_i_union_all.sql
+++ b/tests/queries/0_stateless/00098_shard_i_union_all.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS report1;
 DROP TABLE IF EXISTS report2;
 
diff --git a/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql b/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
index 9885c3c6f44..2fd097b9538 100644
--- a/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
+++ b/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00101_0;
 
 USE test_00101_0;
diff --git a/tests/queries/0_stateless/00105_shard_collations.sql b/tests/queries/0_stateless/00105_shard_collations.sql
index a73c441cc19..3a4151eebf8 100644
--- a/tests/queries/0_stateless/00105_shard_collations.sql
+++ b/tests/queries/0_stateless/00105_shard_collations.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-fasttest
+
 SELECT 'Русский (default)';
 SELECT arrayJoin(['а', 'я', 'ё', 'А', 'Я', 'Ё']) AS x ORDER BY x;
 
diff --git a/tests/queries/0_stateless/00108_shard_totals_after_having.sql b/tests/queries/0_stateless/00108_shard_totals_after_having.sql
index 37825b269f7..db0527c27ab 100644
--- a/tests/queries/0_stateless/00108_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00108_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET max_rows_to_group_by = 100000;
 SET group_by_overflow_mode = 'any';
 
diff --git a/tests/queries/0_stateless/00109_shard_totals_after_having.sql b/tests/queries/0_stateless/00109_shard_totals_after_having.sql
index ae143f594c5..2a616b4a39d 100644
--- a/tests/queries/0_stateless/00109_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00109_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel, no-fasttest
+
 SET max_rows_to_group_by = 100000;
 SET max_block_size = 100001;
 SET group_by_overflow_mode = 'any';
diff --git a/tests/queries/0_stateless/00110_external_sort.sql b/tests/queries/0_stateless/00110_external_sort.sql
index e7284796552..dd65c3e9546 100644
--- a/tests/queries/0_stateless/00110_external_sort.sql
+++ b/tests/queries/0_stateless/00110_external_sort.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET max_memory_usage = 300000000;
 SET max_bytes_before_external_sort = 20000000;
 SELECT number FROM (SELECT number FROM system.numbers LIMIT 10000000) ORDER BY number * 1234567890123456789 LIMIT 9999990, 10;
diff --git a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
index 5f5fa5443fd..112f5edae36 100644
--- a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
+++ b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_memory_usage = 300000000;
 SET max_bytes_before_external_sort = 20000000;
 
diff --git a/tests/queries/0_stateless/00112_shard_totals_after_having.sql b/tests/queries/0_stateless/00112_shard_totals_after_having.sql
index bea0bd36ef2..27952ae28c4 100644
--- a/tests/queries/0_stateless/00112_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00112_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET totals_mode = 'after_having_auto';
 SET max_rows_to_group_by = 100000;
 SET group_by_overflow_mode = 'any';
diff --git a/tests/queries/0_stateless/00113_shard_group_array.sql b/tests/queries/0_stateless/00113_shard_group_array.sql
index b960144ac4e..b589f9ce047 100644
--- a/tests/queries/0_stateless/00113_shard_group_array.sql
+++ b/tests/queries/0_stateless/00113_shard_group_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT intDiv(number, 100) AS k, length(groupArray(number)) FROM (SELECT * FROM system.numbers LIMIT 1000000) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
 
 SELECT '';
diff --git a/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh b/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
index 1348989e244..5c3918dea9f 100755
--- a/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
+++ b/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00116_storage_set.sql b/tests/queries/0_stateless/00116_storage_set.sql
index 0eeed7e859a..b06ee254c69 100644
--- a/tests/queries/0_stateless/00116_storage_set.sql
+++ b/tests/queries/0_stateless/00116_storage_set.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS set;
 DROP TABLE IF EXISTS set2;
 
diff --git a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
index 2aee56135f2..fd32f3d32d2 100644
--- a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
+++ b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS alter_00121;
 CREATE TABLE alter_00121 (d Date, x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/alter_00121/t1', 'r1', d, (d), 8192);
 
diff --git a/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql b/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
index 396be0683d3..788f16c2202 100644
--- a/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
+++ b/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_distributed_connections = 1;
 SELECT count() + 1 FROM remote('127.0.0.{2,3}', system, one);
diff --git a/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql b/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
index 5352a8eba1a..6bc5fe268d6 100644
--- a/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
+++ b/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, distributed
+
 SET max_parallel_replicas = 2;
 
 DROP TABLE IF EXISTS report;
diff --git a/tests/queries/0_stateless/00132_sets.sql b/tests/queries/0_stateless/00132_sets.sql
index f9cb2fbbd35..1b0a5fd0f64 100644
--- a/tests/queries/0_stateless/00132_sets.sql
+++ b/tests/queries/0_stateless/00132_sets.sql
@@ -7,7 +7,7 @@ SELECT (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, '') IN (1, 2, 3,
 SELECT (number AS n, n + 1, n + 2, n + 3) IN (1, 2, 3, 4) FROM system.numbers LIMIT 3;
 SELECT (number AS n, n + 1, n + 2, n + 3, n - 1) IN (1, 2, 3, 4, 0) FROM system.numbers LIMIT 3;
 SELECT (number AS n, n + 1, toString(n + 2), n + 3, n - 1) IN (1, 2, '3', 4, 0) FROM system.numbers LIMIT 3;
-SELECT number, tuple FROM (SELECT 1 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN (((1, (2, 3)), (4, (5, 6))));
+SELECT number, tuple FROM (SELECT 1 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN ( (/*number*/1, /*tuple*/(2, 3)), (/*number*/4, /*tuple*/(5, 6)) );
 SELECT number, tuple FROM (SELECT 2 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN ((2, (2, 3)));
 SELECT number, tuple FROM (SELECT 3 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN (3, (2, 3));
 SELECT number, tuple FROM (SELECT 4 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN (SELECT 4, (2, 3));
diff --git a/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh b/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
index 05ebe9d19a8..389a2cd9684 100755
--- a/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
+++ b/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, shard, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql b/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
index 8f98cd6d62a..a9493418e8e 100644
--- a/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
+++ b/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT DISTINCT number FROM remote('127.0.0.{2,3}', system.numbers) LIMIT 10
diff --git a/tests/queries/0_stateless/00155_long_merges.sh b/tests/queries/0_stateless/00155_long_merges.sh
index c2aafaf0c95..f2d9cd1dade 100755
--- a/tests/queries/0_stateless/00155_long_merges.sh
+++ b/tests/queries/0_stateless/00155_long_merges.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql b/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
index 8d5d297b629..23c157db875 100644
--- a/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
+++ b/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test2_00158;
 DROP TABLE IF EXISTS test2_00158.mt_buffer_00158;
 DROP TABLE IF EXISTS test2_00158.mt_00158;
diff --git a/tests/queries/0_stateless/00162_shard_global_join.sql b/tests/queries/0_stateless/00162_shard_global_join.sql
index af56407e3d5..040eb0e7c03 100644
--- a/tests/queries/0_stateless/00162_shard_global_join.sql
+++ b/tests/queries/0_stateless/00162_shard_global_join.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT toFloat64(dummy + 2) AS n, j1, j2 FROM remote('127.0.0.{2,3}', system.one) jr1 GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 10) jr2 USING n LIMIT 10;
diff --git a/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql b/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
index ab7f347656d..71c570cf762 100644
--- a/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
+++ b/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
 
diff --git a/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql b/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
index 2bd4156a4cb..b28f4e65487 100644
--- a/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
+++ b/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT arrayMap((x, y) -> (x, y), [1, 2, 3], [4, 5, 6]) FROM remote('127.0.0.{2,3}', system.one) ORDER BY rand();
diff --git a/tests/queries/0_stateless/00178_function_replicate.sql b/tests/queries/0_stateless/00178_function_replicate.sql
index 13ce1c24364..832334774ee 100644
--- a/tests/queries/0_stateless/00178_function_replicate.sql
+++ b/tests/queries/0_stateless/00178_function_replicate.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SELECT
     number,
     range(number) AS arr,
diff --git a/tests/queries/0_stateless/00180_attach_materialized_view.sql b/tests/queries/0_stateless/00180_attach_materialized_view.sql
index d674c0bd277..9bebd46da84 100644
--- a/tests/queries/0_stateless/00180_attach_materialized_view.sql
+++ b/tests/queries/0_stateless/00180_attach_materialized_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t_00180;
 DROP TABLE IF EXISTS mv_00180;
 DROP TABLE IF EXISTS `.inner.mv_00180`;
diff --git a/tests/queries/0_stateless/00183_skip_unavailable_shards.sql b/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
index 4aa7cc72605..0f05618e746 100644
--- a/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
+++ b/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET send_logs_level = 'fatal';
 SELECT count() FROM remote('{127,1}.0.0.{2,3}', system.one) SETTINGS skip_unavailable_shards = 1;
 SELECT count() FROM remote('{1,127}.0.0.{2,3}', system.one) SETTINGS skip_unavailable_shards = 1;
diff --git a/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql b/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
index cce10312e8f..965ce45fb90 100644
--- a/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
+++ b/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'distributed_group_by_no_merge=1';
 SELECT count(), uniq(dummy) FROM remote('127.0.0.{2,3}', system.one) SETTINGS distributed_group_by_no_merge=1;
 SELECT count(), uniq(dummy) FROM remote('127.0.0.{2,3,4,5}', system.one) SETTINGS distributed_group_by_no_merge=1;
diff --git a/tests/queries/0_stateless/00186_very_long_arrays.sh b/tests/queries/0_stateless/00186_very_long_arrays.sh
index 26a4496a85b..739b17ccc99 100755
--- a/tests/queries/0_stateless/00186_very_long_arrays.sh
+++ b/tests/queries/0_stateless/00186_very_long_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00189_time_zones_long.sql b/tests/queries/0_stateless/00189_time_zones_long.sql
index 36c7dfb402a..ecc5f62ed1d 100644
--- a/tests/queries/0_stateless/00189_time_zones_long.sql
+++ b/tests/queries/0_stateless/00189_time_zones_long.sql
@@ -1,3 +1,4 @@
+-- Tags: long
 
 /* timestamp 1419800400 == 2014-12-29 00:00:00 (Europe/Moscow) */
 /* timestamp 1412106600 == 2014-09-30 23:50:00 (Europe/Moscow) */
diff --git a/tests/queries/0_stateless/00193_parallel_replicas.sql b/tests/queries/0_stateless/00193_parallel_replicas.sql
index d1430d74045..6c5b50972cc 100644
--- a/tests/queries/0_stateless/00193_parallel_replicas.sql
+++ b/tests/queries/0_stateless/00193_parallel_replicas.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS parallel_replicas;
 DROP TABLE IF EXISTS parallel_replicas_backup;
 
diff --git a/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql b/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
index fa4a9b97c4d..da21c56056c 100644
--- a/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
+++ b/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT * FROM (SELECT * WHERE dummy GLOBAL IN (SELECT 0));
 SELECT * FROM (SELECT * WHERE dummy GLOBAL IN (SELECT toUInt8(number) FROM system.numbers LIMIT 10));
 SELECT * FROM (SELECT * FROM (SELECT * FROM system.numbers LIMIT 20) WHERE number GLOBAL IN (SELECT number FROM system.numbers LIMIT 10));
diff --git a/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql b/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
index 6452e6b4254..6c3b8b5169b 100644
--- a/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
+++ b/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS numbers_memory;
 CREATE TABLE numbers_memory AS system.numbers ENGINE = Memory;
 INSERT INTO numbers_memory SELECT number FROM system.numbers LIMIT 100;
diff --git a/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql b/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
index 390aac0571b..7c44ac30929 100644
--- a/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
+++ b/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT toUInt64(1) IN (1234567890, 2345678901, 3456789012, 4567890123, 5678901234, 6789012345, 7890123456, 8901234567, 9012345678, 123456789) AS x,
     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,
     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,
diff --git a/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
index f1b3c82fec3..2e273cd8056 100644
--- a/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
+++ b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
@@ -1,3 +1,5 @@
+-- Tags: long, shard
+
 -- uniqHLL12
 
 SELECT 'uniqHLL12';
diff --git a/tests/queries/0_stateless/00213_multiple_global_in.sql b/tests/queries/0_stateless/00213_multiple_global_in.sql
index c79c4ef5e10..0992f666a44 100644
--- a/tests/queries/0_stateless/00213_multiple_global_in.sql
+++ b/tests/queries/0_stateless/00213_multiple_global_in.sql
@@ -1 +1,3 @@
+-- Tags: global
+
 SELECT 1 GLOBAL IN (SELECT 1), 2 GLOBAL IN (SELECT 2) FROM remote('localhost', system.one);
diff --git a/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
index 86b84f3f63c..d50f0daeb14 100644
--- a/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS primary_key;
 CREATE TABLE primary_key (d Date DEFAULT today(), x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00215/primary_key', 'r1', d, -x, 1);
 
diff --git a/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql b/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
index 0dd434f0dbf..0ebd60a7f5f 100644
--- a/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
+++ b/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET joined_subquery_requires_alias = 0;
 
 SELECT k, a FROM (SELECT 42 AS k FROM remote('127.0.0.2', system.one)) GLOBAL ALL FULL OUTER JOIN (SELECT 42 AS k, 1 AS a, a) USING k;
diff --git a/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql b/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
index 69fd37f1c2e..80a35a4855a 100644
--- a/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
+++ b/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT x FROM (SELECT count() AS x FROM remote('127.0.0.2', system.one) WITH TOTALS) LIMIT 1;
diff --git a/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql b/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
index 7a25139cdc4..94a70ec1fb1 100644
--- a/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
+++ b/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_block_size = 1000;
 
 DROP TABLE IF EXISTS numbers_10_00223;
diff --git a/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql b/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
index caf5f7aa7f1..f99f712b388 100644
--- a/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
+++ b/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS numbers_100k_log;
 CREATE TABLE numbers_100k_log ENGINE = Log AS SELECT * FROM system.numbers LIMIT 100000;
 
diff --git a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
index d70f337213e..0dec3ca05bc 100644
--- a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
+++ b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS deduplication;
 CREATE TABLE deduplication (d Date DEFAULT '2015-01-01', x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00226/deduplication', 'r1', d, x, 1);
 
diff --git a/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql b/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
index d1cb28bc97d..dc73655743e 100644
--- a/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
+++ b/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select quantilesDeterministic(0.5, 0.9)(number, number) from (select number from system.numbers limit 101);
 -- test merge does not cause overflow
 select ignore(quantilesDeterministic(0.5, 0.9)(number, number)) from (select number from remote('127.0.0.{2,3}', system, numbers) limit 1000000);
diff --git a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
index 96a131514f8..f6eb4b2f8c1 100644
--- a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 SET replication_alter_partitions_sync = 2;
 
 DROP TABLE IF EXISTS attach_r1;
diff --git a/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql b/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
index 282d5dad627..19105b5b935 100644
--- a/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
+++ b/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS storage;
 CREATE TABLE storage(UserID UInt64) ENGINE=Memory;
 INSERT INTO storage(UserID) values (6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(402895971392036118)(402895971392036118)(402895971392036118);
diff --git a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
index 2293b1de490..48336faf382 100644
--- a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
+++ b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select 40 as z from (select * from system.numbers limit 3) group by z;
 select 41 as z from remote('127.0.0.{2,3}', system.one) group by z;
 select count(), 42 AS z from remote('127.0.0.{2,3}', system.one) group by z;
diff --git a/tests/queries/0_stateless/00259_hashing_tuples.sql b/tests/queries/0_stateless/00259_hashing_tuples.sql
index eb90ac78e5a..3702dc133b4 100644
--- a/tests/queries/0_stateless/00259_hashing_tuples.sql
+++ b/tests/queries/0_stateless/00259_hashing_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT cityHash64(1, 2, '') AS x1, cityHash64((1, 2), '') AS x2, cityHash64(1, (2, '')) AS x3, cityHash64((1, 2, '')) AS x4;
 SELECT cityHash64(materialize(1), 2, '') AS x1, cityHash64((materialize(1), 2), '') AS x2, cityHash64(materialize(1), (2, '')) AS x3, cityHash64((materialize(1), 2, '')) AS x4;
 SELECT cityHash64(1, materialize(2), '') AS x1, cityHash64((1, materialize(2)), '') AS x2, cityHash64(1, (materialize(2), '')) AS x3, cityHash64((1, materialize(2), '')) AS x4;
diff --git a/tests/queries/0_stateless/00260_like_and_curly_braces.sql b/tests/queries/0_stateless/00260_like_and_curly_braces.sql
index 2d796b22d03..0064deb22db 100644
--- a/tests/queries/0_stateless/00260_like_and_curly_braces.sql
+++ b/tests/queries/0_stateless/00260_like_and_curly_braces.sql
@@ -1,3 +1,5 @@
+-- Tags: race
+
 SELECT 'a}a' AS x, x LIKE (concat('%', x, '%') AS pat), materialize(x) LIKE pat;
 SELECT 'a}a' AS x, x LIKE (concat('%', x) AS pat), materialize(x) LIKE pat;
 SELECT 'a}a' AS x, x LIKE (concat(x, '%') AS pat), materialize(x) LIKE pat;
diff --git a/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql b/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
index f15e1e5090e..37abdc90c87 100644
--- a/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
+++ b/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT 1 GLOBAL IN (SELECT 1) AS s, s FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00274_shard_group_array.sql b/tests/queries/0_stateless/00274_shard_group_array.sql
index 5257836ae5c..c9618962deb 100644
--- a/tests/queries/0_stateless/00274_shard_group_array.sql
+++ b/tests/queries/0_stateless/00274_shard_group_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT length(groupArray(number)), count() FROM (SELECT number FROM system.numbers_mt LIMIT 1000000);
 SELECT groupArray(dummy), count() FROM remote('127.0.0.{2,3}', system.one);
 
diff --git a/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql b/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
index 16d6307ca4c..607b16b48b1 100644
--- a/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
+++ b/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT quantileExactWeighted(0.5)(number, 1) FROM (SELECT number FROM system.numbers LIMIT 1001);
 SELECT quantilesExactWeighted(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(number, 1) FROM (SELECT number FROM system.numbers LIMIT 1001);
 SELECT quantilesExactWeighted(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(number, number) FROM (SELECT number FROM system.numbers LIMIT 1001);
diff --git a/tests/queries/0_stateless/00286_format_long_negative_float.sql b/tests/queries/0_stateless/00286_format_long_negative_float.sql
index e4d7a7085d2..0a93bab1395 100644
--- a/tests/queries/0_stateless/00286_format_long_negative_float.sql
+++ b/tests/queries/0_stateless/00286_format_long_negative_float.sql
@@ -1 +1,3 @@
+-- Tags: long
+
 select reinterpretAsFloat64(unhex('875635ffffffbfbe'))
diff --git a/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql b/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
index f7fd5fb1458..3b65f46533b 100644
--- a/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
+++ b/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS numbers_10_00290;
 SET max_block_size = 1000;
 CREATE TABLE numbers_10_00290 ENGINE = Log AS SELECT * FROM system.numbers LIMIT 10000;
diff --git a/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql b/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
index a8f51a61c12..150e087e0e4 100644
--- a/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
+++ b/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET max_subquery_depth = 3;
 
 SELECT 1 FROM remote('127.0.0.{1,2}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one))));
diff --git a/tests/queries/0_stateless/00294_shard_enums.sql b/tests/queries/0_stateless/00294_shard_enums.sql
index 9dc12aaadf1..414b9cfad03 100644
--- a/tests/queries/0_stateless/00294_shard_enums.sql
+++ b/tests/queries/0_stateless/00294_shard_enums.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set max_threads = 1;
 drop table if exists enums;
 
diff --git a/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql b/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
index 3fb96dae7c0..06cdb0bd86e 100644
--- a/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
+++ b/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET output_format_write_statistics = 0;
 SELECT arrayJoin(range(100)) AS x FROM remote('127.0.0.2', system.one) WHERE x GLOBAL IN (SELECT toUInt8(arrayJoin(range(100)) + 50)) GROUP BY x ORDER BY x LIMIT 10 FORMAT JSONCompact;
 SELECT arrayJoin(range(100)) AS x FROM remote('127.0.0.{2,3}', system.one) WHERE x GLOBAL IN (SELECT toUInt8(arrayJoin(range(100)) + 50)) GROUP BY x ORDER BY x LIMIT 10 FORMAT JSONCompact;
diff --git a/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled b/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
index 000e768e943..22043c287d2 100644
--- a/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
+++ b/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
@@ -1,3 +1,5 @@
+-- Tags: disabled, zookeeper, no-parallel
+
 DROP TABLE IF EXISTS r1;
 DROP TABLE IF EXISTS r2;
 
diff --git a/tests/queries/0_stateless/00302_http_compression.sh b/tests/queries/0_stateless/00302_http_compression.sh
index cfa9a930f09..69800d6e0bf 100755
--- a/tests/queries/0_stateless/00302_http_compression.sh
+++ b/tests/queries/0_stateless/00302_http_compression.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00305_http_and_readonly.sh b/tests/queries/0_stateless/00305_http_and_readonly.sh
index dd9f116be7a..c630f8c87ee 100755
--- a/tests/queries/0_stateless/00305_http_and_readonly.sh
+++ b/tests/queries/0_stateless/00305_http_and_readonly.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00311_array_primary_key.sql b/tests/queries/0_stateless/00311_array_primary_key.sql
index 0e066c64f89..f6e21beab9b 100644
--- a/tests/queries/0_stateless/00311_array_primary_key.sql
+++ b/tests/queries/0_stateless/00311_array_primary_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS array_pk;
 CREATE TABLE array_pk (key Array(UInt8), s String, n UInt64, d Date MATERIALIZED '2000-01-01') ENGINE = MergeTree(d, (key, s, n), 1);
 
diff --git a/tests/queries/0_stateless/00324_hashing_enums.sql b/tests/queries/0_stateless/00324_hashing_enums.sql
index 6cb834f29bf..9952f94248e 100644
--- a/tests/queries/0_stateless/00324_hashing_enums.sql
+++ b/tests/queries/0_stateless/00324_hashing_enums.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 SELECT cityHash64(*) FROM (SELECT 1 AS x, CAST(x AS Enum8('Hello' = 0, 'World' = 1)) AS y);
 SELECT cityHash64(*) FROM (SELECT 1 AS x, x AS y);
diff --git a/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled b/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
index 6014cb3bb67..124c9d2e496 100644
--- a/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
+++ b/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
@@ -1,3 +1,5 @@
+-- Tags: disabled
+
 DROP TABLE IF EXISTS replacing;
 CREATE TABLE replacing (d Date, k UInt64, s String, v UInt16) ENGINE = ReplacingMergeTree(d, k, 8192, v);
 
diff --git a/tests/queries/0_stateless/00326_long_function_multi_if.sql b/tests/queries/0_stateless/00326_long_function_multi_if.sql
index 3e460511487..0b941f8176c 100644
--- a/tests/queries/0_stateless/00326_long_function_multi_if.sql
+++ b/tests/queries/0_stateless/00326_long_function_multi_if.sql
@@ -1,3 +1,4 @@
+-- Tags: long
 
 SELECT 'Trivial case';
 
diff --git a/tests/queries/0_stateless/00328_long_case_construction.sql b/tests/queries/0_stateless/00328_long_case_construction.sql
index aa653d667f7..b05e388937a 100644
--- a/tests/queries/0_stateless/00328_long_case_construction.sql
+++ b/tests/queries/0_stateless/00328_long_case_construction.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 /* Trivial case */
 
 SELECT CASE WHEN 1 THEN 2 WHEN 3 THEN  4 ELSE 5 END;
diff --git a/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql b/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
index 17400eb6b7a..1cc0938b1be 100644
--- a/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
+++ b/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
@@ -1,2 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
 SELECT quantileTiming(number) FROM (SELECT * FROM system.numbers LIMIT 10000);
 SELECT floor(log2(1 + number) / log2(1.5)) AS k, count() AS c, quantileTiming(number % 10000) AS q FROM (SELECT * FROM system.numbers LIMIT 1000000) GROUP BY k ORDER BY k;
diff --git a/tests/queries/0_stateless/00336_shard_stack_trace.reference b/tests/queries/0_stateless/00336_shard_stack_trace.reference
index ca4011b20db..a956634eefc 100644
--- a/tests/queries/0_stateless/00336_shard_stack_trace.reference
+++ b/tests/queries/0_stateless/00336_shard_stack_trace.reference
@@ -2,6 +2,6 @@
 1
 Ok
 1
-2
+3
 Ok
-2
+3
diff --git a/tests/queries/0_stateless/00336_shard_stack_trace.sh b/tests/queries/0_stateless/00336_shard_stack_trace.sh
index 19389ec11c1..732a9a210c4 100755
--- a/tests/queries/0_stateless/00336_shard_stack_trace.sh
+++ b/tests/queries/0_stateless/00336_shard_stack_trace.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00337_shard_any_heavy.sql b/tests/queries/0_stateless/00337_shard_any_heavy.sql
index 508db866f86..ff955ab0dee 100644
--- a/tests/queries/0_stateless/00337_shard_any_heavy.sql
+++ b/tests/queries/0_stateless/00337_shard_any_heavy.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SELECT anyHeavy(x) FROM (SELECT intHash64(number) % 100 < 60 ? 999 : number AS x FROM system.numbers LIMIT 100000);
 SELECT anyHeavy(1) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00338_replicate_array_of_strings.sql b/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
index 9ec8981a573..b49dddcdda0 100644
--- a/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
+++ b/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS bad_arrays;
 CREATE TABLE bad_arrays (a Array(String), b Array(UInt8)) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh b/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
index c9c53dedd69..91ca0d7d869 100755
--- a/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
+++ b/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
index d5a66c11d2d..8a310cb8fc9 100644
--- a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
+++ b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_str;
 CREATE TABLE group_uniq_str ENGINE = Memory AS SELECT number % 10 as id, toString(intDiv((number%10000), 10)) as v FROM system.numbers LIMIT 10000000;
 
diff --git a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
index fba4ace65ce..abd0e6e6a45 100644
--- a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
+++ b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_arr_int;
 CREATE TABLE group_uniq_arr_int ENGINE = Memory AS
 	SELECT g as id, if(c == 0, [v], if(c == 1, emptyArrayInt64(), [v, v])) as v FROM
diff --git a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
index 41ae2507d20..e9cfff211f8 100644
--- a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
+++ b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_arr_str;
 CREATE TABLE group_uniq_arr_str ENGINE = Memory AS
     SELECT hex(intHash32(g)) as id, if(c == 0, [hex(v)], if(c == 1, emptyArrayString(), [hex(v), hex(v)])) as v FROM
diff --git a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
index 2d99202a8ac..3a70b64bc86 100644
--- a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
+++ b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 SET extremes = 1;
 
diff --git a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
index d24d029c4e7..62f891db33c 100755
--- a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
+++ b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
index a09e9a4adb2..82c80325931 100755
--- a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
+++ b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00386_long_in_pk.sh b/tests/queries/0_stateless/00386_long_in_pk.sh
index 66cc4ccc227..f619b0b8f2c 100755
--- a/tests/queries/0_stateless/00386_long_in_pk.sh
+++ b/tests/queries/0_stateless/00386_long_in_pk.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00387_use_client_time_zone.sh b/tests/queries/0_stateless/00387_use_client_time_zone.sh
index 201277b76d6..2a6d81eebfe 100755
--- a/tests/queries/0_stateless/00387_use_client_time_zone.sh
+++ b/tests/queries/0_stateless/00387_use_client_time_zone.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00400_client_external_options.sh b/tests/queries/0_stateless/00400_client_external_options.sh
index c2c6f44d62e..0adf622587a 100755
--- a/tests/queries/0_stateless/00400_client_external_options.sh
+++ b/tests/queries/0_stateless/00400_client_external_options.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00409_shard_limit_by.sql b/tests/queries/0_stateless/00409_shard_limit_by.sql
index 97748d3e077..0db29982dd1 100644
--- a/tests/queries/0_stateless/00409_shard_limit_by.sql
+++ b/tests/queries/0_stateless/00409_shard_limit_by.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS limit_by;
 CREATE TABLE limit_by (Num UInt32, Name String) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
index 16245c42a7a..f309f6bab1c 100644
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 -- The results are different than in Python. That's why this file is genearated and the reference is edited instead of using the Python script.
 -- Example: in ClickHouse, 9223372036854775808.0 != 9223372036854775808.
 
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
index c2c5491ed90..03a181d17d7 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
index 539bdd297bd..19addc7e4c7 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
index a0e25e8cb0a..e078572438e 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
index b09a05baf69..7e755b80328 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
index 6e9814cbca8..6240450fd63 100755
--- a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
+++ b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00417_kill_query.sh b/tests/queries/0_stateless/00417_kill_query.sh
index ce4c5851762..28f03fc9c37 100755
--- a/tests/queries/0_stateless/00417_kill_query.sh
+++ b/tests/queries/0_stateless/00417_kill_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00423_storage_log_single_thread.sql b/tests/queries/0_stateless/00423_storage_log_single_thread.sql
index 8eff9323564..5d359c7f94d 100644
--- a/tests/queries/0_stateless/00423_storage_log_single_thread.sql
+++ b/tests/queries/0_stateless/00423_storage_log_single_thread.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS log;
 CREATE TABLE log (s String) ENGINE = Log;
 
diff --git a/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql b/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
index e1b3cd70842..0211c21a5cd 100644
--- a/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
+++ b/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT avg(arrayJoin([NULL]));
 SELECT avg(arrayJoin([NULL, 1]));
 SELECT avg(arrayJoin([NULL, 1, 2]));
diff --git a/tests/queries/0_stateless/00429_long_http_bufferization.sh b/tests/queries/0_stateless/00429_long_http_bufferization.sh
index 394e8e99052..802bdf40768 100755
--- a/tests/queries/0_stateless/00429_long_http_bufferization.sh
+++ b/tests/queries/0_stateless/00429_long_http_bufferization.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/00429_point_in_ellipses.sql b/tests/queries/0_stateless/00429_point_in_ellipses.sql
index 9ded2e0d440..57c7250590a 100644
--- a/tests/queries/0_stateless/00429_point_in_ellipses.sql
+++ b/tests/queries/0_stateless/00429_point_in_ellipses.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 SELECT pointInEllipses(33.3, 55.3, 33.4, 55.1, 1.0, 1.0) AS distance;
 SELECT pointInEllipses(33.3 + v, 55.3 + v, 33.4, 55.1, 1.0, 1.0) AS distance from
 (
diff --git a/tests/queries/0_stateless/00436_convert_charset.sql b/tests/queries/0_stateless/00436_convert_charset.sql
index 1b7baf22450..8ac9193c458 100644
--- a/tests/queries/0_stateless/00436_convert_charset.sql
+++ b/tests/queries/0_stateless/00436_convert_charset.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT
     'абвгдеёжзийклмнопрстуфхцчшщъыьэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ' AS orig,
     hex(convertCharset(orig, 'utf-8', 'cp1251') AS cp1251) AS cp1251_hex,
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
index 5c5ecd4564b..a441c9a6761 100755
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database, no-parallel
+# Tag no-replicated-database: Old syntax is not allowed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
index e4d60f1b960..c820cce11af 100644
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SELECT '===Ordinary case===';
 
 SET replication_alter_partitions_sync = 2;
diff --git a/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql b/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
index 04bddd71972..082ba1bf178 100644
--- a/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
+++ b/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SELECT x, arrayJoin(x) FROM (SELECT materialize([1, NULL, 2]) AS x);
 SELECT x, arrayJoin(x) FROM (SELECT materialize([(1, 2), (3, 4), (5, 6)]) AS x);
 SELECT x, arrayJoin(x) FROM (SELECT materialize(arrayMap(x -> toFixedString(x, 5), ['Hello', 'world'])) AS x);
diff --git a/tests/queries/0_stateless/00462_json_true_false_literals.sql b/tests/queries/0_stateless/00462_json_true_false_literals.sql
index 740683ad3ce..2c45229fce6 100644
--- a/tests/queries/0_stateless/00462_json_true_false_literals.sql
+++ b/tests/queries/0_stateless/00462_json_true_false_literals.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json;
 CREATE TABLE json (x UInt8, title String) ENGINE = Memory;
 INSERT INTO json FORMAT JSONEachRow {"x": true, "title": "true"}, {"x": false, "title": "false"}, {"x": 0, "title": "0"}, {"x": 1, "title": "1"};
diff --git a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
index d3bdf32db74..e9f486fbb73 100755
--- a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
+++ b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh b/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
index 47f5c698d17..c2980810ac5 100755
--- a/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
+++ b/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql b/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
index 4227190edf4..aac30d45d41 100644
--- a/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
+++ b/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT visitParamExtractString('{"x":"\\uD800\\udf38"}', 'x') AS x, visitParamExtractString('{"x":"Hello \\u2028 World \\u2029 !"}', 'x') AS y FORMAT JSONEachRow;
 SELECT 'Hello' || convertCharset(unhex('2028'), 'utf16be', 'utf8') || 'World' || convertCharset(unhex('2029'), 'utf16be', 'utf8') || '!' AS x, hex(x) AS h FORMAT JSONEachRow;
 SELECT 'Hello' || convertCharset(unhex('2028'), 'utf16be', 'utf8') || 'World' || convertCharset(unhex('2029'), 'utf16be', 'utf8') || '!' AS x, hex(x) AS h FORMAT TSV;
diff --git a/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql b/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
index 0b1c19996bf..117ca802596 100644
--- a/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
+++ b/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT dummy FROM (SELECT dummy, NOT dummy AS x FROM remote('127.0.0.{2,3}', system.one) GROUP BY dummy HAVING x);
diff --git a/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql b/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
index 089be0a3715..4a1ee2d79a2 100644
--- a/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
+++ b/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS nested;
 CREATE TABLE nested (n Nested(x UInt8)) ENGINE = Memory;
 INSERT INTO nested VALUES ([1, 2]);
diff --git a/tests/queries/0_stateless/00499_json_enum_insert.sql b/tests/queries/0_stateless/00499_json_enum_insert.sql
index d085177a8e3..c4988d08243 100644
--- a/tests/queries/0_stateless/00499_json_enum_insert.sql
+++ b/tests/queries/0_stateless/00499_json_enum_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json;
 CREATE TABLE json (x Enum8('browser' = 1, 'mobile' = 2), y String) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
index bd92fcefcff..8267a451728 100644
--- a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 SET replication_alter_partitions_sync = 2;
 
 SELECT '*** Not partitioned ***';
diff --git a/tests/queries/0_stateless/00505_secure.sh b/tests/queries/0_stateless/00505_secure.sh
index c1113af761b..4b425f1bc71 100755
--- a/tests/queries/0_stateless/00505_secure.sh
+++ b/tests/queries/0_stateless/00505_secure.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00505_shard_secure.sh b/tests/queries/0_stateless/00505_shard_secure.sh
index 526176f8c39..4676f99c02c 100755
--- a/tests/queries/0_stateless/00505_shard_secure.sh
+++ b/tests/queries/0_stateless/00505_shard_secure.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard, no-unbundled, no-parallel, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00506_shard_global_in_union.sql b/tests/queries/0_stateless/00506_shard_global_in_union.sql
index 4cbeb074bb5..b3009add7e5 100644
--- a/tests/queries/0_stateless/00506_shard_global_in_union.sql
+++ b/tests/queries/0_stateless/00506_shard_global_in_union.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT X FROM (SELECT * FROM (SELECT 1 AS X, 2 AS Y) UNION ALL SELECT 3, 4) ORDER BY X;
 
 DROP TABLE IF EXISTS globalin;
diff --git a/tests/queries/0_stateless/00506_union_distributed.sql b/tests/queries/0_stateless/00506_union_distributed.sql
index 4c5fd9a1743..08282d94d8b 100644
--- a/tests/queries/0_stateless/00506_union_distributed.sql
+++ b/tests/queries/0_stateless/00506_union_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- https://github.com/ClickHouse/ClickHouse/issues/1059
 
 SET insert_distributed_sync = 1;
diff --git a/tests/queries/0_stateless/00508_materialized_view_to.sql b/tests/queries/0_stateless/00508_materialized_view_to.sql
index d330faf4fb7..522ceb40404 100644
--- a/tests/queries/0_stateless/00508_materialized_view_to.sql
+++ b/tests/queries/0_stateless/00508_materialized_view_to.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_00508;
 CREATE DATABASE test_00508;
 
diff --git a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
index 48678329404..b24fb090688 100644
--- a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
+++ b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-parallel
+-- Tag no-parallel: leftovers
+
 SET optimize_on_insert = 0;
 
 SELECT '*** Replicated with sampling ***';
diff --git a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
index 24f64a577f1..a702da66eaf 100644
--- a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
+++ b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-ordinary-database, no-parallel
+-- Tag no-parallel: static UUID
+
 DROP TABLE IF EXISTS with_deduplication;
 DROP TABLE IF EXISTS without_deduplication;
 DROP TABLE IF EXISTS with_deduplication_mv;
diff --git a/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql b/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
index 534b13e14d0..64ceb394b17 100644
--- a/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
+++ b/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists tab;
 create table tab (date Date, val UInt64, val2 UInt8 default 42, val3 UInt8 default val2 + 1, val4 UInt64 alias val) engine = MergeTree(date, (date, val), 8192);
 desc tab;
diff --git a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
index 71ed99f78fa..6c76adb86d0 100644
--- a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS deduplication_by_partition;
 CREATE TABLE deduplication_by_partition(d Date, x UInt32) ENGINE =
     ReplicatedMergeTree('/clickhouse/tables/{database}/test_00516/deduplication_by_partition', 'r1', d, x, 8192);
diff --git a/tests/queries/0_stateless/00531_client_ignore_error.sh b/tests/queries/0_stateless/00531_client_ignore_error.sh
index daf636b0765..d3215e1beac 100755
--- a/tests/queries/0_stateless/00531_client_ignore_error.sh
+++ b/tests/queries/0_stateless/00531_client_ignore_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00534_client_ignore_error.sh b/tests/queries/0_stateless/00534_client_ignore_error.sh
index daf636b0765..d3215e1beac 100755
--- a/tests/queries/0_stateless/00534_client_ignore_error.sh
+++ b/tests/queries/0_stateless/00534_client_ignore_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments1.sh b/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
index 2979e18e2a5..d908f1eae7d 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments10.sh b/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
index 178c9dd8d94..68cdfd6ce24 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-parallel
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments11.sh b/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
index 3004c6c84ff..da5ac2768f1 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments12.sh b/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
index 8e5bd15dc80..ee0acd22dc9 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments13.sh b/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
index 37f4282ae79..4e0b5bd3012 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments2.sh b/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
index 9c8eda6fbcb..c60595622cc 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments3.sh b/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
index 640467e9d00..6a6cb87ab66 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh b/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
index b0381295b39..f484221e151 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: long, no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments5.sh b/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
index 3e1d4be7af5..5073a6236a3 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments6.sh b/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
index 53dff77a390..c3fa56a2ee0 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments7.sh b/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
index 3625b65c381..6b28630bde1 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments8.sh b/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
index 35cb25e6f8e..8a192a57635 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments9.sh b/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
index 1756e968271..62360c53a7d 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
index 31853e92262..38b217308d4 100644
--- a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
+++ b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 -- VisitParam with basic type
 SELECT visitParamExtractInt('{"myparam":-1}', 'myparam');
 SELECT visitParamExtractUInt('{"myparam":-1}', 'myparam');
diff --git a/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql b/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
index 5157eb7e813..f3dbdf8edcc 100644
--- a/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
+++ b/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT tupleElement((1, 2), toUInt8(1 + 0)) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00552_or_nullable.sql b/tests/queries/0_stateless/00552_or_nullable.sql
index ebec2db842d..5639a7f65cc 100644
--- a/tests/queries/0_stateless/00552_or_nullable.sql
+++ b/tests/queries/0_stateless/00552_or_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT
     0 OR NULL,
     1 OR NULL,
diff --git a/tests/queries/0_stateless/00561_storage_join.sql b/tests/queries/0_stateless/00561_storage_join.sql
index 01e66d0c380..ad4fab09c20 100644
--- a/tests/queries/0_stateless/00561_storage_join.sql
+++ b/tests/queries/0_stateless/00561_storage_join.sql
@@ -25,24 +25,17 @@ insert into joinbug_join (id, id2, val, val2, created)
 select id, id2, val, val2, created
 from joinbug;
 
-/* expected */
-select *
-from joinbug;
+select * from joinbug;
 
-/* wtf */
 select id, id2, val, val2, created
-from (
-   SELECT toUInt64(arrayJoin(range(50))) AS id2
-) js1
+from ( SELECT toUInt64(arrayJoin(range(50))) AS id2 ) js1
 SEMI LEFT JOIN joinbug_join using id2;
 
-/* type conversion */
-SELECT * FROM
-(
-    SELECT toUInt32(11) AS id2
-) AS js1
-SEMI LEFT JOIN joinbug_join USING (id2);
+-- type conversion
+SELECT * FROM ( SELECT toUInt32(11) AS id2 ) AS js1 SEMI LEFT JOIN joinbug_join USING (id2);
 
+-- can't convert right side in case on storage join
+SELECT * FROM ( SELECT toInt64(11) AS id2 ) AS js1 SEMI LEFT JOIN joinbug_join USING (id2); -- { serverError 53 }
 
 DROP TABLE joinbug;
 DROP TABLE joinbug_join;
diff --git a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
index 4cfbc1d0fb0..fd8a37a15f9 100644
--- a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 -- Check that settings are correctly passed through Distributed table
 DROP TABLE IF EXISTS simple;
 CREATE TABLE simple (d Int8) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_00563/tables/simple', '1') ORDER BY d;
diff --git a/tests/queries/0_stateless/00563_shard_insert_into_remote.sql b/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
index 274dfffa8d6..abc9658fc94 100644
--- a/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
+++ b/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists tab;
 create table tab (val UInt8) engine = MergeTree order by val;
 insert into function remote('127.0.0.2', currentDatabase(), tab) values (1);
diff --git a/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql b/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
index 634b9781c7a..66bbb02183c 100644
--- a/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
+++ b/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set optimize_on_insert = 0;
 
 drop table if exists mult_tab;
diff --git a/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql b/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
index 1ad261de35c..c384ef37fc7 100644
--- a/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
+++ b/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE test_00571;
 
 USE test_00571;
diff --git a/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql b/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
index b7a56676a33..adb569897dc 100644
--- a/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
+++ b/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TEMPORARY TABLE t_00573 (x UInt8);
 
 SET empty_result_for_aggregation_by_empty_set = 0;
diff --git a/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh b/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
index 94a9d331b6a..42bf37cbda5 100755
--- a/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
+++ b/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00580_consistent_hashing_functions.sql b/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
index 20d1892f192..08e785929c7 100644
--- a/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
+++ b/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT jumpConsistentHash(1, 1), jumpConsistentHash(42, 57), jumpConsistentHash(256, 1024), jumpConsistentHash(3735883980, 1), jumpConsistentHash(3735883980, 666), jumpConsistentHash(16045690984833335023, 255);
 SELECT yandexConsistentHash(16045690984833335023, 1), yandexConsistentHash(16045690984833335023, 2), yandexConsistentHash(16045690984833335023, 3), yandexConsistentHash(16045690984833335023, 4), yandexConsistentHash(16045690984833335023, 173), yandexConsistentHash(16045690984833335023, 255);
 SELECT jumpConsistentHash(intHash64(number), 787) FROM system.numbers LIMIT 1000000, 2;
diff --git a/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql b/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
index fdb84ccf00e..b3738fd5a9a 100644
--- a/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
+++ b/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS mergetree_00588;
 DROP TABLE IF EXISTS distributed_00588;
 
diff --git a/tests/queries/0_stateless/00594_alias_in_distributed.sql b/tests/queries/0_stateless/00594_alias_in_distributed.sql
index 27815f2569b..b75dfdf7967 100644
--- a/tests/queries/0_stateless/00594_alias_in_distributed.sql
+++ b/tests/queries/0_stateless/00594_alias_in_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS alias_local10;
 DROP TABLE IF EXISTS alias10;
 
diff --git a/tests/queries/0_stateless/00597_push_down_predicate_long.sql b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
index 2e3357241ad..40ea8b48caa 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.sql
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET send_logs_level = 'fatal';
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
diff --git a/tests/queries/0_stateless/00599_create_view_with_subquery.sql b/tests/queries/0_stateless/00599_create_view_with_subquery.sql
index 9fcc993886b..6d086ed07f5 100644
--- a/tests/queries/0_stateless/00599_create_view_with_subquery.sql
+++ b/tests/queries/0_stateless/00599_create_view_with_subquery.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test_00599;
 DROP TABLE IF EXISTS test_view_00599;
 
diff --git a/tests/queries/0_stateless/00600_replace_running_query.sh b/tests/queries/0_stateless/00600_replace_running_query.sh
index 78ea4daf6bb..89c9d1c4279 100755
--- a/tests/queries/0_stateless/00600_replace_running_query.sh
+++ b/tests/queries/0_stateless/00600_replace_running_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/00602_throw_if.sh b/tests/queries/0_stateless/00602_throw_if.sh
index fe8feab0303..1e8850028c4 100755
--- a/tests/queries/0_stateless/00602_throw_if.sh
+++ b/tests/queries/0_stateless/00602_throw_if.sh
@@ -8,5 +8,5 @@ default_exception_message="Value passed to 'throwIf' function is non zero"
 custom_exception_message="Number equals 1000000"
 
 ${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000) FROM system.numbers" 2>&1 | grep -cF "$default_exception_message"
-${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000, '$custom_exception_message') FROM system.numbers" 2>&1 | grep -cF "$custom_exception_message"
+${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000, '$custom_exception_message') FROM system.numbers" 2>&1 | grep -v '^(query: ' | grep -cF "$custom_exception_message"
 ${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT sum(x = 0) FROM (SELECT throwIf(number = 1000000) AS x FROM numbers(1000000))" 2>&1
diff --git a/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql b/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
index afc5b68bd94..304131d4069 100644
--- a/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
+++ b/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/00604_show_create_database.sql b/tests/queries/0_stateless/00604_show_create_database.sql
index 4f0e8c9f49d..c990e7abed3 100644
--- a/tests/queries/0_stateless/00604_show_create_database.sql
+++ b/tests/queries/0_stateless/00604_show_create_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database, no-parallel
+
 create database if not exists test_00604;
 show create database test_00604;
 drop database test_00604;
diff --git a/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql b/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
index ebcfeaaaf8a..26098201081 100644
--- a/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
+++ b/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS mergetree_00609;
 DROP TABLE IF EXISTS distributed_00609;
 
diff --git a/tests/queries/0_stateless/00609_mv_index_in_in.sql b/tests/queries/0_stateless/00609_mv_index_in_in.sql
index 28085194327..002c94dd576 100644
--- a/tests/queries/0_stateless/00609_mv_index_in_in.sql
+++ b/tests/queries/0_stateless/00609_mv_index_in_in.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database
+
 DROP TABLE IF EXISTS test_00609;
 DROP TABLE IF EXISTS test_mv_00609;
 
diff --git a/tests/queries/0_stateless/00612_http_max_query_size.sh b/tests/queries/0_stateless/00612_http_max_query_size.sh
index 0a37d7ec766..cfcae330b85 100755
--- a/tests/queries/0_stateless/00612_http_max_query_size.sh
+++ b/tests/queries/0_stateless/00612_http_max_query_size.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 # shellcheck disable=SC2028
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00612_shard_count.sql b/tests/queries/0_stateless/00612_shard_count.sql
index 2a69e9ed9c8..ee73caf7fc1 100644
--- a/tests/queries/0_stateless/00612_shard_count.sql
+++ b/tests/queries/0_stateless/00612_shard_count.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS count;
 
 CREATE TABLE count (x UInt64) ENGINE = MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql b/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
index dcd227bd2cf..de3000533a1 100644
--- a/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
+++ b/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_execution_time = 1, timeout_overflow_mode = 'break';
 SELECT DISTINCT * FROM remote('127.0.0.{2,3}', system.numbers) WHERE number < 10;
diff --git a/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql b/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
index 6bcb15dfbe0..5d373927714 100644
--- a/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
+++ b/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists tab;
 create table tab (date Date,  time DateTime, data String) ENGINE = MergeTree(date, (time, data), 8192);
 insert into tab values ('2018-01-21','2018-01-21 15:12:13','test');
diff --git a/tests/queries/0_stateless/00619_union_highlite.sql b/tests/queries/0_stateless/00619_union_highlite.sql
index 9a41a132661..4f9ed7c60c9 100644
--- a/tests/queries/0_stateless/00619_union_highlite.sql
+++ b/tests/queries/0_stateless/00619_union_highlite.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS union;
 
 create view union as select 1 as test union all select 2;
diff --git a/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql b/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
index 715129cc699..c8c181fac62 100644
--- a/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
+++ b/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: replica, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 -- The test is mostly outdated as now every replica is leader and can do OPTIMIZE locally.
 
 DROP TABLE IF EXISTS rename1;
diff --git a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
index 06e88754888..fab8691556b 100644
--- a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_truncate1;
 DROP TABLE IF EXISTS replicated_truncate2;
 
diff --git a/tests/queries/0_stateless/00623_truncate_table.sql b/tests/queries/0_stateless/00623_truncate_table.sql
index 97f85f920af..80369ff2bbc 100644
--- a/tests/queries/0_stateless/00623_truncate_table.sql
+++ b/tests/queries/0_stateless/00623_truncate_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS truncate_test;
 DROP TABLE IF EXISTS truncate_test_log;
 DROP TABLE IF EXISTS truncate_test_memory;
diff --git a/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh b/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
index 59092ff28f2..7a5886795f9 100755
--- a/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
+++ b/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00625_arrays_in_nested.sql b/tests/queries/0_stateless/00625_arrays_in_nested.sql
index 3b418731c8f..78819ac683f 100644
--- a/tests/queries/0_stateless/00625_arrays_in_nested.sql
+++ b/tests/queries/0_stateless/00625_arrays_in_nested.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS nested;
 CREATE TABLE nested
 (
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table.sql b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
index 7224224334e..1e3e07f8274 100644
--- a/tests/queries/0_stateless/00626_replace_partition_from_table.sql
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS dst;
 
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
index 443f2856c88..7b3f787eeab 100755
--- a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 # Because REPLACE PARTITION does not forces immediate removal of replaced data parts from local filesystem
 # (it tries to do it as quick as possible, but it still performed in separate thread asynchronously)
diff --git a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
index def8e8f4cfe..3c6a61b958b 100755
--- a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
+++ b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00634_logging_shard.sh b/tests/queries/0_stateless/00634_logging_shard.sh
index ab210e5a373..579f846fb66 100755
--- a/tests/queries/0_stateless/00634_logging_shard.sh
+++ b/tests/queries/0_stateless/00634_logging_shard.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: shard
+
 set -e
 
 # Get all server logs
diff --git a/tests/queries/0_stateless/00634_rename_view.sql b/tests/queries/0_stateless/00634_rename_view.sql
index a21b68db535..7a1c096daa1 100644
--- a/tests/queries/0_stateless/00634_rename_view.sql
+++ b/tests/queries/0_stateless/00634_rename_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Does not support renaming of multiple tables in single query
 
 DROP TABLE IF EXISTS test1_00634;
 DROP TABLE IF EXISTS test2_00634;
diff --git a/tests/queries/0_stateless/00635_shard_distinct_order_by.sql b/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
index ec0d40952a3..1782db30d4d 100644
--- a/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
+++ b/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS data;
 CREATE TABLE data (s String, x Int8, y Int8) ENGINE = MergeTree ORDER BY tuple();
 
diff --git a/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled b/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
index 6d9a87f7235..92e09928026 100755
--- a/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
+++ b/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00643_cast_zookeeper_long.sql b/tests/queries/0_stateless/00643_cast_zookeeper_long.sql
index 21e7a89c603..85f87d11a2f 100644
--- a/tests/queries/0_stateless/00643_cast_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00643_cast_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SET database_atomic_wait_for_drop_and_detach_synchronously=1;
 
 DROP TABLE IF EXISTS cast1;
diff --git a/tests/queries/0_stateless/00646_url_engine.sh b/tests/queries/0_stateless/00646_url_engine.sh
index 357e0d74fd0..9aacbfcfaf0 100755
--- a/tests/queries/0_stateless/00646_url_engine.sh
+++ b/tests/queries/0_stateless/00646_url_engine.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: Not sure why fail even in sequential mode. Disabled for now to make some progress.
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
index fdf6d717fb8..994114c9c50 100755
--- a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
+++ b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00652_mergetree_mutations.sh b/tests/queries/0_stateless/00652_mergetree_mutations.sh
index 989efd5ecec..0cba8b94040 100755
--- a/tests/queries/0_stateless/00652_mergetree_mutations.sh
+++ b/tests/queries/0_stateless/00652_mergetree_mutations.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
index 58295e17790..3f5b8d570a6 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
index 3995cb3348c..d0e40e2ee62 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database, no-parallel, no-fasttest
+# Tag no-replicated-database: Old syntax is not allowed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql b/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
index 033202e04aa..030d39f9050 100644
--- a/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SET optimize_on_insert = 0;
 
 DROP TABLE IF EXISTS partitioned_by_tuple_replica1_00661;
diff --git a/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql b/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
index 3a74ee16628..99c2e02e248 100644
--- a/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
+++ b/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS remote_test;
 CREATE TABLE remote_test(a1 UInt8) ENGINE=Memory;
 INSERT INTO FUNCTION remote('127.0.0.1', currentDatabase(), remote_test) VALUES(1);
diff --git a/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql b/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
index f6fac23a155..6d45ac47875 100644
--- a/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
+++ b/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 WITH arrayJoin(['hello', 'world']) AS s SELECT count(), arraySort(groupUniqArray(s)), anyHeavy(s) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00678_shard_funnel_window.sql b/tests/queries/0_stateless/00678_shard_funnel_window.sql
index 29ec94be20b..8ea07a1c4ba 100644
--- a/tests/queries/0_stateless/00678_shard_funnel_window.sql
+++ b/tests/queries/0_stateless/00678_shard_funnel_window.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS remote_test;
 CREATE TABLE remote_test(uid String, its UInt32,  action_code String, day Date) ENGINE = MergeTree(day, (uid, its), 8192);
 INSERT INTO remote_test SELECT toString(number) AS uid, number % 3 AS its, toString(number % 3) AS action_code, '2000-01-01' FROM system.numbers LIMIT 10000;
diff --git a/tests/queries/0_stateless/00682_empty_parts_merge.sh b/tests/queries/0_stateless/00682_empty_parts_merge.sh
index 0213f31ea94..64aa1cc7452 100755
--- a/tests/queries/0_stateless/00682_empty_parts_merge.sh
+++ b/tests/queries/0_stateless/00682_empty_parts_merge.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql b/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
index 4ed0468b146..6d64981d228 100644
--- a/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
+++ b/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_json_escape_forward_slashes = 1;
 select '/some/cool/url' as url format JSONEachRow;
 SET output_format_json_escape_forward_slashes = 0;
diff --git a/tests/queries/0_stateless/00686_client_exit_code.sh b/tests/queries/0_stateless/00686_client_exit_code.sh
index eab534dd8d5..9586ddbd0a3 100755
--- a/tests/queries/0_stateless/00686_client_exit_code.sh
+++ b/tests/queries/0_stateless/00686_client_exit_code.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
index 5a169403872..c6f54ea389b 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists lc_dict_reading;
 create table lc_dict_reading (val UInt64, str StringWithDictionary, pat String) engine = MergeTree order by val;
 insert into lc_dict_reading select number, if(number < 8192 * 4, number % 100, number) as s, s from system.numbers limit 1000000;
diff --git a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
index 74788122aee..e62d824e011 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 select 'NativeBlockInputStream';
 select toTypeName(dict), dict, lowCardinalityIndices(dict), lowCardinalityKeys(dict) from (select '123_' || toLowCardinality(v) as dict from (select arrayJoin(['a', 'bb', '', 'a', 'ccc', 'a', 'bb', '', 'dddd']) as v));
 select '-';
diff --git a/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql b/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
index 1d6abf7b252..0c8e4ae237d 100644
--- a/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
+++ b/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- NOTE: database = currentDatabase() is not mandatory
 
 SELECT avg(blockSize()) <= 10 FROM system.tables SETTINGS max_block_size = 10;
diff --git a/tests/queries/0_stateless/00697_in_subquery_shard.sql b/tests/queries/0_stateless/00697_in_subquery_shard.sql
index 1e32a587fb3..634cfe42248 100644
--- a/tests/queries/0_stateless/00697_in_subquery_shard.sql
+++ b/tests/queries/0_stateless/00697_in_subquery_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT 0 IN 0;
 SELECT 0 IN 1;
 SELECT 0 IN (SELECT 0);
diff --git a/tests/queries/0_stateless/00699_materialized_view_mutations.sh b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
index f55b8ac10ed..f66d079e307 100755
--- a/tests/queries/0_stateless/00699_materialized_view_mutations.sh
+++ b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00701_rollup.sql b/tests/queries/0_stateless/00701_rollup.sql
index fa7f3a21657..3637a5fae2f 100644
--- a/tests/queries/0_stateless/00701_rollup.sql
+++ b/tests/queries/0_stateless/00701_rollup.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS rollup;
 CREATE TABLE rollup(a String, b Int32, s Int32) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
index 48833d2643c..4637b210194 100755
--- a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
+++ b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00715_json_each_row_input_nested.sh b/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
index 72e01aef742..c49f50c7bdc 100755
--- a/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
+++ b/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00716_allow_ddl.sql b/tests/queries/0_stateless/00716_allow_ddl.sql
index d33d8b7eec5..bc0fa20eb0a 100644
--- a/tests/queries/0_stateless/00716_allow_ddl.sql
+++ b/tests/queries/0_stateless/00716_allow_ddl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_ddl = 0;
 
diff --git a/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql b/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
index d4d260ee92e..96e60c2891d 100644
--- a/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
+++ b/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync = 1;
 set allow_suspicious_low_cardinality_types = 1;
 
diff --git a/tests/queries/0_stateless/00717_merge_and_distributed.sql b/tests/queries/0_stateless/00717_merge_and_distributed.sql
index 35dad18937a..f7b4a2b24d3 100644
--- a/tests/queries/0_stateless/00717_merge_and_distributed.sql
+++ b/tests/queries/0_stateless/00717_merge_and_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS test_local_1;
diff --git a/tests/queries/0_stateless/00719_parallel_ddl_db.sh b/tests/queries/0_stateless/00719_parallel_ddl_db.sh
index 5608a57eecc..31ea1dbbe58 100755
--- a/tests/queries/0_stateless/00719_parallel_ddl_db.sh
+++ b/tests/queries/0_stateless/00719_parallel_ddl_db.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
index 07fba5d39b4..3a387d0a203 100644
--- a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS byte_identical_r1;
 DROP TABLE IF EXISTS byte_identical_r2;
 
diff --git a/tests/queries/0_stateless/00725_comment_columns_long.sql b/tests/queries/0_stateless/00725_comment_columns_long.sql
index 3eec0ba31b7..fe4ee48909f 100644
--- a/tests/queries/0_stateless/00725_comment_columns_long.sql
+++ b/tests/queries/0_stateless/00725_comment_columns_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS check_query_comment_column;
 
 -- Check COMMENT COLUMN and MODIFY COLUMN statements with simple engine
diff --git a/tests/queries/0_stateless/00725_memory_tracking.sql b/tests/queries/0_stateless/00725_memory_tracking.sql
index 46d7948b1b3..b7356f0a6aa 100644
--- a/tests/queries/0_stateless/00725_memory_tracking.sql
+++ b/tests/queries/0_stateless/00725_memory_tracking.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 SELECT least(value, 0) FROM system.metrics WHERE metric = 'MemoryTracking';
 SELECT length(range(100000000));
 SELECT least(value, 0) FROM system.metrics WHERE metric = 'MemoryTracking';
diff --git a/tests/queries/0_stateless/00725_quantiles_shard.sql b/tests/queries/0_stateless/00725_quantiles_shard.sql
index bb8fcfcd2d9..a3742ce8729 100644
--- a/tests/queries/0_stateless/00725_quantiles_shard.sql
+++ b/tests/queries/0_stateless/00725_quantiles_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT quantiles(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
 SELECT quantilesExact(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
 SELECT quantilesTDigest(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
diff --git a/tests/queries/0_stateless/00728_json_each_row_parsing.sh b/tests/queries/0_stateless/00728_json_each_row_parsing.sh
index 6a43fc2d8da..21f6a350fdb 100755
--- a/tests/queries/0_stateless/00728_json_each_row_parsing.sh
+++ b/tests/queries/0_stateless/00728_json_each_row_parsing.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
index e54326cb59f..f9e33645527 100755
--- a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
+++ b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00732_base64_functions.sql b/tests/queries/0_stateless/00732_base64_functions.sql
index 0d3b7e43645..3ba4180c20c 100644
--- a/tests/queries/0_stateless/00732_base64_functions.sql
+++ b/tests/queries/0_stateless/00732_base64_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET send_logs_level = 'fatal';
 SELECT base64Encode(val) FROM (select arrayJoin(['', 'f', 'fo', 'foo', 'foob', 'fooba', 'foobar']) val);
 SELECT base64Decode(val) FROM (select arrayJoin(['', 'Zg==', 'Zm8=', 'Zm9v', 'Zm9vYg==', 'Zm9vYmE=', 'Zm9vYmFy']) val);
diff --git a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
index a92646a41fc..bff8c7e73ee 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
index 4f9afb93f3a..a1859220c6c 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
index 1374fa776ca..61394447c3d 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
index 0cc162b6010..e3e5aa7949f 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
index 0ceca3743b2..4eb263c75c2 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
index a95d992705e..7fb23936819 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00735_long_conditional.sql b/tests/queries/0_stateless/00735_long_conditional.sql
index a247ce003b3..73febad1310 100644
--- a/tests/queries/0_stateless/00735_long_conditional.sql
+++ b/tests/queries/0_stateless/00735_long_conditional.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET send_logs_level = 'fatal';
 
 SELECT 'value vs value';
diff --git a/tests/queries/0_stateless/00738_lock_for_inner_table.sh b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
index 37d5755fb0b..b28d1b4fa20 100755
--- a/tests/queries/0_stateless/00738_lock_for_inner_table.sh
+++ b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-ordinary-database
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00740_database_in_nested_view.sql b/tests/queries/0_stateless/00740_database_in_nested_view.sql
index 0106196279f..1890baafaa1 100644
--- a/tests/queries/0_stateless/00740_database_in_nested_view.sql
+++ b/tests/queries/0_stateless/00740_database_in_nested_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE test_00740;
 USE test_00740;
 
diff --git a/tests/queries/0_stateless/00741_client_comment_multiline.sql b/tests/queries/0_stateless/00741_client_comment_multiline.sql
index 9e481efe388..9fe4a4cb4ba 100644
--- a/tests/queries/0_stateless/00741_client_comment_multiline.sql
+++ b/tests/queries/0_stateless/00741_client_comment_multiline.sql
@@ -1,2 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
 CREATE DATABASE IF NOT EXISTS test_00741; -- foo
 DROP DATABASE test_00741;
diff --git a/tests/queries/0_stateless/00746_hashing_tuples.sql b/tests/queries/0_stateless/00746_hashing_tuples.sql
index d612d207ba3..fe6c7e373b4 100644
--- a/tests/queries/0_stateless/00746_hashing_tuples.sql
+++ b/tests/queries/0_stateless/00746_hashing_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT sipHash64(1, 2, 3);
 SELECT sipHash64(1, 3, 2);
 SELECT sipHash64(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2))));
diff --git a/tests/queries/0_stateless/00751_default_databasename_for_view.sql b/tests/queries/0_stateless/00751_default_databasename_for_view.sql
index 5fa43555b2b..9292b612d87 100644
--- a/tests/queries/0_stateless/00751_default_databasename_for_view.sql
+++ b/tests/queries/0_stateless/00751_default_databasename_for_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00751;
 USE test_00751;
 
diff --git a/tests/queries/0_stateless/00751_hashing_ints.sql b/tests/queries/0_stateless/00751_hashing_ints.sql
index be3268da29d..fc1564c0243 100644
--- a/tests/queries/0_stateless/00751_hashing_ints.sql
+++ b/tests/queries/0_stateless/00751_hashing_ints.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT halfMD5(123456);
 SELECT sipHash64(123456);
 SELECT cityHash64(123456);
diff --git a/tests/queries/0_stateless/00753_alter_attach.sql b/tests/queries/0_stateless/00753_alter_attach.sql
index 86388396410..a9661d3a304 100644
--- a/tests/queries/0_stateless/00753_alter_attach.sql
+++ b/tests/queries/0_stateless/00753_alter_attach.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS alter_attach;
 CREATE TABLE alter_attach (x UInt64, p UInt8) ENGINE = MergeTree ORDER BY tuple() PARTITION BY p;
 INSERT INTO alter_attach VALUES (1, 1), (2, 1), (3, 1);
diff --git a/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql b/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
index 93e2c9fb9d5..6b785d2f399 100644
--- a/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
+++ b/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS check_comments;
 
 CREATE TABLE check_comments
diff --git a/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
index fd9786be011..4cc330c703d 100644
--- a/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
+++ b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'Check total_bytes/total_rows for Distributed';
 CREATE TABLE check_system_tables_null (key Int) Engine=Null();
 CREATE TABLE check_system_tables AS check_system_tables_null Engine=Distributed(test_shard_localhost, currentDatabase(), check_system_tables_null);
diff --git a/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
index 1037b5a6381..dc54e4630d6 100644
--- a/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
+++ b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS check_system_tables;
 
 -- Check MergeTree declaration in new format
diff --git a/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql b/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
index 4aa7ab8ad64..d7b154bc6ac 100644
--- a/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- check ALTER MODIFY COLUMN with partitions
 
 SET send_logs_level = 'fatal';
diff --git a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
index 78986338cd9..8c19e30249f 100644
--- a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 SET optimize_on_insert = 0;
 
 SET send_logs_level = 'fatal';
diff --git a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
index 55b74e055db..09f20284402 100755
--- a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
+++ b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
index ecf75352ca9..035907bddd7 100755
--- a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
+++ b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00760_insert_json_with_defaults.sql b/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
index 6a1b367abba..1430d10cdb0 100644
--- a/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
+++ b/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET input_format_defaults_for_omitted_fields=1;
 
 DROP TABLE IF EXISTS defaults;
diff --git a/tests/queries/0_stateless/00763_lock_buffer_long.reference b/tests/queries/0_stateless/00763_lock_buffer_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/00763_lock_buffer.sh b/tests/queries/0_stateless/00763_lock_buffer_long.sh
similarity index 93%
rename from tests/queries/0_stateless/00763_lock_buffer.sh
rename to tests/queries/0_stateless/00763_lock_buffer_long.sh
index 44660035208..50680724149 100755
--- a/tests/queries/0_stateless/00763_lock_buffer.sh
+++ b/tests/queries/0_stateless/00763_lock_buffer_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -18,7 +20,7 @@ function thread1()
 
 function thread2()
 {
-    seq 1 1000 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --multiquery --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473'
+    seq 1 1000 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --multiquery --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473' | grep -v '(query: '
 }
 
 thread1 &
diff --git a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
index 65dd2474580..9ff759a034c 100755
--- a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
+++ b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
+
 set -e
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
diff --git a/tests/queries/0_stateless/00800_function_java_hash.sql b/tests/queries/0_stateless/00800_function_java_hash.sql
index 42435ca42e8..ec26895ed60 100644
--- a/tests/queries/0_stateless/00800_function_java_hash.sql
+++ b/tests/queries/0_stateless/00800_function_java_hash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 select javaHash('abc');
 select javaHash('874293087');
 select javaHashUTF16LE(convertCharset('a1가', 'utf-8', 'utf-16le'));
diff --git a/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql b/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
index 196dfd84c7f..600793853ca 100644
--- a/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
+++ b/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET insert_distributed_sync = 1;
 
 DROP TABLE IF EXISTS low_cardinality;
diff --git a/tests/queries/0_stateless/00800_versatile_storage_join.sql b/tests/queries/0_stateless/00800_versatile_storage_join.sql
index b0ec6f69f93..3690ea6bf89 100644
--- a/tests/queries/0_stateless/00800_versatile_storage_join.sql
+++ b/tests/queries/0_stateless/00800_versatile_storage_join.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00800;
 
 USE test_00800;
diff --git a/tests/queries/0_stateless/00803_odbc_driver_2_format.sql b/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
index 58004c04e66..86c3864f359 100644
--- a/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
+++ b/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 SELECT 1 AS x, [2, 3] AS y, 'Hello' AS z, NULL AS a FORMAT ODBCDriver2;
 SELECT number % 10 AS k, count() AS c FROM numbers(100) GROUP BY k WITH TOTALS FORMAT ODBCDriver2;
diff --git a/tests/queries/0_stateless/00803_xxhash.sql b/tests/queries/0_stateless/00803_xxhash.sql
index 2e6a1710e3c..f8b2b223a6e 100644
--- a/tests/queries/0_stateless/00803_xxhash.sql
+++ b/tests/queries/0_stateless/00803_xxhash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 SELECT hex(xxHash64('')) = upper('ef46db3751d8e999');
 SELECT hex(xxHash32('')) = upper('02cc5d05');
 
diff --git a/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql b/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
index 2a1b9e55b9a..9e911262ed7 100644
--- a/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
+++ b/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS alter_compression_codec;
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql b/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
index 87862f46e05..c3573588ae9 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql b/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
index fba6a216762..9331e39f8d7 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
index 6da43298347..044d60aeafb 100644
--- a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
+++ b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET joined_subquery_requires_alias = 0;
 
diff --git a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
index 63897e225ce..5d03823dde3 100644
--- a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
+++ b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS part_header_r1;
 DROP TABLE IF EXISTS part_header_r2;
 
diff --git a/tests/queries/0_stateless/00815_left_join_on_stepanel.sql b/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
index 9d2467e3638..13172f8c18d 100644
--- a/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
+++ b/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00815;
 USE test_00815;
 
diff --git a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
index b0244991b3c..19d9b006cd7 100755
--- a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
+++ b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 set -e
 
diff --git a/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql b/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
index f84c20feaea..39242194486 100644
--- a/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
+++ b/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- NOTE: database = currentDatabase() is not mandatory
 
 DROP TABLE IF EXISTS table1;
diff --git a/tests/queries/0_stateless/00823_capnproto_input.sh b/tests/queries/0_stateless/00823_capnproto_input.sh
index b86c8882bbd..11417852076 100755
--- a/tests/queries/0_stateless/00823_capnproto_input.sh
+++ b/tests/queries/0_stateless/00823_capnproto_input.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan, no-msan, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
index 762f8a937e4..5c2804bdcae 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
index 243446f9438..bd208195acc 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/9069
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
index 300f82e5ca2..2731e4bcce3 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/7438
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_map.sh b/tests/queries/0_stateless/00825_protobuf_format_map.sh
index 877fe73603e..2a84772bc9f 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_map.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_map.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
index 9d382f8c589..f1567128cf4 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/11117
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
index b33db75b5c9..1b94ebd79f2 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/6497
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
index 1e8ef28a48e..a16345c4bb1 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.sh b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
index fb099a6479e..bb376e6ed70 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_persons.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # To generate reference file for this test use the following commands:
 # ninja ProtobufDelimitedMessagesSerializer
diff --git a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
index ca915aca944..0cf33c91465 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_squares.sh b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
index d3ff3ad2f4f..cc54a62e07f 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_squares.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
index 96664ca7f20..09271e81ab1 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
index 3da40f16786..340df58e473 100755
--- a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
+++ b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh b/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
index be57757af06..abdc95475c7 100755
--- a/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
+++ b/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_kill_mutation.sh b/tests/queries/0_stateless/00834_kill_mutation.sh
index a17d85cf9a5..623016dfcfb 100755
--- a/tests/queries/0_stateless/00834_kill_mutation.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
index 92ab6814235..caad08dcb9d 100755
--- a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
index 6274a70a381..7ea6c2660ed 100644
--- a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS minmax_idx;
 DROP TABLE IF EXISTS minmax_idx_r;
 DROP TABLE IF EXISTS minmax_idx2;
diff --git a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
index 0dd8dd41f97..a2fe1ebd63a 100644
--- a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS minmax_idx1;
 DROP TABLE IF EXISTS minmax_idx2;
 
diff --git a/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh b/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
index 2e070d685a4..da4d3b05987 100755
--- a/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
+++ b/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 set -e
 
diff --git a/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh b/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
index 448e7ad076c..8807926d9b6 100755
--- a/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
+++ b/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, no-parallel
 
 # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 
diff --git a/tests/queries/0_stateless/00850_global_join_dups.sql b/tests/queries/0_stateless/00850_global_join_dups.sql
index 5843bf9c227..5a3ab0f1adc 100644
--- a/tests/queries/0_stateless/00850_global_join_dups.sql
+++ b/tests/queries/0_stateless/00850_global_join_dups.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t1_00850;
 DROP TABLE IF EXISTS t2_00850;
diff --git a/tests/queries/0_stateless/00851_http_insert_json_defaults.sh b/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
index 08458822cc0..8838200271f 100755
--- a/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
+++ b/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00855_join_with_array_join.reference b/tests/queries/0_stateless/00855_join_with_array_join.reference
index 88f9253500c..acb0240fbd2 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.reference
+++ b/tests/queries/0_stateless/00855_join_with_array_join.reference
@@ -9,3 +9,12 @@
 2	2	a2
 1	0	
 2	2	a2
+0	0
+0	0
+0	0
+0	0
+0
+0
+0
+0
+0	Int64	Int64
diff --git a/tests/queries/0_stateless/00855_join_with_array_join.sql b/tests/queries/0_stateless/00855_join_with_array_join.sql
index 506d9479110..642f90d4c6c 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.sql
+++ b/tests/queries/0_stateless/00855_join_with_array_join.sql
@@ -30,6 +30,22 @@ SELECT did, id, name FROM f LEFT ARRAY JOIN d_ids as did LEFT JOIN d ON d.id = d
 -- name clash, doesn't work yet
 SELECT id, name FROM f LEFT ARRAY JOIN d_ids as id LEFT JOIN d ON d.id = id ORDER BY id; -- { serverError 403 }
 
+SELECT * FROM ( SELECT [dummy, dummy] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN system.one AS y ON x.dummy == y.dummy;
+
+SELECT * FROM ( SELECT [dummy, dummy] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN system.one AS y ON x.dummy + 1 == y.dummy + 1;
+
+SELECT * FROM ( SELECT [dummy, dummy] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN system.one AS y USING dummy;
+
+SELECT * FROM ( SELECT [toUInt32(dummy), toUInt32(dummy)] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN (select toInt32(dummy) as dummy from system.one ) AS y USING dummy;
+
+SELECT dummy > 0, toTypeName(any(dummy)), any(toTypeName(dummy)) 
+FROM ( SELECT [toUInt32(dummy), toUInt32(dummy)] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN ( SELECT toInt32(dummy) AS dummy FROM system.one ) AS y USING dummy GROUP BY (dummy > 0);
+
 DROP TABLE IF EXISTS f;
 DROP TABLE IF EXISTS d;
 
diff --git a/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql b/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
index df964d3a90c..e7f034131a2 100644
--- a/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
+++ b/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00857;
 USE test_00857;
 DROP TABLE IF EXISTS local_table;
diff --git a/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql b/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
index 111104bb06e..f2dff662d9c 100644
--- a/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
+++ b/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-asan, no-msan, no-unbundled, no-parallel, no-fasttest
+-- Tag no-msan: memory limits don't work correctly under msan because it replaces malloc/free
+
 SET max_memory_usage = 1000000000;
 
 SELECT sum(ignore(*)) FROM (
diff --git a/tests/queries/0_stateless/00899_long_attach_memory_limit.sql b/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
index 0c8b8874293..aa507cda2ac 100644
--- a/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
+++ b/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-debug, no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS index_memory;
 CREATE TABLE index_memory (x UInt64) ENGINE = MergeTree ORDER BY x SETTINGS index_granularity = 1;
 INSERT INTO index_memory SELECT * FROM system.numbers LIMIT 5000000;
diff --git a/tests/queries/0_stateless/00900_entropy_shard.sql b/tests/queries/0_stateless/00900_entropy_shard.sql
index 6e343614bd2..10cc5481d47 100644
--- a/tests/queries/0_stateless/00900_entropy_shard.sql
+++ b/tests/queries/0_stateless/00900_entropy_shard.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SELECT round(entropy(number), 6) FROM remote('127.0.0.{1,2}', numbers(256));
 SELECT entropy(rand64()) > 8 FROM remote('127.0.0.{1,2}', numbers(256));
diff --git a/tests/queries/0_stateless/00900_long_parquet.sh b/tests/queries/0_stateless/00900_long_parquet.sh
index e748fbcaf24..629a82f9d71 100755
--- a/tests/queries/0_stateless/00900_long_parquet.sh
+++ b/tests/queries/0_stateless/00900_long_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00900_long_parquet_decimal.sh b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
index 67561f484bd..013899832d3 100755
--- a/tests/queries/0_stateless/00900_long_parquet_decimal.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.reference b/tests/queries/0_stateless/00900_long_parquet_load.reference
index 0fc050891f6..1efd3afd5f5 100644
--- a/tests/queries/0_stateless/00900_long_parquet_load.reference
+++ b/tests/queries/0_stateless/00900_long_parquet_load.reference
@@ -89,7 +89,7 @@ idx10	['This','is','a','test']
 23
 24
 === Try load data from datapage_v2.snappy.parquet
-Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not yet implemented: Unsupported encoding.: While executing ParquetBlockInputFormat: data for INSERT was parsed from stdin. (CANNOT_READ_ALL_DATA)
+Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not yet implemented: Unsupported encoding.: While executing ParquetBlockInputFormat: (in query: INSERT INTO parquet_load FORMAT Parquet): data for INSERT was parsed from stdin. (CANNOT_READ_ALL_DATA)
 
 === Try load data from datatype-date32.parquet
 1925-01-01
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.sh b/tests/queries/0_stateless/00900_long_parquet_load.sh
index 1cfba22587a..41e5359ac9b 100755
--- a/tests/queries/0_stateless/00900_long_parquet_load.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 #
 # Load all possible .parquet files found in submodules.
diff --git a/tests/queries/0_stateless/00900_null_array_orc_load.sh b/tests/queries/0_stateless/00900_null_array_orc_load.sh
index a303e50a04a..b651f419b1e 100755
--- a/tests/queries/0_stateless/00900_null_array_orc_load.sh
+++ b/tests/queries/0_stateless/00900_null_array_orc_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrays_load.sh b/tests/queries/0_stateless/00900_orc_arrays_load.sh
index 410945b31eb..ad014423246 100755
--- a/tests/queries/0_stateless/00900_orc_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
index 913789dedb0..ca32790a696 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
index 47d7b8519be..fc97cc5ef66 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
index ff16d3205ad..927e48a9c91 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_load.sh b/tests/queries/0_stateless/00900_orc_load.sh
index aae752be3e9..185af8be608 100755
--- a/tests/queries/0_stateless/00900_orc_load.sh
+++ b/tests/queries/0_stateless/00900_orc_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan, no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh b/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
index 81d2aeed4bd..e91edd1d956 100755
--- a/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
index 61829d0709b..3431a606de9 100755
--- a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00908_bloom_filter_index.sh b/tests/queries/0_stateless/00908_bloom_filter_index.sh
index a7631db759c..474a2b739e2 100755
--- a/tests/queries/0_stateless/00908_bloom_filter_index.sh
+++ b/tests/queries/0_stateless/00908_bloom_filter_index.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
+# Tag no-replicated-database: grep -c
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00908_long_http_insert.sh b/tests/queries/0_stateless/00908_long_http_insert.sh
index 5e793410412..ecd1bf37f66 100755
--- a/tests/queries/0_stateless/00908_long_http_insert.sh
+++ b/tests/queries/0_stateless/00908_long_http_insert.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00910_buffer_prewhere.sql b/tests/queries/0_stateless/00910_buffer_prewhere.sql
index d7d9813c5f5..deda0db85fb 100644
--- a/tests/queries/0_stateless/00910_buffer_prewhere.sql
+++ b/tests/queries/0_stateless/00910_buffer_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_buffer;
 CREATE DATABASE test_buffer;
 CREATE TABLE test_buffer.mt (uid UInt64, ts DateTime, val Float64) ENGINE = MergeTree PARTITION BY toDate(ts) ORDER BY (uid, ts);
diff --git a/tests/queries/0_stateless/00910_client_window_size_detection.sh b/tests/queries/0_stateless/00910_client_window_size_detection.sh
index 47d913de152..7bb70bb378b 100755
--- a/tests/queries/0_stateless/00910_client_window_size_detection.sh
+++ b/tests/queries/0_stateless/00910_client_window_size_detection.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql b/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
index 9a0c5d2f5ee..6dea97d1f27 100644
--- a/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
+++ b/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS union1;
 DROP TABLE IF EXISTS union2;
 CREATE TABLE union1 ( date Date, a Int32, b Int32, c Int32, d Int32) ENGINE = MergeTree(date, (a, date), 8192);
diff --git a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
index 3fe121edc94..369d897fafd 100644
--- a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
index e4994ff8d75..ffc1e0906ce 100644
--- a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SET send_logs_level = 'fatal';
 SET replication_alter_partitions_sync = 2;
 
diff --git a/tests/queries/0_stateless/00911_tautological_compare.sql b/tests/queries/0_stateless/00911_tautological_compare.sql
index bcbbbeb514b..93fd930d4bb 100644
--- a/tests/queries/0_stateless/00911_tautological_compare.sql
+++ b/tests/queries/0_stateless/00911_tautological_compare.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 -- TODO: Tautological optimization breaks JIT expression compilation, because it can return constant result
 -- for non constant columns. And then sample blocks from same ActionsDAGs can be mismatched.
 -- This optimization cannot be performed on AST rewrite level, because we does not have information about types
diff --git a/tests/queries/0_stateless/00914_replicate.sql b/tests/queries/0_stateless/00914_replicate.sql
index 4147df0ad45..0e6ac2bd331 100644
--- a/tests/queries/0_stateless/00914_replicate.sql
+++ b/tests/queries/0_stateless/00914_replicate.sql
@@ -1 +1,3 @@
+-- Tags: replica
+
 SELECT CAST(replicate(['a'], [1]) AS String);
diff --git a/tests/queries/0_stateless/00918_json_functions.sql b/tests/queries/0_stateless/00918_json_functions.sql
index f548b9e5e66..6504b735371 100644
--- a/tests/queries/0_stateless/00918_json_functions.sql
+++ b/tests/queries/0_stateless/00918_json_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT '--allow_simdjson=1--';
 SET allow_simdjson=1;
 
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
index 52a29c19be1..6d2cd0a176b 100755
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL="none"
 # We should have correct env vars from shell_config.sh to run this test
@@ -13,4 +14,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 python3 "${CURDIR}"/00921_datetime64_compatibility_long.python \
     | ${CLICKHOUSE_CLIENT} --ignore-error -T -nm --calculate_text_stack_trace 0 --log-level 'error' 2>&1 \
-    | grep -v 'Received exception .*$' | sed 's/^\(Code: [0-9]\+\).*$/\1/g'
+    | grep -v -e 'Received exception .*$' -e '^(query: ' | sed 's/^\(Code: [0-9]\+\).*$/\1/g'
diff --git a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
index 2b119836ebf..dcfeb85da33 100644
--- a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
+++ b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_optimize1;
 DROP TABLE IF EXISTS replicated_optimize2;
 CREATE TABLE replicated_optimize1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_00925/optimize', 'r1', d, k, 8192);
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
index 249c6eebfcf..a29a1bf9d1c 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 ----- Group of very similar simple tests ------
 select '----HORIZONTAL MERGE TESTS----';
 DROP TABLE IF EXISTS zero_rows_per_granule;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
index 3f151abc8fc..ba34cfad299 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SELECT '----00489----';
 DROP TABLE IF EXISTS pk;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
index 3542a6acd0a..075548df6c3 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 ----- Group of very similar simple tests ------
 DROP TABLE IF EXISTS zero_rows_per_granule;
 
diff --git a/tests/queries/0_stateless/00926_geo_to_h3.sql b/tests/queries/0_stateless/00926_geo_to_h3.sql
index a8315eb7ea6..8992f6ce348 100644
--- a/tests/queries/0_stateless/00926_geo_to_h3.sql
+++ b/tests/queries/0_stateless/00926_geo_to_h3.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS table1;
 
 CREATE TABLE table1 (lat Float64, lon Float64, resolution UInt8) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/00926_multimatch.sql b/tests/queries/0_stateless/00926_multimatch.sql
index bf67533bb6c..6a90bfec914 100644
--- a/tests/queries/0_stateless/00926_multimatch.sql
+++ b/tests/queries/0_stateless/00926_multimatch.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Hyperscan
+
 select 0 = multiMatchAny(materialize('mpnsguhwsitzvuleiwebwjfitmsg'), ['wbirxqoabpblrnvvmjizj', 'cfcxhuvrexyzyjsh', 'oldhtubemyuqlqbwvwwkwin', 'bumoozxdkjglzu', 'intxlfohlxmajjomw', 'dxkeghohv', 'arsvmwwkjeopnlwnan', 'ouugllgowpqtaxslcopkytbfhifaxbgt', 'hkedmjlbcrzvryaopjqdjjc', 'tbqkljywstuahzh', 'o', 'wowoclosyfcuwotmvjygzuzhrery', 'vpefjiffkhlggntcu', 'ytdixvasrorhripzfhjdmlhqksmctyycwp']) from system.numbers limit 10;
 select 0 = multiMatchAny(materialize('qjjzqexjpgkglgxpzrbqbnskq'), ['vaiatcjacmlffdzsejpdareqzy', 'xspcfzdufkmecud', 'bcvtbuqtctq', 'nkcopwbfytgemkqcfnnno', 'dylxnzuyhq', 'tno', 'scukuhufly', 'cdyquzuqlptv', 'ohluyfeksyxepezdhqmtfmgkvzsyph', 'ualzwtahvqvtijwp', 'jg', 'gwbawqlngzcknzgtmlj', 'qimvjcgbkkp', 'eaedbcgyrdvv', 'qcwrncjoewwedyyewcdkh', 'uqcvhngoqngmitjfxpznqomertqnqcveoqk', 'ydrgjiankgygpm', 'axepgap']) from system.numbers limit 10;
 select 0 = multiMatchAny(materialize('fdkmtqmxnegwvnjhghjq'), ['vynkybvdmhgeezybbdqfrukibisj', 'knazzamgjjpavwhvdkwigykh', 'peumnifrmdhhmrqqnemw', 'lmsnyvqoisinlaqobxojlwfbi', 'oqwfzs', 'dymudxxeodwjpgbibnkvr', 'vomtfsnizkplgzktqyoiw', 'yoyfuhlpgrzds', 'cefao', 'gi', 'srpgxfjwl', 'etsjusdeiwbfe', 'ikvtzdopxo', 'ljfkavrau', 'soqdhxtenfrkmeic', 'ktprjwfcelzbup', 'pcvuoddqwsaurcqdtjfnczekwni', 'agkqkqxkfbkfgyqliahsljim']) from system.numbers limit 10;
diff --git a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
index 1e04679e1f3..e6ca25a3dd6 100644
--- a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
+++ b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 ----- Group of very similar simple tests ------
 select '----HORIZONTAL MERGE TESTS----';
 DROP TABLE IF EXISTS zero_rows_per_granule1;
diff --git a/tests/queries/0_stateless/00927_asof_join_long.sql b/tests/queries/0_stateless/00927_asof_join_long.sql
index eb6eabfa4b9..c03a06d48d4 100644
--- a/tests/queries/0_stateless/00927_asof_join_long.sql
+++ b/tests/queries/0_stateless/00927_asof_join_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS tvs;
 
 CREATE TABLE tvs(k UInt32, t UInt32, tv UInt64) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/00927_disable_hyperscan.sql b/tests/queries/0_stateless/00927_disable_hyperscan.sql
index 009ed2629a8..9f0f6ca1538 100644
--- a/tests/queries/0_stateless/00927_disable_hyperscan.sql
+++ b/tests/queries/0_stateless/00927_disable_hyperscan.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug
+
 SET allow_hyperscan = 1;
 SELECT multiMatchAny(arrayJoin(['hello', 'world', 'hellllllllo', 'wororld', 'abc']), ['hel+o', 'w(or)*ld']);
 SET allow_hyperscan = 0;
diff --git a/tests/queries/0_stateless/00929_multi_match_edit_distance.sql b/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
index 50f2359a685..176e2a24b28 100644
--- a/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
+++ b/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Hyperscan
+
 SET send_logs_level = 'fatal';
 
 select 0 = multiFuzzyMatchAny('abc', 0, ['a1c']) from system.numbers limit 5;
diff --git a/tests/queries/0_stateless/00933_alter_ttl.sql b/tests/queries/0_stateless/00933_alter_ttl.sql
index f3f6858cbb4..4f586bb20fa 100644
--- a/tests/queries/0_stateless/00933_alter_ttl.sql
+++ b/tests/queries/0_stateless/00933_alter_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set send_logs_level = 'fatal';
 
 drop table if exists ttl;
diff --git a/tests/queries/0_stateless/00933_reserved_word.sql b/tests/queries/0_stateless/00933_reserved_word.sql
index 447a618bfc9..3a26bc6ac98 100644
--- a/tests/queries/0_stateless/00933_reserved_word.sql
+++ b/tests/queries/0_stateless/00933_reserved_word.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS reserved_word_table;
 CREATE TABLE reserved_word_table (`index` UInt8) ENGINE = MergeTree ORDER BY `index`;
 
diff --git a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
index 36ac490c80f..df4c5e233e4 100755
--- a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
+++ b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
index 6085545dc02..1728cc7458e 100644
--- a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS ttl_repl1;
 DROP TABLE IF EXISTS ttl_repl2;
 
diff --git a/tests/queries/0_stateless/00933_ttl_with_default.sql b/tests/queries/0_stateless/00933_ttl_with_default.sql
index e6c0a6e700c..5504e33235c 100644
--- a/tests/queries/0_stateless/00933_ttl_with_default.sql
+++ b/tests/queries/0_stateless/00933_ttl_with_default.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl_00933_2;
 
 create table ttl_00933_2 (d DateTime, a Int default 111 ttl d + interval 1 DAY) engine = MergeTree order by tuple() partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
index 01519f7a598..795f41528b2 100755
--- a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
+++ b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 # Test fix for issue #5066
 
diff --git a/tests/queries/0_stateless/00941_system_columns_race_condition.sh b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
index 1b34abc50d7..69dfb30cd2c 100755
--- a/tests/queries/0_stateless/00941_system_columns_race_condition.sh
+++ b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 # Test fix for issue #5066
 
diff --git a/tests/queries/0_stateless/00950_dict_get.sql b/tests/queries/0_stateless/00950_dict_get.sql
index e49e05fbd27..28f517a73cb 100644
--- a/tests/queries/0_stateless/00950_dict_get.sql
+++ b/tests/queries/0_stateless/00950_dict_get.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Must use `system` database and these tables - they're configured in tests/*_dictionary.xml
 use system;
 drop table if exists ints;
diff --git a/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql b/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
index 641e942bb8f..3a9a9154abe 100644
--- a/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
+++ b/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local_00952;
 DROP TABLE IF EXISTS distributed_00952;
 
diff --git a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
index ca3f4efe743..0705c955d60 100755
--- a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
+++ b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database
+# Tag no-replicated-database: Requires investigation
 
 set -e
 
diff --git a/tests/queries/0_stateless/00954_client_prepared_statements.sh b/tests/queries/0_stateless/00954_client_prepared_statements.sh
index 460b0d44943..7b74d792586 100755
--- a/tests/queries/0_stateless/00954_client_prepared_statements.sh
+++ b/tests/queries/0_stateless/00954_client_prepared_statements.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00955_test_final_mark.sql b/tests/queries/0_stateless/00955_test_final_mark.sql
index e020f10b71a..3c92d96e9a9 100644
--- a/tests/queries/0_stateless/00955_test_final_mark.sql
+++ b/tests/queries/0_stateless/00955_test_final_mark.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS mt_with_pk;
diff --git a/tests/queries/0_stateless/00955_test_final_mark_use.sh b/tests/queries/0_stateless/00955_test_final_mark_use.sh
index 3c7db3249b3..8642011b670 100755
--- a/tests/queries/0_stateless/00955_test_final_mark_use.sh
+++ b/tests/queries/0_stateless/00955_test_final_mark_use.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00956_sensitive_data_masking.sh b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
index 7462dfd5585..e7179e1e002 100755
--- a/tests/queries/0_stateless/00956_sensitive_data_masking.sh
+++ b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
@@ -37,7 +37,7 @@ echo 3
 # failure at before query start
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET' FROM non_existing_table FORMAT Null" \
-  --log_queries=1 --ignore-error --multiquery >"$tmp_file" 2>&1
+  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 3a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 3b'
@@ -47,7 +47,7 @@ echo 4
 # failure at the end of query
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET', intDiv( 100, number - 10) FROM numbers(11) FORMAT Null" \
-  --log_queries=1 --ignore-error --max_block_size=2 --multiquery >"$tmp_file" 2>&1
+  --log_queries=1 --ignore-error --max_block_size=2 --multiquery |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 4a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 4b'
@@ -57,7 +57,7 @@ echo 5
 rm -f "$tmp_file2" >/dev/null 2>&1
 bash -c "$CLICKHOUSE_CLIENT \
   --query=\"select sleepEachRow(1) from numbers(10) where ignore('find_me_TOPSECRET=TOPSECRET')=0 and ignore('fwerkh_that_magic_string_make_me_unique') = 0 FORMAT Null\" \
-  --log_queries=1 --ignore-error --multiquery >$tmp_file2 2>&1" &
+  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > $tmp_file2" &
 
 rm -f "$tmp_file" >/dev/null 2>&1
 # check that executing query doesn't expose secrets in processlist
diff --git a/tests/queries/0_stateless/00960_live_view_watch_events_live.py b/tests/queries/0_stateless/00960_live_view_watch_events_live.py
index 780c31f20ca..9327bc59f80 100755
--- a/tests/queries/0_stateless/00960_live_view_watch_events_live.py
+++ b/tests/queries/0_stateless/00960_live_view_watch_events_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00961_temporary_live_view_watch.sql b/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
index c33fa699321..8bf6fa5e07b 100644
--- a/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
+++ b/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
index 27308548452..5dd357a314a 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
index 76b9980d1f5..95b5530436d 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import time
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
index 34d5db676f4..57cb57d03c5 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py b/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
index 073c8c88e2b..98d65b47d39 100755
--- a/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
+++ b/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled b/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
index cfd218d5983..0b6ac65e77c 100755
--- a/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
+++ b/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py b/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
index 03b598fe46f..c352004078b 100755
--- a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
+++ b/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py b/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
index 15c4e763634..c1c14e8615b 100755
--- a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
+++ b/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql b/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
index 7026466fbab..0d82519e4d3 100644
--- a/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
+++ b/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT count() FROM remote('127.0.0.1,localhos', system.one); -- { serverError 198 }
 SELECT count() FROM remote('127.0.0.1|localhos', system.one);
 
diff --git a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
index 0e7fa55dbae..ca8d6ace69a 100644
--- a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
+++ b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET allow_simdjson=1;
 
 SELECT JSONLength('"HX-=');
diff --git a/tests/queries/0_stateless/00966_live_view_watch_events_http.py b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
index 1c00a5d1236..dcbae5498bf 100755
--- a/tests/queries/0_stateless/00966_live_view_watch_events_http.py
+++ b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql b/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
index 3b562801f92..b59b0b144f0 100644
--- a/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
+++ b/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync=1;
 
 DROP TABLE IF EXISTS dist_00967;
diff --git a/tests/queries/0_stateless/00967_live_view_watch_http.py b/tests/queries/0_stateless/00967_live_view_watch_http.py
index c41b9f0c861..05d7905e8ed 100755
--- a/tests/queries/0_stateless/00967_live_view_watch_http.py
+++ b/tests/queries/0_stateless/00967_live_view_watch_http.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
index eef27ba4999..77b0f37e10f 100644
--- a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
+++ b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
index c890cc28dc6..2d5d5f48b34 100644
--- a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
+++ b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
index 76e5cdbe88d..fbd7660bafe 100755
--- a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
+++ b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py b/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
index 5da36ab2d5f..db5e1698a10 100755
--- a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
+++ b/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00972_live_view_select_1.sql b/tests/queries/0_stateless/00972_live_view_select_1.sql
index 2034d699065..20344466856 100644
--- a/tests/queries/0_stateless/00972_live_view_select_1.sql
+++ b/tests/queries/0_stateless/00972_live_view_select_1.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_select.sql b/tests/queries/0_stateless/00973_live_view_select.sql
index f51c2071fc7..0844c730b26 100644
--- a/tests/queries/0_stateless/00973_live_view_select.sql
+++ b/tests/queries/0_stateless/00973_live_view_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_select_prewhere.sql b/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
index df3b7cb505a..d0d27464618 100644
--- a/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
+++ b/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
index 7ec992e63e7..9d644f245f6 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
index 4045f6c8434..562e6df1bfd 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
index 1c0e779123d..60078ccff30 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
index 75e42f76ac4..700de5955f9 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
index ea70d8f27b7..3a9408a62fa 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
index 10a33a18b61..c0f218edbd8 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
index 9094f923350..2d7da9d6df5 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
index 069889f210e..bdf74949f57 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
index 286d0db6102..a80af3e3337 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00974_distributed_join_on.sql b/tests/queries/0_stateless/00974_distributed_join_on.sql
index 355d9f81e82..2138fb0900f 100644
--- a/tests/queries/0_stateless/00974_distributed_join_on.sql
+++ b/tests/queries/0_stateless/00974_distributed_join_on.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS source_table1;
 DROP TABLE IF EXISTS source_table2;
 DROP TABLE IF EXISTS distributed_table1;
diff --git a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql b/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
index c4e7829b7dd..09eea37de60 100644
--- a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
+++ b/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00974_query_profiler.sql b/tests/queries/0_stateless/00974_query_profiler.sql
index 9bfd44628c9..343a8a4dbf3 100644
--- a/tests/queries/0_stateless/00974_query_profiler.sql
+++ b/tests/queries/0_stateless/00974_query_profiler.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-fasttest
+-- Tag no-fasttest: Not sure why fail even in sequential mode. Disabled for now to make some progress.
+
 SET allow_introspection_functions = 1;
 
 SET query_profiler_real_time_period_ns = 100000000;
diff --git a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
index 22c404c7712..5ad4007b873 100755
--- a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, replica
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00975_json_hang.sql b/tests/queries/0_stateless/00975_json_hang.sql
index d60411cb796..71d921f0475 100644
--- a/tests/queries/0_stateless/00975_json_hang.sql
+++ b/tests/queries/0_stateless/00975_json_hang.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DISTINCT JSONExtractRaw(concat('{"x":', rand() % 2 ? 'true' : 'false', '}'), 'x') AS res FROM numbers(1000000) ORDER BY res;
diff --git a/tests/queries/0_stateless/00975_live_view_create.sql b/tests/queries/0_stateless/00975_live_view_create.sql
index aa567f6a07f..1e7eb674bcc 100644
--- a/tests/queries/0_stateless/00975_live_view_create.sql
+++ b/tests/queries/0_stateless/00975_live_view_create.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS mt;
diff --git a/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql b/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
index a35260615c1..15e12c4ce81 100644
--- a/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
+++ b/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 create table if not exists sample_prewhere (date Date, id Int32, time Int64) engine = MergeTree partition by date order by (id, time, intHash64(time)) sample by intHash64(time);
 
 insert into sample_prewhere values ('2019-01-01', 2, toDateTime('2019-07-20 00:00:01'));
diff --git a/tests/queries/0_stateless/00976_live_view_select_version.sql b/tests/queries/0_stateless/00976_live_view_select_version.sql
index e9538b2e592..39ca587a49f 100644
--- a/tests/queries/0_stateless/00976_live_view_select_version.sql
+++ b/tests/queries/0_stateless/00976_live_view_select_version.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql b/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
index 3736be891cd..945292c5432 100644
--- a/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
+++ b/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS han_1;
 CREATE TABLE han_1 (k Int32, date_dt LowCardinality(Nullable(String))) 
 ENGINE = MergeTree() PARTITION BY k ORDER BY k;
diff --git a/tests/queries/0_stateless/00976_ttl_with_old_parts.sql b/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
index 60151595983..8473a69aedd 100644
--- a/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
+++ b/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d) settings remove_empty_parts = 0;
diff --git a/tests/queries/0_stateless/00977_live_view_watch_events.sql b/tests/queries/0_stateless/00977_live_view_watch_events.sql
index 926f6637ec5..3fe395b45fa 100644
--- a/tests/queries/0_stateless/00977_live_view_watch_events.sql
+++ b/tests/queries/0_stateless/00977_live_view_watch_events.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00978_live_view_watch.sql b/tests/queries/0_stateless/00978_live_view_watch.sql
index e2367fc8900..a76b8aef0d0 100644
--- a/tests/queries/0_stateless/00978_live_view_watch.sql
+++ b/tests/queries/0_stateless/00978_live_view_watch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
index 5f5f4d7a960..81e2764d64f 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live.py b/tests/queries/0_stateless/00979_live_view_watch_live.py
index 2fc70352dbf..7bbae932da7 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled b/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
index 54f9ef694d6..f545186d262 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
+++ b/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py b/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
index 2918bed82e8..ed2fe61f4b7 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00980_alter_settings_race.sh b/tests/queries/0_stateless/00980_alter_settings_race.sh
index 004504b1227..6eb1df8964c 100755
--- a/tests/queries/0_stateless/00980_alter_settings_race.sh
+++ b/tests/queries/0_stateless/00980_alter_settings_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00980_create_temporary_live_view.sql b/tests/queries/0_stateless/00980_create_temporary_live_view.sql
index 2dda5231e73..e01a6d9643e 100644
--- a/tests/queries/0_stateless/00980_create_temporary_live_view.sql
+++ b/tests/queries/0_stateless/00980_create_temporary_live_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00980_merge_alter_settings.sql b/tests/queries/0_stateless/00980_merge_alter_settings.sql
index 755983ac62b..c0d18f6d453 100644
--- a/tests/queries/0_stateless/00980_merge_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_merge_alter_settings.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS log_for_alter;
 
 CREATE TABLE log_for_alter (
diff --git a/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql b/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
index 06f0dcab55b..786e8c5d7e0 100644
--- a/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
+++ b/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS numbers500k;
 CREATE VIEW numbers500k AS SELECT number FROM system.numbers LIMIT 500000;
 
diff --git a/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql b/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
index cccc4a81038..bdabfc7b5f0 100644
--- a/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
+++ b/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t_distr;
 
diff --git a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
index 25516f577ec..dfb91eb3b0a 100644
--- a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS replicated_table_for_alter1;
 DROP TABLE IF EXISTS replicated_table_for_alter2;
 
diff --git a/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql b/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
index 5758f8ab8e5..48d9dedc61c 100644
--- a/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
+++ b/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS topk;
 
 CREATE TABLE topk (val1 String, val2 UInt32) ENGINE = MergeTree ORDER BY val1;
diff --git a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
index 1ef7c543252..2749827c880 100644
--- a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
+++ b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS distr0;
 DROP TABLE IF EXISTS distr1;
 DROP TABLE IF EXISTS distr2;
diff --git a/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql b/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
index c36bee7fe4f..0bcde52d3d6 100644
--- a/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS replicated_constraints1;
 DROP TABLE IF EXISTS replicated_constraints2;
 
diff --git a/tests/queries/0_stateless/00989_parallel_parts_loading.sql b/tests/queries/0_stateless/00989_parallel_parts_loading.sql
index 0b4c0501669..13cd56e1924 100644
--- a/tests/queries/0_stateless/00989_parallel_parts_loading.sql
+++ b/tests/queries/0_stateless/00989_parallel_parts_loading.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS mt;
 
 CREATE TABLE mt (x UInt64) ENGINE = MergeTree ORDER BY x SETTINGS max_part_loading_threads = 16, parts_to_delay_insert = 100000, parts_to_throw_insert = 100000;
diff --git a/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled b/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
index 0548d24a80b..92cc5b10e6b 100755
--- a/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
+++ b/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled b/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
index d441ab94473..abb1a94371d 100755
--- a/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
+++ b/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
index f1b12a319c0..8243c6bde62 100755
--- a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
+++ b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 # This test is disabled because it triggers internal assert in Thread Sanitizer.
 # Thread Sanitizer does not support for more than 64 mutexes to be locked in a single thread.
diff --git a/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled b/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
index ebe492fafce..97c6c92b999 100755
--- a/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
+++ b/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled b/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
index 91efff53abe..2e784223186 100755
--- a/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
+++ b/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
index 19f72120912..273b39961af 100755
--- a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index bdad08fb0e1..72d3cbaa2f1 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh b/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
index f20a0d8d3bd..93e0b0bc0cc 100755
--- a/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
+++ b/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01001_rename_merge_race_condition.sh b/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
index 5aeea34e7c1..253d06c038c 100755
--- a/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
+++ b/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh b/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
index d2766a14c24..b29a42a7356 100755
--- a/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
+++ b/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01003_kill_query_race_condition.sh b/tests/queries/0_stateless/01003_kill_query_race_condition.sh
index 2d21aabf91a..934d18d2670 100755
--- a/tests/queries/0_stateless/01003_kill_query_race_condition.sh
+++ b/tests/queries/0_stateless/01003_kill_query_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01004_rename_deadlock.sh b/tests/queries/0_stateless/01004_rename_deadlock.sh
index 2bde9256bba..f0adf136e94 100755
--- a/tests/queries/0_stateless/01004_rename_deadlock.sh
+++ b/tests/queries/0_stateless/01004_rename_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh b/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
index 5c2ca22715d..ef352606b69 100755
--- a/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
+++ b/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
index 8936d8da775..9f4b2241732 100755
--- a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
+++ b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01009_global_array_join_names.sql b/tests/queries/0_stateless/01009_global_array_join_names.sql
index f3cbd0cf44d..26e7c68ed1b 100644
--- a/tests/queries/0_stateless/01009_global_array_join_names.sql
+++ b/tests/queries/0_stateless/01009_global_array_join_names.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS test1;
 DROP TABLE IF EXISTS test2;
 
diff --git a/tests/queries/0_stateless/01010_pm_join_all_join_bug.reference b/tests/queries/0_stateless/01010_pm_join_all_join_bug.reference
index 5f51e52afa8..6648a96cbc3 100644
--- a/tests/queries/0_stateless/01010_pm_join_all_join_bug.reference
+++ b/tests/queries/0_stateless/01010_pm_join_all_join_bug.reference
@@ -7,3 +7,4 @@
 1	0	1
 1	1	0
 1	1	1
+-
diff --git a/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql b/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
index ef406108514..18a67f41194 100644
--- a/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
+++ b/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
@@ -9,4 +9,7 @@ SELECT * FROM ints l LEFT JOIN ints r USING i64 ORDER BY l.i32, r.i32;
 SELECT '-';
 SELECT * FROM ints l INNER JOIN ints r USING i64 ORDER BY l.i32, r.i32;
 
+SELECT '-';
+SELECT count() FROM ( SELECT [1], count(1) ) AS t1 ALL RIGHT JOIN ( SELECT number AS s FROM numbers(2) ) AS t2 USING (s); -- { serverError NOT_FOUND_COLUMN_IN_BLOCK }
+
 DROP TABLE ints;
diff --git a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
index 2c5f0ef6d99..af747c93678 100644
--- a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
+++ b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET max_memory_usage = 32000000;
 SET join_on_disk_max_files_to_merge = 4;
 
diff --git a/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql b/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
index b20f86ea7e0..eaee502f0a0 100644
--- a/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
+++ b/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 -- serialization of big arrays shouldn't use too much memory
 set max_memory_usage = 300000000;
 select ignore(x) from (select groupArray(number) x from numbers(3355443)) group by x format Null;
diff --git a/tests/queries/0_stateless/01012_show_tables_limit.sql b/tests/queries/0_stateless/01012_show_tables_limit.sql
index f75ba88cf2b..82cde6917d0 100644
--- a/tests/queries/0_stateless/01012_show_tables_limit.sql
+++ b/tests/queries/0_stateless/01012_show_tables_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_show_limit;
 
 CREATE DATABASE test_show_limit;
diff --git a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
index 89b178a38ea..55bbfb3ff11 100755
--- a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
+++ b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01014_lazy_database_basic.sh b/tests/queries/0_stateless/01014_lazy_database_basic.sh
index 11d698e764e..496e9754089 100755
--- a/tests/queries/0_stateless/01014_lazy_database_basic.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_basic.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
index 1970dfe490c..44a27ea08f4 100755
--- a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01015_attach_part.sql b/tests/queries/0_stateless/01015_attach_part.sql
index 290b5eb967f..3d2058f757e 100644
--- a/tests/queries/0_stateless/01015_attach_part.sql
+++ b/tests/queries/0_stateless/01015_attach_part.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS table_01;
 
 CREATE TABLE table_01 (
diff --git a/tests/queries/0_stateless/01015_database_bad_tables.sql b/tests/queries/0_stateless/01015_database_bad_tables.sql
index 458cc597a67..5931b3b6fa5 100644
--- a/tests/queries/0_stateless/01015_database_bad_tables.sql
+++ b/tests/queries/0_stateless/01015_database_bad_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS testlazy;
 
 CREATE TABLE `таблица_со_странным_названием` (a UInt64, b UInt64) ENGINE = Log;
diff --git a/tests/queries/0_stateless/01016_input_null_as_default.sh b/tests/queries/0_stateless/01016_input_null_as_default.sh
index 137e25b6a12..bfeaca0fcac 100755
--- a/tests/queries/0_stateless/01016_input_null_as_default.sh
+++ b/tests/queries/0_stateless/01016_input_null_as_default.sh
@@ -57,8 +57,8 @@ $CLICKHOUSE_CLIENT --query="TRUNCATE TABLE null_as_default";
 
 echo 'Values'
 echo '(NULL, '\''1'\'', (null), '\''2019-07-22'\'', ([10, 20, 30]), (NuLl)),
-(1, '\''world'\'', (3), '\''2019-07-23'\'', (NULL), (('\''tuple'\'', 3.14))),
-(2, null, (123), null, ([]), (('\''test'\'', 2.71828))),
+(1, '\''world'\'', (3), '\''2019-07-23'\'', (NULL), ('\''tuple'\'', 3.14)),
+(2, null, (123), null, ([]), ('\''test'\'', 2.71828)),
 (3, null, (null), null, (null), (null))' | $CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO null_as_default VALUES";
 $CLICKHOUSE_CLIENT --query="SELECT * FROM null_as_default ORDER BY i";
 $CLICKHOUSE_CLIENT --query="DROP TABLE null_as_default";
diff --git a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
index a10e5fb2788..e09a8493bb8 100755
--- a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
+++ b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql b/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
index 2ad1edae733..d47dc6b8d5f 100644
--- a/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
+++ b/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
@@ -1,3 +1,8 @@
+-- Tags: no-tsan, no-asan, no-msan, no-replicated-database
+-- Tag no-tsan: Fine thresholds on memory usage
+-- Tag no-asan: Fine thresholds on memory usage
+-- Tag no-msan: Fine thresholds on memory usage
+
 -- each uniqCombined state should not use > sizeof(HLL) in memory,
 -- sizeof(HLL) is (2^K * 6 / 8)
 -- hence max_memory_usage for 100 rows = (96<<10)*100 = 9830400
diff --git a/tests/queries/0_stateless/01018_Distributed__shard_num.sql b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
index 7d4aaf42473..be2df8b664f 100644
--- a/tests/queries/0_stateless/01018_Distributed__shard_num.sql
+++ b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- make the order static
 SET max_threads = 1;
 
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh b/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
index 37e9fd774d7..6826ed677db 100755
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-replicated-database: grep -c
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
index 025fe51e2a9..100e79a4546 100755
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
index dd62f1451a8..0c5e0c69ffe 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict_01018;
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
index 229d5d55774..69c8ad2faee 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
index db3b7f29492..1877c289d3f 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql b/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
index fb34beaca2a..a4a06d44e01 100644
--- a/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
+++ b/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_ip_dictionary_long.sql b/tests/queries/0_stateless/01018_ip_dictionary_long.sql
index 2abd51cc9fe..6e0c9c8d416 100644
--- a/tests/queries/0_stateless/01018_ip_dictionary_long.sql
+++ b/tests/queries/0_stateless/01018_ip_dictionary_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql b/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
index 5833f2592a2..9fbc3f951fe 100644
--- a/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
+++ b/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 DROP TABLE IF EXISTS null_;
 DROP TABLE IF EXISTS buffer_;
 DROP TABLE IF EXISTS aggregation_;
diff --git a/tests/queries/0_stateless/01020_function_array_compact.reference b/tests/queries/0_stateless/01020_function_array_compact.reference
index 6627a437251..4a6265b4f55 100644
--- a/tests/queries/0_stateless/01020_function_array_compact.reference
+++ b/tests/queries/0_stateless/01020_function_array_compact.reference
@@ -7,3 +7,5 @@
 [1,2,1]
 [2,1]
 [1,2,3,4,5]
+[0]
+[0]
diff --git a/tests/queries/0_stateless/01020_function_array_compact.sql b/tests/queries/0_stateless/01020_function_array_compact.sql
index eea69dcb6da..d4aaa4d3fca 100644
--- a/tests/queries/0_stateless/01020_function_array_compact.sql
+++ b/tests/queries/0_stateless/01020_function_array_compact.sql
@@ -7,3 +7,5 @@ select arrayCompact([1,1,2]);
 select arrayCompact([1,2,1]);
 select arrayCompact([2,1,1]);
 select arrayCompact([1,2,2,3,3,3,4,4,4,4,5,5,5,5,5]);
+SELECT arrayCompact(x->0, [NULL]);
+SELECT toString(arrayCompact(x->0, [NULL]));
diff --git a/tests/queries/0_stateless/01021_only_tuple_columns.sql b/tests/queries/0_stateless/01021_only_tuple_columns.sql
index 27019a67b98..a0be59c3120 100644
--- a/tests/queries/0_stateless/01021_only_tuple_columns.sql
+++ b/tests/queries/0_stateless/01021_only_tuple_columns.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 CREATE TABLE test
 (
     `x` Tuple(UInt64, UInt64)
diff --git a/tests/queries/0_stateless/01023_materialized_view_query_context.sql b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
index 351379d8b14..415690ae1e5 100644
--- a/tests/queries/0_stateless/01023_materialized_view_query_context.sql
+++ b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Create dictionary, since dictGet*() uses DB::Context in executeImpl()
 -- (To cover scope of the Context in DB::PushingToViewsBlockOutputStream::process)
 
diff --git a/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql b/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
index 807889a935a..bfedcc56496 100644
--- a/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
+++ b/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 drop table if exists test_table_hdfs_syntax
 ;
 create table test_table_hdfs_syntax (id UInt32) ENGINE = HDFS('')
diff --git a/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh b/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
index 9bc9028ad1f..8c172049745 100755
--- a/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
+++ b/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01033_dictionaries_lifetime.sql b/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
index 40482cd9f7b..299931bdeb3 100644
--- a/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
+++ b/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01033_quota_dcl.reference b/tests/queries/0_stateless/01033_quota_dcl.reference
index 7478adac441..e732ea2fcd6 100644
--- a/tests/queries/0_stateless/01033_quota_dcl.reference
+++ b/tests/queries/0_stateless/01033_quota_dcl.reference
@@ -1 +1 @@
-CREATE QUOTA default KEYED BY user_name FOR INTERVAL 1 hour TRACKING ONLY TO default, readonly
+CREATE QUOTA default KEYED BY user_name FOR INTERVAL 1 hour TRACKING ONLY TO default, readonly, session_log_test_xml_user
diff --git a/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql b/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
index 7a3d2914111..66c0bb51e8f 100644
--- a/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
+++ b/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS BannerDict;
 
 CREATE TABLE BannerDict (`BannerID` UInt64, `CompaignID` UInt64) ENGINE = ODBC('DSN=pgconn;Database=postgres', bannerdict); -- {serverError 42}
diff --git a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
index af4969d77c8..b8b261aefad 100755
--- a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql b/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
index e708b6ec317..4eea4fd47c7 100644
--- a/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
+++ b/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, distributed
+
 drop table if exists test_max_parallel_replicas_lr;
 
 -- If you wonder why the table is named with "_lr" suffix in this test.
diff --git a/tests/queries/0_stateless/01034_sample_final_distributed.sql b/tests/queries/0_stateless/01034_sample_final_distributed.sql
index ca03daebe12..b784b35cbb3 100644
--- a/tests/queries/0_stateless/01034_sample_final_distributed.sql
+++ b/tests/queries/0_stateless/01034_sample_final_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists sample_final;
 create table sample_final (CounterID UInt32, EventDate Date, EventTime DateTime, UserID UInt64, Sign Int8) engine = CollapsingMergeTree(Sign) order by (CounterID, EventDate, intHash32(UserID), EventTime) sample by intHash32(UserID);
 insert into sample_final select number / (8192 * 4), toDate('2019-01-01'), toDateTime('2019-01-01 00:00:01') + number, number / (8192 * 2), number % 3 = 1 ? -1 : 1 from numbers(1000000);
diff --git a/tests/queries/0_stateless/01035_avg_weighted_long.sh b/tests/queries/0_stateless/01035_avg_weighted_long.sh
index 30b403e2cc4..138aa03fbb3 100755
--- a/tests/queries/0_stateless/01035_avg_weighted_long.sh
+++ b/tests/queries/0_stateless/01035_avg_weighted_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
index 7c15b795c36..16331a49bc4 100755
--- a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
index bd01ea704b1..9040d7b3231 100644
--- a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
+++ b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01036;
 CREATE DATABASE dict_db_01036;
 
diff --git a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
index fa0502ac328..bc84bc0687b 100644
--- a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
+++ b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS `foo 1234`;
 CREATE DATABASE `foo 1234`;
 
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
index f12f35a6af0..fae263b076f 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
index 876f705703e..ea4389d610c 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
index 64039d8dd1f..be983ec1be4 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql b/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
index 262ccecc7d4..703f8824055 100644
--- a/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
+++ b/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 SET check_query_single_value_result = 0;
 SET send_logs_level = 'fatal';
 
diff --git a/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh b/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
index 036eb3db3f3..1e754dce786 100755
--- a/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
+++ b/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
index 66571f456d9..7d6cc5f1bff 100755
--- a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
+++ b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql b/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
index 5e30b6b1a9d..03f6f51daca 100644
--- a/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
+++ b/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test_01040;
 DROP TABLE IF EXISTS dist_test_01040;
 
diff --git a/tests/queries/0_stateless/01040_h3_get_resolution.sql b/tests/queries/0_stateless/01040_h3_get_resolution.sql
index 3dc27216333..58c4af184dc 100644
--- a/tests/queries/0_stateless/01040_h3_get_resolution.sql
+++ b/tests/queries/0_stateless/01040_h3_get_resolution.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3GetResolution(581276613233082367);
 SELECT h3GetResolution(621807531097128959);
 SELECT h3GetResolution(644325529233966508);
diff --git a/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql b/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
index 3d6586063e9..6b4335d4464 100644
--- a/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
+++ b/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictdb.table_for_dict;
 DROP DICTIONARY IF EXISTS dictdb.dict_exists;
 DROP DATABASE IF EXISTS dictdb;
diff --git a/tests/queries/0_stateless/01041_h3_is_valid.sql b/tests/queries/0_stateless/01041_h3_is_valid.sql
index 05885561844..f889a294bcc 100644
--- a/tests/queries/0_stateless/01041_h3_is_valid.sql
+++ b/tests/queries/0_stateless/01041_h3_is_valid.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3IsValid(581276613233082367);
 SELECT h3IsValid(621807531097128959);
 SELECT h3IsValid(Cast(0, 'UInt64'));
diff --git a/tests/queries/0_stateless/01042_h3_k_ring.sql b/tests/queries/0_stateless/01042_h3_k_ring.sql
index 35335df7ff2..9e9afae5024 100644
--- a/tests/queries/0_stateless/01042_h3_k_ring.sql
+++ b/tests/queries/0_stateless/01042_h3_k_ring.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT arraySort(h3kRing(581276613233082367, 1));
 SELECT h3kRing(581276613233082367, 0);
 SELECT h3kRing(581276613233082367, -1); -- { serverError 12 }
diff --git a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
index 512d12866c4..f2b30e05040 100755
--- a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
+++ b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql b/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
index 5e150cfed9c..5d629d4e8db 100644
--- a/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
+++ b/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dictdb_01043;
 CREATE DATABASE dictdb_01043;
 
diff --git a/tests/queries/0_stateless/01043_h3_edge_length_m.sql b/tests/queries/0_stateless/01043_h3_edge_length_m.sql
index dbc517baa8b..03a5dbb4424 100644
--- a/tests/queries/0_stateless/01043_h3_edge_length_m.sql
+++ b/tests/queries/0_stateless/01043_h3_edge_length_m.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeLengthM(1);
 SELECT h3EdgeLengthM(4);
diff --git a/tests/queries/0_stateless/01044_h3_edge_angle.sql b/tests/queries/0_stateless/01044_h3_edge_angle.sql
index a22121971f4..bb87ef20fe3 100644
--- a/tests/queries/0_stateless/01044_h3_edge_angle.sql
+++ b/tests/queries/0_stateless/01044_h3_edge_angle.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeAngle(10);
 SELECT h3EdgeLengthM(2) * 180 / pi() / 6371007.180918475 - h3EdgeAngle(2);
diff --git a/tests/queries/0_stateless/01045_dictionaries_restrictions.sql b/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
index 0bc2f6f9f13..d41be7482f8 100644
--- a/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
+++ b/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dictdb_01045;
 
 CREATE DATABASE dictdb_01045;
diff --git a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
index 6510fcf408d..a438cf7badc 100755
--- a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
+++ b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql b/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
index 318f48dc833..8822ec37d66 100644
--- a/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
+++ b/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- from https://github.com/ClickHouse/ClickHouse/issues/5142
 
 set insert_distributed_sync = 1;
diff --git a/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql b/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
index 8bfafe8e963..40dde29d8e5 100644
--- a/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
+++ b/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test_count;
 
 CREATE TABLE test_count (`pt` Date) ENGINE = MergeTree PARTITION BY pt ORDER BY pt SETTINGS index_granularity = 8192;
diff --git a/tests/queries/0_stateless/01048_exists_query.sql b/tests/queries/0_stateless/01048_exists_query.sql
index 4e642084354..07d3a026c68 100644
--- a/tests/queries/0_stateless/01048_exists_query.sql
+++ b/tests/queries/0_stateless/01048_exists_query.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 EXISTS db_01048.t_01048;
 EXISTS TABLE db_01048.t_01048;
 EXISTS DICTIONARY db_01048.t_01048;
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2 b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
index 93019e7a0ec..b19addfb6be 100644
--- a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
+++ b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS l;
 DROP TABLE IF EXISTS r;
 DROP TABLE IF EXISTS nl;
diff --git a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
index 688847b5c59..c77ab50ab8b 100644
--- a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
+++ b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_synchronous_mutations1;
 DROP TABLE IF EXISTS table_for_synchronous_mutations2;
 
diff --git a/tests/queries/0_stateless/01051_system_stack_trace.sql b/tests/queries/0_stateless/01051_system_stack_trace.sql
index 32d344fce7e..e495e2198ea 100644
--- a/tests/queries/0_stateless/01051_system_stack_trace.sql
+++ b/tests/queries/0_stateless/01051_system_stack_trace.sql
@@ -1,2 +1,4 @@
+-- Tags: race
+
 -- at least this query should be present
 SELECT count() > 0 FROM system.stack_trace WHERE query_id != '';
diff --git a/tests/queries/0_stateless/01053_drop_database_mat_view.sql b/tests/queries/0_stateless/01053_drop_database_mat_view.sql
index 9f7438d594e..67a488f7245 100644
--- a/tests/queries/0_stateless/01053_drop_database_mat_view.sql
+++ b/tests/queries/0_stateless/01053_drop_database_mat_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS some_tests;
 CREATE DATABASE some_tests ENGINE=Ordinary; -- Different inner table name with Atomic
 
diff --git a/tests/queries/0_stateless/01053_ssd_dictionary.sh b/tests/queries/0_stateless/01053_ssd_dictionary.sh
index 9cdd391ec5a..dc5002eaf17 100755
--- a/tests/queries/0_stateless/01053_ssd_dictionary.sh
+++ b/tests/queries/0_stateless/01053_ssd_dictionary.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: this test mistakenly requires acces to /var/lib/clickhouse -- can't run this locally, disabled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
index 235ed7db362..04b1f8b65ce 100755
--- a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
+++ b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql b/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
index 1b317e2165e..88c59014166 100644
--- a/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
+++ b/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
@@ -1,3 +1,4 @@
+-- Tags: no-parallel
 
 create database if not exists test_01054_overflow;
 drop table if exists test_01054_overflow.ints;
diff --git a/tests/queries/0_stateless/01055_compact_parts_1.sql b/tests/queries/0_stateless/01055_compact_parts_1.sql
index c2c2ab041e7..9acd2578025 100644
--- a/tests/queries/0_stateless/01055_compact_parts_1.sql
+++ b/tests/queries/0_stateless/01055_compact_parts_1.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists mt_compact;
 drop table if exists mt_compact_2;
 
diff --git a/tests/queries/0_stateless/01056_create_table_as.sql b/tests/queries/0_stateless/01056_create_table_as.sql
index c27f30b61d5..62db8282ac0 100644
--- a/tests/queries/0_stateless/01056_create_table_as.sql
+++ b/tests/queries/0_stateless/01056_create_table_as.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh b/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
index 22ab745d7c0..78ee0ace479 100755
--- a/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
+++ b/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01059_storage_file_compression.sh b/tests/queries/0_stateless/01059_storage_file_compression.sh
index cab7bc2a38c..fbee5070d8d 100755
--- a/tests/queries/0_stateless/01059_storage_file_compression.sh
+++ b/tests/queries/0_stateless/01059_storage_file_compression.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on brotli and bzip2
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01060_avro.sh b/tests/queries/0_stateless/01060_avro.sh
index e735fadf2be..4fca8c196a2 100755
--- a/tests/queries/0_stateless/01060_avro.sh
+++ b/tests/queries/0_stateless/01060_avro.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-parallel, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql b/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
index 1987fffaa58..5e0ed8b298d 100644
--- a/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
+++ b/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS test;
 CREATE TABLE test Engine = MergeTree ORDER BY number AS SELECT number, toString(rand()) x from numbers(10000000);
 
diff --git a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
index 53d7100a38e..aba84f43033 100644
--- a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS test_alter_on_mutation;
 
 CREATE TABLE test_alter_on_mutation
diff --git a/tests/queries/0_stateless/01069_database_memory.sql b/tests/queries/0_stateless/01069_database_memory.sql
index ed006a5ce04..76a98bf544c 100644
--- a/tests/queries/0_stateless/01069_database_memory.sql
+++ b/tests/queries/0_stateless/01069_database_memory.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS memory_01069;
 CREATE DATABASE memory_01069 ENGINE = Memory;
 SHOW CREATE DATABASE memory_01069;
diff --git a/tests/queries/0_stateless/01070_h3_get_base_cell.sql b/tests/queries/0_stateless/01070_h3_get_base_cell.sql
index b06a12daf4a..27a0b1de152 100644
--- a/tests/queries/0_stateless/01070_h3_get_base_cell.sql
+++ b/tests/queries/0_stateless/01070_h3_get_base_cell.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3GetBaseCell(612916788725809151);
diff --git a/tests/queries/0_stateless/01070_h3_hex_area_m2.sql b/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
index b282485da77..9ad8beec99c 100644
--- a/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
+++ b/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3HexAreaM2(5);
 SELECT h3HexAreaM2(13);
diff --git a/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql b/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
index 52449654b29..6ef2874a962 100644
--- a/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
+++ b/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3IndexesAreNeighbors(617420388352917503, 617420388352655359);
 SELECT h3IndexesAreNeighbors(617420388351344639, 617420388352655359);
 SELECT h3IndexesAreNeighbors(617420388351344639, 617420388351344639);
diff --git a/tests/queries/0_stateless/01070_h3_to_children.sql b/tests/queries/0_stateless/01070_h3_to_children.sql
index 647d4cef078..75675489e0c 100644
--- a/tests/queries/0_stateless/01070_h3_to_children.sql
+++ b/tests/queries/0_stateless/01070_h3_to_children.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT arraySort(h3ToChildren(599405990164561919, 3));
 
 SELECT arraySort(h3ToChildren(599405990164561919, 6));
diff --git a/tests/queries/0_stateless/01070_h3_to_parent.sql b/tests/queries/0_stateless/01070_h3_to_parent.sql
index 5052f4b7b92..46d354d8537 100644
--- a/tests/queries/0_stateless/01070_h3_to_parent.sql
+++ b/tests/queries/0_stateless/01070_h3_to_parent.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToParent(599405990164561919, 3);
 SELECT h3ToParent(599405990164561919, 0);
diff --git a/tests/queries/0_stateless/01070_h3_to_string.sql b/tests/queries/0_stateless/01070_h3_to_string.sql
index 358c5ae18d2..05aa3c90d23 100644
--- a/tests/queries/0_stateless/01070_h3_to_string.sql
+++ b/tests/queries/0_stateless/01070_h3_to_string.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToString(617420388352917503);
diff --git a/tests/queries/0_stateless/01070_materialize_ttl.sql b/tests/queries/0_stateless/01070_materialize_ttl.sql
index 2521ae35edf..b6a03f2ca10 100644
--- a/tests/queries/0_stateless/01070_materialize_ttl.sql
+++ b/tests/queries/0_stateless/01070_materialize_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/01070_modify_ttl.sql b/tests/queries/0_stateless/01070_modify_ttl.sql
index c2746034a40..0716ccd7043 100644
--- a/tests/queries/0_stateless/01070_modify_ttl.sql
+++ b/tests/queries/0_stateless/01070_modify_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql b/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql
index aafed1a7bce..247e412484f 100644
--- a/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql
+++ b/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set mutations_sync = 2;
 
 drop table if exists ttl;
diff --git a/tests/queries/0_stateless/01070_mutations_with_dependencies.sql b/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
index 10077a94c9d..6f297e25b95 100644
--- a/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
+++ b/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 set mutations_sync = 2;
 
diff --git a/tests/queries/0_stateless/01070_string_to_h3.sql b/tests/queries/0_stateless/01070_string_to_h3.sql
index 47b02d9f88b..db4a45f3d64 100644
--- a/tests/queries/0_stateless/01070_string_to_h3.sql
+++ b/tests/queries/0_stateless/01070_string_to_h3.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT stringToH3('89184926cc3ffff');
diff --git a/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql b/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
index 33806cc7416..6a43a750b01 100644
--- a/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
+++ b/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_01071;
diff --git a/tests/queries/0_stateless/01071_live_view_detach_dependency.sql b/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
index e16b8d67bc7..1caab4ca240 100644
--- a/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
+++ b/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 DROP TABLE IF EXISTS test;
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql b/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
index 4c005f6ba56..bbb607fe89f 100644
--- a/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
+++ b/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE TABLE old_syntax_01071_test (date Date, id UInt8) ENGINE = MergeTree(date, id, 8192);
 ALTER TABLE old_syntax_01071_test ADD INDEX  id_minmax id TYPE minmax GRANULARITY 1; -- { serverError 36 }
 CREATE TABLE new_syntax_01071_test (date Date, id UInt8) ENGINE = MergeTree() ORDER BY id;
diff --git a/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql b/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
index 0e4e031a985..f7ccc309c5a 100644
--- a/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
+++ b/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json_square_brackets;
 CREATE TABLE json_square_brackets (id UInt32, name String) ENGINE = Memory;
 INSERT INTO json_square_brackets FORMAT JSONEachRow [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
diff --git a/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql b/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
index e0877d16ca3..ea0da0fe545 100644
--- a/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
+++ b/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-unbundled
+
 drop table if exists data_01072;
 drop table if exists dist_01072;
 
diff --git a/tests/queries/0_stateless/01073_attach_if_not_exists.sql b/tests/queries/0_stateless/01073_attach_if_not_exists.sql
index 8bb52556ccc..8bd356b466c 100644
--- a/tests/queries/0_stateless/01073_attach_if_not_exists.sql
+++ b/tests/queries/0_stateless/01073_attach_if_not_exists.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE TABLE aine (a Int) ENGINE = Log;
 ATTACH TABLE aine; -- { serverError 57 }
 ATTACH TABLE IF NOT EXISTS aine;
diff --git a/tests/queries/0_stateless/01073_show_tables_not_like.sql b/tests/queries/0_stateless/01073_show_tables_not_like.sql
index bdf88449ccb..405a6cb199b 100644
--- a/tests/queries/0_stateless/01073_show_tables_not_like.sql
+++ b/tests/queries/0_stateless/01073_show_tables_not_like.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SHOW TABLES NOT LIKE '%';
 
 DROP DATABASE IF EXISTS test_01073;
diff --git a/tests/queries/0_stateless/01074_h3_range_check.sql b/tests/queries/0_stateless/01074_h3_range_check.sql
index 17b5c5c5b26..42a95229f3f 100644
--- a/tests/queries/0_stateless/01074_h3_range_check.sql
+++ b/tests/queries/0_stateless/01074_h3_range_check.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeLengthM(100); -- { serverError 69 }
 SELECT h3HexAreaM2(100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01075_allowed_client_hosts.sql b/tests/queries/0_stateless/01075_allowed_client_hosts.sql
index 2960a93f0f2..17957c8826b 100644
--- a/tests/queries/0_stateless/01075_allowed_client_hosts.sql
+++ b/tests/queries/0_stateless/01075_allowed_client_hosts.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP USER IF EXISTS test_user_01075, test_user_01075_x, test_user_01075_x@localhost, test_user_01075_x@'192.168.23.15';
 
 CREATE USER test_user_01075;
diff --git a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
index 2562e701a25..80821193d38 100755
--- a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
+++ b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 # This is a monkey test used to trigger sanitizers.
 
diff --git a/tests/queries/0_stateless/01076_json_each_row_array.sh b/tests/queries/0_stateless/01076_json_each_row_array.sh
index cbbaafacace..ec24741ed16 100755
--- a/tests/queries/0_stateless/01076_json_each_row_array.sh
+++ b/tests/queries/0_stateless/01076_json_each_row_array.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
index efe518046a1..bbc16121cb6 100755
--- a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel, no-fasttest
 
 
 # This test checks mutations concurrent execution with concurrent inserts.
diff --git a/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql b/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
index 7257f86c4e8..9239d2e9984 100644
--- a/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS alter_default;
 
 CREATE TABLE alter_default
diff --git a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
index 6e79be90046..82b8be65af5 100755
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
index 4b67a03760b..fbeb18251a6 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
index 3166b2153e8..c95554d26bb 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
index acbb01a1c68..ba8d89aad3c 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql b/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
index 7725cf1890f..1eb6e849851 100644
--- a/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
+++ b/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- TODO: can't just remove default prefix, it breaks the test!
 
 drop database if exists db_01080;
diff --git a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
index 4a3ac513e36..bd4712cca21 100644
--- a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
+++ b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 CREATE TABLE file (n Int8) ENGINE = File(upper('tsv') || 'WithNames' || 'AndTypes');
 CREATE TABLE buffer (n Int8) ENGINE = Buffer(currentDatabase(), file, 16, 10, 200, 10000, 1000000, 10000000, 1000000000);
 CREATE TABLE merge (n Int8) ENGINE = Merge('', lower('DISTRIBUTED'));
diff --git a/tests/queries/0_stateless/01084_regexp_empty.sql b/tests/queries/0_stateless/01084_regexp_empty.sql
index 9cb0eb32bc5..3ccd4af80ab 100644
--- a/tests/queries/0_stateless/01084_regexp_empty.sql
+++ b/tests/queries/0_stateless/01084_regexp_empty.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01084;
 CREATE DATABASE test_01084;
 USE test_01084;
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections.sh b/tests/queries/0_stateless/01085_max_distributed_connections.sh
index 1c42cd1a7e0..d8efa792e9d 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
index 1aa9939407c..3edf70f31b8 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01085_simdjson_uint64.sql b/tests/queries/0_stateless/01085_simdjson_uint64.sql
index dfa367e1238..952bc150dec 100644
--- a/tests/queries/0_stateless/01085_simdjson_uint64.sql
+++ b/tests/queries/0_stateless/01085_simdjson_uint64.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 WITH '{"a": "hello", "b": 12345678901234567890}' AS json
 SELECT JSONExtractRaw(json, 'a');
diff --git a/tests/queries/0_stateless/01086_odbc_roundtrip.sh b/tests/queries/0_stateless/01086_odbc_roundtrip.sh
index 3c9e5c8aba9..cc3d8c53872 100755
--- a/tests/queries/0_stateless/01086_odbc_roundtrip.sh
+++ b/tests/queries/0_stateless/01086_odbc_roundtrip.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-asan, no-msan, no-unbundled, no-fasttest
+# Tag no-msan: can't pass because odbc libraries are not instrumented
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
index 555db6962a7..43ab053655a 100644
--- a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
+++ b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
@@ -1,10 +1,14 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS mutations_and_quorum1;
 DROP TABLE IF EXISTS mutations_and_quorum2;
 
 CREATE TABLE mutations_and_quorum1 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01090/mutations_and_quorum', '1') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
 CREATE TABLE mutations_and_quorum2 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01090/mutations_and_quorum', '2') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
 
-SET insert_quorum=2, insert_quorum_parallel=0, insert_quorum_timeout=3000000;
+-- Should not be larger then 600e6 (default timeout in clickhouse-test)
+SET insert_quorum=2, insert_quorum_parallel=0, insert_quorum_timeout=300e3;
 
 INSERT INTO mutations_and_quorum1 VALUES ('2019-01-01', 'test1'), ('2019-02-01', 'test2'), ('2019-03-01', 'test3'), ('2019-04-01', 'test4'), ('2019-05-01', 'test1'), ('2019-06-01', 'test2'), ('2019-07-01', 'test3'), ('2019-08-01', 'test4'), ('2019-09-01', 'test1'), ('2019-10-01', 'test2'), ('2019-11-01', 'test3'), ('2019-12-01', 'test4');
 
diff --git a/tests/queries/0_stateless/01091_insert_with_default_json.sql b/tests/queries/0_stateless/01091_insert_with_default_json.sql
index d8b998cdd5e..40de4eb0637 100644
--- a/tests/queries/0_stateless/01091_insert_with_default_json.sql
+++ b/tests/queries/0_stateless/01091_insert_with_default_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS table_with_complex_default;
 
 CREATE TABLE table_with_complex_default (i Int8, n UInt8 DEFAULT 42, s String DEFAULT concat('test', CAST(n, 'String'))) ENGINE=TinyLog;
diff --git a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
index 010cbc6265a..84e4f7c0edb 100644
--- a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
+++ b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
@@ -1,2 +1,4 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled
+
 SET query_profiler_cpu_time_period_ns = 1;
 SELECT count() FROM numbers_mt(1000000000);
diff --git a/tests/queries/0_stateless/01092_base64.sql b/tests/queries/0_stateless/01092_base64.sql
index 476edfe31d7..f50cf49d270 100644
--- a/tests/queries/0_stateless/01092_base64.sql
+++ b/tests/queries/0_stateless/01092_base64.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 -- This query reproduces a bug in TurboBase64 library.
 select distinct base64Encode(materialize('LG Optimus')) from numbers(100);
diff --git a/tests/queries/0_stateless/01092_memory_profiler.sql b/tests/queries/0_stateless/01092_memory_profiler.sql
index b0bfca8e494..0988f56413e 100644
--- a/tests/queries/0_stateless/01092_memory_profiler.sql
+++ b/tests/queries/0_stateless/01092_memory_profiler.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-parallel, no-fasttest
+
 SET allow_introspection_functions = 1;
 
 SET memory_profiler_step = 1000000;
diff --git a/tests/queries/0_stateless/01098_msgpack_format.reference b/tests/queries/0_stateless/01098_msgpack_format.reference
index ad116a5ba91..384852f24a7 100644
--- a/tests/queries/0_stateless/01098_msgpack_format.reference
+++ b/tests/queries/0_stateless/01098_msgpack_format.reference
@@ -11,3 +11,25 @@
 2020-01-01
 2020-01-02
 2020-01-02
+{1:2,2:3}	[{1:[1,2],2:[3,4]},{3:[5,6],4:[7,8]}]
+{1:2,2:3}	[{1:[1,2],2:[3,4]},{3:[5,6],4:[7,8]}]
+42	42	42	['42','42']	['42','42']
+42	\N	\N	[NULL,'42',NULL]	[NULL,'42',NULL]
+42	42	42	['42','42']	['42','42']
+42	\N	\N	[NULL,'42',NULL]	[NULL,'42',NULL]
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
diff --git a/tests/queries/0_stateless/01098_msgpack_format.sh b/tests/queries/0_stateless/01098_msgpack_format.sh
index 3bc60b4a9cb..aa982c5478d 100755
--- a/tests/queries/0_stateless/01098_msgpack_format.sh
+++ b/tests/queries/0_stateless/01098_msgpack_format.sh
@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS msgpack";
 
 $CLICKHOUSE_CLIENT --query="CREATE TABLE msgpack (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, date Date, datetime DateTime('Europe/Moscow'), datetime64 DateTime64(3, 'Europe/Moscow'), array Array(UInt32)) ENGINE = Memory";
@@ -61,3 +66,66 @@ $CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack";
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE msgpack";
 
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS msgpack_map";
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE msgpack_map (m Map(UInt64, UInt64), a Array(Map(UInt64, Array(UInt64)))) ENGINE=Memory()";
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO msgpack_map VALUES ({1 : 2, 2 : 3}, [{1 : [1, 2], 2 : [3, 4]}, {3 : [5, 6], 4 : [7, 8]}])";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack_map FORMAT MsgPack" | $CLICKHOUSE_CLIENT --query="INSERT INTO msgpack_map FORMAT MsgPack";
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack_map";
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE msgpack_map";
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS msgpack_lc_nullable";
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE msgpack_lc_nullable (a LowCardinality(String), b Nullable(String), c LowCardinality(Nullable(String)), d Array(Nullable(String)), e Array(LowCardinality(Nullable(String)))) engine=Memory()";
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO msgpack_lc_nullable VALUES ('42', '42', '42', ['42', '42'], ['42', '42']), ('42', NULL, NULL, [NULL, '42', NULL], [NULL, '42', NULL])";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack_lc_nullable FORMAT MsgPack" | $CLICKHOUSE_CLIENT --query="INSERT INTO msgpack_lc_nullable FORMAT MsgPack";
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack_lc_nullable";
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE msgpack_lc_nullable";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT toString(number) FROM  numbers(10) FORMAT MsgPack" > $USER_FILES_PATH/data.msgpack
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x UInt64')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Float32')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Array(UInt32)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Map(UInt64, UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT number FROM  numbers(10) FORMAT MsgPack" > $USER_FILES_PATH/data.msgpack
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Float32')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x String')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Array(UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Map(UInt64, UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT [number, number + 1] FROM  numbers(10) FORMAT MsgPack" > $USER_FILES_PATH/data.msgpack
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Float32')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x String')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x UInt64')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Map(UInt64, UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT map(number, number + 1) FROM  numbers(10) FORMAT MsgPack" > $USER_FILES_PATH/data.msgpack
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Float32')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x String')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x UInt64')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Array(UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+
+
+rm $USER_FILES_PATH/data.msgpack
+
diff --git a/tests/queries/0_stateless/01098_temporary_and_external_tables.sh b/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
index 17683852f2b..860529a26e5 100755
--- a/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
+++ b/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
index 222c05ae827..adfee36fe77 100644
--- a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
+++ b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-unbundled
+
 -- set insert_distributed_sync = 1;  -- see https://github.com/ClickHouse/ClickHouse/issues/18971
 
 DROP TABLE IF EXISTS local_01099_a;
diff --git a/tests/queries/0_stateless/01102_distributed_local_in_bug.sql b/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
index ea32f6ffc7d..580f519bac2 100644
--- a/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
+++ b/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS hits;
 DROP TABLE IF EXISTS visits;
 DROP TABLE IF EXISTS hits_layer;
diff --git a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
index 79c531e1a72..48eeaf748b7 100755
--- a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
+++ b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-fasttest
+# Tag no-fasttest: avoid dependency on qemu -- invonvenient when running locally
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql b/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
index 32655420a27..db22d3e4134 100644
--- a/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
+++ b/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_01103;
 USE test_01103;
 
diff --git a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
index 72459e21b69..95f8dfc0377 100755
--- a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
+++ b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01104_distributed_numbers_test.sql b/tests/queries/0_stateless/01104_distributed_numbers_test.sql
index 101342b4c34..bb2db88f23f 100644
--- a/tests/queries/0_stateless/01104_distributed_numbers_test.sql
+++ b/tests/queries/0_stateless/01104_distributed_numbers_test.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS d_numbers;
 CREATE TABLE d_numbers (number UInt32) ENGINE = Distributed(test_cluster_two_shards, system, numbers, rand());
 
diff --git a/tests/queries/0_stateless/01104_distributed_one_test.sql b/tests/queries/0_stateless/01104_distributed_one_test.sql
index 0ae6a180570..fb2c2774c99 100644
--- a/tests/queries/0_stateless/01104_distributed_one_test.sql
+++ b/tests/queries/0_stateless/01104_distributed_one_test.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS d_one;
 CREATE TABLE d_one (dummy UInt8) ENGINE = Distributed(test_cluster_two_shards, system, one, rand());
 
diff --git a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
index 227c4df6785..300d32f5a0c 100755
--- a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
+++ b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
index d564594291a..14ba90d5ec0 100755
--- a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
+++ b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01109_exchange_tables.sql b/tests/queries/0_stateless/01109_exchange_tables.sql
index f2b8e4adb1d..604f1b9f57d 100644
--- a/tests/queries/0_stateless/01109_exchange_tables.sql
+++ b/tests/queries/0_stateless/01109_exchange_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01109;
 CREATE DATABASE test_01109 ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql b/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
index e39afcba742..ed2f61e2627 100644
--- a/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
+++ b/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_for_dict;
 CREATE DATABASE db_for_dict;
 
diff --git a/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql b/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
index 3b6d9310042..65a03993295 100644
--- a/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
+++ b/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01114_database_atomic.sh b/tests/queries/0_stateless/01114_database_atomic.sh
index 55288e1e3f6..4d77a53cf6a 100755
--- a/tests/queries/0_stateless/01114_database_atomic.sh
+++ b/tests/queries/0_stateless/01114_database_atomic.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql b/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
index 5893365e11c..896cb0ca36d 100644
--- a/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
+++ b/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS conv_main;
 CREATE DATABASE conv_main ENGINE = MySQL('127.0.0.1:3456', conv_main, 'metrika', 'password'); -- { serverError 501 }
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.reference b/tests/queries/0_stateless/01115_join_with_dictionary.reference
index 77f7ba193c0..76337bdfc0b 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.reference
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.reference
@@ -16,6 +16,12 @@ flat: any left
 2	2	2	2
 3	3	3	3
 4	0		0
+flat: any left + any_join_distinct_right_table_keys
+0	0	0	0
+1	1	1	1
+2	2	2	2
+3	3	3	3
+4	0		0
 flat: semi left
 0	0	0	0
 1	1	1	1
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index d2c42bb6f75..8d8589d6085 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -1,10 +1,5 @@
 SET send_logs_level = 'fatal';
 
-DROP DATABASE IF EXISTS db_01115;
-CREATE DATABASE db_01115;
-
-USE db_01115;
-
 DROP DICTIONARY IF EXISTS dict_flat;
 DROP DICTIONARY IF EXISTS dict_hashed;
 DROP DICTIONARY IF EXISTS dict_complex_cache;
@@ -14,19 +9,19 @@ INSERT INTO t1 SELECT number, number, toString(number), number from numbers(4);
 
 CREATE DICTIONARY dict_flat (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' PASSWORD '' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(FLAT());
 
-CREATE DICTIONARY db_01115.dict_hashed (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
+CREATE DICTIONARY dict_hashed (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(HASHED());
 
 CREATE DICTIONARY dict_complex_cache (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key, b
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 1));
 
@@ -38,6 +33,8 @@ SELECT 'flat: left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: any left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key;
+SELECT 'flat: any left + any_join_distinct_right_table_keys'; -- falls back to regular join
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key SETTINGS any_join_distinct_right_table_keys = '1';
 SELECT 'flat: semi left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 SEMI JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: anti left';
@@ -102,10 +99,8 @@ SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat
 SELECT '-';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 RIGHT JOIN dict_flat d ON s1.key = d.key ORDER BY d.key;
 
-
 DROP DICTIONARY dict_flat;
 DROP DICTIONARY dict_hashed;
 DROP DICTIONARY dict_complex_cache;
 
 DROP TABLE t1;
-DROP DATABASE IF EXISTS db_01115;
diff --git a/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql b/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
index 471fd7959a9..a324d278c12 100644
--- a/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
+++ b/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql b/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
index 59edd0c37b8..eb5ea091ca3 100644
--- a/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
+++ b/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS mt;
 CREATE TABLE mt (d Date, x String) ENGINE = MergeTree(d, x, 8192);
 INSERT INTO mt VALUES ('2106-02-07', 'Hello'), ('1970-01-01', 'World');
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql b/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
index c07d65f114c..a0e8d24eff6 100644
--- a/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
+++ b/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS t2;
 
 CREATE TABLE t2(id UInt32, a UInt64, s String)
diff --git a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
index ea8c943b9a4..c370726c72f 100644
--- a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
+++ b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS default_table;
 
 CREATE TABLE default_table
diff --git a/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql b/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
index 67492e7c683..b2f9092150c 100644
--- a/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
+++ b/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS foo_local;
 DROP TABLE IF EXISTS foo_distributed;
 
diff --git a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
index e13b25d1706..2fef16c4b0a 100644
--- a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
+++ b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-replicated-database, no-parallel
+
 DROP TABLE IF EXISTS rmt;
 
 CREATE TABLE rmt (n UInt64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test_01148/{shard}/{database}/{table}', '{replica}') ORDER BY n;
diff --git a/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql b/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
index ca8f70b3cf4..687c8051eed 100644
--- a/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
+++ b/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 set send_logs_level='error';
 drop table if exists mt;
 drop table if exists rmt sync;
diff --git a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
index 6355f790e23..50e6f91b49b 100755
--- a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
+++ b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
@@ -14,20 +15,20 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE test_01150.t2 (x UInt64, s Array(Nullab
 
 function thread_detach_attach {
     while true; do
-        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (219)'
+        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 219' -e '(query: '
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (82)'
+        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 82' -e '(query: '
         sleep 0.0$RANDOM
     done
 }
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
     done
 }
@@ -42,4 +43,4 @@ sleep 1
 
 $CLICKHOUSE_CLIENT --query "DETACH DATABASE IF EXISTS test_01150"
 $CLICKHOUSE_CLIENT --query "ATTACH DATABASE IF NOT EXISTS test_01150"
-$CLICKHOUSE_CLIENT --query "DROP DATABASE test_01150";
+$CLICKHOUSE_CLIENT --query "DROP DATABASE test_01150"
diff --git a/tests/queries/0_stateless/01152_cross_replication.sql b/tests/queries/0_stateless/01152_cross_replication.sql
index 23507c41fd0..60b2c34be07 100644
--- a/tests/queries/0_stateless/01152_cross_replication.sql
+++ b/tests/queries/0_stateless/01152_cross_replication.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, no-parallel
+
 DROP DATABASE IF EXISTS shard_0;
 DROP DATABASE IF EXISTS shard_1;
 SET distributed_ddl_output_mode='none';
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.sql b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
index 86d768d94a7..4f043e11221 100644
--- a/tests/queries/0_stateless/01153_attach_mv_uuid.sql
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database, no-parallel
+
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS mv;
 DROP TABLE IF EXISTS ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2";
diff --git a/tests/queries/0_stateless/01154_move_partition_long.sh b/tests/queries/0_stateless/01154_move_partition_long.sh
index 541550160f2..46cbaea5d44 100755
--- a/tests/queries/0_stateless/01154_move_partition_long.sh
+++ b/tests/queries/0_stateless/01154_move_partition_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
index 882be2702d8..3a67707bdc2 100644
--- a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
+++ b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01155_ordinary;
 DROP DATABASE IF EXISTS test_01155_atomic;
 
diff --git a/tests/queries/0_stateless/01157_replace_table.sql b/tests/queries/0_stateless/01157_replace_table.sql
index a29b381a522..20cae67d8e7 100644
--- a/tests/queries/0_stateless/01157_replace_table.sql
+++ b/tests/queries/0_stateless/01157_replace_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database
+
 drop table if exists t;
 drop table if exists dist;
 drop table if exists buf;
diff --git a/tests/queries/0_stateless/01158_zookeeper_log_long.sql b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
index 8f4a9f04f9b..f067ce15079 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log_long.sql
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database, no-polymorphic-parts
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 drop table if exists rmt;
 -- cleanup code will perform extra Exists
 -- (so the .reference will not match)
diff --git a/tests/queries/0_stateless/01160_table_dependencies.reference b/tests/queries/0_stateless/01160_table_dependencies.reference
new file mode 100644
index 00000000000..39a58b06076
--- /dev/null
+++ b/tests/queries/0_stateless/01160_table_dependencies.reference
@@ -0,0 +1,6 @@
+dict1
+dict2
+dict_src
+join
+s
+t
diff --git a/tests/queries/0_stateless/01160_table_dependencies.sh b/tests/queries/0_stateless/01160_table_dependencies.sh
new file mode 100755
index 00000000000..149439f2981
--- /dev/null
+++ b/tests/queries/0_stateless/01160_table_dependencies.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT -q "drop table if exists dict_src;"
+$CLICKHOUSE_CLIENT -q "drop dictionary if exists dict1;"
+$CLICKHOUSE_CLIENT -q "drop dictionary if exists dict2;"
+$CLICKHOUSE_CLIENT -q "drop table if exists join;"
+$CLICKHOUSE_CLIENT -q "drop table if exists t;"
+
+$CLICKHOUSE_CLIENT -q "create table dict_src (n int, m int, s String) engine=MergeTree order by n;"
+
+$CLICKHOUSE_CLIENT -q "create dictionary dict1 (n int default 0, m int default 1, s String default 'qqq')
+PRIMARY KEY n
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dict_src' PASSWORD '' DB '$CLICKHOUSE_DATABASE'))
+LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT());"
+
+$CLICKHOUSE_CLIENT -q "create table join(n int, m int default dictGet('$CLICKHOUSE_DATABASE.dict1', 'm', 42::UInt64)) engine=Join(any, left, n);"
+
+$CLICKHOUSE_CLIENT -q "create dictionary dict2 (n int default 0, m int DEFAULT 2, s String default 'asd')
+PRIMARY KEY n
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'join' PASSWORD '' DB '$CLICKHOUSE_DATABASE'))
+LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT());"
+
+$CLICKHOUSE_CLIENT -q "create table s (x default joinGet($CLICKHOUSE_DATABASE.join, 'm', 42::int)) engine=Set"
+
+$CLICKHOUSE_CLIENT -q "create table t (n int, m int default joinGet($CLICKHOUSE_DATABASE.join, 'm', 42::int),
+s String default dictGet($CLICKHOUSE_DATABASE.dict1, 's', 42::UInt64), x default in(1, $CLICKHOUSE_DATABASE.s)) engine=MergeTree order by n;"
+
+CLICKHOUSE_CLIENT_DEFAULT_DB=$(echo ${CLICKHOUSE_CLIENT} | sed 's/'"--database=${CLICKHOUSE_DATABASE}"'/--database=default/g')
+
+for _ in {1..10}; do
+  $CLICKHOUSE_CLIENT_DEFAULT_DB -q "detach database $CLICKHOUSE_DATABASE;"
+  $CLICKHOUSE_CLIENT_DEFAULT_DB -q "attach database $CLICKHOUSE_DATABASE;"
+done
+$CLICKHOUSE_CLIENT -q "show tables from $CLICKHOUSE_DATABASE;"
+
+$CLICKHOUSE_CLIENT -q "drop table dict_src;"
+$CLICKHOUSE_CLIENT -q "drop dictionary dict1;"
+$CLICKHOUSE_CLIENT -q "drop dictionary dict2;"
+$CLICKHOUSE_CLIENT -q "drop table join;"
+$CLICKHOUSE_CLIENT -q "drop table t;"
diff --git a/tests/queries/0_stateless/01161_all_system_tables.reference b/tests/queries/0_stateless/01161_all_system_tables.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01161_all_system_tables.sh b/tests/queries/0_stateless/01161_all_system_tables.sh
new file mode 100755
index 00000000000..9b19cc97d16
--- /dev/null
+++ b/tests/queries/0_stateless/01161_all_system_tables.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+THREADS=8
+RAND=$(($RANDOM))
+LIMIT=10000
+
+function run_selects()
+{
+    thread_num=$1
+    readarray -t tables_arr < <(${CLICKHOUSE_CLIENT} -q "SELECT database || '.' || name FROM system.tables
+    WHERE database in ('system', 'information_schema', 'INFORMATION_SCHEMA') and name!='zookeeper'
+    AND sipHash64(name || toString($RAND)) % $THREADS = $thread_num")
+
+    for t in "${tables_arr[@]}"
+    do
+        ${CLICKHOUSE_CLIENT} -q "SELECT * FROM $t LIMIT $LIMIT FORMAT Null" # Suppress style check: database=$CLICKHOUSE_DATABASEs
+    done
+}
+
+for ((i=0; i<THREADS; i++)) do
+    run_selects "$i" &
+done
+wait
diff --git a/tests/queries/0_stateless/01161_information_schema.reference b/tests/queries/0_stateless/01161_information_schema.reference
new file mode 100644
index 00000000000..38ca608ee39
--- /dev/null
+++ b/tests/queries/0_stateless/01161_information_schema.reference
@@ -0,0 +1,27 @@
+columns
+schemata
+tables
+views
+COLUMNS
+SCHEMATA
+TABLES
+VIEWS
+INFORMATION_SCHEMA	INFORMATION_SCHEMA	default	\N	\N	\N	\N
+information_schema	information_schema	default	\N	\N	\N	\N
+default	default	mv	VIEW
+default	default	t	FOREIGN TABLE
+default	default	v	VIEW
+		tmp	LOCAL TEMPORARY
+default	default	mv	SELECT * FROM system.one	NONE	NO	YES	NO	NO	NO
+default	default	v	SELECT n, f FROM default.t	NONE	NO	NO	NO	NO	NO
+default	default	mv	dummy	1		0	UInt8	\N	\N	8	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+default	default	t	n	1		0	UInt64	\N	\N	64	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+default	default	t	f	2		0	Float32	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+default	default	t	s	3		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+default	default	t	fs	4		0	FixedString(42)	42	42	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+default	default	t	d	5		0	Decimal(9, 6)	\N	\N	9	10	6	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+default	default	v	n	1		1	Nullable(Int32)	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+default	default	v	f	2		0	Float64	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+		tmp	d	1		0	Date	\N	\N	\N	\N	\N	0	\N	\N	\N	\N	\N	\N	\N	\N	\N
+		tmp	dt	2		0	DateTime	\N	\N	\N	\N	\N	0	\N	\N	\N	\N	\N	\N	\N	\N	\N
+		tmp	dtms	3		0	DateTime64(3)	\N	\N	\N	\N	\N	3	\N	\N	\N	\N	\N	\N	\N	\N	\N
diff --git a/tests/queries/0_stateless/01161_information_schema.sql b/tests/queries/0_stateless/01161_information_schema.sql
new file mode 100644
index 00000000000..b6b10efb001
--- /dev/null
+++ b/tests/queries/0_stateless/01161_information_schema.sql
@@ -0,0 +1,19 @@
+show tables from information_schema;
+SHOW TABLES FROM INFORMATION_SCHEMA;
+
+create table t (n UInt64, f Float32, s String, fs FixedString(42), d Decimal(9, 6)) engine=Memory;
+create view v (n Nullable(Int32), f Float64) as select n, f from t;
+create materialized view mv engine=Null as select * from system.one;
+create temporary table tmp (d Date, dt DateTime, dtms DateTime64(3));
+
+-- FIXME #28687
+select * from information_schema.schemata where schema_name ilike 'information_schema';
+-- SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE (TABLE_SCHEMA=currentDatabase() OR TABLE_SCHEMA='') AND TABLE_NAME NOT LIKE '%inner%';
+SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE (table_schema=currentDatabase() OR table_schema='') AND table_name NOT LIKE '%inner%';
+select * from information_schema.views where table_schema=currentDatabase();
+-- SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE (TABLE_SCHEMA=currentDatabase() OR TABLE_SCHEMA='') AND TABLE_NAME NOT LIKE '%inner%';
+SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE (table_schema=currentDatabase() OR table_schema='') AND table_name NOT LIKE '%inner%';
+
+drop table t;
+drop view v;
+drop view mv;
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
index 29f6f801044..bedf9e9a091 100644
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
@@ -1,19 +1,24 @@
 none
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)
+(query: create table none on cluster test_shard_localhost (n int) engine=Memory;)
 Received exception from server:
 Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=1) seconds. There are 1 unfinished hosts (0 of them are currently active), they are going to execute the query in background. (TIMEOUT_EXCEEDED)
+(query: drop table if exists none on cluster test_unavailable_shard;)
 throw
 localhost	9000	0		0	0
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)
+(query: create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;)
 localhost	9000	0		1	0
 Received exception from server:
 Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=1) seconds. There are 1 unfinished hosts (0 of them are currently active), they are going to execute the query in background. (TIMEOUT_EXCEEDED)
+(query: drop table if exists throw on cluster test_unavailable_shard;)
 null_status_on_timeout
 localhost	9000	0		0	0
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)
+(query: create table null_status on cluster test_shard_localhost (n int) engine=Memory format Null;)
 localhost	9000	0		1	0
 localhost	1	\N	\N	1	0
 never_throw
@@ -21,3 +26,20 @@ localhost	9000	0		0	0
 localhost	9000	57	Code: 57. Error: Table default.never_throw already exists. (TABLE_ALREADY_EXISTS)	0	0
 localhost	9000	0		1	0
 localhost	1	\N	\N	1	0
+distributed_ddl_queue
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.none ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.none ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.throw ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.throw ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.null_status ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.null_status ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.never_throw already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.never_throw ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.never_throw ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
index 483979d00db..e4a23055ae6 100755
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: long, distributed, no-msan, no-replicated-database
+# Tag no-msan: issue 21600
+# Tag no-replicated-database: ON CLUSTER is not allowed
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
@@ -6,6 +9,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+TMP_OUT=$(mktemp "$CURDIR/01175_distributed_ddl_output_mode_long.XXXXXX")
+trap 'rm -f ${TMP_OUT:?}' EXIT
+
+TIMEOUT=300
+MIN_TIMEOUT=1
 
 # We execute a distributed DDL query with timeout 1 to check that one host is unavailable and will time out and other complete successfully.
 # But sometimes one second is not enough even for healthy host to succeed. Repeat the test in this case.
@@ -14,55 +22,72 @@ function run_until_out_contains()
     PATTERN=$1
     shift
 
-    for _ in {1..20}
+    for ((i=MIN_TIMEOUT; i<10; i++))
     do
-        "$@" > "${CLICKHOUSE_TMP}/out" 2>&1
-        if grep -q "$PATTERN" "${CLICKHOUSE_TMP}/out"
+        "$@" --distributed_ddl_task_timeout="$i" > "$TMP_OUT" 2>&1
+        if grep -q "$PATTERN" "$TMP_OUT"
         then
-            cat "${CLICKHOUSE_TMP}/out"
-            break;
+            cat "$TMP_OUT" | sed "s/distributed_ddl_task_timeout (=$i)/distributed_ddl_task_timeout (=$MIN_TIMEOUT)/g"
+            break
         fi
     done
 }
 
+RAND_COMMENT="01175_DDL_$RANDOM"
+LOG_COMMENT="${CLICKHOUSE_LOG_COMMENT}_$RAND_COMMENT"
+
+CLICKHOUSE_CLIENT_WITH_SETTINGS=${CLICKHOUSE_CLIENT/--log_comment=\'${CLICKHOUSE_LOG_COMMENT}\'/--log_comment=\'${LOG_COMMENT}\'}
+CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --output_format_parallel_formatting=0 "
+CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --distributed_ddl_entry_format_version=2 "
+
+CLIENT=${CLICKHOUSE_CLIENT_WITH_SETTINGS}
+CLIENT+=" --distributed_ddl_task_timeout=$TIMEOUT "
 
 $CLICKHOUSE_CLIENT -q "drop table if exists none;"
 $CLICKHOUSE_CLIENT -q "drop table if exists throw;"
 $CLICKHOUSE_CLIENT -q "drop table if exists null_status;"
 $CLICKHOUSE_CLIENT -q "drop table if exists never_throw;"
 
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=none -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT --distributed_ddl_output_mode=none -q "select value from system.settings where name='distributed_ddl_output_mode';"
 # Ok
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;"
 # Table exists
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 # Timeout
 
-run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=1 --distributed_ddl_output_mode=none -q "drop table if exists none on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
+run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=none -q "drop table if exists none on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
 
 
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT --distributed_ddl_output_mode=throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 
-run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=1 --distributed_ddl_output_mode=throw -q "drop table if exists throw on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
+run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=throw -q "drop table if exists throw on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
 
 
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=null_status_on_timeout -q "select value from system.settings where name='distributed_ddl_output_mode';"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=null_status_on_timeout -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory;"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=null_status_on_timeout -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT --distributed_ddl_output_mode=null_status_on_timeout -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT --distributed_ddl_output_mode=null_status_on_timeout -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT --distributed_ddl_output_mode=null_status_on_timeout -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 
-run_until_out_contains '9000	0		' $CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=1 --distributed_ddl_output_mode=null_status_on_timeout -q "drop table if exists null_status on cluster test_unavailable_shard;"
+run_until_out_contains '9000	0		' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=null_status_on_timeout -q "drop table if exists null_status on cluster test_unavailable_shard;"
 
 
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=never_throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=never_throw -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=never_throw -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT --distributed_ddl_output_mode=never_throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT --distributed_ddl_output_mode=never_throw -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT --distributed_ddl_output_mode=never_throw -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 
-run_until_out_contains '9000	0		' $CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=1 --distributed_ddl_output_mode=never_throw -q "drop table if exists never_throw on cluster test_unavailable_shard;"
+run_until_out_contains '9000	0		' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=never_throw -q "drop table if exists never_throw on cluster test_unavailable_shard;"
 
 
 $CLICKHOUSE_CLIENT -q "drop table if exists none;"
 $CLICKHOUSE_CLIENT -q "drop table if exists throw;"
 $CLICKHOUSE_CLIENT -q "drop table if exists null_status;"
 $CLICKHOUSE_CLIENT -q "drop table if exists never_throw;"
+
+$CLICKHOUSE_CLIENT -q "select 'distributed_ddl_queue'"
+$CLICKHOUSE_CLIENT -q "select entry_version, initiator_host, initiator_port, cluster, replaceRegexpOne(query, 'UUID \'[0-9a-f\-]{36}\' ', ''), abs(query_create_time - now()) < 600,
+    host, port, status, exception_code, replace(replaceRegexpOne(exception_text, ' \(version.*', ''), 'Exception', 'Error'), abs(query_finish_time - query_create_time - query_duration_ms/1000) <= 1 , query_duration_ms < 600000
+    from system.distributed_ddl_queue
+    where arrayExists((key, val) -> key='log_comment' and val like '%$RAND_COMMENT%', mapKeys(settings), mapValues(settings))
+    and arrayExists((key, val) -> key='distributed_ddl_task_timeout' and val in ('$TIMEOUT', '$MIN_TIMEOUT'), mapKeys(settings), mapValues(settings))
+    order by entry, host, port, exception_code"
diff --git a/tests/queries/0_stateless/01176_mysql_client_interactive.expect b/tests/queries/0_stateless/01176_mysql_client_interactive.expect
index 8f56d047e8e..37087dd85f7 100755
--- a/tests/queries/0_stateless/01176_mysql_client_interactive.expect
+++ b/tests/queries/0_stateless/01176_mysql_client_interactive.expect
@@ -1,4 +1,6 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
+# Tag no-fasttest: requires mysql client
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01180_client_syntax_errors.expect b/tests/queries/0_stateless/01180_client_syntax_errors.expect
index c20982b2991..e4b108fc9a9 100755
--- a/tests/queries/0_stateless/01180_client_syntax_errors.expect
+++ b/tests/queries/0_stateless/01180_client_syntax_errors.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
index 24283a0e8e3..fbb67a268ae 100644
--- a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
+++ b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: ON CLUSTER is not allowed
+
 DROP TABLE IF EXISTS test_repl ON CLUSTER test_shard_localhost SYNC;
 CREATE TABLE test_repl ON CLUSTER test_shard_localhost (n UInt64) ENGINE ReplicatedMergeTree('/clickhouse/test_01181/{database}/test_repl','r1') ORDER BY tuple();
 DETACH TABLE test_repl ON CLUSTER test_shard_localhost SYNC;
diff --git a/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh b/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
index f3b3431dffe..09a43d13a42 100755
--- a/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
+++ b/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01185_create_or_replace_table.sql b/tests/queries/0_stateless/01185_create_or_replace_table.sql
index 45900329b2c..e8845260726 100644
--- a/tests/queries/0_stateless/01185_create_or_replace_table.sql
+++ b/tests/queries/0_stateless/01185_create_or_replace_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database, no-parallel
+
 drop table if exists t1;
 
 replace table t1 (n UInt64, s String) engine=MergeTree order by n; -- { serverError 60 }
diff --git a/tests/queries/0_stateless/01188_attach_table_from_path.sql b/tests/queries/0_stateless/01188_attach_table_from_path.sql
index d72daa78f67..5b99c07e986 100644
--- a/tests/queries/0_stateless/01188_attach_table_from_path.sql
+++ b/tests/queries/0_stateless/01188_attach_table_from_path.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel
+
 drop table if exists test;
 drop table if exists file;
 drop table if exists mt;
diff --git a/tests/queries/0_stateless/01190_full_attach_syntax.sql b/tests/queries/0_stateless/01190_full_attach_syntax.sql
index eb739782e5f..ed05950ff98 100644
--- a/tests/queries/0_stateless/01190_full_attach_syntax.sql
+++ b/tests/queries/0_stateless/01190_full_attach_syntax.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01190;
 CREATE DATABASE test_01190 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01190;
diff --git a/tests/queries/0_stateless/01191_rename_dictionary.sql b/tests/queries/0_stateless/01191_rename_dictionary.sql
index 264c527ccca..7160f327336 100644
--- a/tests/queries/0_stateless/01191_rename_dictionary.sql
+++ b/tests/queries/0_stateless/01191_rename_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01191;
 CREATE DATABASE test_01191 ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
index 58bdfbf71ad..62165467675 100755
--- a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
+++ b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01193_metadata_loading.sh b/tests/queries/0_stateless/01193_metadata_loading.sh
index a3154a0784d..d7258151897 100755
--- a/tests/queries/0_stateless/01193_metadata_loading.sh
+++ b/tests/queries/0_stateless/01193_metadata_loading.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01198_client_quota_key.sh b/tests/queries/0_stateless/01198_client_quota_key.sh
index d9f062f6589..3f5f5df5071 100755
--- a/tests/queries/0_stateless/01198_client_quota_key.sh
+++ b/tests/queries/0_stateless/01198_client_quota_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01200_mutations_memory_consumption.reference b/tests/queries/0_stateless/01200_mutations_memory_consumption.reference
index 98fb6a68656..1bb9c019697 100644
--- a/tests/queries/0_stateless/01200_mutations_memory_consumption.reference
+++ b/tests/queries/0_stateless/01200_mutations_memory_consumption.reference
@@ -1,4 +1,4 @@
-1
-1
-1
-1
+[[1]]
+[[1]]
+[[1]]
+[[1]]
diff --git a/tests/queries/0_stateless/01200_mutations_memory_consumption.sql b/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
index 764117586b9..6947c327adc 100644
--- a/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
+++ b/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug, no-parallel
+
 DROP TABLE IF EXISTS table_with_single_pk;
 
 CREATE TABLE table_with_single_pk
@@ -6,7 +8,8 @@ CREATE TABLE table_with_single_pk
   value String
 )
 ENGINE = MergeTree
-ORDER BY key;
+ORDER BY key
+SETTINGS min_compress_block_size=65536, max_compress_block_size=65536;
 
 INSERT INTO table_with_single_pk SELECT number, toString(number % 10) FROM numbers(10000000);
 
@@ -15,9 +18,9 @@ ALTER TABLE table_with_single_pk DELETE WHERE key % 77 = 0 SETTINGS mutations_sy
 SYSTEM FLUSH LOGS;
 
 -- Memory usage for all mutations must be almost constant and less than
--- read_bytes.
+-- read_bytes
 SELECT
-  DISTINCT read_bytes >= peak_memory_usage
+  arrayDistinct(groupArray(if (read_bytes >= peak_memory_usage, [1], [read_bytes, peak_memory_usage])))
 FROM
     system.part_log
 WHERE event_type = 'MutatePart' AND table = 'table_with_single_pk' AND database = currentDatabase();
@@ -34,7 +37,8 @@ CREATE TABLE table_with_multi_pk
   value String
 )
 ENGINE = MergeTree
-ORDER BY (key1, key2, key3);
+ORDER BY (key1, key2, key3)
+SETTINGS min_compress_block_size=65536, max_compress_block_size=65536;
 
 INSERT INTO table_with_multi_pk SELECT number % 32, number, toDateTime('2019-10-01 00:00:00'), toString(number % 10) FROM numbers(10000000);
 
@@ -43,9 +47,9 @@ ALTER TABLE table_with_multi_pk DELETE WHERE key1 % 77 = 0 SETTINGS mutations_sy
 SYSTEM FLUSH LOGS;
 
 -- Memory usage for all mutations must be almost constant and less than
--- read_bytes.
+-- read_bytes
 SELECT
-  DISTINCT read_bytes >= peak_memory_usage
+  arrayDistinct(groupArray(if (read_bytes >= peak_memory_usage, [1], [read_bytes, peak_memory_usage])))
   FROM
       system.part_log
  WHERE event_type = 'MutatePart' AND table = 'table_with_multi_pk' AND database = currentDatabase();
@@ -64,7 +68,8 @@ CREATE TABLE table_with_function_pk
     value String
   )
 ENGINE = MergeTree
-ORDER BY (cast(value as UInt64), key2);
+ORDER BY (cast(value as UInt64), key2)
+SETTINGS min_compress_block_size=65536, max_compress_block_size=65536;
 
 INSERT INTO table_with_function_pk SELECT number % 32, number, toDateTime('2019-10-01 00:00:00'), toString(number % 10) FROM numbers(10000000);
 
@@ -73,9 +78,9 @@ ALTER TABLE table_with_function_pk DELETE WHERE key1 % 77 = 0 SETTINGS mutations
 SYSTEM FLUSH LOGS;
 
 -- Memory usage for all mutations must be almost constant and less than
--- read_bytes.
+-- read_bytes
 SELECT
-  DISTINCT read_bytes >= peak_memory_usage
+  arrayDistinct(groupArray(if (read_bytes >= peak_memory_usage, [1], [read_bytes, peak_memory_usage])))
   FROM
       system.part_log
  WHERE event_type = 'MutatePart' AND table = 'table_with_function_pk' AND database = currentDatabase();
@@ -92,7 +97,8 @@ CREATE TABLE table_without_pk
   value String
 )
 ENGINE = MergeTree
-ORDER BY tuple();
+ORDER BY tuple()
+SETTINGS min_compress_block_size=65536, max_compress_block_size=65536;
 
 INSERT INTO table_without_pk SELECT number % 32, number, toDateTime('2019-10-01 00:00:00'), toString(number % 10) FROM numbers(10000000);
 
@@ -101,9 +107,9 @@ ALTER TABLE table_without_pk DELETE WHERE key1 % 77 = 0 SETTINGS mutations_sync
 SYSTEM FLUSH LOGS;
 
 -- Memory usage for all mutations must be almost constant and less than
--- read_bytes.
+-- read_bytes
 SELECT
-  DISTINCT read_bytes >= peak_memory_usage
+  arrayDistinct(groupArray(if (read_bytes >= peak_memory_usage, [1], [read_bytes, peak_memory_usage])))
   FROM
       system.part_log
  WHERE event_type = 'MutatePart' AND table = 'table_without_pk' AND database = currentDatabase();
diff --git a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
index 9464ac24dff..875bd1f96de 100644
--- a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 -- Testing basic functionality with compact parts
 set replication_alter_partitions_sync = 2;
 drop table if exists mt_compact;
diff --git a/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql b/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
index d7e722fc9bc..65adaf3ad71 100644
--- a/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
+++ b/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_02000;
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
index b82b132be05..a255c1db30e 100755
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
index 91dd6e67512..406507089c3 100644
--- a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_rename_pk;
 
 CREATE TABLE table_for_rename_pk
diff --git a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
index cb9e918e335..986947d5979 100644
--- a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_rename_with_default;
 
 CREATE TABLE table_rename_with_default
diff --git a/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql b/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
index 8024abc75ed..e2de2de07c7 100644
--- a/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
+++ b/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TABLE IF NOT EXISTS local_01213 (id Int) ENGINE = MergeTree ORDER BY tuple();
 CREATE TABLE IF NOT EXISTS dist_01213 AS local_01213 ENGINE = Distributed(test_cluster_two_shards_localhost, currentDatabase(), local_01213, id);
 
diff --git a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
index f15ea4a75f4..6f5deb91ee4 100644
--- a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
+++ b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01224;
 DROP DATABASE IF EXISTS dict_db_01224_dictionary;
 CREATE DATABASE dict_db_01224 ENGINE=Ordinary;  -- Different internal dictionary name with Atomic
diff --git a/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql b/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
index 451f2adbede..513ecbd4ed4 100644
--- a/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
+++ b/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01225;
 CREATE DATABASE dict_db_01225;
 
diff --git a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
index a49f113ebde..006ff952ee9 100644
--- a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
+++ b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01225;
 DROP DATABASE IF EXISTS dict_db_01225_dictionary;
 CREATE DATABASE dict_db_01225 ENGINE=Ordinary;    -- Different internal dictionary name with Atomic
diff --git a/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql b/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
index ca9b28a14f4..f75e097430f 100644
--- a/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
+++ b/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SELECT 'GLOBAL IN';
 select * from remote('localhost', system.one) where dummy global in (0);
 select * from remote('localhost', system.one) where dummy global in system.one;
diff --git a/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql b/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
index 781e9d6f8f9..d8ff9006185 100644
--- a/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
+++ b/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- Test from the issue https://github.com/ClickHouse/ClickHouse/issues/2610
 drop table if exists data_01227;
 create table data_01227 (key Int) Engine=MergeTree() order by key;
diff --git a/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql b/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
index 80f7625900a..e70652877e0 100644
--- a/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
+++ b/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 set send_logs_level = 'error';
 
 create database if not exists shard_0;
diff --git a/tests/queries/0_stateless/01232_extremes.sql b/tests/queries/0_stateless/01232_extremes.sql
index b0670f731c6..c0a9c8cb6d6 100644
--- a/tests/queries/0_stateless/01232_extremes.sql
+++ b/tests/queries/0_stateless/01232_extremes.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set send_logs_level = 'error';
 set extremes = 1;
 
diff --git a/tests/queries/0_stateless/01232_json_as_string_format.sh b/tests/queries/0_stateless/01232_json_as_string_format.sh
index d4476476f60..667aea7ba78 100755
--- a/tests/queries/0_stateless/01232_json_as_string_format.sh
+++ b/tests/queries/0_stateless/01232_json_as_string_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh b/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
index e42e68a6589..4a209f12022 100755
--- a/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
+++ b/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01235_live_view_over_distributed.sql b/tests/queries/0_stateless/01235_live_view_over_distributed.sql
index abc628475db..32ec0a6127f 100644
--- a/tests/queries/0_stateless/01235_live_view_over_distributed.sql
+++ b/tests/queries/0_stateless/01235_live_view_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 set insert_distributed_sync = 1;
 SET allow_experimental_live_view = 1;
 
diff --git a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql b/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
index 522fc5dafbe..4aacecc9734 100644
--- a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
+++ b/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql b/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
index de35b0c6c9d..b7c1c6eea76 100644
--- a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
+++ b/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 SET insert_distributed_sync = 1;
 
diff --git a/tests/queries/0_stateless/01238_http_memory_tracking.sh b/tests/queries/0_stateless/01238_http_memory_tracking.sh
index 8c900e4c208..9b0fe875416 100755
--- a/tests/queries/0_stateless/01238_http_memory_tracking.sh
+++ b/tests/queries/0_stateless/01238_http_memory_tracking.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-fasttest: max_memory_usage_for_user can interfere another queries running concurrently
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
index a8dc0d91c37..134c6763fab 100644
--- a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
+++ b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- TODO: correct testing with real unique shards
 
 set optimize_distributed_group_by_sharding_key=1;
diff --git a/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql b/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
index 030330e4cae..3f7632baf7e 100644
--- a/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
+++ b/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT sum(number) FROM (SELECT * FROM remote('127.0.0.{1,2}', system.numbers) LIMIT 5 SETTINGS distributed_group_by_no_merge = 1);
 SELECT sum(number) FROM (SELECT * FROM remote('127.0.0.{1,2}', system.numbers) LIMIT 5 SETTINGS distributed_group_by_no_merge = 1) with totals;
 
diff --git a/tests/queries/0_stateless/01246_finalize_aggregation_race.sql b/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
index c4946bd9e83..e63f7fb0983 100644
--- a/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
+++ b/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
@@ -1,3 +1,5 @@
+-- Tags: race
+
 drop table if exists test_quantile;
 create table test_quantile (x AggregateFunction(quantileTiming(0.2), UInt64)) engine = Memory;
 insert into test_quantile select medianTimingState(.2)(number) from (select * from numbers(1000) order by number desc);
diff --git a/tests/queries/0_stateless/01246_insert_into_watch_live_view.py b/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
index 193d23999be..addff72ce66 100755
--- a/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
+++ b/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import time
diff --git a/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql b/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
index 73dc916e463..9fc01b141ea 100644
--- a/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
+++ b/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- TODO: correct testing with real unique shards
 
 set optimize_distributed_group_by_sharding_key=1;
diff --git a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
index 8902b164c09..c2be4d04e5f 100644
--- a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
+++ b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01249;
 CREATE DATABASE test_01249 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01249;
diff --git a/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql b/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
index 958165805e1..4b59ca4d7bb 100644
--- a/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
+++ b/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict;
 CREATE DATABASE database_for_dict;
 
diff --git a/tests/queries/0_stateless/01254_dict_create_without_db.sql b/tests/queries/0_stateless/01254_dict_create_without_db.sql
index 0c7f3126d98..65a2ab52d23 100644
--- a/tests/queries/0_stateless/01254_dict_create_without_db.sql
+++ b/tests/queries/0_stateless/01254_dict_create_without_db.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01254;
 CREATE DATABASE dict_db_01254;
 USE dict_db_01254;
diff --git a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
index 8fd56f40afe..c11cb64735c 100644
--- a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
+++ b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01254;
 CREATE DATABASE dict_db_01254;
 
diff --git a/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql b/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
index 35782f1cd02..4ff3b7913f4 100644
--- a/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
+++ b/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_dict_db;
 CREATE DATABASE test_dict_db;
 
diff --git a/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql b/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
index f95d2d87b8e..59cfd85ed60 100644
--- a/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
+++ b/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET distributed_aggregation_memory_efficient = 1;
 
 SELECT sum(DISTINCT number % 13) FROM remote('127.0.0.{1,2}', numbers_mt(100000));
diff --git a/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql b/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
index 3c8b4e03507..224aac43a1f 100644
--- a/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
+++ b/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
index 6e7f4d55a53..11d774e36d7 100644
--- a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS test_alter;
 CREATE TABLE test_alter (x Date, s String) ENGINE = MergeTree ORDER BY s PARTITION BY x;
 ALTER TABLE test_alter MODIFY COLUMN s DEFAULT 'Hello';
diff --git a/tests/queries/0_stateless/01268_dictionary_direct_layout.sql b/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
index f4f3cbec705..914d24a740a 100644
--- a/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
+++ b/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict_01268;
 
 CREATE DATABASE database_for_dict_01268;
diff --git a/tests/queries/0_stateless/01268_shard_avgweighted.sql b/tests/queries/0_stateless/01268_shard_avgweighted.sql
index 3a101ec4754..3ddbf108cea 100644
--- a/tests/queries/0_stateless/01268_shard_avgweighted.sql
+++ b/tests/queries/0_stateless/01268_shard_avgweighted.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TABLE dummy(foo Int64) ENGINE = Memory();
 INSERT INTO dummy VALUES (1);
 SELECT avgWeighted(100., .1) FROM remote('127.0.0.{2,3}', currentDatabase(), dummy);
diff --git a/tests/queries/0_stateless/01269_alias_type_differs.sql b/tests/queries/0_stateless/01269_alias_type_differs.sql
index b78e46f62c8..64abcf9e367 100644
--- a/tests/queries/0_stateless/01269_alias_type_differs.sql
+++ b/tests/queries/0_stateless/01269_alias_type_differs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS data_01269;
 CREATE TABLE data_01269
 (
diff --git a/tests/queries/0_stateless/01269_create_with_null.sql b/tests/queries/0_stateless/01269_create_with_null.sql
index faa6b84e9e4..7548070ce4b 100644
--- a/tests/queries/0_stateless/01269_create_with_null.sql
+++ b/tests/queries/0_stateless/01269_create_with_null.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 DROP TABLE IF EXISTS data_null;
 DROP TABLE IF EXISTS set_null;
 DROP TABLE IF EXISTS cannot_be_nullable;
diff --git a/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql b/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
index 1dc322f2113..12056148625 100644
--- a/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
+++ b/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
 set allow_suspicious_low_cardinality_types=1;
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
index ccfa08af7bc..8a9c6fc01e4 100644
--- a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET optimize_arithmetic_operations_in_aggregate_functions = 1;
 
 EXPLAIN SYNTAX SELECT sum(n + 1), sum(1 + n), sum(n - 1), sum(1 - n) FROM (SELECT number n FROM numbers(10));
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index 7dcf0a48dab..5c493dce98a 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -36,7 +36,9 @@ ALTER SETTINGS	['ALTER SETTING','ALTER MODIFY SETTING','MODIFY SETTING','RESET S
 ALTER MOVE PARTITION	['ALTER MOVE PART','MOVE PARTITION','MOVE PART']	TABLE	ALTER TABLE
 ALTER FETCH PARTITION	['ALTER FETCH PART','FETCH PARTITION']	TABLE	ALTER TABLE
 ALTER FREEZE PARTITION	['FREEZE PARTITION','UNFREEZE']	TABLE	ALTER TABLE
+ALTER DATABASE SETTINGS	['ALTER DATABASE SETTING','ALTER MODIFY DATABASE SETTING','MODIFY DATABASE SETTING']	DATABASE	ALTER DATABASE
 ALTER TABLE	[]	\N	ALTER
+ALTER DATABASE	[]	\N	ALTER
 ALTER VIEW REFRESH	['ALTER LIVE VIEW REFRESH','REFRESH VIEW']	VIEW	ALTER VIEW
 ALTER VIEW MODIFY QUERY	['ALTER TABLE MODIFY QUERY']	VIEW	ALTER VIEW
 ALTER VIEW	[]	\N	ALTER
@@ -92,6 +94,7 @@ SYSTEM RELOAD CONFIG	['RELOAD CONFIG']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD SYMBOLS	['RELOAD SYMBOLS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD DICTIONARY	['SYSTEM RELOAD DICTIONARIES','RELOAD DICTIONARY','RELOAD DICTIONARIES']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD MODEL	['SYSTEM RELOAD MODELS','RELOAD MODEL','RELOAD MODELS']	GLOBAL	SYSTEM RELOAD
+SYSTEM RELOAD FUNCTION	['SYSTEM RELOAD FUNCTIONS','RELOAD FUNCTION','RELOAD FUNCTIONS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD EMBEDDED DICTIONARIES	['RELOAD EMBEDDED DICTIONARIES']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD	[]	\N	SYSTEM
 SYSTEM RESTART DISK	['SYSTEM RESTART DISK']	GLOBAL	SYSTEM
diff --git a/tests/queries/0_stateless/01272_suspicious_codecs.sql b/tests/queries/0_stateless/01272_suspicious_codecs.sql
index 3ec3e480da4..5baa30e3cf4 100644
--- a/tests/queries/0_stateless/01272_suspicious_codecs.sql
+++ b/tests/queries/0_stateless/01272_suspicious_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS codecs;
 
 -- test what should work
diff --git a/tests/queries/0_stateless/01273_arrow.sh b/tests/queries/0_stateless/01273_arrow.sh
index ad8a6f0fdb9..450b677a030 100755
--- a/tests/queries/0_stateless/01273_arrow.sh
+++ b/tests/queries/0_stateless/01273_arrow.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_arrow_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_arrays_load.sh
index bce653376a5..30bcc17c4c1 100755
--- a/tests/queries/0_stateless/01273_arrow_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_decimal.sh b/tests/queries/0_stateless/01273_arrow_decimal.sh
index 22496035ea9..c02bf484578 100755
--- a/tests/queries/0_stateless/01273_arrow_decimal.sh
+++ b/tests/queries/0_stateless/01273_arrow_decimal.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh b/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
index 3f6fcff3dcc..2906330c21b 100755
--- a/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_load.sh b/tests/queries/0_stateless/01273_arrow_load.sh
index bc5588a905b..d5940ed4c8b 100755
--- a/tests/queries/0_stateless/01273_arrow_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
index cd2040260e9..24fc72f3d9a 100755
--- a/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
index d780cc6d06a..4de976190fe 100755
--- a/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_stream.sh b/tests/queries/0_stateless/01273_arrow_stream.sh
index af5931a4bce..a1fa62df7b1 100755
--- a/tests/queries/0_stateless/01273_arrow_stream.sh
+++ b/tests/queries/0_stateless/01273_arrow_stream.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql b/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
index f15d8669388..ce513802e0a 100644
--- a/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
+++ b/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeAngle(100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql b/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
index 8799680125f..769514f851a 100644
--- a/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
+++ b/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync = 1;
 
 DROP TABLE IF EXISTS visits;
diff --git a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
index 10ab75e42bd..8d8f590540a 100644
--- a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_rename1;
 
 CREATE TABLE table_for_rename1
diff --git a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
index e1e0018a1dd..d5cae099f36 100755
--- a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
+++ b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01280_ttl_where_group_by.sh b/tests/queries/0_stateless/01280_ttl_where_group_by.sh
index c9936ce7afd..aa6b33d5935 100755
--- a/tests/queries/0_stateless/01280_ttl_where_group_by.sh
+++ b/tests/queries/0_stateless/01280_ttl_where_group_by.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql b/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
index b273e065bcc..978b2bfcc10 100644
--- a/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
+++ b/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by x set y = max(y); -- { serverError 450}
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by b set y = max(y); -- { serverError 450}
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by a, b, x set y = max(y); -- { serverError 450}
diff --git a/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh b/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
index 4667c76cb60..bf201187f45 100755
--- a/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
+++ b/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-fasttest: max_memory_usage_for_user can interfere another queries running concurrently
 
 # Regression for MemoryTracker that had been incorrectly accounted
 # (it was reset before deallocation)
diff --git a/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql b/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
index f5efb2b56d5..3b122fc0228 100644
--- a/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
+++ b/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS current_failed_query_metrics;
 DROP TABLE IF EXISTS to_insert;
 
diff --git a/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql b/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
index 36ad7b4506c..e9f2346233f 100644
--- a/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
+++ b/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT 'a\_\c\l\i\c\k\h\o\u\s\e', 'a\\_\\c\\l\\i\\c\\k\\h\\o\\u\\s\\e';
 select 'aXb' like 'a_b', 'aXb' like 'a\_b', 'a_b' like 'a\_b', 'a_b' like 'a\\_b';
 SELECT match('Hello', '\w+'), match('Hello', '\\w+'), match('Hello', '\\\w+'), match('Hello', '\w\+'), match('Hello', 'w+');
diff --git a/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql b/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
index 09c043784bb..969bb0a126c 100644
--- a/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
+++ b/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- Limit to 10 MB/sec
 SET max_network_bandwidth = 10000000;
 
diff --git a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
index d6617bec5ce..8dcac23550d 100644
--- a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
+++ b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_execution_speed = 1000000;
 SET timeout_before_checking_execution_speed = 0.001;
 SET max_block_size = 100;
diff --git a/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql b/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
index f0992f2e438..267f5585705 100644
--- a/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
+++ b/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS data;
 DROP TABLE IF EXISTS dist;
 
diff --git a/tests/queries/0_stateless/01292_create_user.sql b/tests/queries/0_stateless/01292_create_user.sql
index c8d408147e9..a9582376825 100644
--- a/tests/queries/0_stateless/01292_create_user.sql
+++ b/tests/queries/0_stateless/01292_create_user.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP USER IF EXISTS u1_01292, u2_01292, u3_01292, u4_01292, u5_01292, u6_01292, u7_01292, u8_01292, u9_01292;
 DROP USER IF EXISTS u10_01292, u11_01292, u12_01292, u13_01292, u14_01292, u15_01292, u16_01292;
 DROP USER IF EXISTS u2_01292_renamed;
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
index 5e845754402..14ca38093bf 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
index c68b153d5d3..3abed6cae03 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01293_system_distribution_queue.sql b/tests/queries/0_stateless/01293_system_distribution_queue.sql
index b16433029bf..34158fb081c 100644
--- a/tests/queries/0_stateless/01293_system_distribution_queue.sql
+++ b/tests/queries/0_stateless/01293_system_distribution_queue.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists null_01293;
 drop table if exists dist_01293;
 
diff --git a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
index 6b89e7a5a8a..3c11dc5f772 100755
--- a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
+++ b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql b/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
index e5cd3ea362f..5c2636d7a68 100644
--- a/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
+++ b/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 -- just a smoke test
 
 -- quirk for ON CLUSTER does not uses currentDatabase()
diff --git a/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql b/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
index fca570b5651..c1e8068075b 100644
--- a/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
+++ b/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP ROW POLICY IF EXISTS p1_01296, p2_01296, p3_01296, p4_01296, p5_01296 ON db_01296.table;
 DROP ROW POLICY IF EXISTS p3_01296, p5_01296 ON db_01296.table2;
 DROP DATABASE IF EXISTS db_01296;
diff --git a/tests/queries/0_stateless/01297_alter_distributed.sql b/tests/queries/0_stateless/01297_alter_distributed.sql
index d5359cc5ea8..cec64278d47 100644
--- a/tests/queries/0_stateless/01297_alter_distributed.sql
+++ b/tests/queries/0_stateless/01297_alter_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists merge_distributed;
 drop table if exists merge_distributed1;
 
diff --git a/tests/queries/0_stateless/01297_create_quota.sql b/tests/queries/0_stateless/01297_create_quota.sql
index 7d55b95601f..b30d453257a 100644
--- a/tests/queries/0_stateless/01297_create_quota.sql
+++ b/tests/queries/0_stateless/01297_create_quota.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP QUOTA IF EXISTS q1_01297, q2_01297, q3_01297, q4_01297, q5_01297, q6_01297, q7_01297, q8_01297, q9_01297, q10_01297;
 DROP QUOTA IF EXISTS q11_01297, q12_01297;
 DROP QUOTA IF EXISTS q2_01297_renamed;
diff --git a/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect b/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
index 0c53f5658d1..22d0c91e54d 100755
--- a/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
+++ b/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: long, no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
index 65bf5de8333..010c66b9bb1 100755
--- a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
index ed8a463cc62..7e10ab475d4 100755
--- a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01304_direct_io_long.sh b/tests/queries/0_stateless/01304_direct_io_long.sh
index 7505173ddba..57638a7d0a6 100755
--- a/tests/queries/0_stateless/01304_direct_io_long.sh
+++ b/tests/queries/0_stateless/01304_direct_io_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
index 6248813c9ba..1d2d4516b9c 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -11,7 +12,7 @@ function thread()
     while true; do
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 SYNC;
             CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
-                grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time'
+                grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time|^\(query: '
     done
 }
 
diff --git a/tests/queries/0_stateless/01306_benchmark_json.sh b/tests/queries/0_stateless/01306_benchmark_json.sh
index fed085abd96..ae361826250 100755
--- a/tests/queries/0_stateless/01306_benchmark_json.sh
+++ b/tests/queries/0_stateless/01306_benchmark_json.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql b/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
index 2daf199f82e..dffcf24684e 100644
--- a/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
+++ b/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set optimize_duplicate_order_by_and_distinct = 1;
 SET distributed_group_by_no_merge = 0;
 
diff --git a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
index 37ee5bf7ad7..2a41d90cd3a 100755
--- a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
+++ b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01307_orc_output_format.sh b/tests/queries/0_stateless/01307_orc_output_format.sh
index b5000bfd3fc..de6984ca74f 100755
--- a/tests/queries/0_stateless/01307_orc_output_format.sh
+++ b/tests/queries/0_stateless/01307_orc_output_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01308_orc_output_format_arrays.sh b/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
index f24f62673ac..9d45c0a5add 100755
--- a/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
+++ b/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01318_decrypt.sql b/tests/queries/0_stateless/01318_decrypt.sql
index b9a20acf4ac..fb0b934d7bf 100644
--- a/tests/queries/0_stateless/01318_decrypt.sql
+++ b/tests/queries/0_stateless/01318_decrypt.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 --- aes_decrypt_mysql(string, key, block_mode[, init_vector, AAD])
 -- The MySQL-compatitable encryption, only ecb, cbc, cfb128 and ofb modes are supported,
 -- just like for MySQL
diff --git a/tests/queries/0_stateless/01318_encrypt.sql b/tests/queries/0_stateless/01318_encrypt.sql
index 0e55a9a2aee..9a5e6fd0ed1 100644
--- a/tests/queries/0_stateless/01318_encrypt.sql
+++ b/tests/queries/0_stateless/01318_encrypt.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 --- aes_encrypt_mysql(string, key, block_mode[, init_vector, AAD])
 -- The MySQL-compatitable encryption, only ecb, cbc, cfb128 and ofb modes are supported,
 -- just like for MySQL
diff --git a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
index 13250e82079..9a4df37d206 100755
--- a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
+++ b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
index cec75ac1b23..e0c949b0878 100644
--- a/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
+++ b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS r1;
 DROP TABLE IF EXISTS r2;
 
diff --git a/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql b/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
index 4f7d6b81002..f056b87cc8a 100644
--- a/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
+++ b/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists data_01319;
 drop table if exists dist_01319;
 drop table if exists dist_layer_01319;
diff --git a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
index 678a3aa12fe..758ec4825e0 100755
--- a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
+++ b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql b/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
index f827bb733b4..1cb36e1441d 100644
--- a/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
+++ b/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists data_01320;
 drop table if exists dist_01320;
 
diff --git a/tests/queries/0_stateless/01337_mysql_global_variables.sql b/tests/queries/0_stateless/01337_mysql_global_variables.sql
index b5b982d2852..d76baa85bc5 100644
--- a/tests/queries/0_stateless/01337_mysql_global_variables.sql
+++ b/tests/queries/0_stateless/01337_mysql_global_variables.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-fasttest
+
 SELECT @@test;
 SELECT @@max_allowed_packet FORMAT CSVWithNames;
 SELECT @@MAX_ALLOWED_PACKET FORMAT CSVWithNames;
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter.sh b/tests/queries/0_stateless/01338_long_select_and_alter.sh
index 499b62564bd..2e3080e9cfc 100755
--- a/tests/queries/0_stateless/01338_long_select_and_alter.sh
+++ b/tests/queries/0_stateless/01338_long_select_and_alter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
index 4aeecc7343d..12bc3b09472 100755
--- a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
+++ b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01338_sha256_fixedstring.sql b/tests/queries/0_stateless/01338_sha256_fixedstring.sql
index 8d34e59f344..bf66b03ec55 100644
--- a/tests/queries/0_stateless/01338_sha256_fixedstring.sql
+++ b/tests/queries/0_stateless/01338_sha256_fixedstring.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT hex(SHA256(''));
 SELECT hex(SHA256('abc'));
 
diff --git a/tests/queries/0_stateless/01339_client_unrecognized_option.sh b/tests/queries/0_stateless/01339_client_unrecognized_option.sh
index f590ed3807e..f88d890f33c 100755
--- a/tests/queries/0_stateless/01339_client_unrecognized_option.sh
+++ b/tests/queries/0_stateless/01339_client_unrecognized_option.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
index d0b6fbe3dde..8bf5d4f2cf8 100644
--- a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS test;
 DROP TABLE IF EXISTS test2;
 
diff --git a/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql b/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
index d9b596f3ec3..132bbb74a00 100644
--- a/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
+++ b/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT number FROM numbers(11) ORDER BY arrayJoin(['а', 'я', '\0�', '', 'Я', '']) ASC, toString(number) ASC, 'y' ASC COLLATE 'el';
diff --git a/tests/queries/0_stateless/01355_alter_column_with_order.sql b/tests/queries/0_stateless/01355_alter_column_with_order.sql
index b3ae8f43042..c0c85e389ea 100644
--- a/tests/queries/0_stateless/01355_alter_column_with_order.sql
+++ b/tests/queries/0_stateless/01355_alter_column_with_order.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS alter_test;
 
 CREATE TABLE alter_test (CounterID UInt32, StartDate Date, UserID UInt32, VisitID UInt32, NestedColumn Nested(A UInt8, S String), ToDrop UInt32) ENGINE = MergeTree(StartDate, intHash32(UserID), (CounterID, StartDate, intHash32(UserID), VisitID), 8192);
diff --git a/tests/queries/0_stateless/01355_ilike.sql b/tests/queries/0_stateless/01355_ilike.sql
index 6f08be2dab2..6bde62bf47e 100644
--- a/tests/queries/0_stateless/01355_ilike.sql
+++ b/tests/queries/0_stateless/01355_ilike.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SELECT 'Hello' ILIKE '';
 SELECT 'Hello' ILIKE '%';
 SELECT 'Hello' ILIKE '%%';
diff --git a/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql b/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
index d8249a603ff..0b968440370 100644
--- a/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
+++ b/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS versioned_collapsing_table;
 
 CREATE TABLE versioned_collapsing_table(
diff --git a/tests/queries/0_stateless/01358_lc_parquet.sh b/tests/queries/0_stateless/01358_lc_parquet.sh
index 3c49adc6185..886fe4538d1 100755
--- a/tests/queries/0_stateless/01358_lc_parquet.sh
+++ b/tests/queries/0_stateless/01358_lc_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
index 5f4855c6119..1b22082bd83 100644
--- a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
+++ b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS slow_log;
 DROP TABLE IF EXISTS expected_times;
 
diff --git a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
index e0d01d905bb..472106bc4a5 100755
--- a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
+++ b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01372_remote_table_function_empty_table.sql b/tests/queries/0_stateless/01372_remote_table_function_empty_table.sql
index 4153dc632f3..55c9d3f63d3 100644
--- a/tests/queries/0_stateless/01372_remote_table_function_empty_table.sql
+++ b/tests/queries/0_stateless/01372_remote_table_function_empty_table.sql
@@ -1,4 +1,4 @@
-SELECT * FROM remote('127..2', 'a.'); -- { serverError 36 }
+SELECT * FROM remote('127..2', 'a.'); -- { serverError 62 }
 
 -- Clear cache to avoid future errors in the logs
 SYSTEM DROP DNS CACHE
diff --git a/tests/queries/0_stateless/01375_compact_parts_codecs.sql b/tests/queries/0_stateless/01375_compact_parts_codecs.sql
index 698f4148a15..35f125515a2 100644
--- a/tests/queries/0_stateless/01375_compact_parts_codecs.sql
+++ b/tests/queries/0_stateless/01375_compact_parts_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS codecs;
 
 CREATE TABLE codecs (id UInt32, val UInt32, s String) 
diff --git a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
index 56f81eb36ec..258d96829a5 100644
--- a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
+++ b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- https://github.com/ClickHouse/ClickHouse/issues/11469
 SELECT dictGet('default.countryId', 'country', toUInt64(number)) AS country FROM numbers(2) GROUP BY country; -- { serverError 36; }
 
diff --git a/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql b/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
index 79d1276ae61..b6982910ace 100644
--- a/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
+++ b/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_rename_with_ttl;
 
 CREATE TABLE table_rename_with_ttl
diff --git a/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql b/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
index bdfeba665d7..de552b7b27f 100644
--- a/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
+++ b/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 DROP DATABASE IF EXISTS test_01383;
 CREATE DATABASE test_01383;
 
diff --git a/tests/queries/0_stateless/01388_clear_all_columns.sql b/tests/queries/0_stateless/01388_clear_all_columns.sql
index 269c6eee824..c1f59efba83 100644
--- a/tests/queries/0_stateless/01388_clear_all_columns.sql
+++ b/tests/queries/0_stateless/01388_clear_all_columns.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (x UInt8) ENGINE = MergeTree ORDER BY tuple();
 INSERT INTO test (x) VALUES (1), (2), (3);
diff --git a/tests/queries/0_stateless/01391_join_on_dict_crash.sql b/tests/queries/0_stateless/01391_join_on_dict_crash.sql
index 0f26359796d..ac3ca94ddf6 100644
--- a/tests/queries/0_stateless/01391_join_on_dict_crash.sql
+++ b/tests/queries/0_stateless/01391_join_on_dict_crash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_01391;
 CREATE DATABASE db_01391;
 USE db_01391;
diff --git a/tests/queries/0_stateless/01392_column_resolve.sql b/tests/queries/0_stateless/01392_column_resolve.sql
index 728ccfd0728..72b6af4576a 100644
--- a/tests/queries/0_stateless/01392_column_resolve.sql
+++ b/tests/queries/0_stateless/01392_column_resolve.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01392;
 CREATE DATABASE test_01392;
 
diff --git a/tests/queries/0_stateless/01393_benchmark_secure_port.sh b/tests/queries/0_stateless/01393_benchmark_secure_port.sh
index 6928041da14..f75577e6ddf 100755
--- a/tests/queries/0_stateless/01393_benchmark_secure_port.sh
+++ b/tests/queries/0_stateless/01393_benchmark_secure_port.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
index 693580bc270..411705e0469 100755
--- a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
+++ b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01411_bayesian_ab_testing.sql b/tests/queries/0_stateless/01411_bayesian_ab_testing.sql
index e162c3a8e1a..a4b03d76c51 100644
--- a/tests/queries/0_stateless/01411_bayesian_ab_testing.sql
+++ b/tests/queries/0_stateless/01411_bayesian_ab_testing.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT count() FROM (SELECT bayesAB('beta', 1, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
 SELECT count() FROM (SELECT bayesAB('gamma', 1, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
 SELECT count() FROM (SELECT bayesAB('beta', 0, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
diff --git a/tests/queries/0_stateless/01412_cache_dictionary_race.sh b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
index 587cec52932..165a461193d 100755
--- a/tests/queries/0_stateless/01412_cache_dictionary_race.sh
+++ b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01412_group_array_moving_shard.sql b/tests/queries/0_stateless/01412_group_array_moving_shard.sql
index 0fbd10bc01a..25e29409f6d 100644
--- a/tests/queries/0_stateless/01412_group_array_moving_shard.sql
+++ b/tests/queries/0_stateless/01412_group_array_moving_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT groupArrayMovingSum(10)(1) FROM remote('127.0.0.{1,2}', numbers(100));
 SELECT groupArrayMovingAvg(10)(1) FROM remote('127.0.0.{1,2}', numbers(100));
 
diff --git a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
index 6e1a6e01757..e47a7c4a40c 100755
--- a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
+++ b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql b/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
index 2ce0575c4ad..6fe7a238e88 100644
--- a/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
+++ b/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t;
 
 SET mutations_sync = 1;
diff --git a/tests/queries/0_stateless/01415_sticking_mutations.sh b/tests/queries/0_stateless/01415_sticking_mutations.sh
index 2e86b6d972d..821c83fe728 100755
--- a/tests/queries/0_stateless/01415_sticking_mutations.sh
+++ b/tests/queries/0_stateless/01415_sticking_mutations.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
index f5389e3e03d..d2032e279ae 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
index 16b39db6e84..5b936b3f2ba 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01428_h3_range_check.sql b/tests/queries/0_stateless/01428_h3_range_check.sql
index 7c7376a90ae..9024108eca9 100644
--- a/tests/queries/0_stateless/01428_h3_range_check.sql
+++ b/tests/queries/0_stateless/01428_h3_range_check.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToChildren(599405990164561919, 100); -- { serverError 69 }
 SELECT h3ToParent(599405990164561919, 100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh b/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
index 5ee8379d431..0f3396fe8cb 100755
--- a/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
+++ b/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql b/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
index 288fa97d218..223c27804df 100644
--- a/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS modify_sample;
 
 SET min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
diff --git a/tests/queries/0_stateless/01442_h3kring_range_check.sql b/tests/queries/0_stateless/01442_h3kring_range_check.sql
index e580beb17a3..fa79b308068 100644
--- a/tests/queries/0_stateless/01442_h3kring_range_check.sql
+++ b/tests/queries/0_stateless/01442_h3kring_range_check.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3kRing(581276613233082367, 65535); -- { serverError 12 }
 SELECT h3kRing(581276613233082367, -1); -- { serverError 12 }
 SELECT length(h3kRing(111111111111, 1000));
diff --git a/tests/queries/0_stateless/01442_merge_detach_attach_long.sh b/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
index c99069b4aa2..b3f9fbb42dd 100755
--- a/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
+++ b/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01443_merge_truncate_long.sh b/tests/queries/0_stateless/01443_merge_truncate_long.sh
index ffd5f225ffe..40cfd0fc627 100755
--- a/tests/queries/0_stateless/01443_merge_truncate_long.sh
+++ b/tests/queries/0_stateless/01443_merge_truncate_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 set -e
 
diff --git a/tests/queries/0_stateless/01444_create_table_drop_database_race.sh b/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
index aba83aac207..eb231e71525 100755
--- a/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
+++ b/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01446_json_strings_each_row.sh b/tests/queries/0_stateless/01446_json_strings_each_row.sh
index a2d98cd7f90..3d19977ec1c 100755
--- a/tests/queries/0_stateless/01446_json_strings_each_row.sh
+++ b/tests/queries/0_stateless/01446_json_strings_each_row.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01447_json_strings.sql b/tests/queries/0_stateless/01447_json_strings.sql
index 45fc4a56d7a..2930879d312 100644
--- a/tests/queries/0_stateless/01447_json_strings.sql
+++ b/tests/queries/0_stateless/01447_json_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 
 SELECT
diff --git a/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql b/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
index 5a09ca18c33..925faa3a17f 100644
--- a/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
+++ b/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_table;
 DROP TABLE IF EXISTS test_table_2;
 SET input_format_null_as_default = 0;
diff --git a/tests/queries/0_stateless/01449_json_compact_strings.sql b/tests/queries/0_stateless/01449_json_compact_strings.sql
index 5b676e30347..d0a9d72af07 100644
--- a/tests/queries/0_stateless/01449_json_compact_strings.sql
+++ b/tests/queries/0_stateless/01449_json_compact_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 
 SELECT
diff --git a/tests/queries/0_stateless/01451_detach_drop_part.sql b/tests/queries/0_stateless/01451_detach_drop_part.sql
index a285730e45f..0bc7e13d243 100644
--- a/tests/queries/0_stateless/01451_detach_drop_part.sql
+++ b/tests/queries/0_stateless/01451_detach_drop_part.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS mt_01451;
 
 CREATE TABLE mt_01451 (v UInt8) ENGINE = MergeTree() order by tuple();
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql b/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
index 2c6bafe4936..0155b83db31 100644
--- a/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
+++ b/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica, no-replicated-database
+
 SET replication_alter_partitions_sync = 2;
 
 
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
index 5da86f45fde..eb4d5e43115 100644
--- a/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
+++ b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 SET replication_alter_partitions_sync = 2;
 
 DROP TABLE IF EXISTS replica1;
diff --git a/tests/queries/0_stateless/01451_wrong_error_long_query.sh b/tests/queries/0_stateless/01451_wrong_error_long_query.sh
index 333dab193cd..948f22d3a9a 100755
--- a/tests/queries/0_stateless/01451_wrong_error_long_query.sh
+++ b/tests/queries/0_stateless/01451_wrong_error_long_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
index 49829b288ae..d83343b3cb3 100755
--- a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
+++ b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
index 59cd1b57d1e..fbbf74bbba2 100755
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed
+
 set -ue
 
 unset CLICKHOUSE_LOG_COMMENT
diff --git a/tests/queries/0_stateless/01455_rank_correlation_spearman.sql b/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
index e770b0bb4ff..b792d709bbc 100644
--- a/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
+++ b/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_01455_rank_correlation;
 USE db_01455_rank_correlation;
 DROP TABLE IF EXISTS moons;
diff --git a/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql b/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
index d21aa391890..a271295a0cd 100644
--- a/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
+++ b/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- Leaf limits is unreliable w/ prefer_localhost_replica=1.
 -- Since in this case initial query and the query on the local node (to the
 -- underlying table) has the same counters, so if query on the remote node
diff --git a/tests/queries/0_stateless/01455_time_zones.sql b/tests/queries/0_stateless/01455_time_zones.sql
index 4024dbb3348..b04655fb758 100644
--- a/tests/queries/0_stateless/01455_time_zones.sql
+++ b/tests/queries/0_stateless/01455_time_zones.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 -- There are currently 594 timezones which are used from the binary embedded inside the ClickHouse binary
 -- Refer: contrib/cctz-cmake/CMakeLists.txt for the complete list. The count may change but we expect there will be at least 500 timezones.
 -- SELECT count(*)
diff --git a/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql b/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
index 1470d8c8d4f..ee144264193 100644
--- a/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
+++ b/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET optimize_move_functions_out_of_any = 1;
 SET optimize_injective_functions_inside_uniq = 1;
 SET optimize_arithmetic_operations_in_aggregate_functions = 1;
diff --git a/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql b/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
index a2e4804f12e..b7cbfc92c26 100644
--- a/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
+++ b/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS tbl;
 CREATE TABLE tbl(a String, b UInt32, c Float64, d Int64, e UInt8) ENGINE=MergeTree ORDER BY tuple();
 INSERT INTO tbl SELECT number, number * 2, number * 3, number * 4, number * 5 FROM system.numbers LIMIT 10;
diff --git a/tests/queries/0_stateless/01457_create_as_table_function_structure.sql b/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
index 9399f06220b..d7c681dc615 100644
--- a/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
+++ b/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01457;
 
 CREATE DATABASE test_01457;
diff --git a/tests/queries/0_stateless/01457_int256_hashing.sql b/tests/queries/0_stateless/01457_int256_hashing.sql
index d6d655e80f3..861e567950a 100644
--- a/tests/queries/0_stateless/01457_int256_hashing.sql
+++ b/tests/queries/0_stateless/01457_int256_hashing.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT toUInt256(123) IN (NULL);
 SELECT toUInt256(123) AS k GROUP BY k;
 SELECT toUInt256(123) AS k FROM system.one INNER JOIN (SELECT toUInt256(123) AS k) t USING k;
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
index cf239fd7032..13c772e75d2 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
index 8c322798173..6eabc9ae1b5 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database, no-parallel
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql b/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
index 02e3d3ef73f..9b7a98f30bc 100644
--- a/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
+++ b/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
@@ -1,3 +1,6 @@
+-- Tags: no-parallel, no-fasttest
+-- Tag no-fasttest: Look at DistributedFilesToInsert, so cannot run in parallel.
+
 -- otherwise SYSTEM STOP DISTRIBUTED SENDS does not makes any effect (for localhost)
 -- (i.e. no .bin files and hence no sending is required)
 set prefer_localhost_replica=0;
diff --git a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql b/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
index 04276087ece..3c855c984b3 100644
--- a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
+++ b/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 CREATE TABLE test0 (
         c0 UInt64
     ) ENGINE = MergeTree() PARTITION BY c0 ORDER BY c0;
diff --git a/tests/queries/0_stateless/01465_ttl_recompression.sql b/tests/queries/0_stateless/01465_ttl_recompression.sql
index 2388e727722..a73be94f2c9 100644
--- a/tests/queries/0_stateless/01465_ttl_recompression.sql
+++ b/tests/queries/0_stateless/01465_ttl_recompression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS recompression_table;
 
 CREATE TABLE recompression_table
diff --git a/tests/queries/0_stateless/01470_show_databases_like.sql b/tests/queries/0_stateless/01470_show_databases_like.sql
index 46ec8878105..33fee27acdb 100644
--- a/tests/queries/0_stateless/01470_show_databases_like.sql
+++ b/tests/queries/0_stateless/01470_show_databases_like.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create database if not exists test_01470;
 show databases like '%01470';
 drop database test_01470;
diff --git a/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql b/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
index 901c47bc10f..ea8aa1814a3 100644
--- a/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
+++ b/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS table_for_ttl;
 
 CREATE TABLE table_for_ttl(
diff --git a/tests/queries/0_stateless/01473_event_time_microseconds.sql b/tests/queries/0_stateless/01473_event_time_microseconds.sql
index 488ee37e6d8..9c6b392a8aa 100644
--- a/tests/queries/0_stateless/01473_event_time_microseconds.sql
+++ b/tests/queries/0_stateless/01473_event_time_microseconds.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug
+
 -- This file contains tests for the event_time_microseconds field for various tables.
 -- Note: Only event_time_microseconds for asynchronous_metric_log table is tested via
 -- an integration test as those metrics take 60s by default to be updated.
diff --git a/tests/queries/0_stateless/01474_bad_global_join.sql b/tests/queries/0_stateless/01474_bad_global_join.sql
index cd98c0f60ec..b65b4e804a8 100644
--- a/tests/queries/0_stateless/01474_bad_global_join.sql
+++ b/tests/queries/0_stateless/01474_bad_global_join.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS local_table;
 DROP TABLE IF EXISTS dist_table;
 
diff --git a/tests/queries/0_stateless/01474_executable_dictionary.sql b/tests/queries/0_stateless/01474_executable_dictionary.sql
index 727cf47f79f..6937a09928e 100644
--- a/tests/queries/0_stateless/01474_executable_dictionary.sql
+++ b/tests/queries/0_stateless/01474_executable_dictionary.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-parallel
+-- Tag no-tsan: informational stderr from sanitizer at start
+
 SELECT number, dictGet('executable_complex', 'a', (number, number)) AS a, dictGet('executable_complex', 'b', (number, number)) AS b FROM numbers(1000000) WHERE number = 999999;
 SELECT number, dictGet('executable_complex_direct', 'a', (number, number)) AS a, dictGet('executable_complex_direct', 'b', (number, number)) AS b FROM numbers(1000000) WHERE number = 999999;
 SELECT number, dictGet('executable_simple', 'a', number) AS a, dictGet('executable_simple', 'b', number) AS b FROM numbers(1000000) WHERE number = 999999;
diff --git a/tests/queries/0_stateless/01486_json_array_output.sql b/tests/queries/0_stateless/01486_json_array_output.sql
index f8c707d4bee..a9318008874 100644
--- a/tests/queries/0_stateless/01486_json_array_output.sql
+++ b/tests/queries/0_stateless/01486_json_array_output.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 set output_format_json_array_of_rows = 1;
 select number a, number * 2 b from numbers(3) format JSONEachRow;
 select * from numbers(1) format JSONEachRow;
diff --git a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
index 39e04804bfb..ccd2c571290 100644
--- a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
+++ b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 CREATE DATABASE IF NOT EXISTS shard_0;
 CREATE DATABASE IF NOT EXISTS shard_1;
 CREATE DATABASE IF NOT EXISTS main_01487;
diff --git a/tests/queries/0_stateless/01492_format_readable_quantity.reference b/tests/queries/0_stateless/01492_format_readable_quantity.reference
index 3736933b5ee..e58a1954eee 100644
--- a/tests/queries/0_stateless/01492_format_readable_quantity.reference
+++ b/tests/queries/0_stateless/01492_format_readable_quantity.reference
@@ -43,8 +43,3 @@
 1739.27 quadrillion	1739.27 quadrillion	-2.15 billion
 4727.84 quadrillion	4727.84 quadrillion	-2.15 billion
 12851.60 quadrillion	12851.60 quadrillion	-2.15 billion
-34934.27 quadrillion	0.00	-2.15 billion
-94961.19 quadrillion	0.00	-2.15 billion
-258131.29 quadrillion	0.00	-2.15 billion
-701673.59 quadrillion	0.00	-2.15 billion
-1907346.57 quadrillion	0.00	-2.15 billion
diff --git a/tests/queries/0_stateless/01492_format_readable_quantity.sql b/tests/queries/0_stateless/01492_format_readable_quantity.sql
index c2ebcfc1a97..3931cde49df 100644
--- a/tests/queries/0_stateless/01492_format_readable_quantity.sql
+++ b/tests/queries/0_stateless/01492_format_readable_quantity.sql
@@ -1,4 +1,4 @@
 WITH round(exp(number), 6) AS x, toUInt64(x) AS y, toInt32(x) AS z
 SELECT formatReadableQuantity(x), formatReadableQuantity(y), formatReadableQuantity(z)
 FROM system.numbers
-LIMIT 50;
+LIMIT 45;
diff --git a/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql b/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
index 8d37900aaf8..e9859d3fe96 100644
--- a/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS no_prop_table;
 
 CREATE TABLE no_prop_table
diff --git a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
index 55f610eb7d0..92e6fce2c93 100644
--- a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
+++ b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS r_prop_table1;
 DROP TABLE IF EXISTS r_prop_table2;
 
diff --git a/tests/queries/0_stateless/01493_storage_set_persistency.sql b/tests/queries/0_stateless/01493_storage_set_persistency.sql
index 9298a24bf73..558e92fbfe9 100644
--- a/tests/queries/0_stateless/01493_storage_set_persistency.sql
+++ b/tests/queries/0_stateless/01493_storage_set_persistency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS set;
 DROP TABLE IF EXISTS number;
 
diff --git a/tests/queries/0_stateless/01494_storage_join_persistency.sql b/tests/queries/0_stateless/01494_storage_join_persistency.sql
index c362a78dccd..9ea7196aa24 100644
--- a/tests/queries/0_stateless/01494_storage_join_persistency.sql
+++ b/tests/queries/0_stateless/01494_storage_join_persistency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS join;
 
 SELECT '----- Default Settings -----';
diff --git a/tests/queries/0_stateless/01499_json_named_tuples.sql b/tests/queries/0_stateless/01499_json_named_tuples.sql
index 896c3ecb2bb..947455f0320 100644
--- a/tests/queries/0_stateless/01499_json_named_tuples.sql
+++ b/tests/queries/0_stateless/01499_json_named_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 create table named_tuples engine File(JSONEachRow)
     settings output_format_json_named_tuples_as_objects = 1
     as select cast(tuple(number, number * 2), 'Tuple(a int, b int)') c
diff --git a/tests/queries/0_stateless/01499_log_deadlock.sql b/tests/queries/0_stateless/01499_log_deadlock.sql
index e98b37f2455..f361297e0b8 100644
--- a/tests/queries/0_stateless/01499_log_deadlock.sql
+++ b/tests/queries/0_stateless/01499_log_deadlock.sql
@@ -1,3 +1,5 @@
+-- Tags: deadlock
+
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (x UInt8) ENGINE = TinyLog;
 
diff --git a/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql b/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
index bb9fb0caa6c..9b383399c51 100644
--- a/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
+++ b/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop database if exists db_01501;
 drop table if exists db_01501.table_cache_dict;
 drop dictionary if exists db_01501.cache_dict;
diff --git a/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh b/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
index 2abb1818529..b84aeb48caa 100755
--- a/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
+++ b/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
index 667a612ff23..b659d550fa4 100755
--- a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 set -e
 
@@ -25,28 +26,28 @@ function thread_drop {
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: '| grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
diff --git a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
index 9f31fcb6da1..1087a7ed96b 100755
--- a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 set -e
 
@@ -18,35 +19,35 @@ function thread_create {
 
 function thread_drop {
     while true; do
-        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
diff --git a/tests/queries/0_stateless/01504_rocksdb.sql b/tests/queries/0_stateless/01504_rocksdb.sql
index 9e30263c6b3..9f9e6c3b1ac 100644
--- a/tests/queries/0_stateless/01504_rocksdb.sql
+++ b/tests/queries/0_stateless/01504_rocksdb.sql
@@ -1,3 +1,7 @@
+-- Tags: no-ordinary-database, no-fasttest
+-- Tag no-ordinary-database: Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
+-- Tag no-fasttest: In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
+
 DROP TABLE IF EXISTS 01504_test;
 
 CREATE TABLE 01504_test (key String, value UInt32) Engine=EmbeddedRocksDB; -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql b/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
index 6f62716d312..85c07a95919 100644
--- a/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
+++ b/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS t;
 DROP TABLE IF EXISTS d;
 
diff --git a/tests/queries/0_stateless/01505_log_distributed_deadlock.sql b/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
index 2b0b2b97188..49817dbed32 100644
--- a/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
+++ b/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
@@ -1,3 +1,5 @@
+-- Tags: deadlock, distributed
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t_dist;
 
diff --git a/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh b/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
index 5b8f0cba639..5cee3ecff0d 100755
--- a/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
+++ b/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_PORT_TCP=50111
 CLICKHOUSE_DATABASE=default
diff --git a/tests/queries/0_stateless/01508_partition_pruning_long.sh b/tests/queries/0_stateless/01508_partition_pruning_long.sh
index 745d08496a7..ddf63bf4808 100755
--- a/tests/queries/0_stateless/01508_partition_pruning_long.sh
+++ b/tests/queries/0_stateless/01508_partition_pruning_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-polymorphic-parts
+# Tag no-polymorphic-parts: bug, shoud be fixed
 
 # Description of test result:
 # Test the correctness of the partition pruning
diff --git a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
index 156deb60ff9..7db9f22951c 100755
--- a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
index 187357b94e2..c2682cd8cfa 100755
--- a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
+++ b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
index 78336ea073b..1589f17c752 100755
--- a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
+++ b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01509_dictionary_preallocate.sh b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
index f2bc17d2e90..7b0448bfde8 100755
--- a/tests/queries/0_stateless/01509_dictionary_preallocate.sh
+++ b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 # shellcheck disable=SC2031
 # shellcheck disable=SC2030
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
index fbeb65419ce..f3cdb70a074 100755
--- a/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
+++ b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
index ba2b774b718..2f0c59ab64b 100644
--- a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
+++ b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS r1 SYNC;
 DROP TABLE IF EXISTS r2 SYNC;
 
diff --git a/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql b/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
index 17a6b8883a4..aff4e100579 100644
--- a/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
+++ b/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_with_version_replicated_1;
 DROP TABLE IF EXISTS table_with_version_replicated_2;
 
diff --git a/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
index 2ee73865122..fbdf68e6063 100644
--- a/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
+++ b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 CREATE TABLE mt (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01497/mt')
     ORDER BY tuple() -- { serverError 36 }
 
diff --git a/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql b/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
index 925dd042435..f800ff86aa5 100644
--- a/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1 SYNC;
diff --git a/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql b/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
index 87c66609421..cca994e8e4a 100644
--- a/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
+++ b/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists data_01513;
 create table data_01513 (key String) engine=MergeTree() order by key;
 -- 10e3 groups, 1e3 keys each
diff --git a/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh b/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
index 726dcc8ee6d..99025890cb3 100755
--- a/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
+++ b/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql b/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
index 8d55a257c47..0b2cb8c64e2 100644
--- a/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
+++ b/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS table_with_enum_column_for_json_insert;
 
 CREATE TABLE table_with_enum_column_for_json_insert (
diff --git a/tests/queries/0_stateless/01515_logtrace_function.sh b/tests/queries/0_stateless/01515_logtrace_function.sh
index 9953fc2ae2b..131ec0edb9e 100755
--- a/tests/queries/0_stateless/01515_logtrace_function.sh
+++ b/tests/queries/0_stateless/01515_logtrace_function.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql b/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
index cd62dfa993d..31151fbc8f4 100644
--- a/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
+++ b/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SET enable_global_with_statement = 1;
 
 with 1 as x select x;
diff --git a/tests/queries/0_stateless/01516_create_table_primary_key.sql b/tests/queries/0_stateless/01516_create_table_primary_key.sql
index c0e9ce4a34d..b3c4acd50ff 100644
--- a/tests/queries/0_stateless/01516_create_table_primary_key.sql
+++ b/tests/queries/0_stateless/01516_create_table_primary_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01516;
 CREATE DATABASE test_01516 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01516;
diff --git a/tests/queries/0_stateless/01516_drop_table_stress_long.sh b/tests/queries/0_stateless/01516_drop_table_stress_long.sh
index 20e76ce49c7..91818e45775 100755
--- a/tests/queries/0_stateless/01516_drop_table_stress_long.sh
+++ b/tests/queries/0_stateless/01516_drop_table_stress_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
index b97480c2911..5e31faa70da 100644
--- a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
+++ b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 --
 -- Atomic no SYNC
 -- (should go first to check that thread for DROP TABLE does not hang)
diff --git a/tests/queries/0_stateless/01517_select_final_distributed.sql b/tests/queries/0_stateless/01517_select_final_distributed.sql
index 1acc4590982..a3d1fcfc185 100644
--- a/tests/queries/0_stateless/01517_select_final_distributed.sql
+++ b/tests/queries/0_stateless/01517_select_final_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test5346;
 
 CREATE TABLE test5346 (`Id` String, `Timestamp` DateTime, `updated` DateTime) 
diff --git a/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql b/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
index 9963823023d..0e35d270f20 100644
--- a/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
+++ b/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 CREATE TABLE IF NOT EXISTS topXtest(A Int64) ENGINE = Memory;
 INSERT INTO topXtest SELECT number FROM numbers(100);
 INSERT INTO topXtest SELECT number FROM numbers(30);
diff --git a/tests/queries/0_stateless/01520_client_print_query_id.expect b/tests/queries/0_stateless/01520_client_print_query_id.expect
index b0ff5d9d165..1989ab51aea 100755
--- a/tests/queries/0_stateless/01520_client_print_query_id.expect
+++ b/tests/queries/0_stateless/01520_client_print_query_id.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01521_distributed_query_hang.sql b/tests/queries/0_stateless/01521_distributed_query_hang.sql
index 73e0f1ec921..9ec303947c9 100644
--- a/tests/queries/0_stateless/01521_distributed_query_hang.sql
+++ b/tests/queries/0_stateless/01521_distributed_query_hang.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- regression for endless loop with connections_with_failover_max_tries=0
 set connections_with_failover_max_tries=0;
 select * from remote('127.2', system.one);
diff --git a/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql b/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
index adb7bccd0df..fe58710a9e6 100644
--- a/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
+++ b/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh b/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
index f4681907ced..cf19efa9b7d 100755
--- a/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
+++ b/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql b/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
index db8c2de0950..24f43a89c0b 100644
--- a/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
+++ b/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_for_alter;
 
 SET replication_alter_partitions_sync = 2;
diff --git a/tests/queries/0_stateless/01526_client_start_and_exit.sh b/tests/queries/0_stateless/01526_client_start_and_exit.sh
index 19f9cb8c37b..82eb56305fc 100755
--- a/tests/queries/0_stateless/01526_client_start_and_exit.sh
+++ b/tests/queries/0_stateless/01526_client_start_and_exit.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql b/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
index c303b35386f..30a5b7e8783 100644
--- a/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
+++ b/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_01526;
 
 CREATE DATABASE db_01526;
diff --git a/tests/queries/0_stateless/01526_max_untracked_memory.sh b/tests/queries/0_stateless/01526_max_untracked_memory.sh
index df5dbae35a9..20c986f14ca 100755
--- a/tests/queries/0_stateless/01526_max_untracked_memory.sh
+++ b/tests/queries/0_stateless/01526_max_untracked_memory.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan
+# Tag no-tsan: requires TraceCollector, does not available under sanitizers
+# Tag no-asan: requires TraceCollector, does not available under sanitizers
+# Tag no-ubsan: requires TraceCollector, does not available under sanitizers
+# Tag no-msan: requires TraceCollector, does not available under sanitizers
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
index 82453c00ca4..d63765fc179 100755
--- a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
+++ b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql b/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
index 7e0782ebe84..5e42fe69c2f 100644
--- a/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
+++ b/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 set allow_nondeterministic_optimize_skip_unused_shards=1;
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
diff --git a/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql b/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
index 51970db73cb..08fba7480d1 100644
--- a/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
+++ b/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists dist_01528;
 create table dist_01528 as system.one engine=Distributed('test_cluster_two_shards', system, one, rand()+dummy);
 
diff --git a/tests/queries/0_stateless/01529_bad_memory_tracking.sh b/tests/queries/0_stateless/01529_bad_memory_tracking.sh
index 5ad2535074a..f5d096cc799 100755
--- a/tests/queries/0_stateless/01529_bad_memory_tracking.sh
+++ b/tests/queries/0_stateless/01529_bad_memory_tracking.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
@@ -7,5 +8,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 for _ in {1..10}; do
-    ${CLICKHOUSE_CLIENT} --max_memory_usage '10G' --query "SELECT i FROM generateRandom('i Array(Int8)', 1, 1, 1048577) LIMIT 65536" 2>&1 | grep -v -P '^(Received exception from server|Code: 241)' ||:
+    ${CLICKHOUSE_CLIENT} --max_memory_usage '10G' --query "SELECT i FROM generateRandom('i Array(Int8)', 1, 1, 1048577) LIMIT 65536" |& grep -v -e 'Received exception from server' -e 'Code: 241' -e '(query: '
 done
+exit 0
diff --git a/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql b/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
index 07fe00693d1..7a2e64742cf 100644
--- a/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
+++ b/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
@@ -1,3 +1,6 @@
+-- Tags: no-parallel
+-- Tag no-parallel: creates database
+
 drop database if exists db_01530_atomic sync;
 
 create database db_01530_atomic Engine=Atomic;
diff --git a/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql b/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
index b6fba26eb2d..ace36236292 100644
--- a/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
+++ b/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collate;
 DROP TABLE IF EXISTS test_collate_null;
 
diff --git a/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
index 85a2e893f37..8df6d0b314e 100644
--- a/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
+++ b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
@@ -1,3 +1,7 @@
+-- Tags: long, replica, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+-- Tag no-parallel: static zk path
+
 DROP TABLE IF EXISTS execute_on_single_replica_r1 NO DELAY;
 DROP TABLE IF EXISTS execute_on_single_replica_r2 NO DELAY;
 
diff --git a/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql b/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
index 31294d8ebbc..8d413cf6c35 100644
--- a/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
+++ b/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS merge_tree_pk;
 
 CREATE TABLE merge_tree_pk
diff --git a/tests/queries/0_stateless/01533_collate_in_nullable.sql b/tests/queries/0_stateless/01533_collate_in_nullable.sql
index 40b48bee465..9e54581bc54 100644
--- a/tests/queries/0_stateless/01533_collate_in_nullable.sql
+++ b/tests/queries/0_stateless/01533_collate_in_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collate;
 
 CREATE TABLE test_collate (x UInt32, s Nullable(String)) ENGINE=Memory();
diff --git a/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh b/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
index 32877bfd0fe..e2d0306fee0 100755
--- a/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
+++ b/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01542_collate_in_array.sql b/tests/queries/0_stateless/01542_collate_in_array.sql
index dd0ec769e7d..1e748bd549f 100644
--- a/tests/queries/0_stateless/01542_collate_in_array.sql
+++ b/tests/queries/0_stateless/01542_collate_in_array.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS collate_test1;
 DROP TABLE IF EXISTS collate_test2;
 DROP TABLE IF EXISTS collate_test3;
diff --git a/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh b/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
index 334fcc87baf..981beb785a5 100755
--- a/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
+++ b/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.reference b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.reference
index e69de29bb2d..8d99d88ca14 100644
--- a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.reference
+++ b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.reference
@@ -0,0 +1,30 @@
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+\N
+1
+\N
+3
+\N
+5
+\N
+7
+\N
+9
diff --git a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
index f3f636dee73..0e987c66512 100755
--- a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
+++ b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
@@ -1,13 +1,28 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS test_01543 (value LowCardinality(String)) ENGINE=Memory()"
-$CLICKHOUSE_CLIENT --query "INSERT INTO test_01543 SELECT toString(number) FROM numbers(1000)"
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+$CLICKHOUSE_CLIENT --multiquery --query "
+SET allow_suspicious_low_cardinality_types=1;
+CREATE TABLE IF NOT EXISTS test_01543 (value LowCardinality(String), value2 LowCardinality(UInt64)) ENGINE=Memory();
+"
+
+$CLICKHOUSE_CLIENT --query "INSERT INTO test_01543 SELECT toString(number), number FROM numbers(10)"
 
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_01543 FORMAT Avro" |
     $CLICKHOUSE_CLIENT -q "INSERT INTO test_01543 FORMAT Avro";
 
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_01543";
+
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_01543"
+
+$CLICKHOUSE_CLIENT --query "SELECT number % 2 ? number: NULL as x from numbers(10) FORMAT Avro" > $USER_FILES_PATH/test_01543.avro
+
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('test_01543.avro', 'Avro', 'x LowCardinality(Nullable(UInt64))')"
+
+rm $USER_FILES_PATH/test_01543.avro
diff --git a/tests/queries/0_stateless/01543_collate_in_tuple.sql b/tests/queries/0_stateless/01543_collate_in_tuple.sql
index 17d9426cf45..222f7762b32 100644
--- a/tests/queries/0_stateless/01543_collate_in_tuple.sql
+++ b/tests/queries/0_stateless/01543_collate_in_tuple.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS collate_test1;
 DROP TABLE IF EXISTS collate_test2;
 DROP TABLE IF EXISTS collate_test3;
diff --git a/tests/queries/0_stateless/01545_system_errors.sh b/tests/queries/0_stateless/01545_system_errors.sh
index 970fd403866..11db3836ddb 100755
--- a/tests/queries/0_stateless/01545_system_errors.sh
+++ b/tests/queries/0_stateless/01545_system_errors.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: Checks system.errors
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql b/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
index d86f692a1ea..2b1a66147a4 100644
--- a/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
+++ b/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (x String) ENGINE = MergeTree ORDER BY x;
 INSERT INTO t VALUES ('Hello');
diff --git a/tests/queries/0_stateless/01560_merge_distributed_join.sql b/tests/queries/0_stateless/01560_merge_distributed_join.sql
index 991a0609dcd..40e89135de7 100644
--- a/tests/queries/0_stateless/01560_merge_distributed_join.sql
+++ b/tests/queries/0_stateless/01560_merge_distributed_join.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- test from https://github.com/ClickHouse/ClickHouse/issues/11755#issuecomment-700850254
 DROP TABLE IF EXISTS cat_hist;
 DROP TABLE IF EXISTS prod_hist;
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert_long.sql b/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
index 1c6418a50df..5570bb76230 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SELECT 'Replacing Merge Tree';
 DROP TABLE IF EXISTS replacing_merge_tree;
 CREATE TABLE replacing_merge_tree (key UInt32, date Datetime) ENGINE=ReplacingMergeTree() PARTITION BY date ORDER BY key;
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
index a98818b2195..f909c2129c1 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS empty1;
 DROP TABLE IF EXISTS empty2;
 
diff --git a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
index a01bc7f5065..72161333812 100755
--- a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
+++ b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01561_mann_whitney_scipy.sh b/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
index a04b630e2f3..8c68dec8925 100755
--- a/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
+++ b/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: Require python libraries like scipy, pandas and numpy
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01563_distributed_query_finish.sh b/tests/queries/0_stateless/01563_distributed_query_finish.sh
index a9e6a5b1fce..b49042ead9d 100755
--- a/tests/queries/0_stateless/01563_distributed_query_finish.sh
+++ b/tests/queries/0_stateless/01563_distributed_query_finish.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed, no-parallel, no-fasttest
+# Tag no-fasttest: Checks system.errors
 
 # query finish should not produce any NETWORK_ERROR
 # (NETWORK_ERROR will be in case of connection reset)
diff --git a/tests/queries/0_stateless/01565_reconnect_after_client_error.expect b/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
index 712fe4ff64a..261e46c2111 100755
--- a/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
+++ b/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 # This is a separate test, because we want to test the interactive mode.
 # https://github.com/ClickHouse/ClickHouse/issues/19353
diff --git a/tests/queries/0_stateless/01568_window_functions_distributed.sql b/tests/queries/0_stateless/01568_window_functions_distributed.sql
index 5e20c57d23d..140b02bfa6d 100644
--- a/tests/queries/0_stateless/01568_window_functions_distributed.sql
+++ b/tests/queries/0_stateless/01568_window_functions_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- { echo }
 select row_number() over (order by dummy) from (select * from remote('127.0.0.{1,2}', system, one));
 
diff --git a/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
index 98e85e9b196..2588a98fbfc 100755
--- a/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
+++ b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql b/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
index 0dc402715c3..2cf9ce661b6 100644
--- a/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
+++ b/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql b/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
index cc8c721b6a8..87eec36a596 100644
--- a/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
+++ b/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 --- See also tests/queries/0_stateless/01581_deduplicate_by_columns_local.sql
 
 --- replicated case
diff --git a/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql b/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
index 4d58e51d690..648eb14f507 100644
--- a/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
+++ b/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS realtimedrep;
 DROP TABLE IF EXISTS realtimedistributed;
 DROP TABLE IF EXISTS realtimebuff;
diff --git a/tests/queries/0_stateless/01585_use_index_for_global_in.sql b/tests/queries/0_stateless/01585_use_index_for_global_in.sql
index 8f89fc1a57b..a0a5b90ac1f 100644
--- a/tests/queries/0_stateless/01585_use_index_for_global_in.sql
+++ b/tests/queries/0_stateless/01585_use_index_for_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql b/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
index 72f12ce435a..6129c92c888 100644
--- a/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
+++ b/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
index 73245fe49ec..e52e0c94c3c 100644
--- a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
+++ b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS replicated_mutations_empty_partitions;
 
 CREATE TABLE replicated_mutations_empty_partitions
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index 26e9e500c3c..f54c10ee8b9 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -1094,62 +1094,24 @@ order by number
 7	6	8
 8	7	9
 9	8	9
--- nth_value without specific frame range given
-select
-    number,
-    nth_value(number, 1) over w as firstValue,
-    nth_value(number, 2) over w as secondValue,
-    nth_value(number, 3) over w as thirdValue,
-    nth_value(number, 4) over w as fourthValue
-from numbers(10)
-window w as (order by number)
-order by number
-;
-0	0	0	0	0
-1	0	1	0	0
-2	0	1	2	0
-3	0	1	2	3
-4	0	1	2	3
-5	0	1	2	3
-6	0	1	2	3
-7	0	1	2	3
-8	0	1	2	3
-9	0	1	2	3
--- nth_value with frame range specified
-select
-    number,
-    nth_value(number, 1) over w as firstValue,
-    nth_value(number, 2) over w as secondValue,
-    nth_value(number, 3) over w as thirdValue,
-    nth_value(number, 4) over w as fourthValue
-from numbers(10)
-window w as (order by number range between 1 preceding and 1 following)
-order by number
-;
-0	0	1	0	0
-1	0	1	2	0
-2	1	2	3	0
-3	2	3	4	0
-4	3	4	5	0
-5	4	5	6	0
-6	5	6	7	0
-7	6	7	8	0
-8	7	8	9	0
-9	8	9	0	0
--- to make nth_value return null for out-of-frame rows, cast the argument to
--- Nullable; otherwise, it returns default values.
-SELECT
-    number,
-    nth_value(toNullable(number), 1) OVER w as firstValue,
-    nth_value(toNullable(number), 3) OVER w as thridValue
-FROM numbers(5)
-WINDOW w AS (ORDER BY number ASC)
-;
-0	0	\N
-1	0	\N
-2	0	2
-3	0	2
-4	0	2
+-- lagInFrame UBsan
+SELECT lagInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, 0) OVER ();
+1
+SELECT lagInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+0
+SELECT lagInFrame(1, 1) OVER ();
+0
+-- leadInFrame UBsan
+SELECT leadInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, 0) OVER ();
+1
+SELECT leadInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+0
+SELECT leadInFrame(1, 1) OVER ();
+0
 -- In this case, we had a problem with PartialSortingTransform returning zero-row
 -- chunks for input chunks w/o columns.
 select count() over () from numbers(4) where number < 2;
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 3075c1ddb46..aa9bd9795e7 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -401,40 +401,20 @@ window w as (order by number range between 1 preceding and 1 following)
 order by number
 ;
 
--- nth_value without specific frame range given
-select
-    number,
-    nth_value(number, 1) over w as firstValue,
-    nth_value(number, 2) over w as secondValue,
-    nth_value(number, 3) over w as thirdValue,
-    nth_value(number, 4) over w as fourthValue
-from numbers(10)
-window w as (order by number)
-order by number
-;
+-- lagInFrame UBsan
+SELECT lagInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, 0) OVER ();
+SELECT lagInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+SELECT lagInFrame(1, 1) OVER ();
 
--- nth_value with frame range specified
-select
-    number,
-    nth_value(number, 1) over w as firstValue,
-    nth_value(number, 2) over w as secondValue,
-    nth_value(number, 3) over w as thirdValue,
-    nth_value(number, 4) over w as fourthValue
-from numbers(10)
-window w as (order by number range between 1 preceding and 1 following)
-order by number
-;
+-- leadInFrame UBsan
+SELECT leadInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, 0) OVER ();
+SELECT leadInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+SELECT leadInFrame(1, 1) OVER ();
 
--- to make nth_value return null for out-of-frame rows, cast the argument to
--- Nullable; otherwise, it returns default values.
-SELECT
-    number,
-    nth_value(toNullable(number), 1) OVER w as firstValue,
-    nth_value(toNullable(number), 3) OVER w as thridValue
-FROM numbers(5)
-WINDOW w AS (ORDER BY number ASC)
-;
-    
 -- In this case, we had a problem with PartialSortingTransform returning zero-row
 -- chunks for input chunks w/o columns.
 select count() over () from numbers(4) where number < 2;
diff --git a/tests/queries/0_stateless/01592_long_window_functions1.sql b/tests/queries/0_stateless/01592_long_window_functions1.sql
index 14fe3affed3..4911b7aa792 100644
--- a/tests/queries/0_stateless/01592_long_window_functions1.sql
+++ b/tests/queries/0_stateless/01592_long_window_functions1.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists stack;
 
 set max_insert_threads = 4;
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
index d40406222c2..bc0b92eb55b 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
index bb04facba15..f8f3ccd6dd6 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01594_too_low_memory_limits.sh b/tests/queries/0_stateless/01594_too_low_memory_limits.sh
index 6a33bd81dd1..b513a947bd9 100755
--- a/tests/queries/0_stateless/01594_too_low_memory_limits.sh
+++ b/tests/queries/0_stateless/01594_too_low_memory_limits.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-parallel, no-fasttest
+# Tag no-tsan: requires jemalloc to track small allocations
+# Tag no-asan: requires jemalloc to track small allocations
+# Tag no-ubsan: requires jemalloc to track small allocations
+# Tag no-msan: requires jemalloc to track small allocations
 
 #
 # Regression for INSERT SELECT, that abnormally terminates the server
diff --git a/tests/queries/0_stateless/01598_memory_limit_zeros.sql b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
index a07ce0bcca3..f8d6cf6ca7a 100644
--- a/tests/queries/0_stateless/01598_memory_limit_zeros.sql
+++ b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
@@ -1,2 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
 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_detach_permanently.sh b/tests/queries/0_stateless/01600_detach_permanently.sh
index 087545ec378..4469d9135e1 100755
--- a/tests/queries/0_stateless/01600_detach_permanently.sh
+++ b/tests/queries/0_stateless/01600_detach_permanently.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh b/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
index 6f0f1c29208..46fea5001a1 100755
--- a/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
+++ b/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -ue
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
index 9eb4221d063..ae296e18560 100644
--- a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
+++ b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop database if exists test_01600;
 create database test_01600;
 
diff --git a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
index 634cb403f85..9c0d28fdd91 100755
--- a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01600_parts_types_metrics_long.sh b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
index 67d2c0c306d..6e4ccbdd325 100755
--- a/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01601_detach_permanently.sql b/tests/queries/0_stateless/01601_detach_permanently.sql
index 3af8ed573ef..3bf05b872b9 100644
--- a/tests/queries/0_stateless/01601_detach_permanently.sql
+++ b/tests/queries/0_stateless/01601_detach_permanently.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'database atomic tests';
 
 DROP DATABASE IF EXISTS test1601_detach_permanently_atomic;
diff --git a/tests/queries/0_stateless/01601_proxy_protocol.sh b/tests/queries/0_stateless/01601_proxy_protocol.sh
index e8d1a7c45b2..5f4ec6cc597 100755
--- a/tests/queries/0_stateless/01601_proxy_protocol.sh
+++ b/tests/queries/0_stateless/01601_proxy_protocol.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: nc - command not found
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01602_max_distributed_connections.sh b/tests/queries/0_stateless/01602_max_distributed_connections.sh
index 772acb39344..51ff803ad5e 100755
--- a/tests/queries/0_stateless/01602_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01602_max_distributed_connections.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01602_show_create_view.sql b/tests/queries/0_stateless/01602_show_create_view.sql
index fd5bf70d470..11b9c235290 100644
--- a/tests/queries/0_stateless/01602_show_create_view.sql
+++ b/tests/queries/0_stateless/01602_show_create_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_1602;
 
 CREATE DATABASE test_1602;
diff --git a/tests/queries/0_stateless/01602_temporary_table_in_system_tables.reference b/tests/queries/0_stateless/01602_temporary_table_in_system_tables.reference
index 5b321d6c87a..4ab84e129fe 100644
--- a/tests/queries/0_stateless/01602_temporary_table_in_system_tables.reference
+++ b/tests/queries/0_stateless/01602_temporary_table_in_system_tables.reference
@@ -1,8 +1,8 @@
 	test_01602a	CREATE TEMPORARY TABLE test_01602a (`x` UInt32) ENGINE = Memory	Memory	Memory	1
 	test_01602b	CREATE TEMPORARY TABLE test_01602b (`y` Float64, `z` String) ENGINE = Memory	Memory	Memory	1
-	test_01602a	x	UInt32	1			0	0	0		0	0	0	0	
-	test_01602b	y	Float64	1			0	0	0		0	0	0	0	
-	test_01602b	z	String	2			0	0	0		0	0	0	0	
+	test_01602a	x	UInt32	1			0	0	0		0	0	0	0		\N	32	2	0	\N
+	test_01602b	y	Float64	1			0	0	0		0	0	0	0		\N	\N	\N	\N	\N
+	test_01602b	z	String	2			0	0	0		0	0	0	0		\N	\N	\N	\N	\N
 CREATE TEMPORARY TABLE test_01602a\n(\n    `x` UInt32\n)\nENGINE = Memory
 CREATE TEMPORARY TABLE test_01602b\n(\n    `y` Float64,\n    `z` String\n)\nENGINE = Memory
 0
diff --git a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
index e80d657fdb4..0c8f80f2b63 100644
--- a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
+++ b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan
+-- Tag no-tsan: Too long for TSan
+
 drop table if exists t;
 
 create table t (x UInt64, s String) engine = MergeTree order by x;
diff --git a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
index c857e08b243..82f9996991f 100644
--- a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
+++ b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP database IF EXISTS test_1603_rename_bug_ordinary;
 create database test_1603_rename_bug_ordinary engine=Ordinary;
 create table test_1603_rename_bug_ordinary.foo engine=Memory as select * from numbers(100);
diff --git a/tests/queries/0_stateless/01610_client_spawn_editor.sh b/tests/queries/0_stateless/01610_client_spawn_editor.sh
index b372d82847c..873b45e12a9 100755
--- a/tests/queries/0_stateless/01610_client_spawn_editor.sh
+++ b/tests/queries/0_stateless/01610_client_spawn_editor.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01615_random_one_shard_insertion.sql b/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
index 59412adbdbf..e205a358db1 100644
--- a/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
+++ b/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 create database if not exists shard_0;
 create database if not exists shard_1;
 drop table if exists shard_0.tbl;
diff --git a/tests/queries/0_stateless/01622_codec_zstd_long.sql b/tests/queries/0_stateless/01622_codec_zstd_long.sql
index 7045699d73f..ddfa9952f2d 100644
--- a/tests/queries/0_stateless/01622_codec_zstd_long.sql
+++ b/tests/queries/0_stateless/01622_codec_zstd_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS zstd_1_00;
 DROP TABLE IF EXISTS zstd_1_24;
 DROP TABLE IF EXISTS zstd_9_00;
diff --git a/tests/queries/0_stateless/01622_defaults_for_url_engine.sh b/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
index 491a1bd8988..0a93a3ef479 100755
--- a/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
+++ b/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: nc - command not found
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql b/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
index 7fb81efaac8..f38b1da29e4 100644
--- a/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
+++ b/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local;
 DROP TABLE IF EXISTS distributed;
 
diff --git a/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql b/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
index b0a674b8389..8bf370b13d7 100644
--- a/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
+++ b/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local;
 DROP TABLE IF EXISTS distributed;
 
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
index 8bbc9ec0a14..6bbf6fcec6a 100644
--- a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
+++ b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 drop table if exists data_01641;
 
 create table data_01641 (key Int, value String) engine=MergeTree order by (key, repeat(value, 40)) settings old_parts_lifetime=0, min_bytes_for_wide_part=0;
diff --git a/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql b/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
index 87ae96aa451..d0d64294ed4 100644
--- a/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
+++ b/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists dist_01643;
 drop table if exists data_01643;
 
diff --git a/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql b/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
index 0b7fba5b02e..7307ba60e3f 100644
--- a/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
+++ b/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
@@ -1,3 +1,6 @@
+-- Tags: replica, no-tsan, no-parallel
+-- Tag no-tsan: RESTART REPLICAS can acquire too much locks, while only 64 is possible from one thread under TSan
+
 DROP TABLE IF EXISTS data_01646;
 CREATE TABLE data_01646 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01646/data_01646', 'r') ORDER BY s PARTITION BY x;
 SYSTEM RESTART REPLICAS;
diff --git a/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql b/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
index a839883e683..1aa568c1663 100644
--- a/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS partitioned_table;
 
 CREATE TABLE partitioned_table (
diff --git a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
index 85b37cee15a..f9b9181b5b7 100644
--- a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
+++ b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS test_01640;
 DROP TABLE IF EXISTS restore_01640;
 
diff --git a/tests/queries/0_stateless/01651_map_functions.sql b/tests/queries/0_stateless/01651_map_functions.sql
index 997006ecdf3..bbaaf9bee84 100644
--- a/tests/queries/0_stateless/01651_map_functions.sql
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -8,14 +8,14 @@ select mapContains(a, 'name') from table_map;
 select mapContains(a, 'gender') from table_map;
 select mapContains(a, 'abc') from table_map;
 select mapContains(a, b) from table_map;
-select mapContains(a, 10) from table_map; -- { serverError 43 }
+select mapContains(a, 10) from table_map; -- { serverError 386 }
 select mapKeys(a) from table_map;
 drop table if exists table_map;
 
 CREATE TABLE table_map (a Map(UInt8, Int), b UInt8, c UInt32) engine = MergeTree order by tuple();
 insert into table_map select map(number, number), number, number from numbers(1000, 3);
 select mapContains(a, b), mapContains(a, c), mapContains(a, 233) from table_map;
-select mapContains(a, 'aaa') from table_map; -- { serverError 43 }
+select mapContains(a, 'aaa') from table_map; -- { serverError 386 }
 select mapContains(b, 'aaa') from table_map; -- { serverError 43 }
 select mapKeys(a) from table_map;
 select mapValues(a) from table_map;
diff --git a/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
index 03970134ca0..827f559f3d8 100644
--- a/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT ISNULL(NULL);
 SELECT '---';
 SELECT ISNULL('abc');
diff --git a/tests/queries/0_stateless/01656_sequence_next_node_long.sql b/tests/queries/0_stateless/01656_sequence_next_node_long.sql
index 9c181f5e491..a53074701b3 100644
--- a/tests/queries/0_stateless/01656_sequence_next_node_long.sql
+++ b/tests/queries/0_stateless/01656_sequence_next_node_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET allow_experimental_funnel_functions = 1;
 
 DROP TABLE IF EXISTS test_sequenceNextNode_Nullable;
diff --git a/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
index 7ac335062b8..003bc3d9383 100644
--- a/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT HEX(10);
diff --git a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
index 50d50155480..7205d547df9 100644
--- a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET database_atomic_wait_for_drop_and_detach_synchronously=1;
 SET log_queries=1;
 
diff --git a/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
index f691481dfc4..c9d4fb6d105 100644
--- a/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT HOUR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
index 1bfcf863184..3797b264f26 100755
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -eu
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
index 0d255e771b4..9eee88f7422 100644
--- a/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT TO_BASE64('test string');
diff --git a/tests/queries/0_stateless/01659_h3_buffer_overflow.sql b/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
index f2d77641ec9..d7564af01af 100644
--- a/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
+++ b/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 -- the behaviour on overflow can be implementation specific
 -- and we don't care about the results, but no buffer overflow should be possible.
 SELECT length(h3kRing(9223372036854775807, 1000)) FORMAT Null;
diff --git a/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
index 3e130716091..0b233e07aa9 100644
--- a/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT FROM_BASE64('dGVzdCBzdHJpbmc=');
diff --git a/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
index 7de1d287d2d..8998f6f8008 100644
--- a/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFYEAR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
index cde47ea483e..007f15ebe06 100644
--- a/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFWEEK(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
index 88b97613ff8..a9b078205da 100644
--- a/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFMONTH(toDateTime('2016-06-15 23:00:00'));
 SELECT '---';
 SELECT DAY(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01663_aes_msan.sql b/tests/queries/0_stateless/01663_aes_msan.sql
index 1d549aece56..16ad0029f44 100644
--- a/tests/queries/0_stateless/01663_aes_msan.sql
+++ b/tests/queries/0_stateless/01663_aes_msan.sql
@@ -1,2 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT hex(encrypt('aes-128-cbc', 'text', 'keykeykeykeykeyk', ''));
 SELECT decrypt('aes-128-cbc', encrypt('aes-128-cbc', 'text', 'keykeykeykeykeyk', ''), 'keykeykeykeykeyk', '');
diff --git a/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
index cefa672777c..bfc815c8863 100644
--- a/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DATE(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql b/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
index 4f4aef09259..3378f782d03 100644
--- a/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT INET6_NTOA(toFixedString(unhex('2A0206B8000000000000000000000011'), 16));
 SELECT hex(INET6_ATON('2a02:6b8::11'));
 SELECT INET_NTOA(toUInt32(1337));
diff --git a/tests/queries/0_stateless/01666_blns_long.sql b/tests/queries/0_stateless/01666_blns_long.sql
index 19caf45832f..fd959cf0a73 100644
--- a/tests/queries/0_stateless/01666_blns_long.sql
+++ b/tests/queries/0_stateless/01666_blns_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, no-fasttest
+-- Tag no-fasttest: JSON functions
+
 -- https://github.com/minimaxir/big-list-of-naughty-strings
 
 /*
diff --git a/tests/queries/0_stateless/01667_aes_args_check.sql b/tests/queries/0_stateless/01667_aes_args_check.sql
index b1d7088c956..fc271e8aca1 100644
--- a/tests/queries/0_stateless/01667_aes_args_check.sql
+++ b/tests/queries/0_stateless/01667_aes_args_check.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT encrypt('aes-128-ecb', [1, -1, 0, NULL], 'text'); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
index bdde3e7b825..c6b0cb84f35 100644
--- a/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT MONTH(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql b/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
index b1a85754fce..7d42358bbc6 100644
--- a/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
+++ b/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 CREATE TEMPORARY TABLE test ("\\" String DEFAULT '\r\n\t\\' || '
 ');
 
diff --git a/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
index afd79e2c1ba..31088b5dd5f 100644
--- a/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT YEAR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql b/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
index 2d75764c0fa..32e7dc17479 100644
--- a/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
+++ b/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE database_dictionary_test_key_expression;
 
 CREATE TABLE database_dictionary_test_key_expression.test_for_dictionary (value String) ENGINE=TinyLog;
diff --git a/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
index 1415c895290..0e85b61070b 100644
--- a/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
+++ b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists dist_01670;
 drop table if exists data_01670;
 
diff --git a/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
index ae2bdb46412..87cdc00fe29 100644
--- a/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT REPEAT('Test', 3);
diff --git a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
index 641eba2d8fa..93c4451524c 100755
--- a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
+++ b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
index 369f2b47723..9c9965c8fce 100644
--- a/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT QUARTER(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
index 0306fde14cd..3438b598413 100644
--- a/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT SECOND(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
index 5d188b5b95b..a4f1427e0c3 100644
--- a/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT MINUTE(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
index ee75f675eb3..c9a7c3e55b1 100755
--- a/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
+++ b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql b/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
index c98cb0a5e0f..caa3e976017 100644
--- a/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
+++ b/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT dictGet('simple_executable_cache_dictionary_no_implicit_key', 'value', toUInt64(1));
 SELECT dictGet('simple_executable_cache_dictionary_implicit_key', 'value', toUInt64(1));
 
diff --git a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
index 5687fe323d0..e373f632155 100755
--- a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
+++ b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, distributed
 
 # NOTE: $SECONDS accuracy is second, so we need some delta, hence -1 in time conditions.
 
diff --git a/tests/queries/0_stateless/01676_dictget_in_default_expression.sql b/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
index cd4feaf5709..54e46a2b718 100644
--- a/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
+++ b/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01676 SYNC;
 
 CREATE DATABASE test_01676;
diff --git a/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
index c8cfe0084cd..9537326d0cd 100755
--- a/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
+++ b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
index 455e850b239..e933d599bd2 100644
--- a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
+++ b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_range_dict;
 
 CREATE DATABASE database_for_range_dict;
diff --git a/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
index f200ead341b..c6133e7a5ee 100644
--- a/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01681_database_for_cache_dictionary;
 CREATE DATABASE 01681_database_for_cache_dictionary;
 
diff --git a/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh b/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
index 0bbf8942c1a..2b4cd1a5f01 100755
--- a/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
+++ b/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-fasttest
+# Tag no-fasttest: Hyperscan
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
diff --git a/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
index 4cc83412457..dbbbf8ad454 100644
--- a/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01682_database_for_cache_dictionary;
 CREATE DATABASE 01682_database_for_cache_dictionary;
 
diff --git a/tests/queries/0_stateless/01683_codec_encrypted.reference b/tests/queries/0_stateless/01683_codec_encrypted.reference
index 0d30be781e5..4bed8ab92b8 100644
--- a/tests/queries/0_stateless/01683_codec_encrypted.reference
+++ b/tests/queries/0_stateless/01683_codec_encrypted.reference
@@ -1 +1,2 @@
 1	Some plaintext
+1	Some plaintext
diff --git a/tests/queries/0_stateless/01683_codec_encrypted.sql b/tests/queries/0_stateless/01683_codec_encrypted.sql
index ec90e6c3129..d3ba1bb5e69 100644
--- a/tests/queries/0_stateless/01683_codec_encrypted.sql
+++ b/tests/queries/0_stateless/01683_codec_encrypted.sql
@@ -1,5 +1,15 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 DROP TABLE IF EXISTS encryption_test;
-CREATE TABLE encryption_test (i Int, s String Codec(Encrypted('AES-128-GCM-SIV'))) ENGINE = MergeTree ORDER BY i;
+CREATE TABLE encryption_test (i Int, s String Codec(AES_128_GCM_SIV)) ENGINE = MergeTree ORDER BY i;
+
+INSERT INTO encryption_test VALUES (1, 'Some plaintext');
+SELECT * FROM encryption_test;
+
+DROP TABLE encryption_test;
+
+CREATE TABLE encryption_test (i Int, s String Codec(AES_256_GCM_SIV)) ENGINE = MergeTree ORDER BY i;
 
 INSERT INTO encryption_test VALUES (1, 'Some plaintext');
 SELECT * FROM encryption_test;
diff --git a/tests/queries/0_stateless/01683_flat_dictionary.sql b/tests/queries/0_stateless/01683_flat_dictionary.sql
index c9f864c6a16..f65695219a5 100644
--- a/tests/queries/0_stateless/01683_flat_dictionary.sql
+++ b/tests/queries/0_stateless/01683_flat_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01681_database_for_flat_dictionary;
 CREATE DATABASE 01681_database_for_flat_dictionary;
 
diff --git a/tests/queries/0_stateless/01683_text_log_deadlock.sh b/tests/queries/0_stateless/01683_text_log_deadlock.sh
index ee772bffa27..debb7a0017f 100755
--- a/tests/queries/0_stateless/01683_text_log_deadlock.sh
+++ b/tests/queries/0_stateless/01683_text_log_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01684_insert_specify_shard_id.sql b/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
index 712fbfcc506..830f987e811 100644
--- a/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
+++ b/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS x;
 DROP TABLE IF EXISTS x_dist;
 DROP TABLE IF EXISTS y;
diff --git a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
index 3e6b5146a80..5a030bfdfaf 100755
--- a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
+++ b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01685_json_extract_double_as_float.sql b/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
index c9aa2518085..ffbddf43907 100644
--- a/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
+++ b/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 WITH '{ "v":1.1}' AS raw
 SELECT
     JSONExtract(raw, 'v', 'float') AS float32_1,
diff --git a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
index 82344a64e99..7f47ce1438f 100755
--- a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
+++ b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01686_rocksdb.sql b/tests/queries/0_stateless/01686_rocksdb.sql
index 23baf249d1f..ad6f56772b0 100644
--- a/tests/queries/0_stateless/01686_rocksdb.sql
+++ b/tests/queries/0_stateless/01686_rocksdb.sql
@@ -1,3 +1,7 @@
+-- Tags: no-ordinary-database, no-fasttest
+-- Tag no-ordinary-database: Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
+-- Tag no-fasttest: In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
+
 DROP TABLE IF EXISTS 01686_test;
 
 CREATE TABLE 01686_test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
diff --git a/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql b/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
index a147952dfe1..cf4bc7650e7 100644
--- a/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
+++ b/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS sample_table;
 
 CREATE TABLE sample_table (
diff --git a/tests/queries/0_stateless/01702_system_query_log.reference b/tests/queries/0_stateless/01702_system_query_log.reference
index 1f329feac22..c9d75db01c0 100644
--- a/tests/queries/0_stateless/01702_system_query_log.reference
+++ b/tests/queries/0_stateless/01702_system_query_log.reference
@@ -42,7 +42,7 @@ Alter	ALTER TABLE sqllt.table DROP COLUMN the_new_col;
 Alter	ALTER TABLE sqllt.table UPDATE i = i + 1 WHERE 1;
 Alter	ALTER TABLE sqllt.table DELETE WHERE i > 65535;
 Select	-- not done, seems to hard, so I\'ve skipped queries of ALTER-X, where X is:\n-- PARTITION\n-- ORDER BY\n-- SAMPLE BY\n-- INDEX\n-- CONSTRAINT\n-- TTL\n-- USER\n-- QUOTA\n-- ROLE\n-- ROW POLICY\n-- SETTINGS PROFILE\n\nSELECT \'SYSTEM queries\';
-System	SYSTEM FLUSH LOGS;
+System	SYSTEM FLUSH LOGS
 System	SYSTEM STOP MERGES sqllt.table
 System	SYSTEM START MERGES sqllt.table
 System	SYSTEM STOP TTL MERGES sqllt.table
diff --git a/tests/queries/0_stateless/01702_system_query_log.sql b/tests/queries/0_stateless/01702_system_query_log.sql
index e3ebf97edb7..f40b2604645 100644
--- a/tests/queries/0_stateless/01702_system_query_log.sql
+++ b/tests/queries/0_stateless/01702_system_query_log.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- fire all kinds of queries and then check if those are present in the system.query_log
 SET log_comment='system.query_log logging test';
 
diff --git a/tests/queries/0_stateless/01710_join_use_nulls.reference b/tests/queries/0_stateless/01707_join_use_nulls.reference
similarity index 100%
rename from tests/queries/0_stateless/01710_join_use_nulls.reference
rename to tests/queries/0_stateless/01707_join_use_nulls.reference
diff --git a/tests/queries/0_stateless/01710_join_use_nulls.sql b/tests/queries/0_stateless/01707_join_use_nulls.sql
similarity index 100%
rename from tests/queries/0_stateless/01710_join_use_nulls.sql
rename to tests/queries/0_stateless/01707_join_use_nulls.sql
diff --git a/tests/queries/0_stateless/01710_normal_projections.reference b/tests/queries/0_stateless/01710_normal_projections.reference
index a935f5b71d8..22ee679ce53 100644
--- a/tests/queries/0_stateless/01710_normal_projections.reference
+++ b/tests/queries/0_stateless/01710_normal_projections.reference
@@ -100,3 +100,4 @@ optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
 		"rows_read": 100,
 optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
 		"rows_read": 100,
+50
diff --git a/tests/queries/0_stateless/01710_normal_projections.sh b/tests/queries/0_stateless/01710_normal_projections.sh
index 6b16021de17..70e38b3722a 100755
--- a/tests/queries/0_stateless/01710_normal_projections.sh
+++ b/tests/queries/0_stateless/01710_normal_projections.sh
@@ -77,4 +77,7 @@ echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x FORMAT JSON
                        SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1" | grep rows_read
 
+$CLICKHOUSE_CLIENT -q "ALTER TABLE test_sort_proj DELETE WHERE x % 2 = 0 SETTINGS mutations_sync=2;"
+$CLICKHOUSE_CLIENT -q "SELECT count() from test_sort_proj;"
+
 $CLICKHOUSE_CLIENT -q "DROP TABLE test_sort_proj"
diff --git a/tests/queries/0_stateless/01710_projection_array_join.reference b/tests/queries/0_stateless/01710_projection_array_join.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_array_join.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/01710_projection_array_join.sql b/tests/queries/0_stateless/01710_projection_array_join.sql
new file mode 100644
index 00000000000..cd18d9282b9
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_array_join.sql
@@ -0,0 +1,11 @@
+set allow_experimental_projection_optimization = 1;
+
+drop table if exists x;
+
+create table x (pk int, arr Array(int), projection p (select arr order by pk)) engine MergeTree order by tuple();
+
+insert into x values (1, [2]);
+
+select a from x array join arr as a;
+
+drop table x;
diff --git a/tests/queries/0_stateless/01710_projection_fetch_long.sql b/tests/queries/0_stateless/01710_projection_fetch_long.sql
index 09750a72289..6c41c69254e 100644
--- a/tests/queries/0_stateless/01710_projection_fetch_long.sql
+++ b/tests/queries/0_stateless/01710_projection_fetch_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists tp_1;
 drop table if exists tp_2;
 
diff --git a/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.reference b/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql b/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
new file mode 100644
index 00000000000..734aa659146
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
@@ -0,0 +1,9 @@
+drop table if exists t;
+
+create table t (x UInt32) engine = MergeTree order by tuple() settings index_granularity = 8;
+insert into t select number from numbers(100);
+alter table t add projection p (select uniqHLL12(x));
+insert into t select number + 100 from numbers(100);
+select uniqHLL12(x) from t settings allow_experimental_projection_optimization = 1, max_bytes_to_read=400, max_block_size=8; -- { serverError 307; }
+
+drop table if exists t;
diff --git a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
index 475e8372fc6..fa734b605cd 100644
--- a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
+++ b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists projection_test;
 
 create table projection_test (dt DateTime, cost Int64, projection p (select toStartOfMinute(dt) dt_m, sum(cost) group by dt_m)) engine MergeTree partition by toDate(dt) order by dt;
diff --git a/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql b/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
index 71898bdedcb..1709a2d412a 100644
--- a/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
+++ b/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS ttl_table;
 
 CREATE TABLE ttl_table
diff --git a/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql b/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
index c0335ae3753..dad5cdbf1f3 100644
--- a/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS i20203_1;
 DROP TABLE IF EXISTS i20203_2;
 
diff --git a/tests/queries/0_stateless/01717_global_with_subquery_fix.sql b/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
index 14c4ac3e4ca..eaebbe1163e 100644
--- a/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
+++ b/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
@@ -1 +1,3 @@
+-- Tags: global
+
 WITH (SELECT count(distinct colU) from tabA) AS withA, (SELECT count(distinct colU) from tabA) AS withB SELECT withA / withB AS ratio FROM (SELECT date AS period, colX FROM (SELECT date, if(colA IN (SELECT colB FROM tabC), 0, colA) AS colX FROM tabB) AS tempB GROUP BY period, colX) AS main; -- {serverError 60}
diff --git a/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql b/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
index a0a4fbbfab9..216a6284508 100644
--- a/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
+++ b/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01720_dictionary_db;
 CREATE DATABASE 01720_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql b/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
index 0451d455009..272bd2d7104 100644
--- a/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
+++ b/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set allow_experimental_bigint_types=1;
 drop database if exists db_01721;
 drop table if exists db_01721.table_decimal_dict;
diff --git a/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql b/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
index 079b2546a20..fb61931d738 100644
--- a/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
+++ b/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: user_files
+
 DROP TABLE IF EXISTS test;
 
 INSERT INTO TABLE FUNCTION file('01721_file/test/data.TSV', 'TSV', 'id UInt32') VALUES (1);
diff --git a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2 b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
index 4479f507046..8c3ed03fce7 100644
--- a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
+++ b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 
diff --git a/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
index a187d778fdb..7295537a2d2 100755
--- a/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql b/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
index e43b81dca48..7f36bcb6c8a 100644
--- a/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
+++ b/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, distributed
+
 drop table if exists data_01730;
 
 -- does not use 127.1 due to prefer_localhost_replica
diff --git a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
index b7dd76760d4..5bb10220f7f 100755
--- a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
+++ b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 unset CLICKHOUSE_LOG_COMMENT
 
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
index a4fd7529ab2..d83656e0e8c 100755
--- a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
index cad7b5803d4..4648889ca27 100644
--- a/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
+++ b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS fuse_tbl;
 CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
 INSERT INTO fuse_tbl SELECT number, number + 1 FROM numbers(1, 20);
 
-SET optimize_fuse_sum_count_avg = 1;
+SET optimize_syntax_fuse_functions = 1;
 SELECT sum(a), sum(b), count(b) from fuse_tbl;
 EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b) from fuse_tbl;
 SELECT '---------NOT trigger fuse--------';
diff --git a/tests/queries/0_stateless/01746_executable_pool_dictionary.sql b/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
index aa59d209b51..69c37d127dc 100644
--- a/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
+++ b/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'executable_pool_simple';
 
 SELECT dictGet('executable_pool_simple', 'a', toUInt64(1));
diff --git a/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
index 7a2343a953a..feaf4bcf623 100755
--- a/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
index f520a21e9b3..02943cad583 100755
--- a/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
index 033a66a477f..09a85baada6 100644
--- a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS report;
 
 CREATE TABLE report
diff --git a/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
index 6c6d33c7d43..fb3b7e20e98 100644
--- a/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
+++ b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'executable_pool_simple_implicit_key';
 
 SELECT dictGet('executable_pool_simple_implicit_key', 'a', toUInt64(1));
diff --git a/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql b/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
index b43fa336485..738c12f00ac 100644
--- a/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
+++ b/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists summing_table01747;
 drop view if exists rates01747;
 drop view if exists agg_view01747;
diff --git a/tests/queries/0_stateless/01747_system_session_log_long.reference b/tests/queries/0_stateless/01747_system_session_log_long.reference
new file mode 100644
index 00000000000..9ecf7e05421
--- /dev/null
+++ b/tests/queries/0_stateless/01747_system_session_log_long.reference
@@ -0,0 +1,218 @@
+
+#  no_password - User with profile from XML 
+TCP endpoint
+TCP 'wrong password' case is skipped for no_password.
+HTTP endpoint
+HTTP 'wrong password' case is skipped for no_password.
+MySQL endpoint
+MySQL 'wrong password' case is skipped for no_password.
+
+#  no_password - No profiles no roles 
+TCP endpoint
+TCP 'wrong password' case is skipped for no_password.
+HTTP endpoint
+HTTP 'wrong password' case is skipped for no_password.
+MySQL endpoint
+MySQL 'wrong password' case is skipped for no_password.
+
+#  no_password - Two profiles, no roles 
+TCP endpoint
+TCP 'wrong password' case is skipped for no_password.
+HTTP endpoint
+HTTP 'wrong password' case is skipped for no_password.
+MySQL endpoint
+MySQL 'wrong password' case is skipped for no_password.
+
+#  no_password - Two profiles and two simple roles 
+TCP endpoint
+TCP 'wrong password' case is skipped for no_password.
+HTTP endpoint
+HTTP 'wrong password' case is skipped for no_password.
+MySQL endpoint
+MySQL 'wrong password' case is skipped for no_password.
+
+#  plaintext_password - No profiles no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  plaintext_password - Two profiles, no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  plaintext_password - Two profiles and two simple roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  sha256_password - No profiles no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+MySQL 'successful login' case is skipped for sha256_password.
+
+#  sha256_password - Two profiles, no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+MySQL 'successful login' case is skipped for sha256_password.
+
+#  sha256_password - Two profiles and two simple roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+MySQL 'successful login' case is skipped for sha256_password.
+
+#  double_sha1_password - No profiles no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  double_sha1_password - Two profiles, no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  double_sha1_password - Two profiles and two simple roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	TCP	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	HTTP	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	MySQL	Logout	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	TCP	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	HTTP	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	MySQL	Logout	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	TCP	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	HTTP	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	MySQL	Logout	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	TCP	Logout	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	HTTP	Logout	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_no_password_no_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_no_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_no_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_no_password_two_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_two_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_two_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_no_password_two_profiles_two_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_two_profiles_two_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_sha256_password_no_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_no_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_no_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_two_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_two_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_session_log_test_xml_user	TCP	LoginFailure	1
+invalid_session_log_test_xml_user	HTTP	LoginFailure	1
+invalid_session_log_test_xml_user	MySQL	LoginFailure	many
+session_log_test_xml_user	TCP	LoginSuccess	1
+session_log_test_xml_user	TCP	Logout	1
+session_log_test_xml_user	HTTP	LoginSuccess	1
+session_log_test_xml_user	HTTP	Logout	1
+session_log_test_xml_user	MySQL	LoginSuccess	1
+session_log_test_xml_user	MySQL	Logout	1
diff --git a/tests/queries/0_stateless/01747_system_session_log_long.sh b/tests/queries/0_stateless/01747_system_session_log_long.sh
new file mode 100755
index 00000000000..b41bf077b57
--- /dev/null
+++ b/tests/queries/0_stateless/01747_system_session_log_long.sh
@@ -0,0 +1,372 @@
+#!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
+# Tag no-fasttest: Accesses CH via mysql table function (which is unavailable)
+
+##################################################################################################
+# Verify that login, logout, and login failure events are properly stored in system.session_log
+# when different `IDENTIFIED BY` clauses are used on user.
+#
+# Make sure that system.session_log entries are non-empty and provide enough info on each event.
+#
+# Using multiple protocols
+# * native TCP protocol with CH client
+# * HTTP with CURL
+# * MySQL - CH server accesses itself via mysql table function, query typically fails (unrelated)
+#   but auth should be performed properly.
+# * PostgreSQL - CH server accesses itself via postgresql table function (currently out of order).
+# * gRPC - not done yet
+#
+# There is way to control how many time a query (e.g. via mysql table function) is retried
+# and hence variable number of records in session_log. To mitigate this and simplify final query,
+# each auth_type is tested for separate user. That way SELECT DISTINCT doesn't exclude log entries
+# from different cases.
+#
+# All created users added to the ALL_USERNAMES and later cleaned up.
+##################################################################################################
+
+# To minimize amount of error context sent on failed queries when talking to CH via MySQL protocol.
+export CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -eu
+
+# Since there is no way to cleanup system.session_log table,
+# make sure that we can identify log entries from this test by a random user name.
+readonly BASE_USERNAME="session_log_test_user_$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 32)"
+readonly TMP_QUERY_FILE=$(mktemp /tmp/tmp_query.log.XXXXXX)
+declare -a ALL_USERNAMES
+ALL_USERNAMES+=("${BASE_USERNAME}")
+
+function reportError()
+{
+    if [ -s "${TMP_QUERY_FILE}" ] ;
+    then
+        echo "!!!!!! ERROR ${CLICKHOUSE_CLIENT} ${*} --queries-file ${TMP_QUERY_FILE}" >&2
+        echo "query:" >&2
+        cat "${TMP_QUERY_FILE}" >&2
+        rm -f "${TMP_QUERY_FILE}"
+    fi
+}
+
+function executeQuery()
+{
+    ## Execute query (provided via heredoc or herestring) and print query in case of error.
+    trap 'rm -f ${TMP_QUERY_FILE}; trap - ERR RETURN' RETURN
+    # Since we want to report with current values supplied to this function call
+    # shellcheck disable=SC2064
+    trap "reportError $*" ERR
+
+    cat - > "${TMP_QUERY_FILE}"
+    ${CLICKHOUSE_CLIENT} "${@}" --queries-file "${TMP_QUERY_FILE}"
+}
+
+function cleanup()
+{
+    local usernames_to_cleanup
+    usernames_to_cleanup="$(IFS=, ; echo "${ALL_USERNAMES[*]}")"
+    executeQuery <<EOF
+DROP USER IF EXISTS ${usernames_to_cleanup};
+DROP SETTINGS PROFILE IF EXISTS session_log_test_profile;
+DROP SETTINGS PROFILE IF EXISTS session_log_test_profile2;
+DROP ROLE IF EXISTS session_log_test_role;
+DROP ROLE IF EXISTS session_log_test_role2;
+EOF
+}
+
+cleanup
+trap "cleanup" EXIT
+
+function executeQueryExpectError()
+{
+    cat - > "${TMP_QUERY_FILE}"
+    ! ${CLICKHOUSE_CLIENT} "${@}" --multiquery --queries-file "${TMP_QUERY_FILE}" 2>&1 | tee -a ${TMP_QUERY_FILE}
+}
+
+function createUser()
+{
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+
+    if [[ "${auth_type}" == "no_password" ]]
+    then
+        password=""
+
+    elif [[ "${auth_type}" == "plaintext_password" ]]
+    then
+        password="${password}"
+
+    elif [[ "${auth_type}" == "sha256_password" ]]
+    then
+        password="$(executeQuery <<< "SELECT hex(SHA256('${password}'))")"
+
+    elif [[ "${auth_type}" == "double_sha1_password" ]]
+    then
+        password="$(executeQuery <<< "SELECT hex(SHA1(SHA1('${password}')))")"
+
+    else
+        echo "Invalid auth_type: ${auth_type}" >&2
+        exit 1
+    fi
+
+    export RESULTING_PASS="${password}"
+    if [ -n "${password}" ]
+    then
+        password="BY '${password}'"
+    fi
+
+    executeQuery <<EOF
+DROP USER IF EXISTS '${username}';
+CREATE USER '${username}' IDENTIFIED WITH ${auth_type} ${password};
+EOF
+    ALL_USERNAMES+=("${username}")
+}
+
+function testTCP()
+{
+    echo "TCP endpoint"
+
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+
+    # Loging\Logout
+    if [[ -n "${password}" ]]
+    then
+        executeQuery -u "${username}" --password "${password}" <<< "SELECT 1 FORMAT Null;"
+    else
+        executeQuery -u "${username}" <<< "SELECT 1 FORMAT Null;" 
+    fi
+
+    # Wrong username
+    executeQueryExpectError -u "invalid_${username}" \
+        <<< "SELECT 1 Format Null" \
+        | grep -Eq "Code: 516. .+ invalid_${username}: Authentication failed: password is incorrect or there is no user with such name"
+
+    # Wrong password
+    if [[ "${auth_type}" == "no_password" ]]
+    then
+        echo "TCP 'wrong password' case is skipped for ${auth_type}."
+    else
+        # user with `no_password` user is able to login with any password, so it makes sense to skip this testcase.
+        executeQueryExpectError -u "${username}" --password  "invalid_${password}" \
+            <<< "SELECT 1 Format Null" \
+            | grep -Eq "Code: 516. .+ ${username}: Authentication failed: password is incorrect or there is no user with such name"
+    fi
+}
+
+function testHTTPWithURL()
+{
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+    local clickhouse_url="${4}"
+
+    # Loging\Logout
+    ${CLICKHOUSE_CURL} -sS "${clickhouse_url}" \
+        -H "X-ClickHouse-User: ${username}" -H "X-ClickHouse-Key: ${password}" \
+        -d 'SELECT 1 Format Null'
+
+    # Wrong username
+    ${CLICKHOUSE_CURL} -sS "${clickhouse_url}" \
+        -H "X-ClickHouse-User: invalid_${username}" -H "X-ClickHouse-Key: ${password}" \
+        -d 'SELECT 1 Format Null' \
+        | grep -Eq "Code: 516. .+ invalid_${username}: Authentication failed: password is incorrect or there is no user with such name"
+
+    # Wrong password
+    if [[ "${auth_type}" == "no_password" ]]
+    then
+        echo "HTTP 'wrong password' case is skipped for ${auth_type}."
+    else
+        # user with `no_password` is able to login with any password, so it makes sense to skip this testcase.
+        ${CLICKHOUSE_CURL} -sS "${clickhouse_url}" \
+            -H "X-ClickHouse-User: ${username}" -H "X-ClickHouse-Key: invalid_${password}" \
+            -d 'SELECT 1 Format Null' \
+            | grep -Eq "Code: 516. .+ ${username}: Authentication failed: password is incorrect or there is no user with such name"
+    fi
+}
+
+function testHTTP()
+{
+    echo "HTTP endpoint"
+    testHTTPWithURL "${1}" "${2}" "${3}" "${CLICKHOUSE_URL}"
+}
+
+function testHTTPNamedSession()
+{
+    # echo "HTTP endpoint with named session"
+    local HTTP_SESSION_ID
+    HTTP_SESSION_ID="session_id_$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 32)"
+    if [ -v CLICKHOUSE_URL_PARAMS ]
+    then
+        CLICKHOUSE_URL_WITH_SESSION_ID="${CLICKHOUSE_URL}&session_id=${HTTP_SESSION_ID}"
+    else
+        CLICKHOUSE_URL_WITH_SESSION_ID="${CLICKHOUSE_URL}?session_id=${HTTP_SESSION_ID}"
+    fi
+
+    testHTTPWithURL "${1}" "${2}" "${3}" "${CLICKHOUSE_URL_WITH_SESSION_ID}"
+}
+
+function testMySQL()
+{
+    echo "MySQL endpoint"
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+
+    trap "reportError" ERR
+
+    # echo 'Loging\Logout'
+    # sha256 auth is done differenctly for MySQL, so skip it for now.
+    if [[ "${auth_type}" == "sha256_password" ]]
+    then
+        echo "MySQL 'successful login' case is skipped for ${auth_type}."
+    else
+        # CH is able to log into itself via MySQL protocol but query fails.
+        executeQueryExpectError \
+            <<< "SELECT 1 FROM mysql('127.0.0.1:9004', 'system', 'numbers', '${username}', '${password}') LIMIT 1 \
+            FORMAT NUll" \
+            | grep -Eq "Code: 1000\. DB::Exception: .*"
+    fi
+
+    # echo 'Wrong username'
+    executeQueryExpectError \
+        <<< "SELECT 1 FROM mysql('127.0.0.1:9004', 'system', 'numbers', 'invalid_${username}', '${password}') LIMIT 1 \
+        FORMAT NUll" \
+        | grep -Eq "Code: 1000\. DB::Exception: .* invalid_${username}"
+
+    # echo 'Wrong password'
+    if [[ "${auth_type}" == "no_password" ]]
+    then
+        echo "MySQL 'wrong password' case is skipped for ${auth_type}."
+    else
+        # user with `no_password` is able to login with any password, so it makes sense to skip this testcase.
+        executeQueryExpectError \
+            <<< "SELECT 1 FROM mysql('127.0.0.1:9004', 'system', 'numbers', '${username}', 'invalid_${password}') LIMIT 1 \
+            FORMAT NUll" \
+            | grep -Eq "Code: 1000\. DB::Exception: .* ${username}"
+    fi
+}
+
+# function testPostgreSQL()
+# {
+#     local auth_type="${1}"
+#
+#     # Right now it is impossible to log into CH via PostgreSQL protocol without a password.
+#     if [[ "${auth_type}" == "no_password" ]]
+#     then
+#         return 0
+#     fi
+#
+#     # Loging\Logout
+#     # CH is being able to log into itself via PostgreSQL protocol but query fails.
+#     executeQueryExpectError \
+#         <<< "SELECT 1 FROM postgresql('localhost:9005', 'system', 'numbers', '${username}', '${password}') LIMIT 1 FORMAT NUll" \
+#         | grep -Eq "Code: 1001. DB::Exception: .* pqxx::broken_connection: .*"
+#
+#     # Wrong username
+#     executeQueryExpectError \
+#         <<< "SELECT 1 FROM postgresql('localhost:9005', 'system', 'numbers', 'invalid_${username}', '${password}') LIMIT 1 FORMAT NUll" \
+#         | grep -Eq "Code: 1001. DB::Exception: .* pqxx::broken_connection: .*"
+#
+#     # Wrong password
+#     executeQueryExpectError \
+#         <<< "SELECT 1 FROM postgresql('localhost:9005', 'system', 'numbers', '${username}', 'invalid_${password}') LIMIT 1 FORMAT NUll" \
+#         | grep -Eq "Code: 1001. DB::Exception: .* pqxx::broken_connection: .*"
+# }
+
+function runEndpointTests()
+{
+    local case_name="${1}"
+    shift 1
+
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+    local setup_queries="${4:-}"
+
+    echo 
+    echo "#  ${auth_type} - ${case_name} "
+
+    ${CLICKHOUSE_CLIENT} -q "SET log_comment='${username} ${auth_type} - ${case_name}';"
+    if [[ -n "${setup_queries}" ]]
+    then
+        # echo "Executing setup queries: ${setup_queries}"
+        echo "${setup_queries}" | executeQuery --multiquery
+    fi
+
+    testTCP "${auth_type}" "${username}" "${password}"
+    testHTTP "${auth_type}" "${username}" "${password}"
+
+    # testHTTPNamedSession "${auth_type}" "${username}" "${password}"
+    testMySQL "${auth_type}" "${username}" "${password}"
+    # testPostgreSQL "${auth_type}" "${username}" "${password}"
+}
+
+function testAsUserIdentifiedBy()
+{
+    local auth_type="${1}"
+    local password="password"
+
+    cleanup
+
+    local username="${BASE_USERNAME}_${auth_type}_no_profiles_no_roles"
+    createUser "${auth_type}" "${username}" "${password}"
+    runEndpointTests "No profiles no roles" "${auth_type}" "${username}" "${RESULTING_PASS}"
+
+    username="${BASE_USERNAME}_${auth_type}_two_profiles_no_roles"
+    createUser "${auth_type}" "${username}" "${password}"
+    runEndpointTests "Two profiles, no roles" "${auth_type}" "${username}" "${RESULTING_PASS}" "\
+DROP SETTINGS PROFILE IF EXISTS session_log_test_profile;
+DROP SETTINGS PROFILE IF EXISTS session_log_test_profile2;
+CREATE PROFILE session_log_test_profile SETTINGS max_memory_usage=10000000 TO ${username};
+CREATE PROFILE session_log_test_profile2 SETTINGS max_rows_to_transfer=1000 TO ${username};
+"
+
+    username="${BASE_USERNAME}_${auth_type}_two_profiles_two_roles"
+    createUser "${auth_type}" "${username}" "${password}"
+    runEndpointTests "Two profiles and two simple roles" "${auth_type}" "${username}" "${RESULTING_PASS}" "\
+CREATE ROLE session_log_test_role;
+GRANT session_log_test_role TO ${username};
+CREATE ROLE session_log_test_role2 SETTINGS max_columns_to_read=100;
+GRANT session_log_test_role2 TO ${username};
+SET DEFAULT ROLE session_log_test_role, session_log_test_role2 TO ${username};
+"
+}
+
+# to cut off previous runs
+readonly start_time="$(executeQuery <<< 'SELECT now64(6);')"
+
+# Special case: user and profile are both defined in XML
+runEndpointTests "User with profile from XML" "no_password" "session_log_test_xml_user" ''
+
+testAsUserIdentifiedBy "no_password"
+testAsUserIdentifiedBy "plaintext_password"
+testAsUserIdentifiedBy "sha256_password"
+testAsUserIdentifiedBy "double_sha1_password"
+
+executeQuery --multiquery <<EOF
+SYSTEM FLUSH LOGS;
+
+WITH
+    now64(6) as n,
+    toDateTime64('${start_time}', 3) as test_start_time
+SELECT
+    replaceAll(user, '${BASE_USERNAME}', '\${BASE_USERNAME}') as user_name,
+    interface,
+    type,
+    if(count(*) > 1, 'many', toString(count(*))) -- do not rely on count value since MySQL does arbitrary number of retries
+FROM
+    system.session_log
+WHERE
+    (user LIKE '%session_log_test_xml_user%' OR user LIKE '%${BASE_USERNAME}%')
+    AND
+    event_time_microseconds >= test_start_time
+GROUP BY
+    user_name, interface, type
+ORDER BY
+    user_name, interface, type;
+EOF
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01748_dictionary_table_dot.sql b/tests/queries/0_stateless/01748_dictionary_table_dot.sql
index a974786f446..a2364fdf823 100644
--- a/tests/queries/0_stateless/01748_dictionary_table_dot.sql
+++ b/tests/queries/0_stateless/01748_dictionary_table_dot.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01748;
 CREATE DATABASE test_01748;
 USE test_01748;
diff --git a/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
index a6936aec913..c6af23bd1db 100644
--- a/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
+++ b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- this is enough to trigger the regression
 SELECT throwIf(dummy = 0) FROM remote('127.1', system.one); -- { serverError 395 }
 
diff --git a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
index afd91ffdaa5..86af09f391d 100644
--- a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01753_dictionary_db;
 CREATE DATABASE 01753_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
index d3046e73b93..40567f944df 100755
--- a/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
+++ b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
index 833f86c538d..59e0ca60f8f 100644
--- a/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
+++ b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, shard
+
 SELECT _shard_num FROM cluster('test_shard_localhost', system.one);
 SELECT _shard_num FROM clusterAllReplicas('test_shard_localhost', system.one);
 
diff --git a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
index 51b29457011..a695302161d 100644
--- a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01754_dictionary_db;
 CREATE DATABASE 01754_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
index 5543af4dd05..89c4bec3dca 100755
--- a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
+++ b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql b/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
index 0e93d76573c..1633665610a 100644
--- a/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
+++ b/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_01755;
diff --git a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
index ea7d526c039..efde0ac1e60 100644
--- a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- NOTE: this test cannot use 'current_database = currentDatabase()',
 -- because it does not propagated via remote queries,
 -- hence it uses 'with (select currentDatabase()) as X'
diff --git a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
index 68247dbfbe5..fd19e17b6bb 100644
--- a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
+++ b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists dist_01757;
 create table dist_01757 as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
 
diff --git a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
index d18ea8694a9..b963f3a618f 100755
--- a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
+++ b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
 
diff --git a/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
index 11a52976716..59f20ca7a51 100644
--- a/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
+++ b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01759_db;
 CREATE DATABASE 01759_db;
 
diff --git a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
index 08b9581ace2..937bd1c0c63 100644
--- a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
+++ b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- { echo }
 select * from remote('127.{1,2}', system, one, dummy)  where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
 select count() from remote('127.{1,2}', system, one, dummy)  where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
diff --git a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
index 9c405640930..55c0d1e3678 100644
--- a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
+++ b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS ddl_dictonary_test_source;
 CREATE TABLE ddl_dictonary_test_source
 (
diff --git a/tests/queries/0_stateless/01760_polygon_dictionaries.sql b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
index 0054be0642d..1589a091ee7 100644
--- a/tests/queries/0_stateless/01760_polygon_dictionaries.sql
+++ b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01760_db;
 CREATE DATABASE 01760_db;
 
diff --git a/tests/queries/0_stateless/01760_system_dictionaries.sql b/tests/queries/0_stateless/01760_system_dictionaries.sql
index f4e0cfa0086..a5609281e49 100644
--- a/tests/queries/0_stateless/01760_system_dictionaries.sql
+++ b/tests/queries/0_stateless/01760_system_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01760_db;
 CREATE DATABASE 01760_db;
 
diff --git a/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql b/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
index d1bd3b65182..5d28e8ca6b3 100644
--- a/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS test_alter_decimal;
 
 CREATE TABLE test_alter_decimal
diff --git a/tests/queries/0_stateless/01763_long_ttl_group_by.sql b/tests/queries/0_stateless/01763_long_ttl_group_by.sql
index e0c6f678f15..9e1ad574f52 100644
--- a/tests/queries/0_stateless/01763_long_ttl_group_by.sql
+++ b/tests/queries/0_stateless/01763_long_ttl_group_by.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS test_ttl_group_by01763;
 CREATE TABLE test_ttl_group_by01763
 (key UInt32, ts DateTime, value UInt32, min_value UInt32 default value, max_value UInt32 default value)
diff --git a/tests/queries/0_stateless/01763_max_distributed_depth.sql b/tests/queries/0_stateless/01763_max_distributed_depth.sql
index 89909a3bd8d..12b2e368007 100644
--- a/tests/queries/0_stateless/01763_max_distributed_depth.sql
+++ b/tests/queries/0_stateless/01763_max_distributed_depth.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS tt6;
 
 CREATE TABLE tt6
diff --git a/tests/queries/0_stateless/01764_table_function_dictionary.sql b/tests/queries/0_stateless/01764_table_function_dictionary.sql
index 0168566077d..b642fdd741e 100644
--- a/tests/queries/0_stateless/01764_table_function_dictionary.sql
+++ b/tests/queries/0_stateless/01764_table_function_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS table_function_dictionary_source_table;
 CREATE TABLE table_function_dictionary_source_table
 (
diff --git a/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
index 7502c6a93bb..db3431b1572 100644
--- a/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01765_db;
 CREATE DATABASE 01765_db;
 
diff --git a/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
index de7ab5b5a1a..1342e3d69cb 100644
--- a/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01766_db;
 CREATE DATABASE 01766_db;
 
diff --git a/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql b/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
index 8730ed0eda2..f03b1e0350a 100644
--- a/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
+++ b/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT decrypt('aes-128-gcm', 'text', 'key', 'IV'); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql b/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
index f6e1a7c9375..8e5f68c2c5f 100644
--- a/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
+++ b/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01778_db;
 CREATE DATABASE 01778_db;
 
diff --git a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
index 5673e646a47..2ea6119cef8 100644
--- a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
+++ b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01780_db;
 CREATE DATABASE 01780_db;
 
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
index 236f7b35b80..1e3b464da30 100644
--- a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS merge_tree_deduplication;
 
 CREATE TABLE merge_tree_deduplication
diff --git a/tests/queries/0_stateless/01783_http_chunk_size.sh b/tests/queries/0_stateless/01783_http_chunk_size.sh
index 66ac4dfa975..a4fa7780077 100755
--- a/tests/queries/0_stateless/01783_http_chunk_size.sh
+++ b/tests/queries/0_stateless/01783_http_chunk_size.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
+# Tag no-replicated-database: Requires investigation
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01785_dictionary_element_count.sql b/tests/queries/0_stateless/01785_dictionary_element_count.sql
index 6db65152a56..1d60fc92447 100644
--- a/tests/queries/0_stateless/01785_dictionary_element_count.sql
+++ b/tests/queries/0_stateless/01785_dictionary_element_count.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01785_db;
 CREATE DATABASE 01785_db;
 
diff --git a/tests/queries/0_stateless/01798_uniq_theta_sketch.sql b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
index 0b728d690d2..bb400c5de14 100644
--- a/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT 'uniqTheta many agrs';
 
 SELECT
diff --git a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
index 8f0b096a11d..d86575c3f0a 100644
--- a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
+++ b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-fasttest
+
 SELECT 'uniqTheta';
 
 SELECT Y, uniqTheta(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
diff --git a/tests/queries/0_stateless/01801_distinct_group_by_shard.sql b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
index ca6572b91ee..848077f05d4 100644
--- a/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
+++ b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT DISTINCT a FROM remote('127.0.0.{1,2,3}', values('a UInt8, b UInt8', (1, 2), (1, 3))) GROUP BY a, b;
diff --git a/tests/queries/0_stateless/01801_s3_cluster.sql b/tests/queries/0_stateless/01801_s3_cluster.sql
index 9c13c257249..e466b1e108e 100644
--- a/tests/queries/0_stateless/01801_s3_cluster.sql
+++ b/tests/queries/0_stateless/01801_s3_cluster.sql
@@ -1,2 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
 select * from s3('http://localhost:11111/test/{a,b,c}.tsv', 'test', 'testtest', 'TSV', 'a UInt64, b UInt64, c UInt64') ORDER BY a, b, c;
 select * from s3Cluster('test_cluster_two_shards', 'http://localhost:11111/test/{a,b,c}.tsv', 'test', 'testtest', 'TSV', 'a UInt64, b UInt64, c UInt64') ORDER BY a, b, c;
diff --git a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
index 4b3e35047bc..4713b15bb5b 100755
--- a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
+++ b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-parallel: Creates database and users
+# Tag no-fasttest: Requires postgresql-client
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
index 1aba8ef7596..77e9abfb742 100644
--- a/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
+++ b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET allow_experimental_bigint_types = 1;
 
 DROP TABLE IF EXISTS dictionary_decimal_source_table;
diff --git a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
index f2aa1f63197..a2945de5b0c 100755
--- a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
+++ b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 # NOTE: this done as not .sql since we need to Ordinary database
 # (to account threads in query_log for DROP TABLE query)
diff --git a/tests/queries/0_stateless/01811_filter_by_null.sql b/tests/queries/0_stateless/01811_filter_by_null.sql
index 496faf428ab..77d6335254e 100644
--- a/tests/queries/0_stateless/01811_filter_by_null.sql
+++ b/tests/queries/0_stateless/01811_filter_by_null.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 DROP TABLE IF EXISTS test_01344;
 
 CREATE TABLE test_01344 (x String, INDEX idx (x) TYPE set(10) GRANULARITY 1) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
diff --git a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
index c39947f2c04..668c3511d82 100644
--- a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
+++ b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- remote() does not have sharding key, while force_optimize_skip_unused_shards=2 requires from table to have it.
 -- But due to only one node, everything works.
 select * from remote('127.1', system.one) settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=2 format Null;
diff --git a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
index 722bd4af5bb..9ccea41c5cc 100644
--- a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
+++ b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS data;
 CREATE TABLE data (a Int64, b Int64) ENGINE = TinyLog();
 
diff --git a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
index 24b27e74ba5..81ed4568092 100755
--- a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
+++ b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed
+
 # shellcheck disable=SC2206
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
index 636426fcc91..c53c59df72a 100644
--- a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
+++ b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_primary_key_source_table;
 CREATE TABLE dictionary_primary_key_source_table
 (
diff --git a/tests/queries/0_stateless/01821_join_table_race_long.sh b/tests/queries/0_stateless/01821_join_table_race_long.sh
index 7c56bf77bfd..e02fe788653 100755
--- a/tests/queries/0_stateless/01821_join_table_race_long.sh
+++ b/tests/queries/0_stateless/01821_join_table_race_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01821_table_comment.sql b/tests/queries/0_stateless/01821_table_comment.sql
index 6d9218d5a42..4bd71d3e278 100644
--- a/tests/queries/0_stateless/01821_table_comment.sql
+++ b/tests/queries/0_stateless/01821_table_comment.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/01822_short_circuit.reference b/tests/queries/0_stateless/01822_short_circuit.reference
index 96c4e161244..949d2fa4985 100644
--- a/tests/queries/0_stateless/01822_short_circuit.reference
+++ b/tests/queries/0_stateless/01822_short_circuit.reference
@@ -1803,3 +1803,33 @@ Decimal32
 \N
 \N
 \N
+0
+1
+0
+1
+0
+0
+1
+1
+1
+1
+1
+1
+3
+3
+5
+5
+7
+7
+9
+9
+1
+1
+3
+3
+5
+5
+7
+7
+9
+9
diff --git a/tests/queries/0_stateless/01822_short_circuit.sql b/tests/queries/0_stateless/01822_short_circuit.sql
index fe8a0315d4a..1f0e04cb4b5 100644
--- a/tests/queries/0_stateless/01822_short_circuit.sql
+++ b/tests/queries/0_stateless/01822_short_circuit.sql
@@ -148,3 +148,8 @@ select if(isNull(x), Null, 42 / x) from (select CAST(materialize(Null), 'Nullabl
 select if(isNull(x), Null, x / 0) from (select CAST(materialize(Null), 'Nullable(Decimal32(2))') as x);
 
 select if(isNull(x), Null, intDiv(42, x)) from (select CAST(materialize(Null), 'Nullable(Int64)') as x);
+
+select number % 2 and toLowCardinality(number) from numbers(5);
+select number % 2 or toLowCardinality(number) from numbers(5);
+select if(toLowCardinality(number) % 2, number, number + 1) from numbers(10);
+select multiIf(toLowCardinality(number) % 2, number, number + 1) from numbers(10);
diff --git a/tests/queries/0_stateless/01823_explain_json.sh b/tests/queries/0_stateless/01823_explain_json.sh
index 004e85cd965..3db2dcb6dc4 100755
--- a/tests/queries/0_stateless/01823_explain_json.sh
+++ b/tests/queries/0_stateless/01823_explain_json.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql b/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
index 7f163f9ac7b..01ef768b423 100644
--- a/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
+++ b/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-parallel
+
 -- { echo }
 CREATE DATABASE IF NOT EXISTS test_01824;
 USE test_01824;
diff --git a/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
index 65422731711..7a9e9cd8838 100644
--- a/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
+++ b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collation;
 
 CREATE TABLE test_collation
diff --git a/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
index baba8b5188e..99bde21d2e5 100644
--- a/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
+++ b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS 01837_db;
 CREATE DATABASE 01837_db ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/01849_geoToS2.sql b/tests/queries/0_stateless/01849_geoToS2.sql
index eb50fa81b8a..abd084a2b19 100644
--- a/tests/queries/0_stateless/01849_geoToS2.sql
+++ b/tests/queries/0_stateless/01849_geoToS2.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 DROP TABLE IF EXISTS s2_indexes;
 
 CREATE TABLE s2_indexes (s2_index UInt64, longitude Float64, latitude Float64) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
index ab4c63ccdf2..790173013f6 100644
--- a/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
+++ b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create database if not exists shard_0;
 create database if not exists shard_1;
 
diff --git a/tests/queries/0_stateless/01851_s2_to_geo.sql b/tests/queries/0_stateless/01851_s2_to_geo.sql
index 76e4b2a5346..d833b95a62f 100644
--- a/tests/queries/0_stateless/01851_s2_to_geo.sql
+++ b/tests/queries/0_stateless/01851_s2_to_geo.sql
@@ -1,2 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2ToGeo(4573520603753570041);
 select s2ToGeo(4573517609713934091);
diff --git a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
index a51309b3ffd..09ca0e2063d 100644
--- a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
+++ b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-parallel
+
 --
 -- Simple key
 --
diff --git a/tests/queries/0_stateless/01852_s2_get_neighbours.sql b/tests/queries/0_stateless/01852_s2_get_neighbours.sql
index 8163f827697..89232c512df 100644
--- a/tests/queries/0_stateless/01852_s2_get_neighbours.sql
+++ b/tests/queries/0_stateless/01852_s2_get_neighbours.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2GetNeighbors(5074766849661468672);
diff --git a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
index 409f8d5ecf5..218320772c9 100755
--- a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
+++ b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01853_s2_cells_intersect.sql b/tests/queries/0_stateless/01853_s2_cells_intersect.sql
index 2a033a67d58..c426a86f631 100644
--- a/tests/queries/0_stateless/01853_s2_cells_intersect.sql
+++ b/tests/queries/0_stateless/01853_s2_cells_intersect.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CellsIntersect(9926595209846587392, 9926594385212866560);
 select s2CellsIntersect(9926595209846587392, 9937259648002293760);
 
diff --git a/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql b/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
index f6a9d6aa25c..34ce7ea04b5 100644
--- a/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
+++ b/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DICTIONARY IF EXISTS dict_01864;
 CREATE DICTIONARY dict_01864
 (
diff --git a/tests/queries/0_stateless/01854_s2_cap_contains.sql b/tests/queries/0_stateless/01854_s2_cap_contains.sql
index 1a8d2548352..4ee4158fdbb 100644
--- a/tests/queries/0_stateless/01854_s2_cap_contains.sql
+++ b/tests/queries/0_stateless/01854_s2_cap_contains.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CapContains(1157339245694594829, 1.0, 1157347770437378819);
 select s2CapContains(1157339245694594829, 1.0, 1152921504606846977);
 select s2CapContains(1157339245694594829, 3.14, 1157339245694594829);
diff --git a/tests/queries/0_stateless/01854_s2_cap_union.sql b/tests/queries/0_stateless/01854_s2_cap_union.sql
index 921a00ac663..9f8510fb833 100644
--- a/tests/queries/0_stateless/01854_s2_cap_union.sql
+++ b/tests/queries/0_stateless/01854_s2_cap_union.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CapUnion(3814912406305146967, 1.0, 1157347770437378819, 1.0);
 select s2CapUnion(1157339245694594829, -1.0, 1152921504606846977, -1.0);
 select s2CapUnion(1157339245694594829, toFloat64(toUInt64(-1)), 1157339245694594829, toFloat64(toUInt64(-1)));
diff --git a/tests/queries/0_stateless/01856_create_function.sql b/tests/queries/0_stateless/01856_create_function.sql
index 3dc6c9f4445..10f87f4a3df 100644
--- a/tests/queries/0_stateless/01856_create_function.sql
+++ b/tests/queries/0_stateless/01856_create_function.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE FUNCTION 01856_test_function_0 AS (a, b, c) -> a * b * c;
 SELECT 01856_test_function_0(2, 3, 4);
 SELECT isConstant(01856_test_function_0(1, 2, 3));
diff --git a/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
index d8a86b7799e..5dfdb9482ee 100644
--- a/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
+++ b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- GROUP BY _shard_num
 SELECT _shard_num, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num ORDER BY _shard_num;
 SELECT _shard_num s, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num ORDER BY _shard_num;
diff --git a/tests/queries/0_stateless/01870_buffer_flush.sql b/tests/queries/0_stateless/01870_buffer_flush.sql
index 55ec79325dc..5e60bc7e080 100644
--- a/tests/queries/0_stateless/01870_buffer_flush.sql
+++ b/tests/queries/0_stateless/01870_buffer_flush.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Check that Buffer will be flushed before shutdown
 -- (via DETACH DATABASE)
 
diff --git a/tests/queries/0_stateless/01870_modulo_partition_key.sql b/tests/queries/0_stateless/01870_modulo_partition_key.sql
index 0226bcc0a3c..06b6fc86d3e 100644
--- a/tests/queries/0_stateless/01870_modulo_partition_key.sql
+++ b/tests/queries/0_stateless/01870_modulo_partition_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'simple partition key:';
 DROP TABLE IF EXISTS table1 SYNC;
 CREATE TABLE table1 (id Int64, v UInt64)
diff --git a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
index 51c47d4ad14..806fbd05fbf 100755
--- a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
+++ b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01881_join_on_conditions.sql b/tests/queries/0_stateless/01881_join_on_conditions.sql
index a34c413845b..e074397ff5e 100644
--- a/tests/queries/0_stateless/01881_join_on_conditions.sql
+++ b/tests/queries/0_stateless/01881_join_on_conditions.sql
@@ -48,10 +48,10 @@ SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardi
 SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(toLowCardinality(t1.key2 != ''));
 
 SELECT '--';
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e; 
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e;
 -- `e + 1` is UInt16
 SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e + 1; -- { serverError 403 }
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toUInt8(e + 1); 
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toUInt8(e + 1);
 
 SELECT '--';
 SELECT t1.id, t1.key, t1.key2, t2.id, t2.key, t2.key2  FROM t1 FULL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 ORDER BY t1.id, t2.id;
@@ -110,10 +110,10 @@ SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardi
 SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(toLowCardinality(t1.key2 != ''));
 
 SELECT '--';
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e; 
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e;
 -- `e + 1` is UInt16
 SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e + 1; -- { serverError 403 }
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toUInt8(e + 1); 
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toUInt8(e + 1);
 
 SELECT '--';
 SELECT t1.id, t1.key, t1.key2, t2.id, t2.key, t2.key2  FROM t1 FULL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 ORDER BY t1.id, t2.id;
diff --git a/tests/queries/0_stateless/01883_subcolumns_distributed.sql b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
index 5593dc60251..7aedc7c8eab 100644
--- a/tests/queries/0_stateless/01883_subcolumns_distributed.sql
+++ b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS t_subcolumns_local;
 DROP TABLE IF EXISTS t_subcolumns_dist;
 
diff --git a/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh b/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
index b49c7b5371c..b5be39a91df 100755
--- a/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
+++ b/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
index 6cea18e2c66..aa162911399 100755
--- a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
+++ b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh b/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
index 9d61f7034cf..e9467d77451 100755
--- a/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
+++ b/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: needs psql
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01889_sql_json_functions.sql b/tests/queries/0_stateless/01889_sql_json_functions.sql
index 1c5069ccfde..0c4f3aff9a3 100644
--- a/tests/queries/0_stateless/01889_sql_json_functions.sql
+++ b/tests/queries/0_stateless/01889_sql_json_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT '--JSON_VALUE--';
 SELECT JSON_VALUE('$', '{"hello":1}'); -- root is a complex object => default value (empty string)
 SELECT JSON_VALUE('$.hello', '{"hello":1}');
diff --git a/tests/queries/0_stateless/01889_sqlite_read_write.sh b/tests/queries/0_stateless/01889_sqlite_read_write.sh
index 3e7e15d2830..247f44b61e7 100755
--- a/tests/queries/0_stateless/01889_sqlite_read_write.sh
+++ b/tests/queries/0_stateless/01889_sqlite_read_write.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql b/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
index 0f61ab168f5..d1b8f407389 100644
--- a/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
+++ b/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01890_materialized_distributed_join.sh b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
index e9808a80db1..8aca09303e0 100755
--- a/tests/queries/0_stateless/01890_materialized_distributed_join.sh
+++ b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 # FIXME: this is an .sh test because JOIN with Distributed in the left will use default database for the right.
 
diff --git a/tests/queries/0_stateless/01890_stem.sql b/tests/queries/0_stateless/01890_stem.sql
index 472cfb54251..8fe41d225ec 100644
--- a/tests/queries/0_stateless/01890_stem.sql
+++ b/tests/queries/0_stateless/01890_stem.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: depends on libstemmer_c
+
 SET allow_experimental_nlp_functions = 1;
 
 SELECT stem('en', 'given');
diff --git a/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql b/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
index 28e81640993..237f1fd4e21 100644
--- a/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
+++ b/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01891_not_in_partition_prune.reference b/tests/queries/0_stateless/01891_not_in_partition_prune.reference
index 628053cd4f8..9d2517ad760 100644
--- a/tests/queries/0_stateless/01891_not_in_partition_prune.reference
+++ b/tests/queries/0_stateless/01891_not_in_partition_prune.reference
@@ -4,3 +4,5 @@
 7	107
 8	108
 9	109
+1970-01-01	1	one
+1970-01-01	3	three
diff --git a/tests/queries/0_stateless/01891_not_in_partition_prune.sql b/tests/queries/0_stateless/01891_not_in_partition_prune.sql
index edbfad93e5d..5bf90fdd65c 100644
--- a/tests/queries/0_stateless/01891_not_in_partition_prune.sql
+++ b/tests/queries/0_stateless/01891_not_in_partition_prune.sql
@@ -8,3 +8,18 @@ set max_rows_to_read = 5;
 select * from test1 where i not in (1,2,3,4,5) order by i;
 
 drop table test1;
+
+drop table if exists t1;
+drop table if exists t2;
+
+create table t1 (date Date, a Float64, b String) Engine=MergeTree ORDER BY date;
+create table t2 (date Date, a Float64, b String) Engine=MergeTree ORDER BY date;
+
+insert into t1(a, b) values (1, 'one'), (2, 'two');
+insert into t2(a, b) values (2, 'two'), (3, 'three');
+
+select date, a, b from t1 where (date, a, b) NOT IN (select date,a,b from t2);
+select date, a, b from t2 where (date, a, b) NOT IN (select date,a,b from t1);
+
+drop table t1;
+drop table t2;
diff --git a/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql b/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
index 0751ff2729f..643266f1ea3 100644
--- a/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
+++ b/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists tab;
 create table tab (i8 Int8, i16 Int16, i32 Int32, i64 Int64, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, id UUID, s String, fs FixedString(33), a Array(UInt8), t Tuple(UInt16, UInt32), d Date, dt DateTime('Europe/Moscow'), dt64 DateTime64(3, 'Europe/Moscow'), dec128 Decimal128(3), lc LowCardinality(String)) engine = MergeTree PARTITION BY (i8, i16, i32, i64, u8, u16, u32, u64, id, s, fs, a, t, d, dt, dt64, dec128, lc) order by tuple();
 insert into tab values (-1, -1, -1, -1, -1, -1, -1, -1, '61f0c404-5cb3-11e7-907b-a6006ad3dba0', 'a', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', [1, 2, 3], (-1, -2), '2020-01-01', '2020-01-01 01:01:01', '2020-01-01 01:01:01', '123.456', 'a');
diff --git a/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql b/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
index c02ed8f18ee..13ebd958a84 100644
--- a/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
+++ b/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql b/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
index bcd6e47d4c7..88867eef24a 100644
--- a/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
+++ b/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'limit', * FROM remote('127.1', view(SELECT * FROM numbers(10))) SETTINGS limit=5;
 SELECT 'offset', * FROM remote('127.1', view(SELECT * FROM numbers(10))) SETTINGS offset=5;
 
diff --git a/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql b/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
index 5e700e537eb..2f2b683a153 100644
--- a/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
+++ b/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql b/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
index 8ba11f4c643..99dda05930e 100644
--- a/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
+++ b/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql b/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
index 903a7c65f21..27a97faa45a 100644
--- a/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
+++ b/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql b/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
index 8b5618230f0..a3228d4a841 100644
--- a/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
+++ b/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql b/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
index 04b8a818382..5e378f3ec6b 100644
--- a/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
+++ b/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh b/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
index bb12f7c0e42..30dff6db0c4 100755
--- a/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
+++ b/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 #
 # Check that KILL MUTATION can be executed in parallel for different tables.
diff --git a/tests/queries/0_stateless/01901_in_literal_shard_prune.sql b/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
index cc587c36613..9250547dad8 100644
--- a/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
+++ b/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=1;
 
diff --git a/tests/queries/0_stateless/01901_test_attach_partition_from.sql b/tests/queries/0_stateless/01901_test_attach_partition_from.sql
index c15edacc6c8..1fe073f0c32 100644
--- a/tests/queries/0_stateless/01901_test_attach_partition_from.sql
+++ b/tests/queries/0_stateless/01901_test_attach_partition_from.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test_alter_attach_01901S;
 DROP TABLE IF EXISTS test_alter_attach_01901D;
 
diff --git a/tests/queries/0_stateless/01902_dictionary_array_type.sql b/tests/queries/0_stateless/01902_dictionary_array_type.sql
index 700f26e915d..bff107d4dad 100644
--- a/tests/queries/0_stateless/01902_dictionary_array_type.sql
+++ b/tests/queries/0_stateless/01902_dictionary_array_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_array_source_table;
 CREATE TABLE dictionary_array_source_table
 (
diff --git a/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql b/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
index 3aabf1a1f36..3801a83e247 100644
--- a/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
+++ b/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01902_db;
 DROP DATABASE IF EXISTS 01902_db1;
 DROP DATABASE IF EXISTS 01902_db2;
diff --git a/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh b/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
index 70aa4623320..b1d6049abcf 100755
--- a/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
+++ b/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql b/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
index 0d4f7119fa3..e6831c92c9f 100644
--- a/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
+++ b/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_nullable_source_table;
 CREATE TABLE dictionary_nullable_source_table
 (
diff --git a/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh b/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
index d3a4389e6d5..07d2ac7baad 100755
--- a/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
+++ b/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01905_to_json_string.sql b/tests/queries/0_stateless/01905_to_json_string.sql
index 80d9c2e2625..e92c32f3422 100644
--- a/tests/queries/0_stateless/01905_to_json_string.sql
+++ b/tests/queries/0_stateless/01905_to_json_string.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 create temporary table t engine Memory as select * from generateRandom(
 $$
     a Array(Int8),
diff --git a/tests/queries/0_stateless/01906_h3_to_geo.sql b/tests/queries/0_stateless/01906_h3_to_geo.sql
index aa6ecca1754..dd8608fbccd 100644
--- a/tests/queries/0_stateless/01906_h3_to_geo.sql
+++ b/tests/queries/0_stateless/01906_h3_to_geo.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS h3_indexes;
 
 CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect b/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
index 55211dca979..3003a0de42d 100755
--- a/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
+++ b/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: long, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01910_memory_tracking_topk.sql b/tests/queries/0_stateless/01910_memory_tracking_topk.sql
index e6309c1eeb8..ea0b4f9047e 100644
--- a/tests/queries/0_stateless/01910_memory_tracking_topk.sql
+++ b/tests/queries/0_stateless/01910_memory_tracking_topk.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 -- Memory limit must correctly apply, triggering an exception:
 
 SET max_memory_usage = '100M';
diff --git a/tests/queries/0_stateless/01910_view_dictionary.sql b/tests/queries/0_stateless/01910_view_dictionary.sql
index 28c50daeba1..7b807c7fbba 100644
--- a/tests/queries/0_stateless/01910_view_dictionary.sql
+++ b/tests/queries/0_stateless/01910_view_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_source_en;
 DROP TABLE IF EXISTS dictionary_source_ru;
 DROP TABLE IF EXISTS dictionary_source_view;
diff --git a/tests/queries/0_stateless/01913_replace_dictionary.sql b/tests/queries/0_stateless/01913_replace_dictionary.sql
index 43dd460707a..891d0c6abd6 100644
--- a/tests/queries/0_stateless/01913_replace_dictionary.sql
+++ b/tests/queries/0_stateless/01913_replace_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01913_db;
 CREATE DATABASE 01913_db ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01914_exchange_dictionaries.sql b/tests/queries/0_stateless/01914_exchange_dictionaries.sql
index 77bcf53ab5e..8c86a04fd90 100644
--- a/tests/queries/0_stateless/01914_exchange_dictionaries.sql
+++ b/tests/queries/0_stateless/01914_exchange_dictionaries.sql
@@ -1,3 +1,6 @@
+-- Tags: no-ordinary-database, no-parallel
+-- Tag no-ordinary-database: Requires Atomic database
+
 DROP DATABASE IF EXISTS 01914_db;
 CREATE DATABASE 01914_db ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql b/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
index 1520dd41973..6f52aea0f69 100644
--- a/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
+++ b/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01915_db;
 CREATE DATABASE test_01915_db ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01915_json_extract_raw_string.sql b/tests/queries/0_stateless/01915_json_extract_raw_string.sql
index 4c5be79f6ef..884c599c206 100644
--- a/tests/queries/0_stateless/01915_json_extract_raw_string.sql
+++ b/tests/queries/0_stateless/01915_json_extract_raw_string.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 select JSONExtract('{"a": "123", "b": 456, "c": [7, 8, 9]}', 'Tuple(a String, b String, c String)');
 
 with '{"string_value":null}' as json select JSONExtract(json, 'string_value', 'Nullable(String)');
diff --git a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
index 80022bd472d..07988da12c2 100755
--- a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01922_client_param.sh b/tests/queries/0_stateless/01922_client_param.sh
index bb0abfb2191..b126746a53b 100755
--- a/tests/queries/0_stateless/01922_client_param.sh
+++ b/tests/queries/0_stateless/01922_client_param.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
index bcb3775f86a..ec5aa141859 100755
--- a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
+++ b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: needs pv
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql b/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
index 07e490d0ce0..7d151f063e1 100644
--- a/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
+++ b/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS broken_partition;
 
 CREATE TABLE broken_partition
diff --git a/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql b/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
index 03a3c4f8b65..01e2c711ed5 100644
--- a/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
+++ b/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01925_join_materialized_columns.reference b/tests/queries/0_stateless/01925_join_materialized_columns.reference
index 1dfda3c769b..5125b322aed 100644
--- a/tests/queries/0_stateless/01925_join_materialized_columns.reference
+++ b/tests/queries/0_stateless/01925_join_materialized_columns.reference
@@ -22,3 +22,13 @@ fact1t1_val1	fact1t2_val2
 fact2t1_val2	fact2t1_val2
 -
 2020-02-02 13:00:00	2020-02-05 13:00:00
+-
+1
+1
+1
+1
+-
+2020-01-01 12:00:00
+2020-01-01 12:00:00
+2020-01-01 12:00:00
+2020-01-01 12:00:00
diff --git a/tests/queries/0_stateless/01925_join_materialized_columns.sql b/tests/queries/0_stateless/01925_join_materialized_columns.sql
index 6a34fef96ab..7c56d5fea39 100644
--- a/tests/queries/0_stateless/01925_join_materialized_columns.sql
+++ b/tests/queries/0_stateless/01925_join_materialized_columns.sql
@@ -2,17 +2,23 @@ DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 
 CREATE TABLE t1 (
-    time DateTime, foo String, dimension_1 String,
+    time DateTime,
+    foo String,
+    dimension_1 String,
     dt Date MATERIALIZED toDate(time),
     dt1 Date MATERIALIZED toDayOfYear(time),
-    aliascol1 ALIAS foo || dimension_1
+    aliascol1 ALIAS foo || dimension_1,
+    time_alias DateTime ALIAS time
 ) ENGINE = MergeTree() PARTITION BY toYYYYMM(dt) ORDER BY (dt, foo);
 
 CREATE TABLE t2 (
-    time DateTime, bar String, dimension_2 String, 
+    time DateTime,
+    bar String,
+    dimension_2 String,
     dt Date MATERIALIZED toDate(time),
     dt2 Date MATERIALIZED toDayOfYear(time),
-    aliascol2 ALIAS bar || dimension_2
+    aliascol2 ALIAS bar || dimension_2,
+    time_alias DateTime ALIAS time
 ) ENGINE = MergeTree() PARTITION BY toYYYYMM(dt) ORDER BY (dt, bar);
 
 INSERT INTO t1 VALUES ('2020-01-01 12:00:00', 'fact1', 't1_val1'), ('2020-02-02 13:00:00', 'fact2', 't1_val2'), ('2020-01-01 13:00:00', 'fact3', 't1_val3');
@@ -35,3 +41,15 @@ SELECT '-';
 SELECT t1.aliascol1, t2.aliascol2 FROM t1 JOIN t2 ON t1.foo = t2.bar ORDER BY t1.time, t2.time;
 SELECT '-';
 SELECT t1.time, t2.time FROM t1 JOIN t2 ON t1.aliascol1 = t2.aliascol2 ORDER BY t1.time, t2.time;
+SELECT '-';
+SELECT count() FROM t1 JOIN t2 ON t1.time_alias = t2.time;
+SELECT count() FROM t1 JOIN t2 ON t1.time = t2.time_alias;
+SELECT count() FROM t1 JOIN t2 ON t1.time_alias = t2.time_alias;
+SELECT count() FROM t1 JOIN t2 USING (time_alias);
+SELECT '-';
+SELECT t1.time as talias FROM t1 JOIN t2 ON talias = t2.time;
+SELECT t1.time as talias FROM t1 JOIN t2 ON talias = t2.time_alias;
+SELECT t2.time as talias FROM t1 JOIN t2 ON t1.time = talias;
+SELECT t2.time as talias FROM t1 JOIN t2 ON t1.time_alias = talias;
+SELECT time as talias FROM t1 JOIN t2 ON t1.time = talias; -- { serverError AMBIGUOUS_COLUMN_NAME }
+SELECT time as talias FROM t1 JOIN t2 ON talias = t2.time; -- { serverError AMBIGUOUS_COLUMN_NAME }
diff --git a/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
index c568cf92118..3b1e5176ff9 100644
--- a/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
+++ b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json_square_brackets;
 CREATE TABLE json_square_brackets (field String) ENGINE = Memory;
 INSERT INTO json_square_brackets FORMAT JSONAsString [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
diff --git a/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql b/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
index f3a5b2db62e..56d255570c8 100644
--- a/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
+++ b/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists merge;
 create table merge
 (
diff --git a/tests/queries/0_stateless/01926_json_as_string_array.sh b/tests/queries/0_stateless/01926_json_as_string_array.sh
index 25259a0f511..477cb8cff9e 100755
--- a/tests/queries/0_stateless/01926_json_as_string_array.sh
+++ b/tests/queries/0_stateless/01926_json_as_string_array.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql b/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
index 7e53c0c2db7..afc2d014f4f 100644
--- a/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
+++ b/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
 
diff --git a/tests/queries/0_stateless/01932_global_in_function.sql b/tests/queries/0_stateless/01932_global_in_function.sql
index 467bf6c3495..ccae1e17a55 100644
--- a/tests/queries/0_stateless/01932_global_in_function.sql
+++ b/tests/queries/0_stateless/01932_global_in_function.sql
@@ -1,2 +1,4 @@
+-- Tags: global
+
 select number from cluster(test_cluster_two_shards_localhost, numbers(1)) where number global in tuple(0, 1, 2, 3);
 select number from cluster(test_cluster_two_shards_localhost, numbers(1)) where number global in array(0, 1, 2, 3);
diff --git a/tests/queries/0_stateless/01932_remote_sharding_key_column.sql b/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
index ded2f187821..20b86eacd71 100644
--- a/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
+++ b/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- regression test for the following query:
 --
 --     select * from remote('127.1', system.one, dummy)
diff --git a/tests/queries/0_stateless/01933_client_replxx_convert_history.expect b/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
index 890d024847f..664c3f06d20 100755
--- a/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
+++ b/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
@@ -1,4 +1,6 @@
 #!/usr/bin/expect -f
+# Tags: no-parallel, no-fasttest
+# Tag no-parallel: Uses non unique history file
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01939_type_map_json.sql b/tests/queries/0_stateless/01939_type_map_json.sql
index df782334c90..9a2d8840e93 100644
--- a/tests/queries/0_stateless/01939_type_map_json.sql
+++ b/tests/queries/0_stateless/01939_type_map_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT map(1, 2, 3, 4) AS m FORMAT JSONEachRow;
 SELECT map(1, 2, 3, 4) AS m, toJSONString(m) AS s, isValidJSON(s);
 
diff --git a/tests/queries/0_stateless/01939_user_with_default_database.sh b/tests/queries/0_stateless/01939_user_with_default_database.sh
index 6dcd288797b..7dee12ced2e 100755
--- a/tests/queries/0_stateless/01939_user_with_default_database.sh
+++ b/tests/queries/0_stateless/01939_user_with_default_database.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql b/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
index 5d38cfb18dc..dd2ec704ce9 100644
--- a/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
+++ b/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 select * from remote('127.{1,2}', view(select 'foo.com' key), cityHash64(key)) where key = cutToFirstSignificantSubdomainCustom('foo.com', 'public_suffix_list') settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
 select * from remote('127.{1,2}', view(select 'foo.com' key), cityHash64(key)) where key = cutToFirstSignificantSubdomainCustom('bar.com', 'public_suffix_list') settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
diff --git a/tests/queries/0_stateless/01943_query_id_check.sql b/tests/queries/0_stateless/01943_query_id_check.sql
index 6e3d281386d..cb2ef090854 100644
--- a/tests/queries/0_stateless/01943_query_id_check.sql
+++ b/tests/queries/0_stateless/01943_query_id_check.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Different query_id
+
 DROP TABLE IF EXISTS tmp;
 
 CREATE TABLE tmp ENGINE = TinyLog AS SELECT queryID();
diff --git a/tests/queries/0_stateless/01944_insert_partition_by.sql b/tests/queries/0_stateless/01944_insert_partition_by.sql
index 1c7d96d7762..5396ca4daf6 100644
--- a/tests/queries/0_stateless/01944_insert_partition_by.sql
+++ b/tests/queries/0_stateless/01944_insert_partition_by.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s3
+
 INSERT INTO TABLE FUNCTION file('foo.csv', 'CSV', 'id Int32, val Int32') PARTITION BY val VALUES (1, 1), (2, 2); -- { serverError NOT_IMPLEMENTED }
 INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, '\r\n'); -- { serverError CANNOT_PARSE_TEXT }
 INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, 'abc\x00abc'); -- { serverError CANNOT_PARSE_TEXT }
diff --git a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
index 86e1fdd768f..a00f307673e 100755
--- a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
+++ b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 MYHOSTNAME=$(hostname -f)
 
diff --git a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
index abca5cdfa3b..b6721d4a798 100755
--- a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
+++ b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql b/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
index 21e8e07c724..33fd79b14eb 100644
--- a/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
+++ b/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS `01945.db`;
 CREATE DATABASE `01945.db`;
 
diff --git a/tests/queries/0_stateless/01951_distributed_push_down_limit.sql b/tests/queries/0_stateless/01951_distributed_push_down_limit.sql
index 0d6e2069215..fa2fc1800c1 100644
--- a/tests/queries/0_stateless/01951_distributed_push_down_limit.sql
+++ b/tests/queries/0_stateless/01951_distributed_push_down_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- { echo }
 explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=0;
 explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=1;
diff --git a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
index 2ae872f72b0..d1f80b42e75 100644
--- a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
+++ b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set optimize_skip_unused_shards=1;
 set optimize_distributed_group_by_sharding_key=1;
 
diff --git a/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh b/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
index 069695c16db..38e5edf15fd 100755
--- a/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
+++ b/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh b/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
index 9085d646a28..e7871454192 100755
--- a/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
+++ b/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan
+# Tag no-ubsan: Limits RLIMIT_NOFILE, see comment in the test
+
 # shellcheck disable=SC2086
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01956_fuse_quantile_optimization.reference b/tests/queries/0_stateless/01956_fuse_quantile_optimization.reference
new file mode 100644
index 00000000000..defad422cad
--- /dev/null
+++ b/tests/queries/0_stateless/01956_fuse_quantile_optimization.reference
@@ -0,0 +1,97 @@
+2016-06-15 23:00:00	2016-06-15 23:00:00
+2016-06-15 23:00:00	2016-06-15 23:00:00
+2016-06-15 23:00:00	2016-06-15 23:00:00
+2016-06-15 23:00:00	2016-06-15 23:00:00	2016-06-15 23:00:00
+30000	30000	30000
+30000	30000	30000
+2016-06-15 23:00:16	2016-06-15 23:00:16	2016-06-15 23:00:16
+2016-06-15 23:00:16	2016-06-15 23:00:16	2016-06-15 23:00:16
+2016-04-02 17:23:12	2016-04-02 17:23:12	2016-04-02 17:23:12
+---------After fuse result-----------
+quantile:
+SELECT
+    quantiles(0.2, 0.3)(d)[1],
+    quantiles(0.2, 0.3)(d)[2]
+FROM datetime
+2016-06-15 23:00:00	2016-06-15 23:00:00
+quantileDeterministic:
+SELECT
+    quantilesDeterministic(0.2, 0.5)(d, 1)[1],
+    quantilesDeterministic(0.2, 0.5)(d, 1)[2]
+FROM datetime
+2016-06-15 23:00:00	2016-06-15 23:00:00
+quantileExact:
+SELECT
+    quantilesExact(0.2, 0.5)(d)[1],
+    quantilesExact(0.2, 0.5)(d)[2]
+FROM datetime
+2016-06-15 23:00:00	2016-06-15 23:00:00
+quantileExactWeighted:
+SELECT
+    quantilesExactWeighted(0.2, 0.4)(d, 1)[1],
+    quantilesExactWeighted(0.2, 0.4)(d, 1)[2],
+    quantileExactWeighted(0.3)(d, 2)
+FROM datetime
+2016-06-15 23:00:00	2016-06-15 23:00:00	2016-06-15 23:00:00
+quantileTiming:
+SELECT
+    quantilesTiming(0.2, 0.3)(d)[1],
+    quantilesTiming(0.2, 0.3)(d)[2],
+    quantileTiming(0.2)(d + 1)
+FROM datetime
+30000	30000	30000
+quantileTimingWeighted:
+SELECT
+    quantilesTimingWeighted(0.2, 0.3)(d, 1)[1],
+    quantilesTimingWeighted(0.2, 0.3)(d, 1)[2],
+    quantileTimingWeighted(0.2)(d, 2)
+FROM datetime
+30000	30000	30000
+quantileTDigest:
+SELECT
+    quantilesTDigest(0.2, 0.3)(d)[1],
+    quantilesTDigest(0.2, 0.3)(d)[2],
+    quantileTDigest(0.2)(d + 1)
+FROM datetime
+2016-06-15 23:00:16	2016-06-15 23:00:16	2016-06-15 23:00:16
+quantileTDigestWeighted:
+SELECT
+    quantilesTDigestWeighted(0.2, 0.3)(d, 1)[1],
+    quantilesTDigestWeighted(0.2, 0.3)(d, 1)[2],
+    quantileTDigestWeighted(0.4)(d, 2)
+FROM datetime
+2016-06-15 23:00:16	2016-06-15 23:00:16	2016-06-15 23:00:16
+quantileBFloat16:
+SELECT
+    quantilesBFloat16(0.2, 0.3)(d)[1],
+    quantilesBFloat16(0.2, 0.3)(d)[2],
+    quantileBFloat16(0.4)(d + 1)
+FROM datetime
+2016-04-02 17:23:12	2016-04-02 17:23:12	2016-04-02 17:23:12
+quantileBFloat16Weighted:
+SELECT
+    quantilesBFloat16Weighted(0.2, 0.3)(d, 1)[1],
+    quantilesBFloat16Weighted(0.2, 0.3)(d, 1)[2],
+    quantileBFloat16Weighted(0.2)(d, 2)
+FROM datetime
+2016-04-02 17:23:12	2016-04-02 17:23:12	2016-04-02 17:23:12
+SELECT
+    quantiles(0.2, 0.3, 0.2)(d)[1] AS k,
+    quantiles(0.2, 0.3, 0.2)(d)[2]
+FROM datetime
+ORDER BY quantiles(0.2, 0.3, 0.2)(d)[3] ASC
+0	4	7.2	7.6
+1	5	8.2	8.6
+SELECT
+    b,
+    quantiles(0.5, 0.9, 0.95)(x)[1] AS a,
+    quantiles(0.5, 0.9, 0.95)(x)[2] AS y,
+    quantiles(0.5, 0.9, 0.95)(x)[3]
+FROM
+(
+    SELECT
+        number AS x,
+        number % 2 AS b
+    FROM numbers(10)
+)
+GROUP BY b
diff --git a/tests/queries/0_stateless/01956_fuse_quantile_optimization.sql b/tests/queries/0_stateless/01956_fuse_quantile_optimization.sql
new file mode 100644
index 00000000000..2a97c60882c
--- /dev/null
+++ b/tests/queries/0_stateless/01956_fuse_quantile_optimization.sql
@@ -0,0 +1,73 @@
+DROP TABLE IF EXISTS datetime;
+CREATE TABLE datetime (d DateTime('UTC')) ENGINE = Memory;
+INSERT INTO datetime(d) VALUES(toDateTime('2016-06-15 23:00:00', 'UTC'))
+
+SET optimize_syntax_fuse_functions = true;
+
+SELECT quantile(0.2)(d), quantile(0.3)(d) FROM datetime;
+SELECT quantileDeterministic(0.2)(d, 1), quantileDeterministic(0.5)(d, 1) FROM datetime;
+SELECT quantileExact(0.2)(d), quantileExact(0.5)(d) FROM datetime;
+SELECT quantileExactWeighted(0.2)(d, 1), quantileExactWeighted(0.4)(d, 1), quantileExactWeighted(0.3)(d, 2) FROM datetime;
+SELECT quantileTiming(0.2)(d), quantileTiming(0.3)(d), quantileTiming(0.2)(d+1) FROM datetime;
+SELECT quantileTimingWeighted(0.2)(d, 1), quantileTimingWeighted(0.3)(d, 1), quantileTimingWeighted(0.2)(d, 2) FROM datetime;
+SELECT quantileTDigest(0.2)(d), quantileTDigest(0.3)(d), quantileTDigest(0.2)(d + 1) FROM datetime;
+SELECT quantileTDigestWeighted(0.2)(d, 1), quantileTDigestWeighted(0.3)(d, 1), quantileTDigestWeighted(0.4)(d, 2) FROM datetime;
+SELECT quantileBFloat16(0.2)(d), quantileBFloat16(0.3)(d), quantileBFloat16(0.4)(d + 1) FROM datetime;
+
+
+SELECT '---------After fuse result-----------';
+SELECT 'quantile:';
+EXPLAIN SYNTAX SELECT quantile(0.2)(d), quantile(0.3)(d) FROM datetime;
+SELECT quantile(0.2)(d), quantile(0.3)(d) FROM datetime;
+
+SELECT 'quantileDeterministic:';
+EXPLAIN SYNTAX SELECT quantileDeterministic(0.2)(d, 1), quantileDeterministic(0.5)(d, 1) FROM datetime;
+SELECT quantileDeterministic(0.2)(d, 1), quantileDeterministic(0.5)(d, 1) FROM datetime;
+
+SELECT 'quantileExact:';
+EXPLAIN SYNTAX SELECT quantileExact(0.2)(d), quantileExact(0.5)(d) FROM datetime;
+SELECT quantileExact(0.2)(d), quantileExact(0.5)(d) FROM datetime;
+
+SELECT 'quantileExactWeighted:';
+EXPLAIN SYNTAX SELECT quantileExactWeighted(0.2)(d, 1), quantileExactWeighted(0.4)(d, 1), quantileExactWeighted(0.3)(d, 2) FROM datetime;
+SELECT quantileExactWeighted(0.2)(d, 1), quantileExactWeighted(0.4)(d, 1), quantileExactWeighted(0.3)(d, 2) FROM datetime;
+
+SELECT 'quantileTiming:';
+EXPLAIN SYNTAX SELECT quantileTiming(0.2)(d), quantileTiming(0.3)(d), quantileTiming(0.2)(d+1) FROM datetime;
+SELECT quantileTiming(0.2)(d), quantileTiming(0.3)(d), quantileTiming(0.2)(d+1) FROM datetime;
+
+SELECT 'quantileTimingWeighted:';
+EXPLAIN SYNTAX SELECT quantileTimingWeighted(0.2)(d, 1), quantileTimingWeighted(0.3)(d, 1), quantileTimingWeighted(0.2)(d, 2) FROM datetime;
+SELECT quantileTimingWeighted(0.2)(d, 1), quantileTimingWeighted(0.3)(d, 1), quantileTimingWeighted(0.2)(d, 2) FROM datetime;
+
+SELECT 'quantileTDigest:';
+EXPLAIN SYNTAX SELECT quantileTDigest(0.2)(d), quantileTDigest(0.3)(d), quantileTDigest(0.2)(d + 1) FROM datetime;
+SELECT quantileTDigest(0.2)(d), quantileTDigest(0.3)(d), quantileTDigest(0.2)(d + 1) FROM datetime;
+
+SELECT 'quantileTDigestWeighted:';
+EXPLAIN SYNTAX SELECT quantileTDigestWeighted(0.2)(d, 1), quantileTDigestWeighted(0.3)(d, 1), quantileTDigestWeighted(0.4)(d, 2) FROM datetime;
+SELECT quantileTDigestWeighted(0.2)(d, 1), quantileTDigestWeighted(0.3)(d, 1), quantileTDigestWeighted(0.4)(d, 2) FROM datetime;
+
+SELECT 'quantileBFloat16:';
+EXPLAIN SYNTAX SELECT quantileBFloat16(0.2)(d), quantileBFloat16(0.3)(d), quantileBFloat16(0.4)(d + 1) FROM datetime;
+SELECT quantileBFloat16(0.2)(d), quantileBFloat16(0.3)(d), quantileBFloat16(0.4)(d + 1) FROM datetime;
+
+SELECT 'quantileBFloat16Weighted:';
+EXPLAIN SYNTAX SELECT quantileBFloat16Weighted(0.2)(d, 1), quantileBFloat16Weighted(0.3)(d, 1), quantileBFloat16Weighted(0.2)(d, 2) FROM datetime;
+SELECT quantileBFloat16Weighted(0.2)(d, 1), quantileBFloat16Weighted(0.3)(d, 1), quantileBFloat16Weighted(0.2)(d, 2) FROM datetime;
+
+EXPLAIN SYNTAX SELECT quantile(0.2)(d) as k, quantile(0.3)(d) FROM datetime order by quantile(0.2)(d);
+
+SELECT b, quantile(0.5)(x) as a, quantile(0.9)(x) as y, quantile(0.95)(x) FROM (select number as x, number % 2 as b from numbers(10)) group by b;
+EXPLAIN SYNTAX SELECT b, quantile(0.5)(x) as a, quantile(0.9)(x) as y, quantile(0.95)(x) FROM (select number as x, number % 2 as b from numbers(10)) group by b;
+
+-- fuzzer
+SELECT quantileDeterministic(0.99)(1023) FROM datetime FORMAT Null; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT quantileTiming(0.5)(NULL, NULL, quantileTiming(-inf)(NULL), NULL) FROM datetime FORMAT Null; -- { serverError ILLEGAL_AGGREGATION }
+SELECT quantileTDigest(NULL)(NULL, quantileTDigest(3.14)(NULL, d + NULL), 2.), NULL FORMAT Null; -- { serverError ILLEGAL_AGGREGATION }
+SELECT quantile(1, 0.3)(d), quantile(0.3)(d) FROM datetime; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT quantile(quantileDeterministic('', '2.47')('0.02', '0.2', NULL), 0.9)(d), quantile(0.3)(d) FROM datetime; -- { serverError ILLEGAL_AGGREGATION }
+SELECT quantileTimingWeighted([[[[['-214748364.8'], NULL]], [[[quantileTimingWeighted([[[[['-214748364.8'], NULL], '-922337203.6854775808'], [[['-214748364.7']]], NULL]])([NULL], NULL), '-214748364.7']]], NULL]])([NULL], NULL); -- { serverError ILLEGAL_AGGREGATION }
+SELECT quantileTimingWeighted([quantileTimingWeighted(0.5)(1, 1)])(1, 1); -- { serverError ILLEGAL_AGGREGATION }
+
+DROP TABLE datetime;
diff --git a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
index 0e2f1857aed..3ddb6346631 100755
--- a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
+++ b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
 
diff --git a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
index 57d71cdc91c..64c31472e89 100644
--- a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
+++ b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
@@ -1,2 +1,4 @@
+-- Tags: no-replicated-database
+
 SET max_memory_usage = '100M';
 SELECT cityHash64(rand() % 1000) as n, groupBitmapState(number) FROM numbers_mt(2000000000) GROUP BY n; -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01999_grant_with_replace.sql b/tests/queries/0_stateless/01999_grant_with_replace.sql
index 31a9187c0d2..0f11bc5423c 100644
--- a/tests/queries/0_stateless/01999_grant_with_replace.sql
+++ b/tests/queries/0_stateless/01999_grant_with_replace.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP USER IF EXISTS test_user_01999;
 
 CREATE USER test_user_01999;
diff --git a/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql b/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
index b006f9acb22..9cf02930199 100644
--- a/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
+++ b/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
@@ -1,3 +1,6 @@
+-- Tags: no-parallel
+-- Tag no-parallel: create user
+
 create user if not exists u_02001 default database system;
 select default_database from system.users where name = 'u_02001';
 drop user if exists u_02001;
diff --git a/tests/queries/0_stateless/02001_select_with_filter.reference b/tests/queries/0_stateless/02001_select_with_filter.reference
index 9d104af5e8c..92af7d1d38f 100644
--- a/tests/queries/0_stateless/02001_select_with_filter.reference
+++ b/tests/queries/0_stateless/02001_select_with_filter.reference
@@ -1,2 +1,4 @@
 98
 2450
+\N
+2500
diff --git a/tests/queries/0_stateless/02001_select_with_filter.sql b/tests/queries/0_stateless/02001_select_with_filter.sql
index 4d10f86ed96..70152db83f8 100644
--- a/tests/queries/0_stateless/02001_select_with_filter.sql
+++ b/tests/queries/0_stateless/02001_select_with_filter.sql
@@ -1,3 +1,4 @@
 SELECT argMax(number, number + 1) FILTER(WHERE number != 99) FROM numbers(100) ;
 SELECT sum(number) FILTER(WHERE number % 2 == 0) FROM numbers(100);
-SELECT sumIfOrNull(number, number % 2 == 1) FILTER(WHERE number % 2 == 0) FROM numbers(100); -- { serverError 184 }
+SELECT sumIfOrNull(number, number % 2 == 1) FILTER(WHERE 0) FROM numbers(100);
+SELECT sumIfOrNull(number, number % 2 == 1) FILTER(WHERE 1) FROM numbers(100);
diff --git a/tests/queries/0_stateless/02001_shard_num_shard_count.sql b/tests/queries/0_stateless/02001_shard_num_shard_count.sql
index daf1084a614..0d4a92f4ede 100644
--- a/tests/queries/0_stateless/02001_shard_num_shard_count.sql
+++ b/tests/queries/0_stateless/02001_shard_num_shard_count.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select shardNum() n, shardCount() c;
 select shardNum() n, shardCount() c from remote('127.0.0.{1,2,3}', system.one) order by n settings prefer_localhost_replica = 0;
 select shardNum() n, shardCount() c from remote('127.0.0.{1,2,3}', system.one) order by n settings prefer_localhost_replica = 1;
diff --git a/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql b/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
index 1b24617569c..7d9c08c7cb6 100644
--- a/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
+++ b/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SELECT
     cityHash64(number GLOBAL IN (NULL, -2147483648, -9223372036854775808), nan, 1024, NULL, NULL, 1.000100016593933, NULL),
     (NULL, cityHash64(inf, -2147483648, NULL, NULL, 10.000100135803223), cityHash64(1.1754943508222875e-38, NULL, NULL, NULL), 2147483647)
diff --git a/tests/queries/0_stateless/02002_row_level_filter_bug.sh b/tests/queries/0_stateless/02002_row_level_filter_bug.sh
index 7e19374c123..d15a26f48f5 100755
--- a/tests/queries/0_stateless/02002_row_level_filter_bug.sh
+++ b/tests/queries/0_stateless/02002_row_level_filter_bug.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+# Tag no-parallel: create user
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02003_compress_bz2.sh b/tests/queries/0_stateless/02003_compress_bz2.sh
index b65ce2f233b..afcea410297 100755
--- a/tests/queries/0_stateless/02003_compress_bz2.sh
+++ b/tests/queries/0_stateless/02003_compress_bz2.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on bzip2
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02003_memory_limit_in_client.expect b/tests/queries/0_stateless/02003_memory_limit_in_client.expect
index 49b81240829..47ac4926537 100755
--- a/tests/queries/0_stateless/02003_memory_limit_in_client.expect
+++ b/tests/queries/0_stateless/02003_memory_limit_in_client.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-parallel, no-fasttest
 
 # This is a test for system.warnings. Testing in interactive mode is necessary,
 # as we want to see certain warnings from client
diff --git a/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql b/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql
index 6058ef2f430..9d62093a702 100644
--- a/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql
+++ b/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql
@@ -1,3 +1,6 @@
+-- Tags: no-debug, no-fasttest
+-- Tag no-fasttest: Hyperscan
+
 set max_hyperscan_regexp_length = 1;
 set max_hyperscan_regexp_total_length = 1;
 
diff --git a/tests/queries/0_stateless/02006_client_test_hint_error_name.sql b/tests/queries/0_stateless/02006_client_test_hint_error_name.sql
index 268406a8054..60d840fb4ec 100644
--- a/tests/queries/0_stateless/02006_client_test_hint_error_name.sql
+++ b/tests/queries/0_stateless/02006_client_test_hint_error_name.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 select throwIf(1); -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
diff --git a/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh b/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
index 15ede23a510..b846136ae58 100755
--- a/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
+++ b/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02006_h3_to_geo_boundary.reference b/tests/queries/0_stateless/02006_h3_to_geo_boundary.reference
new file mode 100644
index 00000000000..0d54f3895bd
--- /dev/null
+++ b/tests/queries/0_stateless/02006_h3_to_geo_boundary.reference
@@ -0,0 +1,16 @@
+[(-25.60370257696877,-170.61932339479839),(-16.505947603561054,-161.6348206171839),(-5.762860491436932,-165.41674992858833),(-3.968796976609588,-176.05696384421356),(-11.54529597541476,175.98600155652952),(-22.19754138630238,177.51613498805204)]
+[(57.15637211465772,51.15131422930827),(53.74532256646542,56.28611799875301),(54.25756495131088,64.15861768734945),(58.31910366055611,68.25632325438265),(62.114389785017146,63.44462184184533),(61.440920615681854,53.98254701603947)]
+[(-82.24829137508873,167.18203088800593),(-83.41761096812805,158.00531624510785),(-84.94207431820979,162.09183616506846),(-85.00324300064887,-178.60454506450245),(-83.46691212211444,-172.41232929697492),(-82.25118471750908,179.4928586395771)]
+[(-69.70201806837188,-95.63006768303532),(-69.78121889088241,-93.8329499937899),(-69.26603652285242,-92.70414199751751),(-68.6908704290193,-93.35479180342097),(-68.62037380778602,-95.0614247833063),(-69.11663254992226,-96.20491957306085)]
+[(-55.64960804791368,-8.350548718066527),(-55.828830219010115,-8.612333853721543),(-56.03525612929049,-8.450494689408638),(-56.06193617137633,-8.024722968315496),(-55.88205068143165,-7.7639036247878686),(-55.67615021200244,-7.927868022867216)]
+[(47.4047230189944,77.11372810022105),(47.31523866865899,77.16981222471887),(47.30324229614998,77.31177114774472),(47.380675190840634,77.39807294060385),(47.47025252565847,77.34232219743376),(47.482304118992815,77.19993524307596)]
+[(36.59082706214739,135.1447773494689),(36.623412749699106,135.14466572237862),(36.640360586702336,135.11335418763244),(36.62472012921161,135.0821822076476),(36.592149268586866,135.08232217250773),(36.575204036900494,135.1136057921021)]
+[(49.072491410488254,39.26829772479248),(49.06434071502539,39.28264806614126),(49.068946849412825,39.29969935764574),(49.08170687750978,39.30240475320644),(49.08985976852211,39.288050003564216),(49.0852504352169,39.27099426655672)]
+[(-27.484668731117956,124.71456214331452),(-27.480255804296018,124.7164671069391),(-27.476759420067374,124.71353974495929),(-27.477675754654342,124.70870779388683),(-27.48208829554146,124.706802674375),(-27.485584887763263,124.70972966178107)]
+[(76.73422062536704,-147.4905412849195),(76.73289074232657,-147.4965026703208),(76.73104961876471,-147.49472931389167),(76.730538300536,-147.48699643238956),(76.73186795003895,-147.4810352654388),(76.73370915128375,-147.4828067613433)]
+[(-25.52488377871919,86.63224601066914),(-25.525614626072162,86.63222807640663),(-25.525993697439322,86.63290113101664),(-25.5256419200276,86.6335921124905),(-25.524911076278325,86.63361003835355),(-25.524532006337036,86.63293699114213)]
+[(13.126242531761285,23.27727960465014),(13.125977729043674,23.277268554217677),(13.125836559860176,23.277506856149834),(13.125960192636454,23.27775620899515),(13.12622499528112,23.27776726055665),(13.126366165222441,23.277528958143787)]
+[(-63.12570930185924,-70.40176049055108),(-63.12571366261393,-70.4015366058905),(-63.1256297288591,-70.40140848801948),(-63.125541434726955,-70.4015042543287),(-63.125537074078174,-70.40172813751032),(-63.125621007455614,-70.40185625586165)]
+[(40.28583119436284,15.642383240826787),(40.2857926151193,15.642384471654026),(40.28577492591182,15.642429586343791),(40.28579581594201,15.642473470233714),(40.2858343951909,15.642472239444253),(40.28585208440421,15.642427124727082)]
+[(54.55605961596273,-76.53410754061841),(54.556055751776405,-76.53413299495058),(54.5560411051761,-76.53413993412053),(54.55603032276505,-76.53412141897394),(54.55603418694863,-76.53409596465765),(54.556048833546,-76.53408902547206)]
+[(67.69370622234305,8.199070817163335),(67.69370970389446,8.199075597443361),(67.69371314705361,8.199068130094206),(67.69371310866035,8.199055882463448),(67.69370962710823,8.19905110218645),(67.69370618395016,8.199058569537081)]
diff --git a/tests/queries/0_stateless/02006_h3_to_geo_boundary.sql b/tests/queries/0_stateless/02006_h3_to_geo_boundary.sql
new file mode 100644
index 00000000000..1019cd45c0b
--- /dev/null
+++ b/tests/queries/0_stateless/02006_h3_to_geo_boundary.sql
@@ -0,0 +1,28 @@
+-- Tags: no-unbundled, no-fasttest
+
+DROP TABLE IF EXISTS h3_indexes;
+
+CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
+
+-- Coordinates from h3ToGeo test.
+
+INSERT INTO h3_indexes VALUES (579205133326352383);
+INSERT INTO h3_indexes VALUES (581263419093549055);
+INSERT INTO h3_indexes VALUES (589753847883235327);
+INSERT INTO h3_indexes VALUES (594082350283882495);
+INSERT INTO h3_indexes VALUES (598372386957426687);
+INSERT INTO h3_indexes VALUES (599542359671177215);
+INSERT INTO h3_indexes VALUES (604296355086598143);
+INSERT INTO h3_indexes VALUES (608785214872748031);
+INSERT INTO h3_indexes VALUES (615732192485572607);
+INSERT INTO h3_indexes VALUES (617056794467368959);
+INSERT INTO h3_indexes VALUES (624586477873168383);
+INSERT INTO h3_indexes VALUES (627882919484481535);
+INSERT INTO h3_indexes VALUES (634600058503392255);
+INSERT INTO h3_indexes VALUES (635544851677385791);
+INSERT INTO h3_indexes VALUES (639763125756281263);
+INSERT INTO h3_indexes VALUES (644178757620501158);
+
+SELECT h3ToGeoBoundary(h3_index) FROM h3_indexes ORDER BY h3_index;
+
+DROP TABLE h3_indexes;
diff --git a/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql b/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql
index 92cc30c38dc..9796beefd6d 100644
--- a/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql
+++ b/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS click_storage;
 DROP TABLE IF EXISTS click_storage_dst;
 
diff --git a/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql b/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
index ba6ed30b609..677879b1ebd 100644
--- a/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
+++ b/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS date_table;
 CREATE TABLE date_table
 (
diff --git a/tests/queries/0_stateless/02009_array_join_partition.sql b/tests/queries/0_stateless/02009_array_join_partition.sql
index a78efe96f66..1b99deec0f9 100644
--- a/tests/queries/0_stateless/02009_array_join_partition.sql
+++ b/tests/queries/0_stateless/02009_array_join_partition.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 CREATE TABLE table_2009_part (`i` Int64, `d` Date, `s` String) ENGINE = MergeTree PARTITION BY toYYYYMM(d) ORDER BY i;
 
 ALTER TABLE table_2009_part ATTACH PARTITION tuple(arrayJoin([0, 1])); -- {serverError 248}
diff --git a/tests/queries/0_stateless/02009_mysql_client_empty_result.sh b/tests/queries/0_stateless/02009_mysql_client_empty_result.sh
index cc1d0aece77..f9fef73e64b 100755
--- a/tests/queries/0_stateless/02009_mysql_client_empty_result.sh
+++ b/tests/queries/0_stateless/02009_mysql_client_empty_result.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql b/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
index 5c0668cb839..684cc365b73 100644
--- a/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
+++ b/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table (id UInt64) ENGINE=TinyLog;
 INSERT INTO test_table VALUES (0);
diff --git a/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql b/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
index 9e25df0f41a..5f53984a8e4 100644
--- a/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
+++ b/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
@@ -1,3 +1,6 @@
+-- Tags: replica, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 create table enum_alter_issue (a Enum8('one' = 1, 'two' = 2)) engine = MergeTree() ORDER BY a;
 insert into enum_alter_issue values ('one'), ('two');
 alter table enum_alter_issue modify column a Enum8('one' = 1, 'two' = 2, 'three' = 3);
diff --git a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
index 4f750fb99c4..87d45c9d566 100644
--- a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
+++ b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
 DROP TABLE IF EXISTS table_with_range;
 
 CREATE TABLE table_with_range(`name` String,`number` UInt32)　ENGINE = S3('http://localhost:11111/test/tsv_with_header.tsv', 'test', 'testtest', 'TSVWithNames')　SETTINGS input_format_with_names_use_header = 1;
diff --git a/tests/queries/0_stateless/02012_sha512_fixedstring.sql b/tests/queries/0_stateless/02012_sha512_fixedstring.sql
index 8ea0fbb2f4e..cd014a58e65 100644
--- a/tests/queries/0_stateless/02012_sha512_fixedstring.sql
+++ b/tests/queries/0_stateless/02012_sha512_fixedstring.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT hex(SHA512(''));
 SELECT hex(SHA512('abc'));
 
diff --git a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
index 0c95c7ff403..790db4c5c3d 100644
--- a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
+++ b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 create table enum_alter_issue (a Enum8('one' = 1, 'two' = 2), b Int)
 engine = ReplicatedMergeTree('/clickhouse/tables/{database}/test_02012/enum_alter_issue', 'r1')
 ORDER BY a;
diff --git a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
index e86023c96fa..697758be0c8 100644
--- a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
+++ b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 drop table if exists enum_alter_issue;
 create table enum_alter_issue (a Enum16('one' = 1, 'two' = 2), b Int)
 engine = ReplicatedMergeTree('/clickhouse/tables/{database}/test_02012/enum_alter_issue', 'r2')
diff --git a/tests/queries/0_stateless/02013_zlib_read_after_eof.sh b/tests/queries/0_stateless/02013_zlib_read_after_eof.sh
index d74dca6cc61..a4a20fe5970 100755
--- a/tests/queries/0_stateless/02013_zlib_read_after_eof.sh
+++ b/tests/queries/0_stateless/02013_zlib_read_after_eof.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on Go
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02015_async_inserts_1.reference b/tests/queries/0_stateless/02015_async_inserts_1.reference
new file mode 100644
index 00000000000..85305b34657
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_1.reference
@@ -0,0 +1,12 @@
+1	a
+2	b
+3	c
+4	d
+5	e
+6	f
+7	g
+8	h
+9	i
+10	j
+11	k
+12	l
diff --git a/tests/queries/0_stateless/02015_async_inserts_1.sh b/tests/queries/0_stateless/02015_async_inserts_1.sh
new file mode 100755
index 00000000000..b4310f5101c
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_1.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = Memory"
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+1,"a"
+2,"b"' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+3,"c"
+4,"d"
+' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 5, "s": "e"} {"id": 6, "s": "f"}' &
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 7, "s": "g"} {"id": 8, "s": "h"}' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSVWithNames
+"id","s"
+9,"i"
+10,"j"' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSVWithNames
+"id","s"
+11,"k"
+12,"l"
+' &
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_2.reference b/tests/queries/0_stateless/02015_async_inserts_2.reference
new file mode 100644
index 00000000000..d5b35a8f8af
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_2.reference
@@ -0,0 +1,6 @@
+Code: 27
+1	a
+2	b
+3	d
+4	c
+all_1_1_0	4	0
diff --git a/tests/queries/0_stateless/02015_async_inserts_2.sh b/tests/queries/0_stateless/02015_async_inserts_2.sh
new file mode 100755
index 00000000000..90f5584d84e
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_2.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id"
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+1,"a"
+2,"b"' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+qqqqqqqqqqq' 2>&1 | grep -o "Code: 27" &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+4,"c"
+3,"d"' &
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+${CLICKHOUSE_CLIENT} -q "SELECT name, rows, level FROM system.parts WHERE table = 'async_inserts' AND database = '$CLICKHOUSE_DATABASE' ORDER BY name"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_3.reference b/tests/queries/0_stateless/02015_async_inserts_3.reference
new file mode 100644
index 00000000000..4c5b75aff3e
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_3.reference
@@ -0,0 +1,8 @@
+1	1
+2	4
+3	9
+4	16
+5	25
+6	36
+7	49
+8	64
diff --git a/tests/queries/0_stateless/02015_async_inserts_3.sh b/tests/queries/0_stateless/02015_async_inserts_3.sh
new file mode 100755
index 00000000000..9d85d81caac
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_3.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, v UInt32 DEFAULT id * id) ENGINE = Memory"
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+1,
+2,' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+3,
+4,
+' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 5} {"id": 6}' &
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 7} {"id": 8}' &
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_4.reference b/tests/queries/0_stateless/02015_async_inserts_4.reference
new file mode 100644
index 00000000000..d169dbeba50
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_4.reference
@@ -0,0 +1,3 @@
+Not enough privileges
+1	a
+2	b
diff --git a/tests/queries/0_stateless/02015_async_inserts_4.sh b/tests/queries/0_stateless/02015_async_inserts_4.sh
new file mode 100755
index 00000000000..65598923b96
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_4.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u_02015_allowed"
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u_02015_denied"
+${CLICKHOUSE_CLIENT} -q "DROP ROLE IF EXISTS role_02015"
+
+${CLICKHOUSE_CLIENT} -q "CREATE ROLE role_02015"
+${CLICKHOUSE_CLIENT} -q "CREATE USER u_02015_allowed";
+${CLICKHOUSE_CLIENT} -q "CREATE USER u_02015_denied";
+
+${CLICKHOUSE_CLIENT} -q "REVOKE ALL ON *.* FROM u_02015_allowed"
+${CLICKHOUSE_CLIENT} -q "REVOKE ALL ON *.* FROM u_02015_denied"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "GRANT INSERT ON async_inserts TO role_02015"
+${CLICKHOUSE_CLIENT} -q "GRANT role_02015 to u_02015_allowed"
+
+${CLICKHOUSE_CURL} -sS "$url&user=u_02015_denied" \
+    -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 1, "s": "a"} {"id": 2, "s": "b"}' \
+    | grep -o "Not enough privileges"
+
+${CLICKHOUSE_CURL} -sS "$url&user=u_02015_allowed" \
+    -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 1, "s": "a"} {"id": 2, "s": "b"}'
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
+${CLICKHOUSE_CLIENT} -q "DROP USER u_02015_allowed"
+${CLICKHOUSE_CLIENT} -q "DROP USER u_02015_denied"
+${CLICKHOUSE_CLIENT} -q "DROP ROLE role_02015"
diff --git a/tests/queries/0_stateless/02015_async_inserts_5.reference b/tests/queries/0_stateless/02015_async_inserts_5.reference
new file mode 100644
index 00000000000..0ba3573ae14
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_5.reference
@@ -0,0 +1,3 @@
+Too many parts
+Too many parts
+Too many parts
diff --git a/tests/queries/0_stateless/02015_async_inserts_5.sh b/tests/queries/0_stateless/02015_async_inserts_5.sh
new file mode 100755
index 00000000000..05ea876b101
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_5.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id SETTINGS parts_to_throw_insert = 1"
+${CLICKHOUSE_CLIENT} -q "SYSTEM STOP MERGES $CLICKHOUSE_DATABASE.async_inserts"
+
+${CLICKHOUSE_CLIENT} -q "INSERT INTO async_inserts VALUES (1, 's')"
+
+for _ in {1..3}; do
+    ${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 2, "s": "a"} {"id": 3, "s": "b"}' \
+        | grep -o "Too many parts" &
+done
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_6.reference b/tests/queries/0_stateless/02015_async_inserts_6.reference
new file mode 100644
index 00000000000..f3a80cd0cdf
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_6.reference
@@ -0,0 +1,4 @@
+Code: 60
+Code: 73
+Code: 73
+Code: 16
diff --git a/tests/queries/0_stateless/02015_async_inserts_6.sh b/tests/queries/0_stateless/02015_async_inserts_6.sh
new file mode 100755
index 00000000000..94091783081
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_6.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = Memory"
+
+${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts1 FORMAT JSONEachRow {"id": 1, "s": "a"}'  \
+    | grep -o "Code: 60"
+
+${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts FORMAT BadFormat {"id": 1, "s": "a"}'  \
+    | grep -o "Code: 73"
+
+${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts FORMAT Pretty {"id": 1, "s": "a"}'  \
+    | grep -o "Code: 73"
+
+${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts (id, a) FORMAT JSONEachRow {"id": 1, "s": "a"}'  \
+    | grep -o "Code: 16"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_stress_long.reference b/tests/queries/0_stateless/02015_async_inserts_stress_long.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_stress_long.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02015_async_inserts_stress_long.sh b/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
new file mode 100755
index 00000000000..f9a58818404
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+set -e
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function insert1()
+{
+    url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
+    while true; do
+        ${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+1,"a"
+2,"b"
+'
+    done
+}
+
+function insert2()
+{
+    url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
+    while true; do
+        ${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 5, "s": "e"} {"id": 6, "s": "f"}'
+    done
+}
+
+function select1()
+{
+    while true; do
+        ${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts FORMAT Null"
+    done
+}
+
+function select2()
+{
+    while true; do
+        ${CLICKHOUSE_CLIENT} -q "SELECT * FROM system.asynchronous_inserts FORMAT Null"
+    done
+}
+
+function truncate1()
+{
+    while true; do
+        sleep 0.1
+        ${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE async_inserts"
+    done
+}
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id"
+
+TIMEOUT=10
+
+export -f insert1
+export -f insert2
+export -f select1
+export -f select2
+export -f truncate1
+
+for _ in {1..5}; do
+    timeout $TIMEOUT bash -c insert1 &
+    timeout $TIMEOUT bash -c insert2 &
+done
+
+timeout $TIMEOUT bash -c select1 &
+timeout $TIMEOUT bash -c select2 &
+timeout $TIMEOUT bash -c truncate1 &
+
+wait
+echo "OK"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts";
diff --git a/tests/queries/0_stateless/02015_shard_crash_clang_12_build.reference b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
new file mode 100755
index 00000000000..256297e253e
--- /dev/null
+++ b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# Tags: shard
+
+# This test reproduces crash in case of insufficient coroutines stack size
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS local"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS distributed"
+
+$CLICKHOUSE_CLIENT --query "CREATE TABLE local (x UInt8) ENGINE = Memory;"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE distributed AS local ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), local, x);"
+
+$CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "INSERT INTO distributed SELECT number FROM numbers(256);"
+$CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SYSTEM FLUSH DISTRIBUTED distributed;"
+
+function select_thread()
+{
+    while true; do
+        $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SELECT count() FROM local" >/dev/null
+        $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SELECT count() FROM distributed" >/dev/null
+    done
+}
+
+export -f select_thread;
+
+TIMEOUT=30
+
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+
+wait
+
+$CLICKHOUSE_CLIENT --query "SELECT 1"
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS local"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS distributed"
diff --git a/tests/queries/0_stateless/02015_system_views.reference b/tests/queries/0_stateless/02015_system_views.reference
deleted file mode 100644
index a1b1b2a9fd3..00000000000
--- a/tests/queries/0_stateless/02015_system_views.reference
+++ /dev/null
@@ -1 +0,0 @@
-02015_db	materialized_view	02015_db	view_source_tb	Materialized
diff --git a/tests/queries/0_stateless/02015_system_views.sql b/tests/queries/0_stateless/02015_system_views.sql
deleted file mode 100644
index a6375dcb591..00000000000
--- a/tests/queries/0_stateless/02015_system_views.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-DROP DATABASE IF EXISTS 02015_db;
-CREATE DATABASE IF NOT EXISTS 02015_db;
-
-DROP TABLE IF EXISTS 02015_db.view_source_tb;
-CREATE TABLE IF NOT EXISTS 02015_db.view_source_tb (a UInt8, s String) ENGINE = MergeTree() ORDER BY a;
-
-DROP TABLE IF EXISTS 02015_db.materialized_view;
-CREATE MATERIALIZED VIEW IF NOT EXISTS 02015_db.materialized_view ENGINE = ReplacingMergeTree() ORDER BY a AS SELECT * FROM 02015_db.view_source_tb;
-
-SELECT * FROM system.views WHERE database='02015_db' and name = 'materialized_view';
-
-DROP TABLE IF EXISTS 02015_db.materialized_view;
-DROP TABLE IF EXISTS 02015_db.view_source_tb;
-DROP DATABASE IF EXISTS 02015_db;
diff --git a/tests/queries/0_stateless/02016_aggregation_spark_bar.reference b/tests/queries/0_stateless/02016_aggregation_spark_bar.reference
new file mode 100644
index 00000000000..cc6cc81037b
--- /dev/null
+++ b/tests/queries/0_stateless/02016_aggregation_spark_bar.reference
@@ -0,0 +1,24 @@
+▁
+▁█
+▃█▁
+▄▅█▁
+▄▄█▇▁
+▃▄▅█▃▁
+▂▅▃▇█▁▂
+▂▅▃▅██ ▁
+▁▅▄▃██▅ ▁
+▁▄▄▂▅▇█▂ ▂
+▁▄▅▂▃▇▆█  ▂
+
+
+
+▁
+▆█▁▃
+▅▁▂█▇
+▁▂▇▆█  ▁
+▁█
+▁█
+▁▁█
+▁▁█
+▁▃▅█
+▁▄▂▇█
diff --git a/tests/queries/0_stateless/02016_aggregation_spark_bar.sql b/tests/queries/0_stateless/02016_aggregation_spark_bar.sql
new file mode 100644
index 00000000000..90403332529
--- /dev/null
+++ b/tests/queries/0_stateless/02016_aggregation_spark_bar.sql
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS spark_bar_test;
+
+CREATE TABLE spark_bar_test (`cnt` UInt64,`event_date` Date) ENGINE = MergeTree ORDER BY event_date SETTINGS index_granularity = 8192;
+
+INSERT INTO spark_bar_test VALUES(1,'2020-01-01'),(4,'2020-01-02'),(5,'2020-01-03'),(2,'2020-01-04'),(3,'2020-01-05'),(7,'2020-01-06'),(6,'2020-01-07'),(8,'2020-01-08'),(2,'2020-01-11');
+
+SELECT sparkbar(1)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(2)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(4)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(5)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(6)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(7)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(8)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(9)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(10)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11)(event_date,cnt) FROM spark_bar_test;
+
+SELECT sparkbar(11,2,5)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,3,7)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,4,11)(event_date,cnt) FROM spark_bar_test;
+
+SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-02'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-05'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-03'),toDate('2020-01-07'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-04'),toDate('2020-01-11'))(event_date,cnt) FROM spark_bar_test;
+
+SELECT sparkbar(2,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(2,toDate('2020-01-02'),toDate('2020-01-09'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-09'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(4,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(5,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
+
+DROP TABLE IF EXISTS spark_bar_test;
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
new file mode 100644
index 00000000000..e6a2b2b6aaf
--- /dev/null
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
@@ -0,0 +1,339 @@
+String ConstConst
+1
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+2	Hello	0001001000011001010110110001101100011011
+3	Hello	0000100100001100101011011000110110001101
+4	Hello	0000010010000110010101101100011011000110
+5	Hello	0000001001000011001010110110001101100011
+6	Hello	0000000100100001100101011011000110110001
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+10	Hello	00010010000110010101101100011011
+11	Hello	00001001000011001010110110001101
+12	Hello	00000100100001100101011011000110
+13	Hello	00000010010000110010101101100011
+14	Hello	00000001001000011001010110110001
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+18	Hello	000100100001100101011011
+19	Hello	000010010000110010101101
+20	Hello	000001001000011001010110
+21	Hello	000000100100001100101011
+22	Hello	000000010010000110010101
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+26	Hello	0001001000011001
+27	Hello	0000100100001100
+28	Hello	0000010010000110
+29	Hello	0000001001000011
+30	Hello	0000000100100001
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+34	Hello	00010010
+35	Hello	00001001
+36	Hello	00000100
+37	Hello	00000010
+38	Hello	00000001
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+FixedString ConstConst
+1
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+2	Hello\0\0\0\0\0	00010010000110010101101100011011000110111100000000000000000000000000000000000000
+3	Hello\0\0\0\0\0	00001001000011001010110110001101100011011110000000000000000000000000000000000000
+4	Hello\0\0\0\0\0	00000100100001100101011011000110110001101111000000000000000000000000000000000000
+5	Hello\0\0\0\0\0	00000010010000110010101101100011011000110111100000000000000000000000000000000000
+6	Hello\0\0\0\0\0	00000001001000011001010110110001101100011011110000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+10	Hello\0\0\0\0\0	00000000000100100001100101011011000110110001101111000000000000000000000000000000
+11	Hello\0\0\0\0\0	00000000000010010000110010101101100011011000110111100000000000000000000000000000
+12	Hello\0\0\0\0\0	00000000000001001000011001010110110001101100011011110000000000000000000000000000
+13	Hello\0\0\0\0\0	00000000000000100100001100101011011000110110001101111000000000000000000000000000
+14	Hello\0\0\0\0\0	00000000000000010010000110010101101100011011000110111100000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+18	Hello\0\0\0\0\0	00000000000000000001001000011001010110110001101100011011110000000000000000000000
+19	Hello\0\0\0\0\0	00000000000000000000100100001100101011011000110110001101111000000000000000000000
+20	Hello\0\0\0\0\0	00000000000000000000010010000110010101101100011011000110111100000000000000000000
+21	Hello\0\0\0\0\0	00000000000000000000001001000011001010110110001101100011011110000000000000000000
+22	Hello\0\0\0\0\0	00000000000000000000000100100001100101011011000110110001101111000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+26	Hello\0\0\0\0\0	00000000000000000000000000010010000110010101101100011011000110111100000000000000
+27	Hello\0\0\0\0\0	00000000000000000000000000001001000011001010110110001101100011011110000000000000
+28	Hello\0\0\0\0\0	00000000000000000000000000000100100001100101011011000110110001101111000000000000
+29	Hello\0\0\0\0\0	00000000000000000000000000000010010000110010101101100011011000110111100000000000
+30	Hello\0\0\0\0\0	00000000000000000000000000000001001000011001010110110001101100011011110000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+34	Hello\0\0\0\0\0	00000000000000000000000000000000000100100001100101011011000110110001101111000000
+35	Hello\0\0\0\0\0	00000000000000000000000000000000000010010000110010101101100011011000110111100000
+36	Hello\0\0\0\0\0	00000000000000000000000000000000000001001000011001010110110001101100011011110000
+37	Hello\0\0\0\0\0	00000000000000000000000000000000000000100100001100101011011000110110001101111000
+38	Hello\0\0\0\0\0	00000000000000000000000000000000000000010010000110010101101100011011000110111100
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+77	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000010
+78	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000001
+79	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+80	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+81	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+
+String VectorVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+
+FixedString VectorVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
+
+String VectorConst
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hel	000000001001000011001010
+7	Hel	000000001001000011001010
+7	Hel	000000001001000011001010
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hel	0100100001100101
+8	Hel	0100100001100101
+8	Hel	0100100001100101
+
+FixedString VectorConst
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+
+String ConstVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+-1	Hel	
+0	Hel	010010000110010101101100
+1	Hel	001001000011001010110110
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+15	Hel	0000000010010000
+16	Hel	01001000
+17	Hel	00100100
+23	Hel	00000000
+24	Hel	
+25	Hel	
+31	Hel	
+32	Hel	
+33	Hel	
+39	Hel	
+40	Hel	
+41	Hel	
+42	Hel	
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+
+FixedString ConstVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+-1	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hel\0\0\0\0\0\0\0	01001000011001010110110000000000000000000000000000000000000000000000000000000000
+1	Hel\0\0\0\0\0\0\0	00100100001100101011011000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
+15	Hel\0\0\0\0\0\0\0	00000000000000001001000011001010110110000000000000000000000000000000000000000000
+16	Hel\0\0\0\0\0\0\0	00000000000000000100100001100101011011000000000000000000000000000000000000000000
+17	Hel\0\0\0\0\0\0\0	00000000000000000010010000110010101101100000000000000000000000000000000000000000
+23	Hel\0\0\0\0\0\0\0	00000000000000000000000010010000110010101101100000000000000000000000000000000000
+24	Hel\0\0\0\0\0\0\0	00000000000000000000000001001000011001010110110000000000000000000000000000000000
+25	Hel\0\0\0\0\0\0\0	00000000000000000000000000100100001100101011011000000000000000000000000000000000
+31	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000000000000000000000000000
+32	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100000000000000000000000000
+33	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110000000000000000000000000
+39	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110000000000000000000
+40	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000000000000000000
+41	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100000000000000000
+42	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
new file mode 100644
index 00000000000..0ee04e408ba
--- /dev/null
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
@@ -0,0 +1,134 @@
+SELECT 'String ConstConst';
+SELECT bin('Hello') == bin(bitShiftRight('Hello', 0));
+SELECT 0, 'Hello',bin(bitShiftRight('Hello', 0));
+SELECT 1, 'Hello',bin(bitShiftRight('Hello', 1));
+SELECT 2, 'Hello',bin(bitShiftRight('Hello', 2));
+SELECT 3, 'Hello',bin(bitShiftRight('Hello', 3));
+SELECT 4, 'Hello',bin(bitShiftRight('Hello', 4));
+SELECT 5, 'Hello',bin(bitShiftRight('Hello', 5));
+SELECT 6, 'Hello',bin(bitShiftRight('Hello', 6));
+SELECT 7, 'Hello',bin(bitShiftRight('Hello', 7));
+SELECT 8, 'Hello',bin(bitShiftRight('Hello', 8));
+SELECT 9, 'Hello',bin(bitShiftRight('Hello', 9));
+SELECT 10,'Hello',bin(bitShiftRight('Hello', 10));
+SELECT 11,'Hello',bin(bitShiftRight('Hello', 11));
+SELECT 12,'Hello',bin(bitShiftRight('Hello', 12));
+SELECT 13,'Hello',bin(bitShiftRight('Hello', 13));
+SELECT 14,'Hello',bin(bitShiftRight('Hello', 14));
+SELECT 15,'Hello',bin(bitShiftRight('Hello', 15));
+SELECT 16,'Hello',bin(bitShiftRight('Hello', 16));
+SELECT 17,'Hello',bin(bitShiftRight('Hello', 17));
+SELECT 18,'Hello',bin(bitShiftRight('Hello', 18));
+SELECT 19,'Hello',bin(bitShiftRight('Hello', 19));
+SELECT 20,'Hello',bin(bitShiftRight('Hello', 20));
+SELECT 21,'Hello',bin(bitShiftRight('Hello', 21));
+SELECT 22,'Hello',bin(bitShiftRight('Hello', 22));
+SELECT 23,'Hello',bin(bitShiftRight('Hello', 23));
+SELECT 24,'Hello',bin(bitShiftRight('Hello', 24));
+SELECT 25,'Hello',bin(bitShiftRight('Hello', 25));
+SELECT 26,'Hello',bin(bitShiftRight('Hello', 26));
+SELECT 27,'Hello',bin(bitShiftRight('Hello', 27));
+SELECT 28,'Hello',bin(bitShiftRight('Hello', 28));
+SELECT 29,'Hello',bin(bitShiftRight('Hello', 29));
+SELECT 30,'Hello',bin(bitShiftRight('Hello', 30));
+SELECT 31,'Hello',bin(bitShiftRight('Hello', 31));
+SELECT 32,'Hello',bin(bitShiftRight('Hello', 32));
+SELECT 33,'Hello',bin(bitShiftRight('Hello', 33));
+SELECT 34,'Hello',bin(bitShiftRight('Hello', 34));
+SELECT 35,'Hello',bin(bitShiftRight('Hello', 35));
+SELECT 36,'Hello',bin(bitShiftRight('Hello', 36));
+SELECT 37,'Hello',bin(bitShiftRight('Hello', 37));
+SELECT 38,'Hello',bin(bitShiftRight('Hello', 38));
+SELECT 39,'Hello',bin(bitShiftRight('Hello', 39));
+SELECT 40,'Hello',bin(bitShiftRight('Hello', 40));
+SELECT 41,'Hello',bin(bitShiftRight('Hello', 41));
+SELECT 42,'Hello',bin(bitShiftRight('Hello', 42));
+
+SELECT 'FixedString ConstConst';
+SELECT bin(toFixedString('Hello', 10)) == bin(bitShiftRight(toFixedString('Hello', 10), 0));
+SELECT 0, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 0));
+SELECT 1, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 1));
+SELECT 2, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 2));
+SELECT 3, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 3));
+SELECT 4, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 4));
+SELECT 5, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 5));
+SELECT 6, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 6));
+SELECT 7, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 7));
+SELECT 8, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 8));
+SELECT 9, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 9));
+SELECT 10,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 10));
+SELECT 11,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 11));
+SELECT 12,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 12));
+SELECT 13,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 13));
+SELECT 14,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 14));
+SELECT 15,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 15));
+SELECT 16,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 16));
+SELECT 17,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 17));
+SELECT 18,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 18));
+SELECT 19,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 19));
+SELECT 20,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 20));
+SELECT 21,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 21));
+SELECT 22,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 22));
+SELECT 23,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 23));
+SELECT 24,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 24));
+SELECT 25,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 25));
+SELECT 26,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 26));
+SELECT 27,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 27));
+SELECT 28,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 28));
+SELECT 29,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 29));
+SELECT 30,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 30));
+SELECT 31,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 31));
+SELECT 32,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 32));
+SELECT 33,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 33));
+SELECT 34,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 34));
+SELECT 35,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 35));
+SELECT 36,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 36));
+SELECT 37,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 37));
+SELECT 38,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 38));
+SELECT 39,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 39));
+SELECT 40,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 40));
+SELECT 41,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 41));
+SELECT 42,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 42));
+SELECT 77,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 77));
+SELECT 78,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 78));
+SELECT 79,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 79));
+SELECT 80,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 80));
+SELECT 81,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 81));
+
+DROP TABLE IF EXISTS test_bit_shift_right_string_integer;
+
+CREATE TABLE test_bit_shift_right_string_integer (str String, fixedStr FixedString(10), id Int64) engine=Log;
+
+INSERT INTO test_bit_shift_right_string_integer VALUES('Hello','Hello',-1)('Hello','Hello',0),('Hello','Hello',1),('Hello','Hello',7),('Hello','Hello',8),('Hello','Hello',9),('Hello','Hello',15),('Hello','Hello',16),('Hello','Hello',17),('Hello','Hello',23),('Hello','Hello',24),('Hello','Hello',25),('Hello','Hello',31),('Hello','Hello',32),('Hello','Hello',33),('Hello','Hello',39),('Hello','Hello',40),('Hello','Hello',41),('Hello','Hello',42),('Hel','Hel',7),('Hel','Hel',8),('Hel','Hel',9);
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String VectorVector';
+SELECT id as shift_right_bit,str as arg,bin(bitShiftRight(str, id)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,str as arg,bin(bitShiftRight(str, id)) as string_res FROM test_bit_shift_right_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftRight('Hello', 42));
+SELECT 'FixedString VectorVector';
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, id)) as fixed_string_res FROM test_bit_shift_right_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String VectorConst';
+SELECT 7 as shift_right_bit,str as arg,bin(bitShiftRight(str, 7)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT 8 as shift_right_bit,str as arg,bin(bitShiftRight(str, 8)) as string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'FixedString VectorConst';
+SELECT 7 as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, 7)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT 8 as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, 8)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String ConstVector';
+SELECT id as shift_right_bit,'Hello' as arg,bin(bitShiftRight('Hello', id)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,'Hel' as arg,bin(bitShiftRight('Hel', id)) as string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'FixedString ConstVector';
+SELECT id as shift_right_bit,toFixedString('Hello', 10) as arg,bin(bitShiftRight(toFixedString('Hello', 10), id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,toFixedString('Hel', 10) as arg,bin(bitShiftRight(toFixedString('Hel', 10), id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+
+DROP TABLE IF EXISTS test_bit_shift_right_string_integer;
diff --git a/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference
new file mode 100644
index 00000000000..ff5a09c0d48
--- /dev/null
+++ b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference
@@ -0,0 +1,339 @@
+String ConstConst
+1
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+2	Hello	000000010010000110010101101100011011000110111100
+3	Hello	000000100100001100101011011000110110001101111000
+4	Hello	000001001000011001010110110001101100011011110000
+5	Hello	000010010000110010101101100011011000110111100000
+6	Hello	000100100001100101011011000110110001101111000000
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+10	Hello	00000001001000011001010110110001101100011011110000000000
+11	Hello	00000010010000110010101101100011011000110111100000000000
+12	Hello	00000100100001100101011011000110110001101111000000000000
+13	Hello	00001001000011001010110110001101100011011110000000000000
+14	Hello	00010010000110010101101100011011000110111100000000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+18	Hello	0000000100100001100101011011000110110001101111000000000000000000
+19	Hello	0000001001000011001010110110001101100011011110000000000000000000
+20	Hello	0000010010000110010101101100011011000110111100000000000000000000
+21	Hello	0000100100001100101011011000110110001101111000000000000000000000
+22	Hello	0001001000011001010110110001101100011011110000000000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+26	Hello	000000010010000110010101101100011011000110111100000000000000000000000000
+27	Hello	000000100100001100101011011000110110001101111000000000000000000000000000
+28	Hello	000001001000011001010110110001101100011011110000000000000000000000000000
+29	Hello	000010010000110010101101100011011000110111100000000000000000000000000000
+30	Hello	000100100001100101011011000110110001101111000000000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+34	Hello	00000001001000011001010110110001101100011011110000000000000000000000000000000000
+35	Hello	00000010010000110010101101100011011000110111100000000000000000000000000000000000
+36	Hello	00000100100001100101011011000110110001101111000000000000000000000000000000000000
+37	Hello	00001001000011001010110110001101100011011110000000000000000000000000000000000000
+38	Hello	00010010000110010101101100011011000110111100000000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+FixedString ConstConst
+1
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+2	Hello\0\0\0\0\0	00100001100101011011000110110001101111000000000000000000000000000000000000000000
+3	Hello\0\0\0\0\0	01000011001010110110001101100011011110000000000000000000000000000000000000000000
+4	Hello\0\0\0\0\0	10000110010101101100011011000110111100000000000000000000000000000000000000000000
+5	Hello\0\0\0\0\0	00001100101011011000110110001101111000000000000000000000000000000000000000000000
+6	Hello\0\0\0\0\0	00011001010110110001101100011011110000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+10	Hello\0\0\0\0\0	10010101101100011011000110111100000000000000000000000000000000000000000000000000
+11	Hello\0\0\0\0\0	00101011011000110110001101111000000000000000000000000000000000000000000000000000
+12	Hello\0\0\0\0\0	01010110110001101100011011110000000000000000000000000000000000000000000000000000
+13	Hello\0\0\0\0\0	10101101100011011000110111100000000000000000000000000000000000000000000000000000
+14	Hello\0\0\0\0\0	01011011000110110001101111000000000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+18	Hello\0\0\0\0\0	10110001101100011011110000000000000000000000000000000000000000000000000000000000
+19	Hello\0\0\0\0\0	01100011011000110111100000000000000000000000000000000000000000000000000000000000
+20	Hello\0\0\0\0\0	11000110110001101111000000000000000000000000000000000000000000000000000000000000
+21	Hello\0\0\0\0\0	10001101100011011110000000000000000000000000000000000000000000000000000000000000
+22	Hello\0\0\0\0\0	00011011000110111100000000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+26	Hello\0\0\0\0\0	10110001101111000000000000000000000000000000000000000000000000000000000000000000
+27	Hello\0\0\0\0\0	01100011011110000000000000000000000000000000000000000000000000000000000000000000
+28	Hello\0\0\0\0\0	11000110111100000000000000000000000000000000000000000000000000000000000000000000
+29	Hello\0\0\0\0\0	10001101111000000000000000000000000000000000000000000000000000000000000000000000
+30	Hello\0\0\0\0\0	00011011110000000000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+34	Hello\0\0\0\0\0	10111100000000000000000000000000000000000000000000000000000000000000000000000000
+35	Hello\0\0\0\0\0	01111000000000000000000000000000000000000000000000000000000000000000000000000000
+36	Hello\0\0\0\0\0	11110000000000000000000000000000000000000000000000000000000000000000000000000000
+37	Hello\0\0\0\0\0	11100000000000000000000000000000000000000000000000000000000000000000000000000000
+38	Hello\0\0\0\0\0	11000000000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+77	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+78	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+79	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+80	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+81	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+
+String VectorVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+
+FixedString VectorVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+
+String VectorConst
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hel	00100100001100101011011000000000
+7	Hel	00100100001100101011011000000000
+7	Hel	00100100001100101011011000000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hel	01001000011001010110110000000000
+8	Hel	01001000011001010110110000000000
+8	Hel	01001000011001010110110000000000
+
+FixedString VectorConst
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+
+String ConstVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+-1	Hel	
+0	Hel	010010000110010101101100
+1	Hel	00000000100100001100101011011000
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+15	Hel	0010010000110010101101100000000000000000
+16	Hel	0100100001100101011011000000000000000000
+17	Hel	000000001001000011001010110110000000000000000000
+23	Hel	001001000011001010110110000000000000000000000000
+24	Hel	
+25	Hel	
+31	Hel	
+32	Hel	
+33	Hel	
+39	Hel	
+40	Hel	
+41	Hel	
+42	Hel	
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+
+FixedString ConstVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+-1	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hel\0\0\0\0\0\0\0	01001000011001010110110000000000000000000000000000000000000000000000000000000000
+1	Hel\0\0\0\0\0\0\0	10010000110010101101100000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+15	Hel\0\0\0\0\0\0\0	10110110000000000000000000000000000000000000000000000000000000000000000000000000
+16	Hel\0\0\0\0\0\0\0	01101100000000000000000000000000000000000000000000000000000000000000000000000000
+17	Hel\0\0\0\0\0\0\0	11011000000000000000000000000000000000000000000000000000000000000000000000000000
+23	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+24	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+25	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+31	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+32	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
diff --git a/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql
new file mode 100644
index 00000000000..5c7a9901dae
--- /dev/null
+++ b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql
@@ -0,0 +1,134 @@
+SELECT 'String ConstConst';
+SELECT bin('Hello') == bin(bitShiftLeft('Hello', 0));
+SELECT 0, 'Hello',bin(bitShiftLeft('Hello', 0));
+SELECT 1, 'Hello',bin(bitShiftLeft('Hello', 1));
+SELECT 2, 'Hello',bin(bitShiftLeft('Hello', 2));
+SELECT 3, 'Hello',bin(bitShiftLeft('Hello', 3));
+SELECT 4, 'Hello',bin(bitShiftLeft('Hello', 4));
+SELECT 5, 'Hello',bin(bitShiftLeft('Hello', 5));
+SELECT 6, 'Hello',bin(bitShiftLeft('Hello', 6));
+SELECT 7, 'Hello',bin(bitShiftLeft('Hello', 7));
+SELECT 8, 'Hello',bin(bitShiftLeft('Hello', 8));
+SELECT 9, 'Hello',bin(bitShiftLeft('Hello', 9));
+SELECT 10,'Hello',bin(bitShiftLeft('Hello', 10));
+SELECT 11,'Hello',bin(bitShiftLeft('Hello', 11));
+SELECT 12,'Hello',bin(bitShiftLeft('Hello', 12));
+SELECT 13,'Hello',bin(bitShiftLeft('Hello', 13));
+SELECT 14,'Hello',bin(bitShiftLeft('Hello', 14));
+SELECT 15,'Hello',bin(bitShiftLeft('Hello', 15));
+SELECT 16,'Hello',bin(bitShiftLeft('Hello', 16));
+SELECT 17,'Hello',bin(bitShiftLeft('Hello', 17));
+SELECT 18,'Hello',bin(bitShiftLeft('Hello', 18));
+SELECT 19,'Hello',bin(bitShiftLeft('Hello', 19));
+SELECT 20,'Hello',bin(bitShiftLeft('Hello', 20));
+SELECT 21,'Hello',bin(bitShiftLeft('Hello', 21));
+SELECT 22,'Hello',bin(bitShiftLeft('Hello', 22));
+SELECT 23,'Hello',bin(bitShiftLeft('Hello', 23));
+SELECT 24,'Hello',bin(bitShiftLeft('Hello', 24));
+SELECT 25,'Hello',bin(bitShiftLeft('Hello', 25));
+SELECT 26,'Hello',bin(bitShiftLeft('Hello', 26));
+SELECT 27,'Hello',bin(bitShiftLeft('Hello', 27));
+SELECT 28,'Hello',bin(bitShiftLeft('Hello', 28));
+SELECT 29,'Hello',bin(bitShiftLeft('Hello', 29));
+SELECT 30,'Hello',bin(bitShiftLeft('Hello', 30));
+SELECT 31,'Hello',bin(bitShiftLeft('Hello', 31));
+SELECT 32,'Hello',bin(bitShiftLeft('Hello', 32));
+SELECT 33,'Hello',bin(bitShiftLeft('Hello', 33));
+SELECT 34,'Hello',bin(bitShiftLeft('Hello', 34));
+SELECT 35,'Hello',bin(bitShiftLeft('Hello', 35));
+SELECT 36,'Hello',bin(bitShiftLeft('Hello', 36));
+SELECT 37,'Hello',bin(bitShiftLeft('Hello', 37));
+SELECT 38,'Hello',bin(bitShiftLeft('Hello', 38));
+SELECT 39,'Hello',bin(bitShiftLeft('Hello', 39));
+SELECT 40,'Hello',bin(bitShiftLeft('Hello', 40));
+SELECT 41,'Hello',bin(bitShiftLeft('Hello', 41));
+SELECT 42,'Hello',bin(bitShiftLeft('Hello', 42));
+
+SELECT 'FixedString ConstConst';
+SELECT bin(toFixedString('Hello', 10)) == bin(bitShiftLeft(toFixedString('Hello', 10), 0));
+SELECT 0, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 0));
+SELECT 1, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 1));
+SELECT 2, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 2));
+SELECT 3, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 3));
+SELECT 4, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 4));
+SELECT 5, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 5));
+SELECT 6, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 6));
+SELECT 7, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 7));
+SELECT 8, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 8));
+SELECT 9, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 9));
+SELECT 10,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 10));
+SELECT 11,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 11));
+SELECT 12,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 12));
+SELECT 13,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 13));
+SELECT 14,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 14));
+SELECT 15,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 15));
+SELECT 16,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 16));
+SELECT 17,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 17));
+SELECT 18,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 18));
+SELECT 19,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 19));
+SELECT 20,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 20));
+SELECT 21,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 21));
+SELECT 22,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 22));
+SELECT 23,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 23));
+SELECT 24,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 24));
+SELECT 25,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 25));
+SELECT 26,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 26));
+SELECT 27,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 27));
+SELECT 28,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 28));
+SELECT 29,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 29));
+SELECT 30,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 30));
+SELECT 31,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 31));
+SELECT 32,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 32));
+SELECT 33,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 33));
+SELECT 34,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 34));
+SELECT 35,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 35));
+SELECT 36,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 36));
+SELECT 37,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 37));
+SELECT 38,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 38));
+SELECT 39,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 39));
+SELECT 40,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 40));
+SELECT 41,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 41));
+SELECT 42,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 42));
+SELECT 77,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 77));
+SELECT 78,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 78));
+SELECT 79,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 79));
+SELECT 80,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 80));
+SELECT 81,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 81));
+
+DROP TABLE IF EXISTS test_bit_shift_left_string_integer;
+
+CREATE TABLE test_bit_shift_left_string_integer (str String, fixedStr FixedString(10), id Int64) engine=Log;
+
+INSERT INTO test_bit_shift_left_string_integer VALUES('Hello','Hello',-1)('Hello','Hello',0),('Hello','Hello',1),('Hello','Hello',7),('Hello','Hello',8),('Hello','Hello',9),('Hello','Hello',15),('Hello','Hello',16),('Hello','Hello',17),('Hello','Hello',23),('Hello','Hello',24),('Hello','Hello',25),('Hello','Hello',31),('Hello','Hello',32),('Hello','Hello',33),('Hello','Hello',39),('Hello','Hello',40),('Hello','Hello',41),('Hello','Hello',42),('Hel','Hel',7),('Hel','Hel',8),('Hel','Hel',9);
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String VectorVector';
+SELECT id as shift_right_bit,str as arg,bin(bitShiftLeft(str, id)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,str as arg,bin(bitShiftLeft(str, id)) as string_res FROM test_bit_shift_left_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftLeft('Hello', 42));
+SELECT 'FixedString VectorVector';
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, id)) as fixed_string_res FROM test_bit_shift_left_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String VectorConst';
+SELECT 7 as shift_right_bit,str as arg,bin(bitShiftLeft(str, 7)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT 8 as shift_right_bit,str as arg,bin(bitShiftLeft(str, 8)) as string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'FixedString VectorConst';
+SELECT 7 as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, 7)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT 8 as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, 8)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String ConstVector';
+SELECT id as shift_right_bit,'Hello' as arg,bin(bitShiftLeft('Hello', id)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,'Hel' as arg,bin(bitShiftLeft('Hel', id)) as string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'FixedString ConstVector';
+SELECT id as shift_right_bit,toFixedString('Hello', 10) as arg,bin(bitShiftLeft(toFixedString('Hello', 10), id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,toFixedString('Hel', 10) as arg,bin(bitShiftLeft(toFixedString('Hel', 10), id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+
+DROP TABLE IF EXISTS test_bit_shift_left_string_integer;
diff --git a/tests/queries/0_stateless/02017_columns_with_dot_2.reference b/tests/queries/0_stateless/02017_columns_with_dot_2.reference
new file mode 100644
index 00000000000..8d43601632c
--- /dev/null
+++ b/tests/queries/0_stateless/02017_columns_with_dot_2.reference
@@ -0,0 +1,2 @@
+123	asd	[1,2]
+123	asd	[1,2]	0
diff --git a/tests/queries/0_stateless/02017_columns_with_dot_2.sql b/tests/queries/0_stateless/02017_columns_with_dot_2.sql
new file mode 100644
index 00000000000..eefe52b74f3
--- /dev/null
+++ b/tests/queries/0_stateless/02017_columns_with_dot_2.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS test_nested;
+
+CREATE TABLE test_nested
+(
+    `id` String,
+    `with_dot.str` String,
+    `with_dot.array` Array(Int32)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+INSERT INTO test_nested VALUES('123', 'asd', [1,2]);
+SELECT * FROM test_nested;
+
+ALTER TABLE test_nested ADD COLUMN `with_dot.bool` UInt8;
+SELECT * FROM test_nested;
+
+DROP TABLE test_nested;
diff --git a/tests/queries/0_stateless/02017_create_distributed_table_coredump.reference b/tests/queries/0_stateless/02017_create_distributed_table_coredump.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql b/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql
new file mode 100644
index 00000000000..a7a77672aa9
--- /dev/null
+++ b/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql
@@ -0,0 +1,14 @@
+-- Tags: distributed
+
+drop table if exists t;
+drop table if exists td1;
+drop table if exists td2;
+drop table if exists td3;
+create table t (val UInt32) engine = MergeTree order by val;
+create table td1 engine = Distributed(test_shard_localhost, currentDatabase(), 't') as t;
+create table td2 engine = Distributed(test_shard_localhost, currentDatabase(), 't', xxHash32(val), default) as t;
+create table td3 engine = Distributed(test_shard_localhost, currentDatabase(), 't', xxHash32(val), 'default') as t;
+drop table if exists t;
+drop table if exists td1; 
+drop table if exists td2; 
+drop table if exists td3; 
diff --git a/tests/queries/0_stateless/02023_nullable_int_uint_where.reference b/tests/queries/0_stateless/02023_nullable_int_uint_where.reference
new file mode 100644
index 00000000000..0811eaa4efb
--- /dev/null
+++ b/tests/queries/0_stateless/02023_nullable_int_uint_where.reference
@@ -0,0 +1 @@
+21585718595728998
diff --git a/tests/queries/0_stateless/02023_nullable_int_uint_where.sql b/tests/queries/0_stateless/02023_nullable_int_uint_where.sql
new file mode 100644
index 00000000000..4318fbf506f
--- /dev/null
+++ b/tests/queries/0_stateless/02023_nullable_int_uint_where.sql
@@ -0,0 +1,10 @@
+drop table if exists t1;
+
+set allow_suspicious_low_cardinality_types = 1;
+create table t1 (id LowCardinality(Nullable(Int64))) engine MergeTree order by id settings allow_nullable_key = 1, index_granularity = 1;
+
+insert into t1 values (21585718595728998), (null);
+
+select * from t1 where id = 21585718595728998;
+
+drop table t1;
diff --git a/tests/queries/0_stateless/02023_transform_or_to_in.reference b/tests/queries/0_stateless/02023_transform_or_to_in.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/02023_transform_or_to_in.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/02023_transform_or_to_in.sql b/tests/queries/0_stateless/02023_transform_or_to_in.sql
new file mode 100644
index 00000000000..c4ceeb76931
--- /dev/null
+++ b/tests/queries/0_stateless/02023_transform_or_to_in.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS t_transform_or;
+
+CREATE TABLE t_transform_or(B AggregateFunction(uniq, String), A String) Engine=MergeTree ORDER BY (A);
+
+INSERT INTO t_transform_or SELECT uniqState(''), '0';
+
+SELECT uniqMergeIf(B, (A = '1') OR (A = '2') OR (A = '3'))
+FROM cluster(test_cluster_two_shards, currentDatabase(), t_transform_or)
+SETTINGS legacy_column_name_of_tuple_literal = 0;
+
+SELECT uniqMergeIf(B, (A = '1') OR (A = '2') OR (A = '3'))
+FROM cluster(test_cluster_two_shards, currentDatabase(), t_transform_or)
+SETTINGS legacy_column_name_of_tuple_literal = 1;
+
+DROP TABLE t_transform_or;
diff --git a/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference
new file mode 100644
index 00000000000..af23232bb2e
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference
@@ -0,0 +1,3 @@
+-- { echo }
+select 1+number+multiIf(number == 1, cityHash64(number), number) from numbers(1) settings compile_expressions=1, min_count_to_compile_expression=0;
+1
diff --git a/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql
new file mode 100644
index 00000000000..113d0d9d4f7
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql
@@ -0,0 +1,2 @@
+-- { echo }
+select 1+number+multiIf(number == 1, cityHash64(number), number) from numbers(1) settings compile_expressions=1, min_count_to_compile_expression=0;
diff --git a/tests/queries/0_stateless/02024_compression_in_query.reference b/tests/queries/0_stateless/02024_compression_in_query.reference
new file mode 100644
index 00000000000..5b5f8363347
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compression_in_query.reference
@@ -0,0 +1,10 @@
+Hello, World! From client.
+Hello, World! From client.
+Hello, World! From client.
+Hello, World! From client.
+Hello, World! From client.
+Hello, World! From local.
+Hello, World! From local.
+Hello, World! From local.
+Hello, World! From local.
+Hello, World! From local.
diff --git a/tests/queries/0_stateless/02024_compression_in_query.sh b/tests/queries/0_stateless/02024_compression_in_query.sh
new file mode 100755
index 00000000000..9daf8d1913c
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compression_in_query.sh
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+#____________________CLIENT__________________
+# clear files from previous tests.
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output.gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz_to_decomp ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz_to_decomp
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_to_decomp ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_to_decomp
+
+# create files using compression method and without it to check that both queries work correct
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM (SELECT 'Hello, World! From client.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM (SELECT 'Hello, World! From client.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'GZ' FORMAT TabSeparated;"
+
+# check content of files
+cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
+gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
+cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp
+
+cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
+gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
+cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp
+
+# create table to check inserts
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_compression_keyword;"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_compression_keyword (text String) Engine=Memory;"
+
+# insert them
+${CLICKHOUSE_CLIENT} --query "INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
+${CLICKHOUSE_CLIENT} --query "INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' COMPRESSION 'gz' FORMAT TabSeparated;"
+${CLICKHOUSE_CLIENT} --query "INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'gz' FORMAT TabSeparated;"
+
+# check result
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_compression_keyword;"
+
+# delete all created elements
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_compression_keyword;"
+
+#____________________LOCAL__________________
+# clear files from previous tests.
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output.gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz
+
+# create files using compression method and without it to check that both queries work correct
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'GZ' FORMAT TabSeparated;"
+
+# check content of files
+cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
+gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
+cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp
+
+cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
+gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
+cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp
+
+# create table to check inserts
+${CLICKHOUSE_LOCAL} --query "
+DROP TABLE IF EXISTS test_compression_keyword;
+CREATE TABLE test_compression_keyword (text String) Engine=Memory;
+INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;
+INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' COMPRESSION 'gz' FORMAT TabSeparated;
+INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'gz' FORMAT TabSeparated;
+SELECT * FROM test_compression_keyword;
+"
+
+# delete all created elements
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
new file mode 100644
index 00000000000..2b3b5b30715
--- /dev/null
+++ b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
@@ -0,0 +1,12 @@
+-- { echo }
+SELECT uniqCombinedIfMerge(n) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+5
+SELECT uniqCombinedIfMergeIf(n, last > 50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+0
+SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMerge(n) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+0
+SELECT uniqCombinedIfMergeIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+5
+SELECT uniqCombinedIfMergeIfIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMergeIfIf(n, last > 5, 1) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
diff --git a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
new file mode 100644
index 00000000000..4811023c198
--- /dev/null
+++ b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
@@ -0,0 +1,8 @@
+-- { echo }
+SELECT uniqCombinedIfMerge(n) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMerge(n) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIfIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMergeIfIf(n, last > 5, 1) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
diff --git a/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference b/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference
new file mode 100644
index 00000000000..431d62da742
--- /dev/null
+++ b/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference
@@ -0,0 +1,8 @@
+0
+0
+0
+0
+0
+0
+40000
+219970
diff --git a/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql b/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql
new file mode 100644
index 00000000000..7d1957a1efc
--- /dev/null
+++ b/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS t_comp_subcolumns;
+
+CREATE TABLE t_comp_subcolumns (id UInt32, n Nullable(String), arr Array(Array(UInt32)))
+ENGINE = MergeTree ORDER BY id;
+
+INSERT INTO t_comp_subcolumns SELECT number, 'a', [range(number % 11), range(number % 13)] FROM numbers(20000);
+
+SELECT sum(n.null) FROM t_comp_subcolumns;
+SELECT n.null FROM t_comp_subcolumns LIMIT 10000, 5;
+
+SELECT sum(arr.size0) FROM t_comp_subcolumns;
+SELECT sumArray(arr.size1) FROM t_comp_subcolumns;
+
+DROP TABLE t_comp_subcolumns;
diff --git a/tests/queries/0_stateless/02026_arrayDifference_const.reference b/tests/queries/0_stateless/02026_arrayDifference_const.reference
new file mode 100644
index 00000000000..7a0beed21a5
--- /dev/null
+++ b/tests/queries/0_stateless/02026_arrayDifference_const.reference
@@ -0,0 +1 @@
+[0,0]
diff --git a/tests/queries/0_stateless/02026_arrayDifference_const.sql b/tests/queries/0_stateless/02026_arrayDifference_const.sql
new file mode 100644
index 00000000000..55a48d2bedb
--- /dev/null
+++ b/tests/queries/0_stateless/02026_arrayDifference_const.sql
@@ -0,0 +1 @@
+SELECT toString(arrayDifference(x->0, [1, 2]));
diff --git a/tests/queries/0_stateless/02026_describe_include_subcolumns.reference b/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
new file mode 100644
index 00000000000..ba792ea9f74
--- /dev/null
+++ b/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
@@ -0,0 +1,23 @@
+┌─name─┬─type────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────┐
+│ d    │ Date                                                │              │                    │                         │                  │                      │
+│ n    │ Nullable(String)                                    │              │                    │ It is a nullable column │                  │                      │
+│ arr1 │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │
+│ arr2 │ Array(Array(String))                                │              │                    │                         │                  │ d + toIntervalDay(1) │
+│ t    │ Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) │              │                    │                         │ ZSTD(1)          │                      │
+└──────┴─────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┘
+┌─name───────┬─type────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────┬─is_subcolumn─┐
+│ d          │ Date                                                │              │                    │                         │                  │                      │            0 │
+│ n          │ Nullable(String)                                    │              │                    │ It is a nullable column │                  │                      │            0 │
+│ arr1       │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            0 │
+│ arr2       │ Array(Array(String))                                │              │                    │                         │                  │ d + toIntervalDay(1) │            0 │
+│ t          │ Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) │              │                    │                         │ ZSTD(1)          │                      │            0 │
+│ n.null     │ UInt8                                               │              │                    │ It is a nullable column │                  │                      │            1 │
+│ arr1.size0 │ UInt64                                              │              │                    │                         │                  │                      │            1 │
+│ arr2.size0 │ UInt64                                              │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
+│ arr2.size1 │ Array(UInt64)                                       │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
+│ t.s        │ String                                              │              │                    │                         │ ZSTD(1)          │                      │            1 │
+│ t.a        │ Array(Tuple(a UInt32, b UInt32))                    │              │                    │                         │                  │                      │            1 │
+│ t.a.size0  │ UInt64                                              │              │                    │                         │                  │                      │            1 │
+│ t.a.a      │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            1 │
+│ t.a.b      │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            1 │
+└────────────┴─────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┴──────────────┘
diff --git a/tests/queries/0_stateless/02026_describe_include_subcolumns.sql b/tests/queries/0_stateless/02026_describe_include_subcolumns.sql
new file mode 100644
index 00000000000..1a58913425c
--- /dev/null
+++ b/tests/queries/0_stateless/02026_describe_include_subcolumns.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS t_desc_subcolumns;
+
+CREATE TABLE t_desc_subcolumns
+(
+    d Date,
+    n Nullable(String) COMMENT 'It is a nullable column',
+    arr1 Array(UInt32) CODEC(ZSTD),
+    arr2 Array(Array(String)) TTL d + INTERVAL 1 DAY,
+    t Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) CODEC(ZSTD)
+)
+ENGINE = MergeTree ORDER BY d;
+
+DESCRIBE TABLE t_desc_subcolumns FORMAT PrettyCompactNoEscapes;
+
+DESCRIBE TABLE t_desc_subcolumns FORMAT PrettyCompactNoEscapes
+SETTINGS describe_include_subcolumns = 1;
+
+DROP TABLE t_desc_subcolumns;
diff --git a/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference
new file mode 100644
index 00000000000..7a0beed21a5
--- /dev/null
+++ b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference
@@ -0,0 +1 @@
+[0,0]
diff --git a/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql
new file mode 100644
index 00000000000..f9522073154
--- /dev/null
+++ b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql
@@ -0,0 +1 @@
+SELECT toString(arrayCumSumNonNegative(x->0, [1, 2]));
diff --git a/tests/queries/0_stateless/02028_create_select_settings.reference b/tests/queries/0_stateless/02028_create_select_settings.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02028_create_select_settings.sql b/tests/queries/0_stateless/02028_create_select_settings.sql
new file mode 100644
index 00000000000..5275d335f53
--- /dev/null
+++ b/tests/queries/0_stateless/02028_create_select_settings.sql
@@ -0,0 +1 @@
+create table test_table engine MergeTree order by a as select a_table.a, b_table.b_arr from (select arrayJoin(range(10000)) as a) a_table cross join (select range(10000) as b_arr) b_table settings max_memory_usage = 1; -- { serverError MEMORY_LIMIT_EXCEEDED }
diff --git a/tests/queries/0_stateless/02029_orc_low_cardinality.reference b/tests/queries/0_stateless/02029_orc_low_cardinality.reference
new file mode 100644
index 00000000000..51537082c87
--- /dev/null
+++ b/tests/queries/0_stateless/02029_orc_low_cardinality.reference
@@ -0,0 +1,10 @@
+0	['0']	('0')
+1	['1']	('1')
+2	['2']	('2')
+3	['3']	('3')
+4	['4']	('4')
+5	['5']	('5')
+6	['6']	('6')
+7	['7']	('7')
+8	['8']	('8')
+9	['9']	('9')
diff --git a/tests/queries/0_stateless/02029_orc_low_cardinality.sh b/tests/queries/0_stateless/02029_orc_low_cardinality.sh
new file mode 100755
index 00000000000..44584a8d969
--- /dev/null
+++ b/tests/queries/0_stateless/02029_orc_low_cardinality.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS orc_lc";
+
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE orc_lc (lc LowCardinality(String), array_lc Array(LowCardinality(String)), tuple_lc  Tuple(LowCardinality(String))) ENGINE = Memory()";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT [lc] as array_lc, tuple(lc) as tuple_lc, toLowCardinality(toString(number)) as lc from numbers(10) FORMAT ORC" | $CLICKHOUSE_CLIENT --query="INSERT INTO orc_lc FORMAT ORC";
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM orc_lc";
diff --git a/tests/queries/0_stateless/02029_output_csv_null_representation.reference b/tests/queries/0_stateless/02029_output_csv_null_representation.reference
new file mode 100644
index 00000000000..a5174f4424f
--- /dev/null
+++ b/tests/queries/0_stateless/02029_output_csv_null_representation.reference
@@ -0,0 +1,4 @@
+# output_format_csv_null_representation should initially be \\N
+"val1",\N,"val3"
+# Changing output_format_csv_null_representation
+"val1",∅,"val3"
diff --git a/tests/queries/0_stateless/02029_output_csv_null_representation.sql b/tests/queries/0_stateless/02029_output_csv_null_representation.sql
new file mode 100644
index 00000000000..772c6c89144
--- /dev/null
+++ b/tests/queries/0_stateless/02029_output_csv_null_representation.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS test_data;
+CREATE TABLE test_data (
+    col1 Nullable(String),
+    col2 Nullable(String),
+    col3 Nullable(String)
+) ENGINE = Memory;
+
+INSERT INTO test_data VALUES ('val1', NULL, 'val3');
+
+SELECT '# output_format_csv_null_representation should initially be \\N';
+SELECT * FROM test_data FORMAT CSV;
+
+SELECT '# Changing output_format_csv_null_representation';
+SET output_format_csv_null_representation = '∅';
+SELECT * FROM test_data FORMAT CSV;
+SET output_format_csv_null_representation = '\\N';
diff --git a/tests/queries/0_stateless/02029_quantile_sanitizer.reference b/tests/queries/0_stateless/02029_quantile_sanitizer.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02029_quantile_sanitizer.sql b/tests/queries/0_stateless/02029_quantile_sanitizer.sql
new file mode 100644
index 00000000000..3e06775ce4c
--- /dev/null
+++ b/tests/queries/0_stateless/02029_quantile_sanitizer.sql
@@ -0,0 +1 @@
+SELECT quantileTDigestWeighted(-0.)(toDateTime(10000000000.), 1); -- { serverError DECIMAL_OVERFLOW }
diff --git a/tests/queries/0_stateless/02031_format_query_option.reference b/tests/queries/0_stateless/02031_format_query_option.reference
new file mode 100644
index 00000000000..2e3761f7a2c
--- /dev/null
+++ b/tests/queries/0_stateless/02031_format_query_option.reference
@@ -0,0 +1 @@
+SELECT 1
diff --git a/tests/queries/0_stateless/02031_format_query_option.sh b/tests/queries/0_stateless/02031_format_query_option.sh
new file mode 100755
index 00000000000..1e87200950d
--- /dev/null
+++ b/tests/queries/0_stateless/02031_format_query_option.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_FORMAT} --query "SELECT 1"
diff --git a/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.reference b/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.reference
new file mode 100644
index 00000000000..00750edc07d
--- /dev/null
+++ b/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.reference
@@ -0,0 +1 @@
+3
diff --git a/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.sh b/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.sh
new file mode 100755
index 00000000000..9cab6db6940
--- /dev/null
+++ b/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+query_id="${CLICKHOUSE_DATABASE}_$$"
+benchmark_args=(
+    --iterations 1
+    --log_queries 1
+    --query_id "$query_id"
+    --log_queries_min_type QUERY_FINISH
+)
+$CLICKHOUSE_BENCHMARK "${benchmark_args[@]}" --query "SELECT * FROM remote('127.2', 'system.one')" >& /dev/null
+$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
+# Number of queries:
+# - DESC TABLE system.one
+# - query on initiator
+# - query on shard
+# Total: 3
+#
+# -- NOTE: this test cannot use 'current_database = $CLICKHOUSE_DATABASE',
+# -- because it does not propagated via remote queries,
+# -- but it uses query_id, and this is enough.
+$CLICKHOUSE_CLIENT --param_query_id="$query_id" -q "SELECT count() FROM system.query_log WHERE event_date >= yesterday() AND initial_query_id = {query_id:String}"
diff --git a/tests/queries/0_stateless/2010_lc_native.python b/tests/queries/0_stateless/2010_lc_native.python
index c850bf3f906..6b3cad89ed6 100755
--- a/tests/queries/0_stateless/2010_lc_native.python
+++ b/tests/queries/0_stateless/2010_lc_native.python
@@ -193,7 +193,7 @@ def readException(s):
 
 def insertValidLowCardinalityRow():
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.settimeout(10)
+        s.settimeout(30)
         s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
         sendHello(s)
         receiveHello(s)
@@ -229,7 +229,7 @@ def insertValidLowCardinalityRow():
 
 def insertLowCardinalityRowWithIndexOverflow():
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.settimeout(10)
+        s.settimeout(30)
         s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
         sendHello(s)
         receiveHello(s)
@@ -262,7 +262,7 @@ def insertLowCardinalityRowWithIndexOverflow():
 
 def insertLowCardinalityRowWithIncorrectDictType():
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.settimeout(10)
+        s.settimeout(30)
         s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
         sendHello(s)
         receiveHello(s)
diff --git a/tests/queries/0_stateless/2015_column_default_dict_get_identifier.reference b/tests/queries/0_stateless/2015_column_default_dict_get_identifier.reference
new file mode 100644
index 00000000000..29e04d559e1
--- /dev/null
+++ b/tests/queries/0_stateless/2015_column_default_dict_get_identifier.reference
@@ -0,0 +1 @@
+5	0
diff --git a/tests/queries/0_stateless/2015_column_default_dict_get_identifier.sql b/tests/queries/0_stateless/2015_column_default_dict_get_identifier.sql
new file mode 100644
index 00000000000..292f53952d0
--- /dev/null
+++ b/tests/queries/0_stateless/2015_column_default_dict_get_identifier.sql
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    key_column UInt64,
+    data_column_1 UInt64,
+    data_column_2 UInt8
+)
+ENGINE = MergeTree
+ORDER BY key_column;
+
+INSERT INTO test_table VALUES (0, 0, 0);
+
+DROP DICTIONARY IF EXISTS test_dictionary;
+CREATE DICTIONARY test_dictionary
+(
+    key_column UInt64 DEFAULT 0,
+    data_column_1 UInt64 DEFAULT 1,
+    data_column_2 UInt8 DEFAULT 1
+)
+PRIMARY KEY key_column
+LAYOUT(DIRECT())
+SOURCE(CLICKHOUSE(TABLE 'test_table'));
+
+DROP TABLE IF EXISTS test_table_default;
+CREATE TABLE test_table_default
+(
+    data_1 DEFAULT dictGetUInt64('test_dictionary', 'data_column_1', toUInt64(0)),
+    data_2 DEFAULT dictGet(test_dictionary, 'data_column_2', toUInt64(0))
+)
+ENGINE=TinyLog;
+
+INSERT INTO test_table_default(data_1) VALUES (5);
+SELECT * FROM test_table_default;
+
+DROP DICTIONARY test_dictionary;
+DROP TABLE test_table;
+DROP TABLE test_table_default;
diff --git a/tests/queries/0_stateless/2015_executable_user_defined_functions.reference b/tests/queries/0_stateless/2015_executable_user_defined_functions.reference
new file mode 100644
index 00000000000..b8626c4cff2
--- /dev/null
+++ b/tests/queries/0_stateless/2015_executable_user_defined_functions.reference
@@ -0,0 +1 @@
+4
diff --git a/tests/queries/0_stateless/2015_executable_user_defined_functions.sql b/tests/queries/0_stateless/2015_executable_user_defined_functions.sql
new file mode 100644
index 00000000000..68848f49cfc
--- /dev/null
+++ b/tests/queries/0_stateless/2015_executable_user_defined_functions.sql
@@ -0,0 +1 @@
+SELECT test_function(toUInt64(2), toUInt64(2));
diff --git a/tests/queries/0_stateless/2015_global_in_threads.reference b/tests/queries/0_stateless/2015_global_in_threads.reference
new file mode 100644
index 00000000000..af81158ecae
--- /dev/null
+++ b/tests/queries/0_stateless/2015_global_in_threads.reference
@@ -0,0 +1,2 @@
+10
+1
diff --git a/tests/queries/0_stateless/2015_global_in_threads.sh b/tests/queries/0_stateless/2015_global_in_threads.sh
new file mode 100755
index 00000000000..c112e47fe92
--- /dev/null
+++ b/tests/queries/0_stateless/2015_global_in_threads.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --log_queries=1 --max_threads=32 --query_id "2015_${CLICKHOUSE_DATABASE}_query" -q "select count() from remote('127.0.0.{2,3}', numbers(10)) where number global in (select number % 5 from numbers_mt(1000000))"
+${CLICKHOUSE_CLIENT} -q "system flush logs"
+${CLICKHOUSE_CLIENT} -q "select length(thread_ids) >= 32 from system.query_log where event_date = today() and query_id = '2015_${CLICKHOUSE_DATABASE}_query' and type = 'QueryFinish' and current_database = currentDatabase()"
diff --git a/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.reference b/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.reference
new file mode 100644
index 00000000000..07258cd829a
--- /dev/null
+++ b/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.reference
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+Hello
diff --git a/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.sql b/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.sql
new file mode 100644
index 00000000000..f0d90f151b2
--- /dev/null
+++ b/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.sql
@@ -0,0 +1 @@
+SELECT s FROM (SELECT 5 AS x, 'Hello' AS s ORDER BY x WITH FILL FROM 1 TO 10) ORDER BY s;
diff --git a/tests/queries/0_stateless/2016_agg_empty_result_bug_28880.reference b/tests/queries/0_stateless/2016_agg_empty_result_bug_28880.reference
new file mode 100644
index 00000000000..9edaf84f295
--- /dev/null
+++ b/tests/queries/0_stateless/2016_agg_empty_result_bug_28880.reference
@@ -0,0 +1,5 @@
+0
+0
+0
+0
+\N
diff --git a/tests/queries/0_stateless/2016_agg_empty_result_bug_28880.sql b/tests/queries/0_stateless/2016_agg_empty_result_bug_28880.sql
new file mode 100644
index 00000000000..005358eb425
--- /dev/null
+++ b/tests/queries/0_stateless/2016_agg_empty_result_bug_28880.sql
@@ -0,0 +1,10 @@
+SELECT count() AS cnt WHERE 0 HAVING cnt = 0;
+
+select cnt from (select count() cnt where 0) where cnt = 0;
+
+select cnt from (select count() cnt from system.one where 0) where cnt = 0;
+
+select sum from (select sum(dummy) sum from system.one where 0) where sum = 0;
+
+set aggregate_functions_null_for_empty=1;
+select sum from (select sum(dummy) sum from system.one where 0) where sum is null;
diff --git a/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.reference b/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.reference
new file mode 100644
index 00000000000..264f29a6ecd
--- /dev/null
+++ b/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.reference
@@ -0,0 +1,3 @@
+2021-07-07 15:21:00
+2021-07-07 15:21:05
+2021-07-07 15:21:10
diff --git a/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.sql b/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.sql
new file mode 100644
index 00000000000..bf232ed5c86
--- /dev/null
+++ b/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.sql
@@ -0,0 +1,6 @@
+SELECT toStartOfMinute(some_time) AS ts
+FROM
+(
+    SELECT toDateTime('2021-07-07 15:21:05') AS some_time
+)
+ORDER BY ts ASC WITH FILL FROM toDateTime('2021-07-07 15:21:00') TO toDateTime('2021-07-07 15:21:15') STEP 5;
diff --git a/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.reference b/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.reference
new file mode 100644
index 00000000000..07193989308
--- /dev/null
+++ b/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.reference
@@ -0,0 +1,9 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.sql b/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.sql
new file mode 100644
index 00000000000..6f3e6787c34
--- /dev/null
+++ b/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.sql
@@ -0,0 +1 @@
+SELECT x FROM (SELECT 5 AS x) ORDER BY -x, x WITH FILL FROM 1 TO 10;
diff --git a/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.reference b/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.sql b/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.sql
new file mode 100644
index 00000000000..32b38388cf6
--- /dev/null
+++ b/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.sql
@@ -0,0 +1 @@
+SELECT x, y FROM (SELECT 5 AS x, 'Hello' AS y) ORDER BY x WITH FILL FROM 3 TO 7, y, x WITH FILL FROM 1 TO 10; -- { serverError 475 }
diff --git a/tests/queries/0_stateless/2019_multiple_weird_with_fill.reference b/tests/queries/0_stateless/2019_multiple_weird_with_fill.reference
new file mode 100644
index 00000000000..822d290564a
--- /dev/null
+++ b/tests/queries/0_stateless/2019_multiple_weird_with_fill.reference
@@ -0,0 +1,45 @@
+3	-10	
+3	-9	
+3	-8	
+3	-7	
+3	-6	
+3	-5	
+3	-4	
+3	-3	
+3	-2	
+4	-10	
+4	-9	
+4	-8	
+4	-7	
+4	-6	
+4	-5	
+4	-4	
+4	-3	
+4	-2	
+5	-10	
+5	-9	
+5	-8	
+5	-7	
+5	-6	
+5	-5	Hello
+5	-4	
+5	-3	
+5	-2	
+6	-10	
+6	-9	
+6	-8	
+6	-7	
+6	-6	
+6	-5	
+6	-4	
+6	-3	
+6	-2	
+7	-10	
+7	-9	
+7	-8	
+7	-7	
+7	-6	
+7	-5	
+7	-4	
+7	-3	
+7	-2	
diff --git a/tests/queries/0_stateless/2019_multiple_weird_with_fill.sql b/tests/queries/0_stateless/2019_multiple_weird_with_fill.sql
new file mode 100644
index 00000000000..a2ed33c51dd
--- /dev/null
+++ b/tests/queries/0_stateless/2019_multiple_weird_with_fill.sql
@@ -0,0 +1,14 @@
+SELECT
+    x,
+    -x,
+    y
+FROM
+(
+    SELECT
+        5 AS x,
+        'Hello' AS y
+)
+ORDER BY
+    x ASC WITH FILL FROM 3 TO 7,
+    y ASC,
+    -x ASC WITH FILL FROM -10 TO -1;
diff --git a/tests/queries/0_stateless/2020_cast_integer_overflow.reference b/tests/queries/0_stateless/2020_cast_integer_overflow.reference
new file mode 100644
index 00000000000..acceae4a72e
--- /dev/null
+++ b/tests/queries/0_stateless/2020_cast_integer_overflow.reference
@@ -0,0 +1,2 @@
+-2147483648
+-2147483648
diff --git a/tests/queries/0_stateless/2020_cast_integer_overflow.sql b/tests/queries/0_stateless/2020_cast_integer_overflow.sql
new file mode 100644
index 00000000000..57aeff9a982
--- /dev/null
+++ b/tests/queries/0_stateless/2020_cast_integer_overflow.sql
@@ -0,0 +1,2 @@
+SELECT toInt32('-2147483648');
+SELECT toInt32OrNull('-2147483648');
diff --git a/tests/queries/0_stateless/2020_exponential_smoothing.reference b/tests/queries/0_stateless/2020_exponential_smoothing.reference
new file mode 100644
index 00000000000..8ebf4c3c066
--- /dev/null
+++ b/tests/queries/0_stateless/2020_exponential_smoothing.reference
@@ -0,0 +1,130 @@
+1	0	0.5
+0	1	0.25
+0	2	0.125
+0	3	0.0625
+0	4	0.03125
+0	5	0.015625
+0	6	0.0078125
+0	7	0.00390625
+0	8	0.001953125
+0	9	0.0009765625
+1	0	0.067
+0	1	0.062
+0	2	0.058
+0	3	0.054
+0	4	0.051
+0	5	0.047
+0	6	0.044
+0	7	0.041
+0	8	0.038
+0	9	0.036
+0	0	0
+1	1	0.5
+2	2	1.25
+3	3	2.125
+4	4	3.0625
+5	5	4.03125
+6	6	5.015625
+7	7	6.0078125
+8	8	7.00390625
+9	9	8.001953125
+1	0	0.067	███▎
+0	1	0.062	███
+0	2	0.058	██▊
+0	3	0.054	██▋
+0	4	0.051	██▌
+0	5	0.047	██▎
+0	6	0.044	██▏
+0	7	0.041	██
+0	8	0.038	█▊
+0	9	0.036	█▋
+0	10	0.033	█▋
+0	11	0.031	█▌
+0	12	0.029	█▍
+0	13	0.027	█▎
+0	14	0.025	█▎
+0	15	0.024	█▏
+0	16	0.022	█
+0	17	0.021	█
+0	18	0.019	▊
+0	19	0.018	▊
+0	20	0.017	▋
+0	21	0.016	▋
+0	22	0.015	▋
+0	23	0.014	▋
+0	24	0.013	▋
+1	25	0.079	███▊
+1	26	0.14	███████
+1	27	0.198	█████████▊
+1	28	0.252	████████████▌
+1	29	0.302	███████████████
+1	30	0.349	█████████████████▍
+1	31	0.392	███████████████████▌
+1	32	0.433	█████████████████████▋
+1	33	0.471	███████████████████████▌
+1	34	0.506	█████████████████████████▎
+1	35	0.539	██████████████████████████▊
+1	36	0.57	████████████████████████████▌
+1	37	0.599	█████████████████████████████▊
+1	38	0.626	███████████████████████████████▎
+1	39	0.651	████████████████████████████████▌
+1	40	0.674	█████████████████████████████████▋
+1	41	0.696	██████████████████████████████████▋
+1	42	0.716	███████████████████████████████████▋
+1	43	0.735	████████████████████████████████████▋
+1	44	0.753	█████████████████████████████████████▋
+1	45	0.77	██████████████████████████████████████▍
+1	46	0.785	███████████████████████████████████████▎
+1	47	0.8	███████████████████████████████████████▊
+1	48	0.813	████████████████████████████████████████▋
+1	49	0.825	█████████████████████████████████████████▎
+1	0	0.5	█████████████████████████
+0	1	0.25	████████████▌
+0	2	0.125	██████▎
+0	3	0.062	███
+0	4	0.031	█▌
+1	5	0.516	█████████████████████████▋
+0	6	0.258	████████████▊
+0	7	0.129	██████▍
+0	8	0.064	███▏
+0	9	0.032	█▌
+1	10	0.516	█████████████████████████▋
+0	11	0.258	████████████▊
+0	12	0.129	██████▍
+0	13	0.065	███▏
+0	14	0.032	█▌
+1	15	0.516	█████████████████████████▋
+0	16	0.258	████████████▊
+0	17	0.129	██████▍
+0	18	0.065	███▏
+0	19	0.032	█▌
+1	20	0.516	█████████████████████████▋
+0	21	0.258	████████████▊
+0	22	0.129	██████▍
+0	23	0.065	███▏
+0	24	0.032	█▌
+1	25	0.516	█████████████████████████▋
+0	26	0.258	████████████▊
+0	27	0.129	██████▍
+0	28	0.065	███▏
+0	29	0.032	█▌
+1	30	0.516	█████████████████████████▋
+0	31	0.258	████████████▊
+0	32	0.129	██████▍
+0	33	0.065	███▏
+0	34	0.032	█▌
+1	35	0.516	█████████████████████████▋
+0	36	0.258	████████████▊
+0	37	0.129	██████▍
+0	38	0.065	███▏
+0	39	0.032	█▌
+1	40	0.516	█████████████████████████▋
+0	41	0.258	████████████▊
+0	42	0.129	██████▍
+0	43	0.065	███▏
+0	44	0.032	█▌
+1	45	0.516	█████████████████████████▋
+0	46	0.258	████████████▊
+0	47	0.129	██████▍
+0	48	0.065	███▏
+0	49	0.032	█▌
diff --git a/tests/queries/0_stateless/2020_exponential_smoothing.sql b/tests/queries/0_stateless/2020_exponential_smoothing.sql
new file mode 100644
index 00000000000..a210225453a
--- /dev/null
+++ b/tests/queries/0_stateless/2020_exponential_smoothing.sql
@@ -0,0 +1,32 @@
+SELECT number = 0 AS value, number AS time, exponentialMovingAverage(1)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth FROM numbers(10);
+SELECT value, time, round(exp_smooth, 3) FROM (SELECT number = 0 AS value, number AS time, exponentialMovingAverage(10)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth FROM numbers(10));
+
+SELECT number AS value, number AS time, exponentialMovingAverage(1)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth FROM numbers(10);
+
+SELECT
+    value,
+    time,
+    round(exp_smooth, 3),
+    bar(exp_smooth, 0, 1, 50) AS bar
+FROM
+(
+    SELECT
+        (number = 0) OR (number >= 25) AS value,
+        number AS time,
+        exponentialMovingAverage(10)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth
+    FROM numbers(50)
+);
+
+SELECT
+    value,
+    time,
+    round(exp_smooth, 3),
+    bar(exp_smooth, 0, 1, 50) AS bar
+FROM
+(
+    SELECT
+        (number % 5) = 0 AS value,
+        number AS time,
+        exponentialMovingAverage(1)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth
+    FROM numbers(50)
+);
diff --git a/tests/queries/0_stateless/2021_exponential_sum.reference b/tests/queries/0_stateless/2021_exponential_sum.reference
new file mode 100644
index 00000000000..5bd77479cf7
--- /dev/null
+++ b/tests/queries/0_stateless/2021_exponential_sum.reference
@@ -0,0 +1,8 @@
+0.0009765625
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
diff --git a/tests/queries/0_stateless/2021_exponential_sum.sql b/tests/queries/0_stateless/2021_exponential_sum.sql
new file mode 100644
index 00000000000..8ab7638029c
--- /dev/null
+++ b/tests/queries/0_stateless/2021_exponential_sum.sql
@@ -0,0 +1,9 @@
+-- Check that it is deterministic
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(10);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(100);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(1000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(10000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(100000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(1000000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(10000000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(100000000);
diff --git a/tests/queries/0_stateless/2021_exponential_sum_shard.reference b/tests/queries/0_stateless/2021_exponential_sum_shard.reference
new file mode 100644
index 00000000000..8453706a05a
--- /dev/null
+++ b/tests/queries/0_stateless/2021_exponential_sum_shard.reference
@@ -0,0 +1,5 @@
+0.009775171065493644
+0.009775171065493644
+0.009775171065493644
+0.009775171065493644
+0.009775171065493644
diff --git a/tests/queries/0_stateless/2021_exponential_sum_shard.sql b/tests/queries/0_stateless/2021_exponential_sum_shard.sql
new file mode 100644
index 00000000000..49fde0fe217
--- /dev/null
+++ b/tests/queries/0_stateless/2021_exponential_sum_shard.sql
@@ -0,0 +1,6 @@
+-- Check that it is deterministic
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(1000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(10000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(100000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(1000000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(10000000));
diff --git a/tests/queries/0_stateless/2021_h3_get_faces.reference b/tests/queries/0_stateless/2021_h3_get_faces.reference
new file mode 100644
index 00000000000..459a9af5827
--- /dev/null
+++ b/tests/queries/0_stateless/2021_h3_get_faces.reference
@@ -0,0 +1,4 @@
+[2,3,7,8,12]
+[7,12]
+[7]
+[7]
diff --git a/tests/queries/0_stateless/2021_h3_get_faces.sql b/tests/queries/0_stateless/2021_h3_get_faces.sql
new file mode 100644
index 00000000000..4a549c5dcf1
--- /dev/null
+++ b/tests/queries/0_stateless/2021_h3_get_faces.sql
@@ -0,0 +1,16 @@
+-- Tags: no-unbundled, no-fasttest
+
+DROP TABLE IF EXISTS h3_indexes;
+
+CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
+
+-- test H3 indexes from: https://github.com/uber/h3-java/blob/master/src/test/java/com/uber/h3core/TestInspection.java#L86
+
+INSERT INTO h3_indexes VALUES (stringToH3('0x85283473fffffffL'));
+INSERT INTO h3_indexes VALUES (stringToH3('85283473fffffff'));
+INSERT INTO h3_indexes VALUES (stringToH3('0x8167bffffffffffL'));
+INSERT INTO h3_indexes VALUES (stringToH3('0x804dfffffffffffL'));
+
+SELECT arraySort(h3GetFaces(h3_index)) FROM h3_indexes ORDER BY h3_index;
+
+DROP TABLE h3_indexes;
diff --git a/tests/queries/0_stateless/2021_h3_is_pentagon.reference b/tests/queries/0_stateless/2021_h3_is_pentagon.reference
new file mode 100644
index 00000000000..d9ff83f1949
--- /dev/null
+++ b/tests/queries/0_stateless/2021_h3_is_pentagon.reference
@@ -0,0 +1,4 @@
+1
+1
+0
+0
diff --git a/tests/queries/0_stateless/2021_h3_is_pentagon.sql b/tests/queries/0_stateless/2021_h3_is_pentagon.sql
new file mode 100644
index 00000000000..c583fa24451
--- /dev/null
+++ b/tests/queries/0_stateless/2021_h3_is_pentagon.sql
@@ -0,0 +1,16 @@
+-- Tags: no-unbundled, no-fasttest
+
+DROP TABLE IF EXISTS h3_indexes;
+
+CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
+
+-- test H3 indexes from: https://github.com/uber/h3-java/blob/master/src/test/java/com/uber/h3core/TestInspection.java#L78
+
+INSERT INTO h3_indexes VALUES (stringToH3('8f28308280f18f2'));
+INSERT INTO h3_indexes VALUES (stringToH3('0x8f28308280f18f2L'));
+INSERT INTO h3_indexes VALUES (stringToH3('821c07fffffffff'));
+INSERT INTO h3_indexes VALUES (stringToH3('0x821c07fffffffffL'));
+
+SELECT h3IsPentagon(h3_index) FROM h3_indexes ORDER BY h3_index;
+
+DROP TABLE h3_indexes;
diff --git a/tests/queries/0_stateless/2021_h3_res_is_classIII.reference b/tests/queries/0_stateless/2021_h3_res_is_classIII.reference
new file mode 100644
index 00000000000..5565ed6787f
--- /dev/null
+++ b/tests/queries/0_stateless/2021_h3_res_is_classIII.reference
@@ -0,0 +1,4 @@
+0
+1
+0
+1
diff --git a/tests/queries/0_stateless/2021_h3_res_is_classIII.sql b/tests/queries/0_stateless/2021_h3_res_is_classIII.sql
new file mode 100644
index 00000000000..67dae6d1fa2
--- /dev/null
+++ b/tests/queries/0_stateless/2021_h3_res_is_classIII.sql
@@ -0,0 +1,16 @@
+-- Tags: no-unbundled, no-fasttest
+
+DROP TABLE IF EXISTS h3_indexes;
+
+CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
+
+-- test H3 indexes from: https://github.com/uber/h3-java/blob/master/src/test/java/com/uber/h3core/TestInspection.java#L57
+
+INSERT INTO h3_indexes VALUES (geoToH3(0.0, 0.0, 0));
+INSERT INTO h3_indexes VALUES (geoToH3(10.0, 0.0, 1));
+INSERT INTO h3_indexes VALUES (geoToH3(0.0, 10.0, 2));
+INSERT INTO h3_indexes VALUES (geoToH3(10.0, 10.0, 3));
+
+SELECT h3ResIsClassIII(h3_index) FROM h3_indexes ORDER BY h3_index;
+
+DROP TABLE h3_indexes;
diff --git a/tests/queries/0_stateless/2021_map_bloom_filter_index.reference b/tests/queries/0_stateless/2021_map_bloom_filter_index.reference
new file mode 100644
index 00000000000..4f0a04073ae
--- /dev/null
+++ b/tests/queries/0_stateless/2021_map_bloom_filter_index.reference
@@ -0,0 +1,46 @@
+Map bloom filter mapKeys
+Equals with existing key
+0	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+Not equals with non existing key and default value
+IN with existing key
+0	{'K0':'V0'}
+IN with non existing key
+IN with non existing key and default value
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+NOT IN with existing key
+1	{'K1':'V1'}
+NOT IN with non existing key
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+NOT IN with non existing key and default value
+MapContains with existing key
+0	{'K0':'V0'}
+MapContains with non existing key
+MapContains with non existing key and default value
+Has with existing key
+0	{'K0':'V0'}
+Has with non existing key
+Has with non existing key and default value
+Map bloom filter mapValues
+IN with existing key
+0	{'K0':'V0'}
+IN with non existing key
+IN with non existing key and default value
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+NOT IN with existing key
+1	{'K1':'V1'}
+NOT IN with non existing key
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+NOT IN with non existing key and default value
diff --git a/tests/queries/0_stateless/2021_map_bloom_filter_index.sql b/tests/queries/0_stateless/2021_map_bloom_filter_index.sql
new file mode 100644
index 00000000000..6e0c4f4a360
--- /dev/null
+++ b/tests/queries/0_stateless/2021_map_bloom_filter_index.sql
@@ -0,0 +1,80 @@
+DROP TABLE IF EXISTS map_test_index_map_keys;
+CREATE TABLE map_test_index_map_keys
+(
+    row_id UInt32,
+    map Map(String, String),
+    INDEX map_bloom_filter_keys mapKeys(map) TYPE bloom_filter GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id;
+
+INSERT INTO map_test_index_map_keys VALUES (0, {'K0':'V0'}), (1, {'K1':'V1'});
+
+SELECT 'Map bloom filter mapKeys';
+
+SELECT 'Equals with existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K0'] = 'V0';
+SELECT 'Equals with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K2'] = 'V2';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE map['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K0'] != 'V0';
+SELECT 'Not equals with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K2'] != 'V2';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE map['K3'] != '';
+
+SELECT 'IN with existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K0'] IN 'V0';
+SELECT 'IN with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K2'] IN 'V2';
+SELECT 'IN with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE map['K3'] IN '';
+SELECT 'NOT IN with existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K0'] NOT IN 'V0';
+SELECT 'NOT IN with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K2'] NOT IN 'V2';
+SELECT 'NOT IN with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE map['K3'] NOT IN '';
+
+SELECT 'MapContains with existing key';
+SELECT * FROM map_test_index_map_keys WHERE mapContains(map, 'K0');
+SELECT 'MapContains with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE mapContains(map, 'K2');
+SELECT 'MapContains with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE mapContains(map, '');
+
+SELECT 'Has with existing key';
+SELECT * FROM map_test_index_map_keys WHERE has(map, 'K0');
+SELECT 'Has with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE has(map, 'K2');
+SELECT 'Has with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE has(map, '');
+
+DROP TABLE map_test_index_map_keys;
+
+DROP TABLE IF EXISTS map_test_index_map_values;
+CREATE TABLE map_test_index_map_values
+(
+    row_id UInt32,
+    map Map(String, String),
+    INDEX map_bloom_filter_values mapValues(map) TYPE bloom_filter GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id;
+
+INSERT INTO map_test_index_map_values VALUES (0, {'K0':'V0'}), (1, {'K1':'V1'});
+
+SELECT 'Map bloom filter mapValues';
+
+SELECT 'IN with existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K0'] IN 'V0';
+SELECT 'IN with non existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K2'] IN 'V2';
+SELECT 'IN with non existing key and default value';
+SELECT * FROM map_test_index_map_values WHERE map['K3'] IN '';
+SELECT 'NOT IN with existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K0'] NOT IN 'V0';
+SELECT 'NOT IN with non existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K2'] NOT IN 'V2';
+SELECT 'NOT IN with non existing key and default value';
+SELECT * FROM map_test_index_map_values WHERE map['K3'] NOT IN '';
+
+DROP TABLE map_test_index_map_values;
diff --git a/tests/queries/0_stateless/2021_map_has.reference b/tests/queries/0_stateless/2021_map_has.reference
new file mode 100644
index 00000000000..2c10bd62504
--- /dev/null
+++ b/tests/queries/0_stateless/2021_map_has.reference
@@ -0,0 +1,6 @@
+Non constant map
+1
+0
+Constant map
+1
+0
diff --git a/tests/queries/0_stateless/2021_map_has.sql b/tests/queries/0_stateless/2021_map_has.sql
new file mode 100644
index 00000000000..84099058273
--- /dev/null
+++ b/tests/queries/0_stateless/2021_map_has.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS test_map;
+CREATE TABLE test_map (value Map(String, String)) ENGINE=TinyLog;
+
+SELECT 'Non constant map';
+INSERT INTO test_map VALUES ({'K0':'V0'});
+SELECT has(value, 'K0') FROM test_map;
+SELECT has(value, 'K1') FROM test_map;
+
+SELECT 'Constant map';
+
+SELECT has(map('K0', 'V0'), 'K0') FROM system.one;
+SELECT has(map('K0', 'V0'), 'K1') FROM system.one;
+
+DROP TABLE test_map;
diff --git a/tests/queries/0_stateless/2022_array_full_text_bloom_filter_index.reference b/tests/queries/0_stateless/2022_array_full_text_bloom_filter_index.reference
new file mode 100644
index 00000000000..f61dedd9bd2
--- /dev/null
+++ b/tests/queries/0_stateless/2022_array_full_text_bloom_filter_index.reference
@@ -0,0 +1,8 @@
+1	['K1 K1']	['K1 K1']
+2	['K2 K2']	['K2 K2']
+1	['K1 K1']	['K1 K1']
+2	['K2 K2']	['K2 K2']
+1	['K1 K1']	['K1 K1']
+2	['K2 K2']	['K2 K2']
+1	['K1 K1']	['K1 K1']
+2	['K2 K2']	['K2 K2']
diff --git a/tests/queries/0_stateless/2022_array_full_text_bloom_filter_index.sql b/tests/queries/0_stateless/2022_array_full_text_bloom_filter_index.sql
new file mode 100644
index 00000000000..6a2a00674cb
--- /dev/null
+++ b/tests/queries/0_stateless/2022_array_full_text_bloom_filter_index.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS bf_tokenbf_array_test;
+DROP TABLE IF EXISTS bf_ngram_array_test;
+
+CREATE TABLE bf_tokenbf_array_test
+(
+    row_id UInt32,
+    array Array(String),
+    array_fixed Array(FixedString(5)),
+    INDEX array_bf_tokenbf array TYPE tokenbf_v1(256,2,0) GRANULARITY 1,
+    INDEX array_fixed_bf_tokenbf array_fixed TYPE tokenbf_v1(256,2,0) GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 2;
+
+CREATE TABLE bf_ngram_array_test
+(
+    row_id UInt32,
+    array Array(String),
+    array_fixed Array(FixedString(5)),
+    INDEX array_ngram array TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1,
+    INDEX array_fixed_ngram array_fixed TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 2;
+
+INSERT INTO bf_tokenbf_array_test VALUES (1, ['K1 K1'], ['K1 K1']), (2, ['K2 K2'], ['K2 K2']);
+INSERT INTO bf_ngram_array_test VALUES (1, ['K1 K1'], ['K1 K1']), (2, ['K2 K2'], ['K2 K2']);
+
+SELECT * FROM bf_tokenbf_array_test WHERE has(array, 'K1 K1');
+SELECT * FROM bf_tokenbf_array_test WHERE has(array, 'K2 K2');
+SELECT * FROM bf_tokenbf_array_test WHERE has(array, 'K3 K3');
+
+SELECT * FROM bf_tokenbf_array_test WHERE has(array_fixed, 'K1 K1');
+SELECT * FROM bf_tokenbf_array_test WHERE has(array_fixed, 'K2 K2');
+SELECT * FROM bf_tokenbf_array_test WHERE has(array_fixed, 'K3 K3');
+
+SELECT * FROM bf_ngram_array_test WHERE has(array, 'K1 K1');
+SELECT * FROM bf_ngram_array_test WHERE has(array, 'K2 K2');
+SELECT * FROM bf_ngram_array_test WHERE has(array, 'K3 K3');
+
+SELECT * FROM bf_ngram_array_test WHERE has(array_fixed, 'K1 K1');
+SELECT * FROM bf_ngram_array_test WHERE has(array_fixed, 'K2 K2');
+SELECT * FROM bf_ngram_array_test WHERE has(array_fixed, 'K3 K3');
+
+DROP TABLE bf_tokenbf_array_test;
+DROP TABLE bf_ngram_array_test;
diff --git a/tests/queries/0_stateless/2023_parser_number_binary_literal.reference b/tests/queries/0_stateless/2023_parser_number_binary_literal.reference
new file mode 100644
index 00000000000..f2356a9a4c0
--- /dev/null
+++ b/tests/queries/0_stateless/2023_parser_number_binary_literal.reference
@@ -0,0 +1,14 @@
+1	UInt8
+2	UInt8
+4	UInt8
+8	UInt8
+Unsigned numbers
+128	UInt8
+32768	UInt16
+2147483648	UInt32
+9223372036854775808	UInt64
+Signed numbers
+-128	Int8
+-32768	Int16
+-2147483648	Int32
+-9223372036854775808	Int64
diff --git a/tests/queries/0_stateless/2023_parser_number_binary_literal.sql b/tests/queries/0_stateless/2023_parser_number_binary_literal.sql
new file mode 100644
index 00000000000..bd5df7845c9
--- /dev/null
+++ b/tests/queries/0_stateless/2023_parser_number_binary_literal.sql
@@ -0,0 +1,16 @@
+SELECT 0b0001 as number, toTypeName(number);
+SELECT 0b0010 as number, toTypeName(number);
+SELECT 0b0100 as number, toTypeName(number);
+SELECT 0b1000 as number, toTypeName(number);
+
+SELECT 'Unsigned numbers';
+SELECT 0b10000000 as number, toTypeName(number);
+SELECT 0b1000000000000000 as number, toTypeName(number);
+SELECT 0b10000000000000000000000000000000 as number, toTypeName(number);
+SELECT 0b1000000000000000000000000000000000000000000000000000000000000000 as number, toTypeName(number);
+
+SELECT 'Signed numbers';
+SELECT -0b10000000 as number, toTypeName(number);
+SELECT -0b1000000000000000 as number, toTypeName(number);
+SELECT -0b10000000000000000000000000000000 as number, toTypeName(number);
+SELECT -0b1000000000000000000000000000000000000000000000000000000000000000 as number, toTypeName(number);
diff --git a/tests/queries/0_stateless/replication.lib b/tests/queries/0_stateless/replication.lib
index 8fe300b59e8..e7fa2dd5404 100755
--- a/tests/queries/0_stateless/replication.lib
+++ b/tests/queries/0_stateless/replication.lib
@@ -84,4 +84,3 @@ function check_replication_consistency()
     fi
 
 }
-
diff --git a/tests/queries/1_stateful/00009_uniq_distributed.sql b/tests/queries/1_stateful/00009_uniq_distributed.sql
index 71d90efbccc..f78604fd401 100644
--- a/tests/queries/1_stateful/00009_uniq_distributed.sql
+++ b/tests/queries/1_stateful/00009_uniq_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT uniq(UserID), uniqIf(UserID, CounterID = 800784), uniqIf(FUniqID, RegionID = 213) FROM remote('127.0.0.{1,2}', test, hits)
diff --git a/tests/queries/1_stateful/00012_sorting_distributed.sql b/tests/queries/1_stateful/00012_sorting_distributed.sql
index b0cdb8bd8a2..c71f643045d 100644
--- a/tests/queries/1_stateful/00012_sorting_distributed.sql
+++ b/tests/queries/1_stateful/00012_sorting_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT EventTime::DateTime('Europe/Moscow') FROM remote('127.0.0.{1,2}', test, hits) ORDER BY EventTime DESC LIMIT 10
diff --git a/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql b/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
index 8beedd09e4e..2afe28639f2 100644
--- a/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
+++ b/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT anyIf(SearchPhrase, CounterID = -1) FROM remote('127.0.0.{1,2}:9000', test, hits)
diff --git a/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql b/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
index c3c726e4ca7..21b577d3b56 100644
--- a/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
+++ b/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_rows_to_sort = 10000;
 SELECT count() FROM (SELECT DISTINCT PredLastVisit AS x FROM remote('127.0.0.{1,2}', test, visits) ORDER BY VisitID);
diff --git a/tests/queries/1_stateful/00046_uniq_upto_distributed.sql b/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
index 1491972b37d..3aa1d5b9909 100644
--- a/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
+++ b/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT RegionID, uniqExact(UserID) AS u1, uniqUpTo(10)(UserID) AS u2 FROM remote('127.0.0.{1,2}', test, visits) GROUP BY RegionID HAVING u1 <= 11 AND u1 != u2
\ No newline at end of file
diff --git a/tests/queries/1_stateful/00053_replicate_segfault.sql b/tests/queries/1_stateful/00053_replicate_segfault.sql
index b727ae3aad8..3e0be96861b 100644
--- a/tests/queries/1_stateful/00053_replicate_segfault.sql
+++ b/tests/queries/1_stateful/00053_replicate_segfault.sql
@@ -1 +1,3 @@
+-- Tags: replica
+
 SELECT count() > 0 FROM (SELECT ParsedParams.Key1 AS p FROM test.visits WHERE arrayAll(y -> arrayExists(x -> y != x, p), p))
diff --git a/tests/queries/1_stateful/00054_merge_tree_partitions.sql b/tests/queries/1_stateful/00054_merge_tree_partitions.sql
index 73020952977..91e67ac857a 100644
--- a/tests/queries/1_stateful/00054_merge_tree_partitions.sql
+++ b/tests/queries/1_stateful/00054_merge_tree_partitions.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS test.partitions;
 CREATE TABLE test.partitions (EventDate Date, CounterID UInt32) ENGINE = MergeTree(EventDate, CounterID, 8192);
 INSERT INTO test.partitions SELECT EventDate + UserID % 365 AS EventDate, CounterID FROM test.hits WHERE CounterID = 1704509;
diff --git a/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql b/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
index 4bc563712c0..3e34d9d1348 100644
--- a/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
+++ b/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
@@ -1,2 +1,4 @@
+-- Tags: replica, distributed
+
 SET max_parallel_replicas = 2;
 SELECT EventTime::DateTime('Europe/Moscow') FROM remote('127.0.0.{1|2}', test, hits) ORDER BY EventTime DESC LIMIT 10
diff --git a/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql b/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
index 60dbec2e9bc..52f9c46997f 100644
--- a/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
+++ b/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SET output_format_write_statistics = 0;
 SELECT EventDate, count() FROM remote('127.0.0.1', test.hits) WHERE UserID GLOBAL IN (SELECT UserID FROM test.hits) GROUP BY EventDate ORDER BY EventDate LIMIT 5 FORMAT JSONCompact;
diff --git a/tests/queries/1_stateful/00090_thread_pool_deadlock.sh b/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
index e94243bfea2..75665166741 100755
--- a/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
+++ b/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/1_stateful/00095_hyperscan_profiler.sql b/tests/queries/1_stateful/00095_hyperscan_profiler.sql
index df07bc92408..c704907178c 100644
--- a/tests/queries/1_stateful/00095_hyperscan_profiler.sql
+++ b/tests/queries/1_stateful/00095_hyperscan_profiler.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug
+
 -- Check that server does not get segfault due to bad stack unwinding from Hyperscan
 
 SET query_profiler_cpu_time_period_ns = 1000000;
diff --git a/tests/queries/1_stateful/00140_rename.sql b/tests/queries/1_stateful/00140_rename.sql
index b0ecd2aeb92..9702d00a4d5 100644
--- a/tests/queries/1_stateful/00140_rename.sql
+++ b/tests/queries/1_stateful/00140_rename.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Does not support renaming of multiple tables in single query
+
 RENAME TABLE test.hits TO test.visits_tmp, test.visits TO test.hits, test.visits_tmp TO test.visits;
 
 SELECT sum(Sign) FROM test.hits WHERE CounterID = 912887;
diff --git a/tests/queries/1_stateful/00147_global_in_aggregate_function.sql b/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
index 8276f4c1b16..075c01530c6 100644
--- a/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
+++ b/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
@@ -1,2 +1,4 @@
+-- Tags: global
+
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM remote('127.0.0.{1,2}', test.hits))) FROM remote('127.0.0.{1,2}', test.hits);
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM test.hits)) FROM remote('127.0.0.{1,2}', test.hits);
diff --git a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
index dc63cb5867f..6f910646fb7 100644
--- a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
+++ b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID);
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID) SETTINGS optimize_aggregation_in_order = 1;
diff --git a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql b/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
index fa18b53bdf9..c1a2001e2a5 100644
--- a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
+++ b/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan
+
 DROP TABLE IF EXISTS mixed_granularity_table;
 
 CREATE TABLE mixed_granularity_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, enable_mixed_granularity_parts=1; -- same with hits, but enabled mixed granularity
diff --git a/tests/queries/1_stateful/00152_insert_different_granularity.sql b/tests/queries/1_stateful/00152_insert_different_granularity.sql
index 7e04aedf2dd..5c802642a5c 100644
--- a/tests/queries/1_stateful/00152_insert_different_granularity.sql
+++ b/tests/queries/1_stateful/00152_insert_different_granularity.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS fixed_granularity_table;
 
 CREATE TABLE fixed_granularity_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, index_granularity_bytes=0, min_bytes_for_wide_part = 0; -- looks like default table before update
diff --git a/tests/queries/1_stateful/00153_aggregate_arena_race.sql b/tests/queries/1_stateful/00153_aggregate_arena_race.sql
index 239b5ad0aa5..cf3971df6a9 100644
--- a/tests/queries/1_stateful/00153_aggregate_arena_race.sql
+++ b/tests/queries/1_stateful/00153_aggregate_arena_race.sql
@@ -1,2 +1,4 @@
+-- Tags: race
+
 create temporary table dest00153 (`s` AggregateFunction(groupUniqArray, String)) engine Memory;
 insert into dest00153 select groupUniqArrayState(RefererDomain) from test.hits group by URLDomain;
diff --git a/tests/queries/1_stateful/00154_avro.sql b/tests/queries/1_stateful/00154_avro.sql
index b3c80f657c9..a2a35dfec12 100644
--- a/tests/queries/1_stateful/00154_avro.sql
+++ b/tests/queries/1_stateful/00154_avro.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS test.avro;
 
 SET max_threads = 1, max_block_size = 8192, min_insert_block_size_rows = 8192, min_insert_block_size_bytes = 1048576; -- lower memory usage
diff --git a/tests/queries/1_stateful/00157_cache_dictionary.sql b/tests/queries/1_stateful/00157_cache_dictionary.sql
index 368da1cc36a..a8f9d12ab3a 100644
--- a/tests/queries/1_stateful/00157_cache_dictionary.sql
+++ b/tests/queries/1_stateful/00157_cache_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_dict;
 DROP DICTIONARY IF EXISTS db_dict.cache_hits;
 
diff --git a/tests/queries/1_stateful/00158_cache_dictionary_has.sql b/tests/queries/1_stateful/00158_cache_dictionary_has.sql
index 8461728c58e..32c109417de 100644
--- a/tests/queries/1_stateful/00158_cache_dictionary_has.sql
+++ b/tests/queries/1_stateful/00158_cache_dictionary_has.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_dict;
 DROP DICTIONARY IF EXISTS db_dict.cache_hits;
 
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
index 9f61b454d56..5d54328e45d 100755
--- a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
+++ b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/1_stateful/00166_explain_estimate.sql b/tests/queries/1_stateful/00166_explain_estimate.sql
index 06725ff7f9f..c4071271736 100644
--- a/tests/queries/1_stateful/00166_explain_estimate.sql
+++ b/tests/queries/1_stateful/00166_explain_estimate.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Requires investigation
+
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID = 29103473;
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID != 29103473;
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID > 29103473;
diff --git a/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql b/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
index b79a3cf05b4..b81cf585b13 100644
--- a/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
+++ b/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
@@ -1,3 +1,6 @@
+-- Tags: no-polymorphic-parts
+-- Tag no-polymorphic-parts: bug, shoud be fixed
+
 DROP TABLE IF EXISTS APPLICATION;
 DROP TABLE IF EXISTS DATABASE_IO;
 
diff --git a/tests/queries/conftest.py b/tests/queries/conftest.py
deleted file mode 100644
index 2d13443e981..00000000000
--- a/tests/queries/conftest.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import os
-import re
-import sys
-
-import pytest
-
-from .server import ServerThread
-
-
-# Command-line arguments
-
-def pytest_addoption(parser):
-    parser.addoption("--builddir", action="store", default=None, help="Path to build directory to use binaries from")
-
-
-# HTML report hooks
-
-def pytest_html_report_title(report):
-    report.title = "ClickHouse Functional Stateless Tests (PyTest)"
-
-
-RE_TEST_NAME = re.compile(r"\[(.*)\]")
-def pytest_itemcollected(item):
-    match = RE_TEST_NAME.search(item.name)
-    if match:
-        item._nodeid = match.group(1)
-
-
-# Fixtures
-
-@pytest.fixture(scope='module')
-def cmdopts(request):
-    return {
-        'builddir': request.config.getoption("--builddir")
-    }
-
-
-@pytest.fixture(scope='module')
-def bin_prefix(cmdopts):
-    prefix = 'clickhouse'
-    if cmdopts['builddir'] is not None:
-        prefix = os.path.join(cmdopts['builddir'], 'programs', prefix)
-    # FIXME: does this hangs the server start for some reason?
-    # if not os.path.isabs(prefix):
-    #     prefix = os.path.abspath(prefix)
-    return prefix
-
-
-# TODO: also support stateful queries.
-QUERIES_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '0_stateless')
-
-@pytest.fixture(scope='module', params=[f for f in os.listdir(QUERIES_PATH) if f.endswith('.sql')])
-def sql_query(request):
-    return os.path.join(QUERIES_PATH, os.path.splitext(request.param)[0])
-
-
-@pytest.fixture(scope='module', params=[f for f in os.listdir(QUERIES_PATH) if f.endswith('.sh')])
-def shell_query(request):
-    return os.path.join(QUERIES_PATH, os.path.splitext(request.param)[0])
-
-
-@pytest.fixture
-def standalone_server(bin_prefix, tmp_path):
-    server = ServerThread(bin_prefix, str(tmp_path))
-    server.start()
-    wait_result = server.wait()
-
-    if wait_result is not None:
-        with open(os.path.join(server.log_dir, 'server', 'stdout.txt'), 'r') as f:
-            print(f.read(), file=sys.stderr)
-        with open(os.path.join(server.log_dir, 'server', 'stderr.txt'), 'r') as f:
-            print(f.read(), file=sys.stderr)
-        pytest.fail('Server died unexpectedly with code {code}'.format(code=server._proc.returncode), pytrace=False)
-
-    yield server
-
-    server.stop()
diff --git a/tests/queries/pytest.ini b/tests/queries/pytest.ini
deleted file mode 100644
index 13a2ebbaf83..00000000000
--- a/tests/queries/pytest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest]
-render_collapsed = True
diff --git a/tests/queries/query_test.py b/tests/queries/query_test.py
deleted file mode 100644
index 1735febee44..00000000000
--- a/tests/queries/query_test.py
+++ /dev/null
@@ -1,260 +0,0 @@
-import difflib
-import os
-import random
-import string
-import subprocess
-import sys
-
-import pytest
-
-
-SKIP_LIST = [
-    # these couple of tests hangs everything
-    "00600_replace_running_query",
-    "00987_distributed_stack_overflow",
-    "01954_clickhouse_benchmark_multiple_long",
-
-    # just fail
-    "00133_long_shard_memory_tracker_and_exception_safety",
-    "00463_long_sessions_in_http_interface",
-    "00505_secure",
-    "00505_shard_secure",
-    "00646_url_engine",
-    "00725_memory_tracking",  # BROKEN
-    "00738_lock_for_inner_table",
-    "00821_distributed_storage_with_join_on",
-    "00825_protobuf_format_array_3dim",
-    "00825_protobuf_format_array_of_arrays",
-    "00825_protobuf_format_enum_mapping",
-    "00825_protobuf_format_nested_in_nested",
-    "00825_protobuf_format_nested_optional",
-    "00825_protobuf_format_no_length_delimiter",
-    "00825_protobuf_format_persons",
-    "00825_protobuf_format_squares",
-    "00825_protobuf_format_table_default",
-    "00834_cancel_http_readonly_queries_on_client_close",
-    "00877_memory_limit_for_new_delete",
-    "00900_parquet_load",
-    "00933_test_fix_extra_seek_on_compressed_cache",
-    "00965_logs_level_bugfix",
-    "00965_send_logs_level_concurrent_queries",
-    "00974_query_profiler",
-    "00990_hasToken",
-    "00990_metric_log_table_not_empty",
-    "01014_lazy_database_concurrent_recreate_reattach_and_show_tables",
-    "01017_uniqCombined_memory_usage",
-    "01018_Distributed__shard_num",
-    "01018_ip_dictionary_long",
-    "01035_lc_empty_part_bug",  # FLAKY
-    "01050_clickhouse_dict_source_with_subquery",
-    "01053_ssd_dictionary",
-    "01054_cache_dictionary_overflow_cell",
-    "01057_http_compression_prefer_brotli",
-    "01080_check_for_error_incorrect_size_of_nested_column",
-    "01083_expressions_in_engine_arguments",
-    "01086_odbc_roundtrip",
-    "01088_benchmark_query_id",
-    "01092_memory_profiler",
-    "01098_temporary_and_external_tables",
-    "01099_parallel_distributed_insert_select",
-    "01103_check_cpu_instructions_at_startup",
-    "01107_atomic_db_detach_attach",
-    "01114_database_atomic",
-    "01148_zookeeper_path_macros_unfolding",
-    "01152_cross_replication",  # tcp port in reference
-    "01175_distributed_ddl_output_mode_long",
-    "01181_db_atomic_drop_on_cluster",  # tcp port in reference
-    "01280_ssd_complex_key_dictionary",
-    "01293_client_interactive_vertical_multiline",  # expect-test
-    "01293_client_interactive_vertical_singleline",  # expect-test
-    "01293_show_clusters",
-    "01293_show_settings",
-    "01293_system_distribution_queue",  # FLAKY
-    "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
-    "01294_system_distributed_on_cluster",
-    "01300_client_save_history_when_terminated",  # expect-test
-    "01304_direct_io",
-    "01306_benchmark_json",
-    "01035_lc_empty_part_bug",  # FLAKY
-    "01175_distributed_ddl_output_mode_long",  # tcp port in reference
-    "01320_create_sync_race_condition_zookeeper",
-    "01355_CSV_input_format_allow_errors",
-    "01370_client_autocomplete_word_break_characters",  # expect-test
-    "01376_GROUP_BY_injective_elimination_dictGet",
-    "01393_benchmark_secure_port",
-    "01418_custom_settings",
-    "01451_wrong_error_long_query",
-    "01455_opentelemetry_distributed",
-    "01473_event_time_microseconds",
-    "01474_executable_dictionary",
-    "01507_clickhouse_server_start_with_embedded_config",
-    "01514_distributed_cancel_query_on_error",
-    "01520_client_print_query_id",  # expect-test
-    "01526_client_start_and_exit",  # expect-test
-    "01526_max_untracked_memory",
-    "01527_dist_sharding_key_dictGet_reload",
-    "01528_play",
-    "01545_url_file_format_settings",
-    "01553_datetime64_comparison",
-    "01555_system_distribution_queue_mask",
-    "01558_ttest_scipy",
-    "01561_mann_whitney_scipy",
-    "01582_distinct_optimization",
-    "01591_window_functions",
-    "01594_too_low_memory_limits",
-    "01599_multiline_input_and_singleline_comments",  # expect-test
-    "01601_custom_tld",
-    "01606_git_import",
-    "01610_client_spawn_editor",  # expect-test
-    "01654_test_writer_block_sequence",  # No module named 'pandas'
-    "01658_read_file_to_stringcolumn",
-    "01666_merge_tree_max_query_limit",
-    "01674_unicode_asan",
-    "01676_clickhouse_client_autocomplete",  # expect-test (partially)
-    "01676_long_clickhouse_client_autocomplete",
-    "01683_text_log_deadlock",  # secure tcp
-    "01684_ssd_cache_dictionary_simple_key",
-    "01685_ssd_cache_dictionary_complex_key",
-    "01737_clickhouse_server_wait_server_pool_long",
-    "01746_executable_pool_dictionary",
-    "01747_executable_pool_dictionary_implicit_key.sql",
-    "01747_join_view_filter_dictionary",
-    "01748_dictionary_table_dot",
-    "01754_cluster_all_replicas_shard_num",
-    "01759_optimize_skip_unused_shards_zero_shards",
-    "01763_max_distributed_depth",  # BROKEN
-    "01780_clickhouse_dictionary_source_loop",
-    "01801_s3_cluster",
-    "01802_test_postgresql_protocol_with_row_policy",
-    "01804_dictionary_decimal256_type",  # hardcoded path
-    "01848_http_insert_segfault",
-    "01875_ssd_cache_dictionary_decimal256_type",
-    "01880_remote_ipv6",
-    "01889_check_row_policy_defined_using_user_function",
-    "01889_clickhouse_client_config_format",
-    "01903_ssd_cache_dictionary_array_type",
-]
-
-
-def check_result(result, error, return_code, reference, replace_map):
-    if replace_map:
-        for old, new in replace_map.items():
-            result = result.replace(old.encode('utf-8'), new.encode('utf-8'))
-
-    if return_code != 0:
-        try:
-            print(error.decode('utf-8'), file=sys.stderr)
-        except UnicodeDecodeError:
-            print(error.decode('latin1'), file=sys.stderr)  # encoding with 1 symbol per 1 byte, covering all values
-        pytest.fail('Client died unexpectedly with code {code}'.format(code=return_code), pytrace=False)
-    elif result != reference:
-        pytest.fail("Query output doesn't match reference:{eol}{diff}".format(
-                eol=os.linesep,
-                diff=os.linesep.join(l.strip() for l in difflib.unified_diff(reference.decode('utf-8').splitlines(),
-                                                                             result.decode('utf-8').splitlines(),
-                                                                             fromfile='expected', tofile='actual'))),
-            pytrace=False)
-
-
-def run_client(bin_prefix, port, database, query, reference, replace_map=None):
-    # We can't use `text=True` since some tests may return binary data
-    cmd = [bin_prefix + '-client', '--port', str(port), '-d', database, '-m', '-n', '--testmode']
-    client = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    result, error = client.communicate(query.encode('utf-8'))
-    assert client.returncode is not None, "Client should exit after processing all queries"
-
-    check_result(result, error, client.returncode, reference, replace_map)
-
-
-def run_shell(bin_prefix, server, database, path, reference, replace_map=None):
-    env = {
-        'CLICKHOUSE_BINARY': bin_prefix,
-        'CLICKHOUSE_DATABASE': database,
-        'CLICKHOUSE_PORT_TCP': str(server.tcp_port),
-        'CLICKHOUSE_PORT_TCP_SECURE': str(server.tcps_port),
-        'CLICKHOUSE_PORT_TCP_WITH_PROXY': str(server.proxy_port),
-        'CLICKHOUSE_PORT_HTTP': str(server.http_port),
-        'CLICKHOUSE_PORT_INTERSERVER': str(server.inter_port),
-        'CLICKHOUSE_PORT_POSTGRESQL': str(server.postgresql_port),
-        'CLICKHOUSE_TMP': server.tmp_dir,
-        'CLICKHOUSE_CONFIG_CLIENT': server.client_config,
-        'PROTOC_BINARY': os.path.abspath(os.path.join(os.path.dirname(bin_prefix), '..', 'contrib', 'protobuf', 'protoc')),  # FIXME: adhoc solution
-    }
-    shell = subprocess.Popen([path], env=env, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    result, error = shell.communicate()
-    assert shell.returncode is not None, "Script should exit after executing all commands"
-
-    check_result(result, error, shell.returncode, reference, replace_map)
-
-
-def random_str(length=10):
-    alphabet = string.ascii_lowercase + string.digits
-    random.seed(os.urandom(8))
-    return ''.join(random.choice(alphabet) for _ in range(length))
-
-
-def test_sql_query(bin_prefix, sql_query, standalone_server):
-    for test in SKIP_LIST:
-        if test in sql_query:
-            pytest.skip("Test matches skip-list: " + test)
-            return
-
-    tcp_port = standalone_server.tcp_port
-
-    query_path = sql_query + ".sql"
-    reference_path = sql_query + ".reference"
-
-    if not os.path.exists(reference_path):
-        pytest.skip('No .reference file found')
-
-    with open(query_path, 'r') as file:
-        query = file.read()
-    with open(reference_path, 'rb') as file:
-        reference = file.read()
-
-    random_name = 'test_{random}'.format(random=random_str())
-    run_client(bin_prefix, tcp_port, 'default', 'CREATE DATABASE {random};'.format(random=random_name), b'')
-
-    run_client(bin_prefix, tcp_port, random_name, query, reference, {random_name: 'default'})
-
-    query = "SELECT 'SHOW ORPHANED TABLES'; SELECT name FROM system.tables WHERE database != 'system' ORDER BY (database, name);"
-    run_client(bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED TABLES\n')
-
-    query = 'DROP DATABASE {random};'.format(random=random_name)
-    run_client(bin_prefix, tcp_port, 'default', query, b'')
-
-    query = "SELECT 'SHOW ORPHANED DATABASES'; SHOW DATABASES;"
-    run_client(bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED DATABASES\ndefault\nsystem\n')
-
-
-def test_shell_query(bin_prefix, shell_query, standalone_server):
-    for test in SKIP_LIST:
-        if test in shell_query:
-            pytest.skip("Test matches skip-list: " + test)
-            return
-
-    tcp_port = standalone_server.tcp_port
-
-    shell_path = shell_query + ".sh"
-    reference_path = shell_query + ".reference"
-
-    if not os.path.exists(reference_path):
-        pytest.skip('No .reference file found')
-
-    with open(reference_path, 'rb') as file:
-        reference = file.read()
-
-    random_name = 'test_{random}'.format(random=random_str())
-    query = 'CREATE DATABASE {random};'.format(random=random_name)
-    run_client(bin_prefix, tcp_port, 'default', query, b'')
-
-    run_shell(bin_prefix, standalone_server, random_name, shell_path, reference, {random_name: 'default'})
-
-    query = "SELECT 'SHOW ORPHANED TABLES'; SELECT name FROM system.tables WHERE database != 'system' ORDER BY (database, name);"
-    run_client(bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED TABLES\n')
-
-    query = 'DROP DATABASE {random};'.format(random=random_name)
-    run_client(bin_prefix, tcp_port, 'default', query, b'')
-
-    query = "SELECT 'SHOW ORPHANED DATABASES'; SHOW DATABASES;"
-    run_client(bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED DATABASES\ndefault\nsystem\n')
diff --git a/tests/queries/server.py b/tests/queries/server.py
deleted file mode 100644
index c08004aff61..00000000000
--- a/tests/queries/server.py
+++ /dev/null
@@ -1,1303 +0,0 @@
-import os
-import random
-import socket
-import subprocess
-import sys
-import threading
-import time
-
-
-class ServerThread(threading.Thread):
-    DEFAULT_RETRIES = 3
-    DEFAULT_SERVER_DELAY = 0.5  # seconds
-    DEFAULT_CONNECTION_TIMEOUT = 1.0  # seconds
-
-    def __init__(self, bin_prefix, tmp_dir):
-        self._bin = bin_prefix + '-server'
-        self._lock = threading.Lock()
-        threading.Thread.__init__(self)
-        self._lock.acquire()
-
-        self.tmp_dir = tmp_dir
-        self.log_dir = os.path.join(tmp_dir, 'log')
-        self.etc_dir = os.path.join(tmp_dir, 'etc')
-        self.server_config = os.path.join(self.etc_dir, 'server-config.xml')
-        self.users_config = os.path.join(self.etc_dir, 'users.xml')
-        self.dicts_config = os.path.join(self.etc_dir, 'dictionaries.xml')
-        self.client_config = os.path.join(self.etc_dir, 'client-config.xml')
-
-        os.makedirs(self.log_dir)
-        os.makedirs(self.etc_dir)
-
-    def _choose_ports_and_args(self):
-        port_base = random.SystemRandom().randrange(10000, 60000)
-        self.tcp_port = port_base + 1
-        self.http_port = port_base + 2
-        self.inter_port = port_base + 3
-        self.tcps_port = port_base + 4
-        self.https_port = port_base + 5
-        self.odbc_port = port_base + 6
-        self.proxy_port = port_base + 7
-        self.postgresql_port = port_base + 8
-
-        self._args = [
-            '--config-file={config_path}'.format(config_path=self.server_config),
-            '--',
-            '--tcp_port={tcp_port}'.format(tcp_port=self.tcp_port),
-            '--http_port={http_port}'.format(http_port=self.http_port),
-            '--interserver_http_port={inter_port}'.format(inter_port=self.inter_port),
-            '--tcp_with_proxy_port={proxy_port}'.format(proxy_port=self.proxy_port),
-            '--postgresql_port={psql_port}'.format(psql_port=self.postgresql_port),
-            # TODO: SSL certificate is not specified '--tcp_port_secure={tcps_port}'.format(tcps_port=self.tcps_port),
-        ]
-
-        with open(self.server_config, 'w') as f:
-            f.write(ServerThread.DEFAULT_SERVER_CONFIG.format(
-                tmp_dir=self.tmp_dir, log_dir=self.log_dir, tcp_port=self.tcp_port))
-
-        with open(self.users_config, 'w') as f:
-            f.write(ServerThread.DEFAULT_USERS_CONFIG)
-
-        with open(self.dicts_config, 'w') as f:
-            f.write(ServerThread.DEFAULT_DICTIONARIES_CONFIG.format(tcp_port=self.tcp_port))
-
-        with open(self.client_config, 'w') as f:
-            f.write(ServerThread.DEFAULT_CLIENT_CONFIG)
-
-    def run(self):
-        retries = ServerThread.DEFAULT_RETRIES
-
-        while retries:
-            self._choose_ports_and_args()
-            print('Start clickhouse-server with args:', self._args)
-            self._proc = subprocess.Popen([self._bin] + self._args, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-            while self._proc.poll() is None:
-                try:
-                    time.sleep(ServerThread.DEFAULT_SERVER_DELAY)
-                    s = socket.create_connection(('localhost', self.tcp_port), ServerThread.DEFAULT_CONNECTION_TIMEOUT)
-                    s.sendall(b'G')  # trigger expected "bad" HELLO response
-                    s.recv(1024)  # FIXME: read whole buffered response
-                    s.shutdown(socket.SHUT_RDWR)
-                    s.close()
-                except Exception:
-                    # Failed to connect to server - try again
-                    continue
-                else:
-                    break
-
-            # If process has died then try to fetch output before releasing lock
-            if self._proc.returncode is not None:
-                stdout, stderr = self._proc.communicate()
-                print(stdout.decode('utf-8'), file=sys.stderr)
-                print(stderr.decode('utf-8'), file=sys.stderr)
-
-            if self._proc.returncode == 70:  # Address already in use
-                retries -= 1
-                continue
-
-            break
-
-        self._lock.release()
-
-        if not retries:
-            print('Failed to start server', file=sys.stderr)
-            return
-
-        while self._proc.returncode is None:
-            self._proc.communicate()
-
-    def wait(self):
-        self._lock.acquire()
-        if self._proc.returncode is not None:
-            self.join()
-        self._lock.release()
-        return self._proc.returncode
-
-    def stop(self):
-        if self._proc.returncode is None:
-            self._proc.terminate()
-        self.join()
-        print('Stopped clickhouse-server')
-
-
-ServerThread.DEFAULT_SERVER_CONFIG = \
-"""\
-<?xml version="1.0"?>
-<yandex>
-    <logger>
-        <level>trace</level>
-        <log>{log_dir}/server/stdout.txt</log>
-        <errorlog>{log_dir}/server/stderr.txt</errorlog>
-        <size>never</size>
-        <count>1</count>
-    </logger>
-
-    <listen_host>::</listen_host>
-
-    <path>{tmp_dir}/data/</path>
-    <tmp_path>{tmp_dir}/tmp/</tmp_path>
-    <access_control_path>{tmp_dir}/data/access/</access_control_path>
-    <users_config>users.xml</users_config>
-    <dictionaries_config>dictionaries.xml</dictionaries_config>
-    <mark_cache_size>5368709120</mark_cache_size>
-
-    <keep_alive_timeout>3</keep_alive_timeout>
-    <timezone>Europe/Moscow</timezone>
-
-    <macros>
-        <test>Hello, world!</test>
-        <shard>s1</shard>
-        <replica>r1</replica>
-    </macros>
-
-    <graphite_rollup>
-        <version_column_name>Version</version_column_name>
-        <pattern>
-            <regexp>sum</regexp>
-            <function>sum</function>
-            <retention>
-                <age>0</age>
-                <precision>600</precision>
-            </retention>
-            <retention>
-                <age>172800</age> <!-- 2 days -->
-                <precision>6000</precision>
-            </retention>
-        </pattern>
-        <default>
-            <function>max</function>
-            <retention>
-                <age>0</age>
-                <precision>600</precision>
-            </retention>
-            <retention>
-                <age>172800</age>
-                <precision>6000</precision>
-            </retention>
-        </default>
-    </graphite_rollup>
-
-    <query_masking_rules>
-        <rule>
-            <regexp>TOPSECRET.TOPSECRET</regexp>
-            <replace>[hidden]</replace>
-        </rule>
-    </query_masking_rules>
-
-    <remote_servers>
-        <test_shard_localhost>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_shard_localhost>
-
-        <test_cluster_two_shards_localhost>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards_localhost>
-
-        <test_cluster_two_shards>
-            <shard>
-                <replica>
-                    <host>127.0.0.1</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>127.0.0.2</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards>
-
-        <test_unavailable_shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>1</port>
-                </replica>
-            </shard>
-        </test_unavailable_shard>
-
-        <test_cluster_two_shards_different_databases>
-             <shard>
-                 <replica>
-                     <default_database>shard_0</default_database>
-                     <host>localhost</host>
-                     <port>{tcp_port}</port>
-                 </replica>
-             </shard>
-             <shard>
-                 <replica>
-                     <default_database>shard_1</default_database>
-                     <host>localhost</host>
-                     <port>{tcp_port}</port>
-                 </replica>
-             </shard>
-         </test_cluster_two_shards_different_databases>
-
-         <test_cluster_two_shards_internal_replication>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>127.0.0.1</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>127.0.0.2</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards_internal_replication>
-
-        <test_cluster_with_incorrect_pw>
-             <shard>
-                 <internal_replication>true</internal_replication>
-                 <replica>
-                     <host>127.0.0.1</host>
-                     <port>{tcp_port}</port>
-                     <!-- password is incorrect -->
-                     <password>foo</password>
-                 </replica>
-                 <replica>
-                     <host>127.0.0.2</host>
-                     <port>{tcp_port}</port>
-                     <!-- password is incorrect -->
-                     <password>foo</password>
-                 </replica>
-             </shard>
-         </test_cluster_with_incorrect_pw>
-
-         <test_cluster_one_shard_two_replicas>
-           <shard>
-               <replica>
-                   <host>127.0.0.1</host>
-                   <port>{tcp_port}</port>
-               </replica>
-               <replica>
-                   <host>127.0.0.2</host>
-                   <port>{tcp_port}</port>
-               </replica>
-           </shard>
-        </test_cluster_one_shard_two_replicas>
-
-        <test_cluster_two_replicas_different_databases>
-            <shard>
-                <replica>
-                    <default_database>shard_0</default_database>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-                <replica>
-                    <default_database>shard_1</default_database>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_cluster_two_replicas_different_databases>
-    </remote_servers>
-
-    <storage_configuration>
-        <disks>
-            <disk_memory>
-                <type>memory</type>
-            </disk_memory>
-        </disks>
-    </storage_configuration>
-
-    <zookeeper>
-        <implementation>testkeeper</implementation>
-    </zookeeper>
-
-    <distributed_ddl>
-        <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-
-    <part_log>
-        <database>system</database>
-        <table>part_log</table>
-    </part_log>
-
-    <query_log>
-        <database>system</database>
-        <table>query_log</table>
-    </query_log>
-
-    <query_thread_log>
-        <database>system</database>
-        <table>query_thread_log</table>
-    </query_thread_log>
-
-    <text_log>
-        <database>system</database>
-        <table>text_log</table>
-    </text_log>
-
-    <trace_log>
-        <database>system</database>
-        <table>trace_log</table>
-    </trace_log>
-</yandex>
-"""
-
-
-ServerThread.DEFAULT_USERS_CONFIG = \
-"""\
-<?xml version="1.0"?>
-<yandex>
-    <profiles>
-        <default>
-            <max_memory_usage>10000000000</max_memory_usage>
-            <use_uncompressed_cache>0</use_uncompressed_cache>
-            <load_balancing>random</load_balancing>
-        </default>
-
-        <readonly>
-            <readonly>1</readonly>
-        </readonly>
-    </profiles>
-
-    <users>
-        <default>
-            <password></password>
-            <networks replace="replace">
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>default</profile>
-
-            <quota>default</quota>
-
-            <access_management>1</access_management>
-        </default>
-
-        <readonly>
-            <password></password>
-            <networks replace="replace">
-                <ip>::1</ip>
-                <ip>127.0.0.1</ip>
-            </networks>
-
-            <profile>readonly</profile>
-
-            <quota>default</quota>
-        </readonly>
-    </users>
-
-    <quotas>
-        <default>
-            <interval>
-                <duration>3600</duration>
-                <queries>0</queries>
-                <errors>0</errors>
-                <result_rows>0</result_rows>
-                <read_rows>0</read_rows>
-                <execution_time>0</execution_time>
-            </interval>
-        </default>
-    </quotas>
-</yandex>
-"""
-
-
-ServerThread.DEFAULT_DICTIONARIES_CONFIG = \
-"""\
-<yandex>
-    <dictionary>
-        <name>flat_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <flat/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>hashed_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>hashed_sparse_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <sparse_hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>cache_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <cache><size_in_cells>1000</size_in_cells></cache>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_hashed_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_hashed/>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_cache_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_cache><size_in_cells>1000</size_in_cells></complex_key_cache>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>flat_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <flat/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>hashed_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>cache_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <cache><size_in_cells>1000</size_in_cells></cache>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_hashed_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_hashed/>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_cache_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_cache><size_in_cells>1000</size_in_cells></complex_key_cache>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>flat_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <flat/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>hashed_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>cache_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <cache><size_in_cells>1000</size_in_cells></cache>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_hashed_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_hashed/>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_cache_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_cache><size_in_cells>1000</size_in_cells></complex_key_cache>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>simple_executable_cache_dictionary_no_implicit_key</name>
-        <structure>
-            <id>
-                <name>id</name>
-                <type>UInt64</type>
-            </id>
-
-            <attribute>
-                <name>value</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <source>
-            <executable>
-                <command>echo "1\tValue"</command>
-                <format>TabSeparated</format>
-                <implicit_key>false</implicit_key>
-            </executable>
-        </source>
-        <layout>
-            <cache>
-                <size_in_cells>10000</size_in_cells>
-            </cache>
-        </layout>
-        <lifetime>300</lifetime>
-    </dictionary>
-
-    <dictionary>
-        <name>simple_executable_cache_dictionary_implicit_key</name>
-        <structure>
-            <id>
-                <name>id</name>
-                <type>UInt64</type>
-            </id>
-
-            <attribute>
-                <name>value</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <source>
-            <executable>
-                <command>echo "Value"</command>
-                <format>TabSeparated</format>
-                <implicit_key>true</implicit_key>
-            </executable>
-        </source>
-        <layout>
-            <cache>
-                <size_in_cells>10000</size_in_cells>
-            </cache>
-        </layout>
-        <lifetime>300</lifetime>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_executable_cache_dictionary_no_implicit_key</name>
-        <structure>
-            <key>
-                <attribute>
-                    <name>id</name>
-                    <type>UInt64</type>
-                    <null_value></null_value>
-                </attribute>
-                <attribute>
-                    <name>id_key</name>
-                    <type>String</type>
-                    <null_value></null_value>
-                </attribute>
-            </key>
-            <attribute>
-                <name>value</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <source>
-            <executable>
-                <command>echo "1\tFirstKey\tValue"</command>
-                <format>TabSeparated</format>
-                <implicit_key>false</implicit_key>
-            </executable>
-        </source>
-        <layout>
-            <complex_key_cache>
-                <size_in_cells>10000</size_in_cells>
-            </complex_key_cache>
-        </layout>
-        <lifetime>300</lifetime>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_executable_cache_dictionary_implicit_key</name>
-        <structure>
-            <key>
-                <attribute>
-                    <name>id</name>
-                    <type>UInt64</type>
-                    <null_value></null_value>
-                </attribute>
-                <attribute>
-                    <name>id_key</name>
-                    <type>String</type>
-                    <null_value></null_value>
-                </attribute>
-            </key>
-            <attribute>
-                <name>value</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <source>
-            <executable>
-                <command>echo "Value"</command>
-                <format>TabSeparated</format>
-                <implicit_key>true</implicit_key>
-            </executable>
-        </source>
-        <layout>
-            <complex_key_cache>
-                <size_in_cells>10000</size_in_cells>
-            </complex_key_cache>
-        </layout>
-        <lifetime>300</lifetime>
-    </dictionary>
-</yandex>
-"""
-
-ServerThread.DEFAULT_CLIENT_CONFIG = \
-"""\
-<config>
-    <openSSL>
-        <client>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-            <invalidCertificateHandler>
-                <name>AcceptCertificateHandler</name>
-            </invalidCertificateHandler>
-        </client>
-    </openSSL>
-</config>
-"""
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
deleted file mode 100644
index 0143cc78dbe..00000000000
--- a/tests/queries/skip_list.json
+++ /dev/null
@@ -1,518 +0,0 @@
-/** List of tests which should be skipped depending on clickhouse build options.
-  * This file in json format, but javascript-style comments are allowed.
-  */
-{
-    "thread-sanitizer": [
-        "00877",
-        "query_profiler",
-        "memory_profiler",
-        "01103_check_cpu_instructions_at_startup",
-        "00152_insert_different_granularity",
-        "00151_replace_partition_with_different_granularity",
-        "00157_cache_dictionary",
-        "01193_metadata_loading",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01474_executable_dictionary", /// informational stderr from sanitizer at start
-        "functions_bad_arguments", /// Too long for TSan
-        "01603_read_with_backoff_bug", /// Too long for TSan
-        "01646_system_restart_replicas_smoke", /// RESTART REPLICAS can acquire too much locks, while only 64 is possible from one thread under TSan
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "address-sanitizer": [
-        "00877",
-        "query_profiler",
-        "memory_profiler",
-        "odbc_roundtrip",
-        "01103_check_cpu_instructions_at_startup",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "ub-sanitizer": [
-        "capnproto",
-        "query_profiler",
-        "memory_profiler",
-        "01103_check_cpu_instructions_at_startup",
-        "00900_orc_load",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01955_clickhouse_benchmark_connection_hang" /// Limits RLIMIT_NOFILE, see comment in the test
-    ],
-    "memory-sanitizer": [
-        "capnproto",
-        "query_profiler",
-        "memory_profiler",
-        "01175_distributed_ddl_output_mode_long",  /// issue 21600
-        "01103_check_cpu_instructions_at_startup",
-        "01086_odbc_roundtrip", /// can't pass because odbc libraries are not instrumented
-        "00877_memory_limit_for_new_delete", /// memory limits don't work correctly under msan because it replaces malloc/free
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "debug-build": [
-        "query_profiler",
-        "memory_profiler",
-        "00899_long_attach",
-        "00980_alter_settings_race",
-        "00834_kill_mutation_replicated_zookeeper",
-        "00834_kill_mutation",
-        "01200_mutations_memory_consumption",
-        "01103_check_cpu_instructions_at_startup",
-        "01037_polygon_dicts_",
-        "hyperscan",
-        "01193_metadata_loading",
-        "01473_event_time_microseconds",
-        "01396_inactive_replica_cleanup_nodes"
-    ],
-    "unbundled-build": [
-        "00429",
-        "00877",
-        "pocopatch",
-        "parquet",
-        "xxhash",
-        "_h3",
-        "query_profiler",
-        "memory_profiler",
-        "orc_load",
-        "01033_storage_odbc_parsing_exception_check",
-        "avro",
-        "01072_optimize_skip_unused_shards_const_expr_eval",
-        "00505_secure",
-        "00505_shard_secure",
-        "odbc_roundtrip",
-        "01103_check_cpu_instructions_at_startup",
-        "01114_mysql_database_engine_segfault",
-        "00834_cancel_http_readonly_queries_on_client_close",
-        "_arrow",
-        "01099_parallel_distributed_insert_select",
-        "01300_client_save_history_when_terminated",
-        "orc_output",
-        "01370_client_autocomplete_word_break_characters",
-        "01676_clickhouse_client_autocomplete",
-        "01193_metadata_loading",
-        "01455_time_zones",
-        "01755_client_highlight_multi_line_comment_regression"
-    ],
-    "release-build": [
-    ],
-    "database-ordinary": [
-        "00604_show_create_database",
-        "00609_mv_index_in_in",
-        "00510_materizlized_view_and_deduplication_zookeeper",
-        "00738_lock_for_inner_table",
-        "01153_attach_mv_uuid",
-        "01157_replace_table",
-        "01185_create_or_replace_table",
-        /// Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database.
-        "rocksdb",
-        "01914_exchange_dictionaries" /// Requires Atomic database
-    ],
-    "database-replicated": [
-        /// Unclassified
-        "memory_tracking",
-        "memory_usage",
-        "live_view",
-        "01148_zookeeper_path_macros_unfolding",
-        "01269_create_with_null",
-        "01451_replicated_detach_drop_and_quorum",
-        "01188_attach_table_from_path",
-        /// ON CLUSTER is not allowed
-        "01181_db_atomic_drop_on_cluster",
-        "01175_distributed_ddl_output_mode",
-        "01415_sticking_mutations",
-        /// user_files
-        "01721_engine_file_truncate_on_insert",
-        /// Fails due to additional replicas or shards
-        "quorum",
-        "01650_drop_part_and_deduplication_zookeeper",
-        "01532_execute_merges_on_single_replica",
-        "00652_replicated_mutations_default_database_zookeeper",
-        "00620_optimize_on_nonleader_replica_zookeeper",
-        "01158_zookeeper_log",
-        /// grep -c
-        "01018_ddl_dictionaries_bad_queries",
-        "00908_bloom_filter_index",
-        /// Unsupported type of ALTER query
-        "01650_fetch_patition_with_macro_in_zk_path",
-        "01451_detach_drop_part",
-        "01451_replicated_detach_drop_part",
-        "01417_freeze_partition_verbose",
-        "01417_freeze_partition_verbose_zookeeper",
-        "01130_in_memory_parts_partitons",
-        "01060_shutdown_table_after_detach",
-        "01021_only_tuple_columns",
-        "01015_attach_part",
-        "00955_test_final_mark",
-        "00753_alter_attach",
-        "00626_replace_partition_from_table_zookeeper",
-        "00626_replace_partition_from_table",
-        "00152_insert_different_granularity",
-        "00054_merge_tree_partitions",
-        "01781_merge_tree_deduplication",
-        "00980_zookeeper_merge_tree_alter_settings",
-        "00980_merge_alter_settings",
-        "02009_array_join_partition",
-        "02012_changed_enum_type_non_replicated",
-        "02012_zookeeper_changed_enum_type",
-        "02012_zookeeper_changed_enum_type_incompatible",
-        /// Old syntax is not allowed
-        "01062_alter_on_mutataion_zookeeper",
-        "00925_zookeeper_empty_replicated_merge_tree_optimize_final",
-        "00754_alter_modify_order_by_replicated_zookeeper",
-        "00652_replicated_mutations_zookeeper",
-        "00623_replicated_truncate_table_zookeeper",
-        "00516_deduplication_after_drop_partition_zookeeper",
-        "00446_clear_column_in_partition_concurrent_zookeeper",
-        "00236_replicated_drop_on_non_leader_zookeeper",
-        "00226_zookeeper_deduplication_and_unexpected_parts",
-        "00215_primary_key_order_zookeeper",
-        "00121_drop_column_zookeeper",
-        "00083_create_merge_tree_zookeeper",
-        "00062_replicated_merge_tree_alter_zookeeper",
-        /// Does not support renaming of multiple tables in single query
-        "00634_rename_view",
-        "00140_rename",
-        /// Different query_id
-        "01943_query_id_check",
-        /// Requires investigation
-        "00953_zookeeper_suetin_deduplication_bug",
-        "01783_http_chunk_size",
-        "00166_explain_estimate"
-    ],
-    "polymorphic-parts": [
-        "01508_partition_pruning_long", /// bug, shoud be fixed
-        "01482_move_to_prewhere_and_cast", /// bug, shoud be fixed
-        "01158_zookeeper_log"
-    ],
-    "parallel":
-    [
-        /// Pessimistic list of tests which work badly in parallel.
-        /// Probably they need better investigation.
-        "00080_show_tables_and_system_tables",
-        "00101_materialized_views_and_insert_without_explicit_database",
-        "00109_shard_totals_after_having",
-        "00110_external_sort",
-        "00116_storage_set",
-        "00133_long_shard_memory_tracker_and_exception_safety",
-        "00158_buffer_and_nonexistent_table",
-        "00180_attach_materialized_view",
-        "00305_http_and_readonly",
-        "00311_array_primary_key",
-        "00417_kill_query",
-        "00423_storage_log_single_thread",
-        "00429_long_http_bufferization",
-        "00446_clear_column_in_partition_concurrent_zookeeper",
-        "00463_long_sessions_in_http_interface",
-        "00505_shard_secure",
-        "00508_materialized_view_to",
-        "00534_functions_bad_arguments10",
-        "00552_or_nullable",
-        "00564_versioned_collapsing_merge_tree",
-        "00571_non_exist_database_when_create_materializ_view",
-        "00575_illegal_column_exception_when_drop_depen_column",
-        "00599_create_view_with_subquery",
-        "00600_replace_running_query",
-        "00604_show_create_database",
-        "00612_http_max_query_size",
-        "00619_union_highlite",
-        "00620_optimize_on_nonleader_replica_zookeeper",
-        "00623_truncate_table",
-        "00623_truncate_table_throw_exception",
-        "00625_arrays_in_nested",
-        "00626_replace_partition_from_table",
-        "00626_replace_partition_from_table_zookeeper",
-        "00633_materialized_view_and_too_many_parts_zookeeper",
-        "00652_mergetree_mutations",
-        "00652_replicated_mutations_zookeeper",
-        "00682_empty_parts_merge",
-        "00688_low_cardinality_serialization",
-        "00693_max_block_size_system_tables_columns",
-        "00699_materialized_view_mutations",
-        "00701_rollup",
-        "00715_fetch_merged_or_mutated_part_zookeeper",
-        "00716_allow_ddl",
-        "00719_parallel_ddl_db",
-        "00740_database_in_nested_view",
-        "00741_client_comment_multiline",
-        "00751_default_databasename_for_view",
-        "00753_alter_attach",
-        "00754_alter_modify_column_partitions",
-        "00763_long_lock_buffer_alter_destination_table",
-        "00800_versatile_storage_join",
-        "00804_test_alter_compression_codecs",
-        "00804_test_custom_compression_codecs",
-        "00804_test_custom_compression_codes_log_storages",
-        "00804_test_delta_codec_compression",
-        "00815_left_join_on_stepanel",
-        "00834_cancel_http_readonly_queries_on_client_close",
-        "00834_kill_mutation",
-        "00834_kill_mutation_replicated_zookeeper",
-        "00840_long_concurrent_select_and_drop_deadlock",
-        "00857_global_joinsavel_table_alias",
-        "00899_long_attach_memory_limit",
-        "00910_buffer_prewhere",
-        "00926_adaptive_index_granularity_merge_tree",
-        "00926_adaptive_index_granularity_pk",
-        "00926_adaptive_index_granularity_replacing_merge_tree",
-        "00933_alter_ttl",
-        "00933_reserved_word",
-        "00933_test_fix_extra_seek_on_compressed_cache",
-        "00933_ttl_with_default",
-        "00950_dict_get",
-        "00955_test_final_mark",
-        "00976_ttl_with_old_parts",
-        "00980_merge_alter_settings",
-        "00980_zookeeper_merge_tree_alter_settings",
-        "00989_parallel_parts_loading",
-        "00992_system_parts_race_condition_zookeeper_long",
-        "00993_system_parts_race_condition_drop_zookeeper",
-        "01012_show_tables_limit",
-        "01013_sync_replica_timeout_zookeeper",
-        "01014_lazy_database_basic",
-        "01014_lazy_database_concurrent_recreate_reattach_and_show_tables",
-        "01015_attach_part",
-        "01015_database_bad_tables",
-        "01018_ddl_dictionaries_concurrent_requrests",
-        "01018_ddl_dictionaries_create",
-        "01018_ddl_dictionaries_select",
-        "01018_ddl_dictionaries_special",
-        "01018_dictionaries_from_dictionaries",
-        "01018_ip_dictionary_long",
-        "01021_only_tuple_columns",
-        "01023_materialized_view_query_context",
-        "01031_mutations_interpreter_and_context",
-        "01033_dictionaries_lifetime",
-        "01035_concurrent_move_partition_from_table_zookeeper",
-        "01036_no_superfluous_dict_reload_on_create_database",
-        "01036_no_superfluous_dict_reload_on_create_database_2",
-        "01037_polygon_dicts_correctness_all",
-        "01037_polygon_dicts_correctness_fast",
-        "01037_polygon_dicts_simple_functions",
-        "01038_dictionary_lifetime_min_zero_sec",
-        "01040_dictionary_invalidate_query_switchover_long",
-        "01041_create_dictionary_if_not_exists",
-        "01042_system_reload_dictionary_reloads_completely",
-        "01043_dictionary_attribute_properties_values",
-        "01045_dictionaries_restrictions",
-        "01045_zookeeper_system_mutations_with_parts_names",
-        "01048_exists_query",
-        "01053_drop_database_mat_view",
-        "01053_ssd_dictionary",
-        "01054_cache_dictionary_bunch_update",
-        "01054_cache_dictionary_overflow_cell",
-        "01055_compact_parts_1",
-        "01056_create_table_as",
-        "01060_avro",
-        "01060_shutdown_table_after_detach",
-        "01069_database_memory",
-        "01070_materialize_ttl",
-        "01070_modify_ttl",
-        "01070_mutations_with_dependencies",
-        "01071_live_view_detach_dependency",
-        "01071_prohibition_secondary_index_with_old_format_merge_tree",
-        "01073_attach_if_not_exists",
-        "01073_show_tables_not_like",
-        "01076_cache_dictionary_datarace_exception_ptr",
-        "01076_parallel_alter_replicated_zookeeper",
-        "01079_parallel_alter_add_drop_column_zookeeper",
-        "01079_parallel_alter_detach_table_zookeeper",
-        "01079_parallel_alter_modify_zookeeper_long",
-        "01080_check_for_error_incorrect_size_of_nested_column",
-        "01083_expressions_in_engine_arguments",
-        "01084_regexp_empty",
-        "01085_max_distributed_connections_http",
-        "01092_memory_profiler",
-        "01098_temporary_and_external_tables",
-        "01103_distributed_product_mode_local_column_renames",
-        "01107_atomic_db_detach_attach",
-        "01108_restart_replicas_rename_deadlock_zookeeper",
-        "01109_exchange_tables",
-        "01110_dictionary_layout_without_arguments",
-        "01113_local_dictionary_type_conversion",
-        "01114_database_atomic",
-        "01114_mysql_database_engine_segfault",
-        "01115_join_with_dictionary",
-        "01125_dict_ddl_cannot_add_column",
-        "01127_month_partitioning_consistency_select",
-        "01130_in_memory_parts_partitons",
-        "01148_zookeeper_path_macros_unfolding",
-        "01150_ddl_guard_rwr",
-        "01153_attach_mv_uuid",
-        "01152_cross_replication",
-        "01154_move_partition_long",
-        "01155_rename_move_materialized_view",
-        "01185_create_or_replace_table",
-        "01190_full_attach_syntax",
-        "01191_rename_dictionary",
-        "01192_rename_database_zookeeper",
-        "01193_metadata_loading",
-        "01200_mutations_memory_consumption",
-        "01224_no_superfluous_dict_reload",
-        "01225_drop_dictionary_as_table",
-        "01225_show_create_table_from_dictionary",
-        "01231_distributed_aggregation_memory_efficient_mix_levels",
-        "01232_extremes",
-        "01238_http_memory_tracking",
-        "01249_bad_arguments_for_bloom_filter",
-        "01251_dict_is_in_infinite_loop",
-        "01254_dict_create_without_db",
-        "01254_dict_load_after_detach_attach",
-        "01257_dictionary_mismatch_types",
-        "01259_dictionary_custom_settings_ddl",
-        "01268_dictionary_direct_layout",
-        "01269_alias_type_differs",
-        "01272_suspicious_codecs",
-        "01280_ssd_complex_key_dictionary",
-        "01280_ttl_where_group_by",
-        "01281_group_by_limit_memory_tracking",
-        "01281_unsucceeded_insert_select_queries_counter",
-        "01293_system_distribution_queue",
-        "01294_lazy_database_concurrent",
-        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
-        "01294_system_distributed_on_cluster",
-        "01296_create_row_policy_in_current_database",
-        "01297_create_quota",
-        "01305_replica_create_drop_zookeeper",
-        "01307_multiple_leaders_zookeeper",
-        "01318_long_unsuccessful_mutation_zookeeper",
-        "01320_create_sync_race_condition_zookeeper",
-        "01338_long_select_and_alter",
-        "01338_long_select_and_alter_zookeeper",
-        "01355_alter_column_with_order",
-        "01355_ilike",
-        "01357_version_collapsing_attach_detach_zookeeper",
-        "01375_compact_parts_codecs",
-        "01376_GROUP_BY_injective_elimination_dictGet",
-        "01383_remote_ambiguous_column_shard",
-        "01388_clear_all_columns",
-        "01391_join_on_dict_crash",
-        "01392_column_resolve",
-        "01396_inactive_replica_cleanup_nodes_zookeeper",
-        "01412_cache_dictionary_race",
-        "01414_mutations_and_errors_zookeeper",
-        "01415_inconsistent_merge_tree_settings",
-        "01415_sticking_mutations",
-        "01417_freeze_partition_verbose",
-        "01417_freeze_partition_verbose_zookeeper",
-        "01444_create_table_drop_database_race",
-        "01454_storagememory_data_race_challenge",
-        "01455_rank_correlation_spearman",
-        "01456_modify_column_type_via_add_drop_update",
-        "01457_create_as_table_function_structure",
-        "01459_manual_write_to_replicas",
-        "01460_DistributedFilesToInsert",
-        "01465_ttl_recompression",
-        "01470_show_databases_like",
-        "01471_calculate_ttl_during_merge",
-        "01487_distributed_in_not_default_db",
-        "01493_storage_set_persistency",
-        "01494_storage_join_persistency",
-        "01501_cache_dictionary_all_fields",
-        "01507_clickhouse_server_start_with_embedded_config",
-        "01509_dictionary_preallocate",
-        "01516_create_table_primary_key",
-        "01517_drop_mv_with_inner_table",
-        "01526_complex_key_dict_direct_layout",
-        "01527_clickhouse_local_optimize",
-        "01527_dist_sharding_key_dictGet_reload",
-        "01541_max_memory_usage_for_user_long",
-        "01542_dictionary_load_exception_race",
-        "01545_system_errors", // looks at the difference of values in system.errors
-        "01560_optimize_on_insert_zookeeper",
-        "01563_distributed_query_finish", // looks at system.errors which is global
-        "01575_disable_detach_table_of_dictionary",
-        "01593_concurrent_alter_mutations_kill",
-        "01593_concurrent_alter_mutations_kill_many_replicas",
-        "01600_count_of_parts_metrics", // tests global system metrics
-        "01600_detach_permanently",
-        "01600_log_queries_with_extensive_info",
-        "01600_multiple_left_join_with_aliases",
-        "01601_detach_permanently",
-        "01602_show_create_view",
-        "01603_rename_overwrite_bug",
-        "01646_system_restart_replicas_smoke", // system restart replicas is a global query
-        "01656_test_query_log_factories_info",
-        "01658_read_file_to_stringcolumn",
-        "01676_dictget_in_default_expression",
-        "01681_cache_dictionary_simple_key",
-        "01682_cache_dictionary_complex_key",
-        "01683_flat_dictionary",
-        "01684_ssd_cache_dictionary_simple_key",
-        "01685_ssd_cache_dictionary_complex_key",
-        "01702_system_query_log", // It's ok to execute in parallel with oter tests but not several instances of the same test.
-        "01702_system_query_log", // Runs many global system queries
-        "01721_engine_file_truncate_on_insert", // It's ok to execute in parallel but not several instances of the same test.
-        "01722_long_brotli_http_compression_json_format", // It is broken in some unimaginable way with the genius error 'cannot write to ofstream'. Not sure how to debug this
-        "01748_dictionary_table_dot", // creates database
-        "01760_polygon_dictionaries",
-        "01760_system_dictionaries",
-        "01360_materialized_view_with_join_on_query_log", // creates and drops MVs on query_log, which may interrupt flushes.
-        "attach",
-        "ddl_dictionaries",
-        "dictionary",
-        "limit_memory",
-        "live_view",
-        "memory_leak",
-        "memory_limit",
-        "polygon_dicts", // they use an explicitly specified database
-        "01658_read_file_to_stringcolumn",
-        "01721_engine_file_truncate_on_insert", // It's ok to execute in parallel but not several instances of the same test.
-        "01702_system_query_log", // It's ok to execute in parallel with oter tests but not several instances of the same test.
-        "01748_dictionary_table_dot", // creates database
-        "00950_dict_get",
-        "01615_random_one_shard_insertion",
-        "01683_flat_dictionary",
-        "01681_cache_dictionary_simple_key",
-        "01682_cache_dictionary_complex_key",
-        "01684_ssd_cache_dictionary_simple_key",
-        "01685_ssd_cache_dictionary_complex_key",
-        "01737_clickhouse_server_wait_server_pool_long", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01954_clickhouse_benchmark_round_robin", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01594_too_low_memory_limits", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01760_system_dictionaries",
-        "01760_polygon_dictionaries",
-        "01778_hierarchical_dictionaries",
-        "01780_clickhouse_dictionary_source_loop",
-        "01785_dictionary_element_count",
-        "01802_test_postgresql_protocol_with_row_policy", /// Creates database and users
-        "01804_dictionary_decimal256_type",
-        "01850_dist_INSERT_preserve_error", // uses cluster with different static databases shard_0/shard_1
-        "01821_table_comment",
-        "01856_create_function",
-        "01857_create_function_and_check_jit_compiled",
-        "01824_prefer_global_in_and_join",
-        "01870_modulo_partition_key",
-        "01870_buffer_flush", // creates database
-        "01889_postgresql_protocol_null_fields",
-        "01889_check_row_policy_defined_using_user_function",
-        "01921_concurrent_ttl_and_normal_merges_zookeeper_long", // heavy test, better to run sequentially
-        "01913_replace_dictionary",
-        "01914_exchange_dictionaries",
-        "01915_create_or_replace_dictionary",
-        "01925_test_storage_merge_aliases",
-        "01933_client_replxx_convert_history", /// Uses non unique history file
-        "01939_user_with_default_database", //create user and database
-        "01999_grant_with_replace",
-        "01902_table_function_merge_db_repr",
-        "01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer",
-        "01946_test_wrong_host_name_access",
-        "01493_alter_remove_properties_zookeeper",
-        "00510_materizlized_view_and_deduplication_zookeeper", /// static UUID
-        "00509_extended_storage_definition_syntax_zookeeper", /// leftovers
-        "00083_create_merge_tree_zookeeper", /// leftovers
-        "01532_execute_merges_on_single_replica", /// static zk path
-        "01530_drop_database_atomic_sync", /// creates database
-        "02001_add_default_database_to_system_users", ///create user
-        "02002_row_level_filter_bug", ///create user
-        "02015_system_views"
-    ]
-}
diff --git a/tests/server-test.xml b/tests/server-test.xml
deleted file mode 100644
index 1f67317ad0a..00000000000
--- a/tests/server-test.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Config for test server in "Arcadia".
-   This file is unused by ClickHouse continuous integration tests.
-   "Arcadia" is a proprietary monorepository in Yandex, that we don't care about.
-   If you are looking at this file, it is a wrong place.
-   Do not edit this file.
--->
-<yandex>
-    <logger>
-        <level>trace</level>
-        <log>/tmp/clickhouse/log/clickhouse-server.log</log>
-        <errorlog>/tmp/clickhouse/log/clickhouse-server.err.log</errorlog>
-        <size>10M</size>
-        <count>1</count>
-        <compress>0</compress>
-    </logger>
-    <listen_host>::</listen_host>
-    <listen_host>0.0.0.0</listen_host>
-    <listen_try>1</listen_try>
-    <http_port>58123</http_port>
-    <tcp_port>59000</tcp_port>
-    <https_port>58443</https_port>
-    <tcp_port_secure>59440</tcp_port_secure>
-    <interserver_http_port>59009</interserver_http_port>
-    <max_thread_pool_size>10000</max_thread_pool_size>
-    <openSSL>
-        <server> <!-- Used for https server AND secure tcp port -->
-            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
-            <certificateFile>/tmp/clickhouse/etc/server.crt</certificateFile>
-            <privateKeyFile>/tmp/clickhouse/etc/server.key</privateKeyFile>
-            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
-            <dhParamsFile>/tmp/clickhouse/etc/dhparam.pem</dhParamsFile>
-            <verificationMode>none</verificationMode>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-        </server>
-
-        <client> <!-- Used for connecting to https dictionary source and secured Zookeeper communication -->
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-            <verificationMode>none</verificationMode>
-            <invalidCertificateHandler>
-                <name>AcceptCertificateHandler</name>
-            </invalidCertificateHandler>
-        </client>
-    </openSSL>
-
-    <keep_alive_timeout>3</keep_alive_timeout>
-    <path>/tmp/clickhouse/data/</path>
-    <tmp_path>/tmp/clickhouse/tmp/</tmp_path>
-    <users_config>users.xml</users_config>
-    <access_control_path>/tmp/clickhouse/data/access/</access_control_path>
-    <custom_settings_prefixes>custom_</custom_settings_prefixes>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <default_profile>default</default_profile>
-    <default_database>default</default_database>
-    <timezone>Europe/Moscow</timezone>
-    <remote_servers incl="clickhouse_remote_servers" >
-        <!-- Test only shard config for testing distributed storage -->
-        <test_unavailable_shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>1</port>
-                </replica>
-            </shard>
-        </test_unavailable_shard>
-        <test_shard_localhost>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-        </test_shard_localhost>
-        <test_cluster_two_shards>
-            <shard>
-                <replica>
-                    <host>127.0.0.1</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>127.0.0.2</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards>
-        <test_cluster_two_shards_localhost>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards_localhost>
-        <test_shard_localhost_secure>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59440</port>
-                    <secure>1</secure>
-                </replica>
-            </shard>
-        </test_shard_localhost_secure>
-    </remote_servers>
-    <include_from/>
-    <zookeeper incl="zookeeper-servers" optional="true" />
-    <macros incl="macros" optional="true" />
-    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
-    <max_session_timeout>3600</max_session_timeout>
-    <default_session_timeout>60</default_session_timeout>
-    <query_log>
-        <database>system</database>
-        <table>query_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </query_log>
-    <dictionaries_config>*_dictionary.xml</dictionaries_config>
-    <compression incl="clickhouse_compression">
-    </compression>
-    <distributed_ddl>
-        <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-    <format_schema_path>/tmp/clickhouse/data/format_schemas/</format_schema_path>
-    <query_masking_rules>
-        <rule>
-            <regexp>TOPSECRET.TOPSECRET</regexp>
-            <replace>[hidden]</replace>
-        </rule>
-    </query_masking_rules>
-</yandex>
diff --git a/tests/strings_dictionary.xml b/tests/strings_dictionary.xml
deleted file mode 120000
index be66c1da224..00000000000
--- a/tests/strings_dictionary.xml
+++ /dev/null
@@ -1 +0,0 @@
-config/strings_dictionary.xml
\ No newline at end of file
diff --git a/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml b/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
+++ b/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
+++ b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/example/example_env/clickhouse-service.yml b/tests/testflows/example/example_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/example/example_env/clickhouse-service.yml
+++ b/tests/testflows/example/example_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100644
--- a/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
+++ b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml b/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
index 14736a264b8..9f30ca3039a 100644
--- a/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
+++ b/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test:21454
+    image: clickhouse/integration-test:21454
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml b/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/map_type/map_type_env/clickhouse-service.yml b/tests/testflows/map_type/map_type_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100755
--- a/tests/testflows/map_type/map_type_env/clickhouse-service.yml
+++ b/tests/testflows/map_type/map_type_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/rbac/rbac_env/clickhouse-service.yml b/tests/testflows/rbac/rbac_env/clickhouse-service.yml
index 2d79443dcbb..ac52e3b83eb 100755
--- a/tests/testflows/rbac/rbac_env/clickhouse-service.yml
+++ b/tests/testflows/rbac/rbac_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/runner b/tests/testflows/runner
index 772a4d01a84..0208512762c 100755
--- a/tests/testflows/runner
+++ b/tests/testflows/runner
@@ -14,7 +14,7 @@ DEFAULT_CLICKHOUSE_ROOT = os.path.abspath(os.path.join(CUR_FILE_DIR, "../../"))
 CURRENT_WORK_DIR = os.getcwd()
 CONTAINER_NAME = "clickhouse_testflows_tests"
 
-DIND_TESTFLOWS_TESTS_IMAGE_NAME = "yandex/clickhouse-testflows-runner"
+DIND_TESTFLOWS_TESTS_IMAGE_NAME = "clickhouse/testflows-runner"
 
 def check_args_and_update_paths(args):
     if not os.path.isabs(args.binary):
diff --git a/tests/testflows/window_functions/tests/common.py b/tests/testflows/window_functions/tests/common.py
index 3ed4f794ada..4f8b8081bf9 100644
--- a/tests/testflows/window_functions/tests/common.py
+++ b/tests/testflows/window_functions/tests/common.py
@@ -33,7 +33,7 @@ def syntax_error():
     return (62, "Exception: Syntax error")
 
 def groups_frame_error():
-    return (48, "Exception: Window frame 'GROUPS' is not implemented")
+    return (48, "Exception: Window frame 'Groups' is not implemented")
 
 def getuid():
     if current().subtype == TestSubType.Example:
diff --git a/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml b/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100755
--- a/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
+++ b/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/users.d/access_management.xml b/tests/users.d/access_management.xml
deleted file mode 100644
index 7e799cb7b10..00000000000
--- a/tests/users.d/access_management.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>
diff --git a/tests/users.d/readonly.xml b/tests/users.d/readonly.xml
deleted file mode 120000
index 023bb5bf9f5..00000000000
--- a/tests/users.d/readonly.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../programs/server/users.d/readonly.xml
\ No newline at end of file
diff --git a/tests/users.xml b/tests/users.xml
deleted file mode 120000
index 32a83e5806f..00000000000
--- a/tests/users.xml
+++ /dev/null
@@ -1 +0,0 @@
-../programs/server/users.xml
\ No newline at end of file
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 9b9daa9470a..8c1d56c90d8 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -167,26 +167,6 @@ find $ROOT_PATH -not -path $ROOT_PATH'/docker*' -not -path $ROOT_PATH'/contrib*'
 # There shouldn't be any docker compose files outside docker directory
 #find $ROOT_PATH -not -path $ROOT_PATH'/tests/testflows*' -not -path $ROOT_PATH'/docker*' -not -path $ROOT_PATH'/contrib*' -name '*compose*.yml' -type f 2>/dev/null | xargs --no-run-if-empty grep -l "version:" | xargs --no-run-if-empty -n1 echo "Please move docker compose to docker directory:"
 
-# Check that ya.make files are auto-generated
-"$ROOT_PATH"/utils/generate-ya-make/generate-ya-make.sh
-# FIXME: apparently sandbox (don't confuse it with docker) cloning sources
-# using some ancient git version, <2.8, that contains one bug for submodules
-# initialization [1]:
-#
-#    " * A partial rewrite of "git submodule" in the 2.7 timeframe changed
-#        the way the gitdir: pointer in the submodules point at the real
-#        repository location to use absolute paths by accident.  This has
-#        been corrected."
-#
-#  [1]: https://github.com/git/git/blob/cf11a67975b057a144618badf16dc4e3d25b9407/Documentation/RelNotes/2.8.3.txt#L33-L36
-#
-# Due to which "git status" will report the following error:
-#
-#     fatal: not a git repository: /place/sandbox-data/tasks/0/2/882869720/ClickHouse/.git/modules/contrib/AMQP-CPP
-#
-# Anyway this check does not requires any submodule traverse, so it is fine to ignore those errors.
-git status -uno 2> >(grep "fatal: not a git repository: /place/sandbox-data/tasks/.*/ClickHouse/\\.git/modules/contrib") | grep ya.make && echo "ya.make files should be generated with utils/generate-ya-make/generate-ya-make.sh"
-
 # Check that every header file has #pragma once in first line
 find $ROOT_PATH/{src,programs,utils} -name '*.h' |
     grep -vP $EXCLUDE_DIRS |
diff --git a/utils/generate-ya-make/generate-ya-make.sh b/utils/generate-ya-make/generate-ya-make.sh
deleted file mode 100755
index d20f8d4fb8c..00000000000
--- a/utils/generate-ya-make/generate-ya-make.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# This script searches for ya.make.in files in repository and generates ya.make files from them.
-# ya.make.in is a template with substitutions in form of <? command ?>
-# command is interpreted by bash and output is put in place of substitution
-
-ROOT_PATH=$(git rev-parse --show-toplevel)
-EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|memcpy/|consistent-hashing'
-
-# Otherwise 'sort' behaves differently on Mac OS and also depends on locale.
-export LC_ALL=C
-
-find "${ROOT_PATH}" -name 'ya.make.in' | while read path; do
-    echo "# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it." > "${path/.in/}"
-    (cd $(dirname "${path}") && perl -pne 's/<\?(.+?)\?>/`$1`/e' < "${path}" >> "${path/.in/}")
-done
diff --git a/utils/github/cherrypick.py b/utils/github/cherrypick.py
index 89072b316b2..8bedf54fefa 100644
--- a/utils/github/cherrypick.py
+++ b/utils/github/cherrypick.py
@@ -114,7 +114,7 @@ class CherryPick:
             'Merge it only if you intend to backport changes to the target branch, otherwise just close it.\n'
         )
 
-        git_prefix = ['git', '-C', repo_path, '-c', 'user.email=robot-clickhouse@yandex-team.ru', '-c', 'user.name=robot-clickhouse']
+        git_prefix = ['git', '-C', repo_path, '-c', 'user.email=robot-clickhouse@clickhouse.com', '-c', 'user.name=robot-clickhouse']
 
         pr_title = 'Backport #{number} to {target}: {title}'.format(
             number=self._pr['number'], target=self.target_branch,
diff --git a/utils/github/ya.make b/utils/github/ya.make
deleted file mode 100644
index 3b19a5b69d1..00000000000
--- a/utils/github/ya.make
+++ /dev/null
@@ -1,13 +0,0 @@
-OWNER(g:clickhouse)
-
-PY23_LIBRARY()
-
-PY_SRCS(
-    __init__.py
-    backport.py
-    cherrypick.py
-    local.py
-    query.py
-)
-
-END()
diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
index 11db6fc61bc..842e6b09775 100644
--- a/utils/keeper-data-dumper/main.cpp
+++ b/utils/keeper-data-dumper/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
     LOG_INFO(logger, "Last committed index: {}", last_commited_index);
 
-    DB::KeeperLogStore changelog(argv[2], 10000000, true);
+    DB::KeeperLogStore changelog(argv[2], 10000000, true, settings->compress_logs);
     changelog.init(last_commited_index, 10000000000UL); /// collect all logs
     if (changelog.size() == 0)
         LOG_INFO(logger, "Changelog empty");
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index c8885521437..739e0b8edd2 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,6 +1,13 @@
+v21.9.4.35-stable	2021-09-22
+v21.9.3.30-stable	2021-09-16
+v21.9.2.17-stable	2021-09-09
+v21.8.7.22-lts	2021-09-22
+v21.8.6.15-lts	2021-09-16
 v21.8.5.7-lts	2021-09-02
 v21.8.4.51-lts	2021-08-17
 v21.8.3.44-lts	2021-08-12
+v21.7.11.3-stable	2021-09-23
+v21.7.10.4-stable	2021-09-16
 v21.7.9.7-stable	2021-09-02
 v21.7.8.58-stable	2021-08-17
 v21.7.7.47-stable	2021-08-09
@@ -26,6 +33,7 @@ v21.4.6.55-stable	2021-04-30
 v21.4.5.46-stable	2021-04-24
 v21.4.4.30-stable	2021-04-16
 v21.4.3.21-stable	2021-04-12
+v21.3.17.2-lts	2021-09-16
 v21.3.16.5-lts	2021-09-03
 v21.3.15.4-stable	2021-07-10
 v21.3.14.1-lts	2021-07-01
diff --git a/utils/memcpy-bench/memcpy-bench.cpp b/utils/memcpy-bench/memcpy-bench.cpp
index 025c9100f75..3cd2323672a 100644
--- a/utils/memcpy-bench/memcpy-bench.cpp
+++ b/utils/memcpy-bench/memcpy-bench.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <memory>
 #include <cstddef>
 #include <stdexcept>
diff --git a/utils/release/release_lib.sh b/utils/release/release_lib.sh
index efa41ae22ad..9f6c2285d93 100644
--- a/utils/release/release_lib.sh
+++ b/utils/release/release_lib.sh
@@ -168,7 +168,7 @@ function gen_changelog {
         -e "s/[@]VERSION_STRING[@]/$VERSION_STRING/g" \
         -e "s/[@]DATE[@]/$CHDATE/g" \
         -e "s/[@]AUTHOR[@]/$AUTHOR/g" \
-        -e "s/[@]EMAIL[@]/$(whoami)@yandex-team.ru/g" \
+        -e "s/[@]EMAIL[@]/$(whoami)@clickhouse.com/g" \
         < $CHLOG.in > $CHLOG
 }
 
diff --git a/utils/s3tools/s3uploader b/utils/s3tools/s3uploader
index a21263c1094..0627b19ea8f 100755
--- a/utils/s3tools/s3uploader
+++ b/utils/s3tools/s3uploader
@@ -8,6 +8,7 @@ import math
 
 try:
     from boto.s3.connection import S3Connection
+    from boto.s3.key import Key
 except ImportError:
     raise ImportError("You have to install boto package 'pip install boto'")
 
@@ -23,12 +24,13 @@ class S3API(object):
 
     def upload_file(self, bucket_name, file_path, s3_path):
         logging.info("Start uploading file to bucket %s", bucket_name)
+
         bucket = self.connection.get_bucket(bucket_name)
         key = bucket.initiate_multipart_upload(s3_path)
         logging.info("Will upload to s3 path %s", s3_path)
         chunksize = 1024 * 1024 * 1024 # 1 GB
         filesize = os.stat(file_path).st_size
-        logging.info("File size if %s", filesize)
+        logging.info("File size is %s", filesize)
         chunkcount = int(math.ceil(filesize / chunksize))
 
         def call_back(x, y):
@@ -38,6 +40,7 @@ class S3API(object):
                 logging.info("Uploading chunk %s of %s", i, chunkcount + 1)
                 offset = chunksize * i
                 bytes_size = min(chunksize, filesize - offset)
+
                 with open(file_path, 'r') as fp:
                     fp.seek(offset)
                     key.upload_part_from_file(fp=fp, part_num=i+1,
@@ -51,6 +54,46 @@ class S3API(object):
         return "https://{bucket}.{mds_url}/{path}".format(
             bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
 
+    def set_file_contents(self, bucket, local_file_path, s3_file_path):
+        key = Key(bucket)
+        key.key = s3_file_path
+        file_size = os.stat(local_file_path).st_size
+        logging.info("Uploading file `%s` to `%s`. Size is %s", local_file_path, s3_file_path, file_size)
+        def call_back(x, y):
+            print("Uploaded {}/{} bytes".format(x, y))
+        key.set_contents_from_filename(local_file_path, cb=call_back)
+
+    def upload_data_for_static_files_disk(self, bucket_name, directory_path, s3_path):
+        bucket = self.connection.get_bucket(bucket_name)
+        if s3_path.endswith("/"):
+            s3_path += "store/"
+        else:
+            s3_path += "/store/"
+        print(s3_path)
+        for root, dirs, files in os.walk(directory_path):
+            path = root.split(os.sep)
+            for file in files:
+                local_file_path = os.path.join(root, file)
+                s3_file = local_file_path[len(directory_path) + 1:]
+                s3_file_path = os.path.join(s3_path, s3_file)
+                self.set_file_contents(bucket, local_file_path, s3_file_path)
+
+        logging.info("Uploading finished")
+        return "https://{bucket}.{mds_url}/{path}".format(bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
+
+    def list_bucket_keys(self, bucket_name):
+        bucket = self.connection.get_bucket(bucket_name)
+        for obj in bucket.get_all_keys():
+            print(obj.key)
+
+    def remove_folder_from_bucket(self, bucket_name, folder_path):
+        bucket = self.connection.get_bucket(bucket_name)
+        bucket.get_all_keys()
+        for obj in bucket.get_all_keys():
+            if obj.key.startswith(folder_path):
+                print('Removing ' + obj.key)
+                obj.delete()
+
 
 def make_tar_file_for_table(clickhouse_data_path, db_name, table_name,
                             tmp_prefix):
@@ -96,6 +139,9 @@ if __name__ == "__main__":
                             help='Name of table with database, if you are uploading partitions')
     data_group.add_argument('--file-path',
                             help='Name of file, if you are uploading')
+    data_group.add_argument('--directory-path', help='Path to directory with files to upload')
+    data_group.add_argument('--list-directory', help='List s3 directory by --directory-path')
+    data_group.add_argument('--remove-directory', help='Remove s3 directory by --directory-path')
     args = parser.parse_args()
 
     if args.table_name is not None and args.clickhouse_data_path is None:
@@ -106,27 +152,41 @@ if __name__ == "__main__":
         args.access_key_id, args.secret_access_key,
         args.s3_api_url, args.s3_common_url)
 
-    if args.table_name is not None:
-        if '.' not in args.table_name:
-            db_name = 'default'
+    file_path = ''
+    directory_path = args.directory_path
+    s3_path = args.s3_path
+
+    if args.list_directory:
+        s3_conn.list_bucket_keys(args.bucket_name)
+    elif args.remove_directory:
+        print('Removing s3 path: ' + args.remove_directory)
+        s3_conn.remove_folder_from_bucket(args.bucket_name, args.remove_directory)
+    elif args.directory_path is not None:
+        url = s3_conn.upload_data_for_static_files_disk(args.bucket_name, directory_path, s3_path)
+        logging.info("Data uploaded: %s", url)
+    else:
+
+        if args.table_name is not None:
+            if '.' not in args.table_name:
+                db_name = 'default'
+            else:
+                db_name, table_name = args.table_name.split('.')
+            file_path = make_tar_file_for_table(
+                args.clickhouse_data_path, db_name, table_name, args.tmp_prefix)
         else:
-            db_name, table_name = args.table_name.split('.')
-        file_path = make_tar_file_for_table(
-            args.clickhouse_data_path, db_name, table_name, args.tmp_prefix)
-    else:
-        file_path = args.file_path
+            file_path = args.file_path
 
-    if 'tsv' in file_path:
-        s3_path = os.path.join(
-            args.dataset_name, 'tsv', os.path.basename(file_path))
-    elif args.table_name is not None:
-        s3_path = os.path.join(
-            args.dataset_name, 'partitions', os.path.basename(file_path))
-    elif args.s3_path is not None:
-        s3_path = os.path.join(
-            args.dataset_name, args.s3_path, os.path.basename(file_path))
-    else:
-        raise Exception("Don't know s3-path to upload")
+        if 'tsv' in file_path:
+            s3_path = os.path.join(
+                args.dataset_name, 'tsv', os.path.basename(file_path))
+        if args.table_name is not None:
+            s3_path = os.path.join(
+                args.dataset_name, 'partitions', os.path.basename(file_path))
+        elif args.s3_path is not None:
+            s3_path = os.path.join(
+                args.dataset_name, args.s3_path, os.path.basename(file_path))
+        else:
+            raise Exception("Don't know s3-path to upload")
 
-    url = s3_conn.upload_file(args.bucket_name, file_path, s3_path)
-    logging.info("Data uploaded: %s", url)
+        url = s3_conn.upload_file(args.bucket_name, file_path, s3_path)
+        logging.info("Data uploaded: %s", url)
diff --git a/website/blog/en/2020/package-repository-behind-cdn.md b/website/blog/en/2020/package-repository-behind-cdn.md
index c5857bcd4a4..fb724d18cb3 100644
--- a/website/blog/en/2020/package-repository-behind-cdn.md
+++ b/website/blog/en/2020/package-repository-behind-cdn.md
@@ -52,7 +52,7 @@ Implementing it required a little bit of research, but the overall solution appe
 
 1. For a ClickHouse database, it was a no-brainer to use [Yandex Managed Service for ClickHouse](https://cloud.yandex.com/services/managed-clickhouse). With a few clicks in the admin interface, we got a running ClickHouse cluster with properly configured high-availability and automated backups. Ad-hoc SQL queries could be run from that same admin interface.
 2. Cloudflare allows customers to run custom code on CDN edge servers in a serverless fashion (so-called [workers](https://workers.cloudflare.com)). Those workers are executed in a tight sandbox which doesn't allow for anything complicated, but this feature fits perfectly to gather some data about download events and send it somewhere else. This is normally a paid feature, but special thanks to Connor Peshek from Cloudflare who arranged a lot of extra features for free on `clickhouse.tech` when we have applied to their [open-source support program](https://developers.cloudflare.com/sponsorships/). 
-3. To avoid publicly exposing yet another ClickHouse instance (like we did with **[playground](https://clickhouse.tech/docs/en/getting-started/playground/)** regardless of being a 100% anti-pattern), the download event data is sent to [Yandex Cloud Functions](https://cloud.yandex.com/services/functions). It's a generic serverless computing framework at Yandex Cloud, which also allows running custom code without maintaining any servers, but with less strict sandbox limitations and direct access to other cloud services like Managed ClickHouse that was needed for this task.
+3. To avoid publicly exposing yet another ClickHouse instance (like we did with **[playground](/docs/en/getting-started/playground/)** regardless of being a 100% anti-pattern), the download event data is sent to [Yandex Cloud Functions](https://cloud.yandex.com/services/functions). It's a generic serverless computing framework at Yandex Cloud, which also allows running custom code without maintaining any servers, but with less strict sandbox limitations and direct access to other cloud services like Managed ClickHouse that was needed for this task.
 4. It didn't require much effort to choose a visualization tool either, as [DataLens BI](https://cloud.yandex.com/docs/datalens/) is tightly integrated with ClickHouse, capable to build what's required right from the UI, and satisfies the “no servers” requirement because it's a SaaS solution. Public access option for charts and dashboards have also appeared to be handy.
 
 There's not so much data collected yet, but here's a live example of how the resulting data visualization looks like. For example, here we can see that LTS releases of ClickHouse are not so popular yet *(yes, we have [LTS releases](https://clickhouse.tech/docs/en/faq/operations/production/)!)*:
diff --git a/website/blog/en/2020/pixel-benchmark.md b/website/blog/en/2020/pixel-benchmark.md
index b9be7638c38..57e9aec3857 100644
--- a/website/blog/en/2020/pixel-benchmark.md
+++ b/website/blog/en/2020/pixel-benchmark.md
@@ -66,7 +66,7 @@ What is this function, and why do we need it? In this particular stack trace, we
 
 ## Is your phone good enough?
 
-There is a beaten genre of using data sets and queries of a varying degree of syntheticity to prove that a particular DBMS you work on has performance superior to other, less advanced, DBMSes. We've moved past that, and instead use the DBMS we love as a benchmark of hardware. For this benchmark we use a small 100M rows obfuscated data set from Yandex.Metrica, about 12 GB compressed, and some queries representative of Metrica dashboards. There is [this page](https://clickhouse.tech/benchmark/hardware/) with crowdsourced results for various cloud and traditional servers and even some laptops, but how do the phones compare? Let's find out. Following [the manual](https://clickhouse.tech/docs/en/operations/performance-test/) to download the necessary data to the phone and run the benchmark was pretty straightforward. One problem was that some queries can't run because they use too much memory and the server gets killed by Android, so I had to script around that. Also, I'm not sure how to reset a file system cache on Android, so the 'cold run' data is not correct. The results look pretty good:
+There is a beaten genre of using data sets and queries of a varying degree of syntheticity to prove that a particular DBMS you work on has performance superior to other, less advanced, DBMSes. We've moved past that, and instead use the DBMS we love as a benchmark of hardware. For this benchmark we use a small 100M rows obfuscated data set from Yandex.Metrica, about 12 GB compressed, and some queries representative of Metrica dashboards. There is [this page](/benchmark/hardware/) with crowdsourced results for various cloud and traditional servers and even some laptops, but how do the phones compare? Let's find out. Following [the manual](/docs/en/operations/performance-test/) to download the necessary data to the phone and run the benchmark was pretty straightforward. One problem was that some queries can't run because they use too much memory and the server gets killed by Android, so I had to script around that. Also, I'm not sure how to reset a file system cache on Android, so the 'cold run' data is not correct. The results look pretty good:
 
 <img src="https://blog-images.clickhouse.tech/en/2020/pixel-benchmark/compare.png" width="80%"/>
 
diff --git a/website/blog/en/2020/the-clickhouse-community.md b/website/blog/en/2020/the-clickhouse-community.md
index 7080fed6479..9a76a5a526c 100644
--- a/website/blog/en/2020/the-clickhouse-community.md
+++ b/website/blog/en/2020/the-clickhouse-community.md
@@ -16,7 +16,7 @@ ClickHouse began as a solution for web analytics in [Yandex Metrica](https://met
 
 This is a classic problem for data warehouses. However, Alexey could not find one that met Yandex requirements, specifically large datasets, linear scaling, high efficiency, and compatibility with SQL tools. In a nutshell: like MySQL but for analytic applications. So Alexey wrote one. It started as a prototype to do GROUP BY operations.
 
-The prototype evolved into a full solution with a name, ClickHouse, short for “Clickstream Data Warehouse”. Alexey added additional features including SQL support and the MergeTree engine. The SQL dialect was superficially similar to MySQL, [which was also used in Metrica](https://clickhouse.tech/blog/en/2016/evolution-of-data-structures-in-yandex-metrica/) but could not handle query workloads without complex pre-aggregation. By 2011 ClickHouse was in production for Metrica.
+The prototype evolved into a full solution with a name, ClickHouse, short for “Clickstream Data Warehouse”. Alexey added additional features including SQL support and the MergeTree engine. The SQL dialect was superficially similar to MySQL, [which was also used in Metrica](/blog/en/2016/evolution-of-data-structures-in-yandex-metrica/) but could not handle query workloads without complex pre-aggregation. By 2011 ClickHouse was in production for Metrica.
 
 Over the next 5 years Alexey and a growing team of developers extended ClickHouse to cover new use cases. By 2016 ClickHouse was a core Metrica backend service. It was also becoming entrenched as a data warehouse within Yandex, extending to use cases like service monitoring, network flow logs, and event management. ClickHouse had evolved from the original one-person project to business critical software with a full team of a dozen engineers led by Alexey.
 
@@ -38,13 +38,13 @@ Alexey and the development team moved ClickHouse code to a Github repo under the
 
 ClickHouse quickly picked up steam in Eastern Europe. The first ClickHouse meetups started in 2016 and have grown to include 200 participants for in-person meetings and up to 400 for online meetings.  ClickHouse is now widely used in start-ups in Russia as well as other Eastern European countries. Developers located in Eastern Europe continue to supply more contributions to ClickHouse than any other region.
 
-ClickHouse also started to gain recognition in the US and Western Europe. [CloudFlare](https://www.cloudflare.com/) published a widely read blog article about [their success using ClickHouse for DNS analytics](https://blog.cloudflare.com/how-cloudflare-analyzes-1m-dns-queries-per-second/). Alexander Zaitsev successfully migrated an ad tech analytics system from a commercial DBMS to a ClickHouse cluster. This success prompted him to found [Altinity](https://altinity.com) in 2017 with help from friends at [Percona](https://www.percona.com). US meetups started in the same year. With support from Altinity these have grown to over 100 attendees for online meetings.
+ClickHouse also started to gain recognition in the US and Western Europe. [CloudFlare](https://www.cloudflare.com/) published a widely read blog article about [their success using ClickHouse for DNS analytics](https://blog.cloudflare.com/how-cloudflare-analyzes-1m-dns-queries-per-second/).
 
 ClickHouse also took off in China. The first meetup in China took place in 2018 and attracted enormous interest. In-person meetups included over 400 participants.  Online meetings have reached up to 1000 online viewers.
 
 In 2019 a further step occurred as ClickHouse moved out from under the Yandex Github organization into a separate [ClickHouse organization](https://github.com/ClickHouse). The new organization includes ClickHouse server code plus core ecosystem projects like the cpp and ODBC drivers.
 
-ClickHouse community events shifted online following world-wide disruptions due to COVID-19, but growth in usage continued. One interesting development has been the increasing number of startups using ClickHouse as a backend. Many of these are listed on the [ClickHouse Adopters](https://clickhouse.tech/docs/en/introduction/adopters/) page. Also, additional prominent companies like eBay, Uber, and Flipcart went public in 2020 with stories of successful ClickHouse usage.
+ClickHouse community events shifted online following world-wide disruptions due to COVID-19, but growth in usage continued. One interesting development has been the increasing number of startups using ClickHouse as a backend. Many of these are listed on the [ClickHouse Adopters](/docs/en/introduction/adopters/) page. Also, additional prominent companies like eBay, Uber, and Flipcart went public in 2020 with stories of successful ClickHouse usage.
 
 ## The ClickHouse community today
 
@@ -87,17 +87,16 @@ ClickHouse ecosystem projects are also growing rapidly. Here is a selected list
 * [mymarilyn/clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver) — ClickHouse Python driver with native interface support
 * [Vertamedia/clickhouse-grafana](https://github.com/Vertamedia/clickhouse-grafana) — Grafana datasource for ClickHouse
 * [smi2/phpClickHouse](https://github.com/smi2/phpClickHouse) — PHP ClickHouse client
-* [Altinity/clickhouse-operator](https://github.com/Altinity/clickhouse-operator) — Kubernetes operator for ClickHouse
 * [AlexAkulov/clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup) — ClickHouse backup and restore using cloud storage
 * [And almost 1200 more...](https://github.com/search?o=desc&p=1&q=clickhouse&s=stars&type=Repositories)
 
 ## Resources
 
-With the community growth numerous resources are available to users. At the center is the [ClickHouse org on Github](https://github.com/ClickHouse), which hosts [ClickHouse server code](https://github.com/ClickHouse/ClickHouse).  ClickHouse server documentation is available at the [clickhouse.tech](https://clickhouse.tech/) website. It has [installation instructions](https://clickhouse.tech/docs/en/getting-started/install/) and links to ClickHouse community builds for major Linux distributions as well as Mac, FreeBSD, and Docker.
+With the community growth numerous resources are available to users. At the center is the [ClickHouse org on Github](https://github.com/ClickHouse), which hosts [ClickHouse server code](https://github.com/ClickHouse/ClickHouse).  ClickHouse server documentation is available at the [clickhouse.tech](/) website. It has [installation instructions](/docs/en/getting-started/install/) and links to ClickHouse community builds for major Linux distributions as well as Mac, FreeBSD, and Docker.
 
 In addition, ClickHouse users have a wide range of ways to engage with the community and get help on applications.  These include both chat applications as well as meetups.  Here are some links to get started.
 
-* Yandex Meetups — Yandex has regular in-person and online international and Russian-language meetups. Video recordings and online translations are available at the official [YouTube channel](https://www.youtube.com/c/ClickHouseDB/videos). Watch for announcements on the [clickhouse.tech](https://clickhouse.tech/) site and [Telegram](https://t.me/clickhouse_ru).
+* Yandex Meetups — Yandex has regular in-person and online international and Russian-language meetups. Video recordings and online translations are available at the official [YouTube channel](https://www.youtube.com/c/ClickHouseDB/videos). Watch for announcements on the [clickhouse.tech](/) site and [Telegram](https://t.me/clickhouse_ru).
 * [SF Bay Area ClickHouse Meetup](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/) — The largest US ClickHouse meetup, with meetings approximately every 2 months.
 * Chinese meetups occur at regular intervals with different sponsors.  Watch for announcements on clickhouse.tech.
 * Telegram - By far the largest forum for ClickHouse. It is the best place to talk to ClickHouse devs. There are two groups.
@@ -118,26 +117,18 @@ We welcome users to join the ClickHouse community in every capacity. There are f
 
 Start with the documentation. Download ClickHouse and try it out. Join the chat channels. If you encounter bugs, [log issues](https://github.com/ClickHouse/ClickHouse/issues) so we can get them fixed. Also, it’s easy to make contributions to the documentation if you have basic Github and markdown skills. Press the pencil icon on any page of the clickhouse.tech website to edit pages and automatically generate pull requests to merge your changes.
 
-If your company has deployed ClickHouse and is comfortable talking about it, please don't be shy. Add them to the [ClickHouse Adopters](https://clickhouse.tech/docs/en/introduction/adopters/) page so that others can learn from your experience.
+If your company has deployed ClickHouse and is comfortable talking about it, please don't be shy. Add them to the [ClickHouse Adopters](/docs/en/introduction/adopters/) page so that others can learn from your experience.
 
 ### Become a ClickHouse developer
 
 Write code to make ClickHouse better. Here are your choices.
 
-* ClickHouse server — Start with the [“For Beginners” documentation](https://clickhouse.tech/docs/en/development/developer-instruction/) to learn how to build ClickHouse and submit PRs. Check out the current ClickHouse issues if you are looking for work. PRs that follow the development standards will be merged faster.
+* ClickHouse server — Start with the [“For Beginners” documentation](/docs/en/development/developer-instruction/) to learn how to build ClickHouse and submit PRs. Check out the current ClickHouse issues if you are looking for work. PRs that follow the development standards will be merged faster.
 
 * Ecosystem projects — Most projects in the ClickHouse ecosystem accept PRs.  Check with each project for specific practices.
 
 ClickHouse is also a great target for research problems.  Overall the years many dozens of university CS students have worked on ClickHouse features. Alexey Milovidov maintains an especially rich set of [project suggestions for students](https://github.com/ClickHouse/ClickHouse/issues/15065). Join Telegram and ask for help if you are interested.  Both Yandex and Altinity also offer internships.
 
-### Write ClickHouse applications
-
-ClickHouse enables a host of new applications that depend on low latency access to large datasets. If you write something interesting, blog about it and present at local meetups. Altinity has a program to highlight startups who are developing ClickHouse applications and help with marketing as well as resources for development. Send email to [info@altinity.com](mailto:info@altinity.com) for more information.
-
-### Become a corporate sponsor
-
-The ClickHouse community has been assisted by many corporate users who have helped organize meetups, funded development, and guided growth of ClickHouse.  Contact community members directly at [clickhouse-feedback@yandex-team.ru](mailto:clickhouse-feedback@yandex-team.ru),  [info@altinity.com](mailto:info@altinity.com), or via Telegram to find out more about how to chip in as a corporate sponsor.
-
 ## Where we go from here
 
 ClickHouse has grown enormously from its origins as a basic prototype in 2008 to the popular SQL data warehouse users see today. Our community is the rock that will enable ClickHouse to become the default data warehouse worldwide. We are working together to create an inclusive environment where everyone feels welcome and has an opportunity to contribute. We welcome you to join!
diff --git a/website/blog/en/2021/clickhouse-inc.md b/website/blog/en/2021/clickhouse-inc.md
new file mode 100644
index 00000000000..164e6fc545d
--- /dev/null
+++ b/website/blog/en/2021/clickhouse-inc.md
@@ -0,0 +1,51 @@
+---
+title: 'Introducing ClickHouse, Inc.'
+image: 'https://blog-images.clickhouse.tech/en/2021/clickhouse-inc/home.png'
+date: '2021-09-20'
+author: '[Alexey Milovidov](https://github.com/alexey-milovidov)'
+tags: ['company', 'incorporation', 'yandex', 'community']
+---
+
+Today I’m happy to announce **ClickHouse Inc.**, the new home of ClickHouse. The development team has moved from Yandex and joined ClickHouse Inc. to continue building the fastest (and the greatest) analytical database management system. The company has received nearly $50M in Series A funding led by Index Ventures and Benchmark with participation by Yandex N.V. and others. I created ClickHouse, Inc. with two co-founders, [Yury Izrailevsky](https://www.linkedin.com/in/yuryizrailevsky/) and [Aaron Katz](https://www.linkedin.com/in/aaron-katz-5762094/). I will continue to lead the development of ClickHouse as Chief Technology Officer (CTO), Yury will run product and engineering, and Aaron will be CEO.
+
+## History of ClickHouse
+
+I started developing ClickHouse more than ten years ago, and it has never been an easy ride. The idea of ClickHouse came up while I was working in Yandex as a developer of a real-time web analytics system. My team and I faced multiple data processing challenges that often required custom data structures and sophisticated algorithms, creative solutions and tradeoffs, deep understanding of domain area, hardware, and math. All these years, I often went to bed with endless thoughts about how we could solve yet another data processing challenge. I love data and processing in extreme constraints, where you have to think about bytes and nanoseconds to save petabytes and seconds. The ClickHouse team shares this passion: in my opinion, this is the main reason for ClickHouse’s success.
+
+In 2009 we started ClickHouse as an experimental project to check the hypothesis if it's viable to generate analytical reports in real-time from non-aggregated data that is also constantly added in real-time. It took three years to prove this hypothesis, and in 2012 ClickHouse launched in production for the first time. Unlike custom data structures used before, ClickHouse was applicable more generally to work as a database management system. After several years I found that most departments in my company were using ClickHouse, and it made me wonder: maybe ClickHouse is too good to run only inside Yandex? Then we released it in [open source](https://github.com/ClickHouse/ClickHouse) in 2016.
+
+## ClickHouse in Open Source
+
+Making ClickHouse open source was also not an easy decision, but now I see: doing open source is hard, but it is a big win. While it takes a tremendous effort and responsibility to maintain a popular open-source product, for us, the benefits outweigh all the costs. Since we published ClickHouse, it has been deployed in production in thousands of companies across the globe for a wide range of use cases, from agriculture to self-driving cars. In 2019 we spent over a third of our time abroad organizing various ClickHouse events and speaking at external conferences, and we’re thrilled to see you all again in person once travel restrictions become less severe. The feedback and contributions from our community are priceless, and we improve the quality of implementation, the feature completeness, and making product decisions with the help of our community. One of our main focuses is to make ClickHouse welcoming for contributors by making the source code easy to read and understand, with the processes easy to follow. For me, ClickHouse is a showcase so everyone can learn the ideas in data processing.
+
+I like to present ClickHouse as the answer to many questions in software engineering. What is better: vectorization or JIT compilation? Look at ClickHouse; it is using both. How to write the code in modern C++ in a safe way? Ok, look at the testing infrastructure in ClickHouse. How to optimize the memcpy function? What is the fastest way to transform a Unix timestamp to date in a custom timezone? I can do multiple-hour talks about these topics, and thanks to the open-source, everyone can read the code, run ClickHouse and validate our claims.
+
+## Technical Advantage
+
+The most notable advantage of ClickHouse is its extremely high query processing speed and data storage efficiency. What is unique about ClickHouse performance? It is difficult to answer because there is no single "[silver bullet](https://www.youtube.com/watch?v=ZOZQCQEtrz8)". The main advantage is attention to details of the most extreme production workloads. We develop ClickHouse from practical needs. It has been created to solve the needs of Metrica, one of the [most widespread](https://w3techs.com/technologies/overview/traffic_analysis) web analytics services in the world. So ClickHouse is capable of processing 100+ PBs of data with more than 100 billion records inserted every day. One of the early adopters, Cloudflare, uses ClickHouse to process a large portion of all HTTP traffic on the internet with 10+ million records per second. As ClickHouse developers, we don’t consider the task solved if there is room for performance improvement.
+
+Query processing performance is not only about speed. It opens new possibilities. In previous generation data warehouses, you cannot run interactive queries without pre-aggregation; or you cannot insert new data in real time while serving interactive queries; or you cannot just store all your data. With ClickHouse, you can keep all records as long as you need and make interactive real-time reporting across the data. Before using ClickHouse, it was difficult to imagine that analytical data processing could be so easy and efficient: there is no need for a dozen pre-aggregating and tiering services (e.g. Druid), no need to place huge data volumes in RAM (e.g. Elastic), and no need to maintain daily/hourly/minutely tables (e.g. Hadoop, Spark).
+
+Most other database management systems don’t even permit benchmarks (through the infamous "DeWitt clause"). But we don’t fear benchmarks; we [collect them](https://github.com/ClickHouse/ClickHouse/issues/22398). ClickHouse documentation has [links](/docs/en/getting-started/example-datasets/) to publicly available datasets up to multiple terabytes in size from various domain areas. We encourage you to try ClickHouse, do some experiments on your workload, and find ClickHouse faster than others. And if not, we encourage you to publish the benchmark, and we will make ClickHouse better!
+
+Lastly, ClickHouse was purpose-built from the beginning to:
+
+— Be easy to install and use. It runs everywhere, from your laptop to the cloud
+— Be highly reliable and scale both vertically and horizontally
+— Provide SQL with many practical and convenient extensions
+— Integrate with foreign data sources and streams
+
+## ClickHouse Spinout From Yandex
+
+Yandex N.V. is the largest internet company in Europe and employs over 14,000 people. They develop search, advertisement, and e-commerce services, ride tech and food tech solutions, self-driving cars... and also ClickHouse with a team of 15 engineers. It is hard to believe that we have managed to build a world-class leading analytical DBMS with such a small team while leveraging the global community. While this was barely enough to keep up with the development of the open-source product, everyone understands that the potential of ClickHouse technology highly outgrows such a small team.
+
+We decided to unite the resources: take the team of core ClickHouse developers, bring in a world-class business team led by [Aaron Katz](https://www.linkedin.com/in/aaron-katz-5762094/) and a cloud engineering team led by [Yury Izrailevsky](https://www.linkedin.com/in/yuryizrailevsky/), keep the power of open source, add the investment from the leading VC funds, and make an international company 100% focused on ClickHouse. I’m thrilled to announce ClickHouse, Inc.
+
+## What’s Next?
+
+Companies love ClickHouse because it gives tremendous improvements in data processing efficiency. But it is mostly about the core technology, the database server itself. We want to make ClickHouse suitable for all kinds of companies and enterprises, not just tech-savvy internet companies who are fine with managing their clusters. We want to lower the learning curve, make ClickHouse compliant with enterprise standards, make ClickHouse service to be instantly available in the cloud in a serverless way, make auto-scaling easy, and much more.
+
+Our mission is to make ClickHouse the first choice of analytical database management systems. Whenever you think about data analytics, ClickHouse should be the obvious preferred solution. I see how many companies already benefit from ClickHouse and I'm very eager to make it even more widespread and universally accepted across the world. Now we have the best engineers and the best entrepreneurs together and we are ready for the mission.
+
+
+_2021-09-20, [Alexey Milovidov](https://github.com/alexey-milovidov)_
diff --git a/website/blog/en/2021/fuzzing-clickhouse.md b/website/blog/en/2021/fuzzing-clickhouse.md
index b6852dcce15..68a394bfe0c 100644
--- a/website/blog/en/2021/fuzzing-clickhouse.md
+++ b/website/blog/en/2021/fuzzing-clickhouse.md
@@ -51,7 +51,7 @@ After fixing the majority of pre-existing error, this fuzzer became efficient fo
 
 A major factor that makes fuzzing really efficient for us is that we have a lot of assertions and other checks of program logic in our code. For debug-only checks, we use the plain `assert` macro from `<cassert>`. For checks that are needed even in release mode, we use an exception with a special code `LOGICAL_ERROR` that signifies an internal program error. We did some work to ensure that these errors are distinct from errors caused by the wrong user actions. A user error reported for a randomly generated query is normal (e.g.  it references some non-existent columns), but when we see an internal program error, we know that it's definitely a bug, same as an assertion. Of course, even without assertions, you get some checks for memory errors provided by the OS (segfaults). Another way to add runtime checks to your program is to use some kind of sanitizer. We already run most of our tests under clang's Address, Memory, UndefinedBehavior and Thread sanitizers. Using them in conjunction with this fuzzer also proved to be very efficient.
 
-To see for yourself how the fuzzer works, you only need the normal ClickHouse client.  Start `clickhouse-client --query-fuzzer-runs=100`, enter any query, and enjoy the client going crazy and running a hundred of random queries instead. All queries from the current session become a source for expressions for fuzzing, so try entering several different queries to get more interesting results. Be careful not to do this in production! When you do this experiment, you'll soon notice that the fuzzer tends to generate queries that take very long to run. This is why for the CI fuzzer runs we have to configure the server to limit query execution time, memory usage and so on using the corresponding [server settings](https://clickhouse.tech/docs/en/operations/settings/query-complexity/#:~:text=In%20the%20default%20configuration%20file,query%20within%20a%20single%20server.). We had a hilarious situation after that: the fuzzer figured out how to remove the limits by generating a `SET max_execution_time = 0` query, and then generated a never-ending query and failed. Thankfully we were able to defeat its cleverness by using [settings constraints](https://clickhouse.tech/docs/en/operations/settings/constraints-on-settings/).
+To see for yourself how the fuzzer works, you only need the normal ClickHouse client.  Start `clickhouse-client --query-fuzzer-runs=100`, enter any query, and enjoy the client going crazy and running a hundred of random queries instead. All queries from the current session become a source for expressions for fuzzing, so try entering several different queries to get more interesting results. Be careful not to do this in production! When you do this experiment, you'll soon notice that the fuzzer tends to generate queries that take very long to run. This is why for the CI fuzzer runs we have to configure the server to limit query execution time, memory usage and so on using the corresponding [server settings](/docs/en/operations/settings/query-complexity/#:~:text=In%20the%20default%20configuration%20file,query%20within%20a%20single%20server.). We had a hilarious situation after that: the fuzzer figured out how to remove the limits by generating a `SET max_execution_time = 0` query, and then generated a never-ending query and failed. Thankfully we were able to defeat its cleverness by using [settings constraints](/docs/en/operations/settings/constraints-on-settings/).
 
 ## Other Fuzzers
 
diff --git a/website/blog/en/2021/performance-test-1.md b/website/blog/en/2021/performance-test-1.md
index 3d15a7ea3ec..0e6de5fb049 100644
--- a/website/blog/en/2021/performance-test-1.md
+++ b/website/blog/en/2021/performance-test-1.md
@@ -6,11 +6,11 @@ author: '[Alexander Kuzmenkov](https://github.com/akuzm)'
 tags: ['testing', 'performance']
 ---
 
-One of the main selling points of ClickHouse is that it's very fast, in many cases utilizing the hardware up to the theoretical limits. This was noted by many independent benchmark such as [this one](http://brandonharris.io/redshift-clickhouse-time-series/). This speed boils down to a right combination of architectural choices and algorithmic optimizations, sprinkled with a dash of pixie dust. There is an [overview of these factors](https://clickhouse.tech/docs/en/faq/general/why-clickhouse-is-so-fast) on our website, or a talk by the ClickHouse lead developer Alexey Milovidov ["The secrets of ClickHouse performance optimizations"](https://www.youtube.com/watch?v=ZOZQCQEtrz8). But this is a static picture of "how the things are". Software is a living and changing organism, and ClickHouse is changing very fast &mdash; to give you a scale, in July 2021 we merged 319 pull requests made by 60 different authors ([live statistics here](https://gh-api.clickhouse.tech/play?user=play#c2VsZWN0IGRhdGVfdHJ1bmMoJ21vbnRoJywgY3JlYXRlZF9hdCkgbW9udGgsIHVuaXEoY3JlYXRvcl91c2VyX2xvZ2luKSBhdXRob3JzLCB1bmlxKG51bWJlcikgcHJzIGZyb20gZ2l0aHViX2V2ZW50cyB3aGVyZSByZXBvX25hbWUgPSAnQ2xpY2tIb3VzZS9DbGlja0hvdXNlJyBhbmQgbm90IGhhc0FueShsYWJlbHMsIFsncHItYmFja3BvcnQnLCAncHItZG9jdW1lbnRhdGlvbicsICdwci1jaGVycnlwaWNrJ10pIGFuZCBtZXJnZWQgYW5kIGNyZWF0ZWRfYXQgYmV0d2VlbiAnMjAyMC0wOS0wMScgYW5kICcyMDIxLTA5LTAxJyBncm91cCBieSBtb250aA==)). Any quality that is not actively selected for is going to be lost in this endless stream of changes, and the performance is no exception. For this reason, we have to have some process that allows us to ensure than ClickHouse always stays fast.
+One of the main selling points of ClickHouse is that it's very fast, in many cases utilizing the hardware up to the theoretical limits. This was noted by many independent benchmark such as [this one](http://brandonharris.io/redshift-clickhouse-time-series/). This speed boils down to a right combination of architectural choices and algorithmic optimizations, sprinkled with a dash of pixie dust. There is an [overview of these factors](/docs/en/faq/general/why-clickhouse-is-so-fast) on our website, or a talk by the ClickHouse lead developer Alexey Milovidov ["The secrets of ClickHouse performance optimizations"](https://www.youtube.com/watch?v=ZOZQCQEtrz8). But this is a static picture of "how the things are". Software is a living and changing organism, and ClickHouse is changing very fast &mdash; to give you a scale, in July 2021 we merged 319 pull requests made by 60 different authors ([live statistics here](https://gh-api.clickhouse.tech/play?user=play#c2VsZWN0IGRhdGVfdHJ1bmMoJ21vbnRoJywgY3JlYXRlZF9hdCkgbW9udGgsIHVuaXEoY3JlYXRvcl91c2VyX2xvZ2luKSBhdXRob3JzLCB1bmlxKG51bWJlcikgcHJzIGZyb20gZ2l0aHViX2V2ZW50cyB3aGVyZSByZXBvX25hbWUgPSAnQ2xpY2tIb3VzZS9DbGlja0hvdXNlJyBhbmQgbm90IGhhc0FueShsYWJlbHMsIFsncHItYmFja3BvcnQnLCAncHItZG9jdW1lbnRhdGlvbicsICdwci1jaGVycnlwaWNrJ10pIGFuZCBtZXJnZWQgYW5kIGNyZWF0ZWRfYXQgYmV0d2VlbiAnMjAyMC0wOS0wMScgYW5kICcyMDIxLTA5LTAxJyBncm91cCBieSBtb250aA==)). Any quality that is not actively selected for is going to be lost in this endless stream of changes, and the performance is no exception. For this reason, we have to have some process that allows us to ensure than ClickHouse always stays fast.
 
 # Measuring and Comparing the Performance
 
-How do we know it is fast, in the first place? We do a lot of benchmarks, many kinds of them. The most basic kind of a benchmark is a micro-benchmark, that doesn't use the full code of the server and tests a particular algorithm in isolation. We use them to choose a better inner loop for some aggregate function, or to test various layouts of hash tables, and so on. For example, when we discovered that a competing database engine completes a query with `sum` aggregate function twice as fast, we tested a couple of dozen implementations of `sum` to ultimately find the one that gives the best performance (see [a talk](https://www.youtube.com/watch?v=MJJfWoWJq0o) about this, in Russian). But testing a particular algorithm by itself is not enough to say how the entire query is going to work. We have to also make end-to-end measurements of entire queries, often using the real production data, because the particulars of the data (e.g. the cardinality and the distribution of values) heavily influence the performance. Currently we have about 3000 end-to-end test queries organized into about 200 [tests](https://github.com/ClickHouse/ClickHouse/tree/6c4c3df96e41425185beb0c471a8dde0ce6f25a7/tests/performance). Many of them use real data sets, such as the [production data of Yandex.Metrica](https://clickhouse.tech/docs/en/getting-started/example-datasets/metrica/), obfuscated with `clickhouse-obfuscator` as described [here](https://habr.com/ru/company/yandex/blog/485096/).
+How do we know it is fast, in the first place? We do a lot of benchmarks, many kinds of them. The most basic kind of a benchmark is a micro-benchmark, that doesn't use the full code of the server and tests a particular algorithm in isolation. We use them to choose a better inner loop for some aggregate function, or to test various layouts of hash tables, and so on. For example, when we discovered that a competing database engine completes a query with `sum` aggregate function twice as fast, we tested a couple of dozen implementations of `sum` to ultimately find the one that gives the best performance (see [a talk](https://www.youtube.com/watch?v=MJJfWoWJq0o) about this, in Russian). But testing a particular algorithm by itself is not enough to say how the entire query is going to work. We have to also make end-to-end measurements of entire queries, often using the real production data, because the particulars of the data (e.g. the cardinality and the distribution of values) heavily influence the performance. Currently we have about 3000 end-to-end test queries organized into about 200 [tests](https://github.com/ClickHouse/ClickHouse/tree/6c4c3df96e41425185beb0c471a8dde0ce6f25a7/tests/performance). Many of them use real data sets, such as the [production data of Yandex.Metrica](/docs/en/getting-started/example-datasets/metrica/), obfuscated with `clickhouse-obfuscator` as described [here](https://habr.com/ru/company/yandex/blog/485096/).
 
 Micro-benchmarks are normally ran by a developer while working on the code, but it is not practical to manually run the entire battery of the end-to-end tests for each change. We use an automated system that does this for each pull request as part of continuous integration checks. It measures whether the code changes introduced by a pull request influenced the performance, for which kinds of queries and by how much, and alerts the developer if there is a regression. Here is how a typical report looks.
 
@@ -27,6 +27,7 @@ For complex processes which resist modeling, a practical option is to use the hi
 We run the reference version of the server process and the tested version, simultaneously on the same machine, and run the test queries on each of them in turn, one by one. This way we eliminate most systematic errors, because both servers are equally influenced by them. We can then compare the set of results we got from the reference server process, and the set from the test server process, to see whether they look the same. Comparing the distributions using two samples is a very interesting problem in itself. We use a non-parametric bootstrap method to build a randomization distribution for the observed difference of median query run times. This method is described in detail in [[1]](#ref1), where they apply it to see how changing a fertilizer mixture changes the yield of tomato plants. ClickHouse is not much different from tomatoes, only we have to check how the changes in code influence the performance.
 
 This method ultimately gives a single threshold number _T_: what is the largest difference in median query run times between old and new server, that we can observe even if nothing has changed. Then we have a simple decision protocol given this threshold _T_ and the measured difference of medians _D_:
+
 1. _abs(D) <= T_ &mdash; the changes are not statistically significant,
 2. _abs(D) <= 5%_ &mdash; the changes are too small to be important,
 3. _abs(T) >= 10%_ &mdash; the test query has excessive run time variance that leads to poor sensitivity,
@@ -36,7 +37,7 @@ The most interesting case are the unstable queries _(3)_. When the elapsed time
 
 # Understanding the Reasons Behind the Changes
 
-An investigation of code performance often starts with applying a profiler. On Linux, you would use `perf`, a sampling profiler that periodically collects the stack trace of the process, so that you can then see an aggregate picture of where your program spends the most time. In ClickHouse, we actually have a built-in sampling profiler that saves results into a system table, so no external tools are needed. It can be enabled for all queries or for a particular one, by passing the settings [as described in the docs](https://clickhouse.tech/docs/en/operations/optimizing-performance/sampling-query-profiler/). It is on by default, so if you use a recent version of ClickHouse, you already have a combined profile of your production server load. To visualize it, we can use a well-known script for building [flamegraphs](https://github.com/brendangregg/FlameGraph):
+An investigation of code performance often starts with applying a profiler. On Linux, you would use `perf`, a sampling profiler that periodically collects the stack trace of the process, so that you can then see an aggregate picture of where your program spends the most time. In ClickHouse, we actually have a built-in sampling profiler that saves results into a system table, so no external tools are needed. It can be enabled for all queries or for a particular one, by passing the settings [as described in the docs](/docs/en/operations/optimizing-performance/sampling-query-profiler/). It is on by default, so if you use a recent version of ClickHouse, you already have a combined profile of your production server load. To visualize it, we can use a well-known script for building [flamegraphs](https://github.com/brendangregg/FlameGraph):
 ```
 clickhouse-client -q "SELECT
     arrayStringConcat(
@@ -72,7 +73,7 @@ Regardless of how it works inside, a test system must be actually usable as a pa
 
 Organizationally, it is hard to prevent devolving into a system that does a lot of busywork to just show a green check without giving any insight. I like to call this process "mining the green check", by analogy to cryptocurrencies. Our previous system did just that. It used increasingly complex heuristics tailored to each test query to prevent false positives, restarted itself many times if the results didn't look good, and so on. Ultimately, it wasted a lot of processing power without giving the real picture of the server performance. If you wanted to be sure that the performance did or did not change, you had to recheck by hand. This sorry state is the result of how the incentives are aligned around development &mdash; most of the time, the developers just want to merge their pull requests and not be bothered by some obscure test failures. Writing a good performance test query is also not always simple. Just any other query won't do &mdash; it has to give predictable performance, be not too fast and not too slow, actually measure something, and so on. After gathering more precise statistics, we discovered that several hundred of our test queries don't measure anything meaningful, e.g. they give a result that varies by 100% between runs. Another problem is that the performance often changes in statistically significant ways (true positive) with no relevant code changes (due to e.g. random differences in layout of the executable). Given all these difficulties, a working performance test system is bound to add noticeable friction to the development process. Most of the "obvious" ways to remove this friction ultimately boil down to "mining the green check".
 
-Implementation-wise, our system is peculiar in that it doesn't rely on well-known statistical packages, but instead heavily uses `clickhouse-local`, a tool that turns the ClickHouse SQL query processor into a [command line utility](https://altinity.com/blog/2019/6/11/clickhouse-local-the-power-of-clickhouse-sql-in-a-single-command). Doing all the computations in ClickHouse SQL helped us find bugs and usability problems with `clickhouse-local`. The performance test continues to work in dual purpose as a heavy SQL test, and sometimes catches newly introduced bugs in complex joins and the like. The query profiler is always on in the performance tests, and this finds bugs in our fork of `libunwind`. To run the test queries, we use a third-party [Python driver](https://github.com/mymarilyn/clickhouse-driver). This is the only use of this driver in our CI, and it also helped us find some bugs in native protocol handling. A not so honorable fact is that the scaffolding consists of an unreasonable amount of bash, but this at least served to convince us that running [shellcheck](https://github.com/koalaman/shellcheck) in CI is very helpful.
+Implementation-wise, our system is peculiar in that it doesn't rely on well-known statistical packages, but instead heavily uses `clickhouse-local`, a tool that turns the ClickHouse SQL query processor into a command line utility Doing all the computations in ClickHouse SQL helped us find bugs and usability problems with `clickhouse-local`. The performance test continues to work in dual purpose as a heavy SQL test, and sometimes catches newly introduced bugs in complex joins and the like. The query profiler is always on in the performance tests, and this finds bugs in our fork of `libunwind`. To run the test queries, we use a third-party [Python driver](https://github.com/mymarilyn/clickhouse-driver). This is the only use of this driver in our CI, and it also helped us find some bugs in native protocol handling. A not so honorable fact is that the scaffolding consists of an unreasonable amount of bash, but this at least served to convince us that running [shellcheck](https://github.com/koalaman/shellcheck) in CI is very helpful.
 
 This concludes the overview of the ClickHouse performance test system. Stay tuned for the next article where we will discuss the most problematic kind of a performance test failure &mdash; the unstable query run time.
 
@@ -80,4 +81,4 @@ _2021-08-20 [Alexander Kuzmenkov](https://github.com/akuzm). Title photo by [Ale
 
 References:
 
-<a id="ref1"/>1. Box, Hunter, Hunter, 2005. Statistics for experimenters, p. 78: A Randomized Design Used in the Comparison of Standard and Modified Fertilizer Mixtures for Tomato Plants.
\ No newline at end of file
+<a id="ref1"/>1. Box, Hunter, Hunter, 2005. Statistics for experimenters, p. 78: A Randomized Design Used in the Comparison of Standard and Modified Fertilizer Mixtures for Tomato Plants.
diff --git a/website/blog/en/2021/reading-from-external-memory.md b/website/blog/en/2021/reading-from-external-memory.md
index f431bde0625..0b19d209c68 100644
--- a/website/blog/en/2021/reading-from-external-memory.md
+++ b/website/blog/en/2021/reading-from-external-memory.md
@@ -49,6 +49,7 @@ This figure shows results for Intel Optane SSD.
 Minimal latency is 12 microseconds whih is 10 times lower than those of NVMe SSD. Average latency is 1000 lower than those of HDD. There is quite large variation for small block read latency: even though the average time is quite low and close to minimal latency the maximum latency and even 99 percentile are significantly worse. If somebody looks at these results and wishes to create an Intel Optane-based service with 12 microsecond latency for reads they would have to install larger number of Intel Optane drives or consider providing more realistic timings.
 
 When latency is so small overheads of context switching and interrupt handling become noticeable. One can use polling mode to gain some improvement. In this mode the Linux kernel monitors the completion queue instead of switching to some other job and relying on hardware interrupt with interrupt handler to notify about completion. Clearly, it is considerable to use the polling mode only when hardware response is expected to arrive fast enough.
+
 ![Intel Optane single read latency in polling mode](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/optane-single-hipri-read.png)
 
 The figure above shows results for reading from Intel Optane in polling mode. The polling mode is used when an application calls preadv2(2) system call with RWF\_HIGHPRI flag. Compared to usual pread(2) the polling mode lowers the maximum latency by a factor of two for block sizes up to 256 kilobytes.
diff --git a/website/company/index.html b/website/company/index.html
new file mode 100644
index 00000000000..7439ebf15fe
--- /dev/null
+++ b/website/company/index.html
@@ -0,0 +1,29 @@
+{% set prefetch_items = [
+    ('/docs/en/', 'document')
+] %}
+
+{% extends "templates/base.html" %}
+
+{% block extra_meta %}
+{% include "templates/common_fonts.html" %}
+{% endblock %}
+
+{% block nav %}
+
+{% include "templates/global/nav.html" %}
+
+{% endblock %}
+
+{% block content %}
+
+{% include "templates/company/hero.html" %}
+{% include "templates/company/overview.html" %}
+{% include "templates/company/founders.html" %}
+{% include "templates/company/team.html" %}
+{% include "templates/company/press.html" %}
+{% include "templates/company/contact.html" %}
+
+{% include "templates/global/newsletter.html" %}
+{% include "templates/global/github_stars.html" %}
+
+{% endblock %}
diff --git a/website/css/base.css b/website/css/base.css
index a63d1d7b166..b65c8e869f4 100644
--- a/website/css/base.css
+++ b/website/css/base.css
@@ -1,13 +1,11 @@
-body {
-    font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans","Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
-}
-
-a:link, a:visited {
+.blog a:link, .blog a:visited,
+.docs a:link, .docs a:visited {
     color: #f14600;
     text-decoration: none;
 }
 
-a:hover, a:active {
+.blog a:hover, .blog a:active,
+.docs a:hover, .docs a:active {
     text-decoration: underline;
 }
 
@@ -25,7 +23,7 @@ a:hover, a:active {
 }
 
 #logo-icon, #docs-logo-icon {
-    width: 40px;
+    width: 64px;
 }
 
 #logo-text {
@@ -113,19 +111,6 @@ a.btn-outline-yellow {
     color: #fc0;
 }
 
-.navbar-light {
-    border-bottom: 1px solid #efefef;
-}
-
-
-.navbar-light .navbar-nav .nav-link {
-    color: #000;
-}
-
-.navbar-light .navbar-nav .nav-link:hover {
-    color: #f14600;
-}
-
 .bg-number {
     position: absolute;
     font-size: 900%;
@@ -145,7 +130,7 @@ a.btn-outline-yellow {
 }
 
 .nav .dropdown-toggle::after {
-    vertical-align: 0;
+    vertical-align: 0 !important;
 }
 .nav .dropdown-toggle[aria-expanded=false]::after {
     display: inline-block;
@@ -204,3 +189,7 @@ a.btn-outline-yellow {
 #feedback_email {
     white-space: nowrap;
 }
+
+.height-20 {
+    height: 20px;
+}
diff --git a/website/css/bootstrap.css b/website/css/bootstrap.css
index 0703d5d3b65..92e98ef2c66 100644
--- a/website/css/bootstrap.css
+++ b/website/css/bootstrap.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";
 /*!
  * Bootstrap v4.4.1 (https://getbootstrap.com/)
  * Copyright 2011-2019 The Bootstrap Authors
@@ -18,20 +19,46 @@
   --white: #fff;
   --gray: #6c757d;
   --gray-dark: #343a40;
-  --primary: #007bff;
-  --secondary: #6c757d;
+  --brand-primary: #ffcc00;
+  --brand-secondary: #ff3939;
+  --primary-accent-yellow: #ffcc00;
+  --primary-accent-light-yellow: #fffaf0;
+  --primary-accent-blue: #257af4;
+  --primary-accent-light-blue: #e3f1fe;
+  --secondary-accent-orange: #ff8c00;
+  --secondary-accent-light-orange: #ffe4b5;
+  --secondary-accent-red: #ff3939;
+  --secondary-accent-light-red: #ffe4e1;
+  --primary: #ffcc00;
+  --secondary: #212529;
   --success: #28a745;
   --info: #17a2b8;
   --warning: #ffc107;
   --danger: #dc3545;
-  --light: #f8f9fa;
-  --dark: #343a40;
-  --breakpoint-xs: 0;
-  --breakpoint-sm: 576px;
+  --light: #f1f6f9;
+  --dark: #495057;
+  --primary-light: #fffaf0;
+  --secondary-light: #fff;
+  --tertiary: #257af4;
+  --tertiary-light: #e3f1fe;
+  --white: #fff;
+  --black: #212529;
+  --blue: #257af4;
+  --light-blue: #e3f1fe;
+  --yellow: #ffcc00;
+  --light-yellow: #fffaf0;
+  --orange: #ff8c00;
+  --light-orange: #ffe4b5;
+  --red: #ff3939;
+  --light-red: #ffe4e1;
+  --medium: #d6dbdf;
+  --breakpoint-xxs: 0;
+  --breakpoint-xs: 400px;
+  --breakpoint-sm: 616px;
   --breakpoint-md: 768px;
-  --breakpoint-lg: 992px;
-  --breakpoint-xl: 1200px;
-  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  --breakpoint-lg: 980px;
+  --breakpoint-xl: 1240px;
+  --font-family-sans-serif: "Noto Sans", sans-serif;
   --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
 
@@ -45,7 +72,7 @@ html {
   font-family: sans-serif;
   line-height: 1.15;
   -webkit-text-size-adjust: 100%;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-tap-highlight-color: rgba(33, 37, 41, 0);
 }
 
 article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
@@ -54,7 +81,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
 
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: "Noto Sans", sans-serif;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -75,7 +102,7 @@ hr {
 
 h1, h2, h3, h4, h5, h6 {
   margin-top: 0;
-  margin-bottom: 0.5rem;
+  margin-bottom: 16px;
 }
 
 p {
@@ -87,11 +114,11 @@ abbr[title],
 abbr[data-original-title] {
   text-decoration: underline;
   -webkit-text-decoration: underline dotted;
-  text-decoration: underline dotted;
+          text-decoration: underline dotted;
   cursor: help;
   border-bottom: 0;
   -webkit-text-decoration-skip-ink: none;
-  text-decoration-skip-ink: none;
+          text-decoration-skip-ink: none;
 }
 
 address {
@@ -119,7 +146,7 @@ dt {
 }
 
 dd {
-  margin-bottom: .5rem;
+  margin-bottom: 0.5rem;
   margin-left: 0;
 }
 
@@ -145,21 +172,20 @@ sup {
 }
 
 sub {
-  bottom: -.25em;
+  bottom: -0.25em;
 }
 
 sup {
-  top: -.5em;
+  top: -0.5em;
 }
 
 a {
-  color: #007bff;
+  color: #ff8c00;
   text-decoration: none;
   background-color: transparent;
 }
-
 a:hover {
-  color: #0056b3;
+  color: #ff8c00;
   text-decoration: underline;
 }
 
@@ -167,7 +193,6 @@ a:not([href]) {
   color: inherit;
   text-decoration: none;
 }
-
 a:not([href]):hover {
   color: inherit;
   text-decoration: none;
@@ -257,37 +282,37 @@ select {
 }
 
 button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
+[type=button],
+[type=reset],
+[type=submit] {
   -webkit-appearance: button;
 }
 
 button:not(:disabled),
-[type="button"]:not(:disabled),
-[type="reset"]:not(:disabled),
-[type="submit"]:not(:disabled) {
+[type=button]:not(:disabled),
+[type=reset]:not(:disabled),
+[type=submit]:not(:disabled) {
   cursor: pointer;
 }
 
 button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
+[type=button]::-moz-focus-inner,
+[type=reset]::-moz-focus-inner,
+[type=submit]::-moz-focus-inner {
   padding: 0;
   border-style: none;
 }
 
-input[type="radio"],
-input[type="checkbox"] {
+input[type=radio],
+input[type=checkbox] {
   box-sizing: border-box;
   padding: 0;
 }
 
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
+input[type=date],
+input[type=time],
+input[type=datetime-local],
+input[type=month] {
   -webkit-appearance: listbox;
 }
 
@@ -308,28 +333,33 @@ legend {
   width: 100%;
   max-width: 100%;
   padding: 0;
-  margin-bottom: .5rem;
+  margin-bottom: 0.5rem;
   font-size: 1.5rem;
   line-height: inherit;
   color: inherit;
   white-space: normal;
 }
+@media (max-width: 1200px) {
+  legend {
+    font-size: calc(1.275rem + 0.3vw);
+  }
+}
 
 progress {
   vertical-align: baseline;
 }
 
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
+[type=number]::-webkit-inner-spin-button,
+[type=number]::-webkit-outer-spin-button {
   height: auto;
 }
 
-[type="search"] {
+[type=search] {
   outline-offset: -2px;
   -webkit-appearance: none;
 }
 
-[type="search"]::-webkit-search-decoration {
+[type=search]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
 
@@ -357,69 +387,115 @@ template {
 
 h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
-  margin-bottom: 0.5rem;
+  margin-bottom: 16px;
+  font-family: "Hind Siliguri", sans-serif;
   font-weight: 500;
-  line-height: 1.2;
+  line-height: 1.125;
 }
 
 h1, .h1 {
-  font-size: 2rem;
+  font-size: 2.5rem;
+}
+@media (max-width: 1200px) {
+  h1, .h1 {
+    font-size: calc(1.375rem + 1.5vw);
+  }
 }
 
 h2, .h2 {
-  font-size: 1.5rem;
+  font-size: 2rem;
+}
+@media (max-width: 1200px) {
+  h2, .h2 {
+    font-size: calc(1.325rem + 0.9vw);
+  }
 }
 
 h3, .h3 {
-  font-size: 1.25rem;
+  font-size: 1.75rem;
+}
+@media (max-width: 1200px) {
+  h3, .h3 {
+    font-size: calc(1.3rem + 0.6vw);
+  }
 }
 
 h4, .h4 {
-  font-size: 1rem;
+  font-size: 1.5rem;
+}
+@media (max-width: 1200px) {
+  h4, .h4 {
+    font-size: calc(1.275rem + 0.3vw);
+  }
 }
 
 h5, .h5 {
-  font-size: 1rem;
+  font-size: 1.125rem;
 }
 
 h6, .h6 {
-  font-size: 1rem;
+  font-size: 0.875rem;
 }
 
 .lead {
-  font-size: 1.25rem;
-  font-weight: 300;
+  font-size: 1.375rem;
+  font-weight: 400;
+}
+@media (max-width: 1200px) {
+  .lead {
+    font-size: calc(1.2625rem + 0.15vw);
+  }
 }
 
 .display-1 {
-  font-size: 6rem;
-  font-weight: 300;
-  line-height: 1.2;
+  font-size: 4rem;
+  font-weight: 600;
+  line-height: 1.125;
+}
+@media (max-width: 1200px) {
+  .display-1 {
+    font-size: calc(1.525rem + 3.3vw);
+  }
 }
 
 .display-2 {
-  font-size: 5.5rem;
-  font-weight: 300;
-  line-height: 1.2;
+  font-size: 2.5rem;
+  font-weight: 600;
+  line-height: 1.125;
+}
+@media (max-width: 1200px) {
+  .display-2 {
+    font-size: calc(1.375rem + 1.5vw);
+  }
 }
 
 .display-3 {
-  font-size: 4.5rem;
-  font-weight: 300;
-  line-height: 1.2;
+  font-size: 2rem;
+  font-weight: 500;
+  line-height: 1.125;
+}
+@media (max-width: 1200px) {
+  .display-3 {
+    font-size: calc(1.325rem + 0.9vw);
+  }
 }
 
 .display-4 {
-  font-size: 3.5rem;
-  font-weight: 300;
-  line-height: 1.2;
+  font-size: 1.75rem;
+  font-weight: 500;
+  line-height: 1.125;
+}
+@media (max-width: 1200px) {
+  .display-4 {
+    font-size: calc(1.3rem + 0.6vw);
+  }
 }
 
 hr {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
+  margin-top: 8px;
+  margin-bottom: 8px;
   border: 0;
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  border-top: 1px solid rgba(33, 37, 41, 0.1);
 }
 
 small,
@@ -447,7 +523,6 @@ mark,
 .list-inline-item {
   display: inline-block;
 }
-
 .list-inline-item:not(:last-child) {
   margin-right: 0.5rem;
 }
@@ -458,7 +533,7 @@ mark,
 }
 
 .blockquote {
-  margin-bottom: 1rem;
+  margin-bottom: 8px;
   font-size: 1.25rem;
 }
 
@@ -467,9 +542,8 @@ mark,
   font-size: 80%;
   color: #6c757d;
 }
-
 .blockquote-footer::before {
-  content: "\2014\00A0";
+  content: "— ";
 }
 
 .img-fluid {
@@ -481,7 +555,7 @@ mark,
   padding: 0.25rem;
   background-color: #fff;
   border: 1px solid #dee2e6;
-  border-radius: 0.25rem;
+  border-radius: 8px;
   max-width: 100%;
   height: auto;
 }
@@ -491,7 +565,7 @@ mark,
 }
 
 .figure-img {
-  margin-bottom: 0.5rem;
+  margin-bottom: 4px;
   line-height: 1;
 }
 
@@ -505,7 +579,6 @@ code {
   color: #e83e8c;
   word-wrap: break-word;
 }
-
 a > code {
   color: inherit;
 }
@@ -514,10 +587,9 @@ kbd {
   padding: 0.2rem 0.4rem;
   font-size: 87.5%;
   color: #fff;
-  background-color: #212529;
-  border-radius: 0.2rem;
+  background-color: #495057;
+  border-radius: 8px;
 }
-
 kbd kbd {
   padding: 0;
   font-size: 100%;
@@ -527,8 +599,8 @@ kbd kbd {
 pre {
   display: block;
   font-size: 87.5%;
+  color: #495057;
 }
-
 pre code {
   font-size: inherit;
   color: inherit;
@@ -542,304 +614,268 @@ pre code {
 
 .container {
   width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
+  padding-right: 20px;
+  padding-left: 20px;
   margin-right: auto;
   margin-left: auto;
 }
-
-@media (min-width: 576px) {
+@media (min-width: 400px) {
   .container {
-    max-width: 540px;
+    max-width: 576px;
+  }
+}
+@media (min-width: 616px) {
+  .container {
+    max-width: 576px;
   }
 }
-
 @media (min-width: 768px) {
   .container {
-    max-width: 720px;
+    max-width: 958px;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .container {
-    max-width: 960px;
+    max-width: 1008px;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .container {
-    max-width: 1140px;
+    max-width: 1118px;
   }
 }
 
-.container-fluid, .container-sm, .container-md, .container-lg, .container-xl {
+.container-fluid, .container-xl, .container-lg, .container-md, .container-sm, .container-xs {
   width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
+  padding-right: 20px;
+  padding-left: 20px;
   margin-right: auto;
   margin-left: auto;
 }
 
-@media (min-width: 576px) {
-  .container, .container-sm {
-    max-width: 540px;
+@media (min-width: 400px) {
+  .container-xs, .container {
+    max-width: 576px;
+  }
+}
+@media (min-width: 616px) {
+  .container-sm, .container-xs, .container {
+    max-width: 576px;
   }
 }
-
 @media (min-width: 768px) {
-  .container, .container-sm, .container-md {
-    max-width: 720px;
+  .container-md, .container-sm, .container-xs, .container {
+    max-width: 958px;
   }
 }
-
-@media (min-width: 992px) {
-  .container, .container-sm, .container-md, .container-lg {
-    max-width: 960px;
+@media (min-width: 980px) {
+  .container-lg, .container-md, .container-sm, .container-xs, .container {
+    max-width: 1008px;
   }
 }
-
-@media (min-width: 1200px) {
-  .container, .container-sm, .container-md, .container-lg, .container-xl {
-    max-width: 1140px;
+@media (min-width: 1240px) {
+  .container-xl, .container-lg, .container-md, .container-sm, .container-xs, .container {
+    max-width: 1118px;
   }
 }
-
 .row {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
-  margin-right: -15px;
-  margin-left: -15px;
+  margin-right: -20px;
+  margin-left: -20px;
 }
 
 .no-gutters {
   margin-right: 0;
   margin-left: 0;
 }
-
 .no-gutters > .col,
-.no-gutters > [class*="col-"] {
+.no-gutters > [class*=col-] {
   padding-right: 0;
   padding-left: 0;
 }
 
-.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
-.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
-.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
-.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
-.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
-.col-xl-auto {
+.col-xl,
+.col-xl-auto, .col-xl-12, .col-xl-11, .col-xl-10, .col-xl-9, .col-xl-8, .col-xl-7, .col-xl-6, .col-xl-5, .col-xl-4, .col-xl-3, .col-xl-2, .col-xl-1, .col-lg,
+.col-lg-auto, .col-lg-12, .col-lg-11, .col-lg-10, .col-lg-9, .col-lg-8, .col-lg-7, .col-lg-6, .col-lg-5, .col-lg-4, .col-lg-3, .col-lg-2, .col-lg-1, .col-md,
+.col-md-auto, .col-md-12, .col-md-11, .col-md-10, .col-md-9, .col-md-8, .col-md-7, .col-md-6, .col-md-5, .col-md-4, .col-md-3, .col-md-2, .col-md-1, .col-sm,
+.col-sm-auto, .col-sm-12, .col-sm-11, .col-sm-10, .col-sm-9, .col-sm-8, .col-sm-7, .col-sm-6, .col-sm-5, .col-sm-4, .col-sm-3, .col-sm-2, .col-sm-1, .col-xs,
+.col-xs-auto, .col-xs-12, .col-xs-11, .col-xs-10, .col-xs-9, .col-xs-8, .col-xs-7, .col-xs-6, .col-xs-5, .col-xs-4, .col-xs-3, .col-xs-2, .col-xs-1, .col,
+.col-auto, .col-12, .col-11, .col-10, .col-9, .col-8, .col-7, .col-6, .col-5, .col-4, .col-3, .col-2, .col-1 {
   position: relative;
   width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
+  padding-right: 20px;
+  padding-left: 20px;
 }
 
 .col {
-  -ms-flex-preferred-size: 0;
   flex-basis: 0;
-  -ms-flex-positive: 1;
   flex-grow: 1;
   max-width: 100%;
 }
 
 .row-cols-1 > * {
-  -ms-flex: 0 0 100%;
   flex: 0 0 100%;
   max-width: 100%;
 }
 
 .row-cols-2 > * {
-  -ms-flex: 0 0 50%;
   flex: 0 0 50%;
   max-width: 50%;
 }
 
 .row-cols-3 > * {
-  -ms-flex: 0 0 33.333333%;
-  flex: 0 0 33.333333%;
-  max-width: 33.333333%;
+  flex: 0 0 33.3333333333%;
+  max-width: 33.3333333333%;
 }
 
 .row-cols-4 > * {
-  -ms-flex: 0 0 25%;
   flex: 0 0 25%;
   max-width: 25%;
 }
 
 .row-cols-5 > * {
-  -ms-flex: 0 0 20%;
   flex: 0 0 20%;
   max-width: 20%;
 }
 
 .row-cols-6 > * {
-  -ms-flex: 0 0 16.666667%;
-  flex: 0 0 16.666667%;
-  max-width: 16.666667%;
+  flex: 0 0 16.6666666667%;
+  max-width: 16.6666666667%;
 }
 
 .col-auto {
-  -ms-flex: 0 0 auto;
   flex: 0 0 auto;
   width: auto;
   max-width: 100%;
 }
 
 .col-1 {
-  -ms-flex: 0 0 8.333333%;
-  flex: 0 0 8.333333%;
-  max-width: 8.333333%;
+  flex: 0 0 8.3333333333%;
+  max-width: 8.3333333333%;
 }
 
 .col-2 {
-  -ms-flex: 0 0 16.666667%;
-  flex: 0 0 16.666667%;
-  max-width: 16.666667%;
+  flex: 0 0 16.6666666667%;
+  max-width: 16.6666666667%;
 }
 
 .col-3 {
-  -ms-flex: 0 0 25%;
   flex: 0 0 25%;
   max-width: 25%;
 }
 
 .col-4 {
-  -ms-flex: 0 0 33.333333%;
-  flex: 0 0 33.333333%;
-  max-width: 33.333333%;
+  flex: 0 0 33.3333333333%;
+  max-width: 33.3333333333%;
 }
 
 .col-5 {
-  -ms-flex: 0 0 41.666667%;
-  flex: 0 0 41.666667%;
-  max-width: 41.666667%;
+  flex: 0 0 41.6666666667%;
+  max-width: 41.6666666667%;
 }
 
 .col-6 {
-  -ms-flex: 0 0 50%;
   flex: 0 0 50%;
   max-width: 50%;
 }
 
 .col-7 {
-  -ms-flex: 0 0 58.333333%;
-  flex: 0 0 58.333333%;
-  max-width: 58.333333%;
+  flex: 0 0 58.3333333333%;
+  max-width: 58.3333333333%;
 }
 
 .col-8 {
-  -ms-flex: 0 0 66.666667%;
-  flex: 0 0 66.666667%;
-  max-width: 66.666667%;
+  flex: 0 0 66.6666666667%;
+  max-width: 66.6666666667%;
 }
 
 .col-9 {
-  -ms-flex: 0 0 75%;
   flex: 0 0 75%;
   max-width: 75%;
 }
 
 .col-10 {
-  -ms-flex: 0 0 83.333333%;
-  flex: 0 0 83.333333%;
-  max-width: 83.333333%;
+  flex: 0 0 83.3333333333%;
+  max-width: 83.3333333333%;
 }
 
 .col-11 {
-  -ms-flex: 0 0 91.666667%;
-  flex: 0 0 91.666667%;
-  max-width: 91.666667%;
+  flex: 0 0 91.6666666667%;
+  max-width: 91.6666666667%;
 }
 
 .col-12 {
-  -ms-flex: 0 0 100%;
   flex: 0 0 100%;
   max-width: 100%;
 }
 
 .order-first {
-  -ms-flex-order: -1;
   order: -1;
 }
 
 .order-last {
-  -ms-flex-order: 13;
   order: 13;
 }
 
 .order-0 {
-  -ms-flex-order: 0;
   order: 0;
 }
 
 .order-1 {
-  -ms-flex-order: 1;
   order: 1;
 }
 
 .order-2 {
-  -ms-flex-order: 2;
   order: 2;
 }
 
 .order-3 {
-  -ms-flex-order: 3;
   order: 3;
 }
 
 .order-4 {
-  -ms-flex-order: 4;
   order: 4;
 }
 
 .order-5 {
-  -ms-flex-order: 5;
   order: 5;
 }
 
 .order-6 {
-  -ms-flex-order: 6;
   order: 6;
 }
 
 .order-7 {
-  -ms-flex-order: 7;
   order: 7;
 }
 
 .order-8 {
-  -ms-flex-order: 8;
   order: 8;
 }
 
 .order-9 {
-  -ms-flex-order: 9;
   order: 9;
 }
 
 .order-10 {
-  -ms-flex-order: 10;
   order: 10;
 }
 
 .order-11 {
-  -ms-flex-order: 11;
   order: 11;
 }
 
 .order-12 {
-  -ms-flex-order: 12;
   order: 12;
 }
 
 .offset-1 {
-  margin-left: 8.333333%;
+  margin-left: 8.3333333333%;
 }
 
 .offset-2 {
-  margin-left: 16.666667%;
+  margin-left: 16.6666666667%;
 }
 
 .offset-3 {
@@ -847,11 +883,11 @@ pre code {
 }
 
 .offset-4 {
-  margin-left: 33.333333%;
+  margin-left: 33.3333333333%;
 }
 
 .offset-5 {
-  margin-left: 41.666667%;
+  margin-left: 41.6666666667%;
 }
 
 .offset-6 {
@@ -859,11 +895,11 @@ pre code {
 }
 
 .offset-7 {
-  margin-left: 58.333333%;
+  margin-left: 58.3333333333%;
 }
 
 .offset-8 {
-  margin-left: 66.666667%;
+  margin-left: 66.6666666667%;
 }
 
 .offset-9 {
@@ -871,841 +907,1085 @@ pre code {
 }
 
 .offset-10 {
-  margin-left: 83.333333%;
+  margin-left: 83.3333333333%;
 }
 
 .offset-11 {
-  margin-left: 91.666667%;
+  margin-left: 91.6666666667%;
 }
 
-@media (min-width: 576px) {
-  .col-sm {
-    -ms-flex-preferred-size: 0;
+@media (min-width: 400px) {
+  .col-xs {
     flex-basis: 0;
-    -ms-flex-positive: 1;
     flex-grow: 1;
     max-width: 100%;
   }
-  .row-cols-sm-1 > * {
-    -ms-flex: 0 0 100%;
+
+  .row-cols-xs-1 > * {
     flex: 0 0 100%;
     max-width: 100%;
   }
-  .row-cols-sm-2 > * {
-    -ms-flex: 0 0 50%;
+
+  .row-cols-xs-2 > * {
     flex: 0 0 50%;
     max-width: 50%;
   }
-  .row-cols-sm-3 > * {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
+
+  .row-cols-xs-3 > * {
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
   }
-  .row-cols-sm-4 > * {
-    -ms-flex: 0 0 25%;
+
+  .row-cols-xs-4 > * {
     flex: 0 0 25%;
     max-width: 25%;
   }
-  .row-cols-sm-5 > * {
-    -ms-flex: 0 0 20%;
+
+  .row-cols-xs-5 > * {
     flex: 0 0 20%;
     max-width: 20%;
   }
-  .row-cols-sm-6 > * {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
+
+  .row-cols-xs-6 > * {
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
   }
-  .col-sm-auto {
-    -ms-flex: 0 0 auto;
+
+  .col-xs-auto {
     flex: 0 0 auto;
     width: auto;
     max-width: 100%;
   }
-  .col-sm-1 {
-    -ms-flex: 0 0 8.333333%;
-    flex: 0 0 8.333333%;
-    max-width: 8.333333%;
+
+  .col-xs-1 {
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%;
   }
-  .col-sm-2 {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
+
+  .col-xs-2 {
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
   }
-  .col-sm-3 {
-    -ms-flex: 0 0 25%;
+
+  .col-xs-3 {
     flex: 0 0 25%;
     max-width: 25%;
   }
-  .col-sm-4 {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
+
+  .col-xs-4 {
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
   }
-  .col-sm-5 {
-    -ms-flex: 0 0 41.666667%;
-    flex: 0 0 41.666667%;
-    max-width: 41.666667%;
+
+  .col-xs-5 {
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%;
   }
-  .col-sm-6 {
-    -ms-flex: 0 0 50%;
+
+  .col-xs-6 {
     flex: 0 0 50%;
     max-width: 50%;
   }
-  .col-sm-7 {
-    -ms-flex: 0 0 58.333333%;
-    flex: 0 0 58.333333%;
-    max-width: 58.333333%;
+
+  .col-xs-7 {
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%;
   }
-  .col-sm-8 {
-    -ms-flex: 0 0 66.666667%;
-    flex: 0 0 66.666667%;
-    max-width: 66.666667%;
+
+  .col-xs-8 {
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%;
   }
-  .col-sm-9 {
-    -ms-flex: 0 0 75%;
+
+  .col-xs-9 {
     flex: 0 0 75%;
     max-width: 75%;
   }
-  .col-sm-10 {
-    -ms-flex: 0 0 83.333333%;
-    flex: 0 0 83.333333%;
-    max-width: 83.333333%;
+
+  .col-xs-10 {
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%;
   }
-  .col-sm-11 {
-    -ms-flex: 0 0 91.666667%;
-    flex: 0 0 91.666667%;
-    max-width: 91.666667%;
+
+  .col-xs-11 {
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%;
   }
-  .col-sm-12 {
-    -ms-flex: 0 0 100%;
+
+  .col-xs-12 {
     flex: 0 0 100%;
     max-width: 100%;
   }
-  .order-sm-first {
-    -ms-flex-order: -1;
+
+  .order-xs-first {
     order: -1;
   }
-  .order-sm-last {
-    -ms-flex-order: 13;
+
+  .order-xs-last {
     order: 13;
   }
-  .order-sm-0 {
-    -ms-flex-order: 0;
+
+  .order-xs-0 {
     order: 0;
   }
-  .order-sm-1 {
-    -ms-flex-order: 1;
+
+  .order-xs-1 {
     order: 1;
   }
-  .order-sm-2 {
-    -ms-flex-order: 2;
+
+  .order-xs-2 {
     order: 2;
   }
-  .order-sm-3 {
-    -ms-flex-order: 3;
+
+  .order-xs-3 {
     order: 3;
   }
-  .order-sm-4 {
-    -ms-flex-order: 4;
+
+  .order-xs-4 {
     order: 4;
   }
-  .order-sm-5 {
-    -ms-flex-order: 5;
+
+  .order-xs-5 {
     order: 5;
   }
-  .order-sm-6 {
-    -ms-flex-order: 6;
+
+  .order-xs-6 {
     order: 6;
   }
-  .order-sm-7 {
-    -ms-flex-order: 7;
+
+  .order-xs-7 {
     order: 7;
   }
-  .order-sm-8 {
-    -ms-flex-order: 8;
+
+  .order-xs-8 {
     order: 8;
   }
-  .order-sm-9 {
-    -ms-flex-order: 9;
+
+  .order-xs-9 {
     order: 9;
   }
-  .order-sm-10 {
-    -ms-flex-order: 10;
+
+  .order-xs-10 {
     order: 10;
   }
-  .order-sm-11 {
-    -ms-flex-order: 11;
+
+  .order-xs-11 {
     order: 11;
   }
-  .order-sm-12 {
-    -ms-flex-order: 12;
+
+  .order-xs-12 {
     order: 12;
   }
+
+  .offset-xs-0 {
+    margin-left: 0;
+  }
+
+  .offset-xs-1 {
+    margin-left: 8.3333333333%;
+  }
+
+  .offset-xs-2 {
+    margin-left: 16.6666666667%;
+  }
+
+  .offset-xs-3 {
+    margin-left: 25%;
+  }
+
+  .offset-xs-4 {
+    margin-left: 33.3333333333%;
+  }
+
+  .offset-xs-5 {
+    margin-left: 41.6666666667%;
+  }
+
+  .offset-xs-6 {
+    margin-left: 50%;
+  }
+
+  .offset-xs-7 {
+    margin-left: 58.3333333333%;
+  }
+
+  .offset-xs-8 {
+    margin-left: 66.6666666667%;
+  }
+
+  .offset-xs-9 {
+    margin-left: 75%;
+  }
+
+  .offset-xs-10 {
+    margin-left: 83.3333333333%;
+  }
+
+  .offset-xs-11 {
+    margin-left: 91.6666666667%;
+  }
+}
+@media (min-width: 616px) {
+  .col-sm {
+    flex-basis: 0;
+    flex-grow: 1;
+    max-width: 100%;
+  }
+
+  .row-cols-sm-1 > * {
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+
+  .row-cols-sm-2 > * {
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+
+  .row-cols-sm-3 > * {
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
+  }
+
+  .row-cols-sm-4 > * {
+    flex: 0 0 25%;
+    max-width: 25%;
+  }
+
+  .row-cols-sm-5 > * {
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+
+  .row-cols-sm-6 > * {
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
+  }
+
+  .col-sm-auto {
+    flex: 0 0 auto;
+    width: auto;
+    max-width: 100%;
+  }
+
+  .col-sm-1 {
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%;
+  }
+
+  .col-sm-2 {
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
+  }
+
+  .col-sm-3 {
+    flex: 0 0 25%;
+    max-width: 25%;
+  }
+
+  .col-sm-4 {
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
+  }
+
+  .col-sm-5 {
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%;
+  }
+
+  .col-sm-6 {
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+
+  .col-sm-7 {
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%;
+  }
+
+  .col-sm-8 {
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%;
+  }
+
+  .col-sm-9 {
+    flex: 0 0 75%;
+    max-width: 75%;
+  }
+
+  .col-sm-10 {
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%;
+  }
+
+  .col-sm-11 {
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%;
+  }
+
+  .col-sm-12 {
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+
+  .order-sm-first {
+    order: -1;
+  }
+
+  .order-sm-last {
+    order: 13;
+  }
+
+  .order-sm-0 {
+    order: 0;
+  }
+
+  .order-sm-1 {
+    order: 1;
+  }
+
+  .order-sm-2 {
+    order: 2;
+  }
+
+  .order-sm-3 {
+    order: 3;
+  }
+
+  .order-sm-4 {
+    order: 4;
+  }
+
+  .order-sm-5 {
+    order: 5;
+  }
+
+  .order-sm-6 {
+    order: 6;
+  }
+
+  .order-sm-7 {
+    order: 7;
+  }
+
+  .order-sm-8 {
+    order: 8;
+  }
+
+  .order-sm-9 {
+    order: 9;
+  }
+
+  .order-sm-10 {
+    order: 10;
+  }
+
+  .order-sm-11 {
+    order: 11;
+  }
+
+  .order-sm-12 {
+    order: 12;
+  }
+
   .offset-sm-0 {
     margin-left: 0;
   }
+
   .offset-sm-1 {
-    margin-left: 8.333333%;
+    margin-left: 8.3333333333%;
   }
+
   .offset-sm-2 {
-    margin-left: 16.666667%;
+    margin-left: 16.6666666667%;
   }
+
   .offset-sm-3 {
     margin-left: 25%;
   }
+
   .offset-sm-4 {
-    margin-left: 33.333333%;
+    margin-left: 33.3333333333%;
   }
+
   .offset-sm-5 {
-    margin-left: 41.666667%;
+    margin-left: 41.6666666667%;
   }
+
   .offset-sm-6 {
     margin-left: 50%;
   }
+
   .offset-sm-7 {
-    margin-left: 58.333333%;
+    margin-left: 58.3333333333%;
   }
+
   .offset-sm-8 {
-    margin-left: 66.666667%;
+    margin-left: 66.6666666667%;
   }
+
   .offset-sm-9 {
     margin-left: 75%;
   }
+
   .offset-sm-10 {
-    margin-left: 83.333333%;
+    margin-left: 83.3333333333%;
   }
+
   .offset-sm-11 {
-    margin-left: 91.666667%;
+    margin-left: 91.6666666667%;
   }
 }
-
 @media (min-width: 768px) {
   .col-md {
-    -ms-flex-preferred-size: 0;
     flex-basis: 0;
-    -ms-flex-positive: 1;
     flex-grow: 1;
     max-width: 100%;
   }
+
   .row-cols-md-1 > * {
-    -ms-flex: 0 0 100%;
     flex: 0 0 100%;
     max-width: 100%;
   }
+
   .row-cols-md-2 > * {
-    -ms-flex: 0 0 50%;
     flex: 0 0 50%;
     max-width: 50%;
   }
+
   .row-cols-md-3 > * {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
   }
+
   .row-cols-md-4 > * {
-    -ms-flex: 0 0 25%;
     flex: 0 0 25%;
     max-width: 25%;
   }
+
   .row-cols-md-5 > * {
-    -ms-flex: 0 0 20%;
     flex: 0 0 20%;
     max-width: 20%;
   }
+
   .row-cols-md-6 > * {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
   }
+
   .col-md-auto {
-    -ms-flex: 0 0 auto;
     flex: 0 0 auto;
     width: auto;
     max-width: 100%;
   }
+
   .col-md-1 {
-    -ms-flex: 0 0 8.333333%;
-    flex: 0 0 8.333333%;
-    max-width: 8.333333%;
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%;
   }
+
   .col-md-2 {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
   }
+
   .col-md-3 {
-    -ms-flex: 0 0 25%;
     flex: 0 0 25%;
     max-width: 25%;
   }
+
   .col-md-4 {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
   }
+
   .col-md-5 {
-    -ms-flex: 0 0 41.666667%;
-    flex: 0 0 41.666667%;
-    max-width: 41.666667%;
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%;
   }
+
   .col-md-6 {
-    -ms-flex: 0 0 50%;
     flex: 0 0 50%;
     max-width: 50%;
   }
+
   .col-md-7 {
-    -ms-flex: 0 0 58.333333%;
-    flex: 0 0 58.333333%;
-    max-width: 58.333333%;
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%;
   }
+
   .col-md-8 {
-    -ms-flex: 0 0 66.666667%;
-    flex: 0 0 66.666667%;
-    max-width: 66.666667%;
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%;
   }
+
   .col-md-9 {
-    -ms-flex: 0 0 75%;
     flex: 0 0 75%;
     max-width: 75%;
   }
+
   .col-md-10 {
-    -ms-flex: 0 0 83.333333%;
-    flex: 0 0 83.333333%;
-    max-width: 83.333333%;
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%;
   }
+
   .col-md-11 {
-    -ms-flex: 0 0 91.666667%;
-    flex: 0 0 91.666667%;
-    max-width: 91.666667%;
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%;
   }
+
   .col-md-12 {
-    -ms-flex: 0 0 100%;
     flex: 0 0 100%;
     max-width: 100%;
   }
+
   .order-md-first {
-    -ms-flex-order: -1;
     order: -1;
   }
+
   .order-md-last {
-    -ms-flex-order: 13;
     order: 13;
   }
+
   .order-md-0 {
-    -ms-flex-order: 0;
     order: 0;
   }
+
   .order-md-1 {
-    -ms-flex-order: 1;
     order: 1;
   }
+
   .order-md-2 {
-    -ms-flex-order: 2;
     order: 2;
   }
+
   .order-md-3 {
-    -ms-flex-order: 3;
     order: 3;
   }
+
   .order-md-4 {
-    -ms-flex-order: 4;
     order: 4;
   }
+
   .order-md-5 {
-    -ms-flex-order: 5;
     order: 5;
   }
+
   .order-md-6 {
-    -ms-flex-order: 6;
     order: 6;
   }
+
   .order-md-7 {
-    -ms-flex-order: 7;
     order: 7;
   }
+
   .order-md-8 {
-    -ms-flex-order: 8;
     order: 8;
   }
+
   .order-md-9 {
-    -ms-flex-order: 9;
     order: 9;
   }
+
   .order-md-10 {
-    -ms-flex-order: 10;
     order: 10;
   }
+
   .order-md-11 {
-    -ms-flex-order: 11;
     order: 11;
   }
+
   .order-md-12 {
-    -ms-flex-order: 12;
     order: 12;
   }
+
   .offset-md-0 {
     margin-left: 0;
   }
+
   .offset-md-1 {
-    margin-left: 8.333333%;
+    margin-left: 8.3333333333%;
   }
+
   .offset-md-2 {
-    margin-left: 16.666667%;
+    margin-left: 16.6666666667%;
   }
+
   .offset-md-3 {
     margin-left: 25%;
   }
+
   .offset-md-4 {
-    margin-left: 33.333333%;
+    margin-left: 33.3333333333%;
   }
+
   .offset-md-5 {
-    margin-left: 41.666667%;
+    margin-left: 41.6666666667%;
   }
+
   .offset-md-6 {
     margin-left: 50%;
   }
+
   .offset-md-7 {
-    margin-left: 58.333333%;
+    margin-left: 58.3333333333%;
   }
+
   .offset-md-8 {
-    margin-left: 66.666667%;
+    margin-left: 66.6666666667%;
   }
+
   .offset-md-9 {
     margin-left: 75%;
   }
+
   .offset-md-10 {
-    margin-left: 83.333333%;
+    margin-left: 83.3333333333%;
   }
+
   .offset-md-11 {
-    margin-left: 91.666667%;
+    margin-left: 91.6666666667%;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .col-lg {
-    -ms-flex-preferred-size: 0;
     flex-basis: 0;
-    -ms-flex-positive: 1;
     flex-grow: 1;
     max-width: 100%;
   }
+
   .row-cols-lg-1 > * {
-    -ms-flex: 0 0 100%;
     flex: 0 0 100%;
     max-width: 100%;
   }
+
   .row-cols-lg-2 > * {
-    -ms-flex: 0 0 50%;
     flex: 0 0 50%;
     max-width: 50%;
   }
+
   .row-cols-lg-3 > * {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
   }
+
   .row-cols-lg-4 > * {
-    -ms-flex: 0 0 25%;
     flex: 0 0 25%;
     max-width: 25%;
   }
+
   .row-cols-lg-5 > * {
-    -ms-flex: 0 0 20%;
     flex: 0 0 20%;
     max-width: 20%;
   }
+
   .row-cols-lg-6 > * {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
   }
+
   .col-lg-auto {
-    -ms-flex: 0 0 auto;
     flex: 0 0 auto;
     width: auto;
     max-width: 100%;
   }
+
   .col-lg-1 {
-    -ms-flex: 0 0 8.333333%;
-    flex: 0 0 8.333333%;
-    max-width: 8.333333%;
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%;
   }
+
   .col-lg-2 {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
   }
+
   .col-lg-3 {
-    -ms-flex: 0 0 25%;
     flex: 0 0 25%;
     max-width: 25%;
   }
+
   .col-lg-4 {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
   }
+
   .col-lg-5 {
-    -ms-flex: 0 0 41.666667%;
-    flex: 0 0 41.666667%;
-    max-width: 41.666667%;
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%;
   }
+
   .col-lg-6 {
-    -ms-flex: 0 0 50%;
     flex: 0 0 50%;
     max-width: 50%;
   }
+
   .col-lg-7 {
-    -ms-flex: 0 0 58.333333%;
-    flex: 0 0 58.333333%;
-    max-width: 58.333333%;
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%;
   }
+
   .col-lg-8 {
-    -ms-flex: 0 0 66.666667%;
-    flex: 0 0 66.666667%;
-    max-width: 66.666667%;
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%;
   }
+
   .col-lg-9 {
-    -ms-flex: 0 0 75%;
     flex: 0 0 75%;
     max-width: 75%;
   }
+
   .col-lg-10 {
-    -ms-flex: 0 0 83.333333%;
-    flex: 0 0 83.333333%;
-    max-width: 83.333333%;
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%;
   }
+
   .col-lg-11 {
-    -ms-flex: 0 0 91.666667%;
-    flex: 0 0 91.666667%;
-    max-width: 91.666667%;
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%;
   }
+
   .col-lg-12 {
-    -ms-flex: 0 0 100%;
     flex: 0 0 100%;
     max-width: 100%;
   }
+
   .order-lg-first {
-    -ms-flex-order: -1;
     order: -1;
   }
+
   .order-lg-last {
-    -ms-flex-order: 13;
     order: 13;
   }
+
   .order-lg-0 {
-    -ms-flex-order: 0;
     order: 0;
   }
+
   .order-lg-1 {
-    -ms-flex-order: 1;
     order: 1;
   }
+
   .order-lg-2 {
-    -ms-flex-order: 2;
     order: 2;
   }
+
   .order-lg-3 {
-    -ms-flex-order: 3;
     order: 3;
   }
+
   .order-lg-4 {
-    -ms-flex-order: 4;
     order: 4;
   }
+
   .order-lg-5 {
-    -ms-flex-order: 5;
     order: 5;
   }
+
   .order-lg-6 {
-    -ms-flex-order: 6;
     order: 6;
   }
+
   .order-lg-7 {
-    -ms-flex-order: 7;
     order: 7;
   }
+
   .order-lg-8 {
-    -ms-flex-order: 8;
     order: 8;
   }
+
   .order-lg-9 {
-    -ms-flex-order: 9;
     order: 9;
   }
+
   .order-lg-10 {
-    -ms-flex-order: 10;
     order: 10;
   }
+
   .order-lg-11 {
-    -ms-flex-order: 11;
     order: 11;
   }
+
   .order-lg-12 {
-    -ms-flex-order: 12;
     order: 12;
   }
+
   .offset-lg-0 {
     margin-left: 0;
   }
+
   .offset-lg-1 {
-    margin-left: 8.333333%;
+    margin-left: 8.3333333333%;
   }
+
   .offset-lg-2 {
-    margin-left: 16.666667%;
+    margin-left: 16.6666666667%;
   }
+
   .offset-lg-3 {
     margin-left: 25%;
   }
+
   .offset-lg-4 {
-    margin-left: 33.333333%;
+    margin-left: 33.3333333333%;
   }
+
   .offset-lg-5 {
-    margin-left: 41.666667%;
+    margin-left: 41.6666666667%;
   }
+
   .offset-lg-6 {
     margin-left: 50%;
   }
+
   .offset-lg-7 {
-    margin-left: 58.333333%;
+    margin-left: 58.3333333333%;
   }
+
   .offset-lg-8 {
-    margin-left: 66.666667%;
+    margin-left: 66.6666666667%;
   }
+
   .offset-lg-9 {
     margin-left: 75%;
   }
+
   .offset-lg-10 {
-    margin-left: 83.333333%;
+    margin-left: 83.3333333333%;
   }
+
   .offset-lg-11 {
-    margin-left: 91.666667%;
+    margin-left: 91.6666666667%;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .col-xl {
-    -ms-flex-preferred-size: 0;
     flex-basis: 0;
-    -ms-flex-positive: 1;
     flex-grow: 1;
     max-width: 100%;
   }
+
   .row-cols-xl-1 > * {
-    -ms-flex: 0 0 100%;
     flex: 0 0 100%;
     max-width: 100%;
   }
+
   .row-cols-xl-2 > * {
-    -ms-flex: 0 0 50%;
     flex: 0 0 50%;
     max-width: 50%;
   }
+
   .row-cols-xl-3 > * {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
   }
+
   .row-cols-xl-4 > * {
-    -ms-flex: 0 0 25%;
     flex: 0 0 25%;
     max-width: 25%;
   }
+
   .row-cols-xl-5 > * {
-    -ms-flex: 0 0 20%;
     flex: 0 0 20%;
     max-width: 20%;
   }
+
   .row-cols-xl-6 > * {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
   }
+
   .col-xl-auto {
-    -ms-flex: 0 0 auto;
     flex: 0 0 auto;
     width: auto;
     max-width: 100%;
   }
+
   .col-xl-1 {
-    -ms-flex: 0 0 8.333333%;
-    flex: 0 0 8.333333%;
-    max-width: 8.333333%;
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%;
   }
+
   .col-xl-2 {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%;
   }
+
   .col-xl-3 {
-    -ms-flex: 0 0 25%;
     flex: 0 0 25%;
     max-width: 25%;
   }
+
   .col-xl-4 {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%;
   }
+
   .col-xl-5 {
-    -ms-flex: 0 0 41.666667%;
-    flex: 0 0 41.666667%;
-    max-width: 41.666667%;
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%;
   }
+
   .col-xl-6 {
-    -ms-flex: 0 0 50%;
     flex: 0 0 50%;
     max-width: 50%;
   }
+
   .col-xl-7 {
-    -ms-flex: 0 0 58.333333%;
-    flex: 0 0 58.333333%;
-    max-width: 58.333333%;
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%;
   }
+
   .col-xl-8 {
-    -ms-flex: 0 0 66.666667%;
-    flex: 0 0 66.666667%;
-    max-width: 66.666667%;
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%;
   }
+
   .col-xl-9 {
-    -ms-flex: 0 0 75%;
     flex: 0 0 75%;
     max-width: 75%;
   }
+
   .col-xl-10 {
-    -ms-flex: 0 0 83.333333%;
-    flex: 0 0 83.333333%;
-    max-width: 83.333333%;
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%;
   }
+
   .col-xl-11 {
-    -ms-flex: 0 0 91.666667%;
-    flex: 0 0 91.666667%;
-    max-width: 91.666667%;
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%;
   }
+
   .col-xl-12 {
-    -ms-flex: 0 0 100%;
     flex: 0 0 100%;
     max-width: 100%;
   }
+
   .order-xl-first {
-    -ms-flex-order: -1;
     order: -1;
   }
+
   .order-xl-last {
-    -ms-flex-order: 13;
     order: 13;
   }
+
   .order-xl-0 {
-    -ms-flex-order: 0;
     order: 0;
   }
+
   .order-xl-1 {
-    -ms-flex-order: 1;
     order: 1;
   }
+
   .order-xl-2 {
-    -ms-flex-order: 2;
     order: 2;
   }
+
   .order-xl-3 {
-    -ms-flex-order: 3;
     order: 3;
   }
+
   .order-xl-4 {
-    -ms-flex-order: 4;
     order: 4;
   }
+
   .order-xl-5 {
-    -ms-flex-order: 5;
     order: 5;
   }
+
   .order-xl-6 {
-    -ms-flex-order: 6;
     order: 6;
   }
+
   .order-xl-7 {
-    -ms-flex-order: 7;
     order: 7;
   }
+
   .order-xl-8 {
-    -ms-flex-order: 8;
     order: 8;
   }
+
   .order-xl-9 {
-    -ms-flex-order: 9;
     order: 9;
   }
+
   .order-xl-10 {
-    -ms-flex-order: 10;
     order: 10;
   }
+
   .order-xl-11 {
-    -ms-flex-order: 11;
     order: 11;
   }
+
   .order-xl-12 {
-    -ms-flex-order: 12;
     order: 12;
   }
+
   .offset-xl-0 {
     margin-left: 0;
   }
+
   .offset-xl-1 {
-    margin-left: 8.333333%;
+    margin-left: 8.3333333333%;
   }
+
   .offset-xl-2 {
-    margin-left: 16.666667%;
+    margin-left: 16.6666666667%;
   }
+
   .offset-xl-3 {
     margin-left: 25%;
   }
+
   .offset-xl-4 {
-    margin-left: 33.333333%;
+    margin-left: 33.3333333333%;
   }
+
   .offset-xl-5 {
-    margin-left: 41.666667%;
+    margin-left: 41.6666666667%;
   }
+
   .offset-xl-6 {
     margin-left: 50%;
   }
+
   .offset-xl-7 {
-    margin-left: 58.333333%;
+    margin-left: 58.3333333333%;
   }
+
   .offset-xl-8 {
-    margin-left: 66.666667%;
+    margin-left: 66.6666666667%;
   }
+
   .offset-xl-9 {
     margin-left: 75%;
   }
+
   .offset-xl-10 {
-    margin-left: 83.333333%;
+    margin-left: 83.3333333333%;
   }
+
   .offset-xl-11 {
-    margin-left: 91.666667%;
+    margin-left: 91.6666666667%;
   }
 }
-
 .table {
   width: 100%;
-  margin-bottom: 1rem;
+  margin-bottom: 8px;
   color: #212529;
 }
-
 .table th,
 .table td {
   padding: 0.75rem;
   vertical-align: top;
-  border-top: 1px solid #dee2e6;
+  border-top: 1px solid #d6dbdf;
 }
-
 .table thead th {
   vertical-align: bottom;
-  border-bottom: 2px solid #dee2e6;
+  border-bottom: 2px solid #d6dbdf;
 }
-
 .table tbody + tbody {
-  border-top: 2px solid #dee2e6;
+  border-top: 2px solid #d6dbdf;
 }
 
 .table-sm th,
@@ -1714,14 +1994,12 @@ pre code {
 }
 
 .table-bordered {
-  border: 1px solid #dee2e6;
+  border: 1px solid #d6dbdf;
 }
-
 .table-bordered th,
 .table-bordered td {
-  border: 1px solid #dee2e6;
+  border: 1px solid #d6dbdf;
 }
-
 .table-bordered thead th,
 .table-bordered thead td {
   border-bottom-width: 2px;
@@ -1735,56 +2013,52 @@ pre code {
 }
 
 .table-striped tbody tr:nth-of-type(odd) {
-  background-color: rgba(0, 0, 0, 0.05);
+  background-color: rgba(33, 37, 41, 0.05);
 }
 
 .table-hover tbody tr:hover {
   color: #212529;
-  background-color: rgba(0, 0, 0, 0.075);
+  background-color: rgba(33, 37, 41, 0.075);
 }
 
 .table-primary,
 .table-primary > th,
 .table-primary > td {
-  background-color: #b8daff;
+  background-color: #fff1b8;
 }
-
 .table-primary th,
 .table-primary td,
 .table-primary thead th,
 .table-primary tbody + tbody {
-  border-color: #7abaff;
+  border-color: #ffe47a;
 }
 
 .table-hover .table-primary:hover {
-  background-color: #9fcdff;
+  background-color: #ffec9f;
 }
-
 .table-hover .table-primary:hover > td,
 .table-hover .table-primary:hover > th {
-  background-color: #9fcdff;
+  background-color: #ffec9f;
 }
 
 .table-secondary,
 .table-secondary > th,
 .table-secondary > td {
-  background-color: #d6d8db;
+  background-color: #c1c2c3;
 }
-
 .table-secondary th,
 .table-secondary td,
 .table-secondary thead th,
 .table-secondary tbody + tbody {
-  border-color: #b3b7bb;
+  border-color: #8c8e90;
 }
 
 .table-hover .table-secondary:hover {
-  background-color: #c8cbcf;
+  background-color: #b4b5b6;
 }
-
 .table-hover .table-secondary:hover > td,
 .table-hover .table-secondary:hover > th {
-  background-color: #c8cbcf;
+  background-color: #b4b5b6;
 }
 
 .table-success,
@@ -1792,7 +2066,6 @@ pre code {
 .table-success > td {
   background-color: #c3e6cb;
 }
-
 .table-success th,
 .table-success td,
 .table-success thead th,
@@ -1803,7 +2076,6 @@ pre code {
 .table-hover .table-success:hover {
   background-color: #b1dfbb;
 }
-
 .table-hover .table-success:hover > td,
 .table-hover .table-success:hover > th {
   background-color: #b1dfbb;
@@ -1814,7 +2086,6 @@ pre code {
 .table-info > td {
   background-color: #bee5eb;
 }
-
 .table-info th,
 .table-info td,
 .table-info thead th,
@@ -1825,7 +2096,6 @@ pre code {
 .table-hover .table-info:hover {
   background-color: #abdde5;
 }
-
 .table-hover .table-info:hover > td,
 .table-hover .table-info:hover > th {
   background-color: #abdde5;
@@ -1836,7 +2106,6 @@ pre code {
 .table-warning > td {
   background-color: #ffeeba;
 }
-
 .table-warning th,
 .table-warning td,
 .table-warning thead th,
@@ -1847,7 +2116,6 @@ pre code {
 .table-hover .table-warning:hover {
   background-color: #ffe8a1;
 }
-
 .table-hover .table-warning:hover > td,
 .table-hover .table-warning:hover > th {
   background-color: #ffe8a1;
@@ -1858,7 +2126,6 @@ pre code {
 .table-danger > td {
   background-color: #f5c6cb;
 }
-
 .table-danger th,
 .table-danger td,
 .table-danger thead th,
@@ -1869,7 +2136,6 @@ pre code {
 .table-hover .table-danger:hover {
   background-color: #f1b0b7;
 }
-
 .table-hover .table-danger:hover > td,
 .table-hover .table-danger:hover > th {
   background-color: #f1b0b7;
@@ -1878,60 +2144,355 @@ pre code {
 .table-light,
 .table-light > th,
 .table-light > td {
-  background-color: #fdfdfe;
+  background-color: #fbfcfd;
 }
-
 .table-light th,
 .table-light td,
 .table-light thead th,
 .table-light tbody + tbody {
-  border-color: #fbfcfc;
+  border-color: #f8fafc;
 }
 
 .table-hover .table-light:hover {
-  background-color: #ececf6;
+  background-color: #eaeff5;
 }
-
 .table-hover .table-light:hover > td,
 .table-hover .table-light:hover > th {
-  background-color: #ececf6;
+  background-color: #eaeff5;
 }
 
 .table-dark,
 .table-dark > th,
 .table-dark > td {
-  background-color: #c6c8ca;
+  background-color: #ccced0;
 }
-
 .table-dark th,
 .table-dark td,
 .table-dark thead th,
 .table-dark tbody + tbody {
-  border-color: #95999c;
+  border-color: #a0a4a8;
 }
 
 .table-hover .table-dark:hover {
-  background-color: #b9bbbe;
+  background-color: #bfc1c4;
 }
-
 .table-hover .table-dark:hover > td,
 .table-hover .table-dark:hover > th {
-  background-color: #b9bbbe;
+  background-color: #bfc1c4;
+}
+
+.table-primary-light,
+.table-primary-light > th,
+.table-primary-light > td {
+  background-color: #fffefb;
+}
+.table-primary-light th,
+.table-primary-light td,
+.table-primary-light thead th,
+.table-primary-light tbody + tbody {
+  border-color: #fffcf7;
+}
+
+.table-hover .table-primary-light:hover {
+  background-color: #fff8e2;
+}
+.table-hover .table-primary-light:hover > td,
+.table-hover .table-primary-light:hover > th {
+  background-color: #fff8e2;
+}
+
+.table-secondary-light,
+.table-secondary-light > th,
+.table-secondary-light > td {
+  background-color: white;
+}
+.table-secondary-light th,
+.table-secondary-light td,
+.table-secondary-light thead th,
+.table-secondary-light tbody + tbody {
+  border-color: white;
+}
+
+.table-hover .table-secondary-light:hover {
+  background-color: #f2f2f2;
+}
+.table-hover .table-secondary-light:hover > td,
+.table-hover .table-secondary-light:hover > th {
+  background-color: #f2f2f2;
+}
+
+.table-tertiary,
+.table-tertiary > th,
+.table-tertiary > td {
+  background-color: #c2dafc;
+}
+.table-tertiary th,
+.table-tertiary td,
+.table-tertiary thead th,
+.table-tertiary tbody + tbody {
+  border-color: #8ebaf9;
+}
+
+.table-hover .table-tertiary:hover {
+  background-color: #aacbfb;
+}
+.table-hover .table-tertiary:hover > td,
+.table-hover .table-tertiary:hover > th {
+  background-color: #aacbfb;
+}
+
+.table-tertiary-light,
+.table-tertiary-light > th,
+.table-tertiary-light > td {
+  background-color: #f7fbff;
+}
+.table-tertiary-light th,
+.table-tertiary-light td,
+.table-tertiary-light thead th,
+.table-tertiary-light tbody + tbody {
+  border-color: #f0f8fe;
+}
+
+.table-hover .table-tertiary-light:hover {
+  background-color: #deeeff;
+}
+.table-hover .table-tertiary-light:hover > td,
+.table-hover .table-tertiary-light:hover > th {
+  background-color: #deeeff;
+}
+
+.table-white,
+.table-white > th,
+.table-white > td {
+  background-color: white;
+}
+.table-white th,
+.table-white td,
+.table-white thead th,
+.table-white tbody + tbody {
+  border-color: white;
+}
+
+.table-hover .table-white:hover {
+  background-color: #f2f2f2;
+}
+.table-hover .table-white:hover > td,
+.table-hover .table-white:hover > th {
+  background-color: #f2f2f2;
+}
+
+.table-black,
+.table-black > th,
+.table-black > td {
+  background-color: #c1c2c3;
+}
+.table-black th,
+.table-black td,
+.table-black thead th,
+.table-black tbody + tbody {
+  border-color: #8c8e90;
+}
+
+.table-hover .table-black:hover {
+  background-color: #b4b5b6;
+}
+.table-hover .table-black:hover > td,
+.table-hover .table-black:hover > th {
+  background-color: #b4b5b6;
+}
+
+.table-blue,
+.table-blue > th,
+.table-blue > td {
+  background-color: #c2dafc;
+}
+.table-blue th,
+.table-blue td,
+.table-blue thead th,
+.table-blue tbody + tbody {
+  border-color: #8ebaf9;
+}
+
+.table-hover .table-blue:hover {
+  background-color: #aacbfb;
+}
+.table-hover .table-blue:hover > td,
+.table-hover .table-blue:hover > th {
+  background-color: #aacbfb;
+}
+
+.table-light-blue,
+.table-light-blue > th,
+.table-light-blue > td {
+  background-color: #f7fbff;
+}
+.table-light-blue th,
+.table-light-blue td,
+.table-light-blue thead th,
+.table-light-blue tbody + tbody {
+  border-color: #f0f8fe;
+}
+
+.table-hover .table-light-blue:hover {
+  background-color: #deeeff;
+}
+.table-hover .table-light-blue:hover > td,
+.table-hover .table-light-blue:hover > th {
+  background-color: #deeeff;
+}
+
+.table-yellow,
+.table-yellow > th,
+.table-yellow > td {
+  background-color: #fff1b8;
+}
+.table-yellow th,
+.table-yellow td,
+.table-yellow thead th,
+.table-yellow tbody + tbody {
+  border-color: #ffe47a;
+}
+
+.table-hover .table-yellow:hover {
+  background-color: #ffec9f;
+}
+.table-hover .table-yellow:hover > td,
+.table-hover .table-yellow:hover > th {
+  background-color: #ffec9f;
+}
+
+.table-light-yellow,
+.table-light-yellow > th,
+.table-light-yellow > td {
+  background-color: #fffefb;
+}
+.table-light-yellow th,
+.table-light-yellow td,
+.table-light-yellow thead th,
+.table-light-yellow tbody + tbody {
+  border-color: #fffcf7;
+}
+
+.table-hover .table-light-yellow:hover {
+  background-color: #fff8e2;
+}
+.table-hover .table-light-yellow:hover > td,
+.table-hover .table-light-yellow:hover > th {
+  background-color: #fff8e2;
+}
+
+.table-orange,
+.table-orange > th,
+.table-orange > td {
+  background-color: #ffdfb8;
+}
+.table-orange th,
+.table-orange td,
+.table-orange thead th,
+.table-orange tbody + tbody {
+  border-color: #ffc37a;
+}
+
+.table-hover .table-orange:hover {
+  background-color: #ffd49f;
+}
+.table-hover .table-orange:hover > td,
+.table-hover .table-orange:hover > th {
+  background-color: #ffd49f;
+}
+
+.table-light-orange,
+.table-light-orange > th,
+.table-light-orange > td {
+  background-color: #fff7ea;
+}
+.table-light-orange th,
+.table-light-orange td,
+.table-light-orange thead th,
+.table-light-orange tbody + tbody {
+  border-color: #fff1d9;
+}
+
+.table-hover .table-light-orange:hover {
+  background-color: #ffedd1;
+}
+.table-hover .table-light-orange:hover > td,
+.table-hover .table-light-orange:hover > th {
+  background-color: #ffedd1;
+}
+
+.table-red,
+.table-red > th,
+.table-red > td {
+  background-color: #ffc8c8;
+}
+.table-red th,
+.table-red td,
+.table-red thead th,
+.table-red tbody + tbody {
+  border-color: #ff9898;
+}
+
+.table-hover .table-red:hover {
+  background-color: #ffafaf;
+}
+.table-hover .table-red:hover > td,
+.table-hover .table-red:hover > th {
+  background-color: #ffafaf;
+}
+
+.table-light-red,
+.table-light-red > th,
+.table-light-red > td {
+  background-color: #fff7f7;
+}
+.table-light-red th,
+.table-light-red td,
+.table-light-red thead th,
+.table-light-red tbody + tbody {
+  border-color: #fff1ef;
+}
+
+.table-hover .table-light-red:hover {
+  background-color: #ffdede;
+}
+.table-hover .table-light-red:hover > td,
+.table-hover .table-light-red:hover > th {
+  background-color: #ffdede;
+}
+
+.table-medium,
+.table-medium > th,
+.table-medium > td {
+  background-color: #f4f5f6;
+}
+.table-medium th,
+.table-medium td,
+.table-medium thead th,
+.table-medium tbody + tbody {
+  border-color: #eaecee;
+}
+
+.table-hover .table-medium:hover {
+  background-color: #e6e8eb;
+}
+.table-hover .table-medium:hover > td,
+.table-hover .table-medium:hover > th {
+  background-color: #e6e8eb;
 }
 
 .table-active,
 .table-active > th,
 .table-active > td {
-  background-color: rgba(0, 0, 0, 0.075);
+  background-color: rgba(33, 37, 41, 0.075);
 }
 
 .table-hover .table-active:hover {
-  background-color: rgba(0, 0, 0, 0.075);
+  background-color: rgba(22, 24, 27, 0.075);
 }
-
 .table-hover .table-active:hover > td,
 .table-hover .table-active:hover > th {
-  background-color: rgba(0, 0, 0, 0.075);
+  background-color: rgba(22, 24, 27, 0.075);
 }
 
 .table .thead-dark th {
@@ -1939,38 +2500,44 @@ pre code {
   background-color: #343a40;
   border-color: #454d55;
 }
-
 .table .thead-light th {
-  color: #495057;
+  color: #6c757d;
   background-color: #e9ecef;
-  border-color: #dee2e6;
+  border-color: #d6dbdf;
 }
 
 .table-dark {
   color: #fff;
   background-color: #343a40;
 }
-
 .table-dark th,
 .table-dark td,
 .table-dark thead th {
   border-color: #454d55;
 }
-
 .table-dark.table-bordered {
   border: 0;
 }
-
 .table-dark.table-striped tbody tr:nth-of-type(odd) {
   background-color: rgba(255, 255, 255, 0.05);
 }
-
 .table-dark.table-hover tbody tr:hover {
   color: #fff;
   background-color: rgba(255, 255, 255, 0.075);
 }
 
-@media (max-width: 575.98px) {
+@media (max-width: 399.98px) {
+  .table-responsive-xs {
+    display: block;
+    width: 100%;
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+  }
+  .table-responsive-xs > .table-bordered {
+    border: 0;
+  }
+}
+@media (max-width: 615.98px) {
   .table-responsive-sm {
     display: block;
     width: 100%;
@@ -1981,7 +2548,6 @@ pre code {
     border: 0;
   }
 }
-
 @media (max-width: 767.98px) {
   .table-responsive-md {
     display: block;
@@ -1993,8 +2559,7 @@ pre code {
     border: 0;
   }
 }
-
-@media (max-width: 991.98px) {
+@media (max-width: 979.98px) {
   .table-responsive-lg {
     display: block;
     width: 100%;
@@ -2005,8 +2570,7 @@ pre code {
     border: 0;
   }
 }
-
-@media (max-width: 1199.98px) {
+@media (max-width: 1239.98px) {
   .table-responsive-xl {
     display: block;
     width: 100%;
@@ -2017,14 +2581,12 @@ pre code {
     border: 0;
   }
 }
-
 .table-responsive {
   display: block;
   width: 100%;
   overflow-x: auto;
   -webkit-overflow-scrolling: touch;
 }
-
 .table-responsive > .table-bordered {
   border: 0;
 }
@@ -2037,69 +2599,52 @@ pre code {
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
-  color: #495057;
+  color: #6c757d;
   background-color: #fff;
   background-clip: padding-box;
   border: 1px solid #ced4da;
-  border-radius: 0.25rem;
+  border-radius: 8px;
+  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .form-control {
     transition: none;
   }
 }
-
 .form-control::-ms-expand {
   background-color: transparent;
   border: 0;
 }
-
 .form-control:-moz-focusring {
   color: transparent;
-  text-shadow: 0 0 0 #495057;
+  text-shadow: 0 0 0 #6c757d;
 }
-
 .form-control:focus {
-  color: #495057;
-  background-color: #fff;
-  border-color: #80bdff;
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.form-control::-webkit-input-placeholder {
   color: #6c757d;
-  opacity: 1;
+  background-color: #fff;
+  border-color: #ffe680;
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 204, 0, 0.25);
 }
-
 .form-control::-moz-placeholder {
   color: #6c757d;
   opacity: 1;
 }
-
 .form-control:-ms-input-placeholder {
   color: #6c757d;
   opacity: 1;
 }
-
-.form-control::-ms-input-placeholder {
-  color: #6c757d;
-  opacity: 1;
-}
-
 .form-control::placeholder {
   color: #6c757d;
   opacity: 1;
 }
-
 .form-control:disabled, .form-control[readonly] {
   background-color: #e9ecef;
   opacity: 1;
 }
 
 select.form-control:focus::-ms-value {
-  color: #495057;
+  color: #6c757d;
   background-color: #fff;
 }
 
@@ -2120,7 +2665,7 @@ select.form-control:focus::-ms-value {
 .col-form-label-lg {
   padding-top: calc(0.5rem + 1px);
   padding-bottom: calc(0.5rem + 1px);
-  font-size: 1.25rem;
+  font-size: 1.125rem;
   line-height: 1.5;
 }
 
@@ -2143,7 +2688,6 @@ select.form-control:focus::-ms-value {
   border: solid transparent;
   border-width: 1px 0;
 }
-
 .form-control-plaintext.form-control-sm, .form-control-plaintext.form-control-lg {
   padding-right: 0;
   padding-left: 0;
@@ -2154,15 +2698,15 @@ select.form-control:focus::-ms-value {
   padding: 0.25rem 0.5rem;
   font-size: 0.875rem;
   line-height: 1.5;
-  border-radius: 0.2rem;
+  border-radius: 8px;
 }
 
 .form-control-lg {
   height: calc(1.5em + 1rem + 2px);
   padding: 0.5rem 1rem;
-  font-size: 1.25rem;
+  font-size: 1.125rem;
   line-height: 1.5;
-  border-radius: 0.3rem;
+  border-radius: 8px;
 }
 
 select.form-control[size], select.form-control[multiple] {
@@ -2183,16 +2727,13 @@ textarea.form-control {
 }
 
 .form-row {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
   margin-right: -5px;
   margin-left: -5px;
 }
-
 .form-row > .col,
-.form-row > [class*="col-"] {
+.form-row > [class*=col-] {
   padding-right: 5px;
   padding-left: 5px;
 }
@@ -2208,9 +2749,7 @@ textarea.form-control {
   margin-top: 0.3rem;
   margin-left: -1.25rem;
 }
-
-.form-check-input[disabled] ~ .form-check-label,
-.form-check-input:disabled ~ .form-check-label {
+.form-check-input[disabled] ~ .form-check-label, .form-check-input:disabled ~ .form-check-label {
   color: #6c757d;
 }
 
@@ -2219,14 +2758,11 @@ textarea.form-control {
 }
 
 .form-check-inline {
-  display: -ms-inline-flexbox;
   display: inline-flex;
-  -ms-flex-align: center;
   align-items: center;
   padding-left: 0;
   margin-right: 0.75rem;
 }
-
 .form-check-inline .form-check-input {
   position: static;
   margin-top: 0;
@@ -2249,12 +2785,12 @@ textarea.form-control {
   display: none;
   max-width: 100%;
   padding: 0.25rem 0.5rem;
-  margin-top: .1rem;
+  margin-top: 0.1rem;
   font-size: 0.875rem;
   line-height: 1.5;
   color: #fff;
   background-color: rgba(40, 167, 69, 0.9);
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
 
 .was-validated :valid ~ .valid-feedback,
@@ -2272,7 +2808,6 @@ textarea.form-control {
   background-position: right calc(0.375em + 0.1875rem) center;
   background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
 }
-
 .was-validated .form-control:valid:focus, .form-control.is-valid:focus {
   border-color: #28a745;
   box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
@@ -2288,7 +2823,6 @@ textarea.form-control {
   padding-right: calc(0.75em + 2.3125rem);
   background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
 }
-
 .was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {
   border-color: #28a745;
   box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
@@ -2297,7 +2831,6 @@ textarea.form-control {
 .was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {
   color: #28a745;
 }
-
 .was-validated .form-check-input:valid ~ .valid-feedback,
 .was-validated .form-check-input:valid ~ .valid-tooltip, .form-check-input.is-valid ~ .valid-feedback,
 .form-check-input.is-valid ~ .valid-tooltip {
@@ -2307,20 +2840,16 @@ textarea.form-control {
 .was-validated .custom-control-input:valid ~ .custom-control-label, .custom-control-input.is-valid ~ .custom-control-label {
   color: #28a745;
 }
-
 .was-validated .custom-control-input:valid ~ .custom-control-label::before, .custom-control-input.is-valid ~ .custom-control-label::before {
   border-color: #28a745;
 }
-
 .was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {
   border-color: #34ce57;
   background-color: #34ce57;
 }
-
 .was-validated .custom-control-input:valid:focus ~ .custom-control-label::before, .custom-control-input.is-valid:focus ~ .custom-control-label::before {
   box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
 }
-
 .was-validated .custom-control-input:valid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-valid:focus:not(:checked) ~ .custom-control-label::before {
   border-color: #28a745;
 }
@@ -2328,7 +2857,6 @@ textarea.form-control {
 .was-validated .custom-file-input:valid ~ .custom-file-label, .custom-file-input.is-valid ~ .custom-file-label {
   border-color: #28a745;
 }
-
 .was-validated .custom-file-input:valid:focus ~ .custom-file-label, .custom-file-input.is-valid:focus ~ .custom-file-label {
   border-color: #28a745;
   box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
@@ -2349,12 +2877,12 @@ textarea.form-control {
   display: none;
   max-width: 100%;
   padding: 0.25rem 0.5rem;
-  margin-top: .1rem;
+  margin-top: 0.1rem;
   font-size: 0.875rem;
   line-height: 1.5;
   color: #fff;
   background-color: rgba(220, 53, 69, 0.9);
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
 
 .was-validated :invalid ~ .invalid-feedback,
@@ -2372,7 +2900,6 @@ textarea.form-control {
   background-position: right calc(0.375em + 0.1875rem) center;
   background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
 }
-
 .was-validated .form-control:invalid:focus, .form-control.is-invalid:focus {
   border-color: #dc3545;
   box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
@@ -2388,7 +2915,6 @@ textarea.form-control {
   padding-right: calc(0.75em + 2.3125rem);
   background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
 }
-
 .was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus {
   border-color: #dc3545;
   box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
@@ -2397,7 +2923,6 @@ textarea.form-control {
 .was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label {
   color: #dc3545;
 }
-
 .was-validated .form-check-input:invalid ~ .invalid-feedback,
 .was-validated .form-check-input:invalid ~ .invalid-tooltip, .form-check-input.is-invalid ~ .invalid-feedback,
 .form-check-input.is-invalid ~ .invalid-tooltip {
@@ -2407,20 +2932,16 @@ textarea.form-control {
 .was-validated .custom-control-input:invalid ~ .custom-control-label, .custom-control-input.is-invalid ~ .custom-control-label {
   color: #dc3545;
 }
-
 .was-validated .custom-control-input:invalid ~ .custom-control-label::before, .custom-control-input.is-invalid ~ .custom-control-label::before {
   border-color: #dc3545;
 }
-
 .was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before, .custom-control-input.is-invalid:checked ~ .custom-control-label::before {
   border-color: #e4606d;
   background-color: #e4606d;
 }
-
 .was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before, .custom-control-input.is-invalid:focus ~ .custom-control-label::before {
   box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
 }
-
 .was-validated .custom-control-input:invalid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-invalid:focus:not(:checked) ~ .custom-control-label::before {
   border-color: #dc3545;
 }
@@ -2428,43 +2949,30 @@ textarea.form-control {
 .was-validated .custom-file-input:invalid ~ .custom-file-label, .custom-file-input.is-invalid ~ .custom-file-label {
   border-color: #dc3545;
 }
-
 .was-validated .custom-file-input:invalid:focus ~ .custom-file-label, .custom-file-input.is-invalid:focus ~ .custom-file-label {
   border-color: #dc3545;
   box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
 }
 
 .form-inline {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-flow: row wrap;
   flex-flow: row wrap;
-  -ms-flex-align: center;
   align-items: center;
 }
-
 .form-inline .form-check {
   width: 100%;
 }
-
-@media (min-width: 576px) {
+@media (min-width: 616px) {
   .form-inline label {
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex-align: center;
     align-items: center;
-    -ms-flex-pack: center;
     justify-content: center;
     margin-bottom: 0;
   }
   .form-inline .form-group {
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex: 0 0 auto;
     flex: 0 0 auto;
-    -ms-flex-flow: row wrap;
     flex-flow: row wrap;
-    -ms-flex-align: center;
     align-items: center;
     margin-bottom: 0;
   }
@@ -2477,31 +2985,25 @@ textarea.form-control {
     display: inline-block;
   }
   .form-inline .input-group,
-  .form-inline .custom-select {
+.form-inline .custom-select {
     width: auto;
   }
   .form-inline .form-check {
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex-align: center;
     align-items: center;
-    -ms-flex-pack: center;
     justify-content: center;
     width: auto;
     padding-left: 0;
   }
   .form-inline .form-check-input {
     position: relative;
-    -ms-flex-negative: 0;
     flex-shrink: 0;
     margin-top: 0;
     margin-right: 0.25rem;
     margin-left: 0;
   }
   .form-inline .custom-control {
-    -ms-flex-align: center;
     align-items: center;
-    -ms-flex-pack: center;
     justify-content: center;
   }
   .form-inline .custom-control-label {
@@ -2511,120 +3013,103 @@ textarea.form-control {
 
 .btn {
   display: inline-block;
-  font-weight: 400;
+  font-family: inherit;
+  font-weight: 700;
   color: #212529;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
   -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
   background-color: transparent;
   border: 1px solid transparent;
-  padding: 0.375rem 0.75rem;
-  font-size: 1rem;
-  line-height: 1.5;
-  border-radius: 0.25rem;
+  padding: 12px 32px;
+  font-size: 0.875rem;
+  line-height: 20px;
+  border-radius: 8px;
+  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .btn {
     transition: none;
   }
 }
-
 .btn:hover {
   color: #212529;
   text-decoration: none;
 }
-
 .btn:focus, .btn.focus {
   outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+  box-shadow: none;
 }
-
 .btn.disabled, .btn:disabled {
   opacity: 0.65;
 }
-
 a.btn.disabled,
 fieldset:disabled a.btn {
   pointer-events: none;
 }
 
 .btn-primary {
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
+  color: #495057;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
 }
-
 .btn-primary:hover {
-  color: #fff;
-  background-color: #0069d9;
-  border-color: #0062cc;
+  color: #495057;
+  background-color: #d9ad00;
+  border-color: #cca300;
 }
-
 .btn-primary:focus, .btn-primary.focus {
-  color: #fff;
-  background-color: #0069d9;
-  border-color: #0062cc;
-  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+  color: #495057;
+  background-color: #d9ad00;
+  border-color: #cca300;
+  box-shadow: 0 0 0 0 rgba(228, 185, 13, 0.5);
 }
-
 .btn-primary.disabled, .btn-primary:disabled {
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
+  color: #495057;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
 }
-
-.btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active,
-.show > .btn-primary.dropdown-toggle {
-  color: #fff;
-  background-color: #0062cc;
-  border-color: #005cbf;
+.btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active, .show > .btn-primary.dropdown-toggle {
+  color: #495057;
+  background-color: #cca300;
+  border-color: #bf9900;
 }
-
-.btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus,
-.show > .btn-primary.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+.btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-primary.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 185, 13, 0.5);
 }
 
 .btn-secondary {
   color: #fff;
-  background-color: #6c757d;
-  border-color: #6c757d;
+  background-color: #212529;
+  border-color: #212529;
 }
-
 .btn-secondary:hover {
   color: #fff;
-  background-color: #5a6268;
-  border-color: #545b62;
+  background-color: #101214;
+  border-color: #0a0c0d;
 }
-
 .btn-secondary:focus, .btn-secondary.focus {
   color: #fff;
-  background-color: #5a6268;
-  border-color: #545b62;
-  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
+  background-color: #101214;
+  border-color: #0a0c0d;
+  box-shadow: 0 0 0 0 rgba(66, 70, 73, 0.5);
 }
-
 .btn-secondary.disabled, .btn-secondary:disabled {
   color: #fff;
-  background-color: #6c757d;
-  border-color: #6c757d;
+  background-color: #212529;
+  border-color: #212529;
 }
-
-.btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active,
-.show > .btn-secondary.dropdown-toggle {
+.btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, .show > .btn-secondary.dropdown-toggle {
   color: #fff;
-  background-color: #545b62;
-  border-color: #4e555b;
+  background-color: #0a0c0d;
+  border-color: #050506;
 }
-
-.btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus,
-.show > .btn-secondary.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
+.btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, .show > .btn-secondary.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(66, 70, 73, 0.5);
 }
 
 .btn-success {
@@ -2632,36 +3117,29 @@ fieldset:disabled a.btn {
   background-color: #28a745;
   border-color: #28a745;
 }
-
 .btn-success:hover {
   color: #fff;
   background-color: #218838;
   border-color: #1e7e34;
 }
-
 .btn-success:focus, .btn-success.focus {
   color: #fff;
   background-color: #218838;
   border-color: #1e7e34;
-  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
+  box-shadow: 0 0 0 0 rgba(72, 180, 97, 0.5);
 }
-
 .btn-success.disabled, .btn-success:disabled {
   color: #fff;
   background-color: #28a745;
   border-color: #28a745;
 }
-
-.btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,
-.show > .btn-success.dropdown-toggle {
+.btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active, .show > .btn-success.dropdown-toggle {
   color: #fff;
   background-color: #1e7e34;
   border-color: #1c7430;
 }
-
-.btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,
-.show > .btn-success.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
+.btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus, .show > .btn-success.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(72, 180, 97, 0.5);
 }
 
 .btn-info {
@@ -2669,73 +3147,59 @@ fieldset:disabled a.btn {
   background-color: #17a2b8;
   border-color: #17a2b8;
 }
-
 .btn-info:hover {
   color: #fff;
   background-color: #138496;
   border-color: #117a8b;
 }
-
 .btn-info:focus, .btn-info.focus {
   color: #fff;
   background-color: #138496;
   border-color: #117a8b;
-  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
+  box-shadow: 0 0 0 0 rgba(58, 176, 195, 0.5);
 }
-
 .btn-info.disabled, .btn-info:disabled {
   color: #fff;
   background-color: #17a2b8;
   border-color: #17a2b8;
 }
-
-.btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active,
-.show > .btn-info.dropdown-toggle {
+.btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active, .show > .btn-info.dropdown-toggle {
   color: #fff;
   background-color: #117a8b;
   border-color: #10707f;
 }
-
-.btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus,
-.show > .btn-info.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
+.btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus, .show > .btn-info.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(58, 176, 195, 0.5);
 }
 
 .btn-warning {
-  color: #212529;
+  color: #495057;
   background-color: #ffc107;
   border-color: #ffc107;
 }
-
 .btn-warning:hover {
-  color: #212529;
+  color: #495057;
   background-color: #e0a800;
   border-color: #d39e00;
 }
-
 .btn-warning:focus, .btn-warning.focus {
-  color: #212529;
+  color: #495057;
   background-color: #e0a800;
   border-color: #d39e00;
-  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
+  box-shadow: 0 0 0 0 rgba(228, 176, 19, 0.5);
 }
-
 .btn-warning.disabled, .btn-warning:disabled {
-  color: #212529;
+  color: #495057;
   background-color: #ffc107;
   border-color: #ffc107;
 }
-
-.btn-warning:not(:disabled):not(.disabled):active, .btn-warning:not(:disabled):not(.disabled).active,
-.show > .btn-warning.dropdown-toggle {
-  color: #212529;
+.btn-warning:not(:disabled):not(.disabled):active, .btn-warning:not(:disabled):not(.disabled).active, .show > .btn-warning.dropdown-toggle {
+  color: #495057;
   background-color: #d39e00;
   border-color: #c69500;
 }
-
-.btn-warning:not(:disabled):not(.disabled):active:focus, .btn-warning:not(:disabled):not(.disabled).active:focus,
-.show > .btn-warning.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
+.btn-warning:not(:disabled):not(.disabled):active:focus, .btn-warning:not(:disabled):not(.disabled).active:focus, .show > .btn-warning.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 176, 19, 0.5);
 }
 
 .btn-danger {
@@ -2743,427 +3207,1170 @@ fieldset:disabled a.btn {
   background-color: #dc3545;
   border-color: #dc3545;
 }
-
 .btn-danger:hover {
   color: #fff;
   background-color: #c82333;
   border-color: #bd2130;
 }
-
 .btn-danger:focus, .btn-danger.focus {
   color: #fff;
   background-color: #c82333;
   border-color: #bd2130;
-  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
+  box-shadow: 0 0 0 0 rgba(225, 83, 97, 0.5);
 }
-
 .btn-danger.disabled, .btn-danger:disabled {
   color: #fff;
   background-color: #dc3545;
   border-color: #dc3545;
 }
-
-.btn-danger:not(:disabled):not(.disabled):active, .btn-danger:not(:disabled):not(.disabled).active,
-.show > .btn-danger.dropdown-toggle {
+.btn-danger:not(:disabled):not(.disabled):active, .btn-danger:not(:disabled):not(.disabled).active, .show > .btn-danger.dropdown-toggle {
   color: #fff;
   background-color: #bd2130;
   border-color: #b21f2d;
 }
-
-.btn-danger:not(:disabled):not(.disabled):active:focus, .btn-danger:not(:disabled):not(.disabled).active:focus,
-.show > .btn-danger.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
+.btn-danger:not(:disabled):not(.disabled):active:focus, .btn-danger:not(:disabled):not(.disabled).active:focus, .show > .btn-danger.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(225, 83, 97, 0.5);
 }
 
 .btn-light {
-  color: #212529;
-  background-color: #f8f9fa;
-  border-color: #f8f9fa;
+  color: #495057;
+  background-color: #f1f6f9;
+  border-color: #f1f6f9;
 }
-
 .btn-light:hover {
-  color: #212529;
-  background-color: #e2e6ea;
-  border-color: #dae0e5;
+  color: #495057;
+  background-color: #d6e5ee;
+  border-color: #cddfea;
 }
-
 .btn-light:focus, .btn-light.focus {
-  color: #212529;
-  background-color: #e2e6ea;
-  border-color: #dae0e5;
-  box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);
+  color: #495057;
+  background-color: #d6e5ee;
+  border-color: #cddfea;
+  box-shadow: 0 0 0 0 rgba(216, 221, 225, 0.5);
 }
-
 .btn-light.disabled, .btn-light:disabled {
-  color: #212529;
-  background-color: #f8f9fa;
-  border-color: #f8f9fa;
+  color: #495057;
+  background-color: #f1f6f9;
+  border-color: #f1f6f9;
 }
-
-.btn-light:not(:disabled):not(.disabled):active, .btn-light:not(:disabled):not(.disabled).active,
-.show > .btn-light.dropdown-toggle {
-  color: #212529;
-  background-color: #dae0e5;
-  border-color: #d3d9df;
+.btn-light:not(:disabled):not(.disabled):active, .btn-light:not(:disabled):not(.disabled).active, .show > .btn-light.dropdown-toggle {
+  color: #495057;
+  background-color: #cddfea;
+  border-color: #c4d9e6;
 }
-
-.btn-light:not(:disabled):not(.disabled):active:focus, .btn-light:not(:disabled):not(.disabled).active:focus,
-.show > .btn-light.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);
+.btn-light:not(:disabled):not(.disabled):active:focus, .btn-light:not(:disabled):not(.disabled).active:focus, .show > .btn-light.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(216, 221, 225, 0.5);
 }
 
 .btn-dark {
   color: #fff;
-  background-color: #343a40;
-  border-color: #343a40;
+  background-color: #495057;
+  border-color: #495057;
 }
-
 .btn-dark:hover {
   color: #fff;
-  background-color: #23272b;
-  border-color: #1d2124;
+  background-color: #383d42;
+  border-color: #32373b;
 }
-
 .btn-dark:focus, .btn-dark.focus {
   color: #fff;
-  background-color: #23272b;
-  border-color: #1d2124;
-  box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);
+  background-color: #383d42;
+  border-color: #32373b;
+  box-shadow: 0 0 0 0 rgba(100, 106, 112, 0.5);
 }
-
 .btn-dark.disabled, .btn-dark:disabled {
   color: #fff;
-  background-color: #343a40;
-  border-color: #343a40;
+  background-color: #495057;
+  border-color: #495057;
 }
-
-.btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active,
-.show > .btn-dark.dropdown-toggle {
+.btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active, .show > .btn-dark.dropdown-toggle {
   color: #fff;
-  background-color: #1d2124;
-  border-color: #171a1d;
+  background-color: #32373b;
+  border-color: #2c3034;
+}
+.btn-dark:not(:disabled):not(.disabled):active:focus, .btn-dark:not(:disabled):not(.disabled).active:focus, .show > .btn-dark.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(100, 106, 112, 0.5);
 }
 
-.btn-dark:not(:disabled):not(.disabled):active:focus, .btn-dark:not(:disabled):not(.disabled).active:focus,
-.show > .btn-dark.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);
+.btn-primary-light {
+  color: #495057;
+  background-color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-primary-light:hover {
+  color: #495057;
+  background-color: #ffedca;
+  border-color: #ffe9bd;
+}
+.btn-primary-light:focus, .btn-primary-light.focus {
+  color: #495057;
+  background-color: #ffedca;
+  border-color: #ffe9bd;
+  box-shadow: 0 0 0 0 rgba(228, 225, 217, 0.5);
+}
+.btn-primary-light.disabled, .btn-primary-light:disabled {
+  color: #495057;
+  background-color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-primary-light:not(:disabled):not(.disabled):active, .btn-primary-light:not(:disabled):not(.disabled).active, .show > .btn-primary-light.dropdown-toggle {
+  color: #495057;
+  background-color: #ffe9bd;
+  border-color: #ffe5b0;
+}
+.btn-primary-light:not(:disabled):not(.disabled):active:focus, .btn-primary-light:not(:disabled):not(.disabled).active:focus, .show > .btn-primary-light.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 225, 217, 0.5);
+}
+
+.btn-secondary-light {
+  color: #495057;
+  background-color: #fff;
+  border-color: #fff;
+}
+.btn-secondary-light:hover {
+  color: #495057;
+  background-color: #ececec;
+  border-color: #e6e6e6;
+}
+.btn-secondary-light:focus, .btn-secondary-light.focus {
+  color: #495057;
+  background-color: #ececec;
+  border-color: #e6e6e6;
+  box-shadow: 0 0 0 0 rgba(228, 229, 230, 0.5);
+}
+.btn-secondary-light.disabled, .btn-secondary-light:disabled {
+  color: #495057;
+  background-color: #fff;
+  border-color: #fff;
+}
+.btn-secondary-light:not(:disabled):not(.disabled):active, .btn-secondary-light:not(:disabled):not(.disabled).active, .show > .btn-secondary-light.dropdown-toggle {
+  color: #495057;
+  background-color: #e6e6e6;
+  border-color: #dfdfdf;
+}
+.btn-secondary-light:not(:disabled):not(.disabled):active:focus, .btn-secondary-light:not(:disabled):not(.disabled).active:focus, .show > .btn-secondary-light.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 229, 230, 0.5);
+}
+
+.btn-tertiary {
+  color: #fff;
+  background-color: #257af4;
+  border-color: #257af4;
+}
+.btn-tertiary:hover {
+  color: #fff;
+  background-color: #0c66e7;
+  border-color: #0b60db;
+}
+.btn-tertiary:focus, .btn-tertiary.focus {
+  color: #fff;
+  background-color: #0c66e7;
+  border-color: #0b60db;
+  box-shadow: 0 0 0 0 rgba(70, 142, 246, 0.5);
+}
+.btn-tertiary.disabled, .btn-tertiary:disabled {
+  color: #fff;
+  background-color: #257af4;
+  border-color: #257af4;
+}
+.btn-tertiary:not(:disabled):not(.disabled):active, .btn-tertiary:not(:disabled):not(.disabled).active, .show > .btn-tertiary.dropdown-toggle {
+  color: #fff;
+  background-color: #0b60db;
+  border-color: #0a5bcf;
+}
+.btn-tertiary:not(:disabled):not(.disabled):active:focus, .btn-tertiary:not(:disabled):not(.disabled).active:focus, .show > .btn-tertiary.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(70, 142, 246, 0.5);
+}
+
+.btn-tertiary-light {
+  color: #495057;
+  background-color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-tertiary-light:hover {
+  color: #495057;
+  background-color: #bedffd;
+  border-color: #b2d8fc;
+}
+.btn-tertiary-light:focus, .btn-tertiary-light.focus {
+  color: #495057;
+  background-color: #bedffd;
+  border-color: #b2d8fc;
+  box-shadow: 0 0 0 0 rgba(204, 217, 229, 0.5);
+}
+.btn-tertiary-light.disabled, .btn-tertiary-light:disabled {
+  color: #495057;
+  background-color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-tertiary-light:not(:disabled):not(.disabled):active, .btn-tertiary-light:not(:disabled):not(.disabled).active, .show > .btn-tertiary-light.dropdown-toggle {
+  color: #495057;
+  background-color: #b2d8fc;
+  border-color: #a5d2fc;
+}
+.btn-tertiary-light:not(:disabled):not(.disabled):active:focus, .btn-tertiary-light:not(:disabled):not(.disabled).active:focus, .show > .btn-tertiary-light.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(204, 217, 229, 0.5);
+}
+
+.btn-white {
+  color: #495057;
+  background-color: #fff;
+  border-color: #fff;
+}
+.btn-white:hover {
+  color: #495057;
+  background-color: #ececec;
+  border-color: #e6e6e6;
+}
+.btn-white:focus, .btn-white.focus {
+  color: #495057;
+  background-color: #ececec;
+  border-color: #e6e6e6;
+  box-shadow: 0 0 0 0 rgba(228, 229, 230, 0.5);
+}
+.btn-white.disabled, .btn-white:disabled {
+  color: #495057;
+  background-color: #fff;
+  border-color: #fff;
+}
+.btn-white:not(:disabled):not(.disabled):active, .btn-white:not(:disabled):not(.disabled).active, .show > .btn-white.dropdown-toggle {
+  color: #495057;
+  background-color: #e6e6e6;
+  border-color: #dfdfdf;
+}
+.btn-white:not(:disabled):not(.disabled):active:focus, .btn-white:not(:disabled):not(.disabled).active:focus, .show > .btn-white.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 229, 230, 0.5);
+}
+
+.btn-black {
+  color: #fff;
+  background-color: #212529;
+  border-color: #212529;
+}
+.btn-black:hover {
+  color: #fff;
+  background-color: #101214;
+  border-color: #0a0c0d;
+}
+.btn-black:focus, .btn-black.focus {
+  color: #fff;
+  background-color: #101214;
+  border-color: #0a0c0d;
+  box-shadow: 0 0 0 0 rgba(66, 70, 73, 0.5);
+}
+.btn-black.disabled, .btn-black:disabled {
+  color: #fff;
+  background-color: #212529;
+  border-color: #212529;
+}
+.btn-black:not(:disabled):not(.disabled):active, .btn-black:not(:disabled):not(.disabled).active, .show > .btn-black.dropdown-toggle {
+  color: #fff;
+  background-color: #0a0c0d;
+  border-color: #050506;
+}
+.btn-black:not(:disabled):not(.disabled):active:focus, .btn-black:not(:disabled):not(.disabled).active:focus, .show > .btn-black.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(66, 70, 73, 0.5);
+}
+
+.btn-blue {
+  color: #fff;
+  background-color: #257af4;
+  border-color: #257af4;
+}
+.btn-blue:hover {
+  color: #fff;
+  background-color: #0c66e7;
+  border-color: #0b60db;
+}
+.btn-blue:focus, .btn-blue.focus {
+  color: #fff;
+  background-color: #0c66e7;
+  border-color: #0b60db;
+  box-shadow: 0 0 0 0 rgba(70, 142, 246, 0.5);
+}
+.btn-blue.disabled, .btn-blue:disabled {
+  color: #fff;
+  background-color: #257af4;
+  border-color: #257af4;
+}
+.btn-blue:not(:disabled):not(.disabled):active, .btn-blue:not(:disabled):not(.disabled).active, .show > .btn-blue.dropdown-toggle {
+  color: #fff;
+  background-color: #0b60db;
+  border-color: #0a5bcf;
+}
+.btn-blue:not(:disabled):not(.disabled):active:focus, .btn-blue:not(:disabled):not(.disabled).active:focus, .show > .btn-blue.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(70, 142, 246, 0.5);
+}
+
+.btn-light-blue {
+  color: #495057;
+  background-color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-light-blue:hover {
+  color: #495057;
+  background-color: #bedffd;
+  border-color: #b2d8fc;
+}
+.btn-light-blue:focus, .btn-light-blue.focus {
+  color: #495057;
+  background-color: #bedffd;
+  border-color: #b2d8fc;
+  box-shadow: 0 0 0 0 rgba(204, 217, 229, 0.5);
+}
+.btn-light-blue.disabled, .btn-light-blue:disabled {
+  color: #495057;
+  background-color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-light-blue:not(:disabled):not(.disabled):active, .btn-light-blue:not(:disabled):not(.disabled).active, .show > .btn-light-blue.dropdown-toggle {
+  color: #495057;
+  background-color: #b2d8fc;
+  border-color: #a5d2fc;
+}
+.btn-light-blue:not(:disabled):not(.disabled):active:focus, .btn-light-blue:not(:disabled):not(.disabled).active:focus, .show > .btn-light-blue.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(204, 217, 229, 0.5);
+}
+
+.btn-yellow {
+  color: #495057;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
+}
+.btn-yellow:hover {
+  color: #495057;
+  background-color: #d9ad00;
+  border-color: #cca300;
+}
+.btn-yellow:focus, .btn-yellow.focus {
+  color: #495057;
+  background-color: #d9ad00;
+  border-color: #cca300;
+  box-shadow: 0 0 0 0 rgba(228, 185, 13, 0.5);
+}
+.btn-yellow.disabled, .btn-yellow:disabled {
+  color: #495057;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
+}
+.btn-yellow:not(:disabled):not(.disabled):active, .btn-yellow:not(:disabled):not(.disabled).active, .show > .btn-yellow.dropdown-toggle {
+  color: #495057;
+  background-color: #cca300;
+  border-color: #bf9900;
+}
+.btn-yellow:not(:disabled):not(.disabled):active:focus, .btn-yellow:not(:disabled):not(.disabled).active:focus, .show > .btn-yellow.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 185, 13, 0.5);
+}
+
+.btn-light-yellow {
+  color: #495057;
+  background-color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-light-yellow:hover {
+  color: #495057;
+  background-color: #ffedca;
+  border-color: #ffe9bd;
+}
+.btn-light-yellow:focus, .btn-light-yellow.focus {
+  color: #495057;
+  background-color: #ffedca;
+  border-color: #ffe9bd;
+  box-shadow: 0 0 0 0 rgba(228, 225, 217, 0.5);
+}
+.btn-light-yellow.disabled, .btn-light-yellow:disabled {
+  color: #495057;
+  background-color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-light-yellow:not(:disabled):not(.disabled):active, .btn-light-yellow:not(:disabled):not(.disabled).active, .show > .btn-light-yellow.dropdown-toggle {
+  color: #495057;
+  background-color: #ffe9bd;
+  border-color: #ffe5b0;
+}
+.btn-light-yellow:not(:disabled):not(.disabled):active:focus, .btn-light-yellow:not(:disabled):not(.disabled).active:focus, .show > .btn-light-yellow.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 225, 217, 0.5);
+}
+
+.btn-orange {
+  color: #495057;
+  background-color: #ff8c00;
+  border-color: #ff8c00;
+}
+.btn-orange:hover {
+  color: #fff;
+  background-color: #d97700;
+  border-color: #cc7000;
+}
+.btn-orange:focus, .btn-orange.focus {
+  color: #fff;
+  background-color: #d97700;
+  border-color: #cc7000;
+  box-shadow: 0 0 0 0 rgba(228, 131, 13, 0.5);
+}
+.btn-orange.disabled, .btn-orange:disabled {
+  color: #495057;
+  background-color: #ff8c00;
+  border-color: #ff8c00;
+}
+.btn-orange:not(:disabled):not(.disabled):active, .btn-orange:not(:disabled):not(.disabled).active, .show > .btn-orange.dropdown-toggle {
+  color: #fff;
+  background-color: #cc7000;
+  border-color: #bf6900;
+}
+.btn-orange:not(:disabled):not(.disabled):active:focus, .btn-orange:not(:disabled):not(.disabled).active:focus, .show > .btn-orange.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 131, 13, 0.5);
+}
+
+.btn-light-orange {
+  color: #495057;
+  background-color: #ffe4b5;
+  border-color: #ffe4b5;
+}
+.btn-light-orange:hover {
+  color: #495057;
+  background-color: #ffd68f;
+  border-color: #ffd182;
+}
+.btn-light-orange:focus, .btn-light-orange.focus {
+  color: #495057;
+  background-color: #ffd68f;
+  border-color: #ffd182;
+  box-shadow: 0 0 0 0 rgba(228, 206, 167, 0.5);
+}
+.btn-light-orange.disabled, .btn-light-orange:disabled {
+  color: #495057;
+  background-color: #ffe4b5;
+  border-color: #ffe4b5;
+}
+.btn-light-orange:not(:disabled):not(.disabled):active, .btn-light-orange:not(:disabled):not(.disabled).active, .show > .btn-light-orange.dropdown-toggle {
+  color: #495057;
+  background-color: #ffd182;
+  border-color: #ffcd75;
+}
+.btn-light-orange:not(:disabled):not(.disabled):active:focus, .btn-light-orange:not(:disabled):not(.disabled).active:focus, .show > .btn-light-orange.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 206, 167, 0.5);
+}
+
+.btn-red {
+  color: #fff;
+  background-color: #ff3939;
+  border-color: #ff3939;
+}
+.btn-red:hover {
+  color: #fff;
+  background-color: #ff1313;
+  border-color: #ff0606;
+}
+.btn-red:focus, .btn-red.focus {
+  color: #fff;
+  background-color: #ff1313;
+  border-color: #ff0606;
+  box-shadow: 0 0 0 0 rgba(255, 87, 87, 0.5);
+}
+.btn-red.disabled, .btn-red:disabled {
+  color: #fff;
+  background-color: #ff3939;
+  border-color: #ff3939;
+}
+.btn-red:not(:disabled):not(.disabled):active, .btn-red:not(:disabled):not(.disabled).active, .show > .btn-red.dropdown-toggle {
+  color: #fff;
+  background-color: #ff0606;
+  border-color: #f80000;
+}
+.btn-red:not(:disabled):not(.disabled):active:focus, .btn-red:not(:disabled):not(.disabled).active:focus, .show > .btn-red.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 87, 87, 0.5);
+}
+
+.btn-light-red {
+  color: #495057;
+  background-color: #ffe4e1;
+  border-color: #ffe4e1;
+}
+.btn-light-red:hover {
+  color: #495057;
+  background-color: #ffc2bb;
+  border-color: #ffb6ae;
+}
+.btn-light-red:focus, .btn-light-red.focus {
+  color: #495057;
+  background-color: #ffc2bb;
+  border-color: #ffb6ae;
+  box-shadow: 0 0 0 0 rgba(228, 206, 204, 0.5);
+}
+.btn-light-red.disabled, .btn-light-red:disabled {
+  color: #495057;
+  background-color: #ffe4e1;
+  border-color: #ffe4e1;
+}
+.btn-light-red:not(:disabled):not(.disabled):active, .btn-light-red:not(:disabled):not(.disabled).active, .show > .btn-light-red.dropdown-toggle {
+  color: #495057;
+  background-color: #ffb6ae;
+  border-color: #ffaba1;
+}
+.btn-light-red:not(:disabled):not(.disabled):active:focus, .btn-light-red:not(:disabled):not(.disabled).active:focus, .show > .btn-light-red.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(228, 206, 204, 0.5);
+}
+
+.btn-medium {
+  color: #495057;
+  background-color: #d6dbdf;
+  border-color: #d6dbdf;
+}
+.btn-medium:hover {
+  color: #495057;
+  background-color: #c1c8ce;
+  border-color: #b9c2c9;
+}
+.btn-medium:focus, .btn-medium.focus {
+  color: #495057;
+  background-color: #c1c8ce;
+  border-color: #b9c2c9;
+  box-shadow: 0 0 0 0 rgba(193, 198, 203, 0.5);
+}
+.btn-medium.disabled, .btn-medium:disabled {
+  color: #495057;
+  background-color: #d6dbdf;
+  border-color: #d6dbdf;
+}
+.btn-medium:not(:disabled):not(.disabled):active, .btn-medium:not(:disabled):not(.disabled).active, .show > .btn-medium.dropdown-toggle {
+  color: #495057;
+  background-color: #b9c2c9;
+  border-color: #b2bcc3;
+}
+.btn-medium:not(:disabled):not(.disabled):active:focus, .btn-medium:not(:disabled):not(.disabled).active:focus, .show > .btn-medium.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(193, 198, 203, 0.5);
 }
 
 .btn-outline-primary {
-  color: #007bff;
-  border-color: #007bff;
+  color: #ffcc00;
+  border-color: #ffcc00;
 }
-
 .btn-outline-primary:hover {
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
+  color: #495057;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
 }
-
 .btn-outline-primary:focus, .btn-outline-primary.focus {
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+  box-shadow: 0 0 0 0 rgba(255, 204, 0, 0.5);
 }
-
 .btn-outline-primary.disabled, .btn-outline-primary:disabled {
-  color: #007bff;
+  color: #ffcc00;
   background-color: transparent;
 }
-
-.btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active,
-.show > .btn-outline-primary.dropdown-toggle {
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
+.btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active, .show > .btn-outline-primary.dropdown-toggle {
+  color: #495057;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
 }
-
-.btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-primary.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+.btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-primary.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 204, 0, 0.5);
 }
 
 .btn-outline-secondary {
-  color: #6c757d;
-  border-color: #6c757d;
+  color: #212529;
+  border-color: #212529;
 }
-
 .btn-outline-secondary:hover {
   color: #fff;
-  background-color: #6c757d;
-  border-color: #6c757d;
+  background-color: #212529;
+  border-color: #212529;
 }
-
 .btn-outline-secondary:focus, .btn-outline-secondary.focus {
-  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
+  box-shadow: 0 0 0 0 rgba(33, 37, 41, 0.5);
 }
-
 .btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
-  color: #6c757d;
+  color: #212529;
   background-color: transparent;
 }
-
-.btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active,
-.show > .btn-outline-secondary.dropdown-toggle {
+.btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active, .show > .btn-outline-secondary.dropdown-toggle {
   color: #fff;
-  background-color: #6c757d;
-  border-color: #6c757d;
+  background-color: #212529;
+  border-color: #212529;
 }
-
-.btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-secondary.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
+.btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-secondary.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(33, 37, 41, 0.5);
 }
 
 .btn-outline-success {
   color: #28a745;
   border-color: #28a745;
 }
-
 .btn-outline-success:hover {
   color: #fff;
   background-color: #28a745;
   border-color: #28a745;
 }
-
 .btn-outline-success:focus, .btn-outline-success.focus {
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+  box-shadow: 0 0 0 0 rgba(40, 167, 69, 0.5);
 }
-
 .btn-outline-success.disabled, .btn-outline-success:disabled {
   color: #28a745;
   background-color: transparent;
 }
-
-.btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,
-.show > .btn-outline-success.dropdown-toggle {
+.btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active, .show > .btn-outline-success.dropdown-toggle {
   color: #fff;
   background-color: #28a745;
   border-color: #28a745;
 }
-
-.btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-success.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+.btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-success.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(40, 167, 69, 0.5);
 }
 
 .btn-outline-info {
   color: #17a2b8;
   border-color: #17a2b8;
 }
-
 .btn-outline-info:hover {
   color: #fff;
   background-color: #17a2b8;
   border-color: #17a2b8;
 }
-
 .btn-outline-info:focus, .btn-outline-info.focus {
-  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
+  box-shadow: 0 0 0 0 rgba(23, 162, 184, 0.5);
 }
-
 .btn-outline-info.disabled, .btn-outline-info:disabled {
   color: #17a2b8;
   background-color: transparent;
 }
-
-.btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active,
-.show > .btn-outline-info.dropdown-toggle {
+.btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active, .show > .btn-outline-info.dropdown-toggle {
   color: #fff;
   background-color: #17a2b8;
   border-color: #17a2b8;
 }
-
-.btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-info.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
+.btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-info.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(23, 162, 184, 0.5);
 }
 
 .btn-outline-warning {
   color: #ffc107;
   border-color: #ffc107;
 }
-
 .btn-outline-warning:hover {
-  color: #212529;
+  color: #495057;
   background-color: #ffc107;
   border-color: #ffc107;
 }
-
 .btn-outline-warning:focus, .btn-outline-warning.focus {
-  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
+  box-shadow: 0 0 0 0 rgba(255, 193, 7, 0.5);
 }
-
 .btn-outline-warning.disabled, .btn-outline-warning:disabled {
   color: #ffc107;
   background-color: transparent;
 }
-
-.btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled).active,
-.show > .btn-outline-warning.dropdown-toggle {
-  color: #212529;
+.btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled).active, .show > .btn-outline-warning.dropdown-toggle {
+  color: #495057;
   background-color: #ffc107;
   border-color: #ffc107;
 }
-
-.btn-outline-warning:not(:disabled):not(.disabled):active:focus, .btn-outline-warning:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-warning.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
+.btn-outline-warning:not(:disabled):not(.disabled):active:focus, .btn-outline-warning:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-warning.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 193, 7, 0.5);
 }
 
 .btn-outline-danger {
   color: #dc3545;
   border-color: #dc3545;
 }
-
 .btn-outline-danger:hover {
   color: #fff;
   background-color: #dc3545;
   border-color: #dc3545;
 }
-
 .btn-outline-danger:focus, .btn-outline-danger.focus {
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
+  box-shadow: 0 0 0 0 rgba(220, 53, 69, 0.5);
 }
-
 .btn-outline-danger.disabled, .btn-outline-danger:disabled {
   color: #dc3545;
   background-color: transparent;
 }
-
-.btn-outline-danger:not(:disabled):not(.disabled):active, .btn-outline-danger:not(:disabled):not(.disabled).active,
-.show > .btn-outline-danger.dropdown-toggle {
+.btn-outline-danger:not(:disabled):not(.disabled):active, .btn-outline-danger:not(:disabled):not(.disabled).active, .show > .btn-outline-danger.dropdown-toggle {
   color: #fff;
   background-color: #dc3545;
   border-color: #dc3545;
 }
-
-.btn-outline-danger:not(:disabled):not(.disabled):active:focus, .btn-outline-danger:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-danger.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
+.btn-outline-danger:not(:disabled):not(.disabled):active:focus, .btn-outline-danger:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-danger.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(220, 53, 69, 0.5);
 }
 
 .btn-outline-light {
-  color: #f8f9fa;
-  border-color: #f8f9fa;
+  color: #f1f6f9;
+  border-color: #f1f6f9;
 }
-
 .btn-outline-light:hover {
-  color: #212529;
-  background-color: #f8f9fa;
-  border-color: #f8f9fa;
+  color: #495057;
+  background-color: #f1f6f9;
+  border-color: #f1f6f9;
 }
-
 .btn-outline-light:focus, .btn-outline-light.focus {
-  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+  box-shadow: 0 0 0 0 rgba(241, 246, 249, 0.5);
 }
-
 .btn-outline-light.disabled, .btn-outline-light:disabled {
-  color: #f8f9fa;
+  color: #f1f6f9;
   background-color: transparent;
 }
-
-.btn-outline-light:not(:disabled):not(.disabled):active, .btn-outline-light:not(:disabled):not(.disabled).active,
-.show > .btn-outline-light.dropdown-toggle {
-  color: #212529;
-  background-color: #f8f9fa;
-  border-color: #f8f9fa;
+.btn-outline-light:not(:disabled):not(.disabled):active, .btn-outline-light:not(:disabled):not(.disabled).active, .show > .btn-outline-light.dropdown-toggle {
+  color: #495057;
+  background-color: #f1f6f9;
+  border-color: #f1f6f9;
 }
-
-.btn-outline-light:not(:disabled):not(.disabled):active:focus, .btn-outline-light:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-light.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+.btn-outline-light:not(:disabled):not(.disabled):active:focus, .btn-outline-light:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-light.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(241, 246, 249, 0.5);
 }
 
 .btn-outline-dark {
-  color: #343a40;
-  border-color: #343a40;
+  color: #495057;
+  border-color: #495057;
 }
-
 .btn-outline-dark:hover {
   color: #fff;
-  background-color: #343a40;
-  border-color: #343a40;
+  background-color: #495057;
+  border-color: #495057;
 }
-
 .btn-outline-dark:focus, .btn-outline-dark.focus {
-  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+  box-shadow: 0 0 0 0 rgba(73, 80, 87, 0.5);
 }
-
 .btn-outline-dark.disabled, .btn-outline-dark:disabled {
-  color: #343a40;
+  color: #495057;
   background-color: transparent;
 }
-
-.btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active,
-.show > .btn-outline-dark.dropdown-toggle {
+.btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active, .show > .btn-outline-dark.dropdown-toggle {
   color: #fff;
-  background-color: #343a40;
-  border-color: #343a40;
+  background-color: #495057;
+  border-color: #495057;
+}
+.btn-outline-dark:not(:disabled):not(.disabled):active:focus, .btn-outline-dark:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-dark.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(73, 80, 87, 0.5);
 }
 
-.btn-outline-dark:not(:disabled):not(.disabled):active:focus, .btn-outline-dark:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-dark.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+.btn-outline-primary-light {
+  color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-outline-primary-light:hover {
+  color: #495057;
+  background-color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-outline-primary-light:focus, .btn-outline-primary-light.focus {
+  box-shadow: 0 0 0 0 rgba(255, 250, 240, 0.5);
+}
+.btn-outline-primary-light.disabled, .btn-outline-primary-light:disabled {
+  color: #fffaf0;
+  background-color: transparent;
+}
+.btn-outline-primary-light:not(:disabled):not(.disabled):active, .btn-outline-primary-light:not(:disabled):not(.disabled).active, .show > .btn-outline-primary-light.dropdown-toggle {
+  color: #495057;
+  background-color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-outline-primary-light:not(:disabled):not(.disabled):active:focus, .btn-outline-primary-light:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-primary-light.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 250, 240, 0.5);
+}
+
+.btn-outline-secondary-light {
+  color: #fff;
+  border-color: #fff;
+}
+.btn-outline-secondary-light:hover {
+  color: #495057;
+  background-color: #fff;
+  border-color: #fff;
+}
+.btn-outline-secondary-light:focus, .btn-outline-secondary-light.focus {
+  box-shadow: 0 0 0 0 rgba(255, 255, 255, 0.5);
+}
+.btn-outline-secondary-light.disabled, .btn-outline-secondary-light:disabled {
+  color: #fff;
+  background-color: transparent;
+}
+.btn-outline-secondary-light:not(:disabled):not(.disabled):active, .btn-outline-secondary-light:not(:disabled):not(.disabled).active, .show > .btn-outline-secondary-light.dropdown-toggle {
+  color: #495057;
+  background-color: #fff;
+  border-color: #fff;
+}
+.btn-outline-secondary-light:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary-light:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-secondary-light.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 255, 255, 0.5);
+}
+
+.btn-outline-tertiary {
+  color: #257af4;
+  border-color: #257af4;
+}
+.btn-outline-tertiary:hover {
+  color: #fff;
+  background-color: #257af4;
+  border-color: #257af4;
+}
+.btn-outline-tertiary:focus, .btn-outline-tertiary.focus {
+  box-shadow: 0 0 0 0 rgba(37, 122, 244, 0.5);
+}
+.btn-outline-tertiary.disabled, .btn-outline-tertiary:disabled {
+  color: #257af4;
+  background-color: transparent;
+}
+.btn-outline-tertiary:not(:disabled):not(.disabled):active, .btn-outline-tertiary:not(:disabled):not(.disabled).active, .show > .btn-outline-tertiary.dropdown-toggle {
+  color: #fff;
+  background-color: #257af4;
+  border-color: #257af4;
+}
+.btn-outline-tertiary:not(:disabled):not(.disabled):active:focus, .btn-outline-tertiary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-tertiary.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(37, 122, 244, 0.5);
+}
+
+.btn-outline-tertiary-light {
+  color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-outline-tertiary-light:hover {
+  color: #495057;
+  background-color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-outline-tertiary-light:focus, .btn-outline-tertiary-light.focus {
+  box-shadow: 0 0 0 0 rgba(227, 241, 254, 0.5);
+}
+.btn-outline-tertiary-light.disabled, .btn-outline-tertiary-light:disabled {
+  color: #e3f1fe;
+  background-color: transparent;
+}
+.btn-outline-tertiary-light:not(:disabled):not(.disabled):active, .btn-outline-tertiary-light:not(:disabled):not(.disabled).active, .show > .btn-outline-tertiary-light.dropdown-toggle {
+  color: #495057;
+  background-color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-outline-tertiary-light:not(:disabled):not(.disabled):active:focus, .btn-outline-tertiary-light:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-tertiary-light.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(227, 241, 254, 0.5);
+}
+
+.btn-outline-white {
+  color: #fff;
+  border-color: #fff;
+}
+.btn-outline-white:hover {
+  color: #495057;
+  background-color: #fff;
+  border-color: #fff;
+}
+.btn-outline-white:focus, .btn-outline-white.focus {
+  box-shadow: 0 0 0 0 rgba(255, 255, 255, 0.5);
+}
+.btn-outline-white.disabled, .btn-outline-white:disabled {
+  color: #fff;
+  background-color: transparent;
+}
+.btn-outline-white:not(:disabled):not(.disabled):active, .btn-outline-white:not(:disabled):not(.disabled).active, .show > .btn-outline-white.dropdown-toggle {
+  color: #495057;
+  background-color: #fff;
+  border-color: #fff;
+}
+.btn-outline-white:not(:disabled):not(.disabled):active:focus, .btn-outline-white:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-white.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 255, 255, 0.5);
+}
+
+.btn-outline-black {
+  color: #212529;
+  border-color: #212529;
+}
+.btn-outline-black:hover {
+  color: #fff;
+  background-color: #212529;
+  border-color: #212529;
+}
+.btn-outline-black:focus, .btn-outline-black.focus {
+  box-shadow: 0 0 0 0 rgba(33, 37, 41, 0.5);
+}
+.btn-outline-black.disabled, .btn-outline-black:disabled {
+  color: #212529;
+  background-color: transparent;
+}
+.btn-outline-black:not(:disabled):not(.disabled):active, .btn-outline-black:not(:disabled):not(.disabled).active, .show > .btn-outline-black.dropdown-toggle {
+  color: #fff;
+  background-color: #212529;
+  border-color: #212529;
+}
+.btn-outline-black:not(:disabled):not(.disabled):active:focus, .btn-outline-black:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-black.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(33, 37, 41, 0.5);
+}
+
+.btn-outline-blue {
+  color: #257af4;
+  border-color: #257af4;
+}
+.btn-outline-blue:hover {
+  color: #fff;
+  background-color: #257af4;
+  border-color: #257af4;
+}
+.btn-outline-blue:focus, .btn-outline-blue.focus {
+  box-shadow: 0 0 0 0 rgba(37, 122, 244, 0.5);
+}
+.btn-outline-blue.disabled, .btn-outline-blue:disabled {
+  color: #257af4;
+  background-color: transparent;
+}
+.btn-outline-blue:not(:disabled):not(.disabled):active, .btn-outline-blue:not(:disabled):not(.disabled).active, .show > .btn-outline-blue.dropdown-toggle {
+  color: #fff;
+  background-color: #257af4;
+  border-color: #257af4;
+}
+.btn-outline-blue:not(:disabled):not(.disabled):active:focus, .btn-outline-blue:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-blue.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(37, 122, 244, 0.5);
+}
+
+.btn-outline-light-blue {
+  color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-outline-light-blue:hover {
+  color: #495057;
+  background-color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-outline-light-blue:focus, .btn-outline-light-blue.focus {
+  box-shadow: 0 0 0 0 rgba(227, 241, 254, 0.5);
+}
+.btn-outline-light-blue.disabled, .btn-outline-light-blue:disabled {
+  color: #e3f1fe;
+  background-color: transparent;
+}
+.btn-outline-light-blue:not(:disabled):not(.disabled):active, .btn-outline-light-blue:not(:disabled):not(.disabled).active, .show > .btn-outline-light-blue.dropdown-toggle {
+  color: #495057;
+  background-color: #e3f1fe;
+  border-color: #e3f1fe;
+}
+.btn-outline-light-blue:not(:disabled):not(.disabled):active:focus, .btn-outline-light-blue:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-light-blue.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(227, 241, 254, 0.5);
+}
+
+.btn-outline-yellow {
+  color: #ffcc00;
+  border-color: #ffcc00;
+}
+.btn-outline-yellow:hover {
+  color: #495057;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
+}
+.btn-outline-yellow:focus, .btn-outline-yellow.focus {
+  box-shadow: 0 0 0 0 rgba(255, 204, 0, 0.5);
+}
+.btn-outline-yellow.disabled, .btn-outline-yellow:disabled {
+  color: #ffcc00;
+  background-color: transparent;
+}
+.btn-outline-yellow:not(:disabled):not(.disabled):active, .btn-outline-yellow:not(:disabled):not(.disabled).active, .show > .btn-outline-yellow.dropdown-toggle {
+  color: #495057;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
+}
+.btn-outline-yellow:not(:disabled):not(.disabled):active:focus, .btn-outline-yellow:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-yellow.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 204, 0, 0.5);
+}
+
+.btn-outline-light-yellow {
+  color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-outline-light-yellow:hover {
+  color: #495057;
+  background-color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-outline-light-yellow:focus, .btn-outline-light-yellow.focus {
+  box-shadow: 0 0 0 0 rgba(255, 250, 240, 0.5);
+}
+.btn-outline-light-yellow.disabled, .btn-outline-light-yellow:disabled {
+  color: #fffaf0;
+  background-color: transparent;
+}
+.btn-outline-light-yellow:not(:disabled):not(.disabled):active, .btn-outline-light-yellow:not(:disabled):not(.disabled).active, .show > .btn-outline-light-yellow.dropdown-toggle {
+  color: #495057;
+  background-color: #fffaf0;
+  border-color: #fffaf0;
+}
+.btn-outline-light-yellow:not(:disabled):not(.disabled):active:focus, .btn-outline-light-yellow:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-light-yellow.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 250, 240, 0.5);
+}
+
+.btn-outline-orange {
+  color: #ff8c00;
+  border-color: #ff8c00;
+}
+.btn-outline-orange:hover {
+  color: #495057;
+  background-color: #ff8c00;
+  border-color: #ff8c00;
+}
+.btn-outline-orange:focus, .btn-outline-orange.focus {
+  box-shadow: 0 0 0 0 rgba(255, 140, 0, 0.5);
+}
+.btn-outline-orange.disabled, .btn-outline-orange:disabled {
+  color: #ff8c00;
+  background-color: transparent;
+}
+.btn-outline-orange:not(:disabled):not(.disabled):active, .btn-outline-orange:not(:disabled):not(.disabled).active, .show > .btn-outline-orange.dropdown-toggle {
+  color: #495057;
+  background-color: #ff8c00;
+  border-color: #ff8c00;
+}
+.btn-outline-orange:not(:disabled):not(.disabled):active:focus, .btn-outline-orange:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-orange.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 140, 0, 0.5);
+}
+
+.btn-outline-light-orange {
+  color: #ffe4b5;
+  border-color: #ffe4b5;
+}
+.btn-outline-light-orange:hover {
+  color: #495057;
+  background-color: #ffe4b5;
+  border-color: #ffe4b5;
+}
+.btn-outline-light-orange:focus, .btn-outline-light-orange.focus {
+  box-shadow: 0 0 0 0 rgba(255, 228, 181, 0.5);
+}
+.btn-outline-light-orange.disabled, .btn-outline-light-orange:disabled {
+  color: #ffe4b5;
+  background-color: transparent;
+}
+.btn-outline-light-orange:not(:disabled):not(.disabled):active, .btn-outline-light-orange:not(:disabled):not(.disabled).active, .show > .btn-outline-light-orange.dropdown-toggle {
+  color: #495057;
+  background-color: #ffe4b5;
+  border-color: #ffe4b5;
+}
+.btn-outline-light-orange:not(:disabled):not(.disabled):active:focus, .btn-outline-light-orange:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-light-orange.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 228, 181, 0.5);
+}
+
+.btn-outline-red {
+  color: #ff3939;
+  border-color: #ff3939;
+}
+.btn-outline-red:hover {
+  color: #fff;
+  background-color: #ff3939;
+  border-color: #ff3939;
+}
+.btn-outline-red:focus, .btn-outline-red.focus {
+  box-shadow: 0 0 0 0 rgba(255, 57, 57, 0.5);
+}
+.btn-outline-red.disabled, .btn-outline-red:disabled {
+  color: #ff3939;
+  background-color: transparent;
+}
+.btn-outline-red:not(:disabled):not(.disabled):active, .btn-outline-red:not(:disabled):not(.disabled).active, .show > .btn-outline-red.dropdown-toggle {
+  color: #fff;
+  background-color: #ff3939;
+  border-color: #ff3939;
+}
+.btn-outline-red:not(:disabled):not(.disabled):active:focus, .btn-outline-red:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-red.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 57, 57, 0.5);
+}
+
+.btn-outline-light-red {
+  color: #ffe4e1;
+  border-color: #ffe4e1;
+}
+.btn-outline-light-red:hover {
+  color: #495057;
+  background-color: #ffe4e1;
+  border-color: #ffe4e1;
+}
+.btn-outline-light-red:focus, .btn-outline-light-red.focus {
+  box-shadow: 0 0 0 0 rgba(255, 228, 225, 0.5);
+}
+.btn-outline-light-red.disabled, .btn-outline-light-red:disabled {
+  color: #ffe4e1;
+  background-color: transparent;
+}
+.btn-outline-light-red:not(:disabled):not(.disabled):active, .btn-outline-light-red:not(:disabled):not(.disabled).active, .show > .btn-outline-light-red.dropdown-toggle {
+  color: #495057;
+  background-color: #ffe4e1;
+  border-color: #ffe4e1;
+}
+.btn-outline-light-red:not(:disabled):not(.disabled):active:focus, .btn-outline-light-red:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-light-red.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(255, 228, 225, 0.5);
+}
+
+.btn-outline-medium {
+  color: #d6dbdf;
+  border-color: #d6dbdf;
+}
+.btn-outline-medium:hover {
+  color: #495057;
+  background-color: #d6dbdf;
+  border-color: #d6dbdf;
+}
+.btn-outline-medium:focus, .btn-outline-medium.focus {
+  box-shadow: 0 0 0 0 rgba(214, 219, 223, 0.5);
+}
+.btn-outline-medium.disabled, .btn-outline-medium:disabled {
+  color: #d6dbdf;
+  background-color: transparent;
+}
+.btn-outline-medium:not(:disabled):not(.disabled):active, .btn-outline-medium:not(:disabled):not(.disabled).active, .show > .btn-outline-medium.dropdown-toggle {
+  color: #495057;
+  background-color: #d6dbdf;
+  border-color: #d6dbdf;
+}
+.btn-outline-medium:not(:disabled):not(.disabled):active:focus, .btn-outline-medium:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-medium.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0 rgba(214, 219, 223, 0.5);
 }
 
 .btn-link {
   font-weight: 400;
-  color: #007bff;
+  color: #ff8c00;
   text-decoration: none;
 }
-
 .btn-link:hover {
-  color: #0056b3;
+  color: #ff8c00;
   text-decoration: underline;
 }
-
 .btn-link:focus, .btn-link.focus {
   text-decoration: underline;
   box-shadow: none;
 }
-
 .btn-link:disabled, .btn-link.disabled {
-  color: #6c757d;
+  color: #d6dbdf;
   pointer-events: none;
 }
 
 .btn-lg, .btn-group-lg > .btn {
-  padding: 0.5rem 1rem;
-  font-size: 1.25rem;
-  line-height: 1.5;
-  border-radius: 0.3rem;
+  padding: 16px 32px;
+  font-size: 1.125rem;
+  line-height: 26px;
+  border-radius: 8px;
 }
 
 .btn-sm, .btn-group-sm > .btn {
-  padding: 0.25rem 0.5rem;
+  padding: 12px 32px;
   font-size: 0.875rem;
-  line-height: 1.5;
-  border-radius: 0.2rem;
+  line-height: 20px;
+  border-radius: 8px;
 }
 
 .btn-block {
   display: block;
   width: 100%;
 }
-
 .btn-block + .btn-block {
-  margin-top: 0.5rem;
+  margin-top: 24px;
 }
 
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
+input[type=submit].btn-block,
+input[type=reset].btn-block,
+input[type=button].btn-block {
   width: 100%;
 }
 
 .fade {
+  transition: opacity 0.15s linear;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .fade {
     transition: none;
   }
 }
-
 .fade:not(.show) {
   opacity: 0;
 }
@@ -3176,8 +4383,8 @@ input[type="button"].btn-block {
   position: relative;
   height: 0;
   overflow: hidden;
+  transition: height 0.35s ease;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .collapsing {
     transition: none;
@@ -3194,7 +4401,6 @@ input[type="button"].btn-block {
 .dropdown-toggle {
   white-space: nowrap;
 }
-
 .dropdown-toggle::after {
   display: inline-block;
   margin-left: 0.255em;
@@ -3205,7 +4411,6 @@ input[type="button"].btn-block {
   border-bottom: 0;
   border-left: 0.3em solid transparent;
 }
-
 .dropdown-toggle:empty::after {
   margin-left: 0;
 }
@@ -3226,8 +4431,8 @@ input[type="button"].btn-block {
   list-style: none;
   background-color: #fff;
   background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 0.25rem;
+  border: 1px solid rgba(33, 37, 41, 0.15);
+  border-radius: 8px;
 }
 
 .dropdown-menu-left {
@@ -3240,57 +4445,67 @@ input[type="button"].btn-block {
   left: auto;
 }
 
-@media (min-width: 576px) {
+@media (min-width: 400px) {
+  .dropdown-menu-xs-left {
+    right: auto;
+    left: 0;
+  }
+
+  .dropdown-menu-xs-right {
+    right: 0;
+    left: auto;
+  }
+}
+@media (min-width: 616px) {
   .dropdown-menu-sm-left {
     right: auto;
     left: 0;
   }
+
   .dropdown-menu-sm-right {
     right: 0;
     left: auto;
   }
 }
-
 @media (min-width: 768px) {
   .dropdown-menu-md-left {
     right: auto;
     left: 0;
   }
+
   .dropdown-menu-md-right {
     right: 0;
     left: auto;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .dropdown-menu-lg-left {
     right: auto;
     left: 0;
   }
+
   .dropdown-menu-lg-right {
     right: 0;
     left: auto;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .dropdown-menu-xl-left {
     right: auto;
     left: 0;
   }
+
   .dropdown-menu-xl-right {
     right: 0;
     left: auto;
   }
 }
-
 .dropup .dropdown-menu {
   top: auto;
   bottom: 100%;
   margin-top: 0;
   margin-bottom: 0.125rem;
 }
-
 .dropup .dropdown-toggle::after {
   display: inline-block;
   margin-left: 0.255em;
@@ -3301,7 +4516,6 @@ input[type="button"].btn-block {
   border-bottom: 0.3em solid;
   border-left: 0.3em solid transparent;
 }
-
 .dropup .dropdown-toggle:empty::after {
   margin-left: 0;
 }
@@ -3313,7 +4527,6 @@ input[type="button"].btn-block {
   margin-top: 0;
   margin-left: 0.125rem;
 }
-
 .dropright .dropdown-toggle::after {
   display: inline-block;
   margin-left: 0.255em;
@@ -3324,11 +4537,9 @@ input[type="button"].btn-block {
   border-bottom: 0.3em solid transparent;
   border-left: 0.3em solid;
 }
-
 .dropright .dropdown-toggle:empty::after {
   margin-left: 0;
 }
-
 .dropright .dropdown-toggle::after {
   vertical-align: 0;
 }
@@ -3340,18 +4551,15 @@ input[type="button"].btn-block {
   margin-top: 0;
   margin-right: 0.125rem;
 }
-
 .dropleft .dropdown-toggle::after {
   display: inline-block;
   margin-left: 0.255em;
   vertical-align: 0.255em;
   content: "";
 }
-
 .dropleft .dropdown-toggle::after {
   display: none;
 }
-
 .dropleft .dropdown-toggle::before {
   display: inline-block;
   margin-right: 0.255em;
@@ -3361,23 +4569,21 @@ input[type="button"].btn-block {
   border-right: 0.3em solid;
   border-bottom: 0.3em solid transparent;
 }
-
 .dropleft .dropdown-toggle:empty::after {
   margin-left: 0;
 }
-
 .dropleft .dropdown-toggle::before {
   vertical-align: 0;
 }
 
-.dropdown-menu[x-placement^="top"], .dropdown-menu[x-placement^="right"], .dropdown-menu[x-placement^="bottom"], .dropdown-menu[x-placement^="left"] {
+.dropdown-menu[x-placement^=top], .dropdown-menu[x-placement^=right], .dropdown-menu[x-placement^=bottom], .dropdown-menu[x-placement^=left] {
   right: auto;
   bottom: auto;
 }
 
 .dropdown-divider {
   height: 0;
-  margin: 0.5rem 0;
+  margin: 4px 0;
   overflow: hidden;
   border-top: 1px solid #e9ecef;
 }
@@ -3388,25 +4594,22 @@ input[type="button"].btn-block {
   padding: 0.25rem 1.5rem;
   clear: both;
   font-weight: 400;
-  color: #212529;
+  color: #495057;
   text-align: inherit;
   white-space: nowrap;
   background-color: transparent;
   border: 0;
 }
-
 .dropdown-item:hover, .dropdown-item:focus {
-  color: #16181b;
+  color: #3d4349;
   text-decoration: none;
-  background-color: #f8f9fa;
+  background-color: #f1f6f9;
 }
-
 .dropdown-item.active, .dropdown-item:active {
   color: #fff;
   text-decoration: none;
-  background-color: #007bff;
+  background-color: #ffcc00;
 }
-
 .dropdown-item.disabled, .dropdown-item:disabled {
   color: #6c757d;
   pointer-events: none;
@@ -3429,29 +4632,24 @@ input[type="button"].btn-block {
 .dropdown-item-text {
   display: block;
   padding: 0.25rem 1.5rem;
-  color: #212529;
+  color: #495057;
 }
 
 .btn-group,
 .btn-group-vertical {
   position: relative;
-  display: -ms-inline-flexbox;
   display: inline-flex;
   vertical-align: middle;
 }
-
 .btn-group > .btn,
 .btn-group-vertical > .btn {
   position: relative;
-  -ms-flex: 1 1 auto;
   flex: 1 1 auto;
 }
-
 .btn-group > .btn:hover,
 .btn-group-vertical > .btn:hover {
   z-index: 1;
 }
-
 .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active,
 .btn-group-vertical > .btn:focus,
 .btn-group-vertical > .btn:active,
@@ -3460,14 +4658,10 @@ input[type="button"].btn-block {
 }
 
 .btn-toolbar {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
-  -ms-flex-pack: start;
   justify-content: flex-start;
 }
-
 .btn-toolbar .input-group {
   width: auto;
 }
@@ -3476,13 +4670,11 @@ input[type="button"].btn-block {
 .btn-group > .btn-group:not(:first-child) {
   margin-left: -1px;
 }
-
 .btn-group > .btn:not(:last-child):not(.dropdown-toggle),
 .btn-group > .btn-group:not(:last-child) > .btn {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
-
 .btn-group > .btn:not(:first-child),
 .btn-group > .btn-group:not(:first-child) > .btn {
   border-top-left-radius: 0;
@@ -3490,55 +4682,44 @@ input[type="button"].btn-block {
 }
 
 .dropdown-toggle-split {
-  padding-right: 0.5625rem;
-  padding-left: 0.5625rem;
+  padding-right: 24px;
+  padding-left: 24px;
 }
-
-.dropdown-toggle-split::after,
-.dropup .dropdown-toggle-split::after,
-.dropright .dropdown-toggle-split::after {
+.dropdown-toggle-split::after, .dropup .dropdown-toggle-split::after, .dropright .dropdown-toggle-split::after {
   margin-left: 0;
 }
-
 .dropleft .dropdown-toggle-split::before {
   margin-right: 0;
 }
 
 .btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {
-  padding-right: 0.375rem;
-  padding-left: 0.375rem;
+  padding-right: 24px;
+  padding-left: 24px;
 }
 
 .btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
-  padding-right: 0.75rem;
-  padding-left: 0.75rem;
+  padding-right: 24px;
+  padding-left: 24px;
 }
 
 .btn-group-vertical {
-  -ms-flex-direction: column;
   flex-direction: column;
-  -ms-flex-align: start;
   align-items: flex-start;
-  -ms-flex-pack: center;
   justify-content: center;
 }
-
 .btn-group-vertical > .btn,
 .btn-group-vertical > .btn-group {
   width: 100%;
 }
-
 .btn-group-vertical > .btn:not(:first-child),
 .btn-group-vertical > .btn-group:not(:first-child) {
   margin-top: -1px;
 }
-
 .btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle),
 .btn-group-vertical > .btn-group:not(:last-child) > .btn {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-
 .btn-group-vertical > .btn:not(:first-child),
 .btn-group-vertical > .btn-group:not(:first-child) > .btn {
   border-top-left-radius: 0;
@@ -3549,11 +4730,10 @@ input[type="button"].btn-block {
 .btn-group-toggle > .btn-group > .btn {
   margin-bottom: 0;
 }
-
-.btn-group-toggle > .btn input[type="radio"],
-.btn-group-toggle > .btn input[type="checkbox"],
-.btn-group-toggle > .btn-group > .btn input[type="radio"],
-.btn-group-toggle > .btn-group > .btn input[type="checkbox"] {
+.btn-group-toggle > .btn input[type=radio],
+.btn-group-toggle > .btn input[type=checkbox],
+.btn-group-toggle > .btn-group > .btn input[type=radio],
+.btn-group-toggle > .btn-group > .btn input[type=checkbox] {
   position: absolute;
   clip: rect(0, 0, 0, 0);
   pointer-events: none;
@@ -3561,26 +4741,20 @@ input[type="button"].btn-block {
 
 .input-group {
   position: relative;
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
-  -ms-flex-align: stretch;
   align-items: stretch;
   width: 100%;
 }
-
 .input-group > .form-control,
 .input-group > .form-control-plaintext,
 .input-group > .custom-select,
 .input-group > .custom-file {
   position: relative;
-  -ms-flex: 1 1 0%;
   flex: 1 1 0%;
   min-width: 0;
   margin-bottom: 0;
 }
-
 .input-group > .form-control + .form-control,
 .input-group > .form-control + .custom-select,
 .input-group > .form-control + .custom-file,
@@ -3595,42 +4769,32 @@ input[type="button"].btn-block {
 .input-group > .custom-file + .custom-file {
   margin-left: -1px;
 }
-
 .input-group > .form-control:focus,
 .input-group > .custom-select:focus,
 .input-group > .custom-file .custom-file-input:focus ~ .custom-file-label {
   z-index: 3;
 }
-
 .input-group > .custom-file .custom-file-input:focus {
   z-index: 4;
 }
-
 .input-group > .form-control:not(:last-child),
 .input-group > .custom-select:not(:last-child) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
-
 .input-group > .form-control:not(:first-child),
 .input-group > .custom-select:not(:first-child) {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
-
 .input-group > .custom-file {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-align: center;
   align-items: center;
 }
-
-.input-group > .custom-file:not(:last-child) .custom-file-label,
-.input-group > .custom-file:not(:last-child) .custom-file-label::after {
+.input-group > .custom-file:not(:last-child) .custom-file-label, .input-group > .custom-file:not(:last-child) .custom-file-label::after {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
-
 .input-group > .custom-file:not(:first-child) .custom-file-label {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
@@ -3638,21 +4802,17 @@ input[type="button"].btn-block {
 
 .input-group-prepend,
 .input-group-append {
-  display: -ms-flexbox;
   display: flex;
 }
-
 .input-group-prepend .btn,
 .input-group-append .btn {
   position: relative;
   z-index: 2;
 }
-
 .input-group-prepend .btn:focus,
 .input-group-append .btn:focus {
   z-index: 3;
 }
-
 .input-group-prepend .btn + .btn,
 .input-group-prepend .btn + .input-group-text,
 .input-group-prepend .input-group-text + .input-group-text,
@@ -3673,25 +4833,22 @@ input[type="button"].btn-block {
 }
 
 .input-group-text {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-align: center;
   align-items: center;
   padding: 0.375rem 0.75rem;
   margin-bottom: 0;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
-  color: #495057;
+  color: #6c757d;
   text-align: center;
   white-space: nowrap;
   background-color: #e9ecef;
   border: 1px solid #ced4da;
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
-
-.input-group-text input[type="radio"],
-.input-group-text input[type="checkbox"] {
+.input-group-text input[type=radio],
+.input-group-text input[type=checkbox] {
   margin-top: 0;
 }
 
@@ -3707,9 +4864,9 @@ input[type="button"].btn-block {
 .input-group-lg > .input-group-prepend > .btn,
 .input-group-lg > .input-group-append > .btn {
   padding: 0.5rem 1rem;
-  font-size: 1.25rem;
+  font-size: 1.125rem;
   line-height: 1.5;
-  border-radius: 0.3rem;
+  border-radius: 8px;
 }
 
 .input-group-sm > .form-control:not(textarea),
@@ -3726,7 +4883,7 @@ input[type="button"].btn-block {
   padding: 0.25rem 0.5rem;
   font-size: 0.875rem;
   line-height: 1.5;
-  border-radius: 0.2rem;
+  border-radius: 8px;
 }
 
 .input-group-lg > .custom-select,
@@ -3762,7 +4919,6 @@ input[type="button"].btn-block {
 }
 
 .custom-control-inline {
-  display: -ms-inline-flexbox;
   display: inline-flex;
   margin-right: 1rem;
 }
@@ -3775,31 +4931,25 @@ input[type="button"].btn-block {
   height: 1.25rem;
   opacity: 0;
 }
-
 .custom-control-input:checked ~ .custom-control-label::before {
   color: #fff;
-  border-color: #007bff;
-  background-color: #007bff;
+  border-color: #ffcc00;
+  background-color: #ffcc00;
 }
-
 .custom-control-input:focus ~ .custom-control-label::before {
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+  box-shadow: 0 0 0 0.2rem rgba(255, 204, 0, 0.25);
 }
-
 .custom-control-input:focus:not(:checked) ~ .custom-control-label::before {
-  border-color: #80bdff;
+  border-color: #ffe680;
 }
-
 .custom-control-input:not(:disabled):active ~ .custom-control-label::before {
   color: #fff;
-  background-color: #b3d7ff;
-  border-color: #b3d7ff;
+  background-color: #fff0b3;
+  border-color: #fff0b3;
 }
-
 .custom-control-input[disabled] ~ .custom-control-label, .custom-control-input:disabled ~ .custom-control-label {
   color: #6c757d;
 }
-
 .custom-control-input[disabled] ~ .custom-control-label::before, .custom-control-input:disabled ~ .custom-control-label::before {
   background-color: #e9ecef;
 }
@@ -3809,7 +4959,6 @@ input[type="button"].btn-block {
   margin-bottom: 0;
   vertical-align: top;
 }
-
 .custom-control-label::before {
   position: absolute;
   top: 0.25rem;
@@ -3820,9 +4969,8 @@ input[type="button"].btn-block {
   pointer-events: none;
   content: "";
   background-color: #fff;
-  border: #adb5bd solid 1px;
+  border: #d6dbdf solid 1px;
 }
-
 .custom-control-label::after {
   position: absolute;
   top: 0.25rem;
@@ -3831,80 +4979,68 @@ input[type="button"].btn-block {
   width: 1rem;
   height: 1rem;
   content: "";
-  background: no-repeat 50% / 50% 50%;
+  background: no-repeat 50%/50% 50%;
 }
 
 .custom-checkbox .custom-control-label::before {
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
-
 .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e");
 }
-
 .custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before {
-  border-color: #007bff;
-  background-color: #007bff;
+  border-color: #ffcc00;
+  background-color: #ffcc00;
 }
-
 .custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after {
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e");
 }
-
 .custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before {
-  background-color: rgba(0, 123, 255, 0.5);
+  background-color: rgba(255, 204, 0, 0.5);
 }
-
 .custom-checkbox .custom-control-input:disabled:indeterminate ~ .custom-control-label::before {
-  background-color: rgba(0, 123, 255, 0.5);
+  background-color: rgba(255, 204, 0, 0.5);
 }
 
 .custom-radio .custom-control-label::before {
   border-radius: 50%;
 }
-
 .custom-radio .custom-control-input:checked ~ .custom-control-label::after {
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e");
 }
-
 .custom-radio .custom-control-input:disabled:checked ~ .custom-control-label::before {
-  background-color: rgba(0, 123, 255, 0.5);
+  background-color: rgba(255, 204, 0, 0.5);
 }
 
 .custom-switch {
   padding-left: 2.25rem;
 }
-
 .custom-switch .custom-control-label::before {
   left: -2.25rem;
   width: 1.75rem;
   pointer-events: all;
   border-radius: 0.5rem;
 }
-
 .custom-switch .custom-control-label::after {
   top: calc(0.25rem + 2px);
   left: calc(-2.25rem + 2px);
   width: calc(1rem - 4px);
   height: calc(1rem - 4px);
-  background-color: #adb5bd;
+  background-color: #d6dbdf;
   border-radius: 0.5rem;
+  transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .custom-switch .custom-control-label::after {
     transition: none;
   }
 }
-
 .custom-switch .custom-control-input:checked ~ .custom-control-label::after {
   background-color: #fff;
-  -webkit-transform: translateX(0.75rem);
   transform: translateX(0.75rem);
 }
-
 .custom-switch .custom-control-input:disabled:checked ~ .custom-control-label::before {
-  background-color: rgba(0, 123, 255, 0.5);
+  background-color: rgba(255, 204, 0, 0.5);
 }
 
 .custom-select {
@@ -3915,45 +5051,39 @@ input[type="button"].btn-block {
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
-  color: #495057;
+  color: #6c757d;
   vertical-align: middle;
   background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
   border: 1px solid #ced4da;
-  border-radius: 0.25rem;
+  border-radius: 8px;
   -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
+     -moz-appearance: none;
+          appearance: none;
 }
-
 .custom-select:focus {
-  border-color: #80bdff;
+  border-color: #ffe680;
   outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+  box-shadow: 0 0 0 0.2rem rgba(255, 204, 0, 0.25);
 }
-
 .custom-select:focus::-ms-value {
-  color: #495057;
+  color: #6c757d;
   background-color: #fff;
 }
-
 .custom-select[multiple], .custom-select[size]:not([size="1"]) {
   height: auto;
   padding-right: 0.75rem;
   background-image: none;
 }
-
 .custom-select:disabled {
   color: #6c757d;
   background-color: #e9ecef;
 }
-
 .custom-select::-ms-expand {
   display: none;
 }
-
 .custom-select:-moz-focusring {
   color: transparent;
-  text-shadow: 0 0 0 #495057;
+  text-shadow: 0 0 0 #6c757d;
 }
 
 .custom-select-sm {
@@ -3969,7 +5099,7 @@ input[type="button"].btn-block {
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
   padding-left: 1rem;
-  font-size: 1.25rem;
+  font-size: 1.125rem;
 }
 
 .custom-file {
@@ -3988,21 +5118,16 @@ input[type="button"].btn-block {
   margin: 0;
   opacity: 0;
 }
-
 .custom-file-input:focus ~ .custom-file-label {
-  border-color: #80bdff;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+  border-color: #ffe680;
+  box-shadow: 0 0 0 0.2rem rgba(255, 204, 0, 0.25);
 }
-
-.custom-file-input[disabled] ~ .custom-file-label,
-.custom-file-input:disabled ~ .custom-file-label {
+.custom-file-input[disabled] ~ .custom-file-label, .custom-file-input:disabled ~ .custom-file-label {
   background-color: #e9ecef;
 }
-
 .custom-file-input:lang(en) ~ .custom-file-label::after {
   content: "Browse";
 }
-
 .custom-file-input ~ .custom-file-label[data-browse]::after {
   content: attr(data-browse);
 }
@@ -4017,12 +5142,11 @@ input[type="button"].btn-block {
   padding: 0.375rem 0.75rem;
   font-weight: 400;
   line-height: 1.5;
-  color: #495057;
+  color: #6c757d;
   background-color: #fff;
   border: 1px solid #ced4da;
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
-
 .custom-file-label::after {
   position: absolute;
   top: 0;
@@ -4033,11 +5157,11 @@ input[type="button"].btn-block {
   height: calc(1.5em + 0.75rem);
   padding: 0.375rem 0.75rem;
   line-height: 1.5;
-  color: #495057;
+  color: #6c757d;
   content: "Browse";
   background-color: #e9ecef;
   border-left: inherit;
-  border-radius: 0 0.25rem 0.25rem 0;
+  border-radius: 0 8px 8px 0;
 }
 
 .custom-range {
@@ -4046,52 +5170,45 @@ input[type="button"].btn-block {
   padding: 0;
   background-color: transparent;
   -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
+     -moz-appearance: none;
+          appearance: none;
 }
-
 .custom-range:focus {
   outline: none;
 }
-
 .custom-range:focus::-webkit-slider-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(255, 204, 0, 0.25);
 }
-
 .custom-range:focus::-moz-range-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(255, 204, 0, 0.25);
 }
-
 .custom-range:focus::-ms-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(255, 204, 0, 0.25);
 }
-
 .custom-range::-moz-focus-outer {
   border: 0;
 }
-
 .custom-range::-webkit-slider-thumb {
   width: 1rem;
   height: 1rem;
   margin-top: -0.25rem;
-  background-color: #007bff;
+  background-color: #ffcc00;
   border: 0;
   border-radius: 1rem;
+  -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
   -webkit-appearance: none;
-  appearance: none;
+          appearance: none;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .custom-range::-webkit-slider-thumb {
     -webkit-transition: none;
     transition: none;
   }
 }
-
 .custom-range::-webkit-slider-thumb:active {
-  background-color: #b3d7ff;
+  background-color: #fff0b3;
 }
-
 .custom-range::-webkit-slider-runnable-track {
   width: 100%;
   height: 0.5rem;
@@ -4101,28 +5218,26 @@ input[type="button"].btn-block {
   border-color: transparent;
   border-radius: 1rem;
 }
-
 .custom-range::-moz-range-thumb {
   width: 1rem;
   height: 1rem;
-  background-color: #007bff;
+  background-color: #ffcc00;
   border: 0;
   border-radius: 1rem;
+  -moz-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
   -moz-appearance: none;
-  appearance: none;
+       appearance: none;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .custom-range::-moz-range-thumb {
     -moz-transition: none;
     transition: none;
   }
 }
-
 .custom-range::-moz-range-thumb:active {
-  background-color: #b3d7ff;
+  background-color: #fff0b3;
 }
-
 .custom-range::-moz-range-track {
   width: 100%;
   height: 0.5rem;
@@ -4132,30 +5247,28 @@ input[type="button"].btn-block {
   border-color: transparent;
   border-radius: 1rem;
 }
-
 .custom-range::-ms-thumb {
   width: 1rem;
   height: 1rem;
   margin-top: 0;
   margin-right: 0.2rem;
   margin-left: 0.2rem;
-  background-color: #007bff;
+  background-color: #ffcc00;
   border: 0;
   border-radius: 1rem;
+  -ms-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
   appearance: none;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .custom-range::-ms-thumb {
     -ms-transition: none;
     transition: none;
   }
 }
-
 .custom-range::-ms-thumb:active {
-  background-color: #b3d7ff;
+  background-color: #fff0b3;
 }
-
 .custom-range::-ms-track {
   width: 100%;
   height: 0.5rem;
@@ -4165,55 +5278,46 @@ input[type="button"].btn-block {
   border-color: transparent;
   border-width: 0.5rem;
 }
-
 .custom-range::-ms-fill-lower {
   background-color: #dee2e6;
   border-radius: 1rem;
 }
-
 .custom-range::-ms-fill-upper {
   margin-right: 15px;
   background-color: #dee2e6;
   border-radius: 1rem;
 }
-
 .custom-range:disabled::-webkit-slider-thumb {
-  background-color: #adb5bd;
+  background-color: #d6dbdf;
 }
-
 .custom-range:disabled::-webkit-slider-runnable-track {
   cursor: default;
 }
-
 .custom-range:disabled::-moz-range-thumb {
-  background-color: #adb5bd;
+  background-color: #d6dbdf;
 }
-
 .custom-range:disabled::-moz-range-track {
   cursor: default;
 }
-
 .custom-range:disabled::-ms-thumb {
-  background-color: #adb5bd;
+  background-color: #d6dbdf;
 }
 
 .custom-control-label::before,
 .custom-file-label,
 .custom-select {
+  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .custom-control-label::before,
-  .custom-file-label,
-  .custom-select {
+.custom-file-label,
+.custom-select {
     transition: none;
   }
 }
 
 .nav {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
   padding-left: 0;
   margin-bottom: 0;
@@ -4222,50 +5326,42 @@ input[type="button"].btn-block {
 
 .nav-link {
   display: block;
-  padding: 0.25rem 1rem;
+  padding: 0 0;
 }
-
 .nav-link:hover, .nav-link:focus {
   text-decoration: none;
 }
-
 .nav-link.disabled {
-  color: #6c757d;
+  color: #d6dbdf;
   pointer-events: none;
   cursor: default;
 }
 
 .nav-tabs {
-  border-bottom: 1px solid #dee2e6;
+  border-bottom: 1px solid #6c757d;
 }
-
 .nav-tabs .nav-item {
   margin-bottom: -1px;
 }
-
 .nav-tabs .nav-link {
   border: 1px solid transparent;
-  border-top-left-radius: 0.25rem;
-  border-top-right-radius: 0.25rem;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
 }
-
 .nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus {
-  border-color: #e9ecef #e9ecef #dee2e6;
+  border-color: transparent;
 }
-
 .nav-tabs .nav-link.disabled {
-  color: #6c757d;
+  color: #d6dbdf;
   background-color: transparent;
   border-color: transparent;
 }
-
 .nav-tabs .nav-link.active,
 .nav-tabs .nav-item.show .nav-link {
-  color: #495057;
+  color: #257af4;
   background-color: #fff;
-  border-color: #dee2e6 #dee2e6 #fff;
+  border-color: #6c757d;
 }
-
 .nav-tabs .dropdown-menu {
   margin-top: -1px;
   border-top-left-radius: 0;
@@ -4273,25 +5369,21 @@ input[type="button"].btn-block {
 }
 
 .nav-pills .nav-link {
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
-
 .nav-pills .nav-link.active,
 .nav-pills .show > .nav-link {
   color: #fff;
-  background-color: #007bff;
+  background-color: #ffcc00;
 }
 
 .nav-fill .nav-item {
-  -ms-flex: 1 1 auto;
   flex: 1 1 auto;
   text-align: center;
 }
 
 .nav-justified .nav-item {
-  -ms-flex-preferred-size: 0;
   flex-basis: 0;
-  -ms-flex-positive: 1;
   flex-grow: 1;
   text-align: center;
 }
@@ -4299,65 +5391,54 @@ input[type="button"].btn-block {
 .tab-content > .tab-pane {
   display: none;
 }
-
 .tab-content > .active {
   display: block;
 }
 
 .navbar {
   position: relative;
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
-  -ms-flex-align: center;
   align-items: center;
-  -ms-flex-pack: justify;
   justify-content: space-between;
-  padding: 0.5rem 1rem;
+  padding: 24px 0;
 }
-
 .navbar .container,
-.navbar .container-fluid, .navbar .container-sm, .navbar .container-md, .navbar .container-lg, .navbar .container-xl {
-  display: -ms-flexbox;
+.navbar .container-fluid,
+.navbar .container-xs,
+.navbar .container-sm,
+.navbar .container-md,
+.navbar .container-lg,
+.navbar .container-xl {
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
-  -ms-flex-align: center;
   align-items: center;
-  -ms-flex-pack: justify;
   justify-content: space-between;
 }
-
 .navbar-brand {
   display: inline-block;
-  padding-top: 0.3125rem;
-  padding-bottom: 0.3125rem;
-  margin-right: 1rem;
-  font-size: 1.25rem;
+  padding-top: -0.09375rem;
+  padding-bottom: -0.09375rem;
+  margin-right: 0;
+  font-size: 1.125rem;
   line-height: inherit;
   white-space: nowrap;
 }
-
 .navbar-brand:hover, .navbar-brand:focus {
   text-decoration: none;
 }
 
 .navbar-nav {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-direction: column;
   flex-direction: column;
   padding-left: 0;
   margin-bottom: 0;
   list-style: none;
 }
-
 .navbar-nav .nav-link {
   padding-right: 0;
   padding-left: 0;
 }
-
 .navbar-nav .dropdown-menu {
   position: static;
   float: none;
@@ -4365,28 +5446,24 @@ input[type="button"].btn-block {
 
 .navbar-text {
   display: inline-block;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
+  padding-top: 0;
+  padding-bottom: 0;
 }
 
 .navbar-collapse {
-  -ms-flex-preferred-size: 100%;
   flex-basis: 100%;
-  -ms-flex-positive: 1;
   flex-grow: 1;
-  -ms-flex-align: center;
   align-items: center;
 }
 
 .navbar-toggler {
   padding: 0.25rem 0.75rem;
-  font-size: 1.25rem;
+  font-size: 1.125rem;
   line-height: 1;
   background-color: transparent;
   border: 1px solid transparent;
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
-
 .navbar-toggler:hover, .navbar-toggler:focus {
   text-decoration: none;
 }
@@ -4401,23 +5478,68 @@ input[type="button"].btn-block {
   background-size: 100% 100%;
 }
 
-@media (max-width: 575.98px) {
-  .navbar-expand-sm > .container,
-  .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {
+@media (max-width: 399.98px) {
+  .navbar-expand-xs > .container,
+.navbar-expand-xs > .container-fluid,
+.navbar-expand-xs > .container-xs,
+.navbar-expand-xs > .container-sm,
+.navbar-expand-xs > .container-md,
+.navbar-expand-xs > .container-lg,
+.navbar-expand-xs > .container-xl {
     padding-right: 0;
     padding-left: 0;
   }
 }
-
-@media (min-width: 576px) {
-  .navbar-expand-sm {
-    -ms-flex-flow: row nowrap;
+@media (min-width: 400px) {
+  .navbar-expand-xs {
+    flex-flow: row nowrap;
+    justify-content: flex-start;
+  }
+  .navbar-expand-xs .navbar-nav {
+    flex-direction: row;
+  }
+  .navbar-expand-xs .navbar-nav .dropdown-menu {
+    position: absolute;
+  }
+  .navbar-expand-xs .navbar-nav .nav-link {
+    padding-right: 0.5rem;
+    padding-left: 0.5rem;
+  }
+  .navbar-expand-xs > .container,
+.navbar-expand-xs > .container-fluid,
+.navbar-expand-xs > .container-xs,
+.navbar-expand-xs > .container-sm,
+.navbar-expand-xs > .container-md,
+.navbar-expand-xs > .container-lg,
+.navbar-expand-xs > .container-xl {
+    flex-wrap: nowrap;
+  }
+  .navbar-expand-xs .navbar-collapse {
+    display: flex !important;
+    flex-basis: auto;
+  }
+  .navbar-expand-xs .navbar-toggler {
+    display: none;
+  }
+}
+@media (max-width: 615.98px) {
+  .navbar-expand-sm > .container,
+.navbar-expand-sm > .container-fluid,
+.navbar-expand-sm > .container-xs,
+.navbar-expand-sm > .container-sm,
+.navbar-expand-sm > .container-md,
+.navbar-expand-sm > .container-lg,
+.navbar-expand-sm > .container-xl {
+    padding-right: 0;
+    padding-left: 0;
+  }
+}
+@media (min-width: 616px) {
+  .navbar-expand-sm {
     flex-flow: row nowrap;
-    -ms-flex-pack: start;
     justify-content: flex-start;
   }
   .navbar-expand-sm .navbar-nav {
-    -ms-flex-direction: row;
     flex-direction: row;
   }
   .navbar-expand-sm .navbar-nav .dropdown-menu {
@@ -4428,38 +5550,40 @@ input[type="button"].btn-block {
     padding-left: 0.5rem;
   }
   .navbar-expand-sm > .container,
-  .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {
-    -ms-flex-wrap: nowrap;
+.navbar-expand-sm > .container-fluid,
+.navbar-expand-sm > .container-xs,
+.navbar-expand-sm > .container-sm,
+.navbar-expand-sm > .container-md,
+.navbar-expand-sm > .container-lg,
+.navbar-expand-sm > .container-xl {
     flex-wrap: nowrap;
   }
   .navbar-expand-sm .navbar-collapse {
-    display: -ms-flexbox !important;
     display: flex !important;
-    -ms-flex-preferred-size: auto;
     flex-basis: auto;
   }
   .navbar-expand-sm .navbar-toggler {
     display: none;
   }
 }
-
 @media (max-width: 767.98px) {
   .navbar-expand-md > .container,
-  .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {
+.navbar-expand-md > .container-fluid,
+.navbar-expand-md > .container-xs,
+.navbar-expand-md > .container-sm,
+.navbar-expand-md > .container-md,
+.navbar-expand-md > .container-lg,
+.navbar-expand-md > .container-xl {
     padding-right: 0;
     padding-left: 0;
   }
 }
-
 @media (min-width: 768px) {
   .navbar-expand-md {
-    -ms-flex-flow: row nowrap;
     flex-flow: row nowrap;
-    -ms-flex-pack: start;
     justify-content: flex-start;
   }
   .navbar-expand-md .navbar-nav {
-    -ms-flex-direction: row;
     flex-direction: row;
   }
   .navbar-expand-md .navbar-nav .dropdown-menu {
@@ -4470,38 +5594,40 @@ input[type="button"].btn-block {
     padding-left: 0.5rem;
   }
   .navbar-expand-md > .container,
-  .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {
-    -ms-flex-wrap: nowrap;
+.navbar-expand-md > .container-fluid,
+.navbar-expand-md > .container-xs,
+.navbar-expand-md > .container-sm,
+.navbar-expand-md > .container-md,
+.navbar-expand-md > .container-lg,
+.navbar-expand-md > .container-xl {
     flex-wrap: nowrap;
   }
   .navbar-expand-md .navbar-collapse {
-    display: -ms-flexbox !important;
     display: flex !important;
-    -ms-flex-preferred-size: auto;
     flex-basis: auto;
   }
   .navbar-expand-md .navbar-toggler {
     display: none;
   }
 }
-
-@media (max-width: 991.98px) {
+@media (max-width: 979.98px) {
   .navbar-expand-lg > .container,
-  .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {
+.navbar-expand-lg > .container-fluid,
+.navbar-expand-lg > .container-xs,
+.navbar-expand-lg > .container-sm,
+.navbar-expand-lg > .container-md,
+.navbar-expand-lg > .container-lg,
+.navbar-expand-lg > .container-xl {
     padding-right: 0;
     padding-left: 0;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .navbar-expand-lg {
-    -ms-flex-flow: row nowrap;
     flex-flow: row nowrap;
-    -ms-flex-pack: start;
     justify-content: flex-start;
   }
   .navbar-expand-lg .navbar-nav {
-    -ms-flex-direction: row;
     flex-direction: row;
   }
   .navbar-expand-lg .navbar-nav .dropdown-menu {
@@ -4512,38 +5638,40 @@ input[type="button"].btn-block {
     padding-left: 0.5rem;
   }
   .navbar-expand-lg > .container,
-  .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {
-    -ms-flex-wrap: nowrap;
+.navbar-expand-lg > .container-fluid,
+.navbar-expand-lg > .container-xs,
+.navbar-expand-lg > .container-sm,
+.navbar-expand-lg > .container-md,
+.navbar-expand-lg > .container-lg,
+.navbar-expand-lg > .container-xl {
     flex-wrap: nowrap;
   }
   .navbar-expand-lg .navbar-collapse {
-    display: -ms-flexbox !important;
     display: flex !important;
-    -ms-flex-preferred-size: auto;
     flex-basis: auto;
   }
   .navbar-expand-lg .navbar-toggler {
     display: none;
   }
 }
-
-@media (max-width: 1199.98px) {
+@media (max-width: 1239.98px) {
   .navbar-expand-xl > .container,
-  .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {
+.navbar-expand-xl > .container-fluid,
+.navbar-expand-xl > .container-xs,
+.navbar-expand-xl > .container-sm,
+.navbar-expand-xl > .container-md,
+.navbar-expand-xl > .container-lg,
+.navbar-expand-xl > .container-xl {
     padding-right: 0;
     padding-left: 0;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .navbar-expand-xl {
-    -ms-flex-flow: row nowrap;
     flex-flow: row nowrap;
-    -ms-flex-pack: start;
     justify-content: flex-start;
   }
   .navbar-expand-xl .navbar-nav {
-    -ms-flex-direction: row;
     flex-direction: row;
   }
   .navbar-expand-xl .navbar-nav .dropdown-menu {
@@ -4554,203 +5682,175 @@ input[type="button"].btn-block {
     padding-left: 0.5rem;
   }
   .navbar-expand-xl > .container,
-  .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {
-    -ms-flex-wrap: nowrap;
+.navbar-expand-xl > .container-fluid,
+.navbar-expand-xl > .container-xs,
+.navbar-expand-xl > .container-sm,
+.navbar-expand-xl > .container-md,
+.navbar-expand-xl > .container-lg,
+.navbar-expand-xl > .container-xl {
     flex-wrap: nowrap;
   }
   .navbar-expand-xl .navbar-collapse {
-    display: -ms-flexbox !important;
     display: flex !important;
-    -ms-flex-preferred-size: auto;
     flex-basis: auto;
   }
   .navbar-expand-xl .navbar-toggler {
     display: none;
   }
 }
-
 .navbar-expand {
-  -ms-flex-flow: row nowrap;
   flex-flow: row nowrap;
-  -ms-flex-pack: start;
   justify-content: flex-start;
 }
-
 .navbar-expand > .container,
-.navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {
+.navbar-expand > .container-fluid,
+.navbar-expand > .container-xs,
+.navbar-expand > .container-sm,
+.navbar-expand > .container-md,
+.navbar-expand > .container-lg,
+.navbar-expand > .container-xl {
   padding-right: 0;
   padding-left: 0;
 }
-
 .navbar-expand .navbar-nav {
-  -ms-flex-direction: row;
   flex-direction: row;
 }
-
 .navbar-expand .navbar-nav .dropdown-menu {
   position: absolute;
 }
-
 .navbar-expand .navbar-nav .nav-link {
   padding-right: 0.5rem;
   padding-left: 0.5rem;
 }
-
 .navbar-expand > .container,
-.navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {
-  -ms-flex-wrap: nowrap;
+.navbar-expand > .container-fluid,
+.navbar-expand > .container-xs,
+.navbar-expand > .container-sm,
+.navbar-expand > .container-md,
+.navbar-expand > .container-lg,
+.navbar-expand > .container-xl {
   flex-wrap: nowrap;
 }
-
 .navbar-expand .navbar-collapse {
-  display: -ms-flexbox !important;
   display: flex !important;
-  -ms-flex-preferred-size: auto;
   flex-basis: auto;
 }
-
 .navbar-expand .navbar-toggler {
   display: none;
 }
 
 .navbar-light .navbar-brand {
-  color: rgba(0, 0, 0, 0.9);
+  color: rgba(33, 37, 41, 0.9);
 }
-
 .navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus {
-  color: rgba(0, 0, 0, 0.9);
+  color: rgba(33, 37, 41, 0.9);
 }
-
 .navbar-light .navbar-nav .nav-link {
-  color: rgba(0, 0, 0, 0.5);
+  color: rgba(33, 37, 41, 0.5);
 }
-
 .navbar-light .navbar-nav .nav-link:hover, .navbar-light .navbar-nav .nav-link:focus {
-  color: rgba(0, 0, 0, 0.7);
+  color: rgba(33, 37, 41, 0.7);
 }
-
 .navbar-light .navbar-nav .nav-link.disabled {
-  color: rgba(0, 0, 0, 0.3);
+  color: rgba(33, 37, 41, 0.3);
 }
-
 .navbar-light .navbar-nav .show > .nav-link,
 .navbar-light .navbar-nav .active > .nav-link,
 .navbar-light .navbar-nav .nav-link.show,
 .navbar-light .navbar-nav .nav-link.active {
-  color: rgba(0, 0, 0, 0.9);
+  color: rgba(33, 37, 41, 0.9);
 }
-
 .navbar-light .navbar-toggler {
-  color: rgba(0, 0, 0, 0.5);
-  border-color: rgba(0, 0, 0, 0.1);
+  color: rgba(33, 37, 41, 0.5);
+  border-color: rgba(33, 37, 41, 0.1);
 }
-
 .navbar-light .navbar-toggler-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(0, 0, 0, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(33, 37, 41, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
 }
-
 .navbar-light .navbar-text {
-  color: rgba(0, 0, 0, 0.5);
+  color: rgba(33, 37, 41, 0.5);
 }
-
 .navbar-light .navbar-text a {
-  color: rgba(0, 0, 0, 0.9);
+  color: rgba(33, 37, 41, 0.9);
 }
-
 .navbar-light .navbar-text a:hover, .navbar-light .navbar-text a:focus {
-  color: rgba(0, 0, 0, 0.9);
+  color: rgba(33, 37, 41, 0.9);
 }
 
 .navbar-dark .navbar-brand {
   color: #fff;
 }
-
 .navbar-dark .navbar-brand:hover, .navbar-dark .navbar-brand:focus {
   color: #fff;
 }
-
 .navbar-dark .navbar-nav .nav-link {
   color: rgba(255, 255, 255, 0.5);
 }
-
 .navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus {
   color: rgba(255, 255, 255, 0.75);
 }
-
 .navbar-dark .navbar-nav .nav-link.disabled {
   color: rgba(255, 255, 255, 0.25);
 }
-
 .navbar-dark .navbar-nav .show > .nav-link,
 .navbar-dark .navbar-nav .active > .nav-link,
 .navbar-dark .navbar-nav .nav-link.show,
 .navbar-dark .navbar-nav .nav-link.active {
   color: #fff;
 }
-
 .navbar-dark .navbar-toggler {
   color: rgba(255, 255, 255, 0.5);
   border-color: rgba(255, 255, 255, 0.1);
 }
-
 .navbar-dark .navbar-toggler-icon {
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
 }
-
 .navbar-dark .navbar-text {
   color: rgba(255, 255, 255, 0.5);
 }
-
 .navbar-dark .navbar-text a {
   color: #fff;
 }
-
 .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus {
   color: #fff;
 }
 
 .card {
   position: relative;
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-direction: column;
   flex-direction: column;
   min-width: 0;
   word-wrap: break-word;
   background-color: #fff;
   background-clip: border-box;
-  border: 1px solid rgba(0, 0, 0, 0.125);
-  border-radius: 0.25rem;
+  border: 1px solid #d6dbdf;
+  border-radius: 8px;
 }
-
 .card > hr {
   margin-right: 0;
   margin-left: 0;
 }
-
 .card > .list-group:first-child .list-group-item:first-child {
-  border-top-left-radius: 0.25rem;
-  border-top-right-radius: 0.25rem;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
 }
-
 .card > .list-group:last-child .list-group-item:last-child {
-  border-bottom-right-radius: 0.25rem;
-  border-bottom-left-radius: 0.25rem;
+  border-bottom-right-radius: 8px;
+  border-bottom-left-radius: 8px;
 }
 
 .card-body {
-  -ms-flex: 1 1 auto;
   flex: 1 1 auto;
   min-height: 1px;
-  padding: 1.25rem;
+  padding: 24px;
 }
 
 .card-title {
-  margin-bottom: 0.75rem;
+  margin-bottom: 24px;
 }
 
 .card-subtitle {
-  margin-top: -0.375rem;
+  margin-top: -12px;
   margin-bottom: 0;
 }
 
@@ -4761,46 +5861,42 @@ input[type="button"].btn-block {
 .card-link:hover {
   text-decoration: none;
 }
-
 .card-link + .card-link {
-  margin-left: 1.25rem;
+  margin-left: 24px;
 }
 
 .card-header {
-  padding: 0.75rem 1.25rem;
+  padding: 24px 24px;
   margin-bottom: 0;
-  background-color: rgba(0, 0, 0, 0.03);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  background-color: #f1f6f9;
+  border-bottom: 1px solid #d6dbdf;
 }
-
 .card-header:first-child {
-  border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
+  border-radius: subtract(8px, 1px) subtract(8px, 1px) 0 0;
 }
-
 .card-header + .list-group .list-group-item:first-child {
   border-top: 0;
 }
 
 .card-footer {
-  padding: 0.75rem 1.25rem;
-  background-color: rgba(0, 0, 0, 0.03);
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  padding: 24px 24px;
+  background-color: #f1f6f9;
+  border-top: 1px solid #d6dbdf;
 }
-
 .card-footer:last-child {
-  border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px);
+  border-radius: 0 0 subtract(8px, 1px) subtract(8px, 1px);
 }
 
 .card-header-tabs {
-  margin-right: -0.625rem;
-  margin-bottom: -0.75rem;
-  margin-left: -0.625rem;
+  margin-right: -12px;
+  margin-bottom: -24px;
+  margin-left: -12px;
   border-bottom: 0;
 }
 
 .card-header-pills {
-  margin-right: -0.625rem;
-  margin-left: -0.625rem;
+  margin-right: -12px;
+  margin-left: -12px;
 }
 
 .card-img-overlay {
@@ -4809,64 +5905,55 @@ input[type="button"].btn-block {
   right: 0;
   bottom: 0;
   left: 0;
-  padding: 1.25rem;
+  padding: 24px;
 }
 
 .card-img,
 .card-img-top,
 .card-img-bottom {
-  -ms-flex-negative: 0;
   flex-shrink: 0;
   width: 100%;
 }
 
 .card-img,
 .card-img-top {
-  border-top-left-radius: calc(0.25rem - 1px);
-  border-top-right-radius: calc(0.25rem - 1px);
+  border-top-left-radius: subtract(8px, 1px);
+  border-top-right-radius: subtract(8px, 1px);
 }
 
 .card-img,
 .card-img-bottom {
-  border-bottom-right-radius: calc(0.25rem - 1px);
-  border-bottom-left-radius: calc(0.25rem - 1px);
+  border-bottom-right-radius: subtract(8px, 1px);
+  border-bottom-left-radius: subtract(8px, 1px);
 }
 
 .card-deck .card {
-  margin-bottom: 15px;
+  margin-bottom: 20px;
 }
-
-@media (min-width: 576px) {
+@media (min-width: 616px) {
   .card-deck {
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex-flow: row wrap;
     flex-flow: row wrap;
-    margin-right: -15px;
-    margin-left: -15px;
+    margin-right: -20px;
+    margin-left: -20px;
   }
   .card-deck .card {
-    -ms-flex: 1 0 0%;
     flex: 1 0 0%;
-    margin-right: 15px;
+    margin-right: 20px;
     margin-bottom: 0;
-    margin-left: 15px;
+    margin-left: 20px;
   }
 }
 
 .card-group > .card {
-  margin-bottom: 15px;
+  margin-bottom: 20px;
 }
-
-@media (min-width: 576px) {
+@media (min-width: 616px) {
   .card-group {
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex-flow: row wrap;
     flex-flow: row wrap;
   }
   .card-group > .card {
-    -ms-flex: 1 0 0%;
     flex: 1 0 0%;
     margin-bottom: 0;
   }
@@ -4879,11 +5966,11 @@ input[type="button"].btn-block {
     border-bottom-right-radius: 0;
   }
   .card-group > .card:not(:last-child) .card-img-top,
-  .card-group > .card:not(:last-child) .card-header {
+.card-group > .card:not(:last-child) .card-header {
     border-top-right-radius: 0;
   }
   .card-group > .card:not(:last-child) .card-img-bottom,
-  .card-group > .card:not(:last-child) .card-footer {
+.card-group > .card:not(:last-child) .card-footer {
     border-bottom-right-radius: 0;
   }
   .card-group > .card:not(:first-child) {
@@ -4891,27 +5978,24 @@ input[type="button"].btn-block {
     border-bottom-left-radius: 0;
   }
   .card-group > .card:not(:first-child) .card-img-top,
-  .card-group > .card:not(:first-child) .card-header {
+.card-group > .card:not(:first-child) .card-header {
     border-top-left-radius: 0;
   }
   .card-group > .card:not(:first-child) .card-img-bottom,
-  .card-group > .card:not(:first-child) .card-footer {
+.card-group > .card:not(:first-child) .card-footer {
     border-bottom-left-radius: 0;
   }
 }
 
 .card-columns .card {
-  margin-bottom: 0.75rem;
+  margin-bottom: 40px;
 }
-
-@media (min-width: 576px) {
+@media (min-width: 616px) {
   .card-columns {
-    -webkit-column-count: 3;
     -moz-column-count: 3;
-    column-count: 3;
-    -webkit-column-gap: 1.25rem;
-    -moz-column-gap: 1.25rem;
-    column-gap: 1.25rem;
+         column-count: 3;
+    -moz-column-gap: 40px;
+         column-gap: 40px;
     orphans: 1;
     widows: 1;
   }
@@ -4924,64 +6008,54 @@ input[type="button"].btn-block {
 .accordion > .card {
   overflow: hidden;
 }
-
 .accordion > .card:not(:last-of-type) {
   border-bottom: 0;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-
 .accordion > .card:not(:first-of-type) {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
-
 .accordion > .card > .card-header {
   border-radius: 0;
   margin-bottom: -1px;
 }
 
 .breadcrumb {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
   padding: 0.75rem 1rem;
   margin-bottom: 1rem;
   list-style: none;
   background-color: #e9ecef;
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
 
 .breadcrumb-item + .breadcrumb-item {
   padding-left: 0.5rem;
 }
-
 .breadcrumb-item + .breadcrumb-item::before {
   display: inline-block;
   padding-right: 0.5rem;
   color: #6c757d;
   content: "/";
 }
-
 .breadcrumb-item + .breadcrumb-item:hover::before {
   text-decoration: underline;
 }
-
 .breadcrumb-item + .breadcrumb-item:hover::before {
   text-decoration: none;
 }
-
 .breadcrumb-item.active {
   color: #6c757d;
 }
 
 .pagination {
-  display: -ms-flexbox;
   display: flex;
   padding-left: 0;
   list-style: none;
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
 
 .page-link {
@@ -4990,43 +6064,38 @@ input[type="button"].btn-block {
   padding: 0.5rem 0.75rem;
   margin-left: -1px;
   line-height: 1.25;
-  color: #007bff;
+  color: #ff8c00;
   background-color: #fff;
   border: 1px solid #dee2e6;
 }
-
 .page-link:hover {
   z-index: 2;
-  color: #0056b3;
+  color: #ff8c00;
   text-decoration: none;
   background-color: #e9ecef;
   border-color: #dee2e6;
 }
-
 .page-link:focus {
   z-index: 3;
   outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+  box-shadow: 0 0 0 0.2rem rgba(255, 204, 0, 0.25);
 }
 
 .page-item:first-child .page-link {
   margin-left: 0;
-  border-top-left-radius: 0.25rem;
-  border-bottom-left-radius: 0.25rem;
+  border-top-left-radius: 8px;
+  border-bottom-left-radius: 8px;
 }
-
 .page-item:last-child .page-link {
-  border-top-right-radius: 0.25rem;
-  border-bottom-right-radius: 0.25rem;
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
 }
-
 .page-item.active .page-link {
   z-index: 3;
   color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
 }
-
 .page-item.disabled .page-link {
   color: #6c757d;
   pointer-events: none;
@@ -5037,18 +6106,16 @@ input[type="button"].btn-block {
 
 .pagination-lg .page-link {
   padding: 0.75rem 1.5rem;
-  font-size: 1.25rem;
+  font-size: 1.125rem;
   line-height: 1.5;
 }
-
 .pagination-lg .page-item:first-child .page-link {
-  border-top-left-radius: 0.3rem;
-  border-bottom-left-radius: 0.3rem;
+  border-top-left-radius: 8px;
+  border-bottom-left-radius: 8px;
 }
-
 .pagination-lg .page-item:last-child .page-link {
-  border-top-right-radius: 0.3rem;
-  border-bottom-right-radius: 0.3rem;
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
 }
 
 .pagination-sm .page-link {
@@ -5056,15 +6123,13 @@ input[type="button"].btn-block {
   font-size: 0.875rem;
   line-height: 1.5;
 }
-
 .pagination-sm .page-item:first-child .page-link {
-  border-top-left-radius: 0.2rem;
-  border-bottom-left-radius: 0.2rem;
+  border-top-left-radius: 8px;
+  border-bottom-left-radius: 8px;
 }
-
 .pagination-sm .page-item:last-child .page-link {
-  border-top-right-radius: 0.2rem;
-  border-bottom-right-radius: 0.2rem;
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
 }
 
 .badge {
@@ -5076,15 +6141,14 @@ input[type="button"].btn-block {
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
-  border-radius: 0.25rem;
+  border-radius: 8px;
+  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .badge {
     transition: none;
   }
 }
-
 a.badge:hover, a.badge:focus {
   text-decoration: none;
 }
@@ -5105,45 +6169,39 @@ a.badge:hover, a.badge:focus {
 }
 
 .badge-primary {
-  color: #fff;
-  background-color: #007bff;
+  color: #495057;
+  background-color: #ffcc00;
 }
-
 a.badge-primary:hover, a.badge-primary:focus {
-  color: #fff;
-  background-color: #0062cc;
+  color: #495057;
+  background-color: #cca300;
 }
-
 a.badge-primary:focus, a.badge-primary.focus {
   outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(255, 204, 0, 0.5);
 }
 
 .badge-secondary {
   color: #fff;
-  background-color: #6c757d;
+  background-color: #212529;
 }
-
 a.badge-secondary:hover, a.badge-secondary:focus {
   color: #fff;
-  background-color: #545b62;
+  background-color: #0a0c0d;
 }
-
 a.badge-secondary:focus, a.badge-secondary.focus {
   outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(33, 37, 41, 0.5);
 }
 
 .badge-success {
   color: #fff;
   background-color: #28a745;
 }
-
 a.badge-success:hover, a.badge-success:focus {
   color: #fff;
   background-color: #1e7e34;
 }
-
 a.badge-success:focus, a.badge-success.focus {
   outline: 0;
   box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
@@ -5153,27 +6211,23 @@ a.badge-success:focus, a.badge-success.focus {
   color: #fff;
   background-color: #17a2b8;
 }
-
 a.badge-info:hover, a.badge-info:focus {
   color: #fff;
   background-color: #117a8b;
 }
-
 a.badge-info:focus, a.badge-info.focus {
   outline: 0;
   box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
 }
 
 .badge-warning {
-  color: #212529;
+  color: #495057;
   background-color: #ffc107;
 }
-
 a.badge-warning:hover, a.badge-warning:focus {
-  color: #212529;
+  color: #495057;
   background-color: #d39e00;
 }
-
 a.badge-warning:focus, a.badge-warning.focus {
   outline: 0;
   box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
@@ -5183,55 +6237,243 @@ a.badge-warning:focus, a.badge-warning.focus {
   color: #fff;
   background-color: #dc3545;
 }
-
 a.badge-danger:hover, a.badge-danger:focus {
   color: #fff;
   background-color: #bd2130;
 }
-
 a.badge-danger:focus, a.badge-danger.focus {
   outline: 0;
   box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
 }
 
 .badge-light {
-  color: #212529;
-  background-color: #f8f9fa;
+  color: #495057;
+  background-color: #f1f6f9;
 }
-
 a.badge-light:hover, a.badge-light:focus {
-  color: #212529;
-  background-color: #dae0e5;
+  color: #495057;
+  background-color: #cddfea;
 }
-
 a.badge-light:focus, a.badge-light.focus {
   outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(241, 246, 249, 0.5);
 }
 
 .badge-dark {
   color: #fff;
-  background-color: #343a40;
+  background-color: #495057;
 }
-
 a.badge-dark:hover, a.badge-dark:focus {
   color: #fff;
-  background-color: #1d2124;
+  background-color: #32373b;
 }
-
 a.badge-dark:focus, a.badge-dark.focus {
   outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+  box-shadow: 0 0 0 0.2rem rgba(73, 80, 87, 0.5);
+}
+
+.badge-primary-light {
+  color: #495057;
+  background-color: #fffaf0;
+}
+a.badge-primary-light:hover, a.badge-primary-light:focus {
+  color: #495057;
+  background-color: #ffe9bd;
+}
+a.badge-primary-light:focus, a.badge-primary-light.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 250, 240, 0.5);
+}
+
+.badge-secondary-light {
+  color: #495057;
+  background-color: #fff;
+}
+a.badge-secondary-light:hover, a.badge-secondary-light:focus {
+  color: #495057;
+  background-color: #e6e6e6;
+}
+a.badge-secondary-light:focus, a.badge-secondary-light.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 255, 255, 0.5);
+}
+
+.badge-tertiary {
+  color: #fff;
+  background-color: #257af4;
+}
+a.badge-tertiary:hover, a.badge-tertiary:focus {
+  color: #fff;
+  background-color: #0b60db;
+}
+a.badge-tertiary:focus, a.badge-tertiary.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(37, 122, 244, 0.5);
+}
+
+.badge-tertiary-light {
+  color: #495057;
+  background-color: #e3f1fe;
+}
+a.badge-tertiary-light:hover, a.badge-tertiary-light:focus {
+  color: #495057;
+  background-color: #b2d8fc;
+}
+a.badge-tertiary-light:focus, a.badge-tertiary-light.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(227, 241, 254, 0.5);
+}
+
+.badge-white {
+  color: #495057;
+  background-color: #fff;
+}
+a.badge-white:hover, a.badge-white:focus {
+  color: #495057;
+  background-color: #e6e6e6;
+}
+a.badge-white:focus, a.badge-white.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 255, 255, 0.5);
+}
+
+.badge-black {
+  color: #fff;
+  background-color: #212529;
+}
+a.badge-black:hover, a.badge-black:focus {
+  color: #fff;
+  background-color: #0a0c0d;
+}
+a.badge-black:focus, a.badge-black.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(33, 37, 41, 0.5);
+}
+
+.badge-blue {
+  color: #fff;
+  background-color: #257af4;
+}
+a.badge-blue:hover, a.badge-blue:focus {
+  color: #fff;
+  background-color: #0b60db;
+}
+a.badge-blue:focus, a.badge-blue.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(37, 122, 244, 0.5);
+}
+
+.badge-light-blue {
+  color: #495057;
+  background-color: #e3f1fe;
+}
+a.badge-light-blue:hover, a.badge-light-blue:focus {
+  color: #495057;
+  background-color: #b2d8fc;
+}
+a.badge-light-blue:focus, a.badge-light-blue.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(227, 241, 254, 0.5);
+}
+
+.badge-yellow {
+  color: #495057;
+  background-color: #ffcc00;
+}
+a.badge-yellow:hover, a.badge-yellow:focus {
+  color: #495057;
+  background-color: #cca300;
+}
+a.badge-yellow:focus, a.badge-yellow.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 204, 0, 0.5);
+}
+
+.badge-light-yellow {
+  color: #495057;
+  background-color: #fffaf0;
+}
+a.badge-light-yellow:hover, a.badge-light-yellow:focus {
+  color: #495057;
+  background-color: #ffe9bd;
+}
+a.badge-light-yellow:focus, a.badge-light-yellow.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 250, 240, 0.5);
+}
+
+.badge-orange {
+  color: #495057;
+  background-color: #ff8c00;
+}
+a.badge-orange:hover, a.badge-orange:focus {
+  color: #495057;
+  background-color: #cc7000;
+}
+a.badge-orange:focus, a.badge-orange.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 140, 0, 0.5);
+}
+
+.badge-light-orange {
+  color: #495057;
+  background-color: #ffe4b5;
+}
+a.badge-light-orange:hover, a.badge-light-orange:focus {
+  color: #495057;
+  background-color: #ffd182;
+}
+a.badge-light-orange:focus, a.badge-light-orange.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 228, 181, 0.5);
+}
+
+.badge-red {
+  color: #fff;
+  background-color: #ff3939;
+}
+a.badge-red:hover, a.badge-red:focus {
+  color: #fff;
+  background-color: #ff0606;
+}
+a.badge-red:focus, a.badge-red.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 57, 57, 0.5);
+}
+
+.badge-light-red {
+  color: #495057;
+  background-color: #ffe4e1;
+}
+a.badge-light-red:hover, a.badge-light-red:focus {
+  color: #495057;
+  background-color: #ffb6ae;
+}
+a.badge-light-red:focus, a.badge-light-red.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(255, 228, 225, 0.5);
+}
+
+.badge-medium {
+  color: #495057;
+  background-color: #d6dbdf;
+}
+a.badge-medium:hover, a.badge-medium:focus {
+  color: #495057;
+  background-color: #b9c2c9;
+}
+a.badge-medium:focus, a.badge-medium.focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.2rem rgba(214, 219, 223, 0.5);
 }
 
 .jumbotron {
   padding: 2rem 1rem;
   margin-bottom: 2rem;
   background-color: #e9ecef;
-  border-radius: 0.3rem;
+  border-radius: 8px;
 }
-
-@media (min-width: 576px) {
+@media (min-width: 616px) {
   .jumbotron {
     padding: 4rem 2rem;
   }
@@ -5248,7 +6490,7 @@ a.badge-dark:focus, a.badge-dark.focus {
   padding: 0.75rem 1.25rem;
   margin-bottom: 1rem;
   border: 1px solid transparent;
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
 
 .alert-heading {
@@ -5262,7 +6504,6 @@ a.badge-dark:focus, a.badge-dark.focus {
 .alert-dismissible {
   padding-right: 4rem;
 }
-
 .alert-dismissible .close {
   position: absolute;
   top: 0;
@@ -5272,115 +6513,279 @@ a.badge-dark:focus, a.badge-dark.focus {
 }
 
 .alert-primary {
-  color: #004085;
-  background-color: #cce5ff;
-  border-color: #b8daff;
+  color: #947c14;
+  background-color: #fff5cc;
+  border-color: #fff1b8;
 }
-
 .alert-primary hr {
-  border-top-color: #9fcdff;
+  border-top-color: #ffec9f;
 }
-
 .alert-primary .alert-link {
-  color: #002752;
+  color: #67560e;
 }
 
 .alert-secondary {
-  color: #383d41;
-  background-color: #e2e3e5;
-  border-color: #d6d8db;
+  color: #212529;
+  background-color: #d3d3d4;
+  border-color: #c1c2c3;
 }
-
 .alert-secondary hr {
-  border-top-color: #c8cbcf;
+  border-top-color: #b4b5b6;
 }
-
 .alert-secondary .alert-link {
-  color: #202326;
+  color: #0a0c0d;
 }
 
 .alert-success {
-  color: #155724;
+  color: #256938;
   background-color: #d4edda;
   border-color: #c3e6cb;
 }
-
 .alert-success hr {
   border-top-color: #b1dfbb;
 }
-
 .alert-success .alert-link {
-  color: #0b2e13;
+  color: #184324;
 }
 
 .alert-info {
-  color: #0c5460;
+  color: #1c6673;
   background-color: #d1ecf1;
   border-color: #bee5eb;
 }
-
 .alert-info hr {
   border-top-color: #abdde5;
 }
-
 .alert-info .alert-link {
-  color: #062c33;
+  color: #12424a;
 }
 
 .alert-warning {
-  color: #856404;
+  color: #947617;
   background-color: #fff3cd;
   border-color: #ffeeba;
 }
-
 .alert-warning hr {
   border-top-color: #ffe8a1;
 }
-
 .alert-warning .alert-link {
-  color: #533f03;
+  color: #685310;
 }
 
 .alert-danger {
-  color: #721c24;
+  color: #822d38;
   background-color: #f8d7da;
   border-color: #f5c6cb;
 }
-
 .alert-danger hr {
   border-top-color: #f1b0b7;
 }
-
 .alert-danger .alert-link {
-  color: #491217;
+  color: #5c2028;
 }
 
 .alert-light {
-  color: #818182;
-  background-color: #fefefe;
-  border-color: #fdfdfe;
+  color: #8d9295;
+  background-color: #fcfdfe;
+  border-color: #fbfcfd;
 }
-
 .alert-light hr {
-  border-top-color: #ececf6;
+  border-top-color: #eaeff5;
 }
-
 .alert-light .alert-link {
-  color: #686868;
+  color: #73797c;
 }
 
 .alert-dark {
-  color: #1b1e21;
-  background-color: #d6d8d9;
-  border-color: #c6c8ca;
+  color: #363b41;
+  background-color: #dbdcdd;
+  border-color: #ccced0;
 }
-
 .alert-dark hr {
-  border-top-color: #b9bbbe;
+  border-top-color: #bfc1c4;
+}
+.alert-dark .alert-link {
+  color: #1f2225;
 }
 
-.alert-dark .alert-link {
-  color: #040505;
+.alert-primary-light {
+  color: #949490;
+  background-color: #fffefc;
+  border-color: #fffefb;
+}
+.alert-primary-light hr {
+  border-top-color: #fff8e2;
+}
+.alert-primary-light .alert-link {
+  color: #7b7b76;
+}
+
+.alert-secondary-light {
+  color: #949698;
+  background-color: white;
+  border-color: white;
+}
+.alert-secondary-light hr {
+  border-top-color: #f2f2f2;
+}
+.alert-secondary-light .alert-link {
+  color: #7a7d7f;
+}
+
+.alert-tertiary {
+  color: #235193;
+  background-color: #d3e4fd;
+  border-color: #c2dafc;
+}
+.alert-tertiary hr {
+  border-top-color: #aacbfb;
+}
+.alert-tertiary .alert-link {
+  color: #193a6a;
+}
+
+.alert-tertiary-light {
+  color: #868f98;
+  background-color: #f9fcff;
+  border-color: #f7fbff;
+}
+.alert-tertiary-light hr {
+  border-top-color: #deeeff;
+}
+.alert-tertiary-light .alert-link {
+  color: #6c767f;
+}
+
+.alert-white {
+  color: #949698;
+  background-color: white;
+  border-color: white;
+}
+.alert-white hr {
+  border-top-color: #f2f2f2;
+}
+.alert-white .alert-link {
+  color: #7a7d7f;
+}
+
+.alert-black {
+  color: #212529;
+  background-color: #d3d3d4;
+  border-color: #c1c2c3;
+}
+.alert-black hr {
+  border-top-color: #b4b5b6;
+}
+.alert-black .alert-link {
+  color: #0a0c0d;
+}
+
+.alert-blue {
+  color: #235193;
+  background-color: #d3e4fd;
+  border-color: #c2dafc;
+}
+.alert-blue hr {
+  border-top-color: #aacbfb;
+}
+.alert-blue .alert-link {
+  color: #193a6a;
+}
+
+.alert-light-blue {
+  color: #868f98;
+  background-color: #f9fcff;
+  border-color: #f7fbff;
+}
+.alert-light-blue hr {
+  border-top-color: #deeeff;
+}
+.alert-light-blue .alert-link {
+  color: #6c767f;
+}
+
+.alert-yellow {
+  color: #947c14;
+  background-color: #fff5cc;
+  border-color: #fff1b8;
+}
+.alert-yellow hr {
+  border-top-color: #ffec9f;
+}
+.alert-yellow .alert-link {
+  color: #67560e;
+}
+
+.alert-light-yellow {
+  color: #949490;
+  background-color: #fffefc;
+  border-color: #fffefb;
+}
+.alert-light-yellow hr {
+  border-top-color: #fff8e2;
+}
+.alert-light-yellow .alert-link {
+  color: #7b7b76;
+}
+
+.alert-orange {
+  color: #945b14;
+  background-color: #ffe8cc;
+  border-color: #ffdfb8;
+}
+.alert-orange hr {
+  border-top-color: #ffd49f;
+}
+.alert-orange .alert-link {
+  color: #673f0e;
+}
+
+.alert-light-orange {
+  color: #948872;
+  background-color: floralwhite;
+  border-color: #fff7ea;
+}
+.alert-light-orange hr {
+  border-top-color: #ffedd1;
+}
+.alert-light-orange .alert-link {
+  color: #786e5b;
+}
+
+.alert-red {
+  color: #942f31;
+  background-color: #ffd7d7;
+  border-color: #ffc8c8;
+}
+.alert-red hr {
+  border-top-color: #ffafaf;
+}
+.alert-red .alert-link {
+  color: #6d2324;
+}
+
+.alert-light-red {
+  color: #948889;
+  background-color: #fffaf9;
+  border-color: #fff7f7;
+}
+.alert-light-red hr {
+  border-top-color: #ffdede;
+}
+.alert-light-red .alert-link {
+  color: #7b6e6f;
+}
+
+.alert-medium {
+  color: #7f8488;
+  background-color: #f7f8f9;
+  border-color: #f4f5f6;
+}
+.alert-medium hr {
+  border-top-color: #e6e8eb;
+}
+.alert-medium .alert-link {
+  color: #666a6e;
 }
 
 @-webkit-keyframes progress-bar-stripes {
@@ -5400,31 +6805,26 @@ a.badge-dark:focus, a.badge-dark.focus {
     background-position: 0 0;
   }
 }
-
 .progress {
-  display: -ms-flexbox;
   display: flex;
   height: 1rem;
   overflow: hidden;
   font-size: 0.75rem;
   background-color: #e9ecef;
-  border-radius: 0.25rem;
+  border-radius: 8px;
 }
 
 .progress-bar {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-direction: column;
   flex-direction: column;
-  -ms-flex-pack: center;
   justify-content: center;
   overflow: hidden;
   color: #fff;
   text-align: center;
   white-space: nowrap;
-  background-color: #007bff;
+  background-color: #ffcc00;
+  transition: width 0.6s ease;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .progress-bar {
     transition: none;
@@ -5438,32 +6838,26 @@ a.badge-dark:focus, a.badge-dark.focus {
 
 .progress-bar-animated {
   -webkit-animation: progress-bar-stripes 1s linear infinite;
-  animation: progress-bar-stripes 1s linear infinite;
+          animation: progress-bar-stripes 1s linear infinite;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .progress-bar-animated {
     -webkit-animation: none;
-    animation: none;
+            animation: none;
   }
 }
 
 .media {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-align: start;
   align-items: flex-start;
 }
 
 .media-body {
-  -ms-flex: 1;
   flex: 1;
 }
 
 .list-group {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-direction: column;
   flex-direction: column;
   padding-left: 0;
   margin-bottom: 0;
@@ -5471,17 +6865,15 @@ a.badge-dark:focus, a.badge-dark.focus {
 
 .list-group-item-action {
   width: 100%;
-  color: #495057;
+  color: #6c757d;
   text-align: inherit;
 }
-
 .list-group-item-action:hover, .list-group-item-action:focus {
   z-index: 1;
-  color: #495057;
+  color: #6c757d;
   text-decoration: none;
-  background-color: #f8f9fa;
+  background-color: #f1f6f9;
 }
-
 .list-group-item-action:active {
   color: #212529;
   background-color: #e9ecef;
@@ -5492,81 +6884,92 @@ a.badge-dark:focus, a.badge-dark.focus {
   display: block;
   padding: 0.75rem 1.25rem;
   background-color: #fff;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid rgba(33, 37, 41, 0.125);
 }
-
 .list-group-item:first-child {
-  border-top-left-radius: 0.25rem;
-  border-top-right-radius: 0.25rem;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
 }
-
 .list-group-item:last-child {
-  border-bottom-right-radius: 0.25rem;
-  border-bottom-left-radius: 0.25rem;
+  border-bottom-right-radius: 8px;
+  border-bottom-left-radius: 8px;
 }
-
 .list-group-item.disabled, .list-group-item:disabled {
   color: #6c757d;
   pointer-events: none;
   background-color: #fff;
 }
-
 .list-group-item.active {
   z-index: 2;
   color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
+  background-color: #ffcc00;
+  border-color: #ffcc00;
 }
-
 .list-group-item + .list-group-item {
   border-top-width: 0;
 }
-
 .list-group-item + .list-group-item.active {
   margin-top: -1px;
   border-top-width: 1px;
 }
 
 .list-group-horizontal {
-  -ms-flex-direction: row;
   flex-direction: row;
 }
-
 .list-group-horizontal .list-group-item:first-child {
-  border-bottom-left-radius: 0.25rem;
+  border-bottom-left-radius: 8px;
   border-top-right-radius: 0;
 }
-
 .list-group-horizontal .list-group-item:last-child {
-  border-top-right-radius: 0.25rem;
+  border-top-right-radius: 8px;
   border-bottom-left-radius: 0;
 }
-
 .list-group-horizontal .list-group-item.active {
   margin-top: 0;
 }
-
 .list-group-horizontal .list-group-item + .list-group-item {
   border-top-width: 1px;
   border-left-width: 0;
 }
-
 .list-group-horizontal .list-group-item + .list-group-item.active {
   margin-left: -1px;
   border-left-width: 1px;
 }
 
-@media (min-width: 576px) {
+@media (min-width: 400px) {
+  .list-group-horizontal-xs {
+    flex-direction: row;
+  }
+  .list-group-horizontal-xs .list-group-item:first-child {
+    border-bottom-left-radius: 8px;
+    border-top-right-radius: 0;
+  }
+  .list-group-horizontal-xs .list-group-item:last-child {
+    border-top-right-radius: 8px;
+    border-bottom-left-radius: 0;
+  }
+  .list-group-horizontal-xs .list-group-item.active {
+    margin-top: 0;
+  }
+  .list-group-horizontal-xs .list-group-item + .list-group-item {
+    border-top-width: 1px;
+    border-left-width: 0;
+  }
+  .list-group-horizontal-xs .list-group-item + .list-group-item.active {
+    margin-left: -1px;
+    border-left-width: 1px;
+  }
+}
+@media (min-width: 616px) {
   .list-group-horizontal-sm {
-    -ms-flex-direction: row;
     flex-direction: row;
   }
   .list-group-horizontal-sm .list-group-item:first-child {
-    border-bottom-left-radius: 0.25rem;
+    border-bottom-left-radius: 8px;
     border-top-right-radius: 0;
   }
   .list-group-horizontal-sm .list-group-item:last-child {
-    border-top-right-radius: 0.25rem;
+    border-top-right-radius: 8px;
     border-bottom-left-radius: 0;
   }
   .list-group-horizontal-sm .list-group-item.active {
@@ -5581,18 +6984,16 @@ a.badge-dark:focus, a.badge-dark.focus {
     border-left-width: 1px;
   }
 }
-
 @media (min-width: 768px) {
   .list-group-horizontal-md {
-    -ms-flex-direction: row;
     flex-direction: row;
   }
   .list-group-horizontal-md .list-group-item:first-child {
-    border-bottom-left-radius: 0.25rem;
+    border-bottom-left-radius: 8px;
     border-top-right-radius: 0;
   }
   .list-group-horizontal-md .list-group-item:last-child {
-    border-top-right-radius: 0.25rem;
+    border-top-right-radius: 8px;
     border-bottom-left-radius: 0;
   }
   .list-group-horizontal-md .list-group-item.active {
@@ -5607,18 +7008,16 @@ a.badge-dark:focus, a.badge-dark.focus {
     border-left-width: 1px;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .list-group-horizontal-lg {
-    -ms-flex-direction: row;
     flex-direction: row;
   }
   .list-group-horizontal-lg .list-group-item:first-child {
-    border-bottom-left-radius: 0.25rem;
+    border-bottom-left-radius: 8px;
     border-top-right-radius: 0;
   }
   .list-group-horizontal-lg .list-group-item:last-child {
-    border-top-right-radius: 0.25rem;
+    border-top-right-radius: 8px;
     border-bottom-left-radius: 0;
   }
   .list-group-horizontal-lg .list-group-item.active {
@@ -5633,18 +7032,16 @@ a.badge-dark:focus, a.badge-dark.focus {
     border-left-width: 1px;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .list-group-horizontal-xl {
-    -ms-flex-direction: row;
     flex-direction: row;
   }
   .list-group-horizontal-xl .list-group-item:first-child {
-    border-bottom-left-radius: 0.25rem;
+    border-bottom-left-radius: 8px;
     border-top-right-radius: 0;
   }
   .list-group-horizontal-xl .list-group-item:last-child {
-    border-top-right-radius: 0.25rem;
+    border-top-right-radius: 8px;
     border-bottom-left-radius: 0;
   }
   .list-group-horizontal-xl .list-group-item.active {
@@ -5659,147 +7056,338 @@ a.badge-dark:focus, a.badge-dark.focus {
     border-left-width: 1px;
   }
 }
-
 .list-group-flush .list-group-item {
   border-right-width: 0;
   border-left-width: 0;
   border-radius: 0;
 }
-
 .list-group-flush .list-group-item:first-child {
   border-top-width: 0;
 }
-
 .list-group-flush:last-child .list-group-item:last-child {
   border-bottom-width: 0;
 }
 
 .list-group-item-primary {
-  color: #004085;
-  background-color: #b8daff;
+  color: #947c14;
+  background-color: #fff1b8;
 }
-
 .list-group-item-primary.list-group-item-action:hover, .list-group-item-primary.list-group-item-action:focus {
-  color: #004085;
-  background-color: #9fcdff;
+  color: #947c14;
+  background-color: #ffec9f;
 }
-
 .list-group-item-primary.list-group-item-action.active {
   color: #fff;
-  background-color: #004085;
-  border-color: #004085;
+  background-color: #947c14;
+  border-color: #947c14;
 }
 
 .list-group-item-secondary {
-  color: #383d41;
-  background-color: #d6d8db;
+  color: #212529;
+  background-color: #c1c2c3;
 }
-
 .list-group-item-secondary.list-group-item-action:hover, .list-group-item-secondary.list-group-item-action:focus {
-  color: #383d41;
-  background-color: #c8cbcf;
+  color: #212529;
+  background-color: #b4b5b6;
 }
-
 .list-group-item-secondary.list-group-item-action.active {
   color: #fff;
-  background-color: #383d41;
-  border-color: #383d41;
+  background-color: #212529;
+  border-color: #212529;
 }
 
 .list-group-item-success {
-  color: #155724;
+  color: #256938;
   background-color: #c3e6cb;
 }
-
 .list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus {
-  color: #155724;
+  color: #256938;
   background-color: #b1dfbb;
 }
-
 .list-group-item-success.list-group-item-action.active {
   color: #fff;
-  background-color: #155724;
-  border-color: #155724;
+  background-color: #256938;
+  border-color: #256938;
 }
 
 .list-group-item-info {
-  color: #0c5460;
+  color: #1c6673;
   background-color: #bee5eb;
 }
-
 .list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus {
-  color: #0c5460;
+  color: #1c6673;
   background-color: #abdde5;
 }
-
 .list-group-item-info.list-group-item-action.active {
   color: #fff;
-  background-color: #0c5460;
-  border-color: #0c5460;
+  background-color: #1c6673;
+  border-color: #1c6673;
 }
 
 .list-group-item-warning {
-  color: #856404;
+  color: #947617;
   background-color: #ffeeba;
 }
-
 .list-group-item-warning.list-group-item-action:hover, .list-group-item-warning.list-group-item-action:focus {
-  color: #856404;
+  color: #947617;
   background-color: #ffe8a1;
 }
-
 .list-group-item-warning.list-group-item-action.active {
   color: #fff;
-  background-color: #856404;
-  border-color: #856404;
+  background-color: #947617;
+  border-color: #947617;
 }
 
 .list-group-item-danger {
-  color: #721c24;
+  color: #822d38;
   background-color: #f5c6cb;
 }
-
 .list-group-item-danger.list-group-item-action:hover, .list-group-item-danger.list-group-item-action:focus {
-  color: #721c24;
+  color: #822d38;
   background-color: #f1b0b7;
 }
-
 .list-group-item-danger.list-group-item-action.active {
   color: #fff;
-  background-color: #721c24;
-  border-color: #721c24;
+  background-color: #822d38;
+  border-color: #822d38;
 }
 
 .list-group-item-light {
-  color: #818182;
-  background-color: #fdfdfe;
+  color: #8d9295;
+  background-color: #fbfcfd;
 }
-
 .list-group-item-light.list-group-item-action:hover, .list-group-item-light.list-group-item-action:focus {
-  color: #818182;
-  background-color: #ececf6;
+  color: #8d9295;
+  background-color: #eaeff5;
 }
-
 .list-group-item-light.list-group-item-action.active {
   color: #fff;
-  background-color: #818182;
-  border-color: #818182;
+  background-color: #8d9295;
+  border-color: #8d9295;
 }
 
 .list-group-item-dark {
-  color: #1b1e21;
-  background-color: #c6c8ca;
+  color: #363b41;
+  background-color: #ccced0;
 }
-
 .list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus {
-  color: #1b1e21;
-  background-color: #b9bbbe;
+  color: #363b41;
+  background-color: #bfc1c4;
 }
-
 .list-group-item-dark.list-group-item-action.active {
   color: #fff;
-  background-color: #1b1e21;
-  border-color: #1b1e21;
+  background-color: #363b41;
+  border-color: #363b41;
+}
+
+.list-group-item-primary-light {
+  color: #949490;
+  background-color: #fffefb;
+}
+.list-group-item-primary-light.list-group-item-action:hover, .list-group-item-primary-light.list-group-item-action:focus {
+  color: #949490;
+  background-color: #fff8e2;
+}
+.list-group-item-primary-light.list-group-item-action.active {
+  color: #fff;
+  background-color: #949490;
+  border-color: #949490;
+}
+
+.list-group-item-secondary-light {
+  color: #949698;
+  background-color: white;
+}
+.list-group-item-secondary-light.list-group-item-action:hover, .list-group-item-secondary-light.list-group-item-action:focus {
+  color: #949698;
+  background-color: #f2f2f2;
+}
+.list-group-item-secondary-light.list-group-item-action.active {
+  color: #fff;
+  background-color: #949698;
+  border-color: #949698;
+}
+
+.list-group-item-tertiary {
+  color: #235193;
+  background-color: #c2dafc;
+}
+.list-group-item-tertiary.list-group-item-action:hover, .list-group-item-tertiary.list-group-item-action:focus {
+  color: #235193;
+  background-color: #aacbfb;
+}
+.list-group-item-tertiary.list-group-item-action.active {
+  color: #fff;
+  background-color: #235193;
+  border-color: #235193;
+}
+
+.list-group-item-tertiary-light {
+  color: #868f98;
+  background-color: #f7fbff;
+}
+.list-group-item-tertiary-light.list-group-item-action:hover, .list-group-item-tertiary-light.list-group-item-action:focus {
+  color: #868f98;
+  background-color: #deeeff;
+}
+.list-group-item-tertiary-light.list-group-item-action.active {
+  color: #fff;
+  background-color: #868f98;
+  border-color: #868f98;
+}
+
+.list-group-item-white {
+  color: #949698;
+  background-color: white;
+}
+.list-group-item-white.list-group-item-action:hover, .list-group-item-white.list-group-item-action:focus {
+  color: #949698;
+  background-color: #f2f2f2;
+}
+.list-group-item-white.list-group-item-action.active {
+  color: #fff;
+  background-color: #949698;
+  border-color: #949698;
+}
+
+.list-group-item-black {
+  color: #212529;
+  background-color: #c1c2c3;
+}
+.list-group-item-black.list-group-item-action:hover, .list-group-item-black.list-group-item-action:focus {
+  color: #212529;
+  background-color: #b4b5b6;
+}
+.list-group-item-black.list-group-item-action.active {
+  color: #fff;
+  background-color: #212529;
+  border-color: #212529;
+}
+
+.list-group-item-blue {
+  color: #235193;
+  background-color: #c2dafc;
+}
+.list-group-item-blue.list-group-item-action:hover, .list-group-item-blue.list-group-item-action:focus {
+  color: #235193;
+  background-color: #aacbfb;
+}
+.list-group-item-blue.list-group-item-action.active {
+  color: #fff;
+  background-color: #235193;
+  border-color: #235193;
+}
+
+.list-group-item-light-blue {
+  color: #868f98;
+  background-color: #f7fbff;
+}
+.list-group-item-light-blue.list-group-item-action:hover, .list-group-item-light-blue.list-group-item-action:focus {
+  color: #868f98;
+  background-color: #deeeff;
+}
+.list-group-item-light-blue.list-group-item-action.active {
+  color: #fff;
+  background-color: #868f98;
+  border-color: #868f98;
+}
+
+.list-group-item-yellow {
+  color: #947c14;
+  background-color: #fff1b8;
+}
+.list-group-item-yellow.list-group-item-action:hover, .list-group-item-yellow.list-group-item-action:focus {
+  color: #947c14;
+  background-color: #ffec9f;
+}
+.list-group-item-yellow.list-group-item-action.active {
+  color: #fff;
+  background-color: #947c14;
+  border-color: #947c14;
+}
+
+.list-group-item-light-yellow {
+  color: #949490;
+  background-color: #fffefb;
+}
+.list-group-item-light-yellow.list-group-item-action:hover, .list-group-item-light-yellow.list-group-item-action:focus {
+  color: #949490;
+  background-color: #fff8e2;
+}
+.list-group-item-light-yellow.list-group-item-action.active {
+  color: #fff;
+  background-color: #949490;
+  border-color: #949490;
+}
+
+.list-group-item-orange {
+  color: #945b14;
+  background-color: #ffdfb8;
+}
+.list-group-item-orange.list-group-item-action:hover, .list-group-item-orange.list-group-item-action:focus {
+  color: #945b14;
+  background-color: #ffd49f;
+}
+.list-group-item-orange.list-group-item-action.active {
+  color: #fff;
+  background-color: #945b14;
+  border-color: #945b14;
+}
+
+.list-group-item-light-orange {
+  color: #948872;
+  background-color: #fff7ea;
+}
+.list-group-item-light-orange.list-group-item-action:hover, .list-group-item-light-orange.list-group-item-action:focus {
+  color: #948872;
+  background-color: #ffedd1;
+}
+.list-group-item-light-orange.list-group-item-action.active {
+  color: #fff;
+  background-color: #948872;
+  border-color: #948872;
+}
+
+.list-group-item-red {
+  color: #942f31;
+  background-color: #ffc8c8;
+}
+.list-group-item-red.list-group-item-action:hover, .list-group-item-red.list-group-item-action:focus {
+  color: #942f31;
+  background-color: #ffafaf;
+}
+.list-group-item-red.list-group-item-action.active {
+  color: #fff;
+  background-color: #942f31;
+  border-color: #942f31;
+}
+
+.list-group-item-light-red {
+  color: #948889;
+  background-color: #fff7f7;
+}
+.list-group-item-light-red.list-group-item-action:hover, .list-group-item-light-red.list-group-item-action:focus {
+  color: #948889;
+  background-color: #ffdede;
+}
+.list-group-item-light-red.list-group-item-action.active {
+  color: #fff;
+  background-color: #948889;
+  border-color: #948889;
+}
+
+.list-group-item-medium {
+  color: #7f8488;
+  background-color: #f4f5f6;
+}
+.list-group-item-medium.list-group-item-action:hover, .list-group-item-medium.list-group-item-action:focus {
+  color: #7f8488;
+  background-color: #e6e8eb;
+}
+.list-group-item-medium.list-group-item-action.active {
+  color: #fff;
+  background-color: #7f8488;
+  border-color: #7f8488;
 }
 
 .close {
@@ -5807,18 +7395,21 @@ a.badge-dark:focus, a.badge-dark.focus {
   font-size: 1.5rem;
   font-weight: 700;
   line-height: 1;
-  color: #000;
+  color: #212529;
   text-shadow: 0 1px 0 #fff;
-  opacity: .5;
+  opacity: 0.5;
+}
+@media (max-width: 1200px) {
+  .close {
+    font-size: calc(1.275rem + 0.3vw);
+  }
 }
-
 .close:hover {
-  color: #000;
+  color: #212529;
   text-decoration: none;
 }
-
 .close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus {
-  opacity: .75;
+  opacity: 0.75;
 }
 
 button.close {
@@ -5826,8 +7417,8 @@ button.close {
   background-color: transparent;
   border: 0;
   -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
+     -moz-appearance: none;
+          appearance: none;
 }
 
 a.close.disabled {
@@ -5841,34 +7432,28 @@ a.close.disabled {
   background-color: rgba(255, 255, 255, 0.85);
   background-clip: padding-box;
   border: 1px solid rgba(0, 0, 0, 0.1);
-  box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
+  box-shadow: 0 0.25rem 0.75rem rgba(33, 37, 41, 0.1);
   -webkit-backdrop-filter: blur(10px);
-  backdrop-filter: blur(10px);
+          backdrop-filter: blur(10px);
   opacity: 0;
   border-radius: 0.25rem;
 }
-
 .toast:not(:last-child) {
   margin-bottom: 0.75rem;
 }
-
 .toast.showing {
   opacity: 1;
 }
-
 .toast.show {
   display: block;
   opacity: 1;
 }
-
 .toast.hide {
   display: none;
 }
 
 .toast-header {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-align: center;
   align-items: center;
   padding: 0.25rem 0.75rem;
   color: #6c757d;
@@ -5884,7 +7469,6 @@ a.close.disabled {
 .modal-open {
   overflow: hidden;
 }
-
 .modal-open .modal {
   overflow-x: hidden;
   overflow-y: auto;
@@ -5908,91 +7492,70 @@ a.close.disabled {
   margin: 0.5rem;
   pointer-events: none;
 }
-
 .modal.fade .modal-dialog {
-  -webkit-transform: translate(0, -50px);
+  transition: transform 0.3s ease-out;
   transform: translate(0, -50px);
 }
-
 @media (prefers-reduced-motion: reduce) {
   .modal.fade .modal-dialog {
     transition: none;
   }
 }
-
 .modal.show .modal-dialog {
-  -webkit-transform: none;
   transform: none;
 }
-
 .modal.modal-static .modal-dialog {
-  -webkit-transform: scale(1.02);
   transform: scale(1.02);
 }
 
 .modal-dialog-scrollable {
-  display: -ms-flexbox;
   display: flex;
   max-height: calc(100% - 1rem);
 }
-
 .modal-dialog-scrollable .modal-content {
   max-height: calc(100vh - 1rem);
   overflow: hidden;
 }
-
 .modal-dialog-scrollable .modal-header,
 .modal-dialog-scrollable .modal-footer {
-  -ms-flex-negative: 0;
   flex-shrink: 0;
 }
-
 .modal-dialog-scrollable .modal-body {
   overflow-y: auto;
 }
 
 .modal-dialog-centered {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-align: center;
   align-items: center;
   min-height: calc(100% - 1rem);
 }
-
 .modal-dialog-centered::before {
   display: block;
   height: calc(100vh - 1rem);
   content: "";
 }
-
 .modal-dialog-centered.modal-dialog-scrollable {
-  -ms-flex-direction: column;
   flex-direction: column;
-  -ms-flex-pack: center;
   justify-content: center;
   height: 100%;
 }
-
 .modal-dialog-centered.modal-dialog-scrollable .modal-content {
   max-height: none;
 }
-
 .modal-dialog-centered.modal-dialog-scrollable::before {
   content: none;
 }
 
 .modal-content {
   position: relative;
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-direction: column;
   flex-direction: column;
   width: 100%;
   pointer-events: auto;
   background-color: #fff;
   background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 0.3rem;
+  border: 1px solid rgba(33, 37, 41, 0.2);
+  border-radius: 8px;
   outline: 0;
 }
 
@@ -6003,30 +7566,24 @@ a.close.disabled {
   z-index: 1040;
   width: 100vw;
   height: 100vh;
-  background-color: #000;
+  background-color: #212529;
 }
-
 .modal-backdrop.fade {
   opacity: 0;
 }
-
 .modal-backdrop.show {
   opacity: 0.5;
 }
 
 .modal-header {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-align: start;
   align-items: flex-start;
-  -ms-flex-pack: justify;
   justify-content: space-between;
   padding: 1rem 1rem;
-  border-bottom: 1px solid #dee2e6;
-  border-top-left-radius: calc(0.3rem - 1px);
-  border-top-right-radius: calc(0.3rem - 1px);
+  border-bottom: 1px solid #d6dbdf;
+  border-top-left-radius: 7px;
+  border-top-right-radius: 7px;
 }
-
 .modal-header .close {
   padding: 1rem 1rem;
   margin: -1rem -1rem -1rem auto;
@@ -6039,26 +7596,20 @@ a.close.disabled {
 
 .modal-body {
   position: relative;
-  -ms-flex: 1 1 auto;
   flex: 1 1 auto;
   padding: 1rem;
 }
 
 .modal-footer {
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
-  -ms-flex-align: center;
   align-items: center;
-  -ms-flex-pack: end;
   justify-content: flex-end;
   padding: 0.75rem;
-  border-top: 1px solid #dee2e6;
-  border-bottom-right-radius: calc(0.3rem - 1px);
-  border-bottom-left-radius: calc(0.3rem - 1px);
+  border-top: 1px solid #d6dbdf;
+  border-bottom-right-radius: 7px;
+  border-bottom-left-radius: 7px;
 }
-
 .modal-footer > * {
   margin: 0.25rem;
 }
@@ -6071,47 +7622,47 @@ a.close.disabled {
   overflow: scroll;
 }
 
-@media (min-width: 576px) {
+@media (min-width: 616px) {
   .modal-dialog {
     max-width: 500px;
     margin: 1.75rem auto;
   }
+
   .modal-dialog-scrollable {
     max-height: calc(100% - 3.5rem);
   }
   .modal-dialog-scrollable .modal-content {
     max-height: calc(100vh - 3.5rem);
   }
+
   .modal-dialog-centered {
     min-height: calc(100% - 3.5rem);
   }
   .modal-dialog-centered::before {
     height: calc(100vh - 3.5rem);
   }
+
   .modal-sm {
     max-width: 300px;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .modal-lg,
-  .modal-xl {
+.modal-xl {
     max-width: 800px;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .modal-xl {
     max-width: 1140px;
   }
 }
-
 .tooltip {
   position: absolute;
   z-index: 1070;
   display: block;
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: "Noto Sans", sans-serif;
   font-style: normal;
   font-weight: 400;
   line-height: 1.5;
@@ -6129,18 +7680,15 @@ a.close.disabled {
   word-wrap: break-word;
   opacity: 0;
 }
-
 .tooltip.show {
   opacity: 0.9;
 }
-
 .tooltip .arrow {
   position: absolute;
   display: block;
   width: 0.8rem;
   height: 0.4rem;
 }
-
 .tooltip .arrow::before {
   position: absolute;
   content: "";
@@ -6148,64 +7696,56 @@ a.close.disabled {
   border-style: solid;
 }
 
-.bs-tooltip-top, .bs-tooltip-auto[x-placement^="top"] {
+.bs-tooltip-top, .bs-tooltip-auto[x-placement^=top] {
   padding: 0.4rem 0;
 }
-
-.bs-tooltip-top .arrow, .bs-tooltip-auto[x-placement^="top"] .arrow {
+.bs-tooltip-top .arrow, .bs-tooltip-auto[x-placement^=top] .arrow {
   bottom: 0;
 }
-
-.bs-tooltip-top .arrow::before, .bs-tooltip-auto[x-placement^="top"] .arrow::before {
+.bs-tooltip-top .arrow::before, .bs-tooltip-auto[x-placement^=top] .arrow::before {
   top: 0;
   border-width: 0.4rem 0.4rem 0;
-  border-top-color: #000;
+  border-top-color: #212529;
 }
 
-.bs-tooltip-right, .bs-tooltip-auto[x-placement^="right"] {
+.bs-tooltip-right, .bs-tooltip-auto[x-placement^=right] {
   padding: 0 0.4rem;
 }
-
-.bs-tooltip-right .arrow, .bs-tooltip-auto[x-placement^="right"] .arrow {
+.bs-tooltip-right .arrow, .bs-tooltip-auto[x-placement^=right] .arrow {
   left: 0;
   width: 0.4rem;
   height: 0.8rem;
 }
-
-.bs-tooltip-right .arrow::before, .bs-tooltip-auto[x-placement^="right"] .arrow::before {
+.bs-tooltip-right .arrow::before, .bs-tooltip-auto[x-placement^=right] .arrow::before {
   right: 0;
   border-width: 0.4rem 0.4rem 0.4rem 0;
-  border-right-color: #000;
+  border-right-color: #212529;
 }
 
-.bs-tooltip-bottom, .bs-tooltip-auto[x-placement^="bottom"] {
+.bs-tooltip-bottom, .bs-tooltip-auto[x-placement^=bottom] {
   padding: 0.4rem 0;
 }
-
-.bs-tooltip-bottom .arrow, .bs-tooltip-auto[x-placement^="bottom"] .arrow {
+.bs-tooltip-bottom .arrow, .bs-tooltip-auto[x-placement^=bottom] .arrow {
   top: 0;
 }
-
-.bs-tooltip-bottom .arrow::before, .bs-tooltip-auto[x-placement^="bottom"] .arrow::before {
+.bs-tooltip-bottom .arrow::before, .bs-tooltip-auto[x-placement^=bottom] .arrow::before {
   bottom: 0;
   border-width: 0 0.4rem 0.4rem;
-  border-bottom-color: #000;
+  border-bottom-color: #212529;
 }
 
-.bs-tooltip-left, .bs-tooltip-auto[x-placement^="left"] {
+.bs-tooltip-left, .bs-tooltip-auto[x-placement^=left] {
   padding: 0 0.4rem;
 }
-
-.bs-tooltip-left .arrow, .bs-tooltip-auto[x-placement^="left"] .arrow {
+.bs-tooltip-left .arrow, .bs-tooltip-auto[x-placement^=left] .arrow {
   right: 0;
   width: 0.4rem;
   height: 0.8rem;
 }
-
-.bs-tooltip-left .arrow::before, .bs-tooltip-auto[x-placement^="left"] .arrow::before {
+.bs-tooltip-left .arrow::before, .bs-tooltip-auto[x-placement^=left] .arrow::before {
   left: 0;
   border-width: 0.4rem 0 0.4rem 0.4rem;
-  border-left-color: #000;
+  border-left-color: #212529;
 }
 
 .tooltip-inner {
@@ -6213,8 +7753,8 @@ a.close.disabled {
   padding: 0.25rem 0.5rem;
   color: #fff;
   text-align: center;
-  background-color: #000;
-  border-radius: 0.25rem;
+  background-color: #212529;
+  border-radius: 8px;
 }
 
 .popover {
@@ -6224,7 +7764,7 @@ a.close.disabled {
   z-index: 1060;
   display: block;
   max-width: 276px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: "Noto Sans", sans-serif;
   font-style: normal;
   font-weight: 400;
   line-height: 1.5;
@@ -6242,18 +7782,16 @@ a.close.disabled {
   word-wrap: break-word;
   background-color: #fff;
   background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 0.3rem;
+  border: 1px solid rgba(33, 37, 41, 0.2);
+  border-radius: 8px;
 }
-
 .popover .arrow {
   position: absolute;
   display: block;
   width: 1rem;
   height: 0.5rem;
-  margin: 0 0.3rem;
+  margin: 0 8px;
 }
-
 .popover .arrow::before, .popover .arrow::after {
   position: absolute;
   display: block;
@@ -6262,70 +7800,60 @@ a.close.disabled {
   border-style: solid;
 }
 
-.bs-popover-top, .bs-popover-auto[x-placement^="top"] {
+.bs-popover-top, .bs-popover-auto[x-placement^=top] {
   margin-bottom: 0.5rem;
 }
-
-.bs-popover-top > .arrow, .bs-popover-auto[x-placement^="top"] > .arrow {
+.bs-popover-top > .arrow, .bs-popover-auto[x-placement^=top] > .arrow {
   bottom: calc(-0.5rem - 1px);
 }
-
-.bs-popover-top > .arrow::before, .bs-popover-auto[x-placement^="top"] > .arrow::before {
+.bs-popover-top > .arrow::before, .bs-popover-auto[x-placement^=top] > .arrow::before {
   bottom: 0;
   border-width: 0.5rem 0.5rem 0;
-  border-top-color: rgba(0, 0, 0, 0.25);
+  border-top-color: rgba(33, 37, 41, 0.25);
 }
-
-.bs-popover-top > .arrow::after, .bs-popover-auto[x-placement^="top"] > .arrow::after {
+.bs-popover-top > .arrow::after, .bs-popover-auto[x-placement^=top] > .arrow::after {
   bottom: 1px;
   border-width: 0.5rem 0.5rem 0;
   border-top-color: #fff;
 }
 
-.bs-popover-right, .bs-popover-auto[x-placement^="right"] {
+.bs-popover-right, .bs-popover-auto[x-placement^=right] {
   margin-left: 0.5rem;
 }
-
-.bs-popover-right > .arrow, .bs-popover-auto[x-placement^="right"] > .arrow {
+.bs-popover-right > .arrow, .bs-popover-auto[x-placement^=right] > .arrow {
   left: calc(-0.5rem - 1px);
   width: 0.5rem;
   height: 1rem;
-  margin: 0.3rem 0;
+  margin: 8px 0;
 }
-
-.bs-popover-right > .arrow::before, .bs-popover-auto[x-placement^="right"] > .arrow::before {
+.bs-popover-right > .arrow::before, .bs-popover-auto[x-placement^=right] > .arrow::before {
   left: 0;
   border-width: 0.5rem 0.5rem 0.5rem 0;
-  border-right-color: rgba(0, 0, 0, 0.25);
+  border-right-color: rgba(33, 37, 41, 0.25);
 }
-
-.bs-popover-right > .arrow::after, .bs-popover-auto[x-placement^="right"] > .arrow::after {
+.bs-popover-right > .arrow::after, .bs-popover-auto[x-placement^=right] > .arrow::after {
   left: 1px;
   border-width: 0.5rem 0.5rem 0.5rem 0;
   border-right-color: #fff;
 }
 
-.bs-popover-bottom, .bs-popover-auto[x-placement^="bottom"] {
+.bs-popover-bottom, .bs-popover-auto[x-placement^=bottom] {
   margin-top: 0.5rem;
 }
-
-.bs-popover-bottom > .arrow, .bs-popover-auto[x-placement^="bottom"] > .arrow {
+.bs-popover-bottom > .arrow, .bs-popover-auto[x-placement^=bottom] > .arrow {
   top: calc(-0.5rem - 1px);
 }
-
-.bs-popover-bottom > .arrow::before, .bs-popover-auto[x-placement^="bottom"] > .arrow::before {
+.bs-popover-bottom > .arrow::before, .bs-popover-auto[x-placement^=bottom] > .arrow::before {
   top: 0;
   border-width: 0 0.5rem 0.5rem 0.5rem;
-  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border-bottom-color: rgba(33, 37, 41, 0.25);
 }
-
-.bs-popover-bottom > .arrow::after, .bs-popover-auto[x-placement^="bottom"] > .arrow::after {
+.bs-popover-bottom > .arrow::after, .bs-popover-auto[x-placement^=bottom] > .arrow::after {
   top: 1px;
   border-width: 0 0.5rem 0.5rem 0.5rem;
   border-bottom-color: #fff;
 }
-
-.bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^="bottom"] .popover-header::before {
+.bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^=bottom] .popover-header::before {
   position: absolute;
   top: 0;
   left: 50%;
@@ -6336,24 +7864,21 @@ a.close.disabled {
   border-bottom: 1px solid #f7f7f7;
 }
 
-.bs-popover-left, .bs-popover-auto[x-placement^="left"] {
+.bs-popover-left, .bs-popover-auto[x-placement^=left] {
   margin-right: 0.5rem;
 }
-
-.bs-popover-left > .arrow, .bs-popover-auto[x-placement^="left"] > .arrow {
+.bs-popover-left > .arrow, .bs-popover-auto[x-placement^=left] > .arrow {
   right: calc(-0.5rem - 1px);
   width: 0.5rem;
   height: 1rem;
-  margin: 0.3rem 0;
+  margin: 8px 0;
 }
-
-.bs-popover-left > .arrow::before, .bs-popover-auto[x-placement^="left"] > .arrow::before {
+.bs-popover-left > .arrow::before, .bs-popover-auto[x-placement^=left] > .arrow::before {
   right: 0;
   border-width: 0.5rem 0 0.5rem 0.5rem;
-  border-left-color: rgba(0, 0, 0, 0.25);
+  border-left-color: rgba(33, 37, 41, 0.25);
 }
-
-.bs-popover-left > .arrow::after, .bs-popover-auto[x-placement^="left"] > .arrow::after {
+.bs-popover-left > .arrow::after, .bs-popover-auto[x-placement^=left] > .arrow::after {
   right: 1px;
   border-width: 0.5rem 0 0.5rem 0.5rem;
   border-left-color: #fff;
@@ -6365,10 +7890,9 @@ a.close.disabled {
   font-size: 1rem;
   background-color: #f7f7f7;
   border-bottom: 1px solid #ebebeb;
-  border-top-left-radius: calc(0.3rem - 1px);
-  border-top-right-radius: calc(0.3rem - 1px);
+  border-top-left-radius: 7px;
+  border-top-right-radius: 7px;
 }
-
 .popover-header:empty {
   display: none;
 }
@@ -6383,7 +7907,6 @@ a.close.disabled {
 }
 
 .carousel.pointer-event {
-  -ms-touch-action: pan-y;
   touch-action: pan-y;
 }
 
@@ -6392,7 +7915,6 @@ a.close.disabled {
   width: 100%;
   overflow: hidden;
 }
-
 .carousel-inner::after {
   display: block;
   clear: both;
@@ -6406,9 +7928,9 @@ a.close.disabled {
   width: 100%;
   margin-right: -100%;
   -webkit-backface-visibility: hidden;
-  backface-visibility: hidden;
+          backface-visibility: hidden;
+  transition: transform 0.6s ease-in-out;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .carousel-item {
     transition: none;
@@ -6423,39 +7945,34 @@ a.close.disabled {
 
 .carousel-item-next:not(.carousel-item-left),
 .active.carousel-item-right {
-  -webkit-transform: translateX(100%);
   transform: translateX(100%);
 }
 
 .carousel-item-prev:not(.carousel-item-right),
 .active.carousel-item-left {
-  -webkit-transform: translateX(-100%);
   transform: translateX(-100%);
 }
 
 .carousel-fade .carousel-item {
   opacity: 0;
   transition-property: opacity;
-  -webkit-transform: none;
   transform: none;
 }
-
 .carousel-fade .carousel-item.active,
 .carousel-fade .carousel-item-next.carousel-item-left,
 .carousel-fade .carousel-item-prev.carousel-item-right {
   z-index: 1;
   opacity: 1;
 }
-
 .carousel-fade .active.carousel-item-left,
 .carousel-fade .active.carousel-item-right {
   z-index: 0;
   opacity: 0;
+  transition: opacity 0s 0.6s;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .carousel-fade .active.carousel-item-left,
-  .carousel-fade .active.carousel-item-right {
+.carousel-fade .active.carousel-item-right {
     transition: none;
   }
 }
@@ -6466,25 +7983,21 @@ a.close.disabled {
   top: 0;
   bottom: 0;
   z-index: 1;
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-align: center;
   align-items: center;
-  -ms-flex-pack: center;
   justify-content: center;
   width: 15%;
   color: #fff;
   text-align: center;
   opacity: 0.5;
+  transition: opacity 0.15s ease;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .carousel-control-prev,
-  .carousel-control-next {
+.carousel-control-next {
     transition: none;
   }
 }
-
 .carousel-control-prev:hover, .carousel-control-prev:focus,
 .carousel-control-next:hover,
 .carousel-control-next:focus {
@@ -6507,7 +8020,7 @@ a.close.disabled {
   display: inline-block;
   width: 20px;
   height: 20px;
-  background: no-repeat 50% / 100% 100%;
+  background: no-repeat 50%/100% 100%;
 }
 
 .carousel-control-prev-icon {
@@ -6524,19 +8037,15 @@ a.close.disabled {
   bottom: 0;
   left: 0;
   z-index: 15;
-  display: -ms-flexbox;
   display: flex;
-  -ms-flex-pack: center;
   justify-content: center;
   padding-left: 0;
   margin-right: 15%;
   margin-left: 15%;
   list-style: none;
 }
-
 .carousel-indicators li {
   box-sizing: content-box;
-  -ms-flex: 0 1 auto;
   flex: 0 1 auto;
   width: 30px;
   height: 3px;
@@ -6548,15 +8057,14 @@ a.close.disabled {
   background-clip: padding-box;
   border-top: 10px solid transparent;
   border-bottom: 10px solid transparent;
-  opacity: .5;
+  opacity: 0.5;
+  transition: opacity 0.6s ease;
 }
-
 @media (prefers-reduced-motion: reduce) {
   .carousel-indicators li {
     transition: none;
   }
 }
-
 .carousel-indicators .active {
   opacity: 1;
 }
@@ -6575,18 +8083,15 @@ a.close.disabled {
 
 @-webkit-keyframes spinner-border {
   to {
-    -webkit-transform: rotate(360deg);
     transform: rotate(360deg);
   }
 }
 
 @keyframes spinner-border {
   to {
-    -webkit-transform: rotate(360deg);
     transform: rotate(360deg);
   }
 }
-
 .spinner-border {
   display: inline-block;
   width: 2rem;
@@ -6595,8 +8100,8 @@ a.close.disabled {
   border: 0.25em solid currentColor;
   border-right-color: transparent;
   border-radius: 50%;
-  -webkit-animation: spinner-border .75s linear infinite;
-  animation: spinner-border .75s linear infinite;
+  -webkit-animation: spinner-border 0.75s linear infinite;
+          animation: spinner-border 0.75s linear infinite;
 }
 
 .spinner-border-sm {
@@ -6607,7 +8112,6 @@ a.close.disabled {
 
 @-webkit-keyframes spinner-grow {
   0% {
-    -webkit-transform: scale(0);
     transform: scale(0);
   }
   50% {
@@ -6617,14 +8121,12 @@ a.close.disabled {
 
 @keyframes spinner-grow {
   0% {
-    -webkit-transform: scale(0);
     transform: scale(0);
   }
   50% {
     opacity: 1;
   }
 }
-
 .spinner-grow {
   display: inline-block;
   width: 2rem;
@@ -6633,8 +8135,8 @@ a.close.disabled {
   background-color: currentColor;
   border-radius: 50%;
   opacity: 0;
-  -webkit-animation: spinner-grow .75s linear infinite;
-  animation: spinner-grow .75s linear infinite;
+  -webkit-animation: spinner-grow 0.75s linear infinite;
+          animation: spinner-grow 0.75s linear infinite;
 }
 
 .spinner-grow-sm {
@@ -6667,23 +8169,23 @@ a.close.disabled {
 }
 
 .bg-primary {
-  background-color: #007bff !important;
+  background-color: #ffcc00 !important;
 }
 
 a.bg-primary:hover, a.bg-primary:focus,
 button.bg-primary:hover,
 button.bg-primary:focus {
-  background-color: #0062cc !important;
+  background-color: #cca300 !important;
 }
 
 .bg-secondary {
-  background-color: #6c757d !important;
+  background-color: #212529 !important;
 }
 
 a.bg-secondary:hover, a.bg-secondary:focus,
 button.bg-secondary:hover,
 button.bg-secondary:focus {
-  background-color: #545b62 !important;
+  background-color: #0a0c0d !important;
 }
 
 .bg-success {
@@ -6727,23 +8229,173 @@ button.bg-danger:focus {
 }
 
 .bg-light {
-  background-color: #f8f9fa !important;
+  background-color: #f1f6f9 !important;
 }
 
 a.bg-light:hover, a.bg-light:focus,
 button.bg-light:hover,
 button.bg-light:focus {
-  background-color: #dae0e5 !important;
+  background-color: #cddfea !important;
 }
 
 .bg-dark {
-  background-color: #343a40 !important;
+  background-color: #495057 !important;
 }
 
 a.bg-dark:hover, a.bg-dark:focus,
 button.bg-dark:hover,
 button.bg-dark:focus {
-  background-color: #1d2124 !important;
+  background-color: #32373b !important;
+}
+
+.bg-primary-light {
+  background-color: #fffaf0 !important;
+}
+
+a.bg-primary-light:hover, a.bg-primary-light:focus,
+button.bg-primary-light:hover,
+button.bg-primary-light:focus {
+  background-color: #ffe9bd !important;
+}
+
+.bg-secondary-light {
+  background-color: #fff !important;
+}
+
+a.bg-secondary-light:hover, a.bg-secondary-light:focus,
+button.bg-secondary-light:hover,
+button.bg-secondary-light:focus {
+  background-color: #e6e6e6 !important;
+}
+
+.bg-tertiary {
+  background-color: #257af4 !important;
+}
+
+a.bg-tertiary:hover, a.bg-tertiary:focus,
+button.bg-tertiary:hover,
+button.bg-tertiary:focus {
+  background-color: #0b60db !important;
+}
+
+.bg-tertiary-light {
+  background-color: #e3f1fe !important;
+}
+
+a.bg-tertiary-light:hover, a.bg-tertiary-light:focus,
+button.bg-tertiary-light:hover,
+button.bg-tertiary-light:focus {
+  background-color: #b2d8fc !important;
+}
+
+.bg-white {
+  background-color: #fff !important;
+}
+
+a.bg-white:hover, a.bg-white:focus,
+button.bg-white:hover,
+button.bg-white:focus {
+  background-color: #e6e6e6 !important;
+}
+
+.bg-black {
+  background-color: #212529 !important;
+}
+
+a.bg-black:hover, a.bg-black:focus,
+button.bg-black:hover,
+button.bg-black:focus {
+  background-color: #0a0c0d !important;
+}
+
+.bg-blue {
+  background-color: #257af4 !important;
+}
+
+a.bg-blue:hover, a.bg-blue:focus,
+button.bg-blue:hover,
+button.bg-blue:focus {
+  background-color: #0b60db !important;
+}
+
+.bg-light-blue {
+  background-color: #e3f1fe !important;
+}
+
+a.bg-light-blue:hover, a.bg-light-blue:focus,
+button.bg-light-blue:hover,
+button.bg-light-blue:focus {
+  background-color: #b2d8fc !important;
+}
+
+.bg-yellow {
+  background-color: #ffcc00 !important;
+}
+
+a.bg-yellow:hover, a.bg-yellow:focus,
+button.bg-yellow:hover,
+button.bg-yellow:focus {
+  background-color: #cca300 !important;
+}
+
+.bg-light-yellow {
+  background-color: #fffaf0 !important;
+}
+
+a.bg-light-yellow:hover, a.bg-light-yellow:focus,
+button.bg-light-yellow:hover,
+button.bg-light-yellow:focus {
+  background-color: #ffe9bd !important;
+}
+
+.bg-orange {
+  background-color: #ff8c00 !important;
+}
+
+a.bg-orange:hover, a.bg-orange:focus,
+button.bg-orange:hover,
+button.bg-orange:focus {
+  background-color: #cc7000 !important;
+}
+
+.bg-light-orange {
+  background-color: #ffe4b5 !important;
+}
+
+a.bg-light-orange:hover, a.bg-light-orange:focus,
+button.bg-light-orange:hover,
+button.bg-light-orange:focus {
+  background-color: #ffd182 !important;
+}
+
+.bg-red {
+  background-color: #ff3939 !important;
+}
+
+a.bg-red:hover, a.bg-red:focus,
+button.bg-red:hover,
+button.bg-red:focus {
+  background-color: #ff0606 !important;
+}
+
+.bg-light-red {
+  background-color: #ffe4e1 !important;
+}
+
+a.bg-light-red:hover, a.bg-light-red:focus,
+button.bg-light-red:hover,
+button.bg-light-red:focus {
+  background-color: #ffb6ae !important;
+}
+
+.bg-medium {
+  background-color: #d6dbdf !important;
+}
+
+a.bg-medium:hover, a.bg-medium:focus,
+button.bg-medium:hover,
+button.bg-medium:focus {
+  background-color: #b9c2c9 !important;
 }
 
 .bg-white {
@@ -6755,23 +8407,23 @@ button.bg-dark:focus {
 }
 
 .border {
-  border: 1px solid #dee2e6 !important;
+  border: 1px solid #d6dbdf !important;
 }
 
 .border-top {
-  border-top: 1px solid #dee2e6 !important;
+  border-top: 1px solid #d6dbdf !important;
 }
 
 .border-right {
-  border-right: 1px solid #dee2e6 !important;
+  border-right: 1px solid #d6dbdf !important;
 }
 
 .border-bottom {
-  border-bottom: 1px solid #dee2e6 !important;
+  border-bottom: 1px solid #d6dbdf !important;
 }
 
 .border-left {
-  border-left: 1px solid #dee2e6 !important;
+  border-left: 1px solid #d6dbdf !important;
 }
 
 .border-0 {
@@ -6795,11 +8447,11 @@ button.bg-dark:focus {
 }
 
 .border-primary {
-  border-color: #007bff !important;
+  border-color: #ffcc00 !important;
 }
 
 .border-secondary {
-  border-color: #6c757d !important;
+  border-color: #212529 !important;
 }
 
 .border-success {
@@ -6819,11 +8471,71 @@ button.bg-dark:focus {
 }
 
 .border-light {
-  border-color: #f8f9fa !important;
+  border-color: #f1f6f9 !important;
 }
 
 .border-dark {
-  border-color: #343a40 !important;
+  border-color: #495057 !important;
+}
+
+.border-primary-light {
+  border-color: #fffaf0 !important;
+}
+
+.border-secondary-light {
+  border-color: #fff !important;
+}
+
+.border-tertiary {
+  border-color: #257af4 !important;
+}
+
+.border-tertiary-light {
+  border-color: #e3f1fe !important;
+}
+
+.border-white {
+  border-color: #fff !important;
+}
+
+.border-black {
+  border-color: #212529 !important;
+}
+
+.border-blue {
+  border-color: #257af4 !important;
+}
+
+.border-light-blue {
+  border-color: #e3f1fe !important;
+}
+
+.border-yellow {
+  border-color: #ffcc00 !important;
+}
+
+.border-light-yellow {
+  border-color: #fffaf0 !important;
+}
+
+.border-orange {
+  border-color: #ff8c00 !important;
+}
+
+.border-light-orange {
+  border-color: #ffe4b5 !important;
+}
+
+.border-red {
+  border-color: #ff3939 !important;
+}
+
+.border-light-red {
+  border-color: #ffe4e1 !important;
+}
+
+.border-medium {
+  border-color: #d6dbdf !important;
 }
 
 .border-white {
@@ -6831,35 +8543,35 @@ button.bg-dark:focus {
 }
 
 .rounded-sm {
-  border-radius: 0.2rem !important;
+  border-radius: 8px !important;
 }
 
 .rounded {
-  border-radius: 0.25rem !important;
+  border-radius: 8px !important;
 }
 
 .rounded-top {
-  border-top-left-radius: 0.25rem !important;
-  border-top-right-radius: 0.25rem !important;
+  border-top-left-radius: 8px !important;
+  border-top-right-radius: 8px !important;
 }
 
 .rounded-right {
-  border-top-right-radius: 0.25rem !important;
-  border-bottom-right-radius: 0.25rem !important;
+  border-top-right-radius: 8px !important;
+  border-bottom-right-radius: 8px !important;
 }
 
 .rounded-bottom {
-  border-bottom-right-radius: 0.25rem !important;
-  border-bottom-left-radius: 0.25rem !important;
+  border-bottom-right-radius: 8px !important;
+  border-bottom-left-radius: 8px !important;
 }
 
 .rounded-left {
-  border-top-left-radius: 0.25rem !important;
-  border-bottom-left-radius: 0.25rem !important;
+  border-top-left-radius: 8px !important;
+  border-bottom-left-radius: 8px !important;
 }
 
 .rounded-lg {
-  border-radius: 0.3rem !important;
+  border-radius: 8px !important;
 }
 
 .rounded-circle {
@@ -6909,175 +8621,235 @@ button.bg-dark:focus {
 }
 
 .d-flex {
-  display: -ms-flexbox !important;
   display: flex !important;
 }
 
 .d-inline-flex {
-  display: -ms-inline-flexbox !important;
   display: inline-flex !important;
 }
 
-@media (min-width: 576px) {
-  .d-sm-none {
+@media (min-width: 400px) {
+  .d-xs-none {
     display: none !important;
   }
-  .d-sm-inline {
+
+  .d-xs-inline {
     display: inline !important;
   }
-  .d-sm-inline-block {
+
+  .d-xs-inline-block {
     display: inline-block !important;
   }
-  .d-sm-block {
+
+  .d-xs-block {
     display: block !important;
   }
-  .d-sm-table {
+
+  .d-xs-table {
     display: table !important;
   }
-  .d-sm-table-row {
+
+  .d-xs-table-row {
     display: table-row !important;
   }
-  .d-sm-table-cell {
+
+  .d-xs-table-cell {
     display: table-cell !important;
   }
-  .d-sm-flex {
-    display: -ms-flexbox !important;
+
+  .d-xs-flex {
     display: flex !important;
   }
-  .d-sm-inline-flex {
-    display: -ms-inline-flexbox !important;
+
+  .d-xs-inline-flex {
     display: inline-flex !important;
   }
 }
+@media (min-width: 616px) {
+  .d-sm-none {
+    display: none !important;
+  }
 
+  .d-sm-inline {
+    display: inline !important;
+  }
+
+  .d-sm-inline-block {
+    display: inline-block !important;
+  }
+
+  .d-sm-block {
+    display: block !important;
+  }
+
+  .d-sm-table {
+    display: table !important;
+  }
+
+  .d-sm-table-row {
+    display: table-row !important;
+  }
+
+  .d-sm-table-cell {
+    display: table-cell !important;
+  }
+
+  .d-sm-flex {
+    display: flex !important;
+  }
+
+  .d-sm-inline-flex {
+    display: inline-flex !important;
+  }
+}
 @media (min-width: 768px) {
   .d-md-none {
     display: none !important;
   }
+
   .d-md-inline {
     display: inline !important;
   }
+
   .d-md-inline-block {
     display: inline-block !important;
   }
+
   .d-md-block {
     display: block !important;
   }
+
   .d-md-table {
     display: table !important;
   }
+
   .d-md-table-row {
     display: table-row !important;
   }
+
   .d-md-table-cell {
     display: table-cell !important;
   }
+
   .d-md-flex {
-    display: -ms-flexbox !important;
     display: flex !important;
   }
+
   .d-md-inline-flex {
-    display: -ms-inline-flexbox !important;
     display: inline-flex !important;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .d-lg-none {
     display: none !important;
   }
+
   .d-lg-inline {
     display: inline !important;
   }
+
   .d-lg-inline-block {
     display: inline-block !important;
   }
+
   .d-lg-block {
     display: block !important;
   }
+
   .d-lg-table {
     display: table !important;
   }
+
   .d-lg-table-row {
     display: table-row !important;
   }
+
   .d-lg-table-cell {
     display: table-cell !important;
   }
+
   .d-lg-flex {
-    display: -ms-flexbox !important;
     display: flex !important;
   }
+
   .d-lg-inline-flex {
-    display: -ms-inline-flexbox !important;
     display: inline-flex !important;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .d-xl-none {
     display: none !important;
   }
+
   .d-xl-inline {
     display: inline !important;
   }
+
   .d-xl-inline-block {
     display: inline-block !important;
   }
+
   .d-xl-block {
     display: block !important;
   }
+
   .d-xl-table {
     display: table !important;
   }
+
   .d-xl-table-row {
     display: table-row !important;
   }
+
   .d-xl-table-cell {
     display: table-cell !important;
   }
+
   .d-xl-flex {
-    display: -ms-flexbox !important;
     display: flex !important;
   }
+
   .d-xl-inline-flex {
-    display: -ms-inline-flexbox !important;
     display: inline-flex !important;
   }
 }
-
 @media print {
   .d-print-none {
     display: none !important;
   }
+
   .d-print-inline {
     display: inline !important;
   }
+
   .d-print-inline-block {
     display: inline-block !important;
   }
+
   .d-print-block {
     display: block !important;
   }
+
   .d-print-table {
     display: table !important;
   }
+
   .d-print-table-row {
     display: table-row !important;
   }
+
   .d-print-table-cell {
     display: table-cell !important;
   }
+
   .d-print-flex {
-    display: -ms-flexbox !important;
     display: flex !important;
   }
+
   .d-print-inline-flex {
-    display: -ms-inline-flexbox !important;
     display: inline-flex !important;
   }
 }
-
 .embed-responsive {
   position: relative;
   display: block;
@@ -7085,12 +8857,10 @@ button.bg-dark:focus {
   padding: 0;
   overflow: hidden;
 }
-
 .embed-responsive::before {
   display: block;
   content: "";
 }
-
 .embed-responsive .embed-responsive-item,
 .embed-responsive iframe,
 .embed-responsive embed,
@@ -7106,7 +8876,7 @@ button.bg-dark:focus {
 }
 
 .embed-responsive-21by9::before {
-  padding-top: 42.857143%;
+  padding-top: 42.8571428571%;
 }
 
 .embed-responsive-16by9::before {
@@ -7122,731 +8892,826 @@ button.bg-dark:focus {
 }
 
 .flex-row {
-  -ms-flex-direction: row !important;
   flex-direction: row !important;
 }
 
 .flex-column {
-  -ms-flex-direction: column !important;
   flex-direction: column !important;
 }
 
 .flex-row-reverse {
-  -ms-flex-direction: row-reverse !important;
   flex-direction: row-reverse !important;
 }
 
 .flex-column-reverse {
-  -ms-flex-direction: column-reverse !important;
   flex-direction: column-reverse !important;
 }
 
 .flex-wrap {
-  -ms-flex-wrap: wrap !important;
   flex-wrap: wrap !important;
 }
 
 .flex-nowrap {
-  -ms-flex-wrap: nowrap !important;
   flex-wrap: nowrap !important;
 }
 
 .flex-wrap-reverse {
-  -ms-flex-wrap: wrap-reverse !important;
   flex-wrap: wrap-reverse !important;
 }
 
 .flex-fill {
-  -ms-flex: 1 1 auto !important;
   flex: 1 1 auto !important;
 }
 
 .flex-grow-0 {
-  -ms-flex-positive: 0 !important;
   flex-grow: 0 !important;
 }
 
 .flex-grow-1 {
-  -ms-flex-positive: 1 !important;
   flex-grow: 1 !important;
 }
 
 .flex-shrink-0 {
-  -ms-flex-negative: 0 !important;
   flex-shrink: 0 !important;
 }
 
 .flex-shrink-1 {
-  -ms-flex-negative: 1 !important;
   flex-shrink: 1 !important;
 }
 
 .justify-content-start {
-  -ms-flex-pack: start !important;
   justify-content: flex-start !important;
 }
 
 .justify-content-end {
-  -ms-flex-pack: end !important;
   justify-content: flex-end !important;
 }
 
 .justify-content-center {
-  -ms-flex-pack: center !important;
   justify-content: center !important;
 }
 
 .justify-content-between {
-  -ms-flex-pack: justify !important;
   justify-content: space-between !important;
 }
 
 .justify-content-around {
-  -ms-flex-pack: distribute !important;
   justify-content: space-around !important;
 }
 
 .align-items-start {
-  -ms-flex-align: start !important;
   align-items: flex-start !important;
 }
 
 .align-items-end {
-  -ms-flex-align: end !important;
   align-items: flex-end !important;
 }
 
 .align-items-center {
-  -ms-flex-align: center !important;
   align-items: center !important;
 }
 
 .align-items-baseline {
-  -ms-flex-align: baseline !important;
   align-items: baseline !important;
 }
 
 .align-items-stretch {
-  -ms-flex-align: stretch !important;
   align-items: stretch !important;
 }
 
 .align-content-start {
-  -ms-flex-line-pack: start !important;
   align-content: flex-start !important;
 }
 
 .align-content-end {
-  -ms-flex-line-pack: end !important;
   align-content: flex-end !important;
 }
 
 .align-content-center {
-  -ms-flex-line-pack: center !important;
   align-content: center !important;
 }
 
 .align-content-between {
-  -ms-flex-line-pack: justify !important;
   align-content: space-between !important;
 }
 
 .align-content-around {
-  -ms-flex-line-pack: distribute !important;
   align-content: space-around !important;
 }
 
 .align-content-stretch {
-  -ms-flex-line-pack: stretch !important;
   align-content: stretch !important;
 }
 
 .align-self-auto {
-  -ms-flex-item-align: auto !important;
   align-self: auto !important;
 }
 
 .align-self-start {
-  -ms-flex-item-align: start !important;
   align-self: flex-start !important;
 }
 
 .align-self-end {
-  -ms-flex-item-align: end !important;
   align-self: flex-end !important;
 }
 
 .align-self-center {
-  -ms-flex-item-align: center !important;
   align-self: center !important;
 }
 
 .align-self-baseline {
-  -ms-flex-item-align: baseline !important;
   align-self: baseline !important;
 }
 
 .align-self-stretch {
-  -ms-flex-item-align: stretch !important;
   align-self: stretch !important;
 }
 
-@media (min-width: 576px) {
-  .flex-sm-row {
-    -ms-flex-direction: row !important;
+@media (min-width: 400px) {
+  .flex-xs-row {
     flex-direction: row !important;
   }
-  .flex-sm-column {
-    -ms-flex-direction: column !important;
+
+  .flex-xs-column {
     flex-direction: column !important;
   }
-  .flex-sm-row-reverse {
-    -ms-flex-direction: row-reverse !important;
+
+  .flex-xs-row-reverse {
     flex-direction: row-reverse !important;
   }
-  .flex-sm-column-reverse {
-    -ms-flex-direction: column-reverse !important;
+
+  .flex-xs-column-reverse {
     flex-direction: column-reverse !important;
   }
-  .flex-sm-wrap {
-    -ms-flex-wrap: wrap !important;
+
+  .flex-xs-wrap {
     flex-wrap: wrap !important;
   }
-  .flex-sm-nowrap {
-    -ms-flex-wrap: nowrap !important;
+
+  .flex-xs-nowrap {
     flex-wrap: nowrap !important;
   }
-  .flex-sm-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
+
+  .flex-xs-wrap-reverse {
     flex-wrap: wrap-reverse !important;
   }
-  .flex-sm-fill {
-    -ms-flex: 1 1 auto !important;
+
+  .flex-xs-fill {
     flex: 1 1 auto !important;
   }
-  .flex-sm-grow-0 {
-    -ms-flex-positive: 0 !important;
+
+  .flex-xs-grow-0 {
     flex-grow: 0 !important;
   }
-  .flex-sm-grow-1 {
-    -ms-flex-positive: 1 !important;
+
+  .flex-xs-grow-1 {
     flex-grow: 1 !important;
   }
-  .flex-sm-shrink-0 {
-    -ms-flex-negative: 0 !important;
+
+  .flex-xs-shrink-0 {
     flex-shrink: 0 !important;
   }
-  .flex-sm-shrink-1 {
-    -ms-flex-negative: 1 !important;
+
+  .flex-xs-shrink-1 {
     flex-shrink: 1 !important;
   }
-  .justify-content-sm-start {
-    -ms-flex-pack: start !important;
+
+  .justify-content-xs-start {
     justify-content: flex-start !important;
   }
-  .justify-content-sm-end {
-    -ms-flex-pack: end !important;
+
+  .justify-content-xs-end {
     justify-content: flex-end !important;
   }
-  .justify-content-sm-center {
-    -ms-flex-pack: center !important;
+
+  .justify-content-xs-center {
     justify-content: center !important;
   }
-  .justify-content-sm-between {
-    -ms-flex-pack: justify !important;
+
+  .justify-content-xs-between {
     justify-content: space-between !important;
   }
-  .justify-content-sm-around {
-    -ms-flex-pack: distribute !important;
+
+  .justify-content-xs-around {
     justify-content: space-around !important;
   }
-  .align-items-sm-start {
-    -ms-flex-align: start !important;
+
+  .align-items-xs-start {
     align-items: flex-start !important;
   }
-  .align-items-sm-end {
-    -ms-flex-align: end !important;
+
+  .align-items-xs-end {
     align-items: flex-end !important;
   }
-  .align-items-sm-center {
-    -ms-flex-align: center !important;
+
+  .align-items-xs-center {
     align-items: center !important;
   }
-  .align-items-sm-baseline {
-    -ms-flex-align: baseline !important;
+
+  .align-items-xs-baseline {
     align-items: baseline !important;
   }
-  .align-items-sm-stretch {
-    -ms-flex-align: stretch !important;
+
+  .align-items-xs-stretch {
     align-items: stretch !important;
   }
-  .align-content-sm-start {
-    -ms-flex-line-pack: start !important;
+
+  .align-content-xs-start {
     align-content: flex-start !important;
   }
-  .align-content-sm-end {
-    -ms-flex-line-pack: end !important;
+
+  .align-content-xs-end {
     align-content: flex-end !important;
   }
-  .align-content-sm-center {
-    -ms-flex-line-pack: center !important;
+
+  .align-content-xs-center {
     align-content: center !important;
   }
-  .align-content-sm-between {
-    -ms-flex-line-pack: justify !important;
+
+  .align-content-xs-between {
     align-content: space-between !important;
   }
-  .align-content-sm-around {
-    -ms-flex-line-pack: distribute !important;
+
+  .align-content-xs-around {
     align-content: space-around !important;
   }
-  .align-content-sm-stretch {
-    -ms-flex-line-pack: stretch !important;
+
+  .align-content-xs-stretch {
     align-content: stretch !important;
   }
-  .align-self-sm-auto {
-    -ms-flex-item-align: auto !important;
+
+  .align-self-xs-auto {
     align-self: auto !important;
   }
-  .align-self-sm-start {
-    -ms-flex-item-align: start !important;
+
+  .align-self-xs-start {
     align-self: flex-start !important;
   }
-  .align-self-sm-end {
-    -ms-flex-item-align: end !important;
+
+  .align-self-xs-end {
     align-self: flex-end !important;
   }
-  .align-self-sm-center {
-    -ms-flex-item-align: center !important;
+
+  .align-self-xs-center {
     align-self: center !important;
   }
-  .align-self-sm-baseline {
-    -ms-flex-item-align: baseline !important;
+
+  .align-self-xs-baseline {
     align-self: baseline !important;
   }
-  .align-self-sm-stretch {
-    -ms-flex-item-align: stretch !important;
+
+  .align-self-xs-stretch {
     align-self: stretch !important;
   }
 }
+@media (min-width: 616px) {
+  .flex-sm-row {
+    flex-direction: row !important;
+  }
 
+  .flex-sm-column {
+    flex-direction: column !important;
+  }
+
+  .flex-sm-row-reverse {
+    flex-direction: row-reverse !important;
+  }
+
+  .flex-sm-column-reverse {
+    flex-direction: column-reverse !important;
+  }
+
+  .flex-sm-wrap {
+    flex-wrap: wrap !important;
+  }
+
+  .flex-sm-nowrap {
+    flex-wrap: nowrap !important;
+  }
+
+  .flex-sm-wrap-reverse {
+    flex-wrap: wrap-reverse !important;
+  }
+
+  .flex-sm-fill {
+    flex: 1 1 auto !important;
+  }
+
+  .flex-sm-grow-0 {
+    flex-grow: 0 !important;
+  }
+
+  .flex-sm-grow-1 {
+    flex-grow: 1 !important;
+  }
+
+  .flex-sm-shrink-0 {
+    flex-shrink: 0 !important;
+  }
+
+  .flex-sm-shrink-1 {
+    flex-shrink: 1 !important;
+  }
+
+  .justify-content-sm-start {
+    justify-content: flex-start !important;
+  }
+
+  .justify-content-sm-end {
+    justify-content: flex-end !important;
+  }
+
+  .justify-content-sm-center {
+    justify-content: center !important;
+  }
+
+  .justify-content-sm-between {
+    justify-content: space-between !important;
+  }
+
+  .justify-content-sm-around {
+    justify-content: space-around !important;
+  }
+
+  .align-items-sm-start {
+    align-items: flex-start !important;
+  }
+
+  .align-items-sm-end {
+    align-items: flex-end !important;
+  }
+
+  .align-items-sm-center {
+    align-items: center !important;
+  }
+
+  .align-items-sm-baseline {
+    align-items: baseline !important;
+  }
+
+  .align-items-sm-stretch {
+    align-items: stretch !important;
+  }
+
+  .align-content-sm-start {
+    align-content: flex-start !important;
+  }
+
+  .align-content-sm-end {
+    align-content: flex-end !important;
+  }
+
+  .align-content-sm-center {
+    align-content: center !important;
+  }
+
+  .align-content-sm-between {
+    align-content: space-between !important;
+  }
+
+  .align-content-sm-around {
+    align-content: space-around !important;
+  }
+
+  .align-content-sm-stretch {
+    align-content: stretch !important;
+  }
+
+  .align-self-sm-auto {
+    align-self: auto !important;
+  }
+
+  .align-self-sm-start {
+    align-self: flex-start !important;
+  }
+
+  .align-self-sm-end {
+    align-self: flex-end !important;
+  }
+
+  .align-self-sm-center {
+    align-self: center !important;
+  }
+
+  .align-self-sm-baseline {
+    align-self: baseline !important;
+  }
+
+  .align-self-sm-stretch {
+    align-self: stretch !important;
+  }
+}
 @media (min-width: 768px) {
   .flex-md-row {
-    -ms-flex-direction: row !important;
     flex-direction: row !important;
   }
+
   .flex-md-column {
-    -ms-flex-direction: column !important;
     flex-direction: column !important;
   }
+
   .flex-md-row-reverse {
-    -ms-flex-direction: row-reverse !important;
     flex-direction: row-reverse !important;
   }
+
   .flex-md-column-reverse {
-    -ms-flex-direction: column-reverse !important;
     flex-direction: column-reverse !important;
   }
+
   .flex-md-wrap {
-    -ms-flex-wrap: wrap !important;
     flex-wrap: wrap !important;
   }
+
   .flex-md-nowrap {
-    -ms-flex-wrap: nowrap !important;
     flex-wrap: nowrap !important;
   }
+
   .flex-md-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
     flex-wrap: wrap-reverse !important;
   }
+
   .flex-md-fill {
-    -ms-flex: 1 1 auto !important;
     flex: 1 1 auto !important;
   }
+
   .flex-md-grow-0 {
-    -ms-flex-positive: 0 !important;
     flex-grow: 0 !important;
   }
+
   .flex-md-grow-1 {
-    -ms-flex-positive: 1 !important;
     flex-grow: 1 !important;
   }
+
   .flex-md-shrink-0 {
-    -ms-flex-negative: 0 !important;
     flex-shrink: 0 !important;
   }
+
   .flex-md-shrink-1 {
-    -ms-flex-negative: 1 !important;
     flex-shrink: 1 !important;
   }
+
   .justify-content-md-start {
-    -ms-flex-pack: start !important;
     justify-content: flex-start !important;
   }
+
   .justify-content-md-end {
-    -ms-flex-pack: end !important;
     justify-content: flex-end !important;
   }
+
   .justify-content-md-center {
-    -ms-flex-pack: center !important;
     justify-content: center !important;
   }
+
   .justify-content-md-between {
-    -ms-flex-pack: justify !important;
     justify-content: space-between !important;
   }
+
   .justify-content-md-around {
-    -ms-flex-pack: distribute !important;
     justify-content: space-around !important;
   }
+
   .align-items-md-start {
-    -ms-flex-align: start !important;
     align-items: flex-start !important;
   }
+
   .align-items-md-end {
-    -ms-flex-align: end !important;
     align-items: flex-end !important;
   }
+
   .align-items-md-center {
-    -ms-flex-align: center !important;
     align-items: center !important;
   }
+
   .align-items-md-baseline {
-    -ms-flex-align: baseline !important;
     align-items: baseline !important;
   }
+
   .align-items-md-stretch {
-    -ms-flex-align: stretch !important;
     align-items: stretch !important;
   }
+
   .align-content-md-start {
-    -ms-flex-line-pack: start !important;
     align-content: flex-start !important;
   }
+
   .align-content-md-end {
-    -ms-flex-line-pack: end !important;
     align-content: flex-end !important;
   }
+
   .align-content-md-center {
-    -ms-flex-line-pack: center !important;
     align-content: center !important;
   }
+
   .align-content-md-between {
-    -ms-flex-line-pack: justify !important;
     align-content: space-between !important;
   }
+
   .align-content-md-around {
-    -ms-flex-line-pack: distribute !important;
     align-content: space-around !important;
   }
+
   .align-content-md-stretch {
-    -ms-flex-line-pack: stretch !important;
     align-content: stretch !important;
   }
+
   .align-self-md-auto {
-    -ms-flex-item-align: auto !important;
     align-self: auto !important;
   }
+
   .align-self-md-start {
-    -ms-flex-item-align: start !important;
     align-self: flex-start !important;
   }
+
   .align-self-md-end {
-    -ms-flex-item-align: end !important;
     align-self: flex-end !important;
   }
+
   .align-self-md-center {
-    -ms-flex-item-align: center !important;
     align-self: center !important;
   }
+
   .align-self-md-baseline {
-    -ms-flex-item-align: baseline !important;
     align-self: baseline !important;
   }
+
   .align-self-md-stretch {
-    -ms-flex-item-align: stretch !important;
     align-self: stretch !important;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .flex-lg-row {
-    -ms-flex-direction: row !important;
     flex-direction: row !important;
   }
+
   .flex-lg-column {
-    -ms-flex-direction: column !important;
     flex-direction: column !important;
   }
+
   .flex-lg-row-reverse {
-    -ms-flex-direction: row-reverse !important;
     flex-direction: row-reverse !important;
   }
+
   .flex-lg-column-reverse {
-    -ms-flex-direction: column-reverse !important;
     flex-direction: column-reverse !important;
   }
+
   .flex-lg-wrap {
-    -ms-flex-wrap: wrap !important;
     flex-wrap: wrap !important;
   }
+
   .flex-lg-nowrap {
-    -ms-flex-wrap: nowrap !important;
     flex-wrap: nowrap !important;
   }
+
   .flex-lg-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
     flex-wrap: wrap-reverse !important;
   }
+
   .flex-lg-fill {
-    -ms-flex: 1 1 auto !important;
     flex: 1 1 auto !important;
   }
+
   .flex-lg-grow-0 {
-    -ms-flex-positive: 0 !important;
     flex-grow: 0 !important;
   }
+
   .flex-lg-grow-1 {
-    -ms-flex-positive: 1 !important;
     flex-grow: 1 !important;
   }
+
   .flex-lg-shrink-0 {
-    -ms-flex-negative: 0 !important;
     flex-shrink: 0 !important;
   }
+
   .flex-lg-shrink-1 {
-    -ms-flex-negative: 1 !important;
     flex-shrink: 1 !important;
   }
+
   .justify-content-lg-start {
-    -ms-flex-pack: start !important;
     justify-content: flex-start !important;
   }
+
   .justify-content-lg-end {
-    -ms-flex-pack: end !important;
     justify-content: flex-end !important;
   }
+
   .justify-content-lg-center {
-    -ms-flex-pack: center !important;
     justify-content: center !important;
   }
+
   .justify-content-lg-between {
-    -ms-flex-pack: justify !important;
     justify-content: space-between !important;
   }
+
   .justify-content-lg-around {
-    -ms-flex-pack: distribute !important;
     justify-content: space-around !important;
   }
+
   .align-items-lg-start {
-    -ms-flex-align: start !important;
     align-items: flex-start !important;
   }
+
   .align-items-lg-end {
-    -ms-flex-align: end !important;
     align-items: flex-end !important;
   }
+
   .align-items-lg-center {
-    -ms-flex-align: center !important;
     align-items: center !important;
   }
+
   .align-items-lg-baseline {
-    -ms-flex-align: baseline !important;
     align-items: baseline !important;
   }
+
   .align-items-lg-stretch {
-    -ms-flex-align: stretch !important;
     align-items: stretch !important;
   }
+
   .align-content-lg-start {
-    -ms-flex-line-pack: start !important;
     align-content: flex-start !important;
   }
+
   .align-content-lg-end {
-    -ms-flex-line-pack: end !important;
     align-content: flex-end !important;
   }
+
   .align-content-lg-center {
-    -ms-flex-line-pack: center !important;
     align-content: center !important;
   }
+
   .align-content-lg-between {
-    -ms-flex-line-pack: justify !important;
     align-content: space-between !important;
   }
+
   .align-content-lg-around {
-    -ms-flex-line-pack: distribute !important;
     align-content: space-around !important;
   }
+
   .align-content-lg-stretch {
-    -ms-flex-line-pack: stretch !important;
     align-content: stretch !important;
   }
+
   .align-self-lg-auto {
-    -ms-flex-item-align: auto !important;
     align-self: auto !important;
   }
+
   .align-self-lg-start {
-    -ms-flex-item-align: start !important;
     align-self: flex-start !important;
   }
+
   .align-self-lg-end {
-    -ms-flex-item-align: end !important;
     align-self: flex-end !important;
   }
+
   .align-self-lg-center {
-    -ms-flex-item-align: center !important;
     align-self: center !important;
   }
+
   .align-self-lg-baseline {
-    -ms-flex-item-align: baseline !important;
     align-self: baseline !important;
   }
+
   .align-self-lg-stretch {
-    -ms-flex-item-align: stretch !important;
     align-self: stretch !important;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .flex-xl-row {
-    -ms-flex-direction: row !important;
     flex-direction: row !important;
   }
+
   .flex-xl-column {
-    -ms-flex-direction: column !important;
     flex-direction: column !important;
   }
+
   .flex-xl-row-reverse {
-    -ms-flex-direction: row-reverse !important;
     flex-direction: row-reverse !important;
   }
+
   .flex-xl-column-reverse {
-    -ms-flex-direction: column-reverse !important;
     flex-direction: column-reverse !important;
   }
+
   .flex-xl-wrap {
-    -ms-flex-wrap: wrap !important;
     flex-wrap: wrap !important;
   }
+
   .flex-xl-nowrap {
-    -ms-flex-wrap: nowrap !important;
     flex-wrap: nowrap !important;
   }
+
   .flex-xl-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
     flex-wrap: wrap-reverse !important;
   }
+
   .flex-xl-fill {
-    -ms-flex: 1 1 auto !important;
     flex: 1 1 auto !important;
   }
+
   .flex-xl-grow-0 {
-    -ms-flex-positive: 0 !important;
     flex-grow: 0 !important;
   }
+
   .flex-xl-grow-1 {
-    -ms-flex-positive: 1 !important;
     flex-grow: 1 !important;
   }
+
   .flex-xl-shrink-0 {
-    -ms-flex-negative: 0 !important;
     flex-shrink: 0 !important;
   }
+
   .flex-xl-shrink-1 {
-    -ms-flex-negative: 1 !important;
     flex-shrink: 1 !important;
   }
+
   .justify-content-xl-start {
-    -ms-flex-pack: start !important;
     justify-content: flex-start !important;
   }
+
   .justify-content-xl-end {
-    -ms-flex-pack: end !important;
     justify-content: flex-end !important;
   }
+
   .justify-content-xl-center {
-    -ms-flex-pack: center !important;
     justify-content: center !important;
   }
+
   .justify-content-xl-between {
-    -ms-flex-pack: justify !important;
     justify-content: space-between !important;
   }
+
   .justify-content-xl-around {
-    -ms-flex-pack: distribute !important;
     justify-content: space-around !important;
   }
+
   .align-items-xl-start {
-    -ms-flex-align: start !important;
     align-items: flex-start !important;
   }
+
   .align-items-xl-end {
-    -ms-flex-align: end !important;
     align-items: flex-end !important;
   }
+
   .align-items-xl-center {
-    -ms-flex-align: center !important;
     align-items: center !important;
   }
+
   .align-items-xl-baseline {
-    -ms-flex-align: baseline !important;
     align-items: baseline !important;
   }
+
   .align-items-xl-stretch {
-    -ms-flex-align: stretch !important;
     align-items: stretch !important;
   }
+
   .align-content-xl-start {
-    -ms-flex-line-pack: start !important;
     align-content: flex-start !important;
   }
+
   .align-content-xl-end {
-    -ms-flex-line-pack: end !important;
     align-content: flex-end !important;
   }
+
   .align-content-xl-center {
-    -ms-flex-line-pack: center !important;
     align-content: center !important;
   }
+
   .align-content-xl-between {
-    -ms-flex-line-pack: justify !important;
     align-content: space-between !important;
   }
+
   .align-content-xl-around {
-    -ms-flex-line-pack: distribute !important;
     align-content: space-around !important;
   }
+
   .align-content-xl-stretch {
-    -ms-flex-line-pack: stretch !important;
     align-content: stretch !important;
   }
+
   .align-self-xl-auto {
-    -ms-flex-item-align: auto !important;
     align-self: auto !important;
   }
+
   .align-self-xl-start {
-    -ms-flex-item-align: start !important;
     align-self: flex-start !important;
   }
+
   .align-self-xl-end {
-    -ms-flex-item-align: end !important;
     align-self: flex-end !important;
   }
+
   .align-self-xl-center {
-    -ms-flex-item-align: center !important;
     align-self: center !important;
   }
+
   .align-self-xl-baseline {
-    -ms-flex-item-align: baseline !important;
     align-self: baseline !important;
   }
+
   .align-self-xl-stretch {
-    -ms-flex-item-align: stretch !important;
     align-self: stretch !important;
   }
 }
-
 .float-left {
   float: left !important;
 }
@@ -7859,54 +9724,71 @@ button.bg-dark:focus {
   float: none !important;
 }
 
-@media (min-width: 576px) {
+@media (min-width: 400px) {
+  .float-xs-left {
+    float: left !important;
+  }
+
+  .float-xs-right {
+    float: right !important;
+  }
+
+  .float-xs-none {
+    float: none !important;
+  }
+}
+@media (min-width: 616px) {
   .float-sm-left {
     float: left !important;
   }
+
   .float-sm-right {
     float: right !important;
   }
+
   .float-sm-none {
     float: none !important;
   }
 }
-
 @media (min-width: 768px) {
   .float-md-left {
     float: left !important;
   }
+
   .float-md-right {
     float: right !important;
   }
+
   .float-md-none {
     float: none !important;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .float-lg-left {
     float: left !important;
   }
+
   .float-lg-right {
     float: right !important;
   }
+
   .float-lg-none {
     float: none !important;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .float-xl-left {
     float: left !important;
   }
+
   .float-xl-right {
     float: right !important;
   }
+
   .float-xl-none {
     float: none !important;
   }
 }
-
 .overflow-auto {
   overflow: auto !important;
 }
@@ -7932,7 +9814,6 @@ button.bg-dark:focus {
 }
 
 .position-sticky {
-  position: -webkit-sticky !important;
   position: sticky !important;
 }
 
@@ -7952,14 +9833,14 @@ button.bg-dark:focus {
   z-index: 1030;
 }
 
-.sticky-top {
-  position: -webkit-sticky;
-  position: sticky;
-  top: 0;
-  z-index: 1020;
+@supports (position: sticky) {
+  .sticky-top {
+    position: sticky;
+    top: 0;
+    z-index: 1020;
+  }
 }
 
-
 .sr-only {
   position: absolute;
   width: 1px;
@@ -7982,15 +9863,15 @@ button.bg-dark:focus {
 }
 
 .shadow-sm {
-  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
+  box-shadow: 0 2px 14px rgba(108, 117, 125, 0.2) !important;
 }
 
 .shadow {
-  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
+  box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2) !important;
 }
 
 .shadow-lg {
-  box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;
+  box-shadow: 0 12px 32px rgba(108, 117, 125, 0.2) !important;
 }
 
 .shadow-none {
@@ -8098,123 +9979,291 @@ button.bg-dark:focus {
 }
 
 .m-1 {
-  margin: 0.25rem !important;
+  margin: 8px !important;
 }
 
 .mt-1,
 .my-1 {
-  margin-top: 0.25rem !important;
+  margin-top: 8px !important;
 }
 
 .mr-1,
 .mx-1 {
-  margin-right: 0.25rem !important;
+  margin-right: 8px !important;
 }
 
 .mb-1,
 .my-1 {
-  margin-bottom: 0.25rem !important;
+  margin-bottom: 8px !important;
 }
 
 .ml-1,
 .mx-1 {
-  margin-left: 0.25rem !important;
+  margin-left: 8px !important;
 }
 
 .m-2 {
-  margin: 0.5rem !important;
+  margin: 16px !important;
 }
 
 .mt-2,
 .my-2 {
-  margin-top: 0.5rem !important;
+  margin-top: 16px !important;
 }
 
 .mr-2,
 .mx-2 {
-  margin-right: 0.5rem !important;
+  margin-right: 16px !important;
 }
 
 .mb-2,
 .my-2 {
-  margin-bottom: 0.5rem !important;
+  margin-bottom: 16px !important;
 }
 
 .ml-2,
 .mx-2 {
-  margin-left: 0.5rem !important;
+  margin-left: 16px !important;
 }
 
 .m-3 {
-  margin: 1rem !important;
+  margin: 24px !important;
 }
 
 .mt-3,
 .my-3 {
-  margin-top: 1rem !important;
+  margin-top: 24px !important;
 }
 
 .mr-3,
 .mx-3 {
-  margin-right: 1rem !important;
+  margin-right: 24px !important;
 }
 
 .mb-3,
 .my-3 {
-  margin-bottom: 1rem !important;
+  margin-bottom: 24px !important;
 }
 
 .ml-3,
 .mx-3 {
-  margin-left: 1rem !important;
+  margin-left: 24px !important;
 }
 
 .m-4 {
-  margin: 1.5rem !important;
+  margin: 32px !important;
 }
 
 .mt-4,
 .my-4 {
-  margin-top: 1.5rem !important;
+  margin-top: 32px !important;
 }
 
 .mr-4,
 .mx-4 {
-  margin-right: 1.5rem !important;
+  margin-right: 32px !important;
 }
 
 .mb-4,
 .my-4 {
-  margin-bottom: 1.5rem !important;
+  margin-bottom: 32px !important;
 }
 
 .ml-4,
 .mx-4 {
-  margin-left: 1.5rem !important;
+  margin-left: 32px !important;
 }
 
 .m-5 {
-  margin: 3rem !important;
+  margin: 40px !important;
 }
 
 .mt-5,
 .my-5 {
-  margin-top: 3rem !important;
+  margin-top: 40px !important;
 }
 
 .mr-5,
 .mx-5 {
-  margin-right: 3rem !important;
+  margin-right: 40px !important;
 }
 
 .mb-5,
 .my-5 {
-  margin-bottom: 3rem !important;
+  margin-bottom: 40px !important;
 }
 
 .ml-5,
 .mx-5 {
-  margin-left: 3rem !important;
+  margin-left: 40px !important;
+}
+
+.m-6 {
+  margin: 48px !important;
+}
+
+.mt-6,
+.my-6 {
+  margin-top: 48px !important;
+}
+
+.mr-6,
+.mx-6 {
+  margin-right: 48px !important;
+}
+
+.mb-6,
+.my-6 {
+  margin-bottom: 48px !important;
+}
+
+.ml-6,
+.mx-6 {
+  margin-left: 48px !important;
+}
+
+.m-7 {
+  margin: 56px !important;
+}
+
+.mt-7,
+.my-7 {
+  margin-top: 56px !important;
+}
+
+.mr-7,
+.mx-7 {
+  margin-right: 56px !important;
+}
+
+.mb-7,
+.my-7 {
+  margin-bottom: 56px !important;
+}
+
+.ml-7,
+.mx-7 {
+  margin-left: 56px !important;
+}
+
+.m-8 {
+  margin: 64px !important;
+}
+
+.mt-8,
+.my-8 {
+  margin-top: 64px !important;
+}
+
+.mr-8,
+.mx-8 {
+  margin-right: 64px !important;
+}
+
+.mb-8,
+.my-8 {
+  margin-bottom: 64px !important;
+}
+
+.ml-8,
+.mx-8 {
+  margin-left: 64px !important;
+}
+
+.m-9 {
+  margin: 72px !important;
+}
+
+.mt-9,
+.my-9 {
+  margin-top: 72px !important;
+}
+
+.mr-9,
+.mx-9 {
+  margin-right: 72px !important;
+}
+
+.mb-9,
+.my-9 {
+  margin-bottom: 72px !important;
+}
+
+.ml-9,
+.mx-9 {
+  margin-left: 72px !important;
+}
+
+.m-10 {
+  margin: 80px !important;
+}
+
+.mt-10,
+.my-10 {
+  margin-top: 80px !important;
+}
+
+.mr-10,
+.mx-10 {
+  margin-right: 80px !important;
+}
+
+.mb-10,
+.my-10 {
+  margin-bottom: 80px !important;
+}
+
+.ml-10,
+.mx-10 {
+  margin-left: 80px !important;
+}
+
+.m-12 {
+  margin: 96px !important;
+}
+
+.mt-12,
+.my-12 {
+  margin-top: 96px !important;
+}
+
+.mr-12,
+.mx-12 {
+  margin-right: 96px !important;
+}
+
+.mb-12,
+.my-12 {
+  margin-bottom: 96px !important;
+}
+
+.ml-12,
+.mx-12 {
+  margin-left: 96px !important;
+}
+
+.m-15 {
+  margin: 120px !important;
+}
+
+.mt-15,
+.my-15 {
+  margin-top: 120px !important;
+}
+
+.mr-15,
+.mx-15 {
+  margin-right: 120px !important;
+}
+
+.mb-15,
+.my-15 {
+  margin-bottom: 120px !important;
+}
+
+.ml-15,
+.mx-15 {
+  margin-left: 120px !important;
 }
 
 .p-0 {
@@ -8242,243 +10291,579 @@ button.bg-dark:focus {
 }
 
 .p-1 {
-  padding: 0.25rem !important;
+  padding: 8px !important;
 }
 
 .pt-1,
 .py-1 {
-  padding-top: 0.25rem !important;
+  padding-top: 8px !important;
 }
 
 .pr-1,
 .px-1 {
-  padding-right: 0.25rem !important;
+  padding-right: 8px !important;
 }
 
 .pb-1,
 .py-1 {
-  padding-bottom: 0.25rem !important;
+  padding-bottom: 8px !important;
 }
 
 .pl-1,
 .px-1 {
-  padding-left: 0.25rem !important;
+  padding-left: 8px !important;
 }
 
 .p-2 {
-  padding: 0.5rem !important;
+  padding: 16px !important;
 }
 
 .pt-2,
 .py-2 {
-  padding-top: 0.5rem !important;
+  padding-top: 16px !important;
 }
 
 .pr-2,
 .px-2 {
-  padding-right: 0.5rem !important;
+  padding-right: 16px !important;
 }
 
 .pb-2,
 .py-2 {
-  padding-bottom: 0.5rem !important;
+  padding-bottom: 16px !important;
 }
 
 .pl-2,
 .px-2 {
-  padding-left: 0.5rem !important;
+  padding-left: 16px !important;
 }
 
 .p-3 {
-  padding: 1rem !important;
+  padding: 24px !important;
 }
 
 .pt-3,
 .py-3 {
-  padding-top: 1rem !important;
+  padding-top: 24px !important;
 }
 
 .pr-3,
 .px-3 {
-  padding-right: 1rem !important;
+  padding-right: 24px !important;
 }
 
 .pb-3,
 .py-3 {
-  padding-bottom: 1rem !important;
+  padding-bottom: 24px !important;
 }
 
 .pl-3,
 .px-3 {
-  padding-left: 1rem !important;
+  padding-left: 24px !important;
 }
 
 .p-4 {
-  padding: 1.5rem !important;
+  padding: 32px !important;
 }
 
 .pt-4,
 .py-4 {
-  padding-top: 1.5rem !important;
+  padding-top: 32px !important;
 }
 
 .pr-4,
 .px-4 {
-  padding-right: 1.5rem !important;
+  padding-right: 32px !important;
 }
 
 .pb-4,
 .py-4 {
-  padding-bottom: 1.5rem !important;
+  padding-bottom: 32px !important;
 }
 
 .pl-4,
 .px-4 {
-  padding-left: 1.5rem !important;
+  padding-left: 32px !important;
 }
 
 .p-5 {
-  padding: 3rem !important;
+  padding: 40px !important;
 }
 
 .pt-5,
 .py-5 {
-  padding-top: 3rem !important;
+  padding-top: 40px !important;
 }
 
 .pr-5,
 .px-5 {
-  padding-right: 3rem !important;
+  padding-right: 40px !important;
 }
 
 .pb-5,
 .py-5 {
-  padding-bottom: 3rem !important;
+  padding-bottom: 40px !important;
 }
 
 .pl-5,
 .px-5 {
-  padding-left: 3rem !important;
+  padding-left: 40px !important;
+}
+
+.p-6 {
+  padding: 48px !important;
+}
+
+.pt-6,
+.py-6 {
+  padding-top: 48px !important;
+}
+
+.pr-6,
+.px-6 {
+  padding-right: 48px !important;
+}
+
+.pb-6,
+.py-6 {
+  padding-bottom: 48px !important;
+}
+
+.pl-6,
+.px-6 {
+  padding-left: 48px !important;
+}
+
+.p-7 {
+  padding: 56px !important;
+}
+
+.pt-7,
+.py-7 {
+  padding-top: 56px !important;
+}
+
+.pr-7,
+.px-7 {
+  padding-right: 56px !important;
+}
+
+.pb-7,
+.py-7 {
+  padding-bottom: 56px !important;
+}
+
+.pl-7,
+.px-7 {
+  padding-left: 56px !important;
+}
+
+.p-8 {
+  padding: 64px !important;
+}
+
+.pt-8,
+.py-8 {
+  padding-top: 64px !important;
+}
+
+.pr-8,
+.px-8 {
+  padding-right: 64px !important;
+}
+
+.pb-8,
+.py-8 {
+  padding-bottom: 64px !important;
+}
+
+.pl-8,
+.px-8 {
+  padding-left: 64px !important;
+}
+
+.p-9 {
+  padding: 72px !important;
+}
+
+.pt-9,
+.py-9 {
+  padding-top: 72px !important;
+}
+
+.pr-9,
+.px-9 {
+  padding-right: 72px !important;
+}
+
+.pb-9,
+.py-9 {
+  padding-bottom: 72px !important;
+}
+
+.pl-9,
+.px-9 {
+  padding-left: 72px !important;
+}
+
+.p-10 {
+  padding: 80px !important;
+}
+
+.pt-10,
+.py-10 {
+  padding-top: 80px !important;
+}
+
+.pr-10,
+.px-10 {
+  padding-right: 80px !important;
+}
+
+.pb-10,
+.py-10 {
+  padding-bottom: 80px !important;
+}
+
+.pl-10,
+.px-10 {
+  padding-left: 80px !important;
+}
+
+.p-12 {
+  padding: 96px !important;
+}
+
+.pt-12,
+.py-12 {
+  padding-top: 96px !important;
+}
+
+.pr-12,
+.px-12 {
+  padding-right: 96px !important;
+}
+
+.pb-12,
+.py-12 {
+  padding-bottom: 96px !important;
+}
+
+.pl-12,
+.px-12 {
+  padding-left: 96px !important;
+}
+
+.p-15 {
+  padding: 120px !important;
+}
+
+.pt-15,
+.py-15 {
+  padding-top: 120px !important;
+}
+
+.pr-15,
+.px-15 {
+  padding-right: 120px !important;
+}
+
+.pb-15,
+.py-15 {
+  padding-bottom: 120px !important;
+}
+
+.pl-15,
+.px-15 {
+  padding-left: 120px !important;
 }
 
 .m-n1 {
-  margin: -0.25rem !important;
+  margin: -8px !important;
 }
 
 .mt-n1,
 .my-n1 {
-  margin-top: -0.25rem !important;
+  margin-top: -8px !important;
 }
 
 .mr-n1,
 .mx-n1 {
-  margin-right: -0.25rem !important;
+  margin-right: -8px !important;
 }
 
 .mb-n1,
 .my-n1 {
-  margin-bottom: -0.25rem !important;
+  margin-bottom: -8px !important;
 }
 
 .ml-n1,
 .mx-n1 {
-  margin-left: -0.25rem !important;
+  margin-left: -8px !important;
 }
 
 .m-n2 {
-  margin: -0.5rem !important;
+  margin: -16px !important;
 }
 
 .mt-n2,
 .my-n2 {
-  margin-top: -0.5rem !important;
+  margin-top: -16px !important;
 }
 
 .mr-n2,
 .mx-n2 {
-  margin-right: -0.5rem !important;
+  margin-right: -16px !important;
 }
 
 .mb-n2,
 .my-n2 {
-  margin-bottom: -0.5rem !important;
+  margin-bottom: -16px !important;
 }
 
 .ml-n2,
 .mx-n2 {
-  margin-left: -0.5rem !important;
+  margin-left: -16px !important;
 }
 
 .m-n3 {
-  margin: -1rem !important;
+  margin: -24px !important;
 }
 
 .mt-n3,
 .my-n3 {
-  margin-top: -1rem !important;
+  margin-top: -24px !important;
 }
 
 .mr-n3,
 .mx-n3 {
-  margin-right: -1rem !important;
+  margin-right: -24px !important;
 }
 
 .mb-n3,
 .my-n3 {
-  margin-bottom: -1rem !important;
+  margin-bottom: -24px !important;
 }
 
 .ml-n3,
 .mx-n3 {
-  margin-left: -1rem !important;
+  margin-left: -24px !important;
 }
 
 .m-n4 {
-  margin: -1.5rem !important;
+  margin: -32px !important;
 }
 
 .mt-n4,
 .my-n4 {
-  margin-top: -1.5rem !important;
+  margin-top: -32px !important;
 }
 
 .mr-n4,
 .mx-n4 {
-  margin-right: -1.5rem !important;
+  margin-right: -32px !important;
 }
 
 .mb-n4,
 .my-n4 {
-  margin-bottom: -1.5rem !important;
+  margin-bottom: -32px !important;
 }
 
 .ml-n4,
 .mx-n4 {
-  margin-left: -1.5rem !important;
+  margin-left: -32px !important;
 }
 
 .m-n5 {
-  margin: -3rem !important;
+  margin: -40px !important;
 }
 
 .mt-n5,
 .my-n5 {
-  margin-top: -3rem !important;
+  margin-top: -40px !important;
 }
 
 .mr-n5,
 .mx-n5 {
-  margin-right: -3rem !important;
+  margin-right: -40px !important;
 }
 
 .mb-n5,
 .my-n5 {
-  margin-bottom: -3rem !important;
+  margin-bottom: -40px !important;
 }
 
 .ml-n5,
 .mx-n5 {
-  margin-left: -3rem !important;
+  margin-left: -40px !important;
+}
+
+.m-n6 {
+  margin: -48px !important;
+}
+
+.mt-n6,
+.my-n6 {
+  margin-top: -48px !important;
+}
+
+.mr-n6,
+.mx-n6 {
+  margin-right: -48px !important;
+}
+
+.mb-n6,
+.my-n6 {
+  margin-bottom: -48px !important;
+}
+
+.ml-n6,
+.mx-n6 {
+  margin-left: -48px !important;
+}
+
+.m-n7 {
+  margin: -56px !important;
+}
+
+.mt-n7,
+.my-n7 {
+  margin-top: -56px !important;
+}
+
+.mr-n7,
+.mx-n7 {
+  margin-right: -56px !important;
+}
+
+.mb-n7,
+.my-n7 {
+  margin-bottom: -56px !important;
+}
+
+.ml-n7,
+.mx-n7 {
+  margin-left: -56px !important;
+}
+
+.m-n8 {
+  margin: -64px !important;
+}
+
+.mt-n8,
+.my-n8 {
+  margin-top: -64px !important;
+}
+
+.mr-n8,
+.mx-n8 {
+  margin-right: -64px !important;
+}
+
+.mb-n8,
+.my-n8 {
+  margin-bottom: -64px !important;
+}
+
+.ml-n8,
+.mx-n8 {
+  margin-left: -64px !important;
+}
+
+.m-n9 {
+  margin: -72px !important;
+}
+
+.mt-n9,
+.my-n9 {
+  margin-top: -72px !important;
+}
+
+.mr-n9,
+.mx-n9 {
+  margin-right: -72px !important;
+}
+
+.mb-n9,
+.my-n9 {
+  margin-bottom: -72px !important;
+}
+
+.ml-n9,
+.mx-n9 {
+  margin-left: -72px !important;
+}
+
+.m-n10 {
+  margin: -80px !important;
+}
+
+.mt-n10,
+.my-n10 {
+  margin-top: -80px !important;
+}
+
+.mr-n10,
+.mx-n10 {
+  margin-right: -80px !important;
+}
+
+.mb-n10,
+.my-n10 {
+  margin-bottom: -80px !important;
+}
+
+.ml-n10,
+.mx-n10 {
+  margin-left: -80px !important;
+}
+
+.m-n12 {
+  margin: -96px !important;
+}
+
+.mt-n12,
+.my-n12 {
+  margin-top: -96px !important;
+}
+
+.mr-n12,
+.mx-n12 {
+  margin-right: -96px !important;
+}
+
+.mb-n12,
+.my-n12 {
+  margin-bottom: -96px !important;
+}
+
+.ml-n12,
+.mx-n12 {
+  margin-left: -96px !important;
+}
+
+.m-n15 {
+  margin: -120px !important;
+}
+
+.mt-n15,
+.my-n15 {
+  margin-top: -120px !important;
+}
+
+.mr-n15,
+.mx-n15 {
+  margin-right: -120px !important;
+}
+
+.mb-n15,
+.my-n15 {
+  margin-bottom: -120px !important;
+}
+
+.ml-n15,
+.mx-n15 {
+  margin-left: -120px !important;
 }
 
 .m-auto {
@@ -8505,1386 +10890,4691 @@ button.bg-dark:focus {
   margin-left: auto !important;
 }
 
-@media (min-width: 576px) {
-  .m-sm-0 {
+@media (min-width: 400px) {
+  .m-xs-0 {
     margin: 0 !important;
   }
-  .mt-sm-0,
-  .my-sm-0 {
+
+  .mt-xs-0,
+.my-xs-0 {
     margin-top: 0 !important;
   }
-  .mr-sm-0,
-  .mx-sm-0 {
+
+  .mr-xs-0,
+.mx-xs-0 {
     margin-right: 0 !important;
   }
-  .mb-sm-0,
-  .my-sm-0 {
+
+  .mb-xs-0,
+.my-xs-0 {
     margin-bottom: 0 !important;
   }
-  .ml-sm-0,
-  .mx-sm-0 {
+
+  .ml-xs-0,
+.mx-xs-0 {
     margin-left: 0 !important;
   }
-  .m-sm-1 {
-    margin: 0.25rem !important;
+
+  .m-xs-1 {
+    margin: 8px !important;
   }
-  .mt-sm-1,
-  .my-sm-1 {
-    margin-top: 0.25rem !important;
+
+  .mt-xs-1,
+.my-xs-1 {
+    margin-top: 8px !important;
   }
-  .mr-sm-1,
-  .mx-sm-1 {
-    margin-right: 0.25rem !important;
+
+  .mr-xs-1,
+.mx-xs-1 {
+    margin-right: 8px !important;
   }
-  .mb-sm-1,
-  .my-sm-1 {
-    margin-bottom: 0.25rem !important;
+
+  .mb-xs-1,
+.my-xs-1 {
+    margin-bottom: 8px !important;
   }
-  .ml-sm-1,
-  .mx-sm-1 {
-    margin-left: 0.25rem !important;
+
+  .ml-xs-1,
+.mx-xs-1 {
+    margin-left: 8px !important;
   }
-  .m-sm-2 {
-    margin: 0.5rem !important;
+
+  .m-xs-2 {
+    margin: 16px !important;
   }
-  .mt-sm-2,
-  .my-sm-2 {
-    margin-top: 0.5rem !important;
+
+  .mt-xs-2,
+.my-xs-2 {
+    margin-top: 16px !important;
   }
-  .mr-sm-2,
-  .mx-sm-2 {
-    margin-right: 0.5rem !important;
+
+  .mr-xs-2,
+.mx-xs-2 {
+    margin-right: 16px !important;
   }
-  .mb-sm-2,
-  .my-sm-2 {
-    margin-bottom: 0.5rem !important;
+
+  .mb-xs-2,
+.my-xs-2 {
+    margin-bottom: 16px !important;
   }
-  .ml-sm-2,
-  .mx-sm-2 {
-    margin-left: 0.5rem !important;
+
+  .ml-xs-2,
+.mx-xs-2 {
+    margin-left: 16px !important;
   }
-  .m-sm-3 {
-    margin: 1rem !important;
+
+  .m-xs-3 {
+    margin: 24px !important;
   }
-  .mt-sm-3,
-  .my-sm-3 {
-    margin-top: 1rem !important;
+
+  .mt-xs-3,
+.my-xs-3 {
+    margin-top: 24px !important;
   }
-  .mr-sm-3,
-  .mx-sm-3 {
-    margin-right: 1rem !important;
+
+  .mr-xs-3,
+.mx-xs-3 {
+    margin-right: 24px !important;
   }
-  .mb-sm-3,
-  .my-sm-3 {
-    margin-bottom: 1rem !important;
+
+  .mb-xs-3,
+.my-xs-3 {
+    margin-bottom: 24px !important;
   }
-  .ml-sm-3,
-  .mx-sm-3 {
-    margin-left: 1rem !important;
+
+  .ml-xs-3,
+.mx-xs-3 {
+    margin-left: 24px !important;
   }
-  .m-sm-4 {
-    margin: 1.5rem !important;
+
+  .m-xs-4 {
+    margin: 32px !important;
   }
-  .mt-sm-4,
-  .my-sm-4 {
-    margin-top: 1.5rem !important;
+
+  .mt-xs-4,
+.my-xs-4 {
+    margin-top: 32px !important;
   }
-  .mr-sm-4,
-  .mx-sm-4 {
-    margin-right: 1.5rem !important;
+
+  .mr-xs-4,
+.mx-xs-4 {
+    margin-right: 32px !important;
   }
-  .mb-sm-4,
-  .my-sm-4 {
-    margin-bottom: 1.5rem !important;
+
+  .mb-xs-4,
+.my-xs-4 {
+    margin-bottom: 32px !important;
   }
-  .ml-sm-4,
-  .mx-sm-4 {
-    margin-left: 1.5rem !important;
+
+  .ml-xs-4,
+.mx-xs-4 {
+    margin-left: 32px !important;
   }
-  .m-sm-5 {
-    margin: 3rem !important;
+
+  .m-xs-5 {
+    margin: 40px !important;
   }
-  .mt-sm-5,
-  .my-sm-5 {
-    margin-top: 3rem !important;
+
+  .mt-xs-5,
+.my-xs-5 {
+    margin-top: 40px !important;
   }
-  .mr-sm-5,
-  .mx-sm-5 {
-    margin-right: 3rem !important;
+
+  .mr-xs-5,
+.mx-xs-5 {
+    margin-right: 40px !important;
   }
-  .mb-sm-5,
-  .my-sm-5 {
-    margin-bottom: 3rem !important;
+
+  .mb-xs-5,
+.my-xs-5 {
+    margin-bottom: 40px !important;
   }
-  .ml-sm-5,
-  .mx-sm-5 {
-    margin-left: 3rem !important;
+
+  .ml-xs-5,
+.mx-xs-5 {
+    margin-left: 40px !important;
   }
-  .p-sm-0 {
+
+  .m-xs-6 {
+    margin: 48px !important;
+  }
+
+  .mt-xs-6,
+.my-xs-6 {
+    margin-top: 48px !important;
+  }
+
+  .mr-xs-6,
+.mx-xs-6 {
+    margin-right: 48px !important;
+  }
+
+  .mb-xs-6,
+.my-xs-6 {
+    margin-bottom: 48px !important;
+  }
+
+  .ml-xs-6,
+.mx-xs-6 {
+    margin-left: 48px !important;
+  }
+
+  .m-xs-7 {
+    margin: 56px !important;
+  }
+
+  .mt-xs-7,
+.my-xs-7 {
+    margin-top: 56px !important;
+  }
+
+  .mr-xs-7,
+.mx-xs-7 {
+    margin-right: 56px !important;
+  }
+
+  .mb-xs-7,
+.my-xs-7 {
+    margin-bottom: 56px !important;
+  }
+
+  .ml-xs-7,
+.mx-xs-7 {
+    margin-left: 56px !important;
+  }
+
+  .m-xs-8 {
+    margin: 64px !important;
+  }
+
+  .mt-xs-8,
+.my-xs-8 {
+    margin-top: 64px !important;
+  }
+
+  .mr-xs-8,
+.mx-xs-8 {
+    margin-right: 64px !important;
+  }
+
+  .mb-xs-8,
+.my-xs-8 {
+    margin-bottom: 64px !important;
+  }
+
+  .ml-xs-8,
+.mx-xs-8 {
+    margin-left: 64px !important;
+  }
+
+  .m-xs-9 {
+    margin: 72px !important;
+  }
+
+  .mt-xs-9,
+.my-xs-9 {
+    margin-top: 72px !important;
+  }
+
+  .mr-xs-9,
+.mx-xs-9 {
+    margin-right: 72px !important;
+  }
+
+  .mb-xs-9,
+.my-xs-9 {
+    margin-bottom: 72px !important;
+  }
+
+  .ml-xs-9,
+.mx-xs-9 {
+    margin-left: 72px !important;
+  }
+
+  .m-xs-10 {
+    margin: 80px !important;
+  }
+
+  .mt-xs-10,
+.my-xs-10 {
+    margin-top: 80px !important;
+  }
+
+  .mr-xs-10,
+.mx-xs-10 {
+    margin-right: 80px !important;
+  }
+
+  .mb-xs-10,
+.my-xs-10 {
+    margin-bottom: 80px !important;
+  }
+
+  .ml-xs-10,
+.mx-xs-10 {
+    margin-left: 80px !important;
+  }
+
+  .m-xs-12 {
+    margin: 96px !important;
+  }
+
+  .mt-xs-12,
+.my-xs-12 {
+    margin-top: 96px !important;
+  }
+
+  .mr-xs-12,
+.mx-xs-12 {
+    margin-right: 96px !important;
+  }
+
+  .mb-xs-12,
+.my-xs-12 {
+    margin-bottom: 96px !important;
+  }
+
+  .ml-xs-12,
+.mx-xs-12 {
+    margin-left: 96px !important;
+  }
+
+  .m-xs-15 {
+    margin: 120px !important;
+  }
+
+  .mt-xs-15,
+.my-xs-15 {
+    margin-top: 120px !important;
+  }
+
+  .mr-xs-15,
+.mx-xs-15 {
+    margin-right: 120px !important;
+  }
+
+  .mb-xs-15,
+.my-xs-15 {
+    margin-bottom: 120px !important;
+  }
+
+  .ml-xs-15,
+.mx-xs-15 {
+    margin-left: 120px !important;
+  }
+
+  .p-xs-0 {
     padding: 0 !important;
   }
-  .pt-sm-0,
-  .py-sm-0 {
+
+  .pt-xs-0,
+.py-xs-0 {
     padding-top: 0 !important;
   }
-  .pr-sm-0,
-  .px-sm-0 {
+
+  .pr-xs-0,
+.px-xs-0 {
     padding-right: 0 !important;
   }
-  .pb-sm-0,
-  .py-sm-0 {
+
+  .pb-xs-0,
+.py-xs-0 {
     padding-bottom: 0 !important;
   }
-  .pl-sm-0,
-  .px-sm-0 {
+
+  .pl-xs-0,
+.px-xs-0 {
     padding-left: 0 !important;
   }
-  .p-sm-1 {
-    padding: 0.25rem !important;
+
+  .p-xs-1 {
+    padding: 8px !important;
   }
-  .pt-sm-1,
-  .py-sm-1 {
-    padding-top: 0.25rem !important;
+
+  .pt-xs-1,
+.py-xs-1 {
+    padding-top: 8px !important;
   }
-  .pr-sm-1,
-  .px-sm-1 {
-    padding-right: 0.25rem !important;
+
+  .pr-xs-1,
+.px-xs-1 {
+    padding-right: 8px !important;
   }
-  .pb-sm-1,
-  .py-sm-1 {
-    padding-bottom: 0.25rem !important;
+
+  .pb-xs-1,
+.py-xs-1 {
+    padding-bottom: 8px !important;
   }
-  .pl-sm-1,
-  .px-sm-1 {
-    padding-left: 0.25rem !important;
+
+  .pl-xs-1,
+.px-xs-1 {
+    padding-left: 8px !important;
   }
-  .p-sm-2 {
-    padding: 0.5rem !important;
+
+  .p-xs-2 {
+    padding: 16px !important;
   }
-  .pt-sm-2,
-  .py-sm-2 {
-    padding-top: 0.5rem !important;
+
+  .pt-xs-2,
+.py-xs-2 {
+    padding-top: 16px !important;
   }
-  .pr-sm-2,
-  .px-sm-2 {
-    padding-right: 0.5rem !important;
+
+  .pr-xs-2,
+.px-xs-2 {
+    padding-right: 16px !important;
   }
-  .pb-sm-2,
-  .py-sm-2 {
-    padding-bottom: 0.5rem !important;
+
+  .pb-xs-2,
+.py-xs-2 {
+    padding-bottom: 16px !important;
   }
-  .pl-sm-2,
-  .px-sm-2 {
-    padding-left: 0.5rem !important;
+
+  .pl-xs-2,
+.px-xs-2 {
+    padding-left: 16px !important;
   }
-  .p-sm-3 {
-    padding: 1rem !important;
+
+  .p-xs-3 {
+    padding: 24px !important;
   }
-  .pt-sm-3,
-  .py-sm-3 {
-    padding-top: 1rem !important;
+
+  .pt-xs-3,
+.py-xs-3 {
+    padding-top: 24px !important;
   }
-  .pr-sm-3,
-  .px-sm-3 {
-    padding-right: 1rem !important;
+
+  .pr-xs-3,
+.px-xs-3 {
+    padding-right: 24px !important;
   }
-  .pb-sm-3,
-  .py-sm-3 {
-    padding-bottom: 1rem !important;
+
+  .pb-xs-3,
+.py-xs-3 {
+    padding-bottom: 24px !important;
   }
-  .pl-sm-3,
-  .px-sm-3 {
-    padding-left: 1rem !important;
+
+  .pl-xs-3,
+.px-xs-3 {
+    padding-left: 24px !important;
   }
-  .p-sm-4 {
-    padding: 1.5rem !important;
+
+  .p-xs-4 {
+    padding: 32px !important;
   }
-  .pt-sm-4,
-  .py-sm-4 {
-    padding-top: 1.5rem !important;
+
+  .pt-xs-4,
+.py-xs-4 {
+    padding-top: 32px !important;
   }
-  .pr-sm-4,
-  .px-sm-4 {
-    padding-right: 1.5rem !important;
+
+  .pr-xs-4,
+.px-xs-4 {
+    padding-right: 32px !important;
   }
-  .pb-sm-4,
-  .py-sm-4 {
-    padding-bottom: 1.5rem !important;
+
+  .pb-xs-4,
+.py-xs-4 {
+    padding-bottom: 32px !important;
   }
-  .pl-sm-4,
-  .px-sm-4 {
-    padding-left: 1.5rem !important;
+
+  .pl-xs-4,
+.px-xs-4 {
+    padding-left: 32px !important;
   }
-  .p-sm-5 {
-    padding: 3rem !important;
+
+  .p-xs-5 {
+    padding: 40px !important;
   }
-  .pt-sm-5,
-  .py-sm-5 {
-    padding-top: 3rem !important;
+
+  .pt-xs-5,
+.py-xs-5 {
+    padding-top: 40px !important;
   }
-  .pr-sm-5,
-  .px-sm-5 {
-    padding-right: 3rem !important;
+
+  .pr-xs-5,
+.px-xs-5 {
+    padding-right: 40px !important;
   }
-  .pb-sm-5,
-  .py-sm-5 {
-    padding-bottom: 3rem !important;
+
+  .pb-xs-5,
+.py-xs-5 {
+    padding-bottom: 40px !important;
   }
-  .pl-sm-5,
-  .px-sm-5 {
-    padding-left: 3rem !important;
+
+  .pl-xs-5,
+.px-xs-5 {
+    padding-left: 40px !important;
   }
-  .m-sm-n1 {
-    margin: -0.25rem !important;
+
+  .p-xs-6 {
+    padding: 48px !important;
   }
-  .mt-sm-n1,
-  .my-sm-n1 {
-    margin-top: -0.25rem !important;
+
+  .pt-xs-6,
+.py-xs-6 {
+    padding-top: 48px !important;
   }
-  .mr-sm-n1,
-  .mx-sm-n1 {
-    margin-right: -0.25rem !important;
+
+  .pr-xs-6,
+.px-xs-6 {
+    padding-right: 48px !important;
   }
-  .mb-sm-n1,
-  .my-sm-n1 {
-    margin-bottom: -0.25rem !important;
+
+  .pb-xs-6,
+.py-xs-6 {
+    padding-bottom: 48px !important;
   }
-  .ml-sm-n1,
-  .mx-sm-n1 {
-    margin-left: -0.25rem !important;
+
+  .pl-xs-6,
+.px-xs-6 {
+    padding-left: 48px !important;
   }
-  .m-sm-n2 {
-    margin: -0.5rem !important;
+
+  .p-xs-7 {
+    padding: 56px !important;
   }
-  .mt-sm-n2,
-  .my-sm-n2 {
-    margin-top: -0.5rem !important;
+
+  .pt-xs-7,
+.py-xs-7 {
+    padding-top: 56px !important;
   }
-  .mr-sm-n2,
-  .mx-sm-n2 {
-    margin-right: -0.5rem !important;
+
+  .pr-xs-7,
+.px-xs-7 {
+    padding-right: 56px !important;
   }
-  .mb-sm-n2,
-  .my-sm-n2 {
-    margin-bottom: -0.5rem !important;
+
+  .pb-xs-7,
+.py-xs-7 {
+    padding-bottom: 56px !important;
   }
-  .ml-sm-n2,
-  .mx-sm-n2 {
-    margin-left: -0.5rem !important;
+
+  .pl-xs-7,
+.px-xs-7 {
+    padding-left: 56px !important;
   }
-  .m-sm-n3 {
-    margin: -1rem !important;
+
+  .p-xs-8 {
+    padding: 64px !important;
   }
-  .mt-sm-n3,
-  .my-sm-n3 {
-    margin-top: -1rem !important;
+
+  .pt-xs-8,
+.py-xs-8 {
+    padding-top: 64px !important;
   }
-  .mr-sm-n3,
-  .mx-sm-n3 {
-    margin-right: -1rem !important;
+
+  .pr-xs-8,
+.px-xs-8 {
+    padding-right: 64px !important;
   }
-  .mb-sm-n3,
-  .my-sm-n3 {
-    margin-bottom: -1rem !important;
+
+  .pb-xs-8,
+.py-xs-8 {
+    padding-bottom: 64px !important;
   }
-  .ml-sm-n3,
-  .mx-sm-n3 {
-    margin-left: -1rem !important;
+
+  .pl-xs-8,
+.px-xs-8 {
+    padding-left: 64px !important;
   }
-  .m-sm-n4 {
-    margin: -1.5rem !important;
+
+  .p-xs-9 {
+    padding: 72px !important;
   }
-  .mt-sm-n4,
-  .my-sm-n4 {
-    margin-top: -1.5rem !important;
+
+  .pt-xs-9,
+.py-xs-9 {
+    padding-top: 72px !important;
   }
-  .mr-sm-n4,
-  .mx-sm-n4 {
-    margin-right: -1.5rem !important;
+
+  .pr-xs-9,
+.px-xs-9 {
+    padding-right: 72px !important;
   }
-  .mb-sm-n4,
-  .my-sm-n4 {
-    margin-bottom: -1.5rem !important;
+
+  .pb-xs-9,
+.py-xs-9 {
+    padding-bottom: 72px !important;
   }
-  .ml-sm-n4,
-  .mx-sm-n4 {
-    margin-left: -1.5rem !important;
+
+  .pl-xs-9,
+.px-xs-9 {
+    padding-left: 72px !important;
   }
-  .m-sm-n5 {
-    margin: -3rem !important;
+
+  .p-xs-10 {
+    padding: 80px !important;
   }
-  .mt-sm-n5,
-  .my-sm-n5 {
-    margin-top: -3rem !important;
+
+  .pt-xs-10,
+.py-xs-10 {
+    padding-top: 80px !important;
   }
-  .mr-sm-n5,
-  .mx-sm-n5 {
-    margin-right: -3rem !important;
+
+  .pr-xs-10,
+.px-xs-10 {
+    padding-right: 80px !important;
   }
-  .mb-sm-n5,
-  .my-sm-n5 {
-    margin-bottom: -3rem !important;
+
+  .pb-xs-10,
+.py-xs-10 {
+    padding-bottom: 80px !important;
   }
-  .ml-sm-n5,
-  .mx-sm-n5 {
-    margin-left: -3rem !important;
+
+  .pl-xs-10,
+.px-xs-10 {
+    padding-left: 80px !important;
   }
-  .m-sm-auto {
+
+  .p-xs-12 {
+    padding: 96px !important;
+  }
+
+  .pt-xs-12,
+.py-xs-12 {
+    padding-top: 96px !important;
+  }
+
+  .pr-xs-12,
+.px-xs-12 {
+    padding-right: 96px !important;
+  }
+
+  .pb-xs-12,
+.py-xs-12 {
+    padding-bottom: 96px !important;
+  }
+
+  .pl-xs-12,
+.px-xs-12 {
+    padding-left: 96px !important;
+  }
+
+  .p-xs-15 {
+    padding: 120px !important;
+  }
+
+  .pt-xs-15,
+.py-xs-15 {
+    padding-top: 120px !important;
+  }
+
+  .pr-xs-15,
+.px-xs-15 {
+    padding-right: 120px !important;
+  }
+
+  .pb-xs-15,
+.py-xs-15 {
+    padding-bottom: 120px !important;
+  }
+
+  .pl-xs-15,
+.px-xs-15 {
+    padding-left: 120px !important;
+  }
+
+  .m-xs-n1 {
+    margin: -8px !important;
+  }
+
+  .mt-xs-n1,
+.my-xs-n1 {
+    margin-top: -8px !important;
+  }
+
+  .mr-xs-n1,
+.mx-xs-n1 {
+    margin-right: -8px !important;
+  }
+
+  .mb-xs-n1,
+.my-xs-n1 {
+    margin-bottom: -8px !important;
+  }
+
+  .ml-xs-n1,
+.mx-xs-n1 {
+    margin-left: -8px !important;
+  }
+
+  .m-xs-n2 {
+    margin: -16px !important;
+  }
+
+  .mt-xs-n2,
+.my-xs-n2 {
+    margin-top: -16px !important;
+  }
+
+  .mr-xs-n2,
+.mx-xs-n2 {
+    margin-right: -16px !important;
+  }
+
+  .mb-xs-n2,
+.my-xs-n2 {
+    margin-bottom: -16px !important;
+  }
+
+  .ml-xs-n2,
+.mx-xs-n2 {
+    margin-left: -16px !important;
+  }
+
+  .m-xs-n3 {
+    margin: -24px !important;
+  }
+
+  .mt-xs-n3,
+.my-xs-n3 {
+    margin-top: -24px !important;
+  }
+
+  .mr-xs-n3,
+.mx-xs-n3 {
+    margin-right: -24px !important;
+  }
+
+  .mb-xs-n3,
+.my-xs-n3 {
+    margin-bottom: -24px !important;
+  }
+
+  .ml-xs-n3,
+.mx-xs-n3 {
+    margin-left: -24px !important;
+  }
+
+  .m-xs-n4 {
+    margin: -32px !important;
+  }
+
+  .mt-xs-n4,
+.my-xs-n4 {
+    margin-top: -32px !important;
+  }
+
+  .mr-xs-n4,
+.mx-xs-n4 {
+    margin-right: -32px !important;
+  }
+
+  .mb-xs-n4,
+.my-xs-n4 {
+    margin-bottom: -32px !important;
+  }
+
+  .ml-xs-n4,
+.mx-xs-n4 {
+    margin-left: -32px !important;
+  }
+
+  .m-xs-n5 {
+    margin: -40px !important;
+  }
+
+  .mt-xs-n5,
+.my-xs-n5 {
+    margin-top: -40px !important;
+  }
+
+  .mr-xs-n5,
+.mx-xs-n5 {
+    margin-right: -40px !important;
+  }
+
+  .mb-xs-n5,
+.my-xs-n5 {
+    margin-bottom: -40px !important;
+  }
+
+  .ml-xs-n5,
+.mx-xs-n5 {
+    margin-left: -40px !important;
+  }
+
+  .m-xs-n6 {
+    margin: -48px !important;
+  }
+
+  .mt-xs-n6,
+.my-xs-n6 {
+    margin-top: -48px !important;
+  }
+
+  .mr-xs-n6,
+.mx-xs-n6 {
+    margin-right: -48px !important;
+  }
+
+  .mb-xs-n6,
+.my-xs-n6 {
+    margin-bottom: -48px !important;
+  }
+
+  .ml-xs-n6,
+.mx-xs-n6 {
+    margin-left: -48px !important;
+  }
+
+  .m-xs-n7 {
+    margin: -56px !important;
+  }
+
+  .mt-xs-n7,
+.my-xs-n7 {
+    margin-top: -56px !important;
+  }
+
+  .mr-xs-n7,
+.mx-xs-n7 {
+    margin-right: -56px !important;
+  }
+
+  .mb-xs-n7,
+.my-xs-n7 {
+    margin-bottom: -56px !important;
+  }
+
+  .ml-xs-n7,
+.mx-xs-n7 {
+    margin-left: -56px !important;
+  }
+
+  .m-xs-n8 {
+    margin: -64px !important;
+  }
+
+  .mt-xs-n8,
+.my-xs-n8 {
+    margin-top: -64px !important;
+  }
+
+  .mr-xs-n8,
+.mx-xs-n8 {
+    margin-right: -64px !important;
+  }
+
+  .mb-xs-n8,
+.my-xs-n8 {
+    margin-bottom: -64px !important;
+  }
+
+  .ml-xs-n8,
+.mx-xs-n8 {
+    margin-left: -64px !important;
+  }
+
+  .m-xs-n9 {
+    margin: -72px !important;
+  }
+
+  .mt-xs-n9,
+.my-xs-n9 {
+    margin-top: -72px !important;
+  }
+
+  .mr-xs-n9,
+.mx-xs-n9 {
+    margin-right: -72px !important;
+  }
+
+  .mb-xs-n9,
+.my-xs-n9 {
+    margin-bottom: -72px !important;
+  }
+
+  .ml-xs-n9,
+.mx-xs-n9 {
+    margin-left: -72px !important;
+  }
+
+  .m-xs-n10 {
+    margin: -80px !important;
+  }
+
+  .mt-xs-n10,
+.my-xs-n10 {
+    margin-top: -80px !important;
+  }
+
+  .mr-xs-n10,
+.mx-xs-n10 {
+    margin-right: -80px !important;
+  }
+
+  .mb-xs-n10,
+.my-xs-n10 {
+    margin-bottom: -80px !important;
+  }
+
+  .ml-xs-n10,
+.mx-xs-n10 {
+    margin-left: -80px !important;
+  }
+
+  .m-xs-n12 {
+    margin: -96px !important;
+  }
+
+  .mt-xs-n12,
+.my-xs-n12 {
+    margin-top: -96px !important;
+  }
+
+  .mr-xs-n12,
+.mx-xs-n12 {
+    margin-right: -96px !important;
+  }
+
+  .mb-xs-n12,
+.my-xs-n12 {
+    margin-bottom: -96px !important;
+  }
+
+  .ml-xs-n12,
+.mx-xs-n12 {
+    margin-left: -96px !important;
+  }
+
+  .m-xs-n15 {
+    margin: -120px !important;
+  }
+
+  .mt-xs-n15,
+.my-xs-n15 {
+    margin-top: -120px !important;
+  }
+
+  .mr-xs-n15,
+.mx-xs-n15 {
+    margin-right: -120px !important;
+  }
+
+  .mb-xs-n15,
+.my-xs-n15 {
+    margin-bottom: -120px !important;
+  }
+
+  .ml-xs-n15,
+.mx-xs-n15 {
+    margin-left: -120px !important;
+  }
+
+  .m-xs-auto {
     margin: auto !important;
   }
-  .mt-sm-auto,
-  .my-sm-auto {
+
+  .mt-xs-auto,
+.my-xs-auto {
     margin-top: auto !important;
   }
-  .mr-sm-auto,
-  .mx-sm-auto {
+
+  .mr-xs-auto,
+.mx-xs-auto {
     margin-right: auto !important;
   }
-  .mb-sm-auto,
-  .my-sm-auto {
+
+  .mb-xs-auto,
+.my-xs-auto {
     margin-bottom: auto !important;
   }
-  .ml-sm-auto,
-  .mx-sm-auto {
+
+  .ml-xs-auto,
+.mx-xs-auto {
     margin-left: auto !important;
   }
 }
+@media (min-width: 616px) {
+  .m-sm-0 {
+    margin: 0 !important;
+  }
 
+  .mt-sm-0,
+.my-sm-0 {
+    margin-top: 0 !important;
+  }
+
+  .mr-sm-0,
+.mx-sm-0 {
+    margin-right: 0 !important;
+  }
+
+  .mb-sm-0,
+.my-sm-0 {
+    margin-bottom: 0 !important;
+  }
+
+  .ml-sm-0,
+.mx-sm-0 {
+    margin-left: 0 !important;
+  }
+
+  .m-sm-1 {
+    margin: 8px !important;
+  }
+
+  .mt-sm-1,
+.my-sm-1 {
+    margin-top: 8px !important;
+  }
+
+  .mr-sm-1,
+.mx-sm-1 {
+    margin-right: 8px !important;
+  }
+
+  .mb-sm-1,
+.my-sm-1 {
+    margin-bottom: 8px !important;
+  }
+
+  .ml-sm-1,
+.mx-sm-1 {
+    margin-left: 8px !important;
+  }
+
+  .m-sm-2 {
+    margin: 16px !important;
+  }
+
+  .mt-sm-2,
+.my-sm-2 {
+    margin-top: 16px !important;
+  }
+
+  .mr-sm-2,
+.mx-sm-2 {
+    margin-right: 16px !important;
+  }
+
+  .mb-sm-2,
+.my-sm-2 {
+    margin-bottom: 16px !important;
+  }
+
+  .ml-sm-2,
+.mx-sm-2 {
+    margin-left: 16px !important;
+  }
+
+  .m-sm-3 {
+    margin: 24px !important;
+  }
+
+  .mt-sm-3,
+.my-sm-3 {
+    margin-top: 24px !important;
+  }
+
+  .mr-sm-3,
+.mx-sm-3 {
+    margin-right: 24px !important;
+  }
+
+  .mb-sm-3,
+.my-sm-3 {
+    margin-bottom: 24px !important;
+  }
+
+  .ml-sm-3,
+.mx-sm-3 {
+    margin-left: 24px !important;
+  }
+
+  .m-sm-4 {
+    margin: 32px !important;
+  }
+
+  .mt-sm-4,
+.my-sm-4 {
+    margin-top: 32px !important;
+  }
+
+  .mr-sm-4,
+.mx-sm-4 {
+    margin-right: 32px !important;
+  }
+
+  .mb-sm-4,
+.my-sm-4 {
+    margin-bottom: 32px !important;
+  }
+
+  .ml-sm-4,
+.mx-sm-4 {
+    margin-left: 32px !important;
+  }
+
+  .m-sm-5 {
+    margin: 40px !important;
+  }
+
+  .mt-sm-5,
+.my-sm-5 {
+    margin-top: 40px !important;
+  }
+
+  .mr-sm-5,
+.mx-sm-5 {
+    margin-right: 40px !important;
+  }
+
+  .mb-sm-5,
+.my-sm-5 {
+    margin-bottom: 40px !important;
+  }
+
+  .ml-sm-5,
+.mx-sm-5 {
+    margin-left: 40px !important;
+  }
+
+  .m-sm-6 {
+    margin: 48px !important;
+  }
+
+  .mt-sm-6,
+.my-sm-6 {
+    margin-top: 48px !important;
+  }
+
+  .mr-sm-6,
+.mx-sm-6 {
+    margin-right: 48px !important;
+  }
+
+  .mb-sm-6,
+.my-sm-6 {
+    margin-bottom: 48px !important;
+  }
+
+  .ml-sm-6,
+.mx-sm-6 {
+    margin-left: 48px !important;
+  }
+
+  .m-sm-7 {
+    margin: 56px !important;
+  }
+
+  .mt-sm-7,
+.my-sm-7 {
+    margin-top: 56px !important;
+  }
+
+  .mr-sm-7,
+.mx-sm-7 {
+    margin-right: 56px !important;
+  }
+
+  .mb-sm-7,
+.my-sm-7 {
+    margin-bottom: 56px !important;
+  }
+
+  .ml-sm-7,
+.mx-sm-7 {
+    margin-left: 56px !important;
+  }
+
+  .m-sm-8 {
+    margin: 64px !important;
+  }
+
+  .mt-sm-8,
+.my-sm-8 {
+    margin-top: 64px !important;
+  }
+
+  .mr-sm-8,
+.mx-sm-8 {
+    margin-right: 64px !important;
+  }
+
+  .mb-sm-8,
+.my-sm-8 {
+    margin-bottom: 64px !important;
+  }
+
+  .ml-sm-8,
+.mx-sm-8 {
+    margin-left: 64px !important;
+  }
+
+  .m-sm-9 {
+    margin: 72px !important;
+  }
+
+  .mt-sm-9,
+.my-sm-9 {
+    margin-top: 72px !important;
+  }
+
+  .mr-sm-9,
+.mx-sm-9 {
+    margin-right: 72px !important;
+  }
+
+  .mb-sm-9,
+.my-sm-9 {
+    margin-bottom: 72px !important;
+  }
+
+  .ml-sm-9,
+.mx-sm-9 {
+    margin-left: 72px !important;
+  }
+
+  .m-sm-10 {
+    margin: 80px !important;
+  }
+
+  .mt-sm-10,
+.my-sm-10 {
+    margin-top: 80px !important;
+  }
+
+  .mr-sm-10,
+.mx-sm-10 {
+    margin-right: 80px !important;
+  }
+
+  .mb-sm-10,
+.my-sm-10 {
+    margin-bottom: 80px !important;
+  }
+
+  .ml-sm-10,
+.mx-sm-10 {
+    margin-left: 80px !important;
+  }
+
+  .m-sm-12 {
+    margin: 96px !important;
+  }
+
+  .mt-sm-12,
+.my-sm-12 {
+    margin-top: 96px !important;
+  }
+
+  .mr-sm-12,
+.mx-sm-12 {
+    margin-right: 96px !important;
+  }
+
+  .mb-sm-12,
+.my-sm-12 {
+    margin-bottom: 96px !important;
+  }
+
+  .ml-sm-12,
+.mx-sm-12 {
+    margin-left: 96px !important;
+  }
+
+  .m-sm-15 {
+    margin: 120px !important;
+  }
+
+  .mt-sm-15,
+.my-sm-15 {
+    margin-top: 120px !important;
+  }
+
+  .mr-sm-15,
+.mx-sm-15 {
+    margin-right: 120px !important;
+  }
+
+  .mb-sm-15,
+.my-sm-15 {
+    margin-bottom: 120px !important;
+  }
+
+  .ml-sm-15,
+.mx-sm-15 {
+    margin-left: 120px !important;
+  }
+
+  .p-sm-0 {
+    padding: 0 !important;
+  }
+
+  .pt-sm-0,
+.py-sm-0 {
+    padding-top: 0 !important;
+  }
+
+  .pr-sm-0,
+.px-sm-0 {
+    padding-right: 0 !important;
+  }
+
+  .pb-sm-0,
+.py-sm-0 {
+    padding-bottom: 0 !important;
+  }
+
+  .pl-sm-0,
+.px-sm-0 {
+    padding-left: 0 !important;
+  }
+
+  .p-sm-1 {
+    padding: 8px !important;
+  }
+
+  .pt-sm-1,
+.py-sm-1 {
+    padding-top: 8px !important;
+  }
+
+  .pr-sm-1,
+.px-sm-1 {
+    padding-right: 8px !important;
+  }
+
+  .pb-sm-1,
+.py-sm-1 {
+    padding-bottom: 8px !important;
+  }
+
+  .pl-sm-1,
+.px-sm-1 {
+    padding-left: 8px !important;
+  }
+
+  .p-sm-2 {
+    padding: 16px !important;
+  }
+
+  .pt-sm-2,
+.py-sm-2 {
+    padding-top: 16px !important;
+  }
+
+  .pr-sm-2,
+.px-sm-2 {
+    padding-right: 16px !important;
+  }
+
+  .pb-sm-2,
+.py-sm-2 {
+    padding-bottom: 16px !important;
+  }
+
+  .pl-sm-2,
+.px-sm-2 {
+    padding-left: 16px !important;
+  }
+
+  .p-sm-3 {
+    padding: 24px !important;
+  }
+
+  .pt-sm-3,
+.py-sm-3 {
+    padding-top: 24px !important;
+  }
+
+  .pr-sm-3,
+.px-sm-3 {
+    padding-right: 24px !important;
+  }
+
+  .pb-sm-3,
+.py-sm-3 {
+    padding-bottom: 24px !important;
+  }
+
+  .pl-sm-3,
+.px-sm-3 {
+    padding-left: 24px !important;
+  }
+
+  .p-sm-4 {
+    padding: 32px !important;
+  }
+
+  .pt-sm-4,
+.py-sm-4 {
+    padding-top: 32px !important;
+  }
+
+  .pr-sm-4,
+.px-sm-4 {
+    padding-right: 32px !important;
+  }
+
+  .pb-sm-4,
+.py-sm-4 {
+    padding-bottom: 32px !important;
+  }
+
+  .pl-sm-4,
+.px-sm-4 {
+    padding-left: 32px !important;
+  }
+
+  .p-sm-5 {
+    padding: 40px !important;
+  }
+
+  .pt-sm-5,
+.py-sm-5 {
+    padding-top: 40px !important;
+  }
+
+  .pr-sm-5,
+.px-sm-5 {
+    padding-right: 40px !important;
+  }
+
+  .pb-sm-5,
+.py-sm-5 {
+    padding-bottom: 40px !important;
+  }
+
+  .pl-sm-5,
+.px-sm-5 {
+    padding-left: 40px !important;
+  }
+
+  .p-sm-6 {
+    padding: 48px !important;
+  }
+
+  .pt-sm-6,
+.py-sm-6 {
+    padding-top: 48px !important;
+  }
+
+  .pr-sm-6,
+.px-sm-6 {
+    padding-right: 48px !important;
+  }
+
+  .pb-sm-6,
+.py-sm-6 {
+    padding-bottom: 48px !important;
+  }
+
+  .pl-sm-6,
+.px-sm-6 {
+    padding-left: 48px !important;
+  }
+
+  .p-sm-7 {
+    padding: 56px !important;
+  }
+
+  .pt-sm-7,
+.py-sm-7 {
+    padding-top: 56px !important;
+  }
+
+  .pr-sm-7,
+.px-sm-7 {
+    padding-right: 56px !important;
+  }
+
+  .pb-sm-7,
+.py-sm-7 {
+    padding-bottom: 56px !important;
+  }
+
+  .pl-sm-7,
+.px-sm-7 {
+    padding-left: 56px !important;
+  }
+
+  .p-sm-8 {
+    padding: 64px !important;
+  }
+
+  .pt-sm-8,
+.py-sm-8 {
+    padding-top: 64px !important;
+  }
+
+  .pr-sm-8,
+.px-sm-8 {
+    padding-right: 64px !important;
+  }
+
+  .pb-sm-8,
+.py-sm-8 {
+    padding-bottom: 64px !important;
+  }
+
+  .pl-sm-8,
+.px-sm-8 {
+    padding-left: 64px !important;
+  }
+
+  .p-sm-9 {
+    padding: 72px !important;
+  }
+
+  .pt-sm-9,
+.py-sm-9 {
+    padding-top: 72px !important;
+  }
+
+  .pr-sm-9,
+.px-sm-9 {
+    padding-right: 72px !important;
+  }
+
+  .pb-sm-9,
+.py-sm-9 {
+    padding-bottom: 72px !important;
+  }
+
+  .pl-sm-9,
+.px-sm-9 {
+    padding-left: 72px !important;
+  }
+
+  .p-sm-10 {
+    padding: 80px !important;
+  }
+
+  .pt-sm-10,
+.py-sm-10 {
+    padding-top: 80px !important;
+  }
+
+  .pr-sm-10,
+.px-sm-10 {
+    padding-right: 80px !important;
+  }
+
+  .pb-sm-10,
+.py-sm-10 {
+    padding-bottom: 80px !important;
+  }
+
+  .pl-sm-10,
+.px-sm-10 {
+    padding-left: 80px !important;
+  }
+
+  .p-sm-12 {
+    padding: 96px !important;
+  }
+
+  .pt-sm-12,
+.py-sm-12 {
+    padding-top: 96px !important;
+  }
+
+  .pr-sm-12,
+.px-sm-12 {
+    padding-right: 96px !important;
+  }
+
+  .pb-sm-12,
+.py-sm-12 {
+    padding-bottom: 96px !important;
+  }
+
+  .pl-sm-12,
+.px-sm-12 {
+    padding-left: 96px !important;
+  }
+
+  .p-sm-15 {
+    padding: 120px !important;
+  }
+
+  .pt-sm-15,
+.py-sm-15 {
+    padding-top: 120px !important;
+  }
+
+  .pr-sm-15,
+.px-sm-15 {
+    padding-right: 120px !important;
+  }
+
+  .pb-sm-15,
+.py-sm-15 {
+    padding-bottom: 120px !important;
+  }
+
+  .pl-sm-15,
+.px-sm-15 {
+    padding-left: 120px !important;
+  }
+
+  .m-sm-n1 {
+    margin: -8px !important;
+  }
+
+  .mt-sm-n1,
+.my-sm-n1 {
+    margin-top: -8px !important;
+  }
+
+  .mr-sm-n1,
+.mx-sm-n1 {
+    margin-right: -8px !important;
+  }
+
+  .mb-sm-n1,
+.my-sm-n1 {
+    margin-bottom: -8px !important;
+  }
+
+  .ml-sm-n1,
+.mx-sm-n1 {
+    margin-left: -8px !important;
+  }
+
+  .m-sm-n2 {
+    margin: -16px !important;
+  }
+
+  .mt-sm-n2,
+.my-sm-n2 {
+    margin-top: -16px !important;
+  }
+
+  .mr-sm-n2,
+.mx-sm-n2 {
+    margin-right: -16px !important;
+  }
+
+  .mb-sm-n2,
+.my-sm-n2 {
+    margin-bottom: -16px !important;
+  }
+
+  .ml-sm-n2,
+.mx-sm-n2 {
+    margin-left: -16px !important;
+  }
+
+  .m-sm-n3 {
+    margin: -24px !important;
+  }
+
+  .mt-sm-n3,
+.my-sm-n3 {
+    margin-top: -24px !important;
+  }
+
+  .mr-sm-n3,
+.mx-sm-n3 {
+    margin-right: -24px !important;
+  }
+
+  .mb-sm-n3,
+.my-sm-n3 {
+    margin-bottom: -24px !important;
+  }
+
+  .ml-sm-n3,
+.mx-sm-n3 {
+    margin-left: -24px !important;
+  }
+
+  .m-sm-n4 {
+    margin: -32px !important;
+  }
+
+  .mt-sm-n4,
+.my-sm-n4 {
+    margin-top: -32px !important;
+  }
+
+  .mr-sm-n4,
+.mx-sm-n4 {
+    margin-right: -32px !important;
+  }
+
+  .mb-sm-n4,
+.my-sm-n4 {
+    margin-bottom: -32px !important;
+  }
+
+  .ml-sm-n4,
+.mx-sm-n4 {
+    margin-left: -32px !important;
+  }
+
+  .m-sm-n5 {
+    margin: -40px !important;
+  }
+
+  .mt-sm-n5,
+.my-sm-n5 {
+    margin-top: -40px !important;
+  }
+
+  .mr-sm-n5,
+.mx-sm-n5 {
+    margin-right: -40px !important;
+  }
+
+  .mb-sm-n5,
+.my-sm-n5 {
+    margin-bottom: -40px !important;
+  }
+
+  .ml-sm-n5,
+.mx-sm-n5 {
+    margin-left: -40px !important;
+  }
+
+  .m-sm-n6 {
+    margin: -48px !important;
+  }
+
+  .mt-sm-n6,
+.my-sm-n6 {
+    margin-top: -48px !important;
+  }
+
+  .mr-sm-n6,
+.mx-sm-n6 {
+    margin-right: -48px !important;
+  }
+
+  .mb-sm-n6,
+.my-sm-n6 {
+    margin-bottom: -48px !important;
+  }
+
+  .ml-sm-n6,
+.mx-sm-n6 {
+    margin-left: -48px !important;
+  }
+
+  .m-sm-n7 {
+    margin: -56px !important;
+  }
+
+  .mt-sm-n7,
+.my-sm-n7 {
+    margin-top: -56px !important;
+  }
+
+  .mr-sm-n7,
+.mx-sm-n7 {
+    margin-right: -56px !important;
+  }
+
+  .mb-sm-n7,
+.my-sm-n7 {
+    margin-bottom: -56px !important;
+  }
+
+  .ml-sm-n7,
+.mx-sm-n7 {
+    margin-left: -56px !important;
+  }
+
+  .m-sm-n8 {
+    margin: -64px !important;
+  }
+
+  .mt-sm-n8,
+.my-sm-n8 {
+    margin-top: -64px !important;
+  }
+
+  .mr-sm-n8,
+.mx-sm-n8 {
+    margin-right: -64px !important;
+  }
+
+  .mb-sm-n8,
+.my-sm-n8 {
+    margin-bottom: -64px !important;
+  }
+
+  .ml-sm-n8,
+.mx-sm-n8 {
+    margin-left: -64px !important;
+  }
+
+  .m-sm-n9 {
+    margin: -72px !important;
+  }
+
+  .mt-sm-n9,
+.my-sm-n9 {
+    margin-top: -72px !important;
+  }
+
+  .mr-sm-n9,
+.mx-sm-n9 {
+    margin-right: -72px !important;
+  }
+
+  .mb-sm-n9,
+.my-sm-n9 {
+    margin-bottom: -72px !important;
+  }
+
+  .ml-sm-n9,
+.mx-sm-n9 {
+    margin-left: -72px !important;
+  }
+
+  .m-sm-n10 {
+    margin: -80px !important;
+  }
+
+  .mt-sm-n10,
+.my-sm-n10 {
+    margin-top: -80px !important;
+  }
+
+  .mr-sm-n10,
+.mx-sm-n10 {
+    margin-right: -80px !important;
+  }
+
+  .mb-sm-n10,
+.my-sm-n10 {
+    margin-bottom: -80px !important;
+  }
+
+  .ml-sm-n10,
+.mx-sm-n10 {
+    margin-left: -80px !important;
+  }
+
+  .m-sm-n12 {
+    margin: -96px !important;
+  }
+
+  .mt-sm-n12,
+.my-sm-n12 {
+    margin-top: -96px !important;
+  }
+
+  .mr-sm-n12,
+.mx-sm-n12 {
+    margin-right: -96px !important;
+  }
+
+  .mb-sm-n12,
+.my-sm-n12 {
+    margin-bottom: -96px !important;
+  }
+
+  .ml-sm-n12,
+.mx-sm-n12 {
+    margin-left: -96px !important;
+  }
+
+  .m-sm-n15 {
+    margin: -120px !important;
+  }
+
+  .mt-sm-n15,
+.my-sm-n15 {
+    margin-top: -120px !important;
+  }
+
+  .mr-sm-n15,
+.mx-sm-n15 {
+    margin-right: -120px !important;
+  }
+
+  .mb-sm-n15,
+.my-sm-n15 {
+    margin-bottom: -120px !important;
+  }
+
+  .ml-sm-n15,
+.mx-sm-n15 {
+    margin-left: -120px !important;
+  }
+
+  .m-sm-auto {
+    margin: auto !important;
+  }
+
+  .mt-sm-auto,
+.my-sm-auto {
+    margin-top: auto !important;
+  }
+
+  .mr-sm-auto,
+.mx-sm-auto {
+    margin-right: auto !important;
+  }
+
+  .mb-sm-auto,
+.my-sm-auto {
+    margin-bottom: auto !important;
+  }
+
+  .ml-sm-auto,
+.mx-sm-auto {
+    margin-left: auto !important;
+  }
+}
 @media (min-width: 768px) {
   .m-md-0 {
     margin: 0 !important;
   }
+
   .mt-md-0,
-  .my-md-0 {
+.my-md-0 {
     margin-top: 0 !important;
   }
+
   .mr-md-0,
-  .mx-md-0 {
+.mx-md-0 {
     margin-right: 0 !important;
   }
+
   .mb-md-0,
-  .my-md-0 {
+.my-md-0 {
     margin-bottom: 0 !important;
   }
+
   .ml-md-0,
-  .mx-md-0 {
+.mx-md-0 {
     margin-left: 0 !important;
   }
+
   .m-md-1 {
-    margin: 0.25rem !important;
+    margin: 8px !important;
   }
+
   .mt-md-1,
-  .my-md-1 {
-    margin-top: 0.25rem !important;
+.my-md-1 {
+    margin-top: 8px !important;
   }
+
   .mr-md-1,
-  .mx-md-1 {
-    margin-right: 0.25rem !important;
+.mx-md-1 {
+    margin-right: 8px !important;
   }
+
   .mb-md-1,
-  .my-md-1 {
-    margin-bottom: 0.25rem !important;
+.my-md-1 {
+    margin-bottom: 8px !important;
   }
+
   .ml-md-1,
-  .mx-md-1 {
-    margin-left: 0.25rem !important;
+.mx-md-1 {
+    margin-left: 8px !important;
   }
+
   .m-md-2 {
-    margin: 0.5rem !important;
+    margin: 16px !important;
   }
+
   .mt-md-2,
-  .my-md-2 {
-    margin-top: 0.5rem !important;
+.my-md-2 {
+    margin-top: 16px !important;
   }
+
   .mr-md-2,
-  .mx-md-2 {
-    margin-right: 0.5rem !important;
+.mx-md-2 {
+    margin-right: 16px !important;
   }
+
   .mb-md-2,
-  .my-md-2 {
-    margin-bottom: 0.5rem !important;
+.my-md-2 {
+    margin-bottom: 16px !important;
   }
+
   .ml-md-2,
-  .mx-md-2 {
-    margin-left: 0.5rem !important;
+.mx-md-2 {
+    margin-left: 16px !important;
   }
+
   .m-md-3 {
-    margin: 1rem !important;
+    margin: 24px !important;
   }
+
   .mt-md-3,
-  .my-md-3 {
-    margin-top: 1rem !important;
+.my-md-3 {
+    margin-top: 24px !important;
   }
+
   .mr-md-3,
-  .mx-md-3 {
-    margin-right: 1rem !important;
+.mx-md-3 {
+    margin-right: 24px !important;
   }
+
   .mb-md-3,
-  .my-md-3 {
-    margin-bottom: 1rem !important;
+.my-md-3 {
+    margin-bottom: 24px !important;
   }
+
   .ml-md-3,
-  .mx-md-3 {
-    margin-left: 1rem !important;
+.mx-md-3 {
+    margin-left: 24px !important;
   }
+
   .m-md-4 {
-    margin: 1.5rem !important;
+    margin: 32px !important;
   }
+
   .mt-md-4,
-  .my-md-4 {
-    margin-top: 1.5rem !important;
+.my-md-4 {
+    margin-top: 32px !important;
   }
+
   .mr-md-4,
-  .mx-md-4 {
-    margin-right: 1.5rem !important;
+.mx-md-4 {
+    margin-right: 32px !important;
   }
+
   .mb-md-4,
-  .my-md-4 {
-    margin-bottom: 1.5rem !important;
+.my-md-4 {
+    margin-bottom: 32px !important;
   }
+
   .ml-md-4,
-  .mx-md-4 {
-    margin-left: 1.5rem !important;
+.mx-md-4 {
+    margin-left: 32px !important;
   }
+
   .m-md-5 {
-    margin: 3rem !important;
+    margin: 40px !important;
   }
+
   .mt-md-5,
-  .my-md-5 {
-    margin-top: 3rem !important;
+.my-md-5 {
+    margin-top: 40px !important;
   }
+
   .mr-md-5,
-  .mx-md-5 {
-    margin-right: 3rem !important;
+.mx-md-5 {
+    margin-right: 40px !important;
   }
+
   .mb-md-5,
-  .my-md-5 {
-    margin-bottom: 3rem !important;
+.my-md-5 {
+    margin-bottom: 40px !important;
   }
+
   .ml-md-5,
-  .mx-md-5 {
-    margin-left: 3rem !important;
+.mx-md-5 {
+    margin-left: 40px !important;
   }
+
+  .m-md-6 {
+    margin: 48px !important;
+  }
+
+  .mt-md-6,
+.my-md-6 {
+    margin-top: 48px !important;
+  }
+
+  .mr-md-6,
+.mx-md-6 {
+    margin-right: 48px !important;
+  }
+
+  .mb-md-6,
+.my-md-6 {
+    margin-bottom: 48px !important;
+  }
+
+  .ml-md-6,
+.mx-md-6 {
+    margin-left: 48px !important;
+  }
+
+  .m-md-7 {
+    margin: 56px !important;
+  }
+
+  .mt-md-7,
+.my-md-7 {
+    margin-top: 56px !important;
+  }
+
+  .mr-md-7,
+.mx-md-7 {
+    margin-right: 56px !important;
+  }
+
+  .mb-md-7,
+.my-md-7 {
+    margin-bottom: 56px !important;
+  }
+
+  .ml-md-7,
+.mx-md-7 {
+    margin-left: 56px !important;
+  }
+
+  .m-md-8 {
+    margin: 64px !important;
+  }
+
+  .mt-md-8,
+.my-md-8 {
+    margin-top: 64px !important;
+  }
+
+  .mr-md-8,
+.mx-md-8 {
+    margin-right: 64px !important;
+  }
+
+  .mb-md-8,
+.my-md-8 {
+    margin-bottom: 64px !important;
+  }
+
+  .ml-md-8,
+.mx-md-8 {
+    margin-left: 64px !important;
+  }
+
+  .m-md-9 {
+    margin: 72px !important;
+  }
+
+  .mt-md-9,
+.my-md-9 {
+    margin-top: 72px !important;
+  }
+
+  .mr-md-9,
+.mx-md-9 {
+    margin-right: 72px !important;
+  }
+
+  .mb-md-9,
+.my-md-9 {
+    margin-bottom: 72px !important;
+  }
+
+  .ml-md-9,
+.mx-md-9 {
+    margin-left: 72px !important;
+  }
+
+  .m-md-10 {
+    margin: 80px !important;
+  }
+
+  .mt-md-10,
+.my-md-10 {
+    margin-top: 80px !important;
+  }
+
+  .mr-md-10,
+.mx-md-10 {
+    margin-right: 80px !important;
+  }
+
+  .mb-md-10,
+.my-md-10 {
+    margin-bottom: 80px !important;
+  }
+
+  .ml-md-10,
+.mx-md-10 {
+    margin-left: 80px !important;
+  }
+
+  .m-md-12 {
+    margin: 96px !important;
+  }
+
+  .mt-md-12,
+.my-md-12 {
+    margin-top: 96px !important;
+  }
+
+  .mr-md-12,
+.mx-md-12 {
+    margin-right: 96px !important;
+  }
+
+  .mb-md-12,
+.my-md-12 {
+    margin-bottom: 96px !important;
+  }
+
+  .ml-md-12,
+.mx-md-12 {
+    margin-left: 96px !important;
+  }
+
+  .m-md-15 {
+    margin: 120px !important;
+  }
+
+  .mt-md-15,
+.my-md-15 {
+    margin-top: 120px !important;
+  }
+
+  .mr-md-15,
+.mx-md-15 {
+    margin-right: 120px !important;
+  }
+
+  .mb-md-15,
+.my-md-15 {
+    margin-bottom: 120px !important;
+  }
+
+  .ml-md-15,
+.mx-md-15 {
+    margin-left: 120px !important;
+  }
+
   .p-md-0 {
     padding: 0 !important;
   }
+
   .pt-md-0,
-  .py-md-0 {
+.py-md-0 {
     padding-top: 0 !important;
   }
+
   .pr-md-0,
-  .px-md-0 {
+.px-md-0 {
     padding-right: 0 !important;
   }
+
   .pb-md-0,
-  .py-md-0 {
+.py-md-0 {
     padding-bottom: 0 !important;
   }
+
   .pl-md-0,
-  .px-md-0 {
+.px-md-0 {
     padding-left: 0 !important;
   }
+
   .p-md-1 {
-    padding: 0.25rem !important;
+    padding: 8px !important;
   }
+
   .pt-md-1,
-  .py-md-1 {
-    padding-top: 0.25rem !important;
+.py-md-1 {
+    padding-top: 8px !important;
   }
+
   .pr-md-1,
-  .px-md-1 {
-    padding-right: 0.25rem !important;
+.px-md-1 {
+    padding-right: 8px !important;
   }
+
   .pb-md-1,
-  .py-md-1 {
-    padding-bottom: 0.25rem !important;
+.py-md-1 {
+    padding-bottom: 8px !important;
   }
+
   .pl-md-1,
-  .px-md-1 {
-    padding-left: 0.25rem !important;
+.px-md-1 {
+    padding-left: 8px !important;
   }
+
   .p-md-2 {
-    padding: 0.5rem !important;
+    padding: 16px !important;
   }
+
   .pt-md-2,
-  .py-md-2 {
-    padding-top: 0.5rem !important;
+.py-md-2 {
+    padding-top: 16px !important;
   }
+
   .pr-md-2,
-  .px-md-2 {
-    padding-right: 0.5rem !important;
+.px-md-2 {
+    padding-right: 16px !important;
   }
+
   .pb-md-2,
-  .py-md-2 {
-    padding-bottom: 0.5rem !important;
+.py-md-2 {
+    padding-bottom: 16px !important;
   }
+
   .pl-md-2,
-  .px-md-2 {
-    padding-left: 0.5rem !important;
+.px-md-2 {
+    padding-left: 16px !important;
   }
+
   .p-md-3 {
-    padding: 1rem !important;
+    padding: 24px !important;
   }
+
   .pt-md-3,
-  .py-md-3 {
-    padding-top: 1rem !important;
+.py-md-3 {
+    padding-top: 24px !important;
   }
+
   .pr-md-3,
-  .px-md-3 {
-    padding-right: 1rem !important;
+.px-md-3 {
+    padding-right: 24px !important;
   }
+
   .pb-md-3,
-  .py-md-3 {
-    padding-bottom: 1rem !important;
+.py-md-3 {
+    padding-bottom: 24px !important;
   }
+
   .pl-md-3,
-  .px-md-3 {
-    padding-left: 1rem !important;
+.px-md-3 {
+    padding-left: 24px !important;
   }
+
   .p-md-4 {
-    padding: 1.5rem !important;
+    padding: 32px !important;
   }
+
   .pt-md-4,
-  .py-md-4 {
-    padding-top: 1.5rem !important;
+.py-md-4 {
+    padding-top: 32px !important;
   }
+
   .pr-md-4,
-  .px-md-4 {
-    padding-right: 1.5rem !important;
+.px-md-4 {
+    padding-right: 32px !important;
   }
+
   .pb-md-4,
-  .py-md-4 {
-    padding-bottom: 1.5rem !important;
+.py-md-4 {
+    padding-bottom: 32px !important;
   }
+
   .pl-md-4,
-  .px-md-4 {
-    padding-left: 1.5rem !important;
+.px-md-4 {
+    padding-left: 32px !important;
   }
+
   .p-md-5 {
-    padding: 3rem !important;
+    padding: 40px !important;
   }
+
   .pt-md-5,
-  .py-md-5 {
-    padding-top: 3rem !important;
+.py-md-5 {
+    padding-top: 40px !important;
   }
+
   .pr-md-5,
-  .px-md-5 {
-    padding-right: 3rem !important;
+.px-md-5 {
+    padding-right: 40px !important;
   }
+
   .pb-md-5,
-  .py-md-5 {
-    padding-bottom: 3rem !important;
+.py-md-5 {
+    padding-bottom: 40px !important;
   }
+
   .pl-md-5,
-  .px-md-5 {
-    padding-left: 3rem !important;
+.px-md-5 {
+    padding-left: 40px !important;
   }
+
+  .p-md-6 {
+    padding: 48px !important;
+  }
+
+  .pt-md-6,
+.py-md-6 {
+    padding-top: 48px !important;
+  }
+
+  .pr-md-6,
+.px-md-6 {
+    padding-right: 48px !important;
+  }
+
+  .pb-md-6,
+.py-md-6 {
+    padding-bottom: 48px !important;
+  }
+
+  .pl-md-6,
+.px-md-6 {
+    padding-left: 48px !important;
+  }
+
+  .p-md-7 {
+    padding: 56px !important;
+  }
+
+  .pt-md-7,
+.py-md-7 {
+    padding-top: 56px !important;
+  }
+
+  .pr-md-7,
+.px-md-7 {
+    padding-right: 56px !important;
+  }
+
+  .pb-md-7,
+.py-md-7 {
+    padding-bottom: 56px !important;
+  }
+
+  .pl-md-7,
+.px-md-7 {
+    padding-left: 56px !important;
+  }
+
+  .p-md-8 {
+    padding: 64px !important;
+  }
+
+  .pt-md-8,
+.py-md-8 {
+    padding-top: 64px !important;
+  }
+
+  .pr-md-8,
+.px-md-8 {
+    padding-right: 64px !important;
+  }
+
+  .pb-md-8,
+.py-md-8 {
+    padding-bottom: 64px !important;
+  }
+
+  .pl-md-8,
+.px-md-8 {
+    padding-left: 64px !important;
+  }
+
+  .p-md-9 {
+    padding: 72px !important;
+  }
+
+  .pt-md-9,
+.py-md-9 {
+    padding-top: 72px !important;
+  }
+
+  .pr-md-9,
+.px-md-9 {
+    padding-right: 72px !important;
+  }
+
+  .pb-md-9,
+.py-md-9 {
+    padding-bottom: 72px !important;
+  }
+
+  .pl-md-9,
+.px-md-9 {
+    padding-left: 72px !important;
+  }
+
+  .p-md-10 {
+    padding: 80px !important;
+  }
+
+  .pt-md-10,
+.py-md-10 {
+    padding-top: 80px !important;
+  }
+
+  .pr-md-10,
+.px-md-10 {
+    padding-right: 80px !important;
+  }
+
+  .pb-md-10,
+.py-md-10 {
+    padding-bottom: 80px !important;
+  }
+
+  .pl-md-10,
+.px-md-10 {
+    padding-left: 80px !important;
+  }
+
+  .p-md-12 {
+    padding: 96px !important;
+  }
+
+  .pt-md-12,
+.py-md-12 {
+    padding-top: 96px !important;
+  }
+
+  .pr-md-12,
+.px-md-12 {
+    padding-right: 96px !important;
+  }
+
+  .pb-md-12,
+.py-md-12 {
+    padding-bottom: 96px !important;
+  }
+
+  .pl-md-12,
+.px-md-12 {
+    padding-left: 96px !important;
+  }
+
+  .p-md-15 {
+    padding: 120px !important;
+  }
+
+  .pt-md-15,
+.py-md-15 {
+    padding-top: 120px !important;
+  }
+
+  .pr-md-15,
+.px-md-15 {
+    padding-right: 120px !important;
+  }
+
+  .pb-md-15,
+.py-md-15 {
+    padding-bottom: 120px !important;
+  }
+
+  .pl-md-15,
+.px-md-15 {
+    padding-left: 120px !important;
+  }
+
   .m-md-n1 {
-    margin: -0.25rem !important;
+    margin: -8px !important;
   }
+
   .mt-md-n1,
-  .my-md-n1 {
-    margin-top: -0.25rem !important;
+.my-md-n1 {
+    margin-top: -8px !important;
   }
+
   .mr-md-n1,
-  .mx-md-n1 {
-    margin-right: -0.25rem !important;
+.mx-md-n1 {
+    margin-right: -8px !important;
   }
+
   .mb-md-n1,
-  .my-md-n1 {
-    margin-bottom: -0.25rem !important;
+.my-md-n1 {
+    margin-bottom: -8px !important;
   }
+
   .ml-md-n1,
-  .mx-md-n1 {
-    margin-left: -0.25rem !important;
+.mx-md-n1 {
+    margin-left: -8px !important;
   }
+
   .m-md-n2 {
-    margin: -0.5rem !important;
+    margin: -16px !important;
   }
+
   .mt-md-n2,
-  .my-md-n2 {
-    margin-top: -0.5rem !important;
+.my-md-n2 {
+    margin-top: -16px !important;
   }
+
   .mr-md-n2,
-  .mx-md-n2 {
-    margin-right: -0.5rem !important;
+.mx-md-n2 {
+    margin-right: -16px !important;
   }
+
   .mb-md-n2,
-  .my-md-n2 {
-    margin-bottom: -0.5rem !important;
+.my-md-n2 {
+    margin-bottom: -16px !important;
   }
+
   .ml-md-n2,
-  .mx-md-n2 {
-    margin-left: -0.5rem !important;
+.mx-md-n2 {
+    margin-left: -16px !important;
   }
+
   .m-md-n3 {
-    margin: -1rem !important;
+    margin: -24px !important;
   }
+
   .mt-md-n3,
-  .my-md-n3 {
-    margin-top: -1rem !important;
+.my-md-n3 {
+    margin-top: -24px !important;
   }
+
   .mr-md-n3,
-  .mx-md-n3 {
-    margin-right: -1rem !important;
+.mx-md-n3 {
+    margin-right: -24px !important;
   }
+
   .mb-md-n3,
-  .my-md-n3 {
-    margin-bottom: -1rem !important;
+.my-md-n3 {
+    margin-bottom: -24px !important;
   }
+
   .ml-md-n3,
-  .mx-md-n3 {
-    margin-left: -1rem !important;
+.mx-md-n3 {
+    margin-left: -24px !important;
   }
+
   .m-md-n4 {
-    margin: -1.5rem !important;
+    margin: -32px !important;
   }
+
   .mt-md-n4,
-  .my-md-n4 {
-    margin-top: -1.5rem !important;
+.my-md-n4 {
+    margin-top: -32px !important;
   }
+
   .mr-md-n4,
-  .mx-md-n4 {
-    margin-right: -1.5rem !important;
+.mx-md-n4 {
+    margin-right: -32px !important;
   }
+
   .mb-md-n4,
-  .my-md-n4 {
-    margin-bottom: -1.5rem !important;
+.my-md-n4 {
+    margin-bottom: -32px !important;
   }
+
   .ml-md-n4,
-  .mx-md-n4 {
-    margin-left: -1.5rem !important;
+.mx-md-n4 {
+    margin-left: -32px !important;
   }
+
   .m-md-n5 {
-    margin: -3rem !important;
+    margin: -40px !important;
   }
+
   .mt-md-n5,
-  .my-md-n5 {
-    margin-top: -3rem !important;
+.my-md-n5 {
+    margin-top: -40px !important;
   }
+
   .mr-md-n5,
-  .mx-md-n5 {
-    margin-right: -3rem !important;
+.mx-md-n5 {
+    margin-right: -40px !important;
   }
+
   .mb-md-n5,
-  .my-md-n5 {
-    margin-bottom: -3rem !important;
+.my-md-n5 {
+    margin-bottom: -40px !important;
   }
+
   .ml-md-n5,
-  .mx-md-n5 {
-    margin-left: -3rem !important;
+.mx-md-n5 {
+    margin-left: -40px !important;
   }
+
+  .m-md-n6 {
+    margin: -48px !important;
+  }
+
+  .mt-md-n6,
+.my-md-n6 {
+    margin-top: -48px !important;
+  }
+
+  .mr-md-n6,
+.mx-md-n6 {
+    margin-right: -48px !important;
+  }
+
+  .mb-md-n6,
+.my-md-n6 {
+    margin-bottom: -48px !important;
+  }
+
+  .ml-md-n6,
+.mx-md-n6 {
+    margin-left: -48px !important;
+  }
+
+  .m-md-n7 {
+    margin: -56px !important;
+  }
+
+  .mt-md-n7,
+.my-md-n7 {
+    margin-top: -56px !important;
+  }
+
+  .mr-md-n7,
+.mx-md-n7 {
+    margin-right: -56px !important;
+  }
+
+  .mb-md-n7,
+.my-md-n7 {
+    margin-bottom: -56px !important;
+  }
+
+  .ml-md-n7,
+.mx-md-n7 {
+    margin-left: -56px !important;
+  }
+
+  .m-md-n8 {
+    margin: -64px !important;
+  }
+
+  .mt-md-n8,
+.my-md-n8 {
+    margin-top: -64px !important;
+  }
+
+  .mr-md-n8,
+.mx-md-n8 {
+    margin-right: -64px !important;
+  }
+
+  .mb-md-n8,
+.my-md-n8 {
+    margin-bottom: -64px !important;
+  }
+
+  .ml-md-n8,
+.mx-md-n8 {
+    margin-left: -64px !important;
+  }
+
+  .m-md-n9 {
+    margin: -72px !important;
+  }
+
+  .mt-md-n9,
+.my-md-n9 {
+    margin-top: -72px !important;
+  }
+
+  .mr-md-n9,
+.mx-md-n9 {
+    margin-right: -72px !important;
+  }
+
+  .mb-md-n9,
+.my-md-n9 {
+    margin-bottom: -72px !important;
+  }
+
+  .ml-md-n9,
+.mx-md-n9 {
+    margin-left: -72px !important;
+  }
+
+  .m-md-n10 {
+    margin: -80px !important;
+  }
+
+  .mt-md-n10,
+.my-md-n10 {
+    margin-top: -80px !important;
+  }
+
+  .mr-md-n10,
+.mx-md-n10 {
+    margin-right: -80px !important;
+  }
+
+  .mb-md-n10,
+.my-md-n10 {
+    margin-bottom: -80px !important;
+  }
+
+  .ml-md-n10,
+.mx-md-n10 {
+    margin-left: -80px !important;
+  }
+
+  .m-md-n12 {
+    margin: -96px !important;
+  }
+
+  .mt-md-n12,
+.my-md-n12 {
+    margin-top: -96px !important;
+  }
+
+  .mr-md-n12,
+.mx-md-n12 {
+    margin-right: -96px !important;
+  }
+
+  .mb-md-n12,
+.my-md-n12 {
+    margin-bottom: -96px !important;
+  }
+
+  .ml-md-n12,
+.mx-md-n12 {
+    margin-left: -96px !important;
+  }
+
+  .m-md-n15 {
+    margin: -120px !important;
+  }
+
+  .mt-md-n15,
+.my-md-n15 {
+    margin-top: -120px !important;
+  }
+
+  .mr-md-n15,
+.mx-md-n15 {
+    margin-right: -120px !important;
+  }
+
+  .mb-md-n15,
+.my-md-n15 {
+    margin-bottom: -120px !important;
+  }
+
+  .ml-md-n15,
+.mx-md-n15 {
+    margin-left: -120px !important;
+  }
+
   .m-md-auto {
     margin: auto !important;
   }
+
   .mt-md-auto,
-  .my-md-auto {
+.my-md-auto {
     margin-top: auto !important;
   }
+
   .mr-md-auto,
-  .mx-md-auto {
+.mx-md-auto {
     margin-right: auto !important;
   }
+
   .mb-md-auto,
-  .my-md-auto {
+.my-md-auto {
     margin-bottom: auto !important;
   }
+
   .ml-md-auto,
-  .mx-md-auto {
+.mx-md-auto {
     margin-left: auto !important;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .m-lg-0 {
     margin: 0 !important;
   }
+
   .mt-lg-0,
-  .my-lg-0 {
+.my-lg-0 {
     margin-top: 0 !important;
   }
+
   .mr-lg-0,
-  .mx-lg-0 {
+.mx-lg-0 {
     margin-right: 0 !important;
   }
+
   .mb-lg-0,
-  .my-lg-0 {
+.my-lg-0 {
     margin-bottom: 0 !important;
   }
+
   .ml-lg-0,
-  .mx-lg-0 {
+.mx-lg-0 {
     margin-left: 0 !important;
   }
+
   .m-lg-1 {
-    margin: 0.25rem !important;
+    margin: 8px !important;
   }
+
   .mt-lg-1,
-  .my-lg-1 {
-    margin-top: 0.25rem !important;
+.my-lg-1 {
+    margin-top: 8px !important;
   }
+
   .mr-lg-1,
-  .mx-lg-1 {
-    margin-right: 0.25rem !important;
+.mx-lg-1 {
+    margin-right: 8px !important;
   }
+
   .mb-lg-1,
-  .my-lg-1 {
-    margin-bottom: 0.25rem !important;
+.my-lg-1 {
+    margin-bottom: 8px !important;
   }
+
   .ml-lg-1,
-  .mx-lg-1 {
-    margin-left: 0.25rem !important;
+.mx-lg-1 {
+    margin-left: 8px !important;
   }
+
   .m-lg-2 {
-    margin: 0.5rem !important;
+    margin: 16px !important;
   }
+
   .mt-lg-2,
-  .my-lg-2 {
-    margin-top: 0.5rem !important;
+.my-lg-2 {
+    margin-top: 16px !important;
   }
+
   .mr-lg-2,
-  .mx-lg-2 {
-    margin-right: 0.5rem !important;
+.mx-lg-2 {
+    margin-right: 16px !important;
   }
+
   .mb-lg-2,
-  .my-lg-2 {
-    margin-bottom: 0.5rem !important;
+.my-lg-2 {
+    margin-bottom: 16px !important;
   }
+
   .ml-lg-2,
-  .mx-lg-2 {
-    margin-left: 0.5rem !important;
+.mx-lg-2 {
+    margin-left: 16px !important;
   }
+
   .m-lg-3 {
-    margin: 1rem !important;
+    margin: 24px !important;
   }
+
   .mt-lg-3,
-  .my-lg-3 {
-    margin-top: 1rem !important;
+.my-lg-3 {
+    margin-top: 24px !important;
   }
+
   .mr-lg-3,
-  .mx-lg-3 {
-    margin-right: 1rem !important;
+.mx-lg-3 {
+    margin-right: 24px !important;
   }
+
   .mb-lg-3,
-  .my-lg-3 {
-    margin-bottom: 1rem !important;
+.my-lg-3 {
+    margin-bottom: 24px !important;
   }
+
   .ml-lg-3,
-  .mx-lg-3 {
-    margin-left: 1rem !important;
+.mx-lg-3 {
+    margin-left: 24px !important;
   }
+
   .m-lg-4 {
-    margin: 1.5rem !important;
+    margin: 32px !important;
   }
+
   .mt-lg-4,
-  .my-lg-4 {
-    margin-top: 1.5rem !important;
+.my-lg-4 {
+    margin-top: 32px !important;
   }
+
   .mr-lg-4,
-  .mx-lg-4 {
-    margin-right: 1.5rem !important;
+.mx-lg-4 {
+    margin-right: 32px !important;
   }
+
   .mb-lg-4,
-  .my-lg-4 {
-    margin-bottom: 1.5rem !important;
+.my-lg-4 {
+    margin-bottom: 32px !important;
   }
+
   .ml-lg-4,
-  .mx-lg-4 {
-    margin-left: 1.5rem !important;
+.mx-lg-4 {
+    margin-left: 32px !important;
   }
+
   .m-lg-5 {
-    margin: 3rem !important;
+    margin: 40px !important;
   }
+
   .mt-lg-5,
-  .my-lg-5 {
-    margin-top: 3rem !important;
+.my-lg-5 {
+    margin-top: 40px !important;
   }
+
   .mr-lg-5,
-  .mx-lg-5 {
-    margin-right: 3rem !important;
+.mx-lg-5 {
+    margin-right: 40px !important;
   }
+
   .mb-lg-5,
-  .my-lg-5 {
-    margin-bottom: 3rem !important;
+.my-lg-5 {
+    margin-bottom: 40px !important;
   }
+
   .ml-lg-5,
-  .mx-lg-5 {
-    margin-left: 3rem !important;
+.mx-lg-5 {
+    margin-left: 40px !important;
   }
+
+  .m-lg-6 {
+    margin: 48px !important;
+  }
+
+  .mt-lg-6,
+.my-lg-6 {
+    margin-top: 48px !important;
+  }
+
+  .mr-lg-6,
+.mx-lg-6 {
+    margin-right: 48px !important;
+  }
+
+  .mb-lg-6,
+.my-lg-6 {
+    margin-bottom: 48px !important;
+  }
+
+  .ml-lg-6,
+.mx-lg-6 {
+    margin-left: 48px !important;
+  }
+
+  .m-lg-7 {
+    margin: 56px !important;
+  }
+
+  .mt-lg-7,
+.my-lg-7 {
+    margin-top: 56px !important;
+  }
+
+  .mr-lg-7,
+.mx-lg-7 {
+    margin-right: 56px !important;
+  }
+
+  .mb-lg-7,
+.my-lg-7 {
+    margin-bottom: 56px !important;
+  }
+
+  .ml-lg-7,
+.mx-lg-7 {
+    margin-left: 56px !important;
+  }
+
+  .m-lg-8 {
+    margin: 64px !important;
+  }
+
+  .mt-lg-8,
+.my-lg-8 {
+    margin-top: 64px !important;
+  }
+
+  .mr-lg-8,
+.mx-lg-8 {
+    margin-right: 64px !important;
+  }
+
+  .mb-lg-8,
+.my-lg-8 {
+    margin-bottom: 64px !important;
+  }
+
+  .ml-lg-8,
+.mx-lg-8 {
+    margin-left: 64px !important;
+  }
+
+  .m-lg-9 {
+    margin: 72px !important;
+  }
+
+  .mt-lg-9,
+.my-lg-9 {
+    margin-top: 72px !important;
+  }
+
+  .mr-lg-9,
+.mx-lg-9 {
+    margin-right: 72px !important;
+  }
+
+  .mb-lg-9,
+.my-lg-9 {
+    margin-bottom: 72px !important;
+  }
+
+  .ml-lg-9,
+.mx-lg-9 {
+    margin-left: 72px !important;
+  }
+
+  .m-lg-10 {
+    margin: 80px !important;
+  }
+
+  .mt-lg-10,
+.my-lg-10 {
+    margin-top: 80px !important;
+  }
+
+  .mr-lg-10,
+.mx-lg-10 {
+    margin-right: 80px !important;
+  }
+
+  .mb-lg-10,
+.my-lg-10 {
+    margin-bottom: 80px !important;
+  }
+
+  .ml-lg-10,
+.mx-lg-10 {
+    margin-left: 80px !important;
+  }
+
+  .m-lg-12 {
+    margin: 96px !important;
+  }
+
+  .mt-lg-12,
+.my-lg-12 {
+    margin-top: 96px !important;
+  }
+
+  .mr-lg-12,
+.mx-lg-12 {
+    margin-right: 96px !important;
+  }
+
+  .mb-lg-12,
+.my-lg-12 {
+    margin-bottom: 96px !important;
+  }
+
+  .ml-lg-12,
+.mx-lg-12 {
+    margin-left: 96px !important;
+  }
+
+  .m-lg-15 {
+    margin: 120px !important;
+  }
+
+  .mt-lg-15,
+.my-lg-15 {
+    margin-top: 120px !important;
+  }
+
+  .mr-lg-15,
+.mx-lg-15 {
+    margin-right: 120px !important;
+  }
+
+  .mb-lg-15,
+.my-lg-15 {
+    margin-bottom: 120px !important;
+  }
+
+  .ml-lg-15,
+.mx-lg-15 {
+    margin-left: 120px !important;
+  }
+
   .p-lg-0 {
     padding: 0 !important;
   }
+
   .pt-lg-0,
-  .py-lg-0 {
+.py-lg-0 {
     padding-top: 0 !important;
   }
+
   .pr-lg-0,
-  .px-lg-0 {
+.px-lg-0 {
     padding-right: 0 !important;
   }
+
   .pb-lg-0,
-  .py-lg-0 {
+.py-lg-0 {
     padding-bottom: 0 !important;
   }
+
   .pl-lg-0,
-  .px-lg-0 {
+.px-lg-0 {
     padding-left: 0 !important;
   }
+
   .p-lg-1 {
-    padding: 0.25rem !important;
+    padding: 8px !important;
   }
+
   .pt-lg-1,
-  .py-lg-1 {
-    padding-top: 0.25rem !important;
+.py-lg-1 {
+    padding-top: 8px !important;
   }
+
   .pr-lg-1,
-  .px-lg-1 {
-    padding-right: 0.25rem !important;
+.px-lg-1 {
+    padding-right: 8px !important;
   }
+
   .pb-lg-1,
-  .py-lg-1 {
-    padding-bottom: 0.25rem !important;
+.py-lg-1 {
+    padding-bottom: 8px !important;
   }
+
   .pl-lg-1,
-  .px-lg-1 {
-    padding-left: 0.25rem !important;
+.px-lg-1 {
+    padding-left: 8px !important;
   }
+
   .p-lg-2 {
-    padding: 0.5rem !important;
+    padding: 16px !important;
   }
+
   .pt-lg-2,
-  .py-lg-2 {
-    padding-top: 0.5rem !important;
+.py-lg-2 {
+    padding-top: 16px !important;
   }
+
   .pr-lg-2,
-  .px-lg-2 {
-    padding-right: 0.5rem !important;
+.px-lg-2 {
+    padding-right: 16px !important;
   }
+
   .pb-lg-2,
-  .py-lg-2 {
-    padding-bottom: 0.5rem !important;
+.py-lg-2 {
+    padding-bottom: 16px !important;
   }
+
   .pl-lg-2,
-  .px-lg-2 {
-    padding-left: 0.5rem !important;
+.px-lg-2 {
+    padding-left: 16px !important;
   }
+
   .p-lg-3 {
-    padding: 1rem !important;
+    padding: 24px !important;
   }
+
   .pt-lg-3,
-  .py-lg-3 {
-    padding-top: 1rem !important;
+.py-lg-3 {
+    padding-top: 24px !important;
   }
+
   .pr-lg-3,
-  .px-lg-3 {
-    padding-right: 1rem !important;
+.px-lg-3 {
+    padding-right: 24px !important;
   }
+
   .pb-lg-3,
-  .py-lg-3 {
-    padding-bottom: 1rem !important;
+.py-lg-3 {
+    padding-bottom: 24px !important;
   }
+
   .pl-lg-3,
-  .px-lg-3 {
-    padding-left: 1rem !important;
+.px-lg-3 {
+    padding-left: 24px !important;
   }
+
   .p-lg-4 {
-    padding: 1.5rem !important;
+    padding: 32px !important;
   }
+
   .pt-lg-4,
-  .py-lg-4 {
-    padding-top: 1.5rem !important;
+.py-lg-4 {
+    padding-top: 32px !important;
   }
+
   .pr-lg-4,
-  .px-lg-4 {
-    padding-right: 1.5rem !important;
+.px-lg-4 {
+    padding-right: 32px !important;
   }
+
   .pb-lg-4,
-  .py-lg-4 {
-    padding-bottom: 1.5rem !important;
+.py-lg-4 {
+    padding-bottom: 32px !important;
   }
+
   .pl-lg-4,
-  .px-lg-4 {
-    padding-left: 1.5rem !important;
+.px-lg-4 {
+    padding-left: 32px !important;
   }
+
   .p-lg-5 {
-    padding: 3rem !important;
+    padding: 40px !important;
   }
+
   .pt-lg-5,
-  .py-lg-5 {
-    padding-top: 3rem !important;
+.py-lg-5 {
+    padding-top: 40px !important;
   }
+
   .pr-lg-5,
-  .px-lg-5 {
-    padding-right: 3rem !important;
+.px-lg-5 {
+    padding-right: 40px !important;
   }
+
   .pb-lg-5,
-  .py-lg-5 {
-    padding-bottom: 3rem !important;
+.py-lg-5 {
+    padding-bottom: 40px !important;
   }
+
   .pl-lg-5,
-  .px-lg-5 {
-    padding-left: 3rem !important;
+.px-lg-5 {
+    padding-left: 40px !important;
   }
+
+  .p-lg-6 {
+    padding: 48px !important;
+  }
+
+  .pt-lg-6,
+.py-lg-6 {
+    padding-top: 48px !important;
+  }
+
+  .pr-lg-6,
+.px-lg-6 {
+    padding-right: 48px !important;
+  }
+
+  .pb-lg-6,
+.py-lg-6 {
+    padding-bottom: 48px !important;
+  }
+
+  .pl-lg-6,
+.px-lg-6 {
+    padding-left: 48px !important;
+  }
+
+  .p-lg-7 {
+    padding: 56px !important;
+  }
+
+  .pt-lg-7,
+.py-lg-7 {
+    padding-top: 56px !important;
+  }
+
+  .pr-lg-7,
+.px-lg-7 {
+    padding-right: 56px !important;
+  }
+
+  .pb-lg-7,
+.py-lg-7 {
+    padding-bottom: 56px !important;
+  }
+
+  .pl-lg-7,
+.px-lg-7 {
+    padding-left: 56px !important;
+  }
+
+  .p-lg-8 {
+    padding: 64px !important;
+  }
+
+  .pt-lg-8,
+.py-lg-8 {
+    padding-top: 64px !important;
+  }
+
+  .pr-lg-8,
+.px-lg-8 {
+    padding-right: 64px !important;
+  }
+
+  .pb-lg-8,
+.py-lg-8 {
+    padding-bottom: 64px !important;
+  }
+
+  .pl-lg-8,
+.px-lg-8 {
+    padding-left: 64px !important;
+  }
+
+  .p-lg-9 {
+    padding: 72px !important;
+  }
+
+  .pt-lg-9,
+.py-lg-9 {
+    padding-top: 72px !important;
+  }
+
+  .pr-lg-9,
+.px-lg-9 {
+    padding-right: 72px !important;
+  }
+
+  .pb-lg-9,
+.py-lg-9 {
+    padding-bottom: 72px !important;
+  }
+
+  .pl-lg-9,
+.px-lg-9 {
+    padding-left: 72px !important;
+  }
+
+  .p-lg-10 {
+    padding: 80px !important;
+  }
+
+  .pt-lg-10,
+.py-lg-10 {
+    padding-top: 80px !important;
+  }
+
+  .pr-lg-10,
+.px-lg-10 {
+    padding-right: 80px !important;
+  }
+
+  .pb-lg-10,
+.py-lg-10 {
+    padding-bottom: 80px !important;
+  }
+
+  .pl-lg-10,
+.px-lg-10 {
+    padding-left: 80px !important;
+  }
+
+  .p-lg-12 {
+    padding: 96px !important;
+  }
+
+  .pt-lg-12,
+.py-lg-12 {
+    padding-top: 96px !important;
+  }
+
+  .pr-lg-12,
+.px-lg-12 {
+    padding-right: 96px !important;
+  }
+
+  .pb-lg-12,
+.py-lg-12 {
+    padding-bottom: 96px !important;
+  }
+
+  .pl-lg-12,
+.px-lg-12 {
+    padding-left: 96px !important;
+  }
+
+  .p-lg-15 {
+    padding: 120px !important;
+  }
+
+  .pt-lg-15,
+.py-lg-15 {
+    padding-top: 120px !important;
+  }
+
+  .pr-lg-15,
+.px-lg-15 {
+    padding-right: 120px !important;
+  }
+
+  .pb-lg-15,
+.py-lg-15 {
+    padding-bottom: 120px !important;
+  }
+
+  .pl-lg-15,
+.px-lg-15 {
+    padding-left: 120px !important;
+  }
+
   .m-lg-n1 {
-    margin: -0.25rem !important;
+    margin: -8px !important;
   }
+
   .mt-lg-n1,
-  .my-lg-n1 {
-    margin-top: -0.25rem !important;
+.my-lg-n1 {
+    margin-top: -8px !important;
   }
+
   .mr-lg-n1,
-  .mx-lg-n1 {
-    margin-right: -0.25rem !important;
+.mx-lg-n1 {
+    margin-right: -8px !important;
   }
+
   .mb-lg-n1,
-  .my-lg-n1 {
-    margin-bottom: -0.25rem !important;
+.my-lg-n1 {
+    margin-bottom: -8px !important;
   }
+
   .ml-lg-n1,
-  .mx-lg-n1 {
-    margin-left: -0.25rem !important;
+.mx-lg-n1 {
+    margin-left: -8px !important;
   }
+
   .m-lg-n2 {
-    margin: -0.5rem !important;
+    margin: -16px !important;
   }
+
   .mt-lg-n2,
-  .my-lg-n2 {
-    margin-top: -0.5rem !important;
+.my-lg-n2 {
+    margin-top: -16px !important;
   }
+
   .mr-lg-n2,
-  .mx-lg-n2 {
-    margin-right: -0.5rem !important;
+.mx-lg-n2 {
+    margin-right: -16px !important;
   }
+
   .mb-lg-n2,
-  .my-lg-n2 {
-    margin-bottom: -0.5rem !important;
+.my-lg-n2 {
+    margin-bottom: -16px !important;
   }
+
   .ml-lg-n2,
-  .mx-lg-n2 {
-    margin-left: -0.5rem !important;
+.mx-lg-n2 {
+    margin-left: -16px !important;
   }
+
   .m-lg-n3 {
-    margin: -1rem !important;
+    margin: -24px !important;
   }
+
   .mt-lg-n3,
-  .my-lg-n3 {
-    margin-top: -1rem !important;
+.my-lg-n3 {
+    margin-top: -24px !important;
   }
+
   .mr-lg-n3,
-  .mx-lg-n3 {
-    margin-right: -1rem !important;
+.mx-lg-n3 {
+    margin-right: -24px !important;
   }
+
   .mb-lg-n3,
-  .my-lg-n3 {
-    margin-bottom: -1rem !important;
+.my-lg-n3 {
+    margin-bottom: -24px !important;
   }
+
   .ml-lg-n3,
-  .mx-lg-n3 {
-    margin-left: -1rem !important;
+.mx-lg-n3 {
+    margin-left: -24px !important;
   }
+
   .m-lg-n4 {
-    margin: -1.5rem !important;
+    margin: -32px !important;
   }
+
   .mt-lg-n4,
-  .my-lg-n4 {
-    margin-top: -1.5rem !important;
+.my-lg-n4 {
+    margin-top: -32px !important;
   }
+
   .mr-lg-n4,
-  .mx-lg-n4 {
-    margin-right: -1.5rem !important;
+.mx-lg-n4 {
+    margin-right: -32px !important;
   }
+
   .mb-lg-n4,
-  .my-lg-n4 {
-    margin-bottom: -1.5rem !important;
+.my-lg-n4 {
+    margin-bottom: -32px !important;
   }
+
   .ml-lg-n4,
-  .mx-lg-n4 {
-    margin-left: -1.5rem !important;
+.mx-lg-n4 {
+    margin-left: -32px !important;
   }
+
   .m-lg-n5 {
-    margin: -3rem !important;
+    margin: -40px !important;
   }
+
   .mt-lg-n5,
-  .my-lg-n5 {
-    margin-top: -3rem !important;
+.my-lg-n5 {
+    margin-top: -40px !important;
   }
+
   .mr-lg-n5,
-  .mx-lg-n5 {
-    margin-right: -3rem !important;
+.mx-lg-n5 {
+    margin-right: -40px !important;
   }
+
   .mb-lg-n5,
-  .my-lg-n5 {
-    margin-bottom: -3rem !important;
+.my-lg-n5 {
+    margin-bottom: -40px !important;
   }
+
   .ml-lg-n5,
-  .mx-lg-n5 {
-    margin-left: -3rem !important;
+.mx-lg-n5 {
+    margin-left: -40px !important;
   }
+
+  .m-lg-n6 {
+    margin: -48px !important;
+  }
+
+  .mt-lg-n6,
+.my-lg-n6 {
+    margin-top: -48px !important;
+  }
+
+  .mr-lg-n6,
+.mx-lg-n6 {
+    margin-right: -48px !important;
+  }
+
+  .mb-lg-n6,
+.my-lg-n6 {
+    margin-bottom: -48px !important;
+  }
+
+  .ml-lg-n6,
+.mx-lg-n6 {
+    margin-left: -48px !important;
+  }
+
+  .m-lg-n7 {
+    margin: -56px !important;
+  }
+
+  .mt-lg-n7,
+.my-lg-n7 {
+    margin-top: -56px !important;
+  }
+
+  .mr-lg-n7,
+.mx-lg-n7 {
+    margin-right: -56px !important;
+  }
+
+  .mb-lg-n7,
+.my-lg-n7 {
+    margin-bottom: -56px !important;
+  }
+
+  .ml-lg-n7,
+.mx-lg-n7 {
+    margin-left: -56px !important;
+  }
+
+  .m-lg-n8 {
+    margin: -64px !important;
+  }
+
+  .mt-lg-n8,
+.my-lg-n8 {
+    margin-top: -64px !important;
+  }
+
+  .mr-lg-n8,
+.mx-lg-n8 {
+    margin-right: -64px !important;
+  }
+
+  .mb-lg-n8,
+.my-lg-n8 {
+    margin-bottom: -64px !important;
+  }
+
+  .ml-lg-n8,
+.mx-lg-n8 {
+    margin-left: -64px !important;
+  }
+
+  .m-lg-n9 {
+    margin: -72px !important;
+  }
+
+  .mt-lg-n9,
+.my-lg-n9 {
+    margin-top: -72px !important;
+  }
+
+  .mr-lg-n9,
+.mx-lg-n9 {
+    margin-right: -72px !important;
+  }
+
+  .mb-lg-n9,
+.my-lg-n9 {
+    margin-bottom: -72px !important;
+  }
+
+  .ml-lg-n9,
+.mx-lg-n9 {
+    margin-left: -72px !important;
+  }
+
+  .m-lg-n10 {
+    margin: -80px !important;
+  }
+
+  .mt-lg-n10,
+.my-lg-n10 {
+    margin-top: -80px !important;
+  }
+
+  .mr-lg-n10,
+.mx-lg-n10 {
+    margin-right: -80px !important;
+  }
+
+  .mb-lg-n10,
+.my-lg-n10 {
+    margin-bottom: -80px !important;
+  }
+
+  .ml-lg-n10,
+.mx-lg-n10 {
+    margin-left: -80px !important;
+  }
+
+  .m-lg-n12 {
+    margin: -96px !important;
+  }
+
+  .mt-lg-n12,
+.my-lg-n12 {
+    margin-top: -96px !important;
+  }
+
+  .mr-lg-n12,
+.mx-lg-n12 {
+    margin-right: -96px !important;
+  }
+
+  .mb-lg-n12,
+.my-lg-n12 {
+    margin-bottom: -96px !important;
+  }
+
+  .ml-lg-n12,
+.mx-lg-n12 {
+    margin-left: -96px !important;
+  }
+
+  .m-lg-n15 {
+    margin: -120px !important;
+  }
+
+  .mt-lg-n15,
+.my-lg-n15 {
+    margin-top: -120px !important;
+  }
+
+  .mr-lg-n15,
+.mx-lg-n15 {
+    margin-right: -120px !important;
+  }
+
+  .mb-lg-n15,
+.my-lg-n15 {
+    margin-bottom: -120px !important;
+  }
+
+  .ml-lg-n15,
+.mx-lg-n15 {
+    margin-left: -120px !important;
+  }
+
   .m-lg-auto {
     margin: auto !important;
   }
+
   .mt-lg-auto,
-  .my-lg-auto {
+.my-lg-auto {
     margin-top: auto !important;
   }
+
   .mr-lg-auto,
-  .mx-lg-auto {
+.mx-lg-auto {
     margin-right: auto !important;
   }
+
   .mb-lg-auto,
-  .my-lg-auto {
+.my-lg-auto {
     margin-bottom: auto !important;
   }
+
   .ml-lg-auto,
-  .mx-lg-auto {
+.mx-lg-auto {
     margin-left: auto !important;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .m-xl-0 {
     margin: 0 !important;
   }
+
   .mt-xl-0,
-  .my-xl-0 {
+.my-xl-0 {
     margin-top: 0 !important;
   }
+
   .mr-xl-0,
-  .mx-xl-0 {
+.mx-xl-0 {
     margin-right: 0 !important;
   }
+
   .mb-xl-0,
-  .my-xl-0 {
+.my-xl-0 {
     margin-bottom: 0 !important;
   }
+
   .ml-xl-0,
-  .mx-xl-0 {
+.mx-xl-0 {
     margin-left: 0 !important;
   }
+
   .m-xl-1 {
-    margin: 0.25rem !important;
+    margin: 8px !important;
   }
+
   .mt-xl-1,
-  .my-xl-1 {
-    margin-top: 0.25rem !important;
+.my-xl-1 {
+    margin-top: 8px !important;
   }
+
   .mr-xl-1,
-  .mx-xl-1 {
-    margin-right: 0.25rem !important;
+.mx-xl-1 {
+    margin-right: 8px !important;
   }
+
   .mb-xl-1,
-  .my-xl-1 {
-    margin-bottom: 0.25rem !important;
+.my-xl-1 {
+    margin-bottom: 8px !important;
   }
+
   .ml-xl-1,
-  .mx-xl-1 {
-    margin-left: 0.25rem !important;
+.mx-xl-1 {
+    margin-left: 8px !important;
   }
+
   .m-xl-2 {
-    margin: 0.5rem !important;
+    margin: 16px !important;
   }
+
   .mt-xl-2,
-  .my-xl-2 {
-    margin-top: 0.5rem !important;
+.my-xl-2 {
+    margin-top: 16px !important;
   }
+
   .mr-xl-2,
-  .mx-xl-2 {
-    margin-right: 0.5rem !important;
+.mx-xl-2 {
+    margin-right: 16px !important;
   }
+
   .mb-xl-2,
-  .my-xl-2 {
-    margin-bottom: 0.5rem !important;
+.my-xl-2 {
+    margin-bottom: 16px !important;
   }
+
   .ml-xl-2,
-  .mx-xl-2 {
-    margin-left: 0.5rem !important;
+.mx-xl-2 {
+    margin-left: 16px !important;
   }
+
   .m-xl-3 {
-    margin: 1rem !important;
+    margin: 24px !important;
   }
+
   .mt-xl-3,
-  .my-xl-3 {
-    margin-top: 1rem !important;
+.my-xl-3 {
+    margin-top: 24px !important;
   }
+
   .mr-xl-3,
-  .mx-xl-3 {
-    margin-right: 1rem !important;
+.mx-xl-3 {
+    margin-right: 24px !important;
   }
+
   .mb-xl-3,
-  .my-xl-3 {
-    margin-bottom: 1rem !important;
+.my-xl-3 {
+    margin-bottom: 24px !important;
   }
+
   .ml-xl-3,
-  .mx-xl-3 {
-    margin-left: 1rem !important;
+.mx-xl-3 {
+    margin-left: 24px !important;
   }
+
   .m-xl-4 {
-    margin: 1.5rem !important;
+    margin: 32px !important;
   }
+
   .mt-xl-4,
-  .my-xl-4 {
-    margin-top: 1.5rem !important;
+.my-xl-4 {
+    margin-top: 32px !important;
   }
+
   .mr-xl-4,
-  .mx-xl-4 {
-    margin-right: 1.5rem !important;
+.mx-xl-4 {
+    margin-right: 32px !important;
   }
+
   .mb-xl-4,
-  .my-xl-4 {
-    margin-bottom: 1.5rem !important;
+.my-xl-4 {
+    margin-bottom: 32px !important;
   }
+
   .ml-xl-4,
-  .mx-xl-4 {
-    margin-left: 1.5rem !important;
+.mx-xl-4 {
+    margin-left: 32px !important;
   }
+
   .m-xl-5 {
-    margin: 3rem !important;
+    margin: 40px !important;
   }
+
   .mt-xl-5,
-  .my-xl-5 {
-    margin-top: 3rem !important;
+.my-xl-5 {
+    margin-top: 40px !important;
   }
+
   .mr-xl-5,
-  .mx-xl-5 {
-    margin-right: 3rem !important;
+.mx-xl-5 {
+    margin-right: 40px !important;
   }
+
   .mb-xl-5,
-  .my-xl-5 {
-    margin-bottom: 3rem !important;
+.my-xl-5 {
+    margin-bottom: 40px !important;
   }
+
   .ml-xl-5,
-  .mx-xl-5 {
-    margin-left: 3rem !important;
+.mx-xl-5 {
+    margin-left: 40px !important;
   }
+
+  .m-xl-6 {
+    margin: 48px !important;
+  }
+
+  .mt-xl-6,
+.my-xl-6 {
+    margin-top: 48px !important;
+  }
+
+  .mr-xl-6,
+.mx-xl-6 {
+    margin-right: 48px !important;
+  }
+
+  .mb-xl-6,
+.my-xl-6 {
+    margin-bottom: 48px !important;
+  }
+
+  .ml-xl-6,
+.mx-xl-6 {
+    margin-left: 48px !important;
+  }
+
+  .m-xl-7 {
+    margin: 56px !important;
+  }
+
+  .mt-xl-7,
+.my-xl-7 {
+    margin-top: 56px !important;
+  }
+
+  .mr-xl-7,
+.mx-xl-7 {
+    margin-right: 56px !important;
+  }
+
+  .mb-xl-7,
+.my-xl-7 {
+    margin-bottom: 56px !important;
+  }
+
+  .ml-xl-7,
+.mx-xl-7 {
+    margin-left: 56px !important;
+  }
+
+  .m-xl-8 {
+    margin: 64px !important;
+  }
+
+  .mt-xl-8,
+.my-xl-8 {
+    margin-top: 64px !important;
+  }
+
+  .mr-xl-8,
+.mx-xl-8 {
+    margin-right: 64px !important;
+  }
+
+  .mb-xl-8,
+.my-xl-8 {
+    margin-bottom: 64px !important;
+  }
+
+  .ml-xl-8,
+.mx-xl-8 {
+    margin-left: 64px !important;
+  }
+
+  .m-xl-9 {
+    margin: 72px !important;
+  }
+
+  .mt-xl-9,
+.my-xl-9 {
+    margin-top: 72px !important;
+  }
+
+  .mr-xl-9,
+.mx-xl-9 {
+    margin-right: 72px !important;
+  }
+
+  .mb-xl-9,
+.my-xl-9 {
+    margin-bottom: 72px !important;
+  }
+
+  .ml-xl-9,
+.mx-xl-9 {
+    margin-left: 72px !important;
+  }
+
+  .m-xl-10 {
+    margin: 80px !important;
+  }
+
+  .mt-xl-10,
+.my-xl-10 {
+    margin-top: 80px !important;
+  }
+
+  .mr-xl-10,
+.mx-xl-10 {
+    margin-right: 80px !important;
+  }
+
+  .mb-xl-10,
+.my-xl-10 {
+    margin-bottom: 80px !important;
+  }
+
+  .ml-xl-10,
+.mx-xl-10 {
+    margin-left: 80px !important;
+  }
+
+  .m-xl-12 {
+    margin: 96px !important;
+  }
+
+  .mt-xl-12,
+.my-xl-12 {
+    margin-top: 96px !important;
+  }
+
+  .mr-xl-12,
+.mx-xl-12 {
+    margin-right: 96px !important;
+  }
+
+  .mb-xl-12,
+.my-xl-12 {
+    margin-bottom: 96px !important;
+  }
+
+  .ml-xl-12,
+.mx-xl-12 {
+    margin-left: 96px !important;
+  }
+
+  .m-xl-15 {
+    margin: 120px !important;
+  }
+
+  .mt-xl-15,
+.my-xl-15 {
+    margin-top: 120px !important;
+  }
+
+  .mr-xl-15,
+.mx-xl-15 {
+    margin-right: 120px !important;
+  }
+
+  .mb-xl-15,
+.my-xl-15 {
+    margin-bottom: 120px !important;
+  }
+
+  .ml-xl-15,
+.mx-xl-15 {
+    margin-left: 120px !important;
+  }
+
   .p-xl-0 {
     padding: 0 !important;
   }
+
   .pt-xl-0,
-  .py-xl-0 {
+.py-xl-0 {
     padding-top: 0 !important;
   }
+
   .pr-xl-0,
-  .px-xl-0 {
+.px-xl-0 {
     padding-right: 0 !important;
   }
+
   .pb-xl-0,
-  .py-xl-0 {
+.py-xl-0 {
     padding-bottom: 0 !important;
   }
+
   .pl-xl-0,
-  .px-xl-0 {
+.px-xl-0 {
     padding-left: 0 !important;
   }
+
   .p-xl-1 {
-    padding: 0.25rem !important;
+    padding: 8px !important;
   }
+
   .pt-xl-1,
-  .py-xl-1 {
-    padding-top: 0.25rem !important;
+.py-xl-1 {
+    padding-top: 8px !important;
   }
+
   .pr-xl-1,
-  .px-xl-1 {
-    padding-right: 0.25rem !important;
+.px-xl-1 {
+    padding-right: 8px !important;
   }
+
   .pb-xl-1,
-  .py-xl-1 {
-    padding-bottom: 0.25rem !important;
+.py-xl-1 {
+    padding-bottom: 8px !important;
   }
+
   .pl-xl-1,
-  .px-xl-1 {
-    padding-left: 0.25rem !important;
+.px-xl-1 {
+    padding-left: 8px !important;
   }
+
   .p-xl-2 {
-    padding: 0.5rem !important;
+    padding: 16px !important;
   }
+
   .pt-xl-2,
-  .py-xl-2 {
-    padding-top: 0.5rem !important;
+.py-xl-2 {
+    padding-top: 16px !important;
   }
+
   .pr-xl-2,
-  .px-xl-2 {
-    padding-right: 0.5rem !important;
+.px-xl-2 {
+    padding-right: 16px !important;
   }
+
   .pb-xl-2,
-  .py-xl-2 {
-    padding-bottom: 0.5rem !important;
+.py-xl-2 {
+    padding-bottom: 16px !important;
   }
+
   .pl-xl-2,
-  .px-xl-2 {
-    padding-left: 0.5rem !important;
+.px-xl-2 {
+    padding-left: 16px !important;
   }
+
   .p-xl-3 {
-    padding: 1rem !important;
+    padding: 24px !important;
   }
+
   .pt-xl-3,
-  .py-xl-3 {
-    padding-top: 1rem !important;
+.py-xl-3 {
+    padding-top: 24px !important;
   }
+
   .pr-xl-3,
-  .px-xl-3 {
-    padding-right: 1rem !important;
+.px-xl-3 {
+    padding-right: 24px !important;
   }
+
   .pb-xl-3,
-  .py-xl-3 {
-    padding-bottom: 1rem !important;
+.py-xl-3 {
+    padding-bottom: 24px !important;
   }
+
   .pl-xl-3,
-  .px-xl-3 {
-    padding-left: 1rem !important;
+.px-xl-3 {
+    padding-left: 24px !important;
   }
+
   .p-xl-4 {
-    padding: 1.5rem !important;
+    padding: 32px !important;
   }
+
   .pt-xl-4,
-  .py-xl-4 {
-    padding-top: 1.5rem !important;
+.py-xl-4 {
+    padding-top: 32px !important;
   }
+
   .pr-xl-4,
-  .px-xl-4 {
-    padding-right: 1.5rem !important;
+.px-xl-4 {
+    padding-right: 32px !important;
   }
+
   .pb-xl-4,
-  .py-xl-4 {
-    padding-bottom: 1.5rem !important;
+.py-xl-4 {
+    padding-bottom: 32px !important;
   }
+
   .pl-xl-4,
-  .px-xl-4 {
-    padding-left: 1.5rem !important;
+.px-xl-4 {
+    padding-left: 32px !important;
   }
+
   .p-xl-5 {
-    padding: 3rem !important;
+    padding: 40px !important;
   }
+
   .pt-xl-5,
-  .py-xl-5 {
-    padding-top: 3rem !important;
+.py-xl-5 {
+    padding-top: 40px !important;
   }
+
   .pr-xl-5,
-  .px-xl-5 {
-    padding-right: 3rem !important;
+.px-xl-5 {
+    padding-right: 40px !important;
   }
+
   .pb-xl-5,
-  .py-xl-5 {
-    padding-bottom: 3rem !important;
+.py-xl-5 {
+    padding-bottom: 40px !important;
   }
+
   .pl-xl-5,
-  .px-xl-5 {
-    padding-left: 3rem !important;
+.px-xl-5 {
+    padding-left: 40px !important;
   }
+
+  .p-xl-6 {
+    padding: 48px !important;
+  }
+
+  .pt-xl-6,
+.py-xl-6 {
+    padding-top: 48px !important;
+  }
+
+  .pr-xl-6,
+.px-xl-6 {
+    padding-right: 48px !important;
+  }
+
+  .pb-xl-6,
+.py-xl-6 {
+    padding-bottom: 48px !important;
+  }
+
+  .pl-xl-6,
+.px-xl-6 {
+    padding-left: 48px !important;
+  }
+
+  .p-xl-7 {
+    padding: 56px !important;
+  }
+
+  .pt-xl-7,
+.py-xl-7 {
+    padding-top: 56px !important;
+  }
+
+  .pr-xl-7,
+.px-xl-7 {
+    padding-right: 56px !important;
+  }
+
+  .pb-xl-7,
+.py-xl-7 {
+    padding-bottom: 56px !important;
+  }
+
+  .pl-xl-7,
+.px-xl-7 {
+    padding-left: 56px !important;
+  }
+
+  .p-xl-8 {
+    padding: 64px !important;
+  }
+
+  .pt-xl-8,
+.py-xl-8 {
+    padding-top: 64px !important;
+  }
+
+  .pr-xl-8,
+.px-xl-8 {
+    padding-right: 64px !important;
+  }
+
+  .pb-xl-8,
+.py-xl-8 {
+    padding-bottom: 64px !important;
+  }
+
+  .pl-xl-8,
+.px-xl-8 {
+    padding-left: 64px !important;
+  }
+
+  .p-xl-9 {
+    padding: 72px !important;
+  }
+
+  .pt-xl-9,
+.py-xl-9 {
+    padding-top: 72px !important;
+  }
+
+  .pr-xl-9,
+.px-xl-9 {
+    padding-right: 72px !important;
+  }
+
+  .pb-xl-9,
+.py-xl-9 {
+    padding-bottom: 72px !important;
+  }
+
+  .pl-xl-9,
+.px-xl-9 {
+    padding-left: 72px !important;
+  }
+
+  .p-xl-10 {
+    padding: 80px !important;
+  }
+
+  .pt-xl-10,
+.py-xl-10 {
+    padding-top: 80px !important;
+  }
+
+  .pr-xl-10,
+.px-xl-10 {
+    padding-right: 80px !important;
+  }
+
+  .pb-xl-10,
+.py-xl-10 {
+    padding-bottom: 80px !important;
+  }
+
+  .pl-xl-10,
+.px-xl-10 {
+    padding-left: 80px !important;
+  }
+
+  .p-xl-12 {
+    padding: 96px !important;
+  }
+
+  .pt-xl-12,
+.py-xl-12 {
+    padding-top: 96px !important;
+  }
+
+  .pr-xl-12,
+.px-xl-12 {
+    padding-right: 96px !important;
+  }
+
+  .pb-xl-12,
+.py-xl-12 {
+    padding-bottom: 96px !important;
+  }
+
+  .pl-xl-12,
+.px-xl-12 {
+    padding-left: 96px !important;
+  }
+
+  .p-xl-15 {
+    padding: 120px !important;
+  }
+
+  .pt-xl-15,
+.py-xl-15 {
+    padding-top: 120px !important;
+  }
+
+  .pr-xl-15,
+.px-xl-15 {
+    padding-right: 120px !important;
+  }
+
+  .pb-xl-15,
+.py-xl-15 {
+    padding-bottom: 120px !important;
+  }
+
+  .pl-xl-15,
+.px-xl-15 {
+    padding-left: 120px !important;
+  }
+
   .m-xl-n1 {
-    margin: -0.25rem !important;
+    margin: -8px !important;
   }
+
   .mt-xl-n1,
-  .my-xl-n1 {
-    margin-top: -0.25rem !important;
+.my-xl-n1 {
+    margin-top: -8px !important;
   }
+
   .mr-xl-n1,
-  .mx-xl-n1 {
-    margin-right: -0.25rem !important;
+.mx-xl-n1 {
+    margin-right: -8px !important;
   }
+
   .mb-xl-n1,
-  .my-xl-n1 {
-    margin-bottom: -0.25rem !important;
+.my-xl-n1 {
+    margin-bottom: -8px !important;
   }
+
   .ml-xl-n1,
-  .mx-xl-n1 {
-    margin-left: -0.25rem !important;
+.mx-xl-n1 {
+    margin-left: -8px !important;
   }
+
   .m-xl-n2 {
-    margin: -0.5rem !important;
+    margin: -16px !important;
   }
+
   .mt-xl-n2,
-  .my-xl-n2 {
-    margin-top: -0.5rem !important;
+.my-xl-n2 {
+    margin-top: -16px !important;
   }
+
   .mr-xl-n2,
-  .mx-xl-n2 {
-    margin-right: -0.5rem !important;
+.mx-xl-n2 {
+    margin-right: -16px !important;
   }
+
   .mb-xl-n2,
-  .my-xl-n2 {
-    margin-bottom: -0.5rem !important;
+.my-xl-n2 {
+    margin-bottom: -16px !important;
   }
+
   .ml-xl-n2,
-  .mx-xl-n2 {
-    margin-left: -0.5rem !important;
+.mx-xl-n2 {
+    margin-left: -16px !important;
   }
+
   .m-xl-n3 {
-    margin: -1rem !important;
+    margin: -24px !important;
   }
+
   .mt-xl-n3,
-  .my-xl-n3 {
-    margin-top: -1rem !important;
+.my-xl-n3 {
+    margin-top: -24px !important;
   }
+
   .mr-xl-n3,
-  .mx-xl-n3 {
-    margin-right: -1rem !important;
+.mx-xl-n3 {
+    margin-right: -24px !important;
   }
+
   .mb-xl-n3,
-  .my-xl-n3 {
-    margin-bottom: -1rem !important;
+.my-xl-n3 {
+    margin-bottom: -24px !important;
   }
+
   .ml-xl-n3,
-  .mx-xl-n3 {
-    margin-left: -1rem !important;
+.mx-xl-n3 {
+    margin-left: -24px !important;
   }
+
   .m-xl-n4 {
-    margin: -1.5rem !important;
+    margin: -32px !important;
   }
+
   .mt-xl-n4,
-  .my-xl-n4 {
-    margin-top: -1.5rem !important;
+.my-xl-n4 {
+    margin-top: -32px !important;
   }
+
   .mr-xl-n4,
-  .mx-xl-n4 {
-    margin-right: -1.5rem !important;
+.mx-xl-n4 {
+    margin-right: -32px !important;
   }
+
   .mb-xl-n4,
-  .my-xl-n4 {
-    margin-bottom: -1.5rem !important;
+.my-xl-n4 {
+    margin-bottom: -32px !important;
   }
+
   .ml-xl-n4,
-  .mx-xl-n4 {
-    margin-left: -1.5rem !important;
+.mx-xl-n4 {
+    margin-left: -32px !important;
   }
+
   .m-xl-n5 {
-    margin: -3rem !important;
+    margin: -40px !important;
   }
+
   .mt-xl-n5,
-  .my-xl-n5 {
-    margin-top: -3rem !important;
+.my-xl-n5 {
+    margin-top: -40px !important;
   }
+
   .mr-xl-n5,
-  .mx-xl-n5 {
-    margin-right: -3rem !important;
+.mx-xl-n5 {
+    margin-right: -40px !important;
   }
+
   .mb-xl-n5,
-  .my-xl-n5 {
-    margin-bottom: -3rem !important;
+.my-xl-n5 {
+    margin-bottom: -40px !important;
   }
+
   .ml-xl-n5,
-  .mx-xl-n5 {
-    margin-left: -3rem !important;
+.mx-xl-n5 {
+    margin-left: -40px !important;
   }
+
+  .m-xl-n6 {
+    margin: -48px !important;
+  }
+
+  .mt-xl-n6,
+.my-xl-n6 {
+    margin-top: -48px !important;
+  }
+
+  .mr-xl-n6,
+.mx-xl-n6 {
+    margin-right: -48px !important;
+  }
+
+  .mb-xl-n6,
+.my-xl-n6 {
+    margin-bottom: -48px !important;
+  }
+
+  .ml-xl-n6,
+.mx-xl-n6 {
+    margin-left: -48px !important;
+  }
+
+  .m-xl-n7 {
+    margin: -56px !important;
+  }
+
+  .mt-xl-n7,
+.my-xl-n7 {
+    margin-top: -56px !important;
+  }
+
+  .mr-xl-n7,
+.mx-xl-n7 {
+    margin-right: -56px !important;
+  }
+
+  .mb-xl-n7,
+.my-xl-n7 {
+    margin-bottom: -56px !important;
+  }
+
+  .ml-xl-n7,
+.mx-xl-n7 {
+    margin-left: -56px !important;
+  }
+
+  .m-xl-n8 {
+    margin: -64px !important;
+  }
+
+  .mt-xl-n8,
+.my-xl-n8 {
+    margin-top: -64px !important;
+  }
+
+  .mr-xl-n8,
+.mx-xl-n8 {
+    margin-right: -64px !important;
+  }
+
+  .mb-xl-n8,
+.my-xl-n8 {
+    margin-bottom: -64px !important;
+  }
+
+  .ml-xl-n8,
+.mx-xl-n8 {
+    margin-left: -64px !important;
+  }
+
+  .m-xl-n9 {
+    margin: -72px !important;
+  }
+
+  .mt-xl-n9,
+.my-xl-n9 {
+    margin-top: -72px !important;
+  }
+
+  .mr-xl-n9,
+.mx-xl-n9 {
+    margin-right: -72px !important;
+  }
+
+  .mb-xl-n9,
+.my-xl-n9 {
+    margin-bottom: -72px !important;
+  }
+
+  .ml-xl-n9,
+.mx-xl-n9 {
+    margin-left: -72px !important;
+  }
+
+  .m-xl-n10 {
+    margin: -80px !important;
+  }
+
+  .mt-xl-n10,
+.my-xl-n10 {
+    margin-top: -80px !important;
+  }
+
+  .mr-xl-n10,
+.mx-xl-n10 {
+    margin-right: -80px !important;
+  }
+
+  .mb-xl-n10,
+.my-xl-n10 {
+    margin-bottom: -80px !important;
+  }
+
+  .ml-xl-n10,
+.mx-xl-n10 {
+    margin-left: -80px !important;
+  }
+
+  .m-xl-n12 {
+    margin: -96px !important;
+  }
+
+  .mt-xl-n12,
+.my-xl-n12 {
+    margin-top: -96px !important;
+  }
+
+  .mr-xl-n12,
+.mx-xl-n12 {
+    margin-right: -96px !important;
+  }
+
+  .mb-xl-n12,
+.my-xl-n12 {
+    margin-bottom: -96px !important;
+  }
+
+  .ml-xl-n12,
+.mx-xl-n12 {
+    margin-left: -96px !important;
+  }
+
+  .m-xl-n15 {
+    margin: -120px !important;
+  }
+
+  .mt-xl-n15,
+.my-xl-n15 {
+    margin-top: -120px !important;
+  }
+
+  .mr-xl-n15,
+.mx-xl-n15 {
+    margin-right: -120px !important;
+  }
+
+  .mb-xl-n15,
+.my-xl-n15 {
+    margin-bottom: -120px !important;
+  }
+
+  .ml-xl-n15,
+.mx-xl-n15 {
+    margin-left: -120px !important;
+  }
+
   .m-xl-auto {
     margin: auto !important;
   }
+
   .mt-xl-auto,
-  .my-xl-auto {
+.my-xl-auto {
     margin-top: auto !important;
   }
+
   .mr-xl-auto,
-  .mx-xl-auto {
+.mx-xl-auto {
     margin-right: auto !important;
   }
+
   .mb-xl-auto,
-  .my-xl-auto {
+.my-xl-auto {
     margin-bottom: auto !important;
   }
+
   .ml-xl-auto,
-  .mx-xl-auto {
+.mx-xl-auto {
     margin-left: auto !important;
   }
 }
-
 .text-monospace {
   font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important;
 }
@@ -9919,54 +15609,71 @@ button.bg-dark:focus {
   text-align: center !important;
 }
 
-@media (min-width: 576px) {
+@media (min-width: 400px) {
+  .text-xs-left {
+    text-align: left !important;
+  }
+
+  .text-xs-right {
+    text-align: right !important;
+  }
+
+  .text-xs-center {
+    text-align: center !important;
+  }
+}
+@media (min-width: 616px) {
   .text-sm-left {
     text-align: left !important;
   }
+
   .text-sm-right {
     text-align: right !important;
   }
+
   .text-sm-center {
     text-align: center !important;
   }
 }
-
 @media (min-width: 768px) {
   .text-md-left {
     text-align: left !important;
   }
+
   .text-md-right {
     text-align: right !important;
   }
+
   .text-md-center {
     text-align: center !important;
   }
 }
-
-@media (min-width: 992px) {
+@media (min-width: 980px) {
   .text-lg-left {
     text-align: left !important;
   }
+
   .text-lg-right {
     text-align: right !important;
   }
+
   .text-lg-center {
     text-align: center !important;
   }
 }
-
-@media (min-width: 1200px) {
+@media (min-width: 1240px) {
   .text-xl-left {
     text-align: left !important;
   }
+
   .text-xl-right {
     text-align: right !important;
   }
+
   .text-xl-center {
     text-align: center !important;
   }
 }
-
 .text-lowercase {
   text-transform: lowercase !important;
 }
@@ -10008,19 +15715,19 @@ button.bg-dark:focus {
 }
 
 .text-primary {
-  color: #007bff !important;
+  color: #ffcc00 !important;
 }
 
 a.text-primary:hover, a.text-primary:focus {
-  color: #0056b3 !important;
+  color: #b38f00 !important;
 }
 
 .text-secondary {
-  color: #6c757d !important;
+  color: #212529 !important;
 }
 
 a.text-secondary:hover, a.text-secondary:focus {
-  color: #494f54 !important;
+  color: black !important;
 }
 
 .text-success {
@@ -10056,19 +15763,139 @@ a.text-danger:hover, a.text-danger:focus {
 }
 
 .text-light {
-  color: #f8f9fa !important;
+  color: #f1f6f9 !important;
 }
 
 a.text-light:hover, a.text-light:focus {
-  color: #cbd3da !important;
+  color: #bbd4e2 !important;
 }
 
 .text-dark {
-  color: #343a40 !important;
+  color: #495057 !important;
 }
 
 a.text-dark:hover, a.text-dark:focus {
-  color: #121416 !important;
+  color: #262a2d !important;
+}
+
+.text-primary-light {
+  color: #fffaf0 !important;
+}
+
+a.text-primary-light:hover, a.text-primary-light:focus {
+  color: #ffe1a4 !important;
+}
+
+.text-secondary-light {
+  color: #fff !important;
+}
+
+a.text-secondary-light:hover, a.text-secondary-light:focus {
+  color: #d9d9d9 !important;
+}
+
+.text-tertiary {
+  color: #257af4 !important;
+}
+
+a.text-tertiary:hover, a.text-tertiary:focus {
+  color: #0a56c3 !important;
+}
+
+.text-tertiary-light {
+  color: #e3f1fe !important;
+}
+
+a.text-tertiary-light:hover, a.text-tertiary-light:focus {
+  color: #99ccfb !important;
+}
+
+.text-white {
+  color: #fff !important;
+}
+
+a.text-white:hover, a.text-white:focus {
+  color: #d9d9d9 !important;
+}
+
+.text-black {
+  color: #212529 !important;
+}
+
+a.text-black:hover, a.text-black:focus {
+  color: black !important;
+}
+
+.text-blue {
+  color: #257af4 !important;
+}
+
+a.text-blue:hover, a.text-blue:focus {
+  color: #0a56c3 !important;
+}
+
+.text-light-blue {
+  color: #e3f1fe !important;
+}
+
+a.text-light-blue:hover, a.text-light-blue:focus {
+  color: #99ccfb !important;
+}
+
+.text-yellow {
+  color: #ffcc00 !important;
+}
+
+a.text-yellow:hover, a.text-yellow:focus {
+  color: #b38f00 !important;
+}
+
+.text-light-yellow {
+  color: #fffaf0 !important;
+}
+
+a.text-light-yellow:hover, a.text-light-yellow:focus {
+  color: #ffe1a4 !important;
+}
+
+.text-orange {
+  color: #ff8c00 !important;
+}
+
+a.text-orange:hover, a.text-orange:focus {
+  color: #b36200 !important;
+}
+
+.text-light-orange {
+  color: #ffe4b5 !important;
+}
+
+a.text-light-orange:hover, a.text-light-orange:focus {
+  color: #ffc869 !important;
+}
+
+.text-red {
+  color: #ff3939 !important;
+}
+
+a.text-red:hover, a.text-red:focus {
+  color: #ec0000 !important;
+}
+
+.text-light-red {
+  color: #ffe4e1 !important;
+}
+
+a.text-light-red:hover, a.text-light-red:focus {
+  color: #ff9f95 !important;
+}
+
+.text-medium {
+  color: #d6dbdf !important;
+}
+
+a.text-medium:hover, a.text-medium:focus {
+  color: #abb5bd !important;
 }
 
 .text-body {
@@ -10080,7 +15907,7 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .text-black-50 {
-  color: rgba(0, 0, 0, 0.5) !important;
+  color: rgba(33, 37, 41, 0.5) !important;
 }
 
 .text-white-50 {
@@ -10118,80 +15945,95 @@ a.text-dark:hover, a.text-dark:focus {
 
 @media print {
   *,
-  *::before,
-  *::after {
+*::before,
+*::after {
     text-shadow: none !important;
     box-shadow: none !important;
   }
+
   a:not(.btn) {
     text-decoration: underline;
   }
+
   abbr[title]::after {
     content: " (" attr(title) ")";
   }
+
   pre {
     white-space: pre-wrap !important;
   }
+
   pre,
-  blockquote {
-    border: 1px solid #adb5bd;
+blockquote {
+    border: 1px solid #d6dbdf;
     page-break-inside: avoid;
   }
+
   thead {
     display: table-header-group;
   }
+
   tr,
-  img {
+img {
     page-break-inside: avoid;
   }
+
   p,
-  h2,
-  h3 {
+h2,
+h3 {
     orphans: 3;
     widows: 3;
   }
+
   h2,
-  h3 {
+h3 {
     page-break-after: avoid;
   }
+
   @page {
     size: a3;
   }
   body {
-    min-width: 992px !important;
+    min-width: 980px !important;
   }
+
   .container {
-    min-width: 992px !important;
+    min-width: 980px !important;
   }
+
   .navbar {
     display: none;
   }
+
   .badge {
-    border: 1px solid #000;
+    border: 1px solid #212529;
   }
+
   .table {
     border-collapse: collapse !important;
   }
   .table td,
-  .table th {
+.table th {
     background-color: #fff !important;
   }
+
   .table-bordered th,
-  .table-bordered td {
+.table-bordered td {
     border: 1px solid #dee2e6 !important;
   }
+
   .table-dark {
     color: inherit;
   }
   .table-dark th,
-  .table-dark td,
-  .table-dark thead th,
-  .table-dark tbody + tbody {
-    border-color: #dee2e6;
+.table-dark td,
+.table-dark thead th,
+.table-dark tbody + tbody {
+    border-color: #d6dbdf;
   }
+
   .table .thead-dark th {
     color: inherit;
-    border-color: #dee2e6;
+    border-color: #d6dbdf;
   }
-}
-/*# sourceMappingURL=bootstrap.css.map */
+}
\ No newline at end of file
diff --git a/website/css/docs.css b/website/css/docs.css
index 6be02c6343f..735559f384c 100644
--- a/website/css/docs.css
+++ b/website/css/docs.css
@@ -25,6 +25,10 @@ summary {
     color: #666 !important;
 }
 
+#search-icon {
+    width: 40px;
+}
+
 .toc-right {
     right: 0;
 }
diff --git a/website/css/main.css b/website/css/main.css
new file mode 100644
index 00000000000..9b676804eba
--- /dev/null
+++ b/website/css/main.css
@@ -0,0 +1,1039 @@
+@media screen and (max-width: 978.98px) {
+  .btn {
+    padding: 8px 16px;
+  }
+}
+
+@media screen and (max-width: 978.98px) {
+  .btn-lg {
+    padding: 12px 24px;
+  }
+}
+
+.btn-primary {
+  color: #212529;
+}
+.btn-primary:active, .btn-primary:hover {
+  color: #212529;
+}
+
+.btn-outline-primary {
+  background: #fffaf0;
+  border-color: #ffcc00;
+  color: #212529;
+}
+.btn-outline-primary:active, .btn-outline-primary:hover {
+  background: #ffcc00;
+  border-color: #ffcc00;
+  color: #212529;
+}
+
+.btn-secondary {
+  border-color: #212529;
+  color: #fff;
+}
+.btn-secondary:active, .btn-secondary:hover {
+  background: #fff;
+  border-color: #212529;
+  color: #212529;
+}
+
+.btn-outline-secondary {
+  background: #fff;
+  border-color: #212529;
+  color: #212529;
+}
+.btn-outline-secondary:active, .btn-outline-secondary:hover {
+  background: #212529;
+  border-color: #212529;
+  color: #fff;
+}
+
+.btn-tertiary {
+  border-color: #257af4;
+  color: #fff;
+}
+.btn-tertiary:active, .btn-tertiary:hover {
+  background: #257af4;
+  border-color: #257af4;
+  color: #fff;
+}
+
+.btn-outline-tertiary {
+  background: #e3f1fe;
+  color: #257af4;
+}
+.btn-outline-tertiary:active, .btn-outline-tertiary:hover {
+  background: #257af4;
+  color: #fff;
+}
+
+.btns {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+}
+.btns .btn + .btn {
+  margin-left: 24px;
+}
+.btns .btn-lg + .btn-lg {
+  margin-left: 40px;
+}
+
+.card {
+  box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2);
+  overflow: hidden;
+  position: relative;
+  transition: box-shadow 0.2s, transform 0.2s;
+  width: 100%;
+}
+.card-body {
+  position: relative;
+  z-index: 10;
+}
+
+.card.is-large .card-body {
+  padding: 40px;
+}
+
+.card.bg-primary-light {
+  border-color: #ffcc00;
+}
+
+.card.has-dark-border {
+  border-color: #6c757d;
+}
+
+.card.has-pattern:before,
+.card.has-pattern:after {
+  background-repeat: no-repeat;
+  background-size: auto 100%;
+  bottom: 0;
+  content: "";
+  display: block;
+  position: absolute;
+  top: 0;
+  width: 72px;
+}
+
+.card.has-pattern:before {
+  background-image: url(../images/backgrounds/bg-card-pattern-blue-1.png);
+  background-position: left top;
+  left: 0;
+}
+
+.card.has-pattern:after {
+  background-image: url(../images/backgrounds/bg-card-pattern-blue-2.png);
+  background-position: right top;
+  right: 0;
+}
+
+a.card:active,
+a.card:hover,
+.card.has-hover:active,
+.card.has-hover:hover {
+  box-shadow: 0 12px 32px rgba(108, 117, 125, 0.2);
+  transform: translateY(-8px);
+}
+
+a.card:after,
+.card.has-hover:after,
+.card.has-highlight:after {
+  content: "";
+  display: block;
+  height: 8px;
+  margin-top: auto;
+  transition: background 0.2s;
+  width: 100%;
+}
+
+a.card:active:after,
+a.card:hover:after,
+.card.has-hover:active:after,
+.card.has-hover:hover:after,
+.card.has-highlight:after {
+  background: #e3f1fe;
+}
+
+.case-study-cards {
+  -moz-column-gap: 40px;
+       column-gap: 40px;
+  display: grid;
+  grid-template-columns: 1fr;
+  row-gap: 40px;
+  padding-bottom: 40px;
+  position: relative;
+}
+.case-study-cards > div {
+  align-items: stretch;
+  display: flex;
+}
+.case-study-cards:before {
+  background: #d6dbdf;
+  bottom: 0;
+  content: "";
+  display: block;
+  left: 20px;
+  position: absolute;
+  top: 40px;
+  width: 100vw;
+}
+@media screen and (min-width: 980px) {
+  .case-study-cards {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    row-gap: 80px;
+    padding-bottom: 120px;
+  }
+  .case-study-cards:before {
+    left: -40px;
+    top: 120px;
+  }
+}
+
+.case-study-card {
+  align-items: stretch;
+  flex-direction: row;
+  flex-shrink: 0;
+  left: 0;
+  transition: 0.2s box-shadow, 0.4s left, 0.4s width, 0s z-index;
+  transition-delay: 0s, 0.6s, 0.6s, 0s;
+  width: 100%;
+  z-index: 2;
+}
+@media screen and (max-width: 979.98px) {
+  .case-study-card .row {
+    min-height: 0 !important;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card:active, .case-study-card:hover {
+    box-shadow: 0 12px 32px rgba(108, 117, 125, 0.2);
+  }
+  .case-study-card:not(.is-open) {
+    cursor: pointer;
+  }
+  .case-study-card.is-open {
+    transform: none !important;
+    transition-delay: 0s, 0s, 0s, 0s;
+    width: calc(200% + 40px);
+    z-index: 10;
+  }
+  .case-study-card.is-closing {
+    z-index: 10;
+  }
+  .case-study-card.open-left.is-open {
+    left: calc(-100% - 40px);
+  }
+  .case-study-card:before {
+    background: no-repeat url(../images/backgrounds/bg-card-pattern-red.png);
+    background-position: right center;
+    background-size: contain;
+    content: "";
+    display: block;
+    height: calc(100% - 80px);
+    max-height: 224px;
+    max-width: 234px;
+    position: absolute;
+    right: 0;
+    top: 40px;
+    transform: translateX(30%);
+    transition: 0.4s transform;
+    transition-delay: 0.6s;
+    width: 100%;
+    z-index: 1;
+  }
+}
+@media screen and (min-width: 980px) and (min-width: 1240px) {
+  .case-study-card:before {
+    transform: translateX(10%);
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card.is-open:before {
+    transform: translateX(60%);
+    transition-delay: 0s;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card-wrap {
+    align-items: stretch;
+    display: flex;
+    flex-shrink: 0;
+    min-height: 304px;
+    position: relative;
+    transition: 0.4s width;
+    transition-delay: 0.6s;
+    width: calc(200% + 42px);
+    z-index: 2;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card.is-open .case-study-card-wrap {
+    transition-delay: 0s;
+    width: 100%;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card-body {
+    display: flex;
+    flex-direction: column;
+    padding-right: 80px !important;
+  }
+  .case-study-card-body > .row {
+    align-self: stretch;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card-toggle {
+    background: #fff;
+    box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2);
+    border-radius: 100%;
+    cursor: pointer;
+    height: 56px;
+    position: relative;
+    width: 56px;
+  }
+  .case-study-card-toggle:before, .case-study-card-toggle:after {
+    background: #257af4;
+    content: "";
+    display: block;
+    height: 4px;
+    left: calc(50% - 15px);
+    position: absolute;
+    top: calc(50% - 2px);
+    transition: opacity 0.2s, transform 0.2s;
+    width: 30px;
+  }
+  .case-study-card-toggle:after {
+    transform: rotate(90deg);
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card.is-open .case-study-card-toggle:before {
+    opacity: 0;
+    transform: rotate(-90deg);
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card.is-open .case-study-card-toggle:after {
+    transform: rotate(0);
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card .col-lg-3,
+.case-study-card .col-lg-auto {
+    opacity: 0;
+    transform: translateX(24px);
+    transition: 0.4s opacity, 0.4s transform;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card .col-lg-3 {
+    transition-delay: 0s;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card .col-lg-auto {
+    transition-delay: 0.2s;
+  }
+}
+@media screen and (min-width: 980px) and (min-width: 980px) {
+  .case-study-card .col-lg-auto {
+    max-width: 605px;
+    width: calc(100% - 319px);
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card.is-open .col-lg-3, .case-study-card.is-open .col-lg-auto {
+    opacity: 1;
+    transform: none;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card.is-open .col-lg-3 {
+    transition-delay: 0.4s;
+  }
+}
+@media screen and (min-width: 980px) {
+  .case-study-card.is-open .col-lg-auto {
+    transition-delay: 0.2s;
+  }
+}
+
+.footer-copy {
+  white-space: nowrap;
+}
+
+form .form-control {
+  border: 1px solid #6c757d;
+  border-radius: 6px;
+  box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2);
+  color: #212529;
+  height: auto;
+  line-height: 20px;
+  min-height: 44px;
+  padding: 12px 16px;
+  width: 100%;
+}
+form .form-control:focus {
+  border-color: #212529;
+  box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2);
+  color: #212529;
+}
+form .form-control::-moz-placeholder {
+  color: #6c757d;
+}
+form .form-control:-ms-input-placeholder {
+  color: #6c757d;
+}
+form .form-control::placeholder {
+  color: #6c757d;
+}
+form select.form-control {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+}
+form select.form-control:not([data-chosen]) {
+  color: #6c757d;
+}
+form .btn-secondary:active,
+form .btn-secondary:hover {
+  color: #212529;
+  background: #ffcc00;
+  border-color: #ffcc00;
+}
+
+.hero {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
+  overflow: visible;
+  position: relative;
+}
+.hero-bg {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
+  display: block;
+  height: 100%;
+  left: 50%;
+  position: absolute;
+  top: 0;
+  transform: translateX(-50%);
+  z-index: 1;
+}
+.hero > .container {
+  position: relative;
+  z-index: 2;
+}
+
+.hero.has-offset {
+  margin-bottom: -160px;
+  padding-bottom: 160px;
+}
+
+hr {
+  background: #f1f6f9;
+  border: 0;
+  display: block;
+  height: 4px;
+  margin: 0;
+  width: 100%;
+}
+
+hr.is-small {
+  height: 2px;
+}
+
+hr.is-large {
+  height: 8px;
+}
+
+hr.is-medium {
+  background: #d6dbdf;
+}
+
+hr.is-dark {
+  background: #495057;
+}
+
+hr.is-yellow {
+  background: linear-gradient(90deg, #ff8c00 0, #ff8c00 8px, #ffcc00 16px, rgba(255, 204, 0, 0) 100%);
+  -webkit-clip-path: polygon(8px 100%, 0 100%, 0 0, 8px 0, 8px 100%, 16px 100%, 16px 0, 100% 0, 100% 100%);
+          clip-path: polygon(8px 100%, 0 100%, 0 0, 8px 0, 8px 100%, 16px 100%, 16px 0, 100% 0, 100% 100%);
+  height: 8px;
+}
+
+.icon {
+  display: block;
+  height: 48px;
+  margin-bottom: 24px;
+  -o-object-fit: contain;
+     object-fit: contain;
+  -o-object-position: center;
+     object-position: center;
+}
+@media screen and (min-width: 576px) {
+  .icon {
+    height: 64px;
+  }
+}
+@media screen and (min-width: 980px) {
+  .icon {
+    height: 80px;
+  }
+}
+
+img {
+  max-width: 100%;
+}
+
+.kicker {
+  color: #6c757d;
+  font-family: "Hind Siliguri", sans-serif;
+  font-size: 0.875rem;
+  font-weight: 600;
+  letter-spacing: 1px;
+  margin: 0;
+}
+
+@media screen and (max-width: 978.98px) {
+  .lead {
+    font-size: 1.125rem;
+  }
+}
+
+.navbar-clickhouse {
+  border-bottom: 4px solid #f1f6f9 !important;
+  height: 142px !important;
+}
+.navbar-clickhouse > .container {
+  flex-wrap: wrap !important;
+}
+.navbar-super {
+  flex-shrink: 0;
+  width: 100%;
+}
+.navbar-super ul {
+  list-style: none;
+}
+.navbar-super li:not(:last-child) {
+  margin-bottom: 0;
+  margin-right: 24px;
+}
+.navbar-super a {
+  align-items: center;
+  color: #212529;
+  display: flex;
+  font-size: 0.875rem;
+}
+.navbar-super a:active, .navbar-super a:hover {
+  color: #257af4;
+  text-decoration: none;
+}
+.navbar-super img {
+  flex-shrink: 0;
+  margin-right: 4px;
+}
+.navbar-brand-clickhouse {
+  background: no-repeat url(/images/logo-clickhouse.svg);
+  background-size: contain;
+  flex-shrink: 0;
+  height: 28px;
+  margin-right: 48px;
+  padding: 0;
+  width: 180px;
+}
+.navbar-nav {
+  align-items: center;
+  height: 46px;
+}
+.navbar .nav-item:not(:last-child) {
+  margin-bottom: 0;
+  margin-right: 24px;
+}
+.navbar .nav-link {
+  color: #212529;
+}
+.navbar .nav-link:active, .navbar .nav-link:hover {
+  color: #257af4;
+}
+.navbar .navbar-nav {
+  flex-direction: row;
+}
+@media screen and (max-width: 978.98px) {
+  .navbar > .container {
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+  .navbar .navbar-toggler {
+    height: 24px;
+    padding: 0;
+    width: 24px;
+  }
+  .navbar .navbar-toggler:focus {
+    outline: none;
+  }
+  .navbar .navbar-toggler-icon {
+    background: no-repeat url(../images/icons/icon-menu.svg);
+    background-position: center;
+    background-size: contain;
+    height: 24px;
+    width: 24px;
+  }
+  .navbar .navbar-collapse {
+    background: #fff;
+    border-bottom: 4px solid #f1f6f9;
+    height: 56px;
+    left: 0;
+    padding: 0 20px 16px;
+    position: absolute;
+    right: 0;
+    top: 100%;
+  }
+  .navbar .nav-link {
+    font-size: 0.875rem;
+    white-space: nowrap;
+  }
+}
+@media screen and (max-width: 615.98px) {
+  .navbar .navbar-collapse {
+    height: auto;
+  }
+  .navbar .navbar-nav {
+    flex-direction: column;
+    height: auto;
+  }
+  .navbar .nav-item:not(:last-child) {
+    margin-bottom: 16px;
+    margin-right: 0;
+  }
+}
+@media screen and (max-width: 399.98px) {
+  .navbar {
+    height: 80px;
+  }
+}
+
+.page {
+  overflow: hidden;
+  width: 100vw;
+}
+
+.photo-frame {
+  background: rgba(255, 255, 255, 0.6);
+  border-radius: 100%;
+  box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2);
+  display: block;
+  margin-bottom: 24px;
+  max-width: 160px;
+  overflow: hidden;
+  position: relative;
+  width: 100%;
+}
+.photo-frame:before {
+  content: "";
+  display: block;
+  padding-bottom: 100%;
+  width: 100%;
+}
+.photo-frame img {
+  display: block;
+  height: 100%;
+  left: 0;
+  -o-object-fit: contain;
+     object-fit: contain;
+  -o-object-position: center;
+     object-position: center;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.pullquote {
+  position: relative;
+  width: 70%;
+}
+.pullquote:before {
+  background: no-repeat url(../images/backgrounds/bg-quotes.svg);
+  background-position: center;
+  background-size: 100%;
+  bottom: 0;
+  content: "";
+  display: block;
+  mix-blend-mode: multiply;
+  position: absolute;
+  right: 56px;
+  top: 0;
+  width: calc(100% - 16px);
+  z-index: 2;
+}
+.pullquote-bg {
+  bottom: 0;
+  display: block;
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: calc(50vw + 28.5714285714%);
+  z-index: 1;
+}
+.pullquote-body {
+  padding: 64px 40px 64px 0;
+  position: relative;
+  z-index: 3;
+}
+.pullquote-quote {
+  font-family: "Hind Siliguri", sans-serif;
+  font-size: 32px;
+  font-weight: 700;
+}
+.pullquote-citation {
+  font-size: 1.125rem;
+}
+
+.section {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
+  overflow: visible;
+  position: relative;
+}
+.section-bg {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
+  display: block;
+  height: 100%;
+  left: 50%;
+  position: absolute;
+  top: 0;
+  transform: translateX(-50%);
+  z-index: 1;
+}
+.section > .container {
+  position: relative;
+  z-index: 2;
+}
+
+.social-icons {
+  align-items: center;
+  display: flex;
+}
+.social-icons > a {
+  aspect-ratio: 24/24;
+  background: #6c757d;
+  display: block;
+  height: 24px;
+  width: 24px;
+  -webkit-mask-position: center;
+          mask-position: center;
+  -webkit-mask-repeat: no-repeat;
+          mask-repeat: no-repeat;
+  -webkit-mask-size: contain;
+          mask-size: contain;
+  transition: 0.2s background;
+}
+.social-icons > a:active, .social-icons > a:hover {
+  background: #212529;
+}
+.social-icons > a + a {
+  margin-left: 32px;
+}
+.social-icons-facebook {
+  -webkit-mask-image: url("/images/icons/icon-facebook-gray.svg");
+          mask-image: url("/images/icons/icon-facebook-gray.svg");
+}
+.social-icons-twitter {
+  -webkit-mask-image: url("/images/icons/icon-twitter-gray.svg");
+          mask-image: url("/images/icons/icon-twitter-gray.svg");
+  width: 31px;
+}
+.social-icons-linkedin {
+  -webkit-mask-image: url("/images/icons/icon-linkedin-gray.svg");
+          mask-image: url("/images/icons/icon-linkedin-gray.svg");
+}
+.social-icons-linkedin-alt {
+  -webkit-mask-image: url("/images/icons/icon-linkedin-alt-gray.svg");
+          mask-image: url("/images/icons/icon-linkedin-alt-gray.svg");
+}
+
+.social-icons.size-small > a {
+  height: 20px;
+  width: 20px;
+}
+.social-icons.size-small > a:active, .social-icons.size-small > a:hover {
+  background: #212529;
+}
+.social-icons.size-small > a + a {
+  margin-left: 16px;
+}
+
+.tabs {
+  position: relative;
+}
+.tabs:before {
+  background: #fff;
+  border-radius: 7px 7px 0 0;
+  content: "";
+  display: block;
+  height: 8px;
+  left: 1px;
+  position: absolute;
+  right: 1px;
+  top: 68px;
+  z-index: 10;
+}
+@media screen and (min-width: 1240px) {
+  .tabs:before {
+    top: 76px;
+  }
+}
+.tabs-body {
+  background: #fff;
+  border-color: #6c757d;
+  border-radius: 8px;
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: 0 8px 20px rgba(108, 117, 125, 0.2);
+  padding: 24px;
+}
+@media screen and (min-width: 980px) {
+  .tabs-body {
+    padding: 32px;
+  }
+}
+@media screen and (min-width: 1240px) {
+  .tabs-body {
+    padding: 40px;
+  }
+}
+.tabs .nav-tabs {
+  border-bottom: 0;
+  flex-wrap: nowrap;
+  height: 76px;
+  margin: -20px -20px -9px;
+  -webkit-mask-image: linear-gradient(90deg, transparent 0%, #000 20px, #000 calc(100% - 20px), transparent 100%);
+          mask-image: linear-gradient(90deg, transparent 0%, #000 20px, #000 calc(100% - 20px), transparent 100%);
+  overflow: scroll;
+  overflow-x: scroll;
+  overflow-y: visible;
+  padding: 20px 20px 0;
+  position: relative;
+}
+@media screen and (min-width: 940px) {
+  .tabs .nav-tabs {
+    overflow: visible;
+  }
+}
+@media screen and (min-width: 1240px) {
+  .tabs .nav-tabs {
+    height: 84px;
+  }
+}
+.tabs .nav-link {
+  align-items: center;
+  border-bottom: 0;
+  color: #6c757d;
+  display: flex;
+  font-size: 0.875rem;
+  flex-shrink: 0;
+  height: 56px;
+  justify-content: center;
+  padding: 0 12px 8px;
+  text-align: center;
+  white-space: nowrap;
+}
+@media screen and (min-width: 1240px) {
+  .tabs .nav-link {
+    height: 64px;
+    padding: 0 16px 8px;
+  }
+}
+.tabs .nav-link.active {
+  background: #fff;
+  box-shadow: 0 -4px 8px rgba(108, 117, 125, 0.1);
+  font-weight: 700;
+  padding: 0 16px 8px;
+}
+@media screen and (min-width: 980px) {
+  .tabs .nav-link.active {
+    padding: 0 24px 8px;
+  }
+}
+@media screen and (min-width: 1240px) {
+  .tabs .nav-link.active {
+    padding: 0 32px 8px;
+  }
+}
+
+.tab-pane pre {
+  background: #212529;
+  border-radius: 16px;
+  color: #fff;
+  padding: 24px 16px;
+}
+@media screen and (min-width: 1240px) {
+  .tab-pane pre {
+    padding: 32px 24px;
+  }
+}
+
+.trailing-link {
+  align-items: center;
+  color: #212529;
+  display: flex;
+  font-size: 0.875rem;
+  font-weight: 700;
+}
+.trailing-link:after {
+  background: no-repeat url(../images/icons/icon-arrow.svg);
+  background-position: right center;
+  background-size: contain;
+  content: "";
+  display: block;
+  height: 12px;
+  transition: 0.2s transform;
+  width: 20px;
+}
+.trailing-link:active, .trailing-link:hover {
+  color: #212529;
+  text-decoration: none;
+}
+.trailing-link:active:after, .trailing-link:hover:after {
+  transform: translateX(8px);
+}
+.trailing-link.span-full:after {
+  margin-left: auto;
+}
+
+ul {
+  list-style-type: square;
+  padding-left: 1.25em;
+}
+ul li:not(:last-child) {
+  margin-bottom: 16px;
+}
+ul li::marker {
+  color: #ff3939;
+}
+
+ul.has-separators {
+  list-style: none;
+  padding: 0;
+}
+ul.has-separators li:not(:last-child) {
+  border-bottom: 4px solid #f1f6f9;
+  margin-bottom: 24px;
+  padding-bottom: 24px;
+}
+
+.bg-gradient-secondary {
+  background-image: linear-gradient(58deg, #FF6443 3%, #FE561D 24%, #E32F0D 93%);
+}
+
+.bg-gradient-light-orange {
+  background-image: linear-gradient(90deg, rgba(255, 203, 128, 0) 0%, #FFCB80 100%);
+}
+
+.bg-offset-right {
+  bottom: 0;
+  left: -24px;
+  position: absolute;
+  top: 0;
+  width: calc(100vw + 24px);
+  z-index: -1;
+}
+@media screen and (min-width: 1240px) {
+  .bg-offset-right {
+    left: -96px;
+    width: calc(100vw + 96px);
+  }
+}
+
+.bg-inset-right {
+  bottom: 0;
+  left: 40px;
+  position: absolute;
+  top: 0;
+  width: calc(100vw - 40px);
+  z-index: -1;
+}
+@media screen and (min-width: 980px) {
+  .bg-inset-right {
+    left: 96px;
+    width: calc(100vw - 96px);
+  }
+}
+
+.has-border-left {
+  border-left: 8px solid #f1f6f9;
+  padding-left: 16px;
+}
+
+.font-xl {
+  font-size: 1.25rem;
+}
+
+.font-lg {
+  font-size: 1.125rem;
+}
+
+.font-sm {
+  font-size: 0.875rem;
+}
+
+.font-xs {
+  font-size: 0.625rem;
+}
+
+.font-weight-semibold {
+  font-weight: 600;
+}
+
+.display-5 {
+  color: #212529;
+  font-size: 20px;
+  font-weight: 500;
+}
+
+.display-6 {
+  color: #212529;
+  font-size: 14px;
+  font-weight: 700;
+}
+
+.text-decoration-underline {
+  text-decoration: underline;
+}
+
+.text-upper {
+  text-transform: uppercase;
+}
+.base-hero {
+    height:22.5vw;
+    max-height:324px;
+    min-height:280px;
+}
+.index-hero {
+  background-image:url('/images/backgrounds/bg-hero-home.svg');
+  height:68vw;
+  max-height:980px;
+  max-width:2448px;
+  width:170vw;
+}
+.other-hero {
+  background-image: url('/images/backgrounds/bg-hero.svg');
+  max-width: 2448px;
+  width: 170vw;
+}
+.bg-footer-cta {
+  background-image:url('/images/backgrounds/bg-footer-cta.svg');
+  width:2448px;
+}
+.quickstart-bg {
+  background-image:url('/images/backgrounds/bg-quick-start.svg');
+  height:40vw;
+  top:220px;
+  width:170vw;
+}
diff --git a/website/images/backgrounds/bg-card-pattern-blue-1.png b/website/images/backgrounds/bg-card-pattern-blue-1.png
new file mode 100644
index 00000000000..b15958adcb1
Binary files /dev/null and b/website/images/backgrounds/bg-card-pattern-blue-1.png differ
diff --git a/website/images/backgrounds/bg-card-pattern-blue-2.png b/website/images/backgrounds/bg-card-pattern-blue-2.png
new file mode 100644
index 00000000000..a0bf1a9f752
Binary files /dev/null and b/website/images/backgrounds/bg-card-pattern-blue-2.png differ
diff --git a/website/images/backgrounds/bg-card-pattern-red.png b/website/images/backgrounds/bg-card-pattern-red.png
new file mode 100644
index 00000000000..a944ec45bd0
Binary files /dev/null and b/website/images/backgrounds/bg-card-pattern-red.png differ
diff --git a/website/images/backgrounds/bg-footer-cta.svg b/website/images/backgrounds/bg-footer-cta.svg
new file mode 100644
index 00000000000..d3a89339800
--- /dev/null
+++ b/website/images/backgrounds/bg-footer-cta.svg
@@ -0,0 +1 @@
+<svg width="2448" height="432" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background:#fff"><defs><linearGradient x1="50%" y1="5.387%" x2="7.925%" y2="92.027%" id="c"><stop stop-color="#F9FBFD" offset="0%"/><stop stop-color="#F1F6F9" offset="100%"/></linearGradient><linearGradient x1="100%" y1="51.29%" x2="46.829%" y2="50%" id="d"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.974%" x2="0%" y2="49.026%" id="e"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="52.688%" x2="0%" y2="47.312%" id="f"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.075%" x2="0%" y2="49.925%" id="g"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="53.995%" x2="0%" y2="46.005%" id="h"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="174.731%" y1="44.617%" x2="39.814%" y2="50%" id="i"><stop stop-color="#FC0" stop-opacity=".5" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="41.708%" x2="50%" y2="50%" id="j"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="0%" y1="45.225%" x2="100%" y2="45.225%" id="l"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></linearGradient><radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="58.268%" gradientTransform="matrix(0 1 -.83643 0 .918 0)" id="k"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" offset="67.349%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></radialGradient><path id="a" d="M0 0h2440v432H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v432H0z"/><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g transform="translate(-102.53 -434)"><path fill="#F1F6F9" d="m910.393 42.766 280.178 401.785h51.753V42.766z"/><path fill="url(#c)" d="M1454.914 42.766 1304.35 444.55h60.387l364.967-401.785z"/><path fill="#F1F6F9" d="M404.005 116.997V42.766h215.782L1163.73 444.55h-99.023zM1971.115 42.766 1432.546 444.55h-68.271L1860.29 42.766zM2080.643 67.526 1450.85 444.55h99.557l530.236-249.26zM404.005 1170.053v-29.1l641.914-407.38v6.246zM40.143 777.895-.001 643l1045.92-80.68v36.91zM404.005 1240.003v-35.749l641.914-449.535v7.447z"/><path fill="#E3F1FE" d="M404.005 1121.728v-34.717l641.914-353.437v21.145z"/><path fill="#F1F6F9" d="M404.005 1092.392v-34.716l641.914-344.008v21.145z"/><path stroke="#212529" stroke-width="4.193" stroke-linecap="round" d="m571.921 519.073-209.388-15.732"/><path stroke="url(#d)" stroke-width="4" stroke-linecap="round" d="m326.533 424.551 363.631 58.419"/><path fill="#F1F6F9" d="M500.727 1300h-96.722v-33.122l641.914-483.792v4.88z"/><path fill="#E3F1FE" d="M510.27 1243.866H559.9l486.02-449.729v-7.28z"/><path fill="#F1F6F9" d="m537.253 1300 508.666-498.297v20.886L606.515 1300zM1108.891 1300h-38.07l118.984-457.171h9.533zM690.648 1300h259.057l203.112-457.171h-100.61z"/><path fill="#E3F1FE" d="m1023.785 1300 149.672-457.171h20.54L1070.82 1300z"/><path fill="#F1F6F9" d="m1205.88 1300 28.8-457.171h14.117L1259.772 1300zM1323.541 1300 1265.1 842.829h87.477L1559.838 1300z"/><path fill="#E3F1FE" d="m1631.19 1300-253.687-457.171h14.457L1691.684 1300z"/><path fill="#F1F6F9" d="m1737.126 1300-315.57-457.171h16.719L1779.916 1300zM1828.814 1300l-370.629-457.171h56.593L2025.242 1300z"/><path fill="#E3F1FE" d="M1746.45 1148.382h60.518l-316.816-305.553h-18.72z"/><path fill="#F1F6F9" d="m2080.643 1295.81-530.87-452.981h21.622l509.248 318.638z"/><path fill="#E3F1FE" d="M2005.468 1190.69h68.007l-513.637-347.861h-14.631z"/><path fill="#F1F6F9" d="M1610.137 693.209v149.62l470.506 274.392 209.297-205.83z"/><path fill="#E3F1FE" d="M2080.643 1117.221v-45.807l-448-228.585h-22.506z"/><path fill="#F1F6F9" d="m2578.576 708.117 9.977-176.054-978.416 70.972v56.775z"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1610.137 498.34 503.443-178.173"/><path stroke="url(#e)" stroke-width="4" stroke-linecap="round" d="m1828.809 709.768 266.153 37.145"/><path stroke="url(#f)" stroke-width="4" stroke-linecap="round" d="m1830.992 528.692 261.787-60.703"/><path stroke="url(#g)" stroke-width="4" stroke-linecap="round" d="m871.533 562.321-435.448-16.852"/><path d="M863.48 722.628 444.138 841.162" stroke="url(#h)" stroke-width="4" stroke-linecap="round"/><path d="M1174.48 276.628 755.138 395.162" stroke="url(#i)" stroke-width="4" stroke-linecap="round" transform="rotate(47 964.809 335.895)"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1741.714 774.678 401.515 177.135"/><path stroke="#F1F6F9" stroke-width="4" stroke-linecap="round" d="m391.431 763.066 313.998-66.714"/><path stroke="url(#j)" stroke-width="4" stroke-linecap="round" d="m738.059 813.797-346.628 141.16"/><ellipse fill="url(#k)" cx="1326.533" cy="688.5" rx="860" ry="563.5"/></g></g><path fill="url(#l)" mask="url(#b)" transform="matrix(-1 0 0 1 4690 0)" d="M2242 0h206v799h-206z"/><path fill="url(#l)" mask="url(#b)" d="M0-184h206v799H0z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-hero-home.svg b/website/images/backgrounds/bg-hero-home.svg
new file mode 100644
index 00000000000..5df2ea819d6
--- /dev/null
+++ b/website/images/backgrounds/bg-hero-home.svg
@@ -0,0 +1 @@
+<svg width="2448" height="980" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background:#fff"><defs><linearGradient x1="50%" y1="5.387%" x2="7.925%" y2="92.027%" id="c"><stop stop-color="#F9FBFD" offset="0%"/><stop stop-color="#F1F6F9" offset="100%"/></linearGradient><linearGradient x1="100%" y1="58.669%" x2="50%" y2="50%" id="d"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="51.29%" x2="46.829%" y2="50%" id="e"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.974%" x2="0%" y2="49.026%" id="f"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="52.688%" x2="0%" y2="47.312%" id="g"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.075%" x2="0%" y2="49.925%" id="h"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="53.995%" x2="0%" y2="46.005%" id="i"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="174.731%" y1="44.617%" x2="39.814%" y2="50%" id="j"><stop stop-color="#FC0" stop-opacity=".5" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="41.708%" x2="50%" y2="50%" id="k"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="50%" y2="71.743%" id="l"><stop stop-color="#F8F9FA" stop-opacity="0" offset="0%"/><stop stop-color="#FFF" offset="100%"/></linearGradient><linearGradient x1="0%" y1="45.225%" x2="100%" y2="45.225%" id="n"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></linearGradient><radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="58.268%" gradientTransform="matrix(0 1 -.86232 0 .931 0)" id="m"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" offset="67.349%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></radialGradient><path id="a" d="M0 0h2448v980H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v980H0z"/><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g transform="translate(-32.69 -169)"><path fill="#F1F6F9" d="M840.551 42.766 1120.73 444.55h51.753V42.766z"/><path fill="url(#c)" d="M1385.072 42.766 1234.508 444.55h60.387l364.967-401.785z"/><path fill="#F1F6F9" d="M334.163 116.997V42.766h215.782l543.943 401.785h-99.023zM1901.273 42.766 1362.704 444.55h-68.271l496.016-401.785zM2010.802 67.526 1381.008 444.55h99.557l643.831-302.47zM334.163 1170.053v-29.1l641.915-407.38v6.246zM0 772.227V636.48l976.078-74.16v36.91zM334.163 1240.003v-35.749l641.915-449.535v7.447z"/><path fill="#E3F1FE" d="M334.163 1121.728v-34.717l641.915-353.437v21.145z"/><path fill="#F1F6F9" d="M334.163 1092.392v-34.716l641.915-344.008v21.145z"/><path stroke="#212529" stroke-width="4.193" stroke-linecap="round" d="m502.08 519.073-209.389-15.732"/><path stroke="url(#d)" stroke-width="4" stroke-linecap="round" d="m435.791 271.35 354.531 147.62"/><path stroke="url(#e)" stroke-width="4" stroke-linecap="round" d="m256.691 424.551 363.631 58.419"/><path fill="#F1F6F9" d="M430.885 1300h-96.722v-33.122l641.915-483.792v4.88z"/><path fill="#E3F1FE" d="M440.429 1243.866h49.628l486.02-449.729v-7.28z"/><path fill="#F1F6F9" d="m467.41 1300 508.668-498.297v20.886L536.673 1300zM1039.05 1300h-38.07l118.983-457.171h9.534zM620.807 1300h259.056l203.112-457.171h-100.61z"/><path fill="#E3F1FE" d="m953.944 1300 149.67-457.171h20.541L1000.98 1300z"/><path fill="#F1F6F9" d="m1136.038 1300 28.8-457.171h14.117L1189.93 1300zM1253.7 1300l-58.443-457.171h87.477L1489.996 1300z"/><path fill="#E3F1FE" d="m1561.349 1300-253.688-457.171h14.457L1621.843 1300z"/><path fill="#F1F6F9" d="m1667.285 1300-315.572-457.171h16.72L1710.074 1300zM1758.972 1300l-370.629-457.171h56.593L1955.4 1300z"/><path fill="#E3F1FE" d="M1676.609 1148.382h60.518L1420.31 842.829h-18.72z"/><path fill="#F1F6F9" d="m2010.802 1295.81-530.87-452.981h21.62l509.25 318.638z"/><path fill="#E3F1FE" d="M1935.626 1190.69h68.007l-513.637-347.861h-14.63z"/><path fill="#F1F6F9" d="M1540.295 693.209v149.62l470.507 274.392 476.694-114.616z"/><path fill="#E3F1FE" d="M2010.802 1117.221v-45.807l-448-228.585h-22.507z"/><path fill="#F1F6F9" d="m2518.71 707.768-5.425-172.963-972.99 68.23v56.775z"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="M1516.717 339.289 2025.12 0M1540.295 498.34l503.443-178.173"/><path stroke="url(#f)" stroke-width="4" stroke-linecap="round" d="m1758.967 709.768 266.153 37.145"/><path stroke="url(#g)" stroke-width="4" stroke-linecap="round" d="m1761.15 528.692 261.787-60.703"/><path stroke="url(#h)" stroke-width="4" stroke-linecap="round" d="m801.691 562.321-435.448-16.852"/><path d="M793.639 722.628 374.295 841.162" stroke="url(#i)" stroke-width="4" stroke-linecap="round"/><path d="M1104.639 276.628 685.295 395.162" stroke="url(#j)" stroke-width="4" stroke-linecap="round" transform="rotate(47 894.967 335.895)"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1671.872 774.678 401.515 177.135M863.642 243.658 632.443 21.112"/><path stroke="#FC0" stroke-width="4" stroke-linecap="round" d="m1281.983 199.578 25.678-114.798"/><path stroke="#F1F6F9" stroke-width="4" stroke-linecap="round" d="m321.589 763.066 313.998-66.714"/><path stroke="url(#k)" stroke-width="4" stroke-linecap="round" d="m668.217 813.797-346.628 141.16"/><path fill="url(#l)" d="M32.69 649h2448v500h-2448z"/><ellipse fill="url(#m)" cx="1256.202" cy="608" rx="649.877" ry="439"/></g></g><path fill="url(#n)" d="M0 0h206v980H0z"/><path fill="url(#n)" transform="matrix(-1 0 0 1 4690 0)" d="M2242 0h206v980h-206z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-hero.svg b/website/images/backgrounds/bg-hero.svg
new file mode 100644
index 00000000000..a3dd0df7beb
--- /dev/null
+++ b/website/images/backgrounds/bg-hero.svg
@@ -0,0 +1 @@
+<svg width="2448" height="336" xmlns="http://www.w3.org/2000/svg"><g fill="#FFE4B5" fill-rule="evenodd"><path d="M1248 336v-48h1200v48zM1463 253v-48h985v48zM1248 176v-48h1200v48zM1246 96V48h356v48z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-quick-start.svg b/website/images/backgrounds/bg-quick-start.svg
new file mode 100644
index 00000000000..c68b8f94788
--- /dev/null
+++ b/website/images/backgrounds/bg-quick-start.svg
@@ -0,0 +1 @@
+<svg width="2448" height="576" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="0%" y1="50%" x2="100%" y2="50%" id="a"><stop stop-color="#FF8C00" offset="0%"/><stop stop-color="#FFC000" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="0%" y1="50%" x2="50%" y2="50%" id="b"><stop stop-color="#FF8C00" offset="0%"/><stop stop-color="#FFC000" stop-opacity="0" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v576H0z"/><path fill="#FFFAF0" d="M0 56h2448v480H0z"/><path fill="url(#a)" opacity=".797" style="mix-blend-mode:multiply" d="M504 240h720v320H504z" transform="translate(0 16)"/><path fill="url(#b)" opacity=".797" style="mix-blend-mode:multiply" transform="rotate(-180 1584 88)" d="M1224 0h720v160h-720z"/><path fill="#FF8C00" opacity=".8" style="mix-blend-mode:multiply" d="M1944 0h504v160h-504zM0 240h504v320H0z" transform="translate(0 16)"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-quotes.svg b/website/images/backgrounds/bg-quotes.svg
new file mode 100644
index 00000000000..651351a0812
--- /dev/null
+++ b/website/images/backgrounds/bg-quotes.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="700px" height="320px" viewBox="0 0 700 320" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Artboard</title>
+    <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Quote-Panel-BG" fill="#FF8C00">
+            <path d="M577.058824,0 L577.058824,96.5483699 L576.887,96.548 L576.880049,97.4482487 C576.317392,132.334805 548.290575,160.5098 513.587495,161.075432 L512.523092,161.084101 L512.523092,117.946846 C524.315884,117.946846 533.886494,108.382248 533.977629,96.5487133 L480,96.5483699 L480,0 L577.058824,0 Z" id="Combined-Shape"></path>
+            <path d="M700,0 L700,96.5483699 L699.828176,96.548 L699.821226,97.4482487 C699.258568,132.334805 671.231751,160.5098 636.528671,161.075432 L635.464269,161.084101 L635.464269,117.946846 C647.257061,117.946846 656.82767,108.382248 656.918806,96.5487133 L602.941176,96.5483699 L602.941176,0 L700,0 Z" id="Combined-Shape"></path>
+            <path d="M220,159 L220,255.54837 L219.828176,255.548 L219.821226,256.448249 C219.258568,291.334805 191.231751,319.5098 156.528671,320.075432 L155.464269,320.084101 L155.464269,276.946846 C167.257061,276.946846 176.82767,267.382248 176.918806,255.548713 L122.941176,255.54837 L122.941176,159 L220,159 Z" id="Combined-Shape" transform="translate(171.470588, 239.500000) scale(-1, 1) translate(-171.470588, -239.500000) "></path>
+            <path d="M97.0588235,159 L97.0588235,255.54837 L96.887,255.548 L96.8800492,256.448249 C96.3173916,291.334805 68.2905748,319.5098 33.587495,320.075432 L32.5230924,320.084101 L32.5230924,276.946846 C44.3158844,276.946846 53.8864936,267.382248 53.9776294,255.548713 L-7.10542736e-15,255.54837 L-7.10542736e-15,159 L97.0588235,159 Z" id="Combined-Shape" transform="translate(48.529412, 239.500000) scale(-1, 1) translate(-48.529412, -239.500000) "></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-arrow.svg b/website/images/icons/icon-arrow.svg
new file mode 100644
index 00000000000..3a03b2da23b
--- /dev/null
+++ b/website/images/icons/icon-arrow.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-arrow</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-557.000000, -2491.000000)" stroke="#212529" stroke-width="2">
+            <g id="Page/Use-Cases" transform="translate(0.000000, 2108.000000)">
+                <g id="Row-1" transform="translate(185.000000, 134.000000)">
+                    <g id="Link/Read" transform="translate(222.000000, 247.000000)">
+                        <g id="icon-arrow" transform="translate(150.000000, 3.000000)">
+                            <path d="M6,0 L12,6 L6,12 M12,6 L0,6" id="Path-39"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-blog-black.svg b/website/images/icons/icon-blog-black.svg
new file mode 100644
index 00000000000..2e448c5c0da
--- /dev/null
+++ b/website/images/icons/icon-blog-black.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="14px" viewBox="0 0 18 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-blog</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Link/Blog" transform="translate(0.870000, 1.375000)" stroke="#000000" stroke-width="1.25">
+            <g id="Icon/News">
+                <line x1="6.25" y1="4.40736607" x2="12.5" y2="4.40736607" id="Path"></line>
+                <line x1="6.25" y1="6.90736607" x2="12.5" y2="6.90736607" id="Path"></line>
+                <path d="M1.25,11.25 C1.94035594,11.25 2.5,10.6903559 2.5,10 L2.5,0.625 C2.5,0.279822031 2.77982203,0 3.125,0 L15.625,0 C15.970178,0 16.25,0.279822031 16.25,0.625 L16.25,10 C16.25,10.6903559 15.6903559,11.25 15,11.25 L1.25,11.25 Z" id="Path"></path>
+                <path d="M1.25,11.25 C0.559644063,11.25 0,10.6903559 0,10 L0,2.5" id="Path"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-facebook-gray.svg b/website/images/icons/icon-facebook-gray.svg
new file mode 100644
index 00000000000..fc42770a749
--- /dev/null
+++ b/website/images/icons/icon-facebook-gray.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-facebook-gray</title>
+    <defs>
+        <path d="M24,12.0730223 C24,5.40365112 18.6290323,0 12,0 C5.37096774,0 0,5.40365112 0,12.0730223 C0,18.0988235 4.38822581,23.0935497 10.125,24 L10.125,15.563002 L7.0766129,15.563002 L7.0766129,12.0730223 L10.125,12.0730223 L10.125,9.41306288 C10.125,6.38750507 11.9153226,4.71626775 14.6574194,4.71626775 C15.9706452,4.71626775 17.343871,4.95188641 17.343871,4.95188641 L17.343871,7.92146045 L15.8303226,7.92146045 C14.34,7.92146045 13.875,8.85225152 13.875,9.80689655 L13.875,12.0730223 L17.2030645,12.0730223 L16.6708065,15.563002 L13.875,15.563002 L13.875,24 C19.6117742,23.0935497 24,18.0988235 24,12.0730223 Z" id="path-1"></path>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Logo">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Brands/facebook" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"></use>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-facebook.svg b/website/images/icons/icon-facebook.svg
new file mode 100644
index 00000000000..910235c7ed8
--- /dev/null
+++ b/website/images/icons/icon-facebook.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="81px" height="81px" viewBox="0 0 81 81" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group</title>
+    <defs>
+        <polygon id="path-1" points="4.44115232e-15 0 80 0 80 79.5155966 4.44115232e-15 79.5155966"></polygon>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" transform="translate(0.060000, 0.040000)">
+            <g id="Group-3">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="Clip-2"></g>
+                <path d="M80,39.9992187 C80,17.906518 62.0903569,-0.00312518312 39.9976561,-0.00312518312 C17.9049554,-0.00312518312 -0.00468777467,17.906518 -0.00468777467,39.9992187 C-0.00468777467,59.9655449 14.6235912,76.5146395 33.7472899,79.5155966 L33.7472899,51.5623962 L23.5904448,51.5623962 L23.5904448,39.9992187 L33.7472899,39.9992187 L33.7472899,31.1862023 C33.7472899,21.1606149 39.7193586,15.6227904 48.856769,15.6227904 C53.2333535,15.6227904 57.8111999,16.4040862 57.8111999,16.4040862 L57.8111999,26.248413 L52.7669981,26.248413 C47.7977225,26.248413 46.2480223,29.331953 46.2480223,32.4954197 L46.2480223,39.9992187 L57.3424224,39.9992187 L55.568881,51.5623962 L46.2480223,51.5623962 L46.2480223,79.5155966 C65.371721,76.5146395 80,59.9655449 80,39.9992187" id="Fill-1" fill="#1877F2" mask="url(#mask-2)"></path>
+            </g>
+            <path d="M55.568881,51.5623962 L57.3424224,39.9992187 L46.2480223,39.9992187 L46.2480223,32.4954197 C46.2480223,29.331953 47.7977225,26.248413 52.7669981,26.248413 L57.8111999,26.248413 L57.8111999,16.4040862 C57.8111999,16.4040862 53.2333535,15.6227904 48.856769,15.6227904 C39.7193586,15.6227904 33.7472899,21.1606149 33.7472899,31.1862023 L33.7472899,39.9992187 L23.5904448,39.9992187 L23.5904448,51.5623962 L33.7472899,51.5623962 L33.7472899,79.5155966 C35.7838936,79.8351466 37.8712815,80.0015626 39.9976561,80.0015626 C42.1240307,80.0015626 44.2114186,79.8351466 46.2480223,79.5155966 L46.2480223,51.5623962 L55.568881,51.5623962" id="Fill-4" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-github.svg b/website/images/icons/icon-github.svg
new file mode 100644
index 00000000000..c22c8563b21
--- /dev/null
+++ b/website/images/icons/icon-github.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="82px" height="80px" viewBox="0 0 82 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-github</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-github" fill="#212529" fill-rule="nonzero">
+            <path d="M36.3976019,0.285587315 C17.4993108,2.34863347 2.29853201,17.6152782 0.244369937,36.1826935 C-1.80979214,55.5751211 9.28268307,72.9047088 26.1267915,79.5064565 C27.3592888,79.9190657 28.591786,79.0938472 28.591786,77.4434103 L28.591786,70.8416626 C28.591786,70.8416626 26.9484564,71.2542719 24.8942943,71.2542719 C19.1426405,71.2542719 16.677646,66.3029611 16.2668136,63.4146965 C15.8559812,61.7642595 15.0343163,60.5264319 13.8018191,59.2886042 C12.5693218,58.8759949 12.1584894,58.8762012 12.1584894,58.463592 C12.1584894,57.6383735 13.3909867,57.6381672 13.8018191,57.6381672 C16.2668136,57.6381672 18.3209757,60.5264319 19.1426405,61.7642595 C21.1968026,65.0651334 23.6617971,65.8903519 24.8942943,65.8903519 C26.537624,65.8903519 27.7701212,65.4777426 28.591786,65.0651334 C29.0026185,62.1768688 30.2351157,59.2886042 32.7001102,57.6381672 C23.2509646,55.5751211 16.2668136,50.2114074 16.2668136,41.1340043 C16.2668136,36.5953028 18.3209757,32.0566012 21.1968026,28.7557274 C20.7859702,27.9305089 20.3751377,25.8674628 20.3751377,22.9791982 C20.3751377,21.3287612 20.3751377,19.2657151 21.1968026,17.6152782 C21.1968026,16.7900597 22.0184674,16.3774505 22.4292998,16.3774505 L22.8401322,16.3774505 C24.8942943,16.7900597 29.0026185,18.0278874 32.7001102,21.7413705 C35.1651047,20.916152 38.0409316,20.5035428 40.9167585,20.5035428 C43.7925854,20.5035428 46.6684123,20.916152 49.1334068,21.7413705 C52.8308985,18.0278874 57.3500551,16.7900597 59.4042172,16.3774505 L59.8150496,16.3774505 C60.6367144,16.3774505 61.0475468,16.7900597 61.4583792,17.6152782 C61.4583792,19.2657151 61.4583792,21.3287612 61.4583792,22.9791982 C61.4583792,26.280072 61.0475468,27.9305089 60.6367144,28.7557274 C63.5125413,32.0566012 65.5667034,36.1826935 65.5667034,41.1340043 C65.5667034,50.2114074 58.5825523,55.5751211 49.1334068,57.6381672 C51.5984013,59.7012134 53.2417309,63.4146965 53.2417309,67.1281795 L53.2417309,77.8560195 C53.2417309,79.0938472 54.4742282,80.3316749 56.1175578,79.9190657 C71.3183572,73.7299272 82,58.8759949 82,41.5466135 C82,16.7900597 61.0475468,-2.6026773 36.3976019,0.285587315 Z" id="Path"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-google.svg b/website/images/icons/icon-google.svg
new file mode 100644
index 00000000000..4fa5d1eb118
--- /dev/null
+++ b/website/images/icons/icon-google.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-google</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-google" fill-rule="nonzero">
+            <path d="M79.222,32.1658392 L76,32.1658392 L76,31.99984 L40,31.99984 L40,47.99976 L62.606,47.99976 C59.308,57.3137134 50.446,63.99968 40,63.99968 C26.746,63.99968 16,53.2537337 16,39.9998 C16,26.7458663 26.746,15.99992 40,15.99992 C46.118,15.99992 51.684,18.3079085 55.922,22.0778896 L67.236,10.7639462 C60.092,4.10597947 50.536,0 40,0 C17.91,0 0,17.9099105 0,39.9998 C0,62.0896896 17.91,79.9996 40,79.9996 C62.09,79.9996 80,62.0896896 80,39.9998 C80,37.3178134 79.724,34.6998265 79.222,32.1658392 Z" id="Path" fill="#FFC107"></path>
+            <path d="M4.60938,21.3818931 L17.7514,31.0198449 C21.3074,22.2158889 29.9194,15.99992 39.9974,15.99992 C46.1154,15.99992 51.6814,18.3079085 55.9194,22.0778896 L67.2334,10.7639462 C60.0894,4.10597947 50.5334,0 39.9974,0 C24.6334,0 11.30938,8.67395663 4.60938,21.3818931 Z" id="Path" fill="#FF3D00"></path>
+            <path d="M39.9996,80 C50.3316,80 59.7196,76.0460198 66.8176,69.6160519 L54.4376,59.1401043 C50.4216,62.1820891 45.4296,64.00008 39.9996,64.00008 C29.5956,64.00008 20.7616,57.3661132 17.4336,48.1081595 L4.38964,58.1581092 C11.00964,71.1120444 24.4536,80 39.9996,80 Z" id="Path" fill="#4CAF50"></path>
+            <path d="M79.222,32.1658392 L76,32.1658392 L76,31.99984 L40,31.99984 L40,47.99976 L62.606,47.99976 C61.022,52.4737376 58.144,56.3317183 54.432,59.1417043 C54.434,59.1397043 54.436,59.1397043 54.438,59.1377043 L66.818,69.6136519 C65.942,70.409648 80,59.9997 80,39.9998 C80,37.3178134 79.724,34.6998265 79.222,32.1658392 Z" id="Path" fill="#1976D2"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin-alt-gray.svg b/website/images/icons/icon-linkedin-alt-gray.svg
new file mode 100644
index 00000000000..e286486ab9b
--- /dev/null
+++ b/website/images/icons/icon-linkedin-alt-gray.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-linkedin-gray</title>
+    <defs>
+        <path d="M22.2857143,0 L1.70892857,0 C0.766071429,0 0,0.776785714 0,1.73035714 L0,22.2696429 C0,23.2232143 0.766071429,24 1.70892857,24 L22.2857143,24 C23.2285714,24 24,23.2232143 24,22.2696429 L24,1.73035714 C24,0.776785714 23.2285714,0 22.2857143,0 Z M7.25357143,20.5714286 L3.69642857,20.5714286 L3.69642857,9.11785714 L7.25892857,9.11785714 L7.25892857,20.5714286 L7.25357143,20.5714286 Z M5.475,7.55357143 C4.33392857,7.55357143 3.4125,6.62678571 3.4125,5.49107143 C3.4125,4.35535714 4.33392857,3.42857143 5.475,3.42857143 C6.61071429,3.42857143 7.5375,4.35535714 7.5375,5.49107143 C7.5375,6.63214286 6.61607143,7.55357143 5.475,7.55357143 L5.475,7.55357143 Z M20.5875,20.5714286 L17.0303571,20.5714286 L17.0303571,15 C17.0303571,13.6714286 17.0035714,11.9625 15.1821429,11.9625 C13.3285714,11.9625 13.0446429,13.4089286 13.0446429,14.9035714 L13.0446429,20.5714286 L9.4875,20.5714286 L9.4875,9.11785714 L12.9,9.11785714 L12.9,10.6821429 L12.9482143,10.6821429 C13.425,9.78214286 14.5875,8.83392857 16.3178571,8.83392857 C19.9178571,8.83392857 20.5875,11.2071429 20.5875,14.2928571 L20.5875,20.5714286 L20.5875,20.5714286 Z" id="path-1"></path>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="icon-linkedin-gray" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin-gray.svg b/website/images/icons/icon-linkedin-gray.svg
new file mode 100644
index 00000000000..ff19bbbe686
--- /dev/null
+++ b/website/images/icons/icon-linkedin-gray.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-linkedin-gray</title>
+    <defs>
+        <path d="M5.37214286,24 L0.396428571,24 L0.396428571,7.97642802 L5.37214286,7.97642802 L5.37214286,24 Z M2.88160714,5.79066494 C1.29053571,5.79066494 0,4.47277838 0,2.88167143 C0,1.29016824 1.29013948,0 2.88160714,0 C4.47307481,0 5.76321429,1.29016824 5.76321429,2.88167143 C5.76321429,4.47277838 4.47214286,5.79066494 2.88160714,5.79066494 Z M23.9946429,24 L19.0296429,24 L19.0296429,16.1998259 C19.0296429,14.3408558 18.9921429,11.956874 16.4426786,11.956874 C13.8557143,11.956874 13.4592857,13.976562 13.4592857,16.0658943 L13.4592857,24 L8.48892857,24 L8.48892857,7.97642802 L13.2610714,7.97642802 L13.2610714,10.1621911 L13.3307143,10.1621911 C13.995,8.90323442 15.6176786,7.57463333 18.0385714,7.57463333 C23.0742857,7.57463333 24,10.8907788 24,15.1980178 L24,24 L23.9946429,24 Z" id="path-1"></path>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Logo">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Brands/linkedin-in" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"></use>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin.png b/website/images/icons/icon-linkedin.png
new file mode 100644
index 00000000000..e50cf591487
Binary files /dev/null and b/website/images/icons/icon-linkedin.png differ
diff --git a/website/images/icons/icon-menu.svg b/website/images/icons/icon-menu.svg
new file mode 100644
index 00000000000..49aa5b52d37
--- /dev/null
+++ b/website/images/icons/icon-menu.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="21px" viewBox="0 0 24 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" fill="#495057">
+            <rect id="Rectangle" x="0" y="0" width="24" height="3"></rect>
+            <rect id="Rectangle" x="0" y="9" width="24" height="3"></rect>
+            <rect id="Rectangle" x="0" y="18" width="24" height="3"></rect>
+        </g>
+    </g>
+</svg>
diff --git a/website/images/icons/icon-performance.svg b/website/images/icons/icon-performance.svg
new file mode 100644
index 00000000000..758149fc872
--- /dev/null
+++ b/website/images/icons/icon-performance.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-performance</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-185.000000, -1263.000000)" fill-rule="nonzero">
+            <g id="Page/Why" transform="translate(185.000000, 1047.000000)">
+                <g id="Feature-1" transform="translate(0.000000, 216.000000)">
+                    <g id="icon-performance" transform="translate(0.000000, 0.000000)">
+                        <circle id="Oval" fill="#F1F6F9" cx="40" cy="40" r="40"></circle>
+                        <path d="M35.2021333,19.2 C34.8261333,19.2 34.4621333,19.3328 34.1741333,19.5745333 C33.8861333,19.8161333 33.6924,20.1516 33.6270667,20.5218667 L28.8584,41.1718667 L28.8614667,41.1750667 C28.8226667,41.3133333 28.8026667,41.4564 28.8021333,41.6 C28.8021333,42.0244 28.9706667,42.4313333 29.2706667,42.7314667 C29.5708,43.0314667 29.9777333,43.2 30.4021333,43.2 L39.2021333,43.2 L36.8333333,58.8813333 C36.8122667,58.9862667 36.8018667,59.0930667 36.8021333,59.2 C36.8021333,59.6244 36.9706667,60.0313333 37.2706667,60.3314667 C37.5708,60.6314667 37.9777333,60.8 38.4021333,60.8 C38.6928,60.8 38.978,60.7198667 39.2268,60.5696 C39.4756,60.4193333 39.6789333,60.204 39.8145333,59.9469333 L39.8177333,59.9469333 L50.8926667,39.3437333 L50.8770667,39.3156 C51.0665333,39.0528 51.2021333,38.7485333 51.2021333,38.4 C51.2021333,37.5168 50.4853333,36.8 49.6021333,36.8 L40.8021333,36.8 L46.2614667,21.4562667 C46.3542667,21.25 46.4021333,21.0262667 46.4021333,20.8 C46.4021333,20.3757333 46.2334667,19.9686667 45.9334667,19.6686667 C45.6333333,19.3686667 45.2264,19.2 44.8021333,19.2 L35.2021333,19.2 Z" id="Path" fill="#257AF4"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-reliability.svg b/website/images/icons/icon-reliability.svg
new file mode 100644
index 00000000000..0b18d1451c0
--- /dev/null
+++ b/website/images/icons/icon-reliability.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-reliability</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-185.000000, -1674.000000)">
+            <g id="Page/Why" transform="translate(185.000000, 1047.000000)">
+                <g id="Feature-3" transform="translate(0.000000, 627.000000)">
+                    <g id="icon-reliability" transform="translate(0.000000, 0.000000)">
+                        <circle id="Oval" fill="#F1F6F9" fill-rule="nonzero" cx="40" cy="40" r="40"></circle>
+                        <path d="M39.8666667,62.2222222 C39.8666667,62.2222222 57.6444444,53.3333333 57.6444444,40 L57.6444444,24.4444444 L39.8666667,17.7777778 L22.0888889,24.4444444 L22.0888889,40 C22.0888889,53.3333333 39.8666667,62.2222222 39.8666667,62.2222222 Z" id="Path" stroke="#257AF4" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-scalability.svg b/website/images/icons/icon-scalability.svg
new file mode 100644
index 00000000000..4b0a99dc233
--- /dev/null
+++ b/website/images/icons/icon-scalability.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-scalability</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-741.000000, -1263.000000)" fill-rule="nonzero">
+            <g id="Page/Why" transform="translate(185.000000, 1047.000000)">
+                <g id="Feature-2" transform="translate(556.000000, 216.000000)">
+                    <g id="icon-scalability" transform="translate(0.000000, 0.000000)">
+                        <circle id="Oval" fill="#F1F6F9" cx="40" cy="40" r="40"></circle>
+                        <path d="M25.602,22.4 C25.39,22.3969333 25.1794667,22.4361333 24.9826667,22.5152 C24.786,22.5942667 24.6068,22.7116 24.4558667,22.8605333 C24.3049333,23.0093333 24.1849333,23.1868 24.1032,23.3824 C24.0213333,23.578 23.9792,23.788 23.9792,24 C23.9792,24.212 24.0213333,24.422 24.1032,24.6176 C24.1849333,24.8132 24.3049333,24.9905333 24.4558667,25.1394667 C24.6068,25.2882667 24.786,25.4057333 24.9826667,25.4848 C25.1794667,25.5638667 25.39,25.6029333 25.602,25.6 L39.9769333,25.6 L54.402,25.6 C54.614,25.6029333 54.8245333,25.5638667 55.0212,25.4848 C55.218,25.4057333 55.3970667,25.2882667 55.548,25.1394667 C55.6990667,24.9905333 55.8189333,24.8132 55.9008,24.6176 C55.9825333,24.422 56.0248,24.212 56.0248,24 C56.0248,23.788 55.9825333,23.578 55.9008,23.3824 C55.8189333,23.1868 55.6990667,23.0093333 55.548,22.8605333 C55.3970667,22.7116 55.218,22.5942667 55.0212,22.5152 C54.8245333,22.4361333 54.614,22.3969333 54.402,22.4 L25.602,22.4 Z M39.9769333,25.599807 C39.5613333,25.6066667 39.1645333,25.7746667 38.8706667,26.0686667 L35.6706667,29.2686667 C35.5172,29.4161333 35.3945333,29.5928 35.3101333,29.7881333 C35.2256,29.9836 35.1810667,30.1938667 35.1787197,30.4066667 C35.1766667,30.6196 35.2170667,30.8308 35.2974667,31.0278667 C35.378,31.2249333 35.4969333,31.404 35.6474667,31.5545333 C35.798,31.7050667 35.9770667,31.824 36.1741333,31.9044 C36.3712,31.9849333 36.5824,32.0252 36.7952,32.0230667 C37.0081333,32.0209333 37.2184,31.9762667 37.4137333,31.8918667 C37.6092,31.8073333 37.7857333,31.6848 37.9332,31.5312 L38.402,31.0625333 L38.402,48.9374667 L37.9332,48.4686667 C37.7841333,48.3154667 37.6057333,48.1936 37.4088,48.1104 C37.2118667,48.0272 37.0001333,47.9844 36.7862667,47.9844 C36.468,47.9844 36.1569333,48.0794667 35.8929333,48.2572 C35.6289333,48.4350667 35.424,48.6874667 35.3041333,48.9824 C35.1844,49.2773333 35.1553333,49.6012 35.2206667,49.9126667 C35.2858667,50.2242667 35.4426667,50.5092 35.6706667,50.7312 L38.8706667,53.9312 C39.0222667,54.0828 39.2026667,54.2024 39.4012,54.2829333 C39.5998667,54.3634667 39.8126667,54.4032 40.0269333,54.400179 C40.4425333,54.3933333 40.8393333,54.2252 41.1332,53.9312 L44.3332,50.7312 C44.5656,50.5077333 44.7250667,50.2193333 44.7906667,49.9037333 C44.8564,49.5881333 44.8251472,49.2601333 44.7012,48.9625333 C44.5772,48.6649333 44.3662667,48.4117333 44.096,48.236 C43.8256,48.0604 43.5086667,47.9705333 43.1862667,47.9781333 C42.7642667,47.9881333 42.3633333,48.1644 42.0706667,48.4686667 L41.602,48.9374667 L41.602,31.0625333 L42.0706667,31.5312 C42.2181333,31.6848 42.3946667,31.8073333 42.5901333,31.8918667 C42.7856,31.9762667 42.9958667,32.0209333 43.2086667,32.0230667 C43.4216,32.0252 43.6326667,31.9849333 43.8297333,31.9044 C44.0269333,31.824 44.2058667,31.7050667 44.3564,31.5545333 C44.5069333,31.404 44.626,31.2249333 44.7064,31.0278667 C44.7869333,30.8308 44.8272,30.6196 44.8251472,30.4066667 C44.8229333,30.1938667 44.7782667,29.9836 44.6938667,29.7881333 C44.6093333,29.5928 44.4868,29.4161333 44.3332,29.2686667 L41.1332,26.0686667 C40.9817333,25.9172 40.8013333,25.7976 40.6026667,25.7170667 C40.404,25.6365333 40.1912,25.5966667 39.9769333,25.599807 Z M40.0269333,54.4 L25.602,54.4 C25.39,54.3969333 25.1794667,54.4361333 24.9826667,54.5152 C24.786,54.5942667 24.6068,54.7116 24.4558667,54.8605333 C24.3049333,55.0093333 24.1849333,55.1868 24.1032,55.3824 C24.0213333,55.578 23.9792,55.788 23.9792,56 C23.9792,56.212 24.0213333,56.422 24.1032,56.6176 C24.1849333,56.8132 24.3049333,56.9905333 24.4558667,57.1394667 C24.6068,57.2882667 24.786,57.4057333 24.9826667,57.4848 C25.1794667,57.5638667 25.39,57.6029333 25.602,57.6 L54.402,57.6 C54.614,57.6029333 54.8245333,57.5638667 55.0212,57.4848 C55.218,57.4057333 55.3970667,57.2882667 55.548,57.1394667 C55.6990667,56.9905333 55.8189333,56.8132 55.9008,56.6176 C55.9825333,56.422 56.0248,56.212 56.0248,56 C56.0248,55.788 55.9825333,55.578 55.9008,55.3824 C55.8189333,55.1868 55.6990667,55.0093333 55.548,54.8605333 C55.3970667,54.7116 55.218,54.5942667 55.0212,54.5152 C54.8245333,54.4361333 54.614,54.3969333 54.402,54.4 L40.0269333,54.4 Z M25.602,28.8 C25.1776,28.8 24.7706667,28.9685333 24.4705333,29.2686667 C24.1705333,29.5686667 24.002,29.9756 24.002,30.4 C24.002,30.8242667 24.1705333,31.2313333 24.4705333,31.5313333 C24.7706667,31.8314667 25.1776,32 25.602,32 C26.0262667,32 26.4333333,31.8314667 26.7333333,31.5313333 C27.0333333,31.2313333 27.202,30.8242667 27.202,30.4 C27.202,29.9756 27.0333333,29.5686667 26.7333333,29.2686667 C26.4333333,28.9685333 26.0262667,28.8 25.602,28.8 Z M54.402,28.8 C53.9776,28.8 53.5706667,28.9685333 53.2705333,29.2686667 C52.9705333,29.5686667 52.802,29.9756 52.802,30.4 C52.802,30.8242667 52.9705333,31.2313333 53.2705333,31.5313333 C53.5706667,31.8314667 53.9776,32 54.402,32 C54.8262667,32 55.2332,31.8314667 55.5333333,31.5313333 C55.8333333,31.2313333 56.002,30.8242667 56.002,30.4 C56.002,29.9756 55.8333333,29.5686667 55.5333333,29.2686667 C55.2332,28.9685333 54.8262667,28.8 54.402,28.8 Z M25.602,35.2 C25.1776,35.2 24.7706667,35.3685333 24.4705333,35.6686667 C24.1705333,35.9686667 24.002,36.3756 24.002,36.8 C24.002,37.2242667 24.1705333,37.6313333 24.4705333,37.9313333 C24.7706667,38.2314667 25.1776,38.4 25.602,38.4 C26.0262667,38.4 26.4333333,38.2314667 26.7333333,37.9313333 C27.0333333,37.6313333 27.202,37.2242667 27.202,36.8 C27.202,36.3756 27.0333333,35.9686667 26.7333333,35.6686667 C26.4333333,35.3685333 26.0262667,35.2 25.602,35.2 Z M54.402,35.2 C53.9776,35.2 53.5706667,35.3685333 53.2705333,35.6686667 C52.9705333,35.9686667 52.802,36.3756 52.802,36.8 C52.802,37.2242667 52.9705333,37.6313333 53.2705333,37.9313333 C53.5706667,38.2314667 53.9776,38.4 54.402,38.4 C54.8262667,38.4 55.2332,38.2314667 55.5333333,37.9313333 C55.8333333,37.6313333 56.002,37.2242667 56.002,36.8 C56.002,36.3756 55.8333333,35.9686667 55.5333333,35.6686667 C55.2332,35.3685333 54.8262667,35.2 54.402,35.2 Z M25.602,41.6 C25.1776,41.6 24.7706667,41.7685333 24.4705333,42.0686667 C24.1705333,42.3686667 24.002,42.7756 24.002,43.2 C24.002,43.6242667 24.1705333,44.0313333 24.4705333,44.3313333 C24.7706667,44.6314667 25.1776,44.8 25.602,44.8 C26.0262667,44.8 26.4333333,44.6314667 26.7333333,44.3313333 C27.0333333,44.0313333 27.202,43.6242667 27.202,43.2 C27.202,42.7756 27.0333333,42.3686667 26.7333333,42.0686667 C26.4333333,41.7685333 26.0262667,41.6 25.602,41.6 Z M54.402,41.6 C53.9776,41.6 53.5706667,41.7685333 53.2705333,42.0686667 C52.9705333,42.3686667 52.802,42.7756 52.802,43.2 C52.802,43.6242667 52.9705333,44.0313333 53.2705333,44.3313333 C53.5706667,44.6314667 53.9776,44.8 54.402,44.8 C54.8262667,44.8 55.2332,44.6314667 55.5333333,44.3313333 C55.8333333,44.0313333 56.002,43.6242667 56.002,43.2 C56.002,42.7756 55.8333333,42.3686667 55.5333333,42.0686667 C55.2332,41.7685333 54.8262667,41.6 54.402,41.6 Z M25.602,48 C25.1776,48 24.7706667,48.1685333 24.4705333,48.4686667 C24.1705333,48.7686667 24.002,49.1756 24.002,49.6 C24.002,50.0242667 24.1705333,50.4313333 24.4705333,50.7313333 C24.7706667,51.0314667 25.1776,51.2 25.602,51.2 C26.0262667,51.2 26.4333333,51.0314667 26.7333333,50.7313333 C27.0333333,50.4313333 27.202,50.0242667 27.202,49.6 C27.202,49.1756 27.0333333,48.7686667 26.7333333,48.4686667 C26.4333333,48.1685333 26.0262667,48 25.602,48 Z M54.402,48 C53.9776,48 53.5706667,48.1685333 53.2705333,48.4686667 C52.9705333,48.7686667 52.802,49.1756 52.802,49.6 C52.802,50.0242667 52.9705333,50.4313333 53.2705333,50.7313333 C53.5706667,51.0314667 53.9776,51.2 54.402,51.2 C54.8262667,51.2 55.2332,51.0314667 55.5333333,50.7313333 C55.8333333,50.4313333 56.002,50.0242667 56.002,49.6 C56.002,49.1756 55.8333333,48.7686667 55.5333333,48.4686667 C55.2332,48.1685333 54.8262667,48 54.402,48 Z" id="Shape" fill="#257AF4"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-security.svg b/website/images/icons/icon-security.svg
new file mode 100644
index 00000000000..716f7cc5789
--- /dev/null
+++ b/website/images/icons/icon-security.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-security</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-741.000000, -1674.000000)" fill-rule="nonzero">
+            <g id="Page/Why" transform="translate(185.000000, 1047.000000)">
+                <g id="Feature-4" transform="translate(556.000000, 627.000000)">
+                    <g id="icon-security" transform="translate(0.000000, 0.000000)">
+                        <circle id="Oval" fill="#F1F6F9" cx="40" cy="40" r="40"></circle>
+                        <path d="M24,24 C21.794,24 20,25.794 20,28 L20,52 C20,54.206 21.794,56 24,56 C24,57.104 24.896,58 26,58 C27.104,58 28,57.104 28,56 L52,56 C52,57.104 52.896,58 54,58 C55.104,58 56,57.104 56,56 C58.206,56 60,54.206 60,52 L60,28 C60,25.794 58.206,24 56,24 L24,24 Z M53.1757333,30.8281333 C53.6877333,30.8281333 54.1998667,31.0201333 54.5898667,31.4101333 C55.3718667,32.1921333 55.3698667,33.4582667 54.5898667,34.2382667 L52.8672,35.9609333 C53.5712,37.1529333 54,38.52 54,40 C54,41.48 53.5712,42.8490667 52.8672,44.0390667 L54.7656,45.9374667 C55.5456,46.7174667 55.5456,47.9856 54.7656,48.7656 C53.9856,49.5476 52.7194667,49.5456 51.9374667,48.7656 L50.0390667,46.8672 C48.8490667,47.5692 47.48,48 46,48 C44.52,48 43.1509333,47.5712 41.9609333,46.8672 L40.2382667,48.5898667 C39.4582667,49.3698667 38.1901333,49.3698667 37.4101333,48.5898667 C36.6301333,47.8098667 36.6301333,46.5417333 37.4101333,45.7617333 L39.1328,44.0390667 C38.4288,42.8490667 38,41.48 38,40 C38,38.52 38.4288,37.1509333 39.1328,35.9609333 L37.5898667,34.414 C36.8098667,33.634 36.8098667,32.3698667 37.5898667,31.5898667 C38.3698667,30.8098667 39.634,30.8098667 40.414,31.5898667 L41.9609333,33.1328 C43.1509333,32.4288 44.52,32 46,32 C47.48,32 48.8490667,32.4288 50.0390667,33.1328 L51.7617333,31.4101333 C52.1517333,31.0201333 52.6637333,30.8281333 53.1757333,30.8281333 Z M28,34 C29.104,34 30,34.896 30,36 L30,44 C30,45.104 29.104,46 28,46 C26.896,46 26,45.104 26,44 L26,36 C26,34.896 26.896,34 28,34 Z M46,36 C44.9392,36 43.9217333,36.4214667 43.1716,37.1716 C42.4214667,37.9217333 42,38.9392 42,40 C42,41.0608 42.4214667,42.0782667 43.1716,42.8284 C43.9217333,43.5785333 44.9392,44 46,44 C47.0608,44 48.0782667,43.5785333 48.8284,42.8284 C49.5785333,42.0782667 50,41.0608 50,40 C50,38.9392 49.5785333,37.9217333 48.8284,37.1716 C48.0782667,36.4214667 47.0608,36 46,36 Z" id="Shape" fill="#257AF4"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-slack-black.svg b/website/images/icons/icon-slack-black.svg
new file mode 100644
index 00000000000..89b6ddcbada
--- /dev/null
+++ b/website/images/icons/icon-slack-black.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-slack</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Link/Slack" fill="#212529" fill-rule="nonzero">
+            <g id="Icon/Slack">
+                <path d="M5.13302911,0 C4.35912849,0.000570846075 3.73280093,0.627359837 3.73337253,1.39971458 C3.73280093,2.17206932 4.35970047,2.79885831 5.13360109,2.79942915 L6.53382966,2.79942915 L6.53382966,1.40028542 C6.53440125,0.627930683 5.90750171,0.00114169215 5.13302911,0 C5.13360109,0 5.13360109,0 5.13302911,0 M5.13302911,3.73333333 L1.40023129,3.73333333 C0.626330674,3.73390418 -0.000568866549,4.36069317 1.55890848e-06,5.13304791 C-0.00114085518,5.90540265 0.625758685,6.53219164 1.3996593,6.53333333 L5.13302911,6.53333333 C5.90692972,6.53276249 6.53382926,5.9059735 6.53325767,5.13361876 C6.53382926,4.36069317 5.90692972,3.73390418 5.13302911,3.73333333 Z" id="Shape"></path>
+                <path d="M13.9999973,5.13304791 C14.0005689,4.36069317 13.3736693,3.73390418 12.5997687,3.73333333 C11.8258681,3.73390418 11.1989685,4.36069317 11.1995401,5.13304791 L11.1995401,6.53333333 L12.5997687,6.53333333 C13.3736693,6.53276249 14.0005689,5.9059735 13.9999973,5.13304791 Z M10.2666275,5.13304791 L10.2666275,1.39971458 C10.2671991,0.627930683 9.64087151,0.00114169215 8.86697089,0 C8.09307028,0.000570846075 7.46617074,0.627359837 7.46674116,1.39971458 L7.46674116,5.13304791 C7.46559875,5.90540265 8.09249829,6.53219164 8.86639891,6.53333333 C9.64029953,6.53276249 10.2671991,5.9059735 10.2666275,5.13304791 L10.2666275,5.13304791 Z" id="Shape"></path>
+                <path d="M8.86639891,14 C9.64029953,13.9994292 10.2671991,13.3726402 10.2666275,12.6002854 C10.2671991,11.8279307 9.64029953,11.2011417 8.86639891,11.2005708 L7.46617034,11.2005708 L7.46617034,12.6002854 C7.46559875,13.3720693 8.09249829,13.9988583 8.86639891,14 Z M8.86639891,10.2660958 L12.5997687,10.2660958 C13.3736693,10.265525 14.0005689,9.63873598 13.9999984,8.86638124 C14.0011409,8.0940265 13.3742413,7.46723751 12.6003407,7.46609582 L8.86697089,7.46609582 C8.09307028,7.46666667 7.46617074,8.09345566 7.46674233,8.8658104 C7.46617074,9.63873598 8.09249829,10.265525 8.86639891,10.2660958 L8.86639891,10.2660958 Z" id="Shape"></path>
+                <path d="M2.73097794e-06,8.86638124 C-0.00056886655,9.63873598 0.626330674,10.265525 1.40023129,10.2660958 C2.17413191,10.265525 2.80103145,9.63873598 2.80045986,8.86638124 L2.80045986,7.46666667 L1.40023129,7.46666667 C0.626330674,7.46723751 -0.00056886655,8.0940265 2.73097794e-06,8.86638124 Z M3.73337136,8.86638124 L3.73337136,12.5997146 C3.73222895,13.3720693 4.35912849,13.9988583 5.13302911,14 C5.90692972,13.9994292 6.53382926,13.3726402 6.53325884,12.6002854 L6.53325884,8.86752294 C6.53440125,8.0951682 5.90750171,7.4683792 5.13360109,7.46723751 C4.35912849,7.46723751 3.73280093,8.0940265 3.73337136,8.86638124 C3.73337136,8.86638124 3.73337136,8.86695209 3.73337136,8.86638124" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-slack.svg b/website/images/icons/icon-slack.svg
new file mode 100644
index 00000000000..cb74d47cb04
--- /dev/null
+++ b/website/images/icons/icon-slack.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-slack</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-slack" fill-rule="nonzero">
+            <path d="M29.3315949,0 C24.9093056,0.00326197757 21.3302911,3.58491335 21.3335573,7.99836901 C21.3302911,12.4118247 24.9125741,15.993476 29.3348634,15.996738 L37.3361695,15.996738 L37.3361695,8.00163099 C37.3394357,3.58817533 33.7571526,0.00652395515 29.3315949,0 C29.3348634,0 29.3348634,0 29.3315949,0 M29.3315949,21.3333333 L8.00132167,21.3333333 C3.57903242,21.3365953 -0.003250666,24.9182467 8.9080479e-06,29.3317023 C-0.00651917247,33.745158 3.57576392,37.3268094 7.99805317,37.3333333 L29.3315949,37.3333333 C33.7538841,37.3300714 37.3361672,33.74842 37.332901,29.3349643 C37.3361672,24.9182467 33.7538841,21.3365953 29.3315949,21.3333333 Z" id="Shape" fill="#36C5F0"></path>
+            <path d="M79.9999844,29.3317023 C80.0032507,24.9182467 76.4209676,21.3365953 71.9986783,21.3333333 C67.5763891,21.3365953 63.994106,24.9182467 63.9973723,29.3317023 L63.9973723,37.3333333 L71.9986783,37.3333333 C76.4209676,37.3300714 80.0032507,33.74842 79.9999844,29.3317023 Z M58.6664427,29.3317023 L58.6664427,7.99836901 C58.6697089,3.58817533 55.0906944,0.00652395515 50.6684051,0 C46.2461159,0.00326197757 42.6638328,3.58491335 42.6670923,7.99836901 L42.6670923,29.3317023 C42.6605643,33.745158 46.2428474,37.3268094 50.6651366,37.3333333 C55.0874259,37.3300714 58.6697089,33.74842 58.6664427,29.3317023 L58.6664427,29.3317023 Z" id="Shape" fill="#2EB67D"></path>
+            <path d="M50.6651366,80 C55.0874259,79.996738 58.6697089,76.4150866 58.6664427,72.001631 C58.6697089,67.5881753 55.0874259,64.006524 50.6651366,64.003262 L42.6638305,64.003262 L42.6638305,72.001631 C42.6605643,76.4118247 46.2428474,79.993476 50.6651366,80 Z M50.6651366,58.6634047 L71.9986783,58.6634047 C76.4209676,58.6601427 80.0032507,55.0784913 79.9999911,50.6650357 C80.0065192,46.25158 76.4242361,42.6699286 72.0019468,42.6634047 L50.6684051,42.6634047 C46.2461159,42.6666667 42.6638328,46.248318 42.667099,50.6617737 C42.6638328,55.0784913 46.2428474,58.6601427 50.6651366,58.6634047 L50.6651366,58.6634047 Z" id="Shape" fill="#ECB22E"></path>
+            <path d="M1.56055896e-05,50.6650357 C-0.003250666,55.0784913 3.57903242,58.6601427 8.00132167,58.6634047 C12.4236109,58.6601427 16.005894,55.0784913 16.0026277,50.6650357 L16.0026277,42.6666667 L8.00132167,42.6666667 C3.57903242,42.6699286 -0.003250666,46.25158 1.56055896e-05,50.6650357 Z M21.3335506,50.6650357 L21.3335506,71.998369 C21.3270225,76.4118247 24.9093056,79.993476 29.3315949,80 C33.7538841,79.996738 37.3361672,76.4150866 37.3329077,72.001631 L37.3329077,50.6715596 C37.3394357,46.258104 33.7571526,42.6764526 29.3348634,42.6699286 C24.9093056,42.6699286 21.3302911,46.25158 21.3335506,50.6650357 C21.3335506,50.6650357 21.3335506,50.6682977 21.3335506,50.6650357" id="Shape" fill="#E01E5A"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-stack-overflow.svg b/website/images/icons/icon-stack-overflow.svg
new file mode 100644
index 00000000000..5c9a2d57d2b
--- /dev/null
+++ b/website/images/icons/icon-stack-overflow.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="80px" viewBox="0 0 64 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-stack-overflow</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-stack-overflow" fill-rule="nonzero">
+            <polygon id="Path" fill="#607D8B" points="0 47.5675676 6.39914678 47.5675676 6.39914678 77.8378378 0 77.8378378"></polygon>
+            <polygon id="Path" fill="#607D8B" points="0 73.5135135 55.4592721 73.5135135 55.4592721 80 0 80"></polygon>
+            <path d="M49.0601253,47.5675676 L55.4592721,47.5675676 L55.4592721,77.8378378 L49.0601253,77.8378378 L49.0601253,47.5675676 Z M12.7982936,60.5405405 L42.6609785,60.5405405 L42.6609785,67.027027 L12.7982936,67.027027 L12.7982936,60.5405405 Z" id="Shape" fill="#607D8B"></path>
+            <polygon id="Path" fill="#A68A6E" points="12.9732036 48.1292973 42.6646047 51.368 41.979896 57.8170811 12.2887082 54.5783784"></polygon>
+            <polygon id="Path" fill="#EF6C00" points="59.4493534 0 64 29.9145946 57.6735902 30.9033514 53.1229436 0.988864865"></polygon>
+            <polygon id="Path" fill="#FF9800" points="41.5279029 4.83636757 56.0989735 31.2536216 50.5118784 34.4201081 35.9405946 8.0028973"></polygon>
+            <polygon id="Path" fill="#D38B28" points="24.5300627 18.4892973 49.0586322 35.7472432 45.4085589 41.0776216 20.8799893 23.8196757"></polygon>
+            <polygon id="Path" fill="#C09553" points="16.8498067 32.9033514 44.947607 43.1487568 42.7808559 49.2544865 14.6830556 39.0088649"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-telegram.svg b/website/images/icons/icon-telegram.svg
new file mode 100644
index 00000000000..5ab06341383
--- /dev/null
+++ b/website/images/icons/icon-telegram.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-telegram</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-telegram" fill-rule="nonzero">
+            <path d="M40,0 C29.3914,0 19.2172,4.21428 11.71572,11.71572 C4.21428,19.2172 0,29.3914 0,40 C0,50.6086 4.21428,60.7828 11.71572,68.2842 C19.2172,75.7858 29.3914,80 40,80 C50.6086,80 60.7828,75.7858 68.2842,68.2842 C75.7858,60.7828 80,50.6086 80,40 C80,29.3914 75.7858,19.2172 68.2842,11.71572 C60.7828,4.21428 50.6086,0 40,0 Z" id="Path" fill="#29B6F6"></path>
+            <path d="M59.9,21.9999936 L52.408,60.252 C52.408,60.252 52.086,61.9999936 49.918,61.9999936 C48.766,61.9999936 48.172,61.452 48.172,61.452 L31.944,47.986 L24.004,43.984 L13.814,41.274 C13.814,41.274 12,40.75 12,39.25 C12,37.9999936 13.866,37.404 13.866,37.404 L56.498,20.468 C56.496,20.466 57.8,19.998 58.75,19.9999936 C59.334,19.9999936 60,20.25 60,20.9999936 C60,21.4999936 59.9,21.9999936 59.9,21.9999936 Z" id="Path" fill="#FFFFFF"></path>
+            <path d="M37.9996,53.01 L31.1476,59.758 C31.1476,59.758 30.8496,59.988 30.4516,59.998 C30.3136,60.002 30.1656,59.98 30.0136,59.912 L31.9416,47.982 L37.9996,53.01 Z" id="Path" fill="#B0BEC5"></path>
+            <path d="M51.794,28.3918 C51.456,27.9518 50.832,27.8718 50.392,28.2058 L24,43.9998 C24,43.9998 28.212,55.7838 28.854,57.8238 C29.498,59.8658 30.014,59.9138 30.014,59.9138 L31.942,47.9838 L51.606,29.7918 C52.046,29.4578 52.128,28.8318 51.794,28.3918 Z" id="Path" fill="#CFD8DC"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-twitter-gray.svg b/website/images/icons/icon-twitter-gray.svg
new file mode 100644
index 00000000000..115fe5ff390
--- /dev/null
+++ b/website/images/icons/icon-twitter-gray.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31px" height="24px" viewBox="0 0 31 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-twitter-gray</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Twitter-Link" fill="#6C757D" fill-rule="nonzero">
+            <g id="twitter">
+                <path d="M30.2608696,2.8377931 C29.1488762,3.32275862 27.9528319,3.64634483 26.691228,3.79944828 C27.9738447,3.04965517 28.9606022,1.8537931 29.4237226,0.441103448 C28.2234758,1.1337931 26.8937906,1.64275862 25.4792141,1.91089655 C24.34957,0.731586207 22.7383143,0 20.9530733,0 C17.5237967,0 14.7442335,2.71282759 14.7442335,6.05793103 C14.7442335,6.53131034 14.8005476,6.99227586 14.9064518,7.44 C9.74740771,7.18510345 5.17167689,4.7702069 2.11051802,1.10565517 C1.57259228,2.00110345 1.27000905,3.04965517 1.27000905,4.15613793 C1.27000905,6.25903448 2.36351122,8.11034483 4.03110622,9.20110345 C3.01322465,9.17048276 2.05504443,8.89158621 1.21621648,8.44468966 C1.21621648,8.46289655 1.21621648,8.4902069 1.21621648,8.51586207 C1.21621648,11.4546207 3.35699282,13.9017931 6.1945763,14.4587586 C5.67598227,14.5986207 5.12797042,14.6764138 4.5631484,14.6764138 C4.16222562,14.6764138 3.77138895,14.6317241 3.39315992,14.5646897 C4.18323835,16.9663448 6.4753063,18.7216552 9.19099077,18.7737931 C7.0661841,20.3958621 4.39000355,21.3674483 1.48013629,21.3674483 C0.977511929,21.3674483 0.485814183,21.3393103 -7.46521926e-16,21.2813793 C2.74930483,22.9953103 6.01386688,24 9.51794876,24 C20.9362631,24 27.1829257,14.7674483 27.1829257,6.75806897 C27.1829257,6.49572414 27.1745206,6.2342069 27.161913,5.976 C28.380651,5.12855172 29.4312872,4.05931034 30.2608696,2.8377931 Z" id="Path"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-twitter.svg b/website/images/icons/icon-twitter.svg
new file mode 100644
index 00000000000..b25ac9353ac
--- /dev/null
+++ b/website/images/icons/icon-twitter.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 248 204" style="enable-background:new 0 0 248 204;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#1D9BF0;}
+</style>
+<g id="Logo_1_">
+	<path id="white_background" class="st0" d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04
+		C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66
+		c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64
+		c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76
+		c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26
+		c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z"/>
+</g>
+</svg>
diff --git a/website/images/icons/icon-youtube-black.svg b/website/images/icons/icon-youtube-black.svg
new file mode 100644
index 00000000000..0cb017d64a4
--- /dev/null
+++ b/website/images/icons/icon-youtube-black.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="14px" viewBox="0 0 20 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-youtube</title>
+    <defs>
+        <path d="M19.5820806,2.19052604 C19.3520638,1.32828646 18.6743546,0.649213542 17.8138699,0.418760417 C16.2541794,0 10,0 10,0 C10,0 3.74585724,0 2.18613014,0.418760417 C1.32564535,0.64925 0.647936221,1.32828646 0.417919412,2.19052604 C0,3.75338542 0,7.01414583 0,7.01414583 C0,7.01414583 0,10.2749062 0.417919412,11.8377656 C0.647936221,12.7000052 1.32564535,13.3507865 2.18613014,13.5812396 C3.74585724,14 10,14 10,14 C10,14 16.2541428,14 17.8138699,13.5812396 C18.6743546,13.3507865 19.3520638,12.7000052 19.5820806,11.8377656 C20,10.2749062 20,7.01414583 20,7.01414583 C20,7.01414583 20,3.75338542 19.5820806,2.19052604 Z M7.95453131,9.97467188 L7.95453131,4.05361979 L13.1817832,7.01421875 L7.95453131,9.97467188 Z" id="path-1"></path>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icon/Youtube">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Brands/youtube" fill="#212529" fill-rule="nonzero" xlink:href="#path-1"></use>
+        </g>
+    </g>
+</svg>
diff --git a/website/images/icons/icon-youtube.svg b/website/images/icons/icon-youtube.svg
new file mode 100644
index 00000000000..ee676649770
--- /dev/null
+++ b/website/images/icons/icon-youtube.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-youtube</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-youtube" transform="translate(0.000000, 10.000000)" fill-rule="nonzero">
+            <path d="M78.2044888,49.8 C77.4064838,54 74.0149626,57.2 69.8254364,57.8 C63.2418953,58.8 52.2693267,60 39.9002494,60 C27.7306733,60 16.7581047,58.8 9.97506234,57.8 C5.78553616,57.2 2.39401496,54 1.59600998,49.8 C0.798004988,45.2 0,38.4 0,30 C0,21.6 0.798004988,14.8 1.59600998,10.2 C2.39401496,6 5.78553616,2.8 9.97506234,2.2 C16.5586035,1.2 27.5311721,0 39.9002494,0 C52.2693267,0 63.042394,1.2 69.8254364,2.2 C74.0149626,2.8 77.4064838,6 78.2044888,10.2 C79.0024938,14.8 80,21.6 80,30 C79.8004988,38.4 79.0024938,45.2 78.2044888,49.8 Z" id="Path" fill="#FF3D00"></path>
+            <polygon id="Path" fill="#FFFFFF" points="31.9201995 44 31.9201995 16 55.8603491 30"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/logo-clickhouse.svg b/website/images/logo-clickhouse.svg
new file mode 100644
index 00000000000..560e15572d9
--- /dev/null
+++ b/website/images/logo-clickhouse.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="180px" height="28px" viewBox="0 0 180 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>ClickHouse Logo</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="ClickHouse-Logo" transform="translate(0.000000, 0.500000)" fill-rule="nonzero">
+            <g id="logo">
+                <polygon id="Path" fill="#FF0000" points="0 23.625 3.37552743 23.625 3.37552743 27 0 27"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="0 0 3.37552743 0 3.37552743 23.625 0 23.625"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="6.75105485 0 10.1265823 0 10.1265823 27 6.75105485 27"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="13.5021097 0 16.8776371 0 16.8776371 27 13.5021097 27"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="20.2531646 0 23.628692 0 23.628692 27 20.2531646 27"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="27.0042194 10.96875 30.3797468 10.96875 30.3797468 16.03125 27.0042194 16.03125"></polygon>
+            </g>
+            <g id="clickhouse-black" transform="translate(43.291139, 3.000000)" fill="#231F20">
+                <path d="M9.76370444,20.9560972 C8.43447886,20.9735251 7.11430823,20.7384252 5.875478,20.2636703 C4.72047444,19.8054437 3.67723122,19.1113387 2.81453379,18.2271205 C1.90927726,17.3283139 1.2048111,16.2531042 0.746328237,15.0704684 C-0.248776079,12.2964995 -0.248776079,9.27056268 0.746328237,6.4965938 C1.67159165,4.07354026 3.61800681,2.16434552 6.08229856,1.26266086 C7.35832383,0.792264319 8.71148185,0.557532775 10.0739353,0.570233938 C11.1612577,0.548839362 12.2465336,0.672146838 13.3003359,0.936812899 C14.1575307,1.16603291 14.9890302,1.47989577 15.7821826,1.8736258 L15.0376286,4.17492705 C14.334754,3.70811103 13.5779913,3.32526638 12.7832845,3.03445917 C11.8308864,2.71897047 10.8304102,2.56740693 9.82575061,2.58641822 C7.96245266,2.56886976 6.1853824,3.35817309 4.96546756,4.74516099 C4.30442786,5.50472232 3.79877758,6.38298172 3.47635956,7.33157921 C3.08814385,8.46618422 2.89929764,9.65767851 2.91794407,10.8548103 C2.90195973,12.0219322 3.07653544,13.184001 3.43499545,14.2965795 C3.73382292,15.2302331 4.21899806,16.0957206 4.86205728,16.8422667 C5.46077204,17.5238868 6.21094713,18.0604846 7.05435517,18.41041 C7.95798877,18.7824827 8.9290709,18.969569 9.90847883,18.9602785 C10.8005951,18.9648543 11.68759,18.827308 12.5350999,18.5529685 C13.3447055,18.2769814 14.1214074,17.9150606 14.8514901,17.4735971 L15.575362,19.2046644 C14.8756447,19.7279796 14.0929921,20.1339593 13.2589718,20.4062288 C12.1346344,20.7859604 10.952228,20.9719742 9.76370444,20.9560972 L9.76370444,20.9560972 Z" id="Path"></path>
+                <polygon id="Path" points="21.2008811 0 21.2008811 20.6709803 18.7397165 20.6709803 18.7397165 0 21.2008811 0"></polygon>
+                <path d="M26.5161694,4.15456155 C26.0981094,4.18404053 25.6871808,4.03620327 25.3868859,3.74828616 C25.0865909,3.46036905 24.9255529,3.05981554 24.9443332,2.64751471 C24.9293499,2.23543398 25.0776822,1.83376364 25.3579743,1.52741233 C25.9917593,0.922143971 26.9992154,0.922143971 27.6330004,1.52741233 C27.9227354,1.82938962 28.0789406,2.23223687 28.0673236,2.64751471 C28.0795295,3.0508229 27.9224226,3.44126169 27.6330004,3.7268861 C27.3352303,4.0129939 26.9320049,4.16740365 26.5161694,4.15456155 L26.5161694,4.15456155 Z M27.7570927,6.31330432 L27.7570927,20.5691528 L25.3166102,20.5691528 L25.3166102,6.31330432 L27.7777748,6.31330432 L27.7570927,6.31330432 Z" id="Shape"></path>
+                <path d="M38.2015308,20.9561849 C37.2331788,20.9606473 36.2723959,20.7880054 35.3680892,20.4469598 C34.5040176,20.1277138 33.7207114,19.6274001 33.072381,18.9806439 C32.4086321,18.3083453 31.8882536,17.5120269 31.5419089,16.6386117 C30.789066,14.6134632 30.789066,12.3911868 31.5419089,10.3660384 C31.8953146,9.48650873 32.4305899,8.68894988 33.1137451,8.02400613 C33.8006138,7.36063917 34.6265105,6.85322326 35.5335456,6.53732479 C36.4665869,6.19626518 37.4544707,6.0237894 38.4497154,6.02818735 C39.2367736,6.02254268 40.0215928,6.11144966 40.7867877,6.29293882 C41.402916,6.43127907 41.9904819,6.67235105 42.5240804,7.00573124 L41.7381623,9.14410851 C41.2326995,8.76428196 40.6844527,8.44310218 40.1042799,8.18693012 C39.4990142,7.95244732 38.8516533,7.84158602 38.2015308,7.86108215 C37.5775701,7.85677667 36.958946,7.97445444 36.3815099,8.20729561 C35.8033669,8.44328317 35.2871426,8.80537627 34.8717198,9.2663015 C34.4220004,9.77237252 34.0776687,10.3605404 33.8582991,10.9973688 C33.5836299,11.7832018 33.4506403,12.6102801 33.4653401,13.4412285 C33.3646964,14.9221144 33.8543791,16.3832889 34.8303557,17.5143281 C35.8193073,18.4542588 37.1597853,18.9483223 38.5324437,18.8788165 C39.7296588,18.8515966 40.8932941,18.483801 41.8829366,17.8198106 L42.4413521,19.6119744 C41.8863529,20.0201826 41.2635134,20.3302813 40.6006492,20.5284218 C39.8277327,20.7904738 39.0186907,20.9346965 38.2015308,20.9561849 L38.2015308,20.9561849 Z" id="Path"></path>
+                <path d="M47.9427789,0 L47.9427789,20.6709803 L45.4402502,20.6709803 L45.4402502,0 L47.9427789,0 Z M54.3542161,20.6709803 L48.2736918,13.0135531 L54.2714879,6.33366982 L56.8360628,6.33366982 L50.9003129,12.7284361 L57.2497039,20.6709803 L54.3542161,20.6709803 L54.3542161,20.6709803 Z" id="Shape"></path>
+                <polygon id="Path" points="73.1128405 11.8730852 62.7718127 11.8730852 62.7718127 20.6506148 60.1038276 20.6506148 60.1038276 0.855350908 62.7718127 0.855350908 62.7718127 9.89763193 73.1128405 9.89763193 73.1128405 0.855350908 75.7808256 0.855350908 75.7808256 20.6709803 73.1128405 20.6709803"></polygon>
+                <path d="M86.3079919,20.9560972 C85.38699,20.956828 84.4743522,20.7840259 83.6193247,20.4469598 C82.7801539,20.1243214 82.0191689,19.6317014 81.3856627,19.0010094 C80.7288968,18.3272298 80.2155719,17.5309446 79.8758726,16.6589772 C79.1241518,14.6056391 79.1241518,12.35828 79.8758726,10.3049419 C80.2139667,9.43820628 80.7276537,8.64828849 81.3856627,7.98327514 C82.0210949,7.3549028 82.7815529,6.86262399 83.6193247,6.53732479 C84.4743522,6.20025867 85.38699,6.0274377 86.3079919,6.02818492 C87.235663,6.02783377 88.154999,6.20059422 89.0173412,6.53732479 C89.8608646,6.86326706 90.6279639,7.35528929 91.2716852,7.98327514 C91.9432058,8.64563226 92.4709473,9.43552137 92.8228394,10.3049419 C93.5941835,12.3548594 93.5941835,14.6090597 92.8228394,16.6589772 C92.5001582,17.5252355 92.0083217,18.3208853 91.3750955,19.0010094 C90.7336187,19.6317283 89.9659063,20.1241438 89.1207514,20.4469598 C88.2261198,20.7965781 87.270406,20.9695718 86.3079919,20.9560972 Z M86.3079919,19.1028369 C86.8871906,19.1004754 87.4613802,18.9970483 88.0039204,18.7973545 C88.5665616,18.5933999 89.0704796,18.2579374 89.4723464,17.8198106 C89.93364,17.3107661 90.2854168,16.714971 90.5064492,16.0683778 C90.7858877,15.2345245 90.9187812,14.3598326 90.8994082,13.4819595 C90.921252,12.6039337 90.7882958,11.7288286 90.5064492,10.8955413 C90.2829062,10.2561715 89.9312542,9.66751308 89.4723464,9.16447401 C89.0704796,8.72634722 88.5665616,8.39088465 88.0039204,8.18693012 C87.4613802,7.98723626 86.8871906,7.88380922 86.3079919,7.88144765 C85.7421967,7.88338153 85.1815027,7.98690253 84.6534274,8.18693012 C84.1067964,8.39867016 83.6180769,8.73344525 83.2263656,9.16447401 C82.771108,9.66662382 82.426093,10.2559587 82.2129449,10.8955413 C81.9432303,11.7312023 81.817401,12.6054092 81.8406679,13.4819595 C81.8197008,14.3583785 81.9454766,15.2322137 82.2129449,16.0683778 C82.4234966,16.7151843 82.7686424,17.3116787 83.2263656,17.8198106 C83.6175627,18.2514112 84.1064306,18.586288 84.6534274,18.7973545 C85.1815027,18.9973821 85.7421967,19.1009031 86.3079919,19.1028369 L86.3079919,19.1028369 Z" id="Shape"></path>
+                <path d="M104.218652,20.1211118 C103.261113,20.713834 102.142858,21.0051032 101.012933,20.9560972 C99.7999523,21.0051122 98.6193584,20.5636475 97.7451686,19.7341674 C96.8353108,18.7009502 96.3878256,17.3496664 96.5042453,15.9869158 L96.5042453,6.31330432 L98.9860919,6.31330432 L98.9860919,15.9869158 C98.9742754,16.4701161 99.0441695,16.9518863 99.1929125,17.4125006 C99.3056456,17.7606047 99.5046708,18.0755709 99.77201,18.328948 C100.016574,18.5594167 100.314849,18.7272509 100.640656,18.81772 C100.990271,18.9161408 101.352523,18.9641592 101.716123,18.9602785 C102.655549,19.0038445 103.582007,18.7308795 104.342744,18.1863895 C105.051689,17.6370184 105.630443,16.9420231 106.038673,16.1498398 L106.038673,6.31330432 L108.499837,6.31330432 L108.499837,20.5691528 L106.328222,20.5691528 L106.100719,18.0031001 L106.100719,18.0031001 C105.687922,18.8692089 105.035644,19.6032598 104.218652,20.1211118 L104.218652,20.1211118 Z" id="Path"></path>
+                <path d="M116.421065,20.9560972 C115.801233,20.9950241 115.179512,20.9950241 114.55968,20.9560972 C114.092617,20.8964402 113.62981,20.8080164 113.173982,20.6913458 C112.813228,20.605003 112.460411,20.4891975 112.119197,20.3451323 C111.834495,20.2200141 111.558175,20.0771664 111.291915,19.9174568 L112.098515,17.8809071 C112.279343,18.026767 112.473161,18.156273 112.677613,18.2678515 C112.976636,18.4329534 113.287727,18.5759069 113.608305,18.695527 C114.017173,18.8537321 114.439319,18.9763932 114.869911,19.0621059 C115.380772,19.1609067 115.900459,19.2086684 116.421065,19.2046644 C117.260254,19.2611102 118.095255,19.0466179 118.799501,18.5936995 C119.330358,18.1920161 119.630919,17.5621502 119.606101,16.9033632 C119.629117,16.3456326 119.383876,15.8098319 118.944275,15.4574128 C118.248621,14.9827695 117.47054,14.6376468 116.648567,14.4391379 L114.869911,13.8485385 C114.332933,13.6600961 113.82489,13.3996834 113.36012,13.0746496 C112.918371,12.7629353 112.551287,12.3597625 112.284654,11.8934507 C111.990937,11.3416153 111.84837,10.7239217 111.871013,10.1012869 C111.7928,8.92823263 112.331666,7.79778562 113.298074,7.10755873 C114.467654,6.39295223 115.832855,6.05154147 117.206983,6.13001484 C118.07528,6.11663174 118.942387,6.19859987 119.79224,6.37440081 C120.389496,6.49652839 120.971868,6.68085438 121.529532,6.92426925 L120.950435,8.96081903 C120.479952,8.73041885 119.996597,8.52643737 119.502691,8.3498541 C118.797193,8.1146398 118.054965,8.00432014 117.310393,8.02400613 C116.535101,7.9880419 115.762277,8.13465573 115.056049,8.45168159 C114.47936,8.75940804 114.145458,9.37689414 114.208085,10.0198249 C114.202,10.3323024 114.296078,10.6387208 114.476951,10.8955413 C114.663996,11.1520366 114.903538,11.3670997 115.180141,11.5268718 C115.506126,11.720303 115.852962,11.8774057 116.214244,11.9952782 L117.455167,12.3618572 L119.130414,12.9117256 C119.664383,13.1015363 120.166356,13.3692768 120.619522,13.70598 C121.602378,14.4140087 122.154912,15.5634667 122.087948,16.7608047 C122.121004,17.4696719 121.956505,18.1739382 121.612261,18.7973545 C121.300726,19.3338382 120.869299,19.7934828 120.350655,20.1414773 C119.804193,20.5059941 119.194247,20.7683295 118.551316,20.9153662 C117.845409,21.0123699 117.130265,21.0260437 116.421065,20.9560972 Z" id="Path"></path>
+                <path d="M136.379248,19.4286849 C135.765636,19.9144267 135.063746,20.2807344 134.311043,20.5080563 C133.397586,20.8060079 132.439751,20.9505822 131.477601,20.9357317 C129.484022,21.0457076 127.539179,20.3034303 126.141631,18.899182 C124.819952,17.3656124 124.152831,15.3875844 124.280246,13.3801321 C124.263071,12.3194805 124.438164,11.2643153 124.797297,10.2642109 C125.111353,9.39844373 125.596363,8.60246478 126.224359,7.92217864 C126.799559,7.29363386 127.504769,6.79365416 128.292565,6.4558628 C129.13245,6.11650376 130.03203,5.94349361 130.939868,5.94672536 C131.84844,5.93569173 132.749586,6.10900306 133.587171,6.4558628 C134.355957,6.77570775 135.026242,7.28828126 135.531284,7.94254414 C136.069381,8.66407624 136.423989,9.5021104 136.565387,10.3864039 C136.756685,11.5054228 136.756685,12.6480576 136.565387,13.7670765 L126.720728,13.7670765 C126.831033,17.1749031 128.464915,18.8788165 131.622376,18.8788165 C132.38185,18.8941966 133.138087,18.7769813 133.856038,18.532603 C134.495821,18.304128 135.106567,18.0034291 135.676058,17.6365211 L136.379248,19.4286849 Z M131.022596,7.73888916 C130.017668,7.7293132 129.052936,8.12697327 128.354611,8.83862604 C127.526752,9.75405949 127.031943,10.9148261 126.948231,12.1378367 L134.331725,12.1378367 C134.534684,10.9751452 134.259342,9.78072052 133.566489,8.81826055 C132.931983,8.09270485 131.993938,7.6946933 131.022596,7.73888916 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-benchmark-capital.png b/website/images/logos/logo-benchmark-capital.png
new file mode 100644
index 00000000000..626599c6b35
Binary files /dev/null and b/website/images/logos/logo-benchmark-capital.png differ
diff --git a/website/images/logos/logo-cloudflare.svg b/website/images/logos/logo-cloudflare.svg
new file mode 100644
index 00000000000..e4bf4f2f803
--- /dev/null
+++ b/website/images/logos/logo-cloudflare.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1062px" height="155px" viewBox="0 0 1062 155" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>cf-logo-h</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="cf-logo-h" fill-rule="nonzero">
+            <g id="Group" transform="translate(367.600000, 95.800000)" fill="#404041">
+                <polygon id="Path" points="77.1 1.1 92.7 1.1 92.7 43.6 119.8 43.6 119.8 57.2 77.1 57.2"></polygon>
+                <path d="M135.9,29.3 L135.9,29.2 C135.9,13.1 148.9,0 166.2,0 C183.5,0 196.3,12.9 196.3,29 L196.3,29.2 C196.3,45.3 183.3,58.4 166,58.4 C148.8,58.3 135.9,45.4 135.9,29.3 M180.5,29.3 L180.5,29.2 C180.5,21.1 174.7,14.1 166.1,14.1 C157.6,14.1 151.9,21 151.9,29.1 L151.9,29.3 C151.9,37.4 157.7,44.4 166.2,44.4 C174.8,44.3 180.5,37.4 180.5,29.3" id="Shape"></path>
+                <path d="M215.4,32.6 L215.4,1.1 L231.2,1.1 L231.2,32.3 C231.2,40.4 235.3,44.2 241.5,44.2 C247.7,44.2 251.8,40.5 251.8,32.7 L251.8,1.1 L267.6,1.1 L267.6,32.2 C267.6,50.3 257.3,58.2 241.3,58.2 C225.4,58.3 215.4,50.2 215.4,32.6" id="Path"></path>
+                <path d="M291.4,1.1 L313.1,1.1 C333.1,1.1 344.8,12.6 344.8,28.8 L344.8,29 C344.8,45.2 333,57.2 312.8,57.2 L291.5,57.2 L291.4,1.1 L291.4,1.1 Z M313.3,43.4 C322.6,43.4 328.8,38.3 328.8,29.2 L328.8,29 C328.8,20 322.6,14.8 313.3,14.8 L307,14.8 L307,43.3 L313.3,43.4 L313.3,43.4 Z" id="Shape"></path>
+                <polygon id="Path" points="367.3 1.1 412.2 1.1 412.2 14.8 382.8 14.8 382.8 24.3 409.4 24.3 409.4 37.2 382.8 37.2 382.8 57.2 367.3 57.2"></polygon>
+                <polygon id="Path" points="433.8 1.1 449.3 1.1 449.3 43.6 476.5 43.6 476.5 57.2 433.8 57.2"></polygon>
+                <path d="M517.1,0.7 L532.1,0.7 L556,57.2 L539.3,57.2 L535.2,47.2 L513.6,47.2 L509.6,57.2 L493.3,57.2 L517.1,0.7 Z M530.8,35.1 L524.6,19.2 L518.3,35.1 L530.8,35.1 Z" id="Shape"></path>
+                <path d="M576,1.1 L602.5,1.1 C611.1,1.1 617,3.3 620.8,7.2 C624.1,10.4 625.8,14.7 625.8,20.3 L625.8,20.5 C625.8,29.1 621.2,34.8 614.3,37.7 L627.7,57.3 L609.7,57.3 L598.4,40.3 L591.6,40.3 L591.6,57.3 L576.1,57.3 L576,1.1 L576,1.1 Z M601.8,28.1 C607.1,28.1 610.1,25.5 610.1,21.5 L610.1,21.2 C610.1,16.8 606.9,14.6 601.7,14.6 L591.5,14.6 L591.5,28.1 L601.8,28.1 L601.8,28.1 Z" id="Shape"></path>
+                <polygon id="Path" points="648.2 1.1 693.3 1.1 693.3 14.4 663.6 14.4 663.6 22.8 690.5 22.8 690.5 35.1 663.6 35.1 663.6 44 693.7 44 693.7 57.2 648.2 57.2"></polygon>
+                <path d="M43.1,35.9 C40.9,40.8 36.3,44.3 30.3,44.3 C21.8,44.3 16,37.2 16,29.2 L16,29 C16,20.9 21.7,14 30.2,14 C36.6,14 41.5,17.9 43.5,23.3 L59.9,23.3 C57.3,9.9 45.5,0 30.3,0 C13,0 5.68434189e-14,13.1 5.68434189e-14,29.2 L5.68434189e-14,29.4 C5.68434189e-14,45.5 12.8,58.4 30.1,58.4 C44.9,58.4 56.5,48.8 59.5,36 L43.1,35.9 L43.1,35.9 Z" id="Path"></path>
+            </g>
+            <g id="Group">
+                <polygon id="Path" fill="#FFFFFF" points="312.8 91.6 269.9 67 262.5 63.8 87 65.1 87 154.1 312.8 154.2"></polygon>
+                <path d="M234.7,146 C236.8,138.8 236,132.2 232.5,127.3 C229.3,122.8 223.9,120.2 217.4,119.9 L94.3,118.3 C93.5,118.3 92.8,117.9 92.4,117.3 C92,116.7 91.9,115.9 92.1,115.1 C92.5,113.9 93.7,113 95,112.9 L219.2,111.3 C233.9,110.6 249.9,98.7 255.5,84.1 L262.6,65.6 C262.9,64.8 263,64 262.8,63.2 C254.8,27 222.5,1.42108547e-14 183.9,1.42108547e-14 C148.3,1.42108547e-14 118.1,23 107.3,54.9 C100.3,49.7 91.4,46.9 81.8,47.8 C64.7,49.5 51,63.2 49.3,80.3 C48.9,84.7 49.2,89 50.2,93 C22.3,93.8 1.42108547e-14,116.6 1.42108547e-14,144.7 C1.42108547e-14,147.2 0.2,149.7 0.5,152.2 C0.7,153.4 1.7,154.3 2.9,154.3 L230.1,154.3 C231.4,154.3 232.6,153.4 233,152.1 L234.7,146 Z" id="Path" fill="#F38020"></path>
+                <path d="M273.9,66.9 C272.8,66.9 271.6,66.9 270.5,67 C269.7,67 269,67.6 268.7,68.4 L263.9,85.1 C261.8,92.3 262.6,98.9 266.1,103.8 C269.3,108.3 274.7,110.9 281.2,111.2 L307.4,112.8 C308.2,112.8 308.9,113.2 309.3,113.8 C309.7,114.4 309.8,115.3 309.6,116 C309.2,117.2 308,118.1 306.7,118.2 L279.4,119.8 C264.6,120.5 248.7,132.4 243.1,147 L241.1,152.1 C240.7,153.1 241.4,154.1 242.5,154.1 L336.3,154.1 C337.4,154.1 338.4,153.4 338.7,152.3 C340.3,146.5 341.2,140.4 341.2,134.1 C341.2,97 311.1,66.9 273.9,66.9" id="Path" fill="#FAAE40"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-deutsche-bank.png b/website/images/logos/logo-deutsche-bank.png
new file mode 100644
index 00000000000..ba1de3a2873
Binary files /dev/null and b/website/images/logos/logo-deutsche-bank.png differ
diff --git a/website/images/logos/logo-ebay.png b/website/images/logos/logo-ebay.png
new file mode 100644
index 00000000000..6234cd2ac22
Binary files /dev/null and b/website/images/logos/logo-ebay.png differ
diff --git a/website/images/logos/logo-index-ventures.png b/website/images/logos/logo-index-ventures.png
new file mode 100644
index 00000000000..5bf804bc8b7
Binary files /dev/null and b/website/images/logos/logo-index-ventures.png differ
diff --git a/website/images/logos/logo-spotify.png b/website/images/logos/logo-spotify.png
new file mode 100644
index 00000000000..bc7c102e6ae
Binary files /dev/null and b/website/images/logos/logo-spotify.png differ
diff --git a/website/images/logos/logo-uber.png b/website/images/logos/logo-uber.png
new file mode 100644
index 00000000000..cb820664636
Binary files /dev/null and b/website/images/logos/logo-uber.png differ
diff --git a/website/images/logos/logo-yandex.png b/website/images/logos/logo-yandex.png
new file mode 100644
index 00000000000..900fd13a683
Binary files /dev/null and b/website/images/logos/logo-yandex.png differ
diff --git a/website/images/photos/aaron-katz.jpg b/website/images/photos/aaron-katz.jpg
new file mode 100644
index 00000000000..02aff426b33
Binary files /dev/null and b/website/images/photos/aaron-katz.jpg differ
diff --git a/website/images/photos/alexander-sapin.jpg b/website/images/photos/alexander-sapin.jpg
new file mode 100644
index 00000000000..83121a980e7
Binary files /dev/null and b/website/images/photos/alexander-sapin.jpg differ
diff --git a/website/images/photos/alexander-tokmakov.jpg b/website/images/photos/alexander-tokmakov.jpg
new file mode 100644
index 00000000000..3215788443f
Binary files /dev/null and b/website/images/photos/alexander-tokmakov.jpg differ
diff --git a/website/images/photos/alexey-milovidov.jpg b/website/images/photos/alexey-milovidov.jpg
new file mode 100644
index 00000000000..31a4ab5311d
Binary files /dev/null and b/website/images/photos/alexey-milovidov.jpg differ
diff --git a/website/images/photos/anton-popov.jpg b/website/images/photos/anton-popov.jpg
new file mode 100644
index 00000000000..663fc9255e9
Binary files /dev/null and b/website/images/photos/anton-popov.jpg differ
diff --git a/website/images/photos/arno-van-driel.jpg b/website/images/photos/arno-van-driel.jpg
new file mode 100644
index 00000000000..9a7855491aa
Binary files /dev/null and b/website/images/photos/arno-van-driel.jpg differ
diff --git a/website/images/photos/brian-hunter.jpg b/website/images/photos/brian-hunter.jpg
new file mode 100644
index 00000000000..d0672bb3cfb
Binary files /dev/null and b/website/images/photos/brian-hunter.jpg differ
diff --git a/website/images/photos/dmitry-novik.jpg b/website/images/photos/dmitry-novik.jpg
new file mode 100644
index 00000000000..c2ce965e48d
Binary files /dev/null and b/website/images/photos/dmitry-novik.jpg differ
diff --git a/website/images/photos/dorota-szeremeta.jpg b/website/images/photos/dorota-szeremeta.jpg
new file mode 100644
index 00000000000..70e427a1154
Binary files /dev/null and b/website/images/photos/dorota-szeremeta.jpg differ
diff --git a/website/images/photos/ilya-yatsishin.jpg b/website/images/photos/ilya-yatsishin.jpg
new file mode 100644
index 00000000000..b8d9d0866a1
Binary files /dev/null and b/website/images/photos/ilya-yatsishin.jpg differ
diff --git a/website/images/photos/ivan-blinkov.jpg b/website/images/photos/ivan-blinkov.jpg
new file mode 100644
index 00000000000..0e70ff6f773
Binary files /dev/null and b/website/images/photos/ivan-blinkov.jpg differ
diff --git a/website/images/photos/jason-chan.jpg b/website/images/photos/jason-chan.jpg
new file mode 100644
index 00000000000..6ce0b524cb2
Binary files /dev/null and b/website/images/photos/jason-chan.jpg differ
diff --git a/website/images/photos/kristina-frost.jpg b/website/images/photos/kristina-frost.jpg
new file mode 100644
index 00000000000..f15206e51e0
Binary files /dev/null and b/website/images/photos/kristina-frost.jpg differ
diff --git a/website/images/photos/kseniia-sumarokova.jpg b/website/images/photos/kseniia-sumarokova.jpg
new file mode 100644
index 00000000000..0fd4efeee25
Binary files /dev/null and b/website/images/photos/kseniia-sumarokova.jpg differ
diff --git a/website/images/photos/maksim-kita.jpg b/website/images/photos/maksim-kita.jpg
new file mode 100644
index 00000000000..e6aac5737cb
Binary files /dev/null and b/website/images/photos/maksim-kita.jpg differ
diff --git a/website/images/photos/mike-hayes.jpg b/website/images/photos/mike-hayes.jpg
new file mode 100644
index 00000000000..13dfbe4cefd
Binary files /dev/null and b/website/images/photos/mike-hayes.jpg differ
diff --git a/website/images/photos/mike-volpi.jpg b/website/images/photos/mike-volpi.jpg
new file mode 100644
index 00000000000..77756349759
Binary files /dev/null and b/website/images/photos/mike-volpi.jpg differ
diff --git a/website/images/photos/nikita-mikhailov.jpg b/website/images/photos/nikita-mikhailov.jpg
new file mode 100644
index 00000000000..549e5bc06e8
Binary files /dev/null and b/website/images/photos/nikita-mikhailov.jpg differ
diff --git a/website/images/photos/nikolai-kochetov.jpg b/website/images/photos/nikolai-kochetov.jpg
new file mode 100644
index 00000000000..924df4e59cb
Binary files /dev/null and b/website/images/photos/nikolai-kochetov.jpg differ
diff --git a/website/images/photos/pavel-kruglov.jpg b/website/images/photos/pavel-kruglov.jpg
new file mode 100644
index 00000000000..6287ef1bfe3
Binary files /dev/null and b/website/images/photos/pavel-kruglov.jpg differ
diff --git a/website/images/photos/peter-fenton.jpg b/website/images/photos/peter-fenton.jpg
new file mode 100644
index 00000000000..20b0ed5eca6
Binary files /dev/null and b/website/images/photos/peter-fenton.jpg differ
diff --git a/website/images/photos/placeholder.png b/website/images/photos/placeholder.png
new file mode 100644
index 00000000000..820802d67a2
Binary files /dev/null and b/website/images/photos/placeholder.png differ
diff --git a/website/images/photos/richard-raposa.jpg b/website/images/photos/richard-raposa.jpg
new file mode 100644
index 00000000000..f8338d6e3df
Binary files /dev/null and b/website/images/photos/richard-raposa.jpg differ
diff --git a/website/images/photos/thom-oconnor.jpg b/website/images/photos/thom-oconnor.jpg
new file mode 100644
index 00000000000..23d2d10382b
Binary files /dev/null and b/website/images/photos/thom-oconnor.jpg differ
diff --git a/website/images/photos/vitaly-baranov.jpg b/website/images/photos/vitaly-baranov.jpg
new file mode 100644
index 00000000000..516b73073c4
Binary files /dev/null and b/website/images/photos/vitaly-baranov.jpg differ
diff --git a/website/images/photos/vladimir-cherkasov.jpg b/website/images/photos/vladimir-cherkasov.jpg
new file mode 100644
index 00000000000..9d8246be2ae
Binary files /dev/null and b/website/images/photos/vladimir-cherkasov.jpg differ
diff --git a/website/images/photos/yury-izrailevsky.jpg b/website/images/photos/yury-izrailevsky.jpg
new file mode 100644
index 00000000000..785479d4ae3
Binary files /dev/null and b/website/images/photos/yury-izrailevsky.jpg differ
diff --git a/website/images/placeholder-contact-form.png b/website/images/placeholder-contact-form.png
new file mode 100644
index 00000000000..297d10e3a89
Binary files /dev/null and b/website/images/placeholder-contact-form.png differ
diff --git a/website/images/placeholder-newsletter-form.png b/website/images/placeholder-newsletter-form.png
new file mode 100644
index 00000000000..dc487941782
Binary files /dev/null and b/website/images/placeholder-newsletter-form.png differ
diff --git a/website/images/welcome-home.png b/website/images/welcome-home.png
new file mode 100644
index 00000000000..7bbcc2c612f
Binary files /dev/null and b/website/images/welcome-home.png differ
diff --git a/website/index.html b/website/index.html
index a1f85f0bbfb..944ad6aab34 100644
--- a/website/index.html
+++ b/website/index.html
@@ -5,30 +5,31 @@
 {% extends "templates/base.html" %}
 
 {% block extra_meta %}
+{% include "templates/common_fonts.html" %}
 <script type="application/ld+json">{
 "@context": "https://schema.org",
 "@type": "SoftwareApplication",
 "name": "ClickHouse",
 "operatingSystem": ["Linux", "FreeBSD", "Mac OS X"],
 "featureList": ["SQL", "columnar storage", "fault-tolerance", "distributed queries"],
-"softwareHelp": "https://clickhouse.tech/docs/en/",
+"softwareHelp": "https://clickhouse.com/docs/en/",
 "license": "https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE",
 "applicationCategory": "https://schema.org/DeveloperApplication",
 "applicationSubCategory": "Database Management System",
 "copyrightHolder": {
   "@type": "Organization",
-  "name": "Yandex LLC",
+  "name": "ClickHouse, Inc.",
   "logo": {
     "@type": "ImageObject",
-    "url": "https://clickhouse.tech/images/yandex.png",
-    "width": 163,
-    "height": 60
+    "url": "https://clickhouse.com/images/logo-400x240.png",
+    "width": 400,
+    "height": 240
   }
 },
 "copyrightYear": 2016,
 "mainEntityOfPage": {
   "@type": "WebSite",
-  "@id": "https://clickhouse.tech"
+  "@id": "https://clickhouse.com"
 },
 "offers": {
   "@type": "Offer",
@@ -38,20 +39,26 @@
 }</script>
 {% endblock %}
 
+{% block nav %}
+
+{% include "templates/global/nav.html" %}
+
+{% endblock %}
+
 {% block content %}
 
-{% include "templates/index/nav.html" %}
 {% include "templates/index/hero.html" %}
-{% include "templates/index/events.html" %}
-{% include "templates/index/performance.html" %}
 {% include "templates/index/why.html" %}
 {% include "templates/index/success.html" %}
-{% include "templates/index/efficient.html" %}
-{% include "templates/index/rich.html" %}
-{% include "templates/index/features.html" %}
-{% include "templates/index/scalable.html" %}
-{% include "templates/index/use.html" %}
+
+{% if false %}
+    {% include "templates/index/pullquote.html" %}
+{% endif %}
+
+{% include "templates/index/performance.html" %}
 {% include "templates/index/quickstart.html" %}
 {% include "templates/index/community.html" %}
 
+{% include "templates/global/newsletter.html" %}
+{% include "templates/global/github_stars.html" %}
 {% endblock %}
diff --git a/website/js/base.js b/website/js/base.js
index aca6f407d24..52b801eb98f 100644
--- a/website/js/base.js
+++ b/website/js/base.js
@@ -1,7 +1,7 @@
 (function () {
     Sentry.init({
         dsn: 'https://2b95b52c943f4ad99baccab7a9048e4d@o388870.ingest.sentry.io/5246103',
-        environment: window.location.hostname === 'clickhouse.tech' ? 'prod' : 'test'
+        environment: window.location.hostname === 'clickhouse.com' ? 'prod' : 'test'
     });
     $(document).click(function (event) {
         var target = $(event.target);
@@ -36,7 +36,7 @@
         }
     });
 
-    if (window.location.hostname.endsWith('clickhouse.tech')) {
+    if (window.location.hostname.endsWith('clickhouse.com')) {
         $('a.favicon').each(function () {
             $(this).css({
                 background: 'url(/favicon/' + this.hostname + ') left center no-repeat',
@@ -67,13 +67,6 @@
         });
     }
 
-    $('#feedback_email, .feedback-email').each(function() {
-        var name = window.location.host.substring(0, 10)
-        var feedback_address = name + '-feedback' + '@yandex-team.com';
-        $(this).attr('href', 'mailto:' + feedback_address);
-        $(this).html(feedback_address);
-    });
-
     (function (d, w, c) {
         (w[c] = w[c] || []).push(function() {
             var is_single_page = $('html').attr('data-single-page') === 'true';
@@ -86,6 +79,14 @@
                     webvisor: !is_single_page
                 });
             } catch(e) { }
+            
+            if (!is_single_page) {
+                $('head').each(function(_, element) {
+                   $(element).append(
+                       '<script async src="https://www.googletagmanager.com/gtag/js?id=G-KF1LLRTQ5Q"></script><script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag(\'js\', new Date());gtag(\'config\', \'G-KF1LLRTQ5Q\');</script>'
+                   );
+                });
+            }
         });
 
         var n = d.getElementsByTagName("script")[0],
@@ -94,7 +95,7 @@
         s.type = "text/javascript";
         s.async = true;
         s.src = "/js/metrika.js";
-        if (window.location.hostname.endsWith('clickhouse.tech')) {
+        if (window.location.hostname.endsWith('clickhouse.com')) {
             if (w.opera == "[object Opera]") {
                 d.addEventListener("DOMContentLoaded", f, false);
             } else {
diff --git a/website/js/docs.js b/website/js/docs.js
index 2af01bc1929..15552fece85 100644
--- a/website/js/docs.js
+++ b/website/js/docs.js
@@ -27,7 +27,7 @@ function onResize() {
         single_page_switch.removeClass('float-right');
     }
     if (window_height < 800 && is_wide) {
-        docs_top_nav.removeClass('sticky-top');
+        docs_top_nav.removeClass('fixed-top');
         $('#sidebar, #toc.toc-right').css({
             'height': window_height,
             'position': 'sticky',
@@ -35,7 +35,7 @@ function onResize() {
         });
     } else {
         var top_nav_height = docs_top_nav.height();
-        docs_top_nav.addClass('sticky-top');
+        docs_top_nav.addClass('fixed-top');
         $('#sidebar, #toc.toc-right').css({
             'height': (window_height - top_nav_height) + 'px',
             'position': 'fixed',
diff --git a/website/js/main.js b/website/js/main.js
new file mode 100644
index 00000000000..9466b6849ba
--- /dev/null
+++ b/website/js/main.js
@@ -0,0 +1,158 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ({
+
+/***/ "../../website/src/js/components/case-study-card.js":
+/*!**************************************************************************************!*\
+  !*** /Users/cody/Sites/tech.clickhouse/website/src/js/components/case-study-card.js ***!
+  \**************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+eval("function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }\n\nfunction _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }\n\nvar CaseStudyCard = /*#__PURE__*/function () {\n  function CaseStudyCard($el) {\n    _classCallCheck(this, CaseStudyCard);\n\n    this.onOpen = this.onOpen.bind(this);\n    this.onToggle = this.onToggle.bind(this);\n    this.$el = $el;\n    this.$el.addEventListener('click', this.onOpen);\n    this.$el.querySelector('.case-study-card-toggle').addEventListener('click', this.onToggle);\n    this.open = false;\n  }\n\n  _createClass(CaseStudyCard, [{\n    key: \"onOpen\",\n    value: function onOpen() {\n      this.open = true;\n      this.$el.classList.toggle('is-open', this.open);\n      this.$el.classList.toggle('is-closing', !this.open);\n      this.closeOthers();\n    }\n  }, {\n    key: \"onToggle\",\n    value: function onToggle(event) {\n      event.stopPropagation();\n      this.open = !this.$el.classList.contains('is-open');\n      this.$el.classList.toggle('is-open', this.open);\n      this.$el.classList.toggle('is-closing', !this.open);\n      this.closeOthers();\n    }\n  }, {\n    key: \"closeOthers\",\n    value: function closeOthers() {\n      var _this = this;\n\n      if (this.open) {\n        document.querySelectorAll('.case-study-card').forEach(function ($el) {\n          if (!$el.isSameNode(_this.$el)) {\n            $el.classList.toggle('is-closing', $el.classList.contains('is-open'));\n            $el.classList.toggle('is-open', false);\n          }\n        });\n      }\n    }\n  }]);\n\n  return CaseStudyCard;\n}();\n\ndocument.querySelectorAll('.case-study-card').forEach(function ($el) {\n  return new CaseStudyCard($el);\n});\n\n//# sourceURL=webpack:////Users/cody/Sites/tech.clickhouse/website/src/js/components/case-study-card.js?");
+
+/***/ }),
+
+/***/ "../../website/src/js/main.js":
+/*!****************************************************************!*\
+  !*** /Users/cody/Sites/tech.clickhouse/website/src/js/main.js ***!
+  \****************************************************************/
+/*! no exports provided */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _components_case_study_card__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./components/case-study-card */ \"../../website/src/js/components/case-study-card.js\");\n/* harmony import */ var _components_case_study_card__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_components_case_study_card__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _utilities_equalize_heights__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./utilities/equalize-heights */ \"../../website/src/js/utilities/equalize-heights.js\");\n/* harmony import */ var _utilities_equalize_heights__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_utilities_equalize_heights__WEBPACK_IMPORTED_MODULE_1__);\n\n\n\n//# sourceURL=webpack:////Users/cody/Sites/tech.clickhouse/website/src/js/main.js?");
+
+/***/ }),
+
+/***/ "../../website/src/js/utilities/equalize-heights.js":
+/*!**************************************************************************************!*\
+  !*** /Users/cody/Sites/tech.clickhouse/website/src/js/utilities/equalize-heights.js ***!
+  \**************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+eval("function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }\n\nfunction _nonIterableRest() { throw new TypeError(\"Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.\"); }\n\nfunction _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === \"string\") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === \"Object\" && o.constructor) n = o.constructor.name; if (n === \"Map\" || n === \"Set\") return Array.from(o); if (n === \"Arguments\" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }\n\nfunction _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }\n\nfunction _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== \"undefined\" && arr[Symbol.iterator] || arr[\"@@iterator\"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i[\"return\"] != null) _i[\"return\"](); } finally { if (_d) throw _e; } } return _arr; }\n\nfunction _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }\n\nvar $allElements = document.querySelectorAll('[equalize-heights]');\nvar groupedElements = {};\n$allElements.forEach(function ($el) {\n  var group = $el.getAttribute('equalize-heights');\n  groupedElements[group] = groupedElements[group] || [];\n  groupedElements[group].push($el);\n});\n\nfunction resizeElements() {\n  Object.entries(groupedElements).forEach(function (_ref) {\n    var _ref2 = _slicedToArray(_ref, 2),\n        group = _ref2[0],\n        $elements = _ref2[1];\n\n    $elements.forEach(function ($el) {\n      var styles = window.getComputedStyle($el);\n\n      if ('none' === styles.getPropertyValue('display')) {\n        $el.style.display = 'block';\n      }\n\n      $el.style.minHeight = 'auto';\n    });\n    var minHeight = $elements.reduce(function (max, $el) {\n      if ($el.offsetHeight > max) {\n        max = $el.offsetHeight;\n      }\n\n      return max;\n    }, 0);\n    $elements.forEach(function ($el) {\n      $el.style.display = null;\n      $el.style.minHeight = \"\".concat(minHeight, \"px\");\n    });\n  });\n}\n\nwindow.addEventListener('resize', resizeElements);\nwindow.addEventListener('orientationchange', resizeElements);\nresizeElements();\n\n//# sourceURL=webpack:////Users/cody/Sites/tech.clickhouse/website/src/js/utilities/equalize-heights.js?");
+
+/***/ }),
+
+/***/ "../../website/src/scss/bootstrap.scss":
+/*!*************************************************************************!*\
+  !*** /Users/cody/Sites/tech.clickhouse/website/src/scss/bootstrap.scss ***!
+  \*************************************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony default export */ __webpack_exports__[\"default\"] = (__webpack_require__.p + \"./css//bootstrap.css\");\n\n//# sourceURL=webpack:////Users/cody/Sites/tech.clickhouse/website/src/scss/bootstrap.scss?");
+
+/***/ }),
+
+/***/ "../../website/src/scss/main.scss":
+/*!********************************************************************!*\
+  !*** /Users/cody/Sites/tech.clickhouse/website/src/scss/main.scss ***!
+  \********************************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony default export */ __webpack_exports__[\"default\"] = (__webpack_require__.p + \"./css//main.css\");\n\n//# sourceURL=webpack:////Users/cody/Sites/tech.clickhouse/website/src/scss/main.scss?");
+
+/***/ }),
+
+/***/ 0:
+/*!*****************************************************************************************************************************************************************************************************!*\
+  !*** multi /Users/cody/Sites/tech.clickhouse/website/src/scss/bootstrap.scss /Users/cody/Sites/tech.clickhouse/website/src/scss/main.scss /Users/cody/Sites/tech.clickhouse/website/src/js/main.js ***!
+  \*****************************************************************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+eval("__webpack_require__(/*! /Users/cody/Sites/tech.clickhouse/website/src/scss/bootstrap.scss */\"../../website/src/scss/bootstrap.scss\");\n__webpack_require__(/*! /Users/cody/Sites/tech.clickhouse/website/src/scss/main.scss */\"../../website/src/scss/main.scss\");\nmodule.exports = __webpack_require__(/*! /Users/cody/Sites/tech.clickhouse/website/src/js/main.js */\"../../website/src/js/main.js\");\n\n\n//# sourceURL=webpack:///multi_/Users/cody/Sites/tech.clickhouse/website/src/scss/bootstrap.scss_/Users/cody/Sites/tech.clickhouse/website/src/scss/main.scss_/Users/cody/Sites/tech.clickhouse/website/src/js/main.js?");
+
+/***/ })
+
+/******/ });
\ No newline at end of file
diff --git a/website/main.html b/website/main.html
index ff59f6564ee..768dec3cb57 100644
--- a/website/main.html
+++ b/website/main.html
@@ -9,7 +9,7 @@
 {% set og_type = 'article' %}
 
 {% if page and page.abs_url %}
-    {% set url = 'https://clickhouse.tech' + page.abs_url %}
+    {% set url = 'https://clickhouse.com' + page.abs_url %}
 {% endif %}
 
 {% if page and page.canonical_url %}
@@ -48,7 +48,7 @@
     {% block content %}
     {% if not is_blog %}
         {% include "templates/docs/nav.html" %}
-        <div class="container-fluid{% if direction == 'rtl' %} text-right{% endif %}">
+        <div class="docs container-fluid mt-3{% if direction == 'rtl' %} text-right{% endif %}">
             <div class="row justify-content-end{% if not single_page %} justify-content-xl-center{% endif %}">
                 {% include "templates/docs/sidebar.html" %}
                 {% include "templates/docs/content.html" %}
@@ -66,8 +66,8 @@
         </div>
         {% if page and page.meta.is_index %}
             {% include "templates/index/community.html" %}
-            {% include "templates/blog/footer.html" %}
         {% endif %}
+        {% include "templates/blog/footer.html" %}
     {% endif %}
 
     {% endblock %}
diff --git a/website/robots.txt b/website/robots.txt
index 2cecc12e311..f7d6bd76a33 100644
--- a/website/robots.txt
+++ b/website/robots.txt
@@ -1,5 +1,5 @@
 User-agent: *
 Disallow: /cdn-cgi/
 Allow: /
-Host: https://clickhouse.tech
-Sitemap: https://clickhouse.tech/sitemap-index.xml
+Host: https://clickhouse.com
+Sitemap: https://clickhouse.com/sitemap-index.xml
diff --git a/website/sitemap-index.xml b/website/sitemap-index.xml
index 3fbdd99d372..bcaf6a3fe19 100644
--- a/website/sitemap-index.xml
+++ b/website/sitemap-index.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
    <sitemap>
-      <loc>https://clickhouse.tech/docs/en/sitemap.xml</loc>
+      <loc>https://clickhouse.com/docs/en/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/docs/zh/sitemap.xml</loc>
+      <loc>https://clickhouse.com/docs/zh/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/docs/ru/sitemap.xml</loc>
+      <loc>https://clickhouse.com/docs/ru/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/docs/ja/sitemap.xml</loc>
+      <loc>https://clickhouse.com/docs/ja/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/blog/en/sitemap.xml</loc>
+      <loc>https://clickhouse.com/blog/en/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/blog/ru/sitemap.xml</loc>
+      <loc>https://clickhouse.com/blog/ru/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/sitemap-static.xml</loc>
+      <loc>https://clickhouse.com/sitemap-static.xml</loc>
    </sitemap>
 </sitemapindex>
diff --git a/website/sitemap-static.xml b/website/sitemap-static.xml
index 6d6b41e5827..b5b5f3aa0d5 100644
--- a/website/sitemap-static.xml
+++ b/website/sitemap-static.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 <url>
-  <loc>https://clickhouse.tech/</loc>
+  <loc>https://clickhouse.com/</loc>
   <changefreq>daily</changefreq>
 </url>
-<url>
-  <loc>https://clickhouse.tech/benchmark/dbms/</loc>
+  <url>
+  <loc>https://clickhouse.com/company/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>https://clickhouse.tech/benchmark/hardware/</loc>
+  <loc>https://clickhouse.com/benchmark/dbms/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>https://clickhouse.tech/codebrowser/html_report/ClickHouse/index.html</loc>
+  <loc>https://clickhouse.com/benchmark/hardware/</loc>
+  <changefreq>weekly</changefreq>
+</url>
+<url>
+  <loc>https://clickhouse.com/codebrowser/html_report/ClickHouse/index.html</loc>
   <changefreq>daily</changefreq>
 </url>
 </urlset>
diff --git a/website/src/js/components/case-study-card.js b/website/src/js/components/case-study-card.js
new file mode 100644
index 00000000000..cb20b9d6ac7
--- /dev/null
+++ b/website/src/js/components/case-study-card.js
@@ -0,0 +1,40 @@
+class CaseStudyCard {
+	
+	constructor($el) {
+		this.onOpen = this.onOpen.bind(this)
+		this.onToggle = this.onToggle.bind(this)
+		this.$el = $el
+		this.$el.addEventListener('click', this.onOpen)
+		this.$el.querySelector('.case-study-card-toggle').addEventListener('click', this.onToggle)
+		this.open = false
+	}
+
+	onOpen() {
+		this.open = true
+		this.$el.classList.toggle('is-open', this.open)
+		this.$el.classList.toggle('is-closing', !this.open)
+		this.closeOthers()
+	}
+
+	onToggle(event) {
+		event.stopPropagation()
+		this.open = !this.$el.classList.contains('is-open')
+		this.$el.classList.toggle('is-open', this.open)
+		this.$el.classList.toggle('is-closing', !this.open)
+		this.closeOthers()
+	}
+
+	closeOthers() {
+		if (this.open) {
+			document.querySelectorAll('.case-study-card').forEach(($el) => {
+				if (!$el.isSameNode(this.$el)) {
+					$el.classList.toggle('is-closing', $el.classList.contains('is-open'))
+					$el.classList.toggle('is-open', false)
+				}
+			})
+		}
+	}
+
+}
+
+document.querySelectorAll('.case-study-card').forEach(($el) => new CaseStudyCard($el))
diff --git a/website/src/js/main.js b/website/src/js/main.js
new file mode 100644
index 00000000000..e86e5bda09a
--- /dev/null
+++ b/website/src/js/main.js
@@ -0,0 +1,2 @@
+import './components/case-study-card'
+import './utilities/equalize-heights'
diff --git a/website/src/js/utilities/equalize-heights.js b/website/src/js/utilities/equalize-heights.js
new file mode 100644
index 00000000000..9d3dc6c604a
--- /dev/null
+++ b/website/src/js/utilities/equalize-heights.js
@@ -0,0 +1,35 @@
+const $allElements = document.querySelectorAll('[equalize-heights]')
+const groupedElements = {}
+
+$allElements.forEach(($el) => {
+	const group = $el.getAttribute('equalize-heights')
+	groupedElements[group] = groupedElements[group] || []
+	groupedElements[group].push($el)
+})
+
+function resizeElements() {
+	Object.entries(groupedElements).forEach(([group, $elements]) => {
+		$elements.forEach(($el) => {
+			const styles = window.getComputedStyle($el)
+			if ('none' === styles.getPropertyValue('display')) {
+				$el.style.display = 'block'
+			}
+			$el.style.minHeight = 'auto'
+		})
+		const minHeight = $elements.reduce((max, $el) => {
+			if ($el.offsetHeight > max) {
+				max = $el.offsetHeight
+			}
+			return max
+		}, 0)
+		$elements.forEach(($el) => {
+			$el.style.display = null
+			$el.style.minHeight = `${minHeight}px`
+		})
+	})
+}
+	
+window.addEventListener('resize', resizeElements)
+window.addEventListener('orientationchange', resizeElements)
+
+resizeElements()
diff --git a/website/src/scss/_variables.scss b/website/src/scss/_variables.scss
new file mode 100644
index 00000000000..4d5ef4f4667
--- /dev/null
+++ b/website/src/scss/_variables.scss
@@ -0,0 +1,314 @@
+// Colors
+
+$white: #fff;
+$black: #212529;
+
+$gray-100: #f1f6f9;
+$gray-500: #d6dbdf;
+$gray-700: #6c757d;
+$gray-900: #495057;
+
+$color-brand-primary: #ffcc00;
+$color-brand-secondary: #ff3939;
+
+$color-primary-accent-yellow: #ffcc00;
+$color-primary-accent-light-yellow: #fffaf0;
+$color-primary-accent-blue: #257af4;
+$color-primary-accent-light-blue: #e3f1fe;
+
+$color-secondary-accent-orange: #ff8c00;
+$color-secondary-accent-light-orange: #ffe4b5;
+$color-secondary-accent-red: #ff3939;
+$color-secondary-accent-light-red: #ffe4e1;
+
+$grays: (
+    "100": $gray-100,
+    "500": $gray-500,
+	"700": $gray-700,
+    "900": $gray-900
+);
+
+$colors: (
+	"brand-primary": $color-brand-primary,
+	"brand-secondary": $color-brand-secondary,
+
+	"primary-accent-yellow": $color-brand-primary,
+	"primary-accent-light-yellow": $color-primary-accent-light-yellow,
+	"primary-accent-blue": $color-primary-accent-blue,
+	"primary-accent-light-blue": $color-primary-accent-light-blue,
+
+	"secondary-accent-orange": $color-secondary-accent-orange,
+	"secondary-accent-light-orange": $color-secondary-accent-light-orange,
+	"secondary-accent-red": $color-brand-secondary,
+	"secondary-accent-light-red": $color-secondary-accent-light-red,
+);
+
+$theme-colors: (
+	"primary": $color-brand-primary,
+	"primary-light": $color-primary-accent-light-yellow,
+	"secondary": $black,
+	"secondary-light": $white,
+	"tertiary": $color-primary-accent-blue,
+	"tertiary-light": $color-primary-accent-light-blue,
+
+	"white": $white,
+	"black": $black,
+
+	"blue": $color-primary-accent-blue,
+	"light-blue": $color-primary-accent-light-blue,
+	"yellow": $color-primary-accent-yellow,
+	"light-yellow": $color-primary-accent-light-yellow,
+	"orange": $color-secondary-accent-orange,
+	"light-orange": $color-secondary-accent-light-orange,
+	"red": $color-secondary-accent-red,
+	"light-red": $color-secondary-accent-light-red,
+
+	"light": $gray-100,
+	"medium": $gray-500,
+	"dark": $gray-900
+);
+
+$link-color: $color-secondary-accent-orange;
+$link-hover-color: $color-secondary-accent-orange;
+
+
+// Options
+//
+// Quickly modify global styling by enabling or disabling optional features.
+
+$enable-caret:                                true;
+$enable-rounded:                              true;
+$enable-shadows:                              false;
+$enable-gradients:                            false;
+$enable-transitions:                          true;
+$enable-grid-classes:                         true;
+$enable-responsive-font-sizes:                true;
+
+
+// Spacing
+//
+// Control the default styling of most Bootstrap elements by modifying these
+// variables. Mostly focused on spacing.
+// You can add more entries to the $spacers map, should you need more variation.
+
+$spacer: 8px;
+$spacers: (
+	0: 0,
+	1: $spacer,
+	2: ($spacer * 2),
+	3: ($spacer * 3),
+	4: ($spacer * 4),
+	5: ($spacer * 5),
+	6: ($spacer * 6),
+	7: ($spacer * 7),
+	8: ($spacer * 8),
+	9: ($spacer * 9),
+	10: ($spacer * 10),
+	12: ($spacer * 12),
+	15: ($spacer * 15)
+);
+
+
+// Body
+//
+// Settings for the `<body>` element.
+
+$body-bg:                   $white;
+$body-color:                $black;
+
+
+// Grid breakpoints
+//
+// Define the minimum dimensions at which your layout will change,
+// adapting to different screen sizes, for use in media queries.
+
+$grid-breakpoints: (
+  xxs: 0,
+  xs: 400px,
+  sm: 616px,
+  md: 768px,
+  lg: 980px,
+  xl: 1240px
+);
+
+
+// Grid containers
+//
+// Define the maximum width of `.container` for different screen sizes.
+
+$container-max-widths: (
+  xs: 576px,
+  sm: 576px,
+  md: 958px,
+  lg: 1008px,
+  xl: 1118px
+);
+
+// Grid columns
+//
+// Set the number of columns and specify the width of the gutters.
+
+$grid-columns:                12;
+$grid-gutter-width:           40px;
+$grid-row-columns:            6;
+
+
+// Components
+//
+// Define common padding and border radius sizes and more.
+
+$line-height-lg:              1.5;
+$line-height-sm:              1.5;
+
+$border-width:                1px;
+$border-color:                $gray-500;
+
+$border-radius:               8px;
+$border-radius-lg:            8px;
+$border-radius-sm:            8px;
+
+$box-shadow-sm:               0 2px 14px rgba($gray-700, .2);
+$box-shadow:                  0 8px 20px rgba($gray-700, .2);
+$box-shadow-lg:               0 12px 32px rgba($gray-700, .2);
+
+
+// Typography
+//
+// Font, line-height, and color for body text, headings, and more.
+
+$font-family-sans-serif:      "Noto Sans", sans-serif;
+
+$font-size-base:              1rem; // Assumes the browser default, typically `16px`
+$font-size-xl:                $font-size-base * 1.25; // 20px
+$font-size-lg:                $font-size-base * 1.125; // 18px
+$font-size-sm:                $font-size-base * .875; // 14px
+$font-size-xs:                $font-size-base * .625; // 10px
+
+$font-weight-light:           300;
+$font-weight-normal:          400;
+$font-weight-medium:          500;
+$font-weight-semibold:        600;
+$font-weight-bold:            700;
+
+$font-weight-base:            $font-weight-normal;
+$line-height-base:            1.5;
+
+$h1-font-size:                40px;
+$h2-font-size:                32px;
+$h3-font-size:                28px;
+$h4-font-size:                24px;
+$h5-font-size:                18px;
+$h6-font-size:                14px;
+
+$headings-margin-bottom:      $spacer * 2;
+$headings-font-family:        "Hind Siliguri", sans-serif;
+$headings-font-weight:        500;
+$headings-line-height:        1.125;
+$headings-color:              null;
+
+$display1-size:               64px;
+$display2-size:               40px;
+$display3-size:               32px;
+$display4-size:               28px;
+$display5-size:               20px;
+$display6-size:               14px;
+
+$display1-weight:             600;
+$display2-weight:             600;
+$display3-weight:             500;
+$display4-weight:             500;
+$display5-weight:             500;
+$display6-weight:             700;
+$display-line-height:         $headings-line-height;
+
+$lead-font-size:              22px;
+$lead-font-weight:            400;
+
+$text-muted:                  $gray-700;
+
+
+// Buttons
+//
+// For each of Bootstrap's buttons, define text, background, and border color.
+
+$btn-padding-y:               12px;
+$btn-padding-x:               32px;
+$btn-font-family:             inherit;
+$btn-font-size:               14px;
+$btn-line-height:             20px;
+$btn-white-space:             null; // Set to `nowrap` to prevent text wrapping
+
+$btn-padding-y-sm:            12px;
+$btn-padding-x-sm:            32px;
+$btn-font-size-sm:            14px;
+$btn-line-height-sm:          20px;
+
+$btn-padding-y-lg:            16px;
+$btn-padding-x-lg:            32px;
+$btn-font-size-lg:            18px;
+$btn-line-height-lg:          26px;
+
+$btn-border-width:            1px;
+
+$btn-font-weight:             $font-weight-bold;
+$btn-box-shadow:              none;
+$btn-focus-width:             0;
+$btn-focus-box-shadow:        none;
+$btn-disabled-opacity:        .65;
+$btn-active-box-shadow:       none;
+
+$btn-link-disabled-color:     $gray-500;
+
+$btn-block-spacing-y:         24px;
+
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius:           $border-radius;
+$btn-border-radius-lg:        $border-radius-lg;
+$btn-border-radius-sm:        $border-radius-sm;
+
+$btn-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+
+
+// Navs
+
+$nav-link-padding-y:                0;
+$nav-link-padding-x:                0;
+$nav-link-disabled-color:           $gray-500;
+
+$nav-tabs-border-color:             $gray-700;
+$nav-tabs-border-width:             $border-width;
+$nav-tabs-border-radius:            $border-radius;
+$nav-tabs-link-hover-border-color:  transparent;
+$nav-tabs-link-active-color:        $color-primary-accent-blue;
+$nav-tabs-link-active-bg:           $white;
+$nav-tabs-link-active-border-color: $gray-700;
+
+
+// Navbar
+
+$navbar-padding-y:            24px;
+$navbar-padding-x:            0;
+
+
+// Cards
+
+$card-spacer-y:                     24px;
+$card-spacer-x:                     24px;
+$card-border-width:                 $border-width;
+$card-border-radius:                $border-radius;
+$card-border-color:                 $border-color;
+$card-inner-border-radius:          subtract($card-border-radius, $card-border-width);
+$card-cap-bg:                       $gray-100;
+$card-cap-color:                    null;
+$card-height:                       null;
+$card-color:                        null;
+$card-bg:                           $white;
+
+$card-img-overlay-padding:          24px;
+
+$card-group-margin:                 $grid-gutter-width / 2;
+$card-deck-margin:                  $card-group-margin;
+
+$card-columns-count:                3;
+$card-columns-gap:                  $grid-gutter-width;
+$card-columns-margin:               $grid-gutter-width;
diff --git a/website/src/scss/bootstrap.scss b/website/src/scss/bootstrap.scss
new file mode 100644
index 00000000000..0f2559f260f
--- /dev/null
+++ b/website/src/scss/bootstrap.scss
@@ -0,0 +1,2 @@
+@import 'variables';
+@import '~bootstrap';
diff --git a/website/src/scss/components/_btn.scss b/website/src/scss/components/_btn.scss
new file mode 100644
index 00000000000..fd3a45c4cd5
--- /dev/null
+++ b/website/src/scss/components/_btn.scss
@@ -0,0 +1,81 @@
+.btn {
+	@media screen and (max-width: 978.98px) {
+		padding: 8px 16px;
+	}
+}
+
+.btn-lg {
+	@media screen and (max-width: 978.98px) {
+		padding: 12px 24px;
+	}
+}
+
+.btn-primary {
+	color: $black;
+
+	&:active,
+	&:hover {
+		color: $black;
+	}
+}
+
+.btn-outline-primary {
+	background: map-get($theme-colors, "primary-light");
+	border-color: map-get($theme-colors, "primary");
+	color: $black;
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "primary");
+		border-color: map-get($theme-colors, "primary");
+		color: $black;
+	}
+}
+
+.btn-secondary {
+	border-color: map-get($theme-colors, "secondary");
+	color: map-get($theme-colors, "secondary-light");
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "secondary-light");
+		border-color: map-get($theme-colors, "secondary");
+		color: map-get($theme-colors, "secondary");
+	}
+}
+
+.btn-outline-secondary {
+	background: map-get($theme-colors, "secondary-light");
+	border-color: map-get($theme-colors, "secondary");
+	color: map-get($theme-colors, "secondary");
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "secondary");
+		border-color: map-get($theme-colors, "secondary");
+		color: map-get($theme-colors, "secondary-light");
+	}
+}
+
+.btn-tertiary {
+	border-color: map-get($theme-colors, "tertiary");
+	color: $white;
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "tertiary");
+		border-color: map-get($theme-colors, "tertiary");
+		color: $white;
+	}
+}
+
+.btn-outline-tertiary {
+	background: map-get($theme-colors, "tertiary-light");
+	color: map-get($theme-colors, "tertiary");
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "tertiary");
+		color: $white;
+	}
+}
diff --git a/website/src/scss/components/_btns.scss b/website/src/scss/components/_btns.scss
new file mode 100644
index 00000000000..da2d7535e62
--- /dev/null
+++ b/website/src/scss/components/_btns.scss
@@ -0,0 +1,13 @@
+.btns {
+	align-items: center;
+	display: flex;
+	justify-content: center;
+
+	.btn + .btn {
+		margin-left: $spacer * 3;
+	}
+
+	.btn-lg + .btn-lg {
+		margin-left: $spacer * 5;
+	}
+}
diff --git a/website/src/scss/components/_card.scss b/website/src/scss/components/_card.scss
new file mode 100644
index 00000000000..8691234872b
--- /dev/null
+++ b/website/src/scss/components/_card.scss
@@ -0,0 +1,75 @@
+.card {
+	box-shadow: $box-shadow;
+	overflow: hidden;
+	position: relative;
+	transition: box-shadow 0.2s, transform 0.2s;
+	width: 100%;
+
+	&-body {
+		position: relative;
+		z-index: 10;
+	}
+}
+
+.card.is-large .card-body {
+	padding: 40px;
+}
+
+.card.bg-primary-light {
+	border-color: $color-brand-primary;
+}
+
+.card.has-dark-border {
+	border-color: $gray-700;
+}
+
+.card.has-pattern:before,
+.card.has-pattern:after {
+	background-repeat: no-repeat;
+	background-size: auto 100%;
+	bottom: 0;
+	content: '';
+	display: block;
+	position: absolute;
+	top: 0;
+	width: 72px;
+}
+
+.card.has-pattern:before {
+	background-image: url(#{'../images/backgrounds/bg-card-pattern-blue-1.png'});
+	background-position: left top;
+	left: 0;
+}
+
+.card.has-pattern:after {
+	background-image: url(#{'../images/backgrounds/bg-card-pattern-blue-2.png'});
+	background-position: right top;
+	right: 0;
+}
+
+a.card:active,
+a.card:hover,
+.card.has-hover:active,
+.card.has-hover:hover {
+	box-shadow: $box-shadow-lg;
+	transform: translateY(-8px);
+}
+
+a.card:after,
+.card.has-hover:after,
+.card.has-highlight:after {
+	content: '';
+	display: block;
+	height: 8px;
+	margin-top: auto;
+	transition: background 0.2s;
+	width: 100%;
+}
+
+a.card:active:after,
+a.card:hover:after,
+.card.has-hover:active:after,
+.card.has-hover:hover:after,
+.card.has-highlight:after {
+	background: $color-primary-accent-light-blue;
+}
diff --git a/website/src/scss/components/_case-study-card.scss b/website/src/scss/components/_case-study-card.scss
new file mode 100644
index 00000000000..bb2eb53abd1
--- /dev/null
+++ b/website/src/scss/components/_case-study-card.scss
@@ -0,0 +1,204 @@
+.case-study-cards {
+	column-gap: $grid-gutter-width;
+	display: grid;
+	grid-template-columns: 1fr;
+	row-gap: 40px;
+	padding-bottom: 40px;
+	position: relative;
+
+	> div {
+		align-items: stretch;
+		display: flex;
+	}
+
+	&:before {
+		background: $gray-500;
+		bottom: 0;
+		content: '';
+		display: block;
+		left: 20px;
+		position: absolute;
+		top: 40px;
+		width: 100vw;
+	}
+
+	@media screen and (min-width: 980px) {
+		grid-template-columns: repeat(2, minmax(0, 1fr));
+		row-gap: 80px;
+		padding-bottom: 120px;
+
+		&:before {
+			left: -40px;
+			top: 120px;
+		}
+	}
+}
+
+.case-study-card {
+	align-items: stretch;
+	flex-direction: row;
+	flex-shrink: 0;
+	left: 0;
+	transition: 0.2s box-shadow, 0.4s left, 0.4s width, 0s z-index;
+	transition-delay: 0s, 0.6s, 0.6s, 0s;
+	width: 100%;
+	z-index: 2;
+
+	@media screen and (max-width: 979.98px) {
+		.row {
+			min-height: 0 !important;
+		}
+	}
+
+	@media screen and (min-width: 980px) {
+
+		&:active,
+		&:hover {
+			box-shadow: $box-shadow-lg;
+		}
+	
+		&:not(.is-open) {
+			cursor: pointer;
+		}
+	
+		&.is-open {
+			transform: none !important;
+			transition-delay: 0s, 0s, 0s, 0s;
+			width: calc(200% + #{$grid-gutter-width});
+			z-index: 10;
+		}
+	
+		&.is-closing {
+			z-index: 10;
+		}
+	
+		&.open-left.is-open {
+			left: calc(-100% - #{$grid-gutter-width});
+		}
+		
+		&:before {
+			background: no-repeat url(#{'../images/backgrounds/bg-card-pattern-red.png'});
+			background-position: right center;
+			background-size: contain;
+			content: '';
+			display: block;
+			height: calc(100% - 80px);
+			max-height: 224px;
+			max-width: 234px;
+			position: absolute;
+			right: 0;
+			top: 40px;
+			transform: translateX(30%);
+			transition: 0.4s transform;
+			transition-delay: 0.6s;
+			width: 100%;
+			z-index: 1;
+
+			@media screen and (min-width: 1240px) {
+				transform: translateX(10%);
+			}
+		}
+	
+		&.is-open:before {
+			transform: translateX(60%);
+			transition-delay: 0s;
+		}
+	
+		&-wrap {
+			align-items: stretch;
+			display: flex;
+			flex-shrink: 0;
+			min-height: 304px;
+			position: relative;
+			transition: 0.4s width;
+			transition-delay: 0.6s;
+			width: calc(200% + #{2px + $grid-gutter-width});
+			z-index: 2;
+		}
+	
+		&.is-open &-wrap {
+			transition-delay: 0s;
+			width: 100%;
+		}
+	
+		&-body {
+			display: flex;
+			flex-direction: column;
+			padding-right: 80px !important;
+	
+			> .row {
+				align-self: stretch;
+			}
+		}
+	
+		&-toggle {
+			background: $white;
+			box-shadow: $box-shadow;
+			border-radius: 100%;
+			cursor: pointer;
+			height: 56px;
+			position: relative;
+			width: 56px;
+	
+			&:before,
+			&:after {
+				background: $color-primary-accent-blue;
+				content: '';
+				display: block;
+				height: 4px;
+				left: calc(50% - 15px);
+				position: absolute;
+				top: calc(50% - 2px);
+				transition: opacity 0.2s, transform 0.2s;
+				width: 30px;
+			}
+	
+			&:after {
+				transform: rotate(90deg);
+			}
+		}
+	
+		&.is-open &-toggle:before {
+			opacity: 0;
+			transform: rotate(-90deg);
+		}
+	
+		&.is-open &-toggle:after {
+			transform: rotate(0);
+		}
+	
+		.col-lg-3,
+		.col-lg-auto {
+			opacity: 0;
+			transform: translateX(24px);
+			transition: 0.4s opacity, 0.4s transform;
+		}
+	
+		.col-lg-3 {
+			transition-delay: 0s;
+		}
+	
+		.col-lg-auto {
+			transition-delay: 0.2s;
+
+			@media screen and (min-width: 980px) {
+				max-width: 605px;
+				width: calc(100% - 319px);
+			}
+		}
+	
+		&.is-open .col-lg-3,
+		&.is-open .col-lg-auto {
+			opacity: 1;
+			transform: none;
+		}
+	
+		&.is-open .col-lg-3 {
+			transition-delay: 0.4s;
+		}
+	
+		&.is-open .col-lg-auto {
+			transition-delay: 0.2s;
+		}
+	}
+}
diff --git a/website/src/scss/components/_footer.scss b/website/src/scss/components/_footer.scss
new file mode 100644
index 00000000000..94d8f47115f
--- /dev/null
+++ b/website/src/scss/components/_footer.scss
@@ -0,0 +1,5 @@
+.footer {
+	&-copy {
+		white-space: nowrap;
+	}
+}
diff --git a/website/src/scss/components/_form.scss b/website/src/scss/components/_form.scss
new file mode 100644
index 00000000000..b37b7044ce1
--- /dev/null
+++ b/website/src/scss/components/_form.scss
@@ -0,0 +1,38 @@
+form {
+	.form-control {
+		border: 1px solid $gray-700;
+		border-radius: 6px;
+		box-shadow: $box-shadow;
+		color: $black;
+		height: auto;
+		line-height: 20px;
+		min-height: 44px;
+		padding: 12px 16px;
+		width: 100%;
+
+		&:focus {
+			border-color: $black;
+			box-shadow: $box-shadow;
+			color: $black;
+		}
+
+		&::placeholder {
+			color: $gray-700;
+		}
+	}
+
+	select.form-control {
+		appearance: none;
+	}
+
+	select.form-control:not([data-chosen]) {
+		color: $gray-700;
+	}
+
+	.btn-secondary:active,
+	.btn-secondary:hover {
+		color: $black;
+		background: $color-brand-primary;
+		border-color: $color-brand-primary;
+	}
+}
diff --git a/website/src/scss/components/_hero.scss b/website/src/scss/components/_hero.scss
new file mode 100644
index 00000000000..7c3bab209e4
--- /dev/null
+++ b/website/src/scss/components/_hero.scss
@@ -0,0 +1,30 @@
+.hero {
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: cover;
+	overflow: visible;
+	position: relative;
+
+	&-bg {
+		background-repeat: no-repeat;
+		background-position: center;
+		background-size: cover;
+		display: block;
+		height: 100%;
+		left: 50%;
+		position: absolute;
+		top: 0;
+		transform: translateX(-50%);
+		z-index: 1;
+	}
+
+	> .container {
+		position: relative;
+		z-index: 2;
+	}
+}
+
+.hero.has-offset {
+	margin-bottom: -160px;
+	padding-bottom: 160px;
+}
diff --git a/website/src/scss/components/_hr.scss b/website/src/scss/components/_hr.scss
new file mode 100644
index 00000000000..81ed120367a
--- /dev/null
+++ b/website/src/scss/components/_hr.scss
@@ -0,0 +1,40 @@
+hr {
+	background: $gray-100;
+	border: 0;
+	display: block;
+	height: 4px;
+	margin: 0;
+	width: 100%;
+}
+
+hr.is-small {
+	height: 2px;
+}
+
+hr.is-large {
+	height: 8px;
+}
+
+hr.is-medium {
+	background: $gray-500;
+}
+
+hr.is-dark {
+	background: $gray-900;
+}
+
+hr.is-yellow {
+	background: linear-gradient(90deg, $color-secondary-accent-orange 0, $color-secondary-accent-orange 8px, $color-primary-accent-yellow 16px, rgba($color-primary-accent-yellow, 0) 100%);
+	clip-path: polygon(
+		8px 100%,
+		0 100%,
+		0 0,
+		8px 0,
+		8px 100%,
+		16px 100%,
+		16px 0,
+		100% 0,
+		100% 100%
+	);
+	height: 8px;
+}
diff --git a/website/src/scss/components/_icon.scss b/website/src/scss/components/_icon.scss
new file mode 100644
index 00000000000..090720b049a
--- /dev/null
+++ b/website/src/scss/components/_icon.scss
@@ -0,0 +1,15 @@
+.icon {
+	display: block;
+	height: 48px;
+	margin-bottom: $spacer * 3;
+	object-fit: contain;
+	object-position: center;
+
+	@media screen and (min-width: 576px) {
+		height: 64px;
+	}
+
+	@media screen and (min-width: 980px) {
+		height: 80px;
+	}
+}
diff --git a/website/src/scss/components/_img.scss b/website/src/scss/components/_img.scss
new file mode 100644
index 00000000000..f65a4b5ef42
--- /dev/null
+++ b/website/src/scss/components/_img.scss
@@ -0,0 +1,3 @@
+img {
+	max-width: 100%;
+}
diff --git a/website/src/scss/components/_kicker.scss b/website/src/scss/components/_kicker.scss
new file mode 100644
index 00000000000..bac94510157
--- /dev/null
+++ b/website/src/scss/components/_kicker.scss
@@ -0,0 +1,8 @@
+.kicker {
+	color: $gray-700;
+	font-family: $headings-font-family;
+	font-size: $font-size-sm;
+	font-weight: $font-weight-semibold;	
+	letter-spacing: 1px;
+	margin: 0;
+}
diff --git a/website/src/scss/components/_lead.scss b/website/src/scss/components/_lead.scss
new file mode 100644
index 00000000000..0d028bca549
--- /dev/null
+++ b/website/src/scss/components/_lead.scss
@@ -0,0 +1,5 @@
+.lead {
+	@media screen and (max-width: 978.98px) {
+		font-size: $font-size-lg;
+	}
+}
diff --git a/website/src/scss/components/_navbar.scss b/website/src/scss/components/_navbar.scss
new file mode 100644
index 00000000000..179e4ff1f60
--- /dev/null
+++ b/website/src/scss/components/_navbar.scss
@@ -0,0 +1,134 @@
+.navbar {
+    border-bottom: 4px solid $gray-100;
+	height: 142px;
+
+	> .container {
+		flex-wrap: wrap;
+	}
+
+	&-super {
+		flex-shrink: 0;
+		width: 100%;
+
+		ul {
+			list-style: none;
+		}
+
+		li:not(:last-child) {
+			margin-bottom: 0;
+			margin-right: 24px;
+		}
+
+		a {
+			align-items: center;
+			color: $black;
+			display: flex;
+			font-size: $font-size-sm;
+
+			&:active,
+			&:hover {
+				color: $color-primary-accent-blue;
+				text-decoration: none;
+			}
+		}
+
+		img {
+			flex-shrink: 0;
+			margin-right: $spacer * 0.5;
+		}
+	}
+
+	&-brand {
+		background: no-repeat url(#{"../images/logo.svg"});
+		background-size: contain;
+		flex-shrink: 0;
+		height: 28px;
+		margin-right: 48px;
+		padding: 0;
+		width: 180px;
+	}
+
+	&-nav {
+		align-items: center;
+		height: 46px;
+	}
+
+	.nav-item:not(:last-child) {
+		margin-bottom: 0;
+		margin-right: 24px;
+	}
+	
+	.nav-link {
+		color: $black;
+	
+		&:active,
+		&:hover {
+			color: $color-primary-accent-blue;
+		}
+	}
+
+	.navbar-nav {
+		flex-direction: row;
+	}
+
+	@media screen and (max-width: 978.98px) {
+		> .container {
+			padding-left: 20px;
+			padding-right: 20px;
+		}
+
+		.navbar-toggler {
+			height: 24px;
+			padding: 0;
+			width: 24px;
+
+			&:focus {
+				outline: none;
+			}
+		}
+
+		.navbar-toggler-icon {
+			background: no-repeat url(#{"../images/icons/icon-menu.svg"});
+			background-position: center;
+			background-size: contain;
+			height: 24px;
+			width: 24px;
+		}
+		
+		.navbar-collapse {
+			background: $white;
+			border-bottom: 4px solid $gray-100;
+			height: 56px;
+			left: 0;
+			padding: 0 20px 16px;
+			position: absolute;
+			right: 0;
+			top: 100%;
+		}
+
+		.nav-link {
+			font-size: $font-size-sm;
+			white-space: nowrap;
+		}
+	}
+
+	@media screen and (max-width: 615.98px) {
+		.navbar-collapse {
+			height: auto;
+		}
+
+		.navbar-nav {
+			flex-direction: column;
+			height: auto;
+		}
+
+		.nav-item:not(:last-child) {
+			margin-bottom: 16px;
+			margin-right: 0;
+		}
+	}
+
+	@media screen and (max-width: 399.98px) {
+		height: 80px;
+	}
+}
diff --git a/website/src/scss/components/_page.scss b/website/src/scss/components/_page.scss
new file mode 100644
index 00000000000..926f9656b73
--- /dev/null
+++ b/website/src/scss/components/_page.scss
@@ -0,0 +1,4 @@
+.page {
+	overflow: hidden;
+	width: 100vw;
+}
diff --git a/website/src/scss/components/_photo-frame.scss b/website/src/scss/components/_photo-frame.scss
new file mode 100644
index 00000000000..6f8407fe6c3
--- /dev/null
+++ b/website/src/scss/components/_photo-frame.scss
@@ -0,0 +1,30 @@
+.photo-frame {
+	background: rgba($white, 0.6);
+	//border: 6px solid $color-primary-accent-blue;
+	border-radius: 100%;
+	box-shadow: $box-shadow;
+	display: block;
+	margin-bottom: $spacer * 3;
+	max-width: 160px;
+	overflow: hidden;
+	position: relative;
+	width: 100%;
+
+	&:before {
+		content: '';
+		display: block;
+		padding-bottom: 100%;
+		width: 100%;
+	}
+
+	img {
+		display: block;
+		height: 100%;
+		left: 0;
+		object-fit: contain;
+		object-position: center;
+		position: absolute;
+		top: 0;
+		width: 100%;
+	}
+}
diff --git a/website/src/scss/components/_pullquote.scss b/website/src/scss/components/_pullquote.scss
new file mode 100644
index 00000000000..7ce2771c6f8
--- /dev/null
+++ b/website/src/scss/components/_pullquote.scss
@@ -0,0 +1,47 @@
+@use 'sass:math';
+
+.pullquote {
+	position: relative;
+	width: 70%;
+
+	&:before {
+		background: no-repeat url(#{'../images/backgrounds/bg-quotes.svg'});
+		background-position: center;
+		background-size: 100%;
+		bottom: 0;
+		content: '';
+		display: block;
+		mix-blend-mode: multiply;
+		position: absolute;
+		right: $spacer * 7;
+		top: 0;
+		width: calc(100% - #{$spacer * 2});
+		z-index: 2;
+	}
+
+	&-bg {
+		bottom: 0;
+		display: block;
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: calc(50vw + #{100% * math.div(20, 70)});
+		z-index: 1;
+	}
+
+	&-body {
+		padding: ($spacer * 8) ($spacer * 5) ($spacer * 8) 0;
+		position: relative;
+		z-index: 3;
+	}
+
+	&-quote {
+		font-family: $headings-font-family;
+		font-size: 32px;
+		font-weight: $font-weight-bold;
+	}
+
+	&-citation {
+		font-size: $font-size-lg;
+	}
+}
diff --git a/website/src/scss/components/_section.scss b/website/src/scss/components/_section.scss
new file mode 100644
index 00000000000..6243a9326cc
--- /dev/null
+++ b/website/src/scss/components/_section.scss
@@ -0,0 +1,25 @@
+.section {
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: cover;
+	overflow: visible;
+	position: relative;
+
+	&-bg {
+		background-repeat: no-repeat;
+		background-position: center;
+		background-size: cover;
+		display: block;
+		height: 100%;
+		left: 50%;
+		position: absolute;
+		top: 0;
+		transform: translateX(-50%);
+		z-index: 1;
+	}
+
+	> .container {
+		position: relative;
+		z-index: 2;
+	}
+}
diff --git a/website/src/scss/components/_social-icons.scss b/website/src/scss/components/_social-icons.scss
new file mode 100644
index 00000000000..9b55d5d1469
--- /dev/null
+++ b/website/src/scss/components/_social-icons.scss
@@ -0,0 +1,58 @@
+.social-icons {
+	align-items: center;
+	display: flex;
+
+	> a {
+		aspect-ratio: 24 / 24; 
+		background: $gray-700;
+		display: block;
+		height: 24px; 
+		width: 24px; 
+		mask-position: center; 
+		mask-repeat: no-repeat;
+		mask-size: contain;
+		transition: 0.2s background;
+
+		&:active,
+		&:hover {
+			background: $black;
+		}
+	}
+
+	> a + a {
+		margin-left: $spacer * 4;
+	}
+
+	&-facebook {
+		mask-image: url('/images/icons/icon-facebook-gray.svg');
+	}
+
+	&-twitter {
+		mask-image: url('/images/icons/icon-twitter-gray.svg');
+		width: 31px;
+	}
+
+	&-linkedin {
+		mask-image: url('/images/icons/icon-linkedin-gray.svg');
+	}
+
+	&-linkedin-alt {
+		mask-image: url('/images/icons/icon-linkedin-alt-gray.svg');
+	}
+}
+
+.social-icons.size-small {
+	> a {
+		height: 20px; 
+		width: 20px;
+
+		&:active,
+		&:hover {
+			background: $black;
+		}
+	}
+
+	> a + a {
+		margin-left: $spacer * 2;
+	}
+}
diff --git a/website/src/scss/components/_tabs.scss b/website/src/scss/components/_tabs.scss
new file mode 100644
index 00000000000..620b86e7d00
--- /dev/null
+++ b/website/src/scss/components/_tabs.scss
@@ -0,0 +1,106 @@
+.tabs {
+	position: relative;
+
+	&:before {
+		background: $white;
+		border-radius: ($border-radius - $border-width) ($border-radius - $border-width) 0 0;
+		content: '';
+		display: block;
+		height: $border-radius;
+		left: 1px;
+		position: absolute;
+		right: 1px;
+		top: 68px;
+		z-index: 10;
+		
+		@media screen and (min-width: 1240px) {
+			top: 76px;
+		}
+	}
+
+	&-body {
+		background: $white;
+		border-color: $gray-700;
+		border-radius: $border-radius;
+		border-style: solid;
+		border-width: $border-width;
+		box-shadow: $box-shadow;
+		padding: $spacer * 3;
+
+		@media screen and (min-width: 980px) {
+			padding: $spacer * 4;
+		}
+		
+		@media screen and (min-width: 1240px) {
+			padding: $spacer * 5;
+		}
+	}
+
+	.nav-tabs {
+		border-bottom: 0;
+		flex-wrap: nowrap;
+		height: 68px + $border-radius;
+		margin: -20px -20px #{-($border-radius + $border-width)};
+		mask-image: linear-gradient(90deg, transparent 0%, #000 20px, #000 calc(100% - 20px), transparent 100%);
+		overflow: scroll;
+		overflow-x: scroll;
+		overflow-y: visible;
+		padding: 20px 20px 0;
+		position: relative;
+
+		@media screen and (min-width: 940px) {
+			overflow: visible;
+		}
+		
+		@media screen and (min-width: 1240px) {
+			height: 76px + $border-radius;
+		}
+	}
+
+	.nav-link {
+		align-items: center;
+		border-bottom: 0;
+		color: $gray-700;
+		display: flex;
+		font-size: $font-size-sm;
+		flex-shrink: 0;
+		height: 48px + $border-radius;
+		justify-content: center;
+		padding: 0 12px $border-radius;
+		text-align: center;
+		white-space: nowrap;
+		
+		@media screen and (min-width: 1240px) {
+			height: 56px + $border-radius;
+			padding: 0 16px $border-radius;
+		}
+	}
+
+	.nav-link.active {
+		background: $white;
+		box-shadow: 0 -4px 8px rgba($gray-700, .1);
+		font-weight: $font-weight-bold;
+		padding: 0 16px $border-radius;
+		
+		@media screen and (min-width: 980px) {
+			padding: 0 24px $border-radius;
+		}
+		
+		@media screen and (min-width: 1240px) {
+			padding: 0 32px $border-radius;
+		}
+	}
+}
+
+.tab-pane {
+	pre {
+		background: $black;
+		border-radius: 16px;
+		color: $white;
+		padding: ($spacer * 3) ($spacer * 2);
+		
+		@media screen and (min-width: 1240px) {
+			padding: ($spacer * 4) ($spacer * 3);
+		}
+	}
+}
diff --git a/website/src/scss/components/_trailing-link.scss b/website/src/scss/components/_trailing-link.scss
new file mode 100644
index 00000000000..a2c08ff2543
--- /dev/null
+++ b/website/src/scss/components/_trailing-link.scss
@@ -0,0 +1,32 @@
+.trailing-link {
+	align-items: center;
+	color: $black;
+	display: flex;
+	font-size: $font-size-sm;
+	font-weight: $font-weight-bold;
+
+	&:after {
+		background: no-repeat url(#{'../images/icons/icon-arrow.svg'});
+		background-position: right center;
+		background-size: contain;
+		content: '';
+		display: block;
+		height: 12px;
+		transition: 0.2s transform;
+		width: 20px;
+	}
+
+	&:active,
+	&:hover {
+		color: $black;
+		text-decoration: none;
+
+		&:after {
+			transform: translateX(8px);
+		}
+	}
+
+	&.span-full:after {
+		margin-left: auto;
+	}
+}
diff --git a/website/src/scss/components/_ul.scss b/website/src/scss/components/_ul.scss
new file mode 100644
index 00000000000..9cf03aba169
--- /dev/null
+++ b/website/src/scss/components/_ul.scss
@@ -0,0 +1,24 @@
+ul {
+	color: $gray-900;
+	list-style-type: square;
+	padding-left: 1.25em;
+
+	li:not(:last-child) {
+		margin-bottom: ($spacer * 2);
+	}
+
+	li::marker {
+		color: $color-brand-secondary;
+	}
+}
+
+ul.has-separators {
+	list-style: none;
+	padding: 0;
+
+	li:not(:last-child) {
+		border-bottom: 4px solid $gray-100;
+		margin-bottom: $spacer * 3;
+		padding-bottom: $spacer * 3;
+	}
+}
diff --git a/website/src/scss/main.scss b/website/src/scss/main.scss
new file mode 100644
index 00000000000..b77347ee412
--- /dev/null
+++ b/website/src/scss/main.scss
@@ -0,0 +1,3 @@
+@import 'variables';
+@import 'components/**/*';
+@import 'utilities/**/*';
diff --git a/website/src/scss/utilities/_bg.scss b/website/src/scss/utilities/_bg.scss
new file mode 100644
index 00000000000..0b8f63e298f
--- /dev/null
+++ b/website/src/scss/utilities/_bg.scss
@@ -0,0 +1,35 @@
+.bg-gradient-secondary {
+	background-image: linear-gradient(58deg, #FF6443 3%, #FE561D 24%, #E32F0D 93%);
+}
+
+.bg-gradient-light-orange {
+	background-image: linear-gradient(90deg, rgba(#FFCB80, 0) 0%, #FFCB80 100%);
+}
+
+.bg-offset-right {
+	bottom: 0;
+	left: -24px;
+	position: absolute;
+	top: 0;
+	width: calc(100vw + 24px);
+	z-index: -1;
+
+	@media screen and (min-width: 1240px) {
+		left: -96px;
+		width: calc(100vw + 96px);
+	}
+}
+
+.bg-inset-right {
+	bottom: 0;
+	left: 40px;
+	position: absolute;
+	top: 0;
+	width: calc(100vw - 40px);
+	z-index: -1;
+
+	@media screen and (min-width: 980px) {
+		left: 96px;
+		width: calc(100vw - 96px);
+	}
+}
diff --git a/website/src/scss/utilities/_border.scss b/website/src/scss/utilities/_border.scss
new file mode 100644
index 00000000000..7cade2776c3
--- /dev/null
+++ b/website/src/scss/utilities/_border.scss
@@ -0,0 +1,4 @@
+.has-border-left {
+	border-left: 8px solid $gray-100;
+	padding-left: $spacer * 2;
+}
diff --git a/website/src/scss/utilities/_font.scss b/website/src/scss/utilities/_font.scss
new file mode 100644
index 00000000000..44c19e46284
--- /dev/null
+++ b/website/src/scss/utilities/_font.scss
@@ -0,0 +1,31 @@
+.font-xl {
+	font-size: $font-size-xl;
+}
+
+.font-lg {
+	font-size: $font-size-lg;
+}
+
+.font-sm {
+	font-size: $font-size-sm;
+}
+
+.font-xs {
+	font-size: $font-size-xs;
+}
+
+.font-weight-semibold {
+	font-weight: $font-weight-semibold;
+}
+
+.display-5 {
+	color: $black;
+	font-size: $display5-size;
+	font-weight: $display5-weight;
+}
+
+.display-6 {
+	color: $black;
+	font-size: $display6-size;
+	font-weight: $display6-weight;
+}
diff --git a/website/src/scss/utilities/_text.scss b/website/src/scss/utilities/_text.scss
new file mode 100644
index 00000000000..bca5f3bef7c
--- /dev/null
+++ b/website/src/scss/utilities/_text.scss
@@ -0,0 +1,7 @@
+.text-decoration-underline {
+	text-decoration: underline;
+}
+
+.text-upper {
+	text-transform: uppercase;
+}
diff --git a/website/templates/base.html b/website/templates/base.html
index 700f71d61ec..0d849cb120d 100644
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -6,8 +6,11 @@
     {% include "templates/common_css.html" %}
 </head>
 <body dir="{{ direction or 'ltr' }}" {{ extra_body_attrs }}>
-{% block content %}{% endblock %}
-{% include "templates/footer.html" %}
-{% include "templates/common_js.html" %}
+    {% block nav %}{% endblock %}
+    <div class="page">
+        {% block content %}{% endblock %}
+        {% include "templates/footer.html" %}
+        {% include "templates/common_js.html" %}
+    </div>
 </body>
 </html>
diff --git a/website/templates/blog/content.html b/website/templates/blog/content.html
index b14616608a6..d3bb1e159d0 100644
--- a/website/templates/blog/content.html
+++ b/website/templates/blog/content.html
@@ -5,7 +5,7 @@
             {% if page.meta.image %}
                 <img class="img-fluid mb-3" src="{{ page.meta.image }}" alt="{{ title }}" title="{{ title }}" />
             {% endif %}
-            <h1 class="display-4 mb-3">{{ title }}</h1>
+            <h1 class="display-2 mt-3 mb-5">{{ title }}</h1>
         </header>
 
         <div class="row">
@@ -63,5 +63,3 @@
         {% endfor %}
     {% endif %}
 </div>
-
-{% include "templates/blog/footer.html" %}
diff --git a/website/templates/blog/nav.html b/website/templates/blog/nav.html
index 4b99f6c380d..2916ea305eb 100644
--- a/website/templates/blog/nav.html
+++ b/website/templates/blog/nav.html
@@ -4,7 +4,7 @@
             <img id="docs-logo-icon" src="/images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo"/>
         </a>
         <div class="w-100 navbar-text text-left d-none d-md-block">
-            <h2 class="display-6 m-0 p-0 d-inline">
+            <h2 class="display-4 text-reset m-0 p-0 d-inline">
                 <a href="/blog/{{ language }}/" class="text-reset text-decoration-none">
                     {{ config.site_name }}
                 </a>
@@ -32,10 +32,10 @@
                         GitHub
                      </a>
                 </li>
-                <li id="languages-wrapper" class="nav-item dropdown">
+                <li id="languages-wrapper" class="nav-item dropdown mr-3">
                     <div id="languages-dropdown">
                         <a class="nav-link dropdown-toggle d-inline-block text-reset" href="#" id="lang-dropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="32" class="d-inline-block mt-n1" />
+                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="60" class="d-inline-block" />
                         </a>
                         <div class="dropdown-menu" aria-labelledby="lang-dropdown">
                             {% for code, name in config.extra.languages.items() %}
diff --git a/website/templates/common_fonts.html b/website/templates/common_fonts.html
new file mode 100644
index 00000000000..eb61aa2c9b5
--- /dev/null
+++ b/website/templates/common_fonts.html
@@ -0,0 +1,3 @@
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Hind+Siliguri:wght@300;500;600;700&family=Noto+Sans:wght@400;700&display=swap" rel="stylesheet">
diff --git a/website/templates/common_meta.html b/website/templates/common_meta.html
index 0c4f5c30785..6fa00d9825d 100644
--- a/website/templates/common_meta.html
+++ b/website/templates/common_meta.html
@@ -1,5 +1,6 @@
 {% set description = description or _('ClickHouse is a fast open-source column-oriented database management system that allows generating analytical data reports in real-time using SQL queries') %}
 <meta charset="utf-8" />
+<META http-equiv="Content-type" content="text/html; charset=UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <meta name="viewport" content="width=device-width,initial-scale=1" />
 
diff --git a/website/templates/company/contact.html b/website/templates/company/contact.html
new file mode 100644
index 00000000000..2538b184fda
--- /dev/null
+++ b/website/templates/company/contact.html
@@ -0,0 +1,53 @@
+<div id="contact" class="section bg-light-orange pb-8 pb-lg-10 pt-8 pt-lg-10 mb-medium-5 mb-lg-10">
+    <div class="container">
+        
+        <h2 class="display-2 text-center mb-3 mb-lg-5">
+            {{ _('Contact Us') }}
+        </h2>
+
+        <div class="pb-5 pt-5 mb-5 position-relative">
+            <div class="bg-gradient-light-orange bg-offset-right"></div>
+
+            <form action="https://webto.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8" method="POST">
+
+                <input type=hidden name="oid" value="00D5f000000JueF">
+                <input type=hidden name="retURL" value="https://clickhouse.com/thank-you/">
+
+                <div class="mb-5 mx-auto" style="max-width:860px;">
+                    <div class="row">
+                        <div class="form-group col-md-6 mb-3">
+                            <input class="form-control" id="first_name" placeholder="First Name*" maxlength="40" name="first_name" size="20" type="text" required>
+                        </div>
+                        <div class="form-group col-md-6 mb-3">
+                            <input class="form-control" id="last_name" placeholder="Last Name*" maxlength="80" name="last_name" size="20" type="text" required>
+                        </div>
+                        <div class="form-group col-md-6 mb-3">
+                            <input class="form-control" id="email" placeholder="Email*" maxlength="80" name="email" size="20" type="text" required>
+                        </div>
+                        <div class="form-group col-md-6 mb-3">
+                            <input class="form-control" id="company" placeholder="Company" maxlength="40" name="company" size="20" type="text">
+                        </div>
+                        <div class="form-group col-md-6 mb-3 mb-md-0">
+                            <input class="form-control" id="00N5f000006YIf5" name="00N5f000006YIf5" placeholder="Country" maxlength="80" size="20" type="text">
+                        </div>
+                        <div class="form-group col-md-6">
+                            <textarea class="form-control" id="00N5f000000lOdD" placeholder="Tell us about your use case, other example..." name="00N5f000000lOdD" rows="1" type="text" wrap="soft" required></textarea>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="d-flex justify-content-center">
+                    <input type="submit" name="submit" value="Submit" class="btn btn-lg btn-secondary">
+                </div>
+                
+            </form>
+
+        </div>
+        
+        <p class="text-center text-muted mx-auto w-75">
+            {{ _('If you have any more thoughts or questions, feel free to contact the ClickHouse team directly at') }}
+            <a class="text-blue text-decoration-underline" href="mailto:feedback@clickhouse.com">feedback@clickhouse.com</a>
+        </p>
+
+    </div>
+</div>
diff --git a/website/templates/company/founders.html b/website/templates/company/founders.html
new file mode 100644
index 00000000000..2f6100e28f7
--- /dev/null
+++ b/website/templates/company/founders.html
@@ -0,0 +1,55 @@
+<div class="section bg-white pb-10 pt-10 pt-lg-15">
+    <div class="container">
+
+        <h2 class="display-2 text-center mb-5 mb-md-8 mb-lg-10">
+            {{ _('Meet the Team') }}
+        </h2>
+
+        <h3 class="display-3 text-center mb-3 mb-md-5 mb-lg-8">
+            {{ _('ClickHouse Co-Founders') }}
+        </h3>
+
+        <div class="row">
+            <div class="col-lg-4 mb-3 mb-lg-0 text-center">
+
+                <a href="https://www.linkedin.com/in/yuryizrailevsky/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/yury-izrailevsky.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Yury Izrailevsky') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Co-Founder & President, Product and Engineering') }}
+                </p>
+
+            </div>
+            <div class="col-lg-4 mb-3 mb-lg-0 text-center">
+
+                <a href=" https://www.linkedin.com/in/aaron-katz-5762094/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/aaron-katz.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Aaron Katz') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Co-Founder & CEO') }}
+                </p>
+
+            </div>
+            <div class="col-lg-4 text-center">
+
+                <a href="https://github.com/alexey-milovidov" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/alexey-milovidov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Alexey Milovidov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Co-Founder & CTO') }}
+                </p>
+
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/website/templates/company/hero.html b/website/templates/company/hero.html
new file mode 100644
index 00000000000..f7d3fbdb529
--- /dev/null
+++ b/website/templates/company/hero.html
@@ -0,0 +1,10 @@
+<div class="hero bg-primary-light d-flex align-items-center base-hero">
+    <div class="hero-bg other-hero"></div>
+    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
+        
+        <h1 class="display-1 mb-0">
+            {{ _('About Us') }}
+        </h1>
+
+    </div>
+</div>
diff --git a/website/templates/company/investors.html b/website/templates/company/investors.html
new file mode 100644
index 00000000000..0dd38085c83
--- /dev/null
+++ b/website/templates/company/investors.html
@@ -0,0 +1,33 @@
+<h2 class="display-2 text-center mb-3 mb-md-5 mb-lg-8">
+    {{ _('ClickHouse Investors') }}
+</h2>
+
+<div class="d-flex flex-column flex-lg-row align-items-center justify-content-center">
+    <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+        <a href="https://www.linkedin.com/in/peter-fenton-0b117/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+            <img src="/images/photos/peter-fenton.jpg">
+        </a>
+        <h3 class="display-4">
+            {{ _('Peter Fenton') }}
+        </h3>
+        <p class="font-lg text-muted mb-3 mx-auto w-75">
+            {{ _('Board Member') }}
+        </p>
+        <img src="/images/logos/logo-benchmark-capital.png" height="40" width="219" class="d-block mx-auto">
+    </div>
+    <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+        <a href="https://www.linkedin.com/in/mavolpi/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+            <img src="/images/photos/mike-volpi.jpg">
+        </a>
+        <h3 class="display-4">
+            {{ _('Mike Volpi') }}
+        </h3>
+        <p class="font-lg text-muted mb-3 mx-auto w-75">
+            {{ _('Board Member') }}
+        </p>
+        <img src="/images/logos/logo-index-ventures.png" height="33" width="262" class="d-block mx-auto mb-5 mb-lg-0">
+
+    </div>
+</div>
diff --git a/website/templates/company/overview.html b/website/templates/company/overview.html
new file mode 100644
index 00000000000..e5759227c86
--- /dev/null
+++ b/website/templates/company/overview.html
@@ -0,0 +1,15 @@
+<div class="section bg-white pt-10">
+    <div class="container">
+        
+        <p class="lead text-dark mb-3">
+            Creators of the online analytical processing (OLAP) database management system ClickHouse have announced their decision to officially incorporate as a company. The creator of ClickHouse, Alexey Milovidov (CTO), will be joined by co-founders and seasoned enterprise software executives, Yury Izrailevsky (President, Product and Engineering) and Aaron Katz (CEO), along with nearly $50M in Series A funding led by <a href="https://www.indexventures.com/" class="text-blue text-decoration-underline" rel="external nofollow">Index Ventures</a> and <a href="http://www.benchmark.com/" class="text-blue text-decoration-underline" rel="external nofollow">Benchmark</a>.
+        </p>
+
+        <p class="lead text-dark mb-6">
+            ClickHouse is an open-source, column-oriented OLAP database management system that allows users to generate analytical reports using SQL queries in real-time. Its technology works 100-1,000x faster than traditional database management systems, and processes hundreds of millions to over a billion rows and tens of gigabytes of data per server per second. With a widespread user base around the globe, the technology has received praise for its reliability, ease of use, and fault tolerance.
+        </p>
+
+        <hr class="is-yellow">
+
+    </div>
+</div>
diff --git a/website/templates/company/press.html b/website/templates/company/press.html
new file mode 100644
index 00000000000..8265b68b063
--- /dev/null
+++ b/website/templates/company/press.html
@@ -0,0 +1,68 @@
+<div id="press" class="section bg-white pb-10 pb-lg-15 pt-10 pt-lg-15">
+    <div class="container">
+        
+        <div class="row">
+            <div class="col-lg-2">
+                    
+                <h2 class="display-2">
+                    {{ _('Press') }}
+                </h2>
+
+            </div>
+
+            <div class="col-lg-10">
+                <div class="mb-5">
+                    
+                    <p class="kicker mb-1">
+                        {{ _('9/20/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://www.businesswire.com/news/home/20210920005219/en/ClickHouse-Inc.-Announces-Incorporation-Along-With-50M-In-Series-A-Funding" rel="external nofollow noreferrer">{{ _('ClickHouse, Inc. Announces Incorporation, Along With $50M In Series A Funding') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('New financing will allow the open source success to build a world-class, commercial-grade cloud solution that’s secure, compliant, and convenient for any customer to use.') }}
+                    </p>
+                    <a class="trailing-link" href="https://www.businesswire.com/news/home/20210920005219/en/ClickHouse-Inc.-Announces-Incorporation-Along-With-50M-In-Series-A-Funding" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+                <div class="mb-5">
+                    <p class="kicker mb-1">
+                        {{ _('9/20/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://www.businessinsider.com/clickhouse-creators-raise-50-million-for-new-company-2021-9" rel="external nofollow noreferrer">{{ _('Business Insider Exclusive') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('The creators of the popular ClickHouse project just raised $50 million from Index and Benchmark to form a company that will take on Splunk and Druid in the white-hot data space.') }}
+                    </p>
+                    <a class="trailing-link" href="https://www.businessinsider.com/clickhouse-creators-raise-50-million-for-new-company-2021-9" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+                <div class="mb-5">
+                    <p class="kicker mb-1">
+                        {{ _('9/20/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://www.indexventures.com/perspectives/clickhouse-from-russia-with-love/" rel="external nofollow noreferrer">{{ _('Index Ventures Perspective') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('Our road to ClickHouse started like a good spy novel, with a complex series of introductions over Telegram, clandestine text conversations spanning months before we finally managed to meet the team “face-to-face” (aka over Zoom).') }}
+                    </p>
+                    <a class="trailing-link" href="https://www.indexventures.com/perspectives/clickhouse-from-russia-with-love/" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+
+                <div class="mb-5">
+                    <p class="kicker mb-1">
+                        {{ _('9/20/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://yandex.com/company/press_center/press_releases/2021/2021-09-20/" rel="external nofollow noreferrer">{{ _('Yandex Perspective') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('Yandex announces the spin off of ClickHouse, Inc., a pioneering company focused on open-source column-oriented database management systems (DBMS) for analytical processing. ') }}
+                    </p>
+                    <a class="trailing-link" href="https://yandex.com/company/press_center/press_releases/2021/2021-09-20" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/website/templates/company/team.html b/website/templates/company/team.html
new file mode 100644
index 00000000000..8b4c4e26774
--- /dev/null
+++ b/website/templates/company/team.html
@@ -0,0 +1,338 @@
+<div class="section">
+    <div class="container pb-10 pb-lg-15 pt-10">
+        <div class="bg-offset-right bg-light"></div>
+
+        <h2 class="display-3 text-center mb-3 mb-md-5 mb-lg-8">
+            {{ _('ClickHouse Team') }}
+        </h2>
+
+        <div class="row mb-8 mb-md-10 mb-lg-15">
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/vitlibar" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/vitaly-baranov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Vitaly Baranov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Principal Sofware Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/ivanblinkov/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/ivan-blinkov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Ivan Blinkov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, Product') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/jasonbchan/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/jason-chan.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Jason Chan') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Adviser, Security, Privacy &amp; Compliance') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/vdimir" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/vladimir-cherkasov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Vladimir Cherkasov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/kristinamfrost/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/kristina-frost.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Kristina Frost') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Director, Business Technology') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/mike-hayes-54990310/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/mike-hayes.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Mike Hayes') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, Sales') }}
+                </p>
+
+            </div>
+            {% if false %}
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <div class="photo-frame mx-auto">
+                    <img src="/images/photos/brian-hunter.jpg">
+                </div>
+                <h3 class="display-4">
+                    {{ _('Brian Hunter') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Account Executive') }}
+                </p>
+
+            </div>
+            {% endif %}
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/kitaisreal/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/maksim-kita.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Maksim Kita') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/KochetovNicolai/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/nikolai-kochetov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Nikolai Kochetov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Engineering Team Lead') }}
+                </p>
+
+            </div>
+            {% if false %}
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <div class="photo-frame mx-auto">
+                    <img src="/images/photos/placeholder.png">
+                </div>
+                <h3 class="display-4">
+                    {{ _('Anne Krechmer') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Recruiter') }}
+                </p>
+
+            </div>
+            {% endif %}
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/Avogar" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/pavel-kruglov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Pavel Kruglov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            {% if false %}
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <div class="photo-frame mx-auto">
+                    <img src="/images/photos/placeholder.png">
+                </div>
+                <h3 class="display-4">
+                    {{ _('Claire Lucas') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Director, Global Business Strategy &amp; Operations') }}
+                </p>
+
+            </div>
+            {% endif %}
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/nikitamikhaylov" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/nikita-mikhailov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Nikita Mikhailov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/novikd" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/dmitry-novik.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Dmitry Novik') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/4thom/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/thom-oconnor.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Thom O’Connor') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, Support &amp; Services') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/CurtizJ" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/anton-popov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Anton Popov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/richraposa/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/richard-raposa.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Richard Raposa') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Director, Global Learning') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/Alesapin" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/alexander-sapin.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Alexander Sapin') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Engineering Team Lead') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/kssenii" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/kseniia-sumarokova.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Kseniia Sumarokova') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 mb-xl-0 text-center">
+
+                <a href="https://www.linkedin.com/in/dorota-szeremeta-a849b7/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/dorota-szeremeta.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Dorota Szeremeta') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, Operations') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 mb-xl-0 text-center">
+
+                <a href="https://github.com/tavplubix" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/alexander-tokmakov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Alexander Tokmakov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-0 text-center">
+
+                <a href="https://www.linkedin.com/in/arnovandriel" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/arno-van-driel.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Arno Van Driel') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, EMEA') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-0 text-center">
+
+                <a href="https://www.linkedin.com/in/%D1%8F%D1%86%D0%B8%D1%88%D0%B8%D0%BD-%D0%B8%D0%BB%D1%8C%D1%8F-9495b535/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/ilya-yatsishin.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Ilya Yatsishin') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Technical Project Manager') }}
+                </p>
+
+            </div>
+        </div>
+
+        <div class="card mx-auto mb-8 mb-md-10 mb-lg-15 is-large has-dark-border has-pattern w-50">
+            <div class="card-body">
+
+                <h3 class="display-3 text-center">
+                    {{ _('Join the Team') }}
+                </h3>
+
+                <div class="btns">
+                    <a href="mailto:careers@clickhouse.com" class="btn btn-outline-secondary" role="button">
+                        {{ _('Apply Now') }}
+                    </a>
+                </div>
+
+            </div>
+        </div>
+
+        <hr class="is-medium is-large mb-8">
+
+        {% include "templates/company/investors.html" %}
+
+    </div>
+</div>
diff --git a/website/templates/contact-thank-you/hero.html b/website/templates/contact-thank-you/hero.html
new file mode 100644
index 00000000000..0e8cef54ce2
--- /dev/null
+++ b/website/templates/contact-thank-you/hero.html
@@ -0,0 +1,14 @@
+<div class="hero bg-primary-light d-flex align-items-center base-hero">
+    <div class="hero-bg other-hero"></div>
+    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
+        
+        <h1 class="display-1 mb-3">
+            {{ _('Thank You') }}
+        </h1>
+        
+        <p class="lead text-dark mb-0">
+            {{ _('A salesperson will be in contact with you shortly.') }}
+        </p>
+
+    </div>
+</div>
diff --git a/website/templates/contact-thank-you/overview.html b/website/templates/contact-thank-you/overview.html
new file mode 100644
index 00000000000..67728414adc
--- /dev/null
+++ b/website/templates/contact-thank-you/overview.html
@@ -0,0 +1,8 @@
+<div class="section bg-white pt-10">
+    <div class="container">
+        <div class="card bg-dark">
+            <img src="/images/welcome-home.png" height="682" width="2048" class="mx-auto img-fluid">
+        </div>
+
+    </div>
+</div>
diff --git a/website/templates/docs/content.html b/website/templates/docs/content.html
index 6a9bd1f69d9..3f4db728e99 100644
--- a/website/templates/docs/content.html
+++ b/website/templates/docs/content.html
@@ -1,5 +1,5 @@
-<div id="content-wrapper" class="{% if single_page %}col-md-10{% else %}col-md-8{% endif %} p-2 p-md-4">
-    <div id="content" class="mt-md-n3">
+<div id="content-wrapper" class="{% if single_page %}col-md-10{% else %}col-md-8{% endif %} mt-5 p-2 p-md-4">
+    <div id="content">
         {% if not single_page %}
             {% set ancestors = page.ancestors|reverse|list %}
             {% if page.is_index %}
diff --git a/website/templates/docs/ld_json.html b/website/templates/docs/ld_json.html
index 7170a88dad0..4dea9fa6cbb 100644
--- a/website/templates/docs/ld_json.html
+++ b/website/templates/docs/ld_json.html
@@ -3,7 +3,7 @@
 "@context": "http://schema.org",
 "@type": "{% if is_blog %}BlogPosting{% else %}TechArticle{% endif %}",
 "headline": "{{ title }}",
-"mainEntityOfPage": "{{ url or 'https://clickhouse.tech/' }}",
+"mainEntityOfPage": "{{ url or 'https://clickhouse.com/' }}",
 {% if page.meta.date %}
 "datePublished": "{{ page.meta.date }}",
 "dateModified": "{{ page.meta.date }}",
@@ -11,19 +11,19 @@
 {% if page.meta.published_date %}"datePublished": "{{ page.meta.published_date.isoformat() }}",{% endif %}
 {% if page.meta.modified_date %}"dateModified": "{{ page.meta.modified_date.isoformat() }}",{% endif %}
 {% endif %}
-"image": "{{ page.meta.image or 'https://clickhouse.tech/images/logo-209x60.png' }}",
+"image": "{{ page.meta.image or 'https://clickhouse.com/images/clickhouse-209x60.png' }}",
 "author": {
   "@type": "Project",
   "name": "ClickHouse"
 },
 "publisher": {
   "@type": "Organization",
-  "name": "Yandex LLC",
+  "name": "ClickHouse, Inc.",
   "logo": {
     "@type": "ImageObject",
-    "url": "https://clickhouse.tech/images/yandex.png",
-    "width": 163,
-    "height": 60
+    "url": "https://clickhouse.com/images/logo-400x240.png",
+    "width": 400,
+    "height": 240
   }
 }}{% if not is_blog %}, {
 "@context": "http://schema.org",
diff --git a/website/templates/docs/nav.html b/website/templates/docs/nav.html
index 047914c2b95..4d57d282796 100644
--- a/website/templates/docs/nav.html
+++ b/website/templates/docs/nav.html
@@ -1,4 +1,4 @@
-<nav id="top-nav" class="navbar navbar-dark navbar-expand-md bg-dark-alt text-white sticky-top">
+<nav id="top-nav" class="navbar py-1 navbar-dark navbar-expand-md bg-dark-alt text-white fixed-top">
     <div class="container-fluid justify-content-between">
         <a class="d-block navbar-brand mr-3" href="/">
             <img id="docs-logo-icon" src="/images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo"/>
@@ -24,18 +24,18 @@
                 {% endif %}
                 {% if edit_url %}
                 <li id="edit-wrapper" class="nav-item">
-                    <a id="edit-link" href="{{ edit_url }}" title="Edit this article" class="nav-link" rel="external nofollow noreferrer" target="_blank"><img src="/images/mkdocs/edit.svg" alt="Edit this article" class="mt-1" height="22" /></a>
+                    <a id="edit-link" href="{{ edit_url }}" title="Edit this article" class="nav-link" rel="external nofollow noreferrer" target="_blank"><img src="/images/mkdocs/edit.svg" alt="Edit this article" height="60" /></a>
                 </li>
                 {% endif %}
                 <li class="nav-item">
                      <a class="nav-link" href="https://github.com/ClickHouse/ClickHouse" rel="external nofollow noreferrer">
-                        <img src="/images/index/github.svg" alt="GitHub repository" title="Go to GitHub" height="32" />
+                        <img src="/images/index/github.svg" alt="GitHub repository" title="Go to GitHub" height="72" />
                     </a>
                 </li>
-                <li id="languages-wrapper" class="nav-item dropdown">
+                <li id="languages-wrapper" class="nav-item dropdown mr-3">
                     <div id="languages-dropdown">
                         <a class="nav-link dropdown-toggle d-inline-block mt-1 text-muted" href="#" id="lang-dropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="32" class="d-inline-block mt-n1" />
+                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="60" class="d-inline-block mt-n1" />
                         </a>
                         <div class="dropdown-menu bg-dark" aria-labelledby="lang-dropdown">
                             {% for code, name in config.extra.languages.items() %}
diff --git a/website/templates/footer.html b/website/templates/footer.html
index 1eaf519b58b..71c0923981e 100644
--- a/website/templates/footer.html
+++ b/website/templates/footer.html
@@ -1,16 +1,15 @@
 {% if not no_footer %}
-<div id="footer" class="{{ footer_class or 'bg-dark text-muted' }}">
-    <div class="container {{ footer_container_class or 'py-3' }}">
-        <div class="row">
-            <div class="col-lg-8 text-left">
-                <a href="https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">
-        {{ _('ClickHouse source code is published under the Apache 2.0 License.') }}</a> {{ _('Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.') }}
-            </div>
-            <div class="col-lg-4 text-right">
-                &copy; 2016–2021 <a href="https://yandex.com/company/" rel="external nofollow noreferrer" target="_blank" class="text-muted">{{ _('Yandex LLC') }}</a>
-            </div>
+<div class="footer font-xs {{ footer_class or 'bg-light text-muted' }}">
+    <div class="container d-flex align-items-center {{ footer_container_class or 'py-2' }}">
+
+        <div class="footer-copy font-weight-bold">
+            &copy; 2016–2021 {{ _('ClickHouse, Inc.') }}
         </div>
+
+        <div class="footer-license ml-4">
+            {{ _('ClickHouse source code is published under the Apache 2.0 License.') }}</a> {{ _('Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.') }}
+        </div>
+
     </div>
 </div>
 {% endif %}
diff --git a/website/templates/global/github_stars.html b/website/templates/global/github_stars.html
new file mode 100644
index 00000000000..668938fcf58
--- /dev/null
+++ b/website/templates/global/github_stars.html
@@ -0,0 +1 @@
+<script async defer src="https://buttons.github.io/buttons.js"></script>
diff --git a/website/templates/global/nav.html b/website/templates/global/nav.html
new file mode 100644
index 00000000000..0077ce0496b
--- /dev/null
+++ b/website/templates/global/nav.html
@@ -0,0 +1,57 @@
+<nav id="top-nav" class="navbar navbar-clickhouse navbar-expand-lg sticky-top bg-white">
+    <div class="container">
+
+        <nav class="navbar-super mb-2 d-none d-xs-block">
+            <ul class="d-flex align-items-center justify-content-end mb-0">
+                <li class="height-20">
+                    <a class="github-button" href="https://github.com/ClickHouse/ClickHouse" data-show-count="true" aria-label="Star ClickHouse/ClickHouse on GitHub" rel="external nofollow">Star</a>
+                </li>
+                <li>
+                    <a href="/blog/en/">
+                        <img src="/images/icons/icon-blog-black.svg">
+                        Blog
+                    </a>
+                </li>
+                <li>
+                    <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg" target="_blank" rel="external nofollow">
+                        <img src="/images/icons/icon-slack-black.svg">
+                        Slack
+                    </a>
+                </li>
+                <li>
+                    <a href="https://www.youtube.com/c/ClickHouseDB" target="_blank" rel="external nofollow">
+                        <img src="/images/icons/icon-youtube-black.svg">
+                        YouTube
+                </a>
+                </li>
+            </ul>
+        </nav>
+
+        <a class="navbar-brand navbar-brand-clickhouse" href="/" title="ClickHouse"></a>
+
+        <button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-toggle" aria-controls="navbar-toggle" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon text-dark"></span>
+        </button>
+
+        <div id="navbar-toggle" class="collapse navbar-collapse">
+            <ul class="navbar-nav ml-auto justify-content-center justify-content-lg-end">
+                <li class="nav-item">
+                    <a class="nav-link" href="/#quick-start">Quick Start</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/docs/en/">Documentation</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/#community">Community</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/company/">Company</a>
+                </li>
+                <li class="nav-item">
+                    <a class="btn btn-outline-tertiary" href="/company/#contact">Contact Us</a>
+                </li>
+            </ul>
+        </div>
+
+    </div>
+</nav>
diff --git a/website/templates/global/newsletter.html b/website/templates/global/newsletter.html
new file mode 100644
index 00000000000..ef0809760e6
--- /dev/null
+++ b/website/templates/global/newsletter.html
@@ -0,0 +1,40 @@
+<div class="section bg-white pt-10 pb-10 pb-lg-12">
+    <div class="section-bg bg-footer-cta"></div>
+    <div class="container">
+
+        <h2 class="display-2 mb-7 mx-auto text-center w-75">
+            {{ _('Stay informed on feature releases, product roadmap, and future support and cloud offerings! ') }}
+        </h2>
+    
+        <div class="card bg-primary-light is-large">
+            <div class="card-body d-flex flex-column flex-lg-row align-items-center">
+
+                <h2 class="display-3 mb-3 mb-lg-0">
+                    {{ _('Sign up for our newsletter') }}
+                </h2>
+
+                <div class="mx-auto mr-lg-0 pl-0 pl-lg-3" style="flex-grow: 1; max-width: 544px; position: relative;">
+
+                    <form action="https://webto.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8" method="POST">
+
+                        <input type=hidden name="oid" value="00D5f000000JueF">
+                        <input type=hidden name="retURL" value="https://clickhouse.com/thank-you/">
+        
+                        <div class="d-flex" style="max-width: 520px;">
+                            <div style="flex-basis: 400px;">
+                                <input class="form-control" id="email" placeholder="Email*" maxlength="80" name="email" size="20" type="text" required style="border-radius:6px 0 0 6px;">
+                            </div>
+                            <div style="flex-basis: 120px;">
+                                <input type="submit" name="submit" value="Sign Up" class="btn btn-secondary" style="border-radius: 0 6px 6px 0;">
+                            </div>
+                        </div>
+                        
+                    </form>
+                    
+                </div>
+
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/website/templates/index/community.html b/website/templates/index/community.html
index 28e9f12ce93..3d0052e8b9f 100644
--- a/website/templates/index/community.html
+++ b/website/templates/index/community.html
@@ -1,215 +1,165 @@
-<div class="bg-secondary-alt my-5 py-5">
+<div id="community"></div>
+<div class="section pb-lg-10 pt-10 pt-lg-15">
     <div class="container">
-        <h2 id="community" class="display-4 text-white mb-5">{{ _('ClickHouse community') }}</h2>
-        <div class="row mb-5">
-            <div class="col-lg">
-                <div class="row">
-                    <div class="col text-center mb-3">
-                        <a href="https://www.youtube.com/c/ClickHouseDB"
-                            rel="external nofollow noreferrer" target="_blank">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/youtube.svg"
-                                     alt="{{ _('ClickHouse YouTube Channel') }}"
-                                     title="{{ _('ClickHouse YouTube Channel') }}"
-                                     class="bg-secondary-alt rounded-circle p-2" />
-                            </div>
-                        </a>
-                    </div>
 
-                    <div class="col text-center mb-3">
-                        <a href="https://twitter.com/ClickHouseDB"
-                            rel="external nofollow noreferrer" target="_blank">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/twitter.svg"
-                                     alt="{{ _('ClickHouse Official Twitter Account') }}"
-                                     title="{{ _('ClickHouse Official Twitter Account') }}"
-                                     class="bg-secondary-alt rounded-circle p-2" />
-                            </div>
-                        </a>
-                    </div>
-                </div>
-                <div class="row mb-3">
-                    <div class="col-lg">
-                        <div class="bg-dark p-4">
-                            <img data-src="/images/index/telegram.svg"
-                                 alt="{{ _('ClickHouse at Telegram') }}"
-                                 title="{{ _('ClickHouse at Telegram') }}"
-                                 class="bg-secondary-alt rounded-circle p-2 mb-4" />
-                            <h5 class="text-white mb-lg-3">Telegram</h5>
-                            <p class="text-muted">{{ _('Chat with real users in ') }}<a
-                               href="https://telegram.me/clickhouse_en"
-                               rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                                <span class="text-yellow">{{ _('English') }}</span>
-                            </a> {{ _('or in') }}
-                            <a href="https://telegram.me/clickhouse_ru"
-                               rel="external nofollow noreferrer" target="_blank" class="text-decoration-none"><span class="text-yellow">{{ _('Russian') }}</span></a></p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg">
-                <div class="row mb-3">
-                    <div class="col">
-                        <a href="https://github.com/ClickHouse/ClickHouse/issues/new/choose"
-                            rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/github.svg"
-                                     alt="ClickHouse GitHub"
-                                     title="ClickHouse GitHub"
-                                     class="bg-secondary-alt rounded-circle p-2 mb-4" />
-                                <h5 class="text-yellow mb-lg-3">GitHub</h5>
-                                <p class="text-muted">{{ _('Open GitHub issue to ask for help or to file a feature request') }}</p>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-                <div class="row mb-3">
-                    <div class="col w-100">
-                        <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg"
-                            rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/slack.svg"
-                                     alt="{{ _('ClickHouse Slack Workspace') }}"
-                                     title="{{ _('ClickHouse Slack Workspace') }}"
-                                     class="bg-secondary-alt rounded-circle p-2 mr-4 float-left"
-                                     width="64" height="64"/>
-
-                                <h5 class="text-yellow">Slack</h5>
-                                <p class="text-muted mb-2">{{ _('Multipurpose public hangout') }}</p>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg">
-                <div class="row mb-3">
-                    <div class="col w-100">
-                        <a href="https://stackoverflow.com/questions/tagged/clickhouse"
-                            rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/stack-overflow.svg"
-                                     alt="ClickHouse at Stack Overflow"
-                                     title="ClickHouse at Stack Overflow"
-                                     class="bg-secondary-alt rounded-circle p-2 mr-4 float-left" />
-
-                                <h5 class="text-yellow">Stack Overflow</h5>
-                                <p class="text-muted mb-2">{{ _('Ask any questions') }}</p>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="row mb-3">
-                    <div class="col w-100">
-                        <div class="bg-dark p-4">
-                            <img data-src="/images/index/blog.svg"
-                                 alt="ClickHouse Blog"
-                                 title="ClickHouse Blog"
-                                 class="bg-secondary-alt rounded-circle p-2 mr-4 float-left" />
-
-                            <h5 class="text-white">{{ _('ClickHouse Blog') }}</h5>
-                            <p class="text-muted mb-2">{{ _('in') }} <a href="/blog/en/" class="text-decoration-none"><span class="text-yellow">{{ _('English') }}</span></a>
-                                or in <a href="/blog/ru/" class="text-decoration-none"><span class="text-yellow">{{ _('Russian') }}</span></a></p>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row mb-3">
-                    <div class="col w-100">
-                        <a href="https://groups.google.com/group/clickhouse"
-                            rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/google-groups.svg"
-                                     alt="{{ _('ClickHouse at Google Groups') }}"
-                                     title="{{ _('ClickHouse at Google Groups') }}"
-                                     class="bg-secondary-alt rounded-circle p-2 mr-4 float-left" />
-
-                                <h5 class="text-yellow">Google Group</h5>
-                                <p class="text-muted mb-2">{{ _('Email discussions') }}</p>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
         <div class="row">
-            <div class="col">
-                <h3 class="display-5 text-white">{{ _('Like ClickHouse?') }}</h3>
-                <p class="lead text-white">{{ _('Help to spread the word about it via') }} <a rel="external nofollow noreferrer" target="_blank" href="https://www.facebook.com/sharer.php?u=https://clickhouse.tech" class="text-decoration-none"><span class="text-yellow">Facebook</span></a>,
-                    <a rel="external nofollow noreferrer" target="_blank" href="https://twitter.com/intent/tweet?url=https://clickhouse.tech" class="text-decoration-none"><span class="text-yellow">Twitter</span></a> {{ _('and') }} <a rel="external nofollow noreferrer" target="_blank" href="https://www.linkedin.com/shareArticle?url=https://clickhouse.tech" class="text-decoration-none"><span class="text-yellow">LinkedIn</span></a>!</p>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<div>
-    <div class="container">
-        <h2 id="meet" class="display-4 mt-5">{{ _('Hosting ClickHouse Meetups') }}</h2>
-        <div class="row">
-            <div class="col-lg  my-3">
-                <p class="lead">
-                    {{ _('ClickHouse meetups are essential for strengthening community worldwide, but they couldn\'t be possible without the help of local organizers. Please, fill this form if you want to become one or want to meet ClickHouse core team for any other reason.') }}
-                </p>
-                <img data-src="/images/index/meetup.svg" alt="{{ _('ClickHouse Meetup') }}" title="{{ _('ClickHouse Meetup') }}" class="img-fluid mt-5" />
-            </div>
-
-            <div class="col-lg">
-                <form id="meetup-form" action="" method="post">
-                  <div class="form-group my-3">
-                    <input type="text" class="form-control" name="name" placeholder="{{ _('Name') }} *" required="true">
-                  </div>
-                  <div class="form-group">
-                    <input type="email" class="form-control" name="email" placeholder="{{ _('Email') }} *" required="true">
-                  </div>
-                  <div class="form-group">
-                    <input type="text" class="form-control" name="company" placeholder="{{ _('Company') }} *" required="true">
-                  </div>
-                  <div class="form-group">
-                    <input type="text" class="form-control" name="city" placeholder="{{ _('City') }} *" required="true">
-                  </div>
-                  <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="want-host-meetup" name="want-host-meetup">
-                    <label class="form-check-label" for="want-host-meetup">
-                        {{ _('We\'d like to host a public ClickHouse Meetup') }}
-                    </label>
-                  </div>
-                  <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="want-invite-to-office" name="want-invite-to-office">
-                    <label class="form-check-label" for="want-invite-to-office">
-                        {{ _('We\'d like to invite Yandex ClickHouse team to our office') }}
-                    </label>
-                  </div>
-                  <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="want-invite-to-event" name="want-invite-to-event">
-                    <label class="form-check-label" for="want-invite-to-event">
-                        {{ _('We\'d like to invite Yandex ClickHouse team to another event we organize') }}
-                    </label>
-                  </div>
-                  <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="want-commercial" name="want-commercial">
-                    <label class="form-check-label" for="want-commercial">
-                        {{ _('We\'re interested in commercial consulting, support or managed service') }}
-                    </label>
-                  </div>
-                   <div class="form-group">
-                    <textarea class="form-control" name="comments" rows="5" placeholder="{{ _('Additional comments') }}"></textarea>
-                  </div>
-                  <button id="meetup-form-send" type="submit" class="btn btn-yellow w-100 text-center">{{ _('Send') }}</button>
-                  <div id="meetup-form-error"></div>
-                </form>
-            </div>
-        </div>
-
-        <div class="row my-5">
-            <div class="col">
-                <p class="lead">
-                    {{ _('If you have any more thoughts or questions, feel free to contact Yandex ClickHouse team directly at') }}
-                        <a id="feedback_email" href="">{{ _('turn on JavaScript to see email address') }}</a>.
-                </p>
+            <div class="col-lg-4 mb-5 mb-lg-0">
+
+                <h2 class="display-2 mb-3 mb-lg-5" style="max-width: 400px;">
+                    {{ _('Join our growing ClickHouse community') }}
+                </h2>
+
+                <div>
+                    <a href="/blog/en/" class="btn btn-outline-secondary" role="button" rel="nofollow">
+                        {{ _('See Our Blog') }}
+                    </a>
+                </div>
+
+            </div>
+            <div class="col-lg-8">
+
+                <div class="bg-inset-right bg-light" style="bottom:40px;top:40px;"></div>
+
+                <div class="row mx-n2">
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://github.com/ClickHouse/ClickHouse/issues/new/choose" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-github.svg" alt="ClickHouse GitHub" title="ClickHouse GitHub" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-slack.svg" alt="ClickHouse Slack Workspace" title="ClickHouse Slack Workspace" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://stackoverflow.com/questions/tagged/clickhouse" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-stack-overflow.svg" alt="ClickHouse at Stack Overflow" title="ClickHouse at Stack Overflow" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://groups.google.com/group/clickhouse" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-google.svg" alt="ClickHouse at Google Groups" title="ClickHouse at Google Groups" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://www.youtube.com/c/ClickHouseDB" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-youtube.svg" alt="ClickHouse YouTube Channel" title="ClickHouse YouTube Channel" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://telegram.me/clickhouse_en" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-telegram.svg" alt="ClickHouse at Telegram" title="ClickHouse at Telegram" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 mb-sm-0 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://www.facebook.com/ClickHouseInc/" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-facebook.svg" alt="ClickHouse at Facebook" title="ClickHouse at Facebook" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 mb-sm-0 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://twitter.com/ClickhouseDB" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-twitter.svg" alt="ClickHouse at Twitter" title="ClickHouse at Twitter" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://www.linkedin.com/company/ClickHouseInc/" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-linkedin.png" alt="ClickHouse at LinkedIn" title="ClickHouse at LinkedIn" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
             </div>
         </div>
+
     </div>
 </div>
diff --git a/website/templates/index/efficient.html b/website/templates/index/efficient.html
deleted file mode 100644
index 97d3e0c20ca..00000000000
--- a/website/templates/index/efficient.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div>
-    <div class="container my-5">
-        <div class="row mb-5">
-            <div class="col-lg">
-                <h2 id="hardware-efficient" class="display-4 my-4">Hardware efficient</h2>
-                <p class="lead">ClickHouse processes typical analytical queries two to three orders of magnitude faster than traditional
-            row-oriented systems with the same available I/O throughput and CPU capacity. Columnar storage format allows fitting
-            more hot data in RAM, which leads to shorter typical response times.</p>
-                <p class="lead">Total cost of ownership could be further lowered by using commodity hardware with rotating disk drives instead of enterprise grade NVMe or SSD without significant sacrifices in latency for most kinds of queries.</p>
-            </div>
-            <div class="col-lg">
-                <img data-src="images/index/hardware-efficient.svg" class="img-fluid" alt="ClickHouse is hardware efficient" title="ClickHouse is hardware efficient" />
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg">
-                <h3>Strives for CPU efficiency</h3>
-                <p>Vectorized query execution involves relevant SIMD processor instructions
-            and runtime code generation. Processing data in columns increases CPU line cache hit rate.</p>
-
-            </div>
-            <div class="col-lg">
-                <h3>Optimizes disk drive access</h3>
-                <p>ClickHouse minimizes the number of seeks for range queries, which increases the efficiency of using rotational
-            disk drives, as it maintains locality of reference for continually stored data.</p>
-            </div>
-            <div class="col-lg">
-                <h3>Minimizes data transfers</h3>
-                <p>ClickHouse enables companies to manage their data and
-            create reports without using specialized networks that are aimed at high-performance computing.</p>
-
-            </div>
-        </div>
-
-
-    </div>
-</div>
-<div>
-    <div class="container text-center">
-        <img data-src="images/curl.svg" alt="ClickHouse не тормозит" title="ClickHouse не тормозит" />
-    </div>
-</div>
diff --git a/website/templates/index/events.html b/website/templates/index/events.html
deleted file mode 100644
index 60edd5787c9..00000000000
--- a/website/templates/index/events.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% if events %}
-<div id="events" class="bg-light my-0">
-     <div class="container py-5">
-         {% if events|length == 1 %}
-             {% set event = events[0] %}
-             <h2>Upcoming Event</h2>
-             <p class="lead">
-                 <a class="text-reset" rel="external nofollow noreferrer" target="_blank"
-                    href="{{ event.signup_link  }}">
-                    <span class="text-orange">{{ event.event_date }}</span>&nbsp;
-                    {{ event.event_name }}
-                 </a>
-             </p>
-         {% else %}
-            <h2>Upcoming Events</h2>
-            <ul class="lead list-unstyled">
-            {% for event in events %}
-                <li>
-                    <a class="text-reset" rel="external nofollow noreferrer" target="_blank"
-                    href="{{ event.signup_link  }}">
-                    <span class="text-orange">{{ event.event_date }}</span>&nbsp;
-                    {{ event.event_name }}
-                 </a>
-                </li>
-            {% endfor %}
-            </ul>
-         {% endif %}
-     </div>
-</div>
-{% endif %}
diff --git a/website/templates/index/features.html b/website/templates/index/features.html
deleted file mode 100644
index 8f6c02d0f79..00000000000
--- a/website/templates/index/features.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="bg-dark text-light">
-    <div class="container py-5 my-5">
-        <div class="row text-center">
-            <div class="col-lg">
-                <h2 id="key-features" class="display-4">ClickHouse. Just makes you think faster!</h2>
-            </div>
-        </div>
-        <div class="row my-3">
-            <div class="col-lg">
-                <ul class="lead list-unstyled  mb-0 mb-lg-1">
-                    <li><span class="text-yellow">•</span> True column-oriented storage</li>
-                    <li><span class="text-yellow">•</span> Vectorized query execution</li>
-                    <li><span class="text-yellow">•</span> Parallel and distributed query execution</li>
-                    <li><span class="text-yellow">•</span> Real-time query processing</li>
-                    <li><span class="text-yellow">•</span> Real-time data ingestion</li>
-                    <li><span class="text-yellow">•</span> On-disk locality of reference</li>
-                    <li><span class="text-yellow">•</span> Secondary data-skipping indexes</li>
-                    <li><span class="text-yellow">•</span> Data compression</li>
-                    <li><span class="text-yellow">•</span> Hot and cold storage separation</li>
-                </ul>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled mb-0 mb-lg-1">
-                    <li><span class="text-yellow">•</span> SQL support</li>
-                    <li><span class="text-yellow">•</span> JSON documents query functions</li>
-                    <li><span class="text-yellow">•</span> Features for web and mobile analytics</li>
-                    <li><span class="text-yellow">•</span> High availability</li>
-                    <li><span class="text-yellow">•</span> Cross-datacenter replication</li>
-                    <li><span class="text-yellow">•</span> Local and distributed joins</li>
-                    <li><span class="text-yellow">•</span> Adaptive join algorithm</li>
-                    <li><span class="text-yellow">•</span> Pluggable external dimension tables</li>
-                    <li><span class="text-yellow">•</span> Arrays and nested data types</li>
-                </ul>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled mb-0 mb-lg-1">
-                    <li><span class="text-yellow">•</span> Focus on OLAP workloads</li>
-                    <li><span class="text-yellow">•</span> S3-compatible object storage support</li>
-                    <li><span class="text-yellow">•</span> Hadoop, MySQL, Postgres integration</li>
-                    <li><span class="text-yellow">•</span> Approximate query processing</li>
-                    <li><span class="text-yellow">•</span> Probabilistic data structures</li>
-                    <li><span class="text-yellow">•</span> Full support of IPv6</li>
-                    <li><span class="text-yellow">•</span> State-of-the-art algorithms</li>
-                    <li><span class="text-yellow">•</span> Detailed documentation</li>
-                    <li><span class="text-yellow">•</span> Clean documented code</li>
-                </ul>
-            </div>
-        </div>
-        <div class="row mt-5 mb-3">
-            <div class="col-lg text-lg-right my-lg-0 ">
-                <a href="#quick-start" class="btn btn-lg btn-yellow w-50" role="button">Quick start</a>
-            </div>
-            <div class="col-lg mt-lg-0 mt-3">
-                <a href="docs/en/" class="btn btn-lg btn-outline-yellow w-50" role="button">Documentation</a>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/hero.html b/website/templates/index/hero.html
index acb9b566b38..873bcf9487a 100644
--- a/website/templates/index/hero.html
+++ b/website/templates/index/hero.html
@@ -1,38 +1,46 @@
-<div class="container">
-    <div class="row">
-        <div class="col-lg-7 py-lg-5 py-1">
-            <h1 class="display-5">ClickHouse® is a fast <a href="https://github.com/ClickHouse/ClickHouse" rel="external nofollow noreferrer" target="_blank">open-source</a> OLAP database management system</h1>
-            <p class="lead">It is column-oriented and allows to generate analytical reports using SQL queries in real-time.</p>
-            <div class="row lead my-3">
-                <div class="col-md mb-0 mb-md-1">
-                    <ul class="list-unstyled mb-0 mb-md-1">
-                        <li><a class="text-reset" href="#blazing-fast">✓ Blazing fast</a></li>
-                        <li><a class="text-reset" href="#linearly-scalable">✓ Linearly scalable</a></li>
-                        <li><a class="text-reset" href="#feature-rich">✓ Feature-rich</a></li>
-                    </ul>
-                </div>
-                <div class="col-md">
-                    <ul class="list-unstyled">
-                        <li><a class="text-reset" href="#hardware-efficient">✓ Hardware efficient</a></li>
-                        <li><a class="text-reset" href="#fault-tolerant">✓ Fault-tolerant</a></li>
-                        <li><a class="text-reset" href="#highly-reliable">✓ Highly reliable</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="row lead">
+<div class="hero bg-white">
+    <div class="hero-bg index-hero"></div>
+    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10">
+        
+        <h1 class="display-1 mb-3 mx-auto text-center">
+            ClickHouse, Inc <span class="text-orange">Has Arrived</span>
+        </h1>
 
-                <div class="col-lg pb-2">
-                    <a href="https://play.clickhouse.tech/?file=welcome" class="btn btn-lg btn-yellow w-100 mb-3" role="button" target="_blank" rel="external nofollow">Try online demo</a>
-                    <a href="docs/en/commercial/support/" class="btn btn-lg btn-outline-orange w-100" role="button">Request support</a>
-                </div>
-                <div class="col-lg pb-2">
-                    <a href="#quick-start" class="btn btn-lg btn-outline-orange w-100 mb-3" role="button">Quick start</a>
-                    <a href="docs/en/" class="btn btn-lg btn-outline-orange w-100" role="button">Documentation</a>
-                </div>
-            </div>
-        </div>
-        <div class="col-lg-5 py-lg-5 py-1 px-0">
-            <img src="images/index/intro.svg" alt="ClickHouse is capable of generating analytical data reports in real time, with sub-second latencies" title="ClickHouse is capable of generating analytical data reports in real time" class="my-3 img-fluid" />
+        <p class="lead mb-7 mx-auto text-muted text-center" style="max-width:780px;">
+            {{ _('ClickHouse® is an open-source, high performance columnar OLAP database management system for real-time analytics using SQL.') }}
+        </p>
+        
+        <div class="btns mb-5" role="group">
+            <a href="/company/" class="btn btn-lg btn-primary" role="button">Learn More</a>
+            <a href="https://play.clickhouse.com/?file=welcome" class="btn btn-lg btn-outline-primary" role="button">Online Demo</a>
         </div>
+
+        <p class="d-flex justify-content-center">
+            <a href="/blog/en/2021/clickhouse-inc/" class="trailing-link">Read the Blog Post</a>
+        </p>
+
     </div>
 </div>
+
+{% if false %}
+<div class="section">
+    <div class="container">
+
+        <div class="card is-large has-highlight">
+            <div class="card-body">
+                
+                <h5 class="text-blue text-center text-upper">Introducing ClickHouse inc.!</h5>
+
+                <p class="font-lg text-muted text-center mb-6 mx-auto">ClickHouse, Inc. Announces Incorporation, Along With $50M In Series A Funding. New financing will allow the open source success to build a world-class, commercial-grade cloud solution that’s secure, compliant, and convenient for any customer to use.</p>
+
+                <div class="btns" role="group">
+                    <a href="#" class="btn btn-secondary" role="button">Read the Press Release</a>
+                    <a href="#" class="btn btn-outline-secondary" role="button">Read the Blog Post</a>
+                </div>
+
+            </div>
+        </div>
+
+    </div>
+</div>
+{% endif %}
diff --git a/website/templates/index/nav.html b/website/templates/index/nav.html
deleted file mode 100644
index 9bae81eb73c..00000000000
--- a/website/templates/index/nav.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<nav id="top-nav" class="navbar navbar-expand-lg navbar-light bg-white sticky-top">
-    <div class="container">
-        <a class="navbar-brand" href="#">
-            <img id="logo-icon" src="images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo" />
-            <img id="logo-text" src="images/clickhouse-black.svg" alt="ClickHouse" title="ClickHouse" />
-        </a>
-
-        <button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-toggle" aria-controls="navbar-toggle" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon text-dark"></span>
-        </button>
-
-        <div id="navbar-toggle" class="collapse navbar-collapse">
-            <ul class="navbar-nav ml-auto mt-2 mt-lg-0 justify-content-end">
-                <li class="nav-item">
-                    <a class="nav-link" href="#quick-start">Quick start</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="docs/en/">Documentation</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="blog/en/">Blog</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#community">Community</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</nav>
diff --git a/website/templates/index/performance.html b/website/templates/index/performance.html
index cea327001bf..1be0e4dafe2 100644
--- a/website/templates/index/performance.html
+++ b/website/templates/index/performance.html
@@ -1,44 +1,56 @@
-<div id="blazing-fast" class="bg-dark my-0">
-     <div class="container text-light py-5">
-         <div class="row text-center">
-             <div class="col">
-                 <h2 class="display-4 col-lg-10 mx-auto mb-3">ClickHouse works 100-1000x faster than traditional approaches</h2>
-                 <p class="lead">ClickHouse's performance <a href="benchmark/dbms/">exceeds</a> comparable column-oriented database management systems that are available on the market. It processes hundreds of millions to over a billion rows and tens of gigabytes of data per server per second.</p>
+<div id="blazing-fast" class="section bg-white pb-10 pb-lg-15 pt-10 pt-lg-15">
+     <div class="container">
 
-                 <a href="benchmark/dbms/" class="btn btn-lg btn-yellow mt-3 mx-auto" role="button" rel="nofollow">Detailed comparison</a>
-             </div>
-         </div>
-         <div class="row mt-5">
-             <div class="col">
-                <h2 id="independent-benchmarks" class="mb-3">Independent benchmarks</h2>
-             </div>
-         </div>
          <div class="row">
-             <div class="col-lg p-0-lg">
-                 <ul class="list-unstyled">
-                     <li class="mb-3"><a href="https://www.percona.com/blog/2017/02/13/clickhouse-new-opensource-columnar-database/"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">ClickHouse: New Open Source Columnar Database <div class="text-yellow">Percona</div></a></li>
-                    <li class="mb-3"><a href="https://www.percona.com/blog/2017/03/17/column-store-database-benchmarks-mariadb-columnstore-vs-clickhouse-vs-apache-spark/"
-                           title="MariaDB ColumnStore vs. Clickhouse vs. Apache Spark"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">Column Store Database Benchmarks <div class="text-yellow">Percona</div></a></li>
-                    <li class="mb-3"><a href="http://mafiree.com/blogs.php?ref=Benchmark-::-MySQL-Vs-ColumnStore-Vs-Clickhouse"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">MySQL vs ColumnStore vs ClickHouse<div><span class="text-yellow">Mafiree</span></div></a></li>
-                    <li class="mb-3"><a href="https://tech.marksblogg.com/billion-nyc-taxi-rides-clickhouse-cluster.html"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">1.1 Billion Taxi Rides: 108-core ClickHouse Cluster  <div class="text-yellow">Mark Litwintschik</div></a></li>
-                 </ul>
+             <div class="col-lg-6 mb-5 mb-lg-0">
+                 
+                <h2 id="performance" class="display-2 mb-3 mb-lg-5">
+                    ClickHouse works <span class="text-orange">100-1000x</span> faster than traditional approaches
+                </h2>
+
+                <p class="lead text-muted mb-3">
+                    ClickHouse's performance <a href="/benchmark/dbms/">exceeds</a> comparable column-oriented database management systems that are available on the market. It processes hundreds of millions to over a billion rows and tens of gigabytes of data per server per second.
+                </p>
+
+                <a href="/benchmark/dbms/" class="btn btn-outline-secondary" role="button" rel="nofollow">
+                    {{ _('Detailed comparison') }}
+                </a>
+
              </div>
-             <div class="col-lg p-0-lg">
-                 <ul class="list-unstyled">
-                    <li class="mb-3"><a href="https://altinity.com/blog/tag/redshift+benchmark/"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">ClickHouse vs Amazon RedShift Benchmarks <div class="text-yellow">Altinity</div></a></li>
-                    <li class="mb-3"><a href="https://carto.com/blog/inside/geospatial-processing-with-clickhouse"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">Geospatial processing with Clickhouse  <div class="text-yellow">Carto</div></a></li>
-                    <li class="mb-3"><a href="https://translate.yandex.com/translate?url=http%3A%2F%2Fwww.clickhouse.com.cn%2Ftopic%2F5a72e8ab9d28dfde2ddc5ea2F&amp;lang=zh-en"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">ClickHouse and Vertica comparison <div><span class="text-yellow">zhtsh</span> <span class="text-muted">(machine translation from Chinese)</span></div></a></li>
-                    <li class="mb-3"><a href="http://brandonharris.io/redshift-clickhouse-time-series/"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">ClickHouse, Redshift and 2.5 Billion Rows of Time Series Data<div class="text-yellow">Brandon Harris</div></a></li>
-                 </ul>
+             <div class="col-lg-6">
+                
+                <h2 id="independent-benchmarks" class="display-3 mb-4">Independent benchmarks</h2>
+                
+                <ul class="has-separators">
+                    <li>
+                        <div class="kicker">GitLab</div>
+                        <a href="https://www.youtube.com/watch?v=cMdQsxolcqc" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
+                            ClickHouse vs TimescaleDB
+                        </a>
+                    </li>
+                    <li>
+                        <div class="kicker">Mark Litwintschik</div>
+                        <a href="https://tech.marksblogg.com/billion-nyc-taxi-rides-clickhouse-cluster.html" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
+                            1.1 Billion Taxi Rides: 108-core ClickHouse Cluster
+                        </a>
+                    </li>
+                    <li>
+                        <div class="kicker">Brandon Harris</div>
+                        <a href="http://brandonharris.io/redshift-clickhouse-time-series/" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
+                            ClickHouse, Redshift and 2.5 Billion Rows of Time Series Data
+                        </a>
+                    </li>
+                    <li>
+                        <div class="kicker">Percona</div>
+                        <a href="https://www.percona.com/blog/2020/07/27/clickhouse-and-columnstore-in-the-star-schema-benchmark/" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
+                            ClickHouse vs MariaDB ColumnStore
+                        </a>
+                    </li>
+
+                </ul>
+                    
              </div>
          </div>
+         
      </div>
 </div>
diff --git a/website/templates/index/pullquote.html b/website/templates/index/pullquote.html
new file mode 100644
index 00000000000..db6e2c89e0e
--- /dev/null
+++ b/website/templates/index/pullquote.html
@@ -0,0 +1,18 @@
+<div class="section mt-n15">
+    <div class="container">
+
+        <div class="pullquote text-white">
+            <div class="pullquote-bg bg-gradient-secondary"></div>
+            <div class="pullquote-body">
+                <p class="pullquote-quote">
+                    {{ _('"ClickHouse leading the way in real time for Engineering organizations"') }}
+                </p>
+                <p class="pullquote-citation">
+                    <span class="font-weight-bold">{{ _('Author Name') }}</span>,
+                    {{ _('Company Name') }}
+                </p>
+            </div>
+        </div>
+        
+    </div>
+</div>
diff --git a/website/templates/index/quickstart.html b/website/templates/index/quickstart.html
index 47dfef7dfe1..07a2900a52e 100644
--- a/website/templates/index/quickstart.html
+++ b/website/templates/index/quickstart.html
@@ -1,73 +1,76 @@
-<div>
-    <div class="container lead">
-    <h2 id="quick-start" class="display-4 mt-5">Quick start</h2>
+<div class="section bg-white pb-0 pb-lg-10" style="overflow: hidden;">
+    <div class="section-bg quickstart-bg"></div>
+    <div class="container">
 
-    <ul class="nav nav-tabs mt-1 small" id="install-tab" role="tablist">
-        <li class="nav-item">
-            <a class="nav-link active" id="deb-tab" data-toggle="tab" href="#deb" role="tab" aria-controls="deb" aria-selected="true" title="deb packages">Ubuntu or Debian</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="rpm-tab" data-toggle="tab" href="#rpm" role="tab" aria-controls="rpm" aria-selected="false" title="rpm packages">CentOS or RedHat</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="tgz-tab" data-toggle="tab" href="#tgz" role="tab" aria-controls="tgz" aria-selected="false" title="tgz packages">Other Linux (x86)</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="arm-tab" data-toggle="tab" href="#arm" role="tab" aria-controls="arm" aria-selected="false" title="ARM packages">Linux (ARM)</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="mac-x86-tab" data-toggle="tab" href="#mac-x86" role="tab" aria-controls="mac-x86" aria-selected="false" title="Mac x86 packages">Mac (x86)</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="mac-arm-tab" data-toggle="tab" href="#mac-arm" role="tab" aria-controls="mac-arm" aria-selected="false" title="Mac ARM packages">Mac (ARM)</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="freebsd-tab" data-toggle="tab" href="#freebsd" role="tab" aria-controls="freebsd" aria-selected="false" title="FreeBSD packages">FreeBSD</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" href="/docs/en/commercial/cloud/" role="tab" aria-controls="cloud" aria-selected="false" title="Cloud Service Providers"><strong>Cloud</strong></a>
-        </li>
-    </ul>
+        <h2 id="quick-start" class="display-2 mb-5 mb-md-8 mb-lg-10 text-center">Quick Start</h2>
 
-    <div class="tab-content" id="install-tab-content">
-        <div class="tab-pane show active syntax p-3 my-3" id="deb" role="tabpanel" aria-labelledby="deb-tab">
-            <pre>{% include "install/deb.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="rpm" role="tabpanel" aria-labelledby="rpm-tab">
-            <pre>{% include "install/rpm.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="tgz" role="tabpanel" aria-labelledby="tgz-tab">
-            <pre>{% include "install/tgz.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="arm" role="tabpanel" aria-labelledby="arm-tab">
-            <pre>{% include "install/arm.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="mac-x86" role="tabpanel" aria-labelledby="mac-x86-tab">
-            <pre>{% include "install/mac-x86.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="mac-arm" role="tabpanel" aria-labelledby="mac-arm-tab">
-            <pre>{% include "install/mac-arm.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="freebsd" role="tabpanel" aria-labelledby="freebsd-tab">
-            <pre>{% include "install/freebsd.sh" %}</pre>
-        </div>
-    </div>
+        <div class="tabs">
 
-    <p>For other operating systems the easiest way to get started is using
-        <a href="https://hub.docker.com/r/yandex/clickhouse-server/" rel="external nofollow noreferrer"
-           target="_blank">
-            official Docker images of ClickHouse</a>, this is not the only <a href="https://clickhouse.tech/docs/en/getting-started/">option</a> though.
-        Alternatively, you can easily get a running ClickHouse instance or cluster at
-        <a href="https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&amp;utm_medium=clickhouseofficialsite&amp;utm_campaign=link1" rel="external nofollow noreferrer" target="_blank">
-            Yandex Managed Service for ClickHouse</a>.
-    </p>
+            <ul class="nav nav-tabs" id="install-tab" role="tablist">
+                <li class="nav-item">
+                    <a class="nav-link active" id="deb-tab" data-toggle="tab" href="#deb" role="tab" aria-controls="deb" aria-selected="true" title="deb packages">Ubuntu or Debian</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="rpm-tab" data-toggle="tab" href="#rpm" role="tab" aria-controls="rpm" aria-selected="false" title="rpm packages">CentOS or RedHat</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="tgz-tab" data-toggle="tab" href="#tgz" role="tab" aria-controls="tgz" aria-selected="false" title="tgz packages">Other Linux (x86)</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="arm-tab" data-toggle="tab" href="#arm" role="tab" aria-controls="arm" aria-selected="false" title="ARM packages">Linux (ARM)</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="mac-x86-tab" data-toggle="tab" href="#mac-x86" role="tab" aria-controls="mac-x86" aria-selected="false" title="Mac x86 packages">Mac (x86)</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="mac-arm-tab" data-toggle="tab" href="#mac-arm" role="tab" aria-controls="mac-arm" aria-selected="false" title="Mac ARM packages">Mac (ARM)</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="freebsd-tab" data-toggle="tab" href="#freebsd" role="tab" aria-controls="freebsd" aria-selected="false" title="FreeBSD packages">FreeBSD</a>
+                </li>
+            </ul>
+
+            <div class="tabs-body">
+
+                <div class="tab-content mb-5" id="install-tab-content">
+                    <div class="tab-pane show active syntax" id="deb" role="tabpanel" aria-labelledby="deb-tab">
+                        <pre>{% include "install/deb.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="rpm" role="tabpanel" aria-labelledby="rpm-tab">
+                        <pre>{% include "install/rpm.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="tgz" role="tabpanel" aria-labelledby="tgz-tab">
+                        <pre>{% include "install/tgz.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="arm" role="tabpanel" aria-labelledby="arm-tab">
+                        <pre>{% include "install/arm.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="mac-x86" role="tabpanel" aria-labelledby="mac-x86-tab">
+                        <pre>{% include "install/mac-x86.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="mac-arm" role="tabpanel" aria-labelledby="mac-arm-tab">
+                        <pre>{% include "install/mac-arm.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="freebsd" role="tabpanel" aria-labelledby="freebsd-tab">
+                        <pre>{% include "install/freebsd.sh" %}</pre>
+                    </div>
+                </div>
+
+                <p class="font-lg text-dark">
+                    There's a number of <a href="/docs/en/getting-started/">alternative options</a> to get started, most notably the
+                    <a href="https://hub.docker.com/r/clickhouse/clickhouse-server/" rel="external nofollow noreferrer" target="_blank">official Docker images of ClickHouse</a>. To learn more about our future cloud offerings, <a href="/company/#contact">contact us</a>.
+                </p>
+
+                <p class="font-lg text-dark mb-5">After you got connected to your ClickHouse server, you can proceed to:</p>
+
+                <div class="btns justify-content-start">
+                    <a href="/docs/en/getting-started/tutorial/" class="btn btn-secondary" role="button">Tutorial</a>
+                    <a href="/docs/en/" class="btn btn-outline-secondary" role="button">Documentation</a>
+                </div>
+
+            </div>
+
+        </div>
 
-    <p>After you got connected to your ClickHouse server, you can proceed to:</p>
-        <p>
-            <a href="/docs/en/getting-started/tutorial/" class="btn btn-lg btn-outline-orange" role="button">
-                &nbsp;&nbsp;&nbsp;Tutorial&nbsp;&nbsp;&nbsp;
-            </a>&nbsp;&nbsp;
-            <a href="/docs/en/" class="btn btn-lg btn-outline-orange" role="button">Documentation</a>
-        </p>
     </div>
 </div>
diff --git a/website/templates/index/rich.html b/website/templates/index/rich.html
deleted file mode 100644
index ec2620e0a86..00000000000
--- a/website/templates/index/rich.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div>
-    <div class="container py-5">
-
-        <div class="row">
-            <div class="col-lg">
-                <h2 id="feature-rich" class="display-4">Feature-rich SQL database</h2>
-            </div>
-        </div>
-        <div class="row my-lg-5 my-0">
-            <div class="col-lg">
-                <div class="bg-number">1</div>
-                <h4>User-friendly SQL dialect</h4>
-                <p>ClickHouse features a SQL query dialect with a number of built-in analytics capabilities. In addition to common functions that could be found in most DBMS, ClickHouse comes with a lot of domain-specific functions and features for OLAP scenarios out of the box.</p>
-            </div>
-            <div class="col-lg">
-                <div class="bg-number">2</div>
-                <h4>Efficient managing of denormalized data</h4>
-                <p>Column-oriented nature of ClickHouse allows having hundreds or thousands of columns per table without slowing down SELECT queries. It's possible to pack even more data in by leveraging wide range data organizing options, such as arrays, tuples and nested data structures.</p>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg">
-                <div class="bg-number">3</div>
-                <h4>Join distributed or co-located data</h4>
-                <p>ClickHouse provides various options for joining tables. Joins could be either cluster local, they can also access data stored in external systems. There's also an external dictionaries support that provides an alternative more simple syntax for accessing data from an outside source.</p>
-            </div>
-            <div class="col-lg">
-                <div class="bg-number">4</div>
-                <h4>Approximate query processing</h4>
-                <p>Users can control the trade-off between result accuracy and query execution time, which is handy when dealing with multiple terabytes or petabytes of data. ClickHouse also provides probabilistic data structures for fast and memory-efficient calculation of cardinalities and quantiles</p>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/scalable.html b/website/templates/index/scalable.html
deleted file mode 100644
index 672a02f202b..00000000000
--- a/website/templates/index/scalable.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg">
-                <h2 id="linearly-scalable" class="display-4 mt-5">Linearly scalable</h2>
-                <p class="lead">ClickHouse scales well both vertically and horizontally. ClickHouse is easily adaptable to perform either on a cluster with hundreds or thousands of nodes or on a single server or even on a tiny virtual machine. Currently, there are installations with more multiple trillion rows or hundreds of terabytes of data per single node.</p>
-                <p class="lead">
-                    There are many ClickHouse clusters consisting of multiple hundred nodes, including few clusters of Yandex Metrica, while the largest known ClickHouse cluster is well over a thousand nodes.
-                </p>
-            </div>
-            <div class="col-lg">
-                <img data-src="/images/index/linearly-scalable.svg" alt="Lineraly scalable" title="Linearly scalable" class="mt-5" />
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/success.html b/website/templates/index/success.html
index a93efa8bdc5..8ab32b06ac9 100644
--- a/website/templates/index/success.html
+++ b/website/templates/index/success.html
@@ -1,72 +1,246 @@
-<div class="bg-light py-5 my-5">
-    <div class="container text-center">
-        <h2 id="success-stories" class="display-4">Success stories</h2>
-        <div class="row">
-            <div class="col-lg-4 py-3">
-                <a href="docs/en/introduction/history/" class="text-reset text-decoration-none">
-                    <div class="card py-3 dots-lb">
-                        <div class="card-body">
-                            <h4 class="card-title">Yandex Metrica</h4>
-                            <p class="card-text text-muted">The original usecase</p>
+<div class="section bg-white pt-10 pt-lg-15">
+    <div class="container">
+
+        <h2 class="display-2 mb-5 mb-md-8 mb-lg-10 text-center text-lg-left">
+            What users are saying
+        </h2>
+        
+        <div class="case-study-cards">
+            <div>
+
+                <div class="card case-study-card is-large open-right">
+                    <div class="case-study-card-wrap">
+
+                        <div class="card-body case-study-card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-yandex.png" height="40" width="108" title="Yandex" style="aspect-ratio: 108 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                                    
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('ClickHouse was born and in production inside Yandex over a decade ago and now stores 10’s of trillions of rows of data serving a query throughput of 2TB per second for Yandex Metrica. It has also become the de facto standard inside Yandex for advertising systems, monitoring and observability data, business intelligence, recommendations platforms, OLAP, and even cars telemetry.') }}</p>
+                                    
+                                    <a class="trailing-link" href="/docs/en/introduction/history/">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Stores 10’s of trillions of rows of data</li>
+                                        <li class="font-weight-bold">Query throughput of 2TB per second</li>
+                                        <li class="font-weight-bold">Became de facto standard inside Yandex</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
                         </div>
+
                     </div>
-                </a>
+                </div>
+                
             </div>
-            <div class="col-lg-4 py-3">
-                <a href="https://eng.uber.com/logging/" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-cc">
-                        <div class="card-body">
-                            <h4 class="card-title">Log Platform</h4>
-                            <p class="card-text text-muted">at Uber</p>
+            <div>
+
+                <div class="card case-study-card is-large open-left">
+                    <div class="case-study-card-wrap">
+                            
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-uber.png" height="40" width="114" title="Uber" style="aspect-ratio: 114 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                                    
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('Uber moved it’s logging platform to ClickHouse increasing developer productivity and overall reliability of the platform while seeing 3x data compression, 10x performance increase, and ½ the reduction in hardware cost.') }}</p>
+        
+                                    <a class="trailing-link" href="https://eng.uber.com/logging/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">3x data compression</li>
+                                        <li class="font-weight-bold">10x performance increase</li>
+                                        <li class="font-weight-bold">½ the reduction in hardware cost</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
                         </div>
+
                     </div>
-                </a>
+                </div>
+                
             </div>
-            <div class="col-lg-4 py-3">
-                <a href="https://tech.ebayinc.com/engineering/ou-online-analytical-processing/" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-rb">
-                        <div class="card-body">
-                            <h4 class="card-title">Analytical Processing</h4>
-                            <p class="card-text text-muted">at eBay</p>
+            <div>
+
+                <div class="card case-study-card is-large open-right">
+                    <div class="case-study-card-wrap">
+                            
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-ebay.png" height="40" width="100" title="eBay" style="aspect-ratio: 100 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('eBay adopted ClickHouse for their real time OLAP events (Logs + Metrics) infrastructure. The simplified architecture with ClickHouse allowed them to reduce their DevOps activity and troubleshooting, reduced the overall infrastructure by 90%%, and they saw a stronger integration with Grafana and ClickHouse for visualization and alerting.') }}</p>
+        
+                                    <a class="trailing-link" href="https://tech.ebayinc.com/engineering/ou-online-analytical-processing/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Reduced DevOps activity and troubleshooting</li>
+                                        <li class="font-weight-bold">10 times less hardware</li>
+                                        <li class="font-weight-bold">Stronger integration with Grafana</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
                         </div>
+
                     </div>
-                </a>
+                </div>
+                
+            </div>
+            <div>
+
+                <div class="card case-study-card is-large open-left">
+                    <div class="case-study-card-wrap">
+                            
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-cloudflare.svg" height="40" width="246" title="Cloudflare" style="aspect-ratio: 246 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                            
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('Cloudflare was having challenges scaling their CitusDB-based system which had a high TCO and maintenance costs due to the complex architecture. By moving their HTTP analytics data to ClickHouse they were able to scale to 8M requests per second, deleted 10’s of thousands of lines of code, reduced their MTTR, and saw a 7x improvement on customer queries per second they could serve.') }}</p>
+        
+                                    <a class="trailing-link" href="https://blog.cloudflare.com/http-analytics-for-6m-requests-per-second-using-clickhouse/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Scaled to 8M requests per second</li>
+                                        <li class="font-weight-bold">Reduced their MTTR</li>
+                                        <li class="font-weight-bold">7x improvement on query throughput</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
+                        </div>
+                    
+                    </div>
+                </div>
+                
+            </div>
+            <div>
+
+                <div class="card case-study-card is-large open-right">
+                    <div class="case-study-card-wrap">
+
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-spotify.png" height="40" width="134" title="Spotify" style="aspect-ratio: 134 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                                    
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('Spotify\'s A/B Experimentation platform is serving thousands of sub-second queries per second on petabyte-scale datasets with Clickhouse. They reduced the amount of low-variance work by an order of magnitude and enabled feature teams to self-serve insights by introducing a unified SQL interface for Data Platform and tools for automatic decision making for Experimentation.') }}</p>
+        
+                                    <a class="trailing-link" href="https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Reduced the amount of low-variance work</li>
+                                        <li class="font-weight-bold">Enabled feature teams to self-serve insights</li>
+                                        <li class="font-weight-bold">Tools for automatic decision making</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+                </div>
+                
+            </div>
+            <div>
+
+                <div class="card case-study-card is-large open-left">
+                    <div class="case-study-card-wrap">
+
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-deutsche-bank.png" height="40" width="204" title="Deutsche Bank" style="aspect-ratio: 204 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                            
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('ClickHouse helps serve the Client Analytics platform for reporting, deep data analysis as well as advanced data science to provide Deutsche Bank’s front office a clear view on their client\'s activity and profitability.') }}</p>
+        
+                                    <a class="trailing-link" href="https://bigdatadays.ru/wp-content/uploads/2019/10/D2-H3-3_Yakunin-Goihburg.pdf" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Platform for reporting and deep data analysis</li>
+                                        <li class="font-weight-bold">Advanced data science</li>
+                                        <li class="font-weight-bold">Provide clear view of client's activity and profitability</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+                </div>
+                
             </div>
         </div>
-        <div class="row">
-            <div class="col-lg-4 py-3">
-                <a href="https://blog.cloudflare.com/http-analytics-for-6m-requests-per-second-using-clickhouse/" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-rb">
-                        <div class="card-body">
-                            <h4 class="card-title">HTTP and DNS analytics</h4>
-                            <p class="card-text text-muted">at Cloudflare</p>
-                        </div>
-                    </div>
-                </a>
-            </div>
-            <div class="col-lg-4 py-3">
-                <a href="https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-rhb">
-                        <div class="card-body">
-                            <h4 class="card-title">Experimentation</h4>
-                            <p class="card-text text-muted">at Spotify</p>
-                        </div>
-                    </div>
-                </a>
-            </div>
-            <div class="col-lg-4 py-3">
-                <a href="https://bigdatadays.ru/wp-content/uploads/2019/10/D2-H3-3_Yakunin-Goihburg.pdf" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-lb">
-                        <div class="card-body">
-                            <h4 class="card-title">Business Intelligence</h4>
-                            <p class="card-text text-muted">at Deutsche Bank</p>
-                        </div>
-                    </div>
-                </a>
-            </div>
-        </div>
-        <div class="row">
-            <a href="docs/en/introduction/adopters/" class="btn btn-lg btn-outline-orange mx-auto mt-3" role="button">Show more</a>
-        </div>
+        
     </div>
 </div>
diff --git a/website/templates/index/use.html b/website/templates/index/use.html
deleted file mode 100644
index 6fa27782acc..00000000000
--- a/website/templates/index/use.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="bg-light py-5 my-5">
-    <div class="container">
-        <div class="row mb-5">
-            <div class="col-lg">
-                <h2 class="display-5">When to use ClickHouse</h2>
-                <p>For analytics over a stream of clean, well structured and immutable events or logs.
-            It is recommended to put each such stream into a single wide fact table with pre-joined dimensions.</p>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled mb-0 mb-lg-1">
-                    <li>✓ Web and App analytics</li>
-                    <li>✓ Advertising networks and RTB</li>
-                    <li>✓ Telecommunications</li>
-                    <li>✓ E-commerce and finance</li>
-                    <li>✓ Information security</li>
-                </ul>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled">
-                    <li>✓ Monitoring and telemetry</li>
-                    <li>✓ Time series</li>
-                    <li>✓ Business intelligence</li>
-                    <li>✓ Online games</li>
-                    <li>✓ Internet of Things</li>
-                </ul>
-            </div>
-        </div>
-        <div class="row text-red">
-            <div class="col-lg">
-                <h2 class="display-5">When NOT to use ClickHouse</h2>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled mb-0 mb-lg-1">
-                    <li>✕ Transactional workloads (OLTP)</li>
-                    <li>✕ Key-value requests with a high rate</li>
-                </ul>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled">
-                    <li>✕ Blob or document storage</li>
-                    <li>✕ Over-normalized data</li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/why.html b/website/templates/index/why.html
index 0364b9198cc..a4a3c603168 100644
--- a/website/templates/index/why.html
+++ b/website/templates/index/why.html
@@ -1,40 +1,42 @@
-<div>
-    <div class="container my-5 py-3 text-lg-left text-center">
-        <div class="row mb-5">
-            <div class="col-lg text-center">
-                <h2 class="display-4">Why ClickHouse might be the right choice?</h2>
+<div class="section">
+    <div class="container">
+
+        <hr class="mb-10 mx-auto" style="max-width: 600px;">
+
+        <h2 class="display-2 text-center mb-3">
+            Why ClickHouse
+        </h2>
+
+        <p class="lead text-muted text-center mb-5 mb-md-8 mb-lg-10 mx-auto" style="max-width:740px;">
+            {{ _('Our feature rich and hardware efficient OLAP data management system is the right choice for your organization.') }}
+        </p>
+
+        <div class="row mb-5 mb-md-8 mb-lg-10">
+            <div class="col-lg-6 mb-5 mb-md-8 mb-lg-0 mx-auto mx-lg-0 d-flex flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
+                <img class="icon" src="/images/icons/icon-performance.svg">
+                <h3 class="display-3">Performance</h3>
+                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse supports best in the industry query performance, while significantly reducing storage requirements through our innovative use of columnar storage and compression.</p>
+                <hr class="is-yellow mt-auto">
             </div>
-        </div>
-        <div class="row mb-5">
-            <div class="col-lg-1">
-                <img data-src="images/index/flash.svg" alt="Blazing fast" title="Blazing fast" />
-            </div>
-            <div class="col-lg-5">
-                <h3 class="display-5">Blazing fast</h3>
-                <p>ClickHouse uses all available hardware to its full potential to process each query as fast as possible. Peak processing performance for a single query stands at more than 2&nbsp;terabytes per second <span class="text-muted">(after decompression, only used columns)</span>. In distributed setup reads are automatically balanced among healthy replicas to avoid increasing latency.</p>
-            </div>
-            <div class="col-lg-1">
-                <img data-src="images/index/safe.svg" alt="Fault tolerant" title="Fault tolerant" />
-            </div>
-            <div class="col-lg-5">
-                <h3 id="fault-tolerant" class="display-5">Fault-tolerant</h3>
-                <p>ClickHouse supports multi-master asynchronous replication and can be deployed across multiple datacenters. All nodes are equal, which allows avoiding having single points of failure. Downtime of a single node or the whole datacenter won't affect the system's availability for both reads and writes.</p>
+            <div class="col-lg-6 d-flex mx-auto mx-lg-0 flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
+                <img class="icon" src="/images/icons/icon-scalability.svg">
+                <h3 class="display-3">Scalability</h3>
+                <p class="font-lg text-muted mb-3" style="max-width: 440px;">Battle tested in production, with linear horizontal scalability from single-server deployments to clusters with many thousands of nodes.</p>
+                <hr class="is-yellow mt-auto">
             </div>
         </div>
         <div class="row">
-            <div class="col-lg-1">
-                <img data-src="images/index/heart.svg" alt="Easy to use" title="Easy to use" />
+            <div class="col-lg-6 mb-5 mb-md-8 mb-lg-0 mx-auto mx-lg-0 d-flex flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
+                <img class="icon" src="/images/icons/icon-reliability.svg">
+                <h3 class="display-3">Reliability</h3>
+                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse deployments feature best in class availability. There are no single points of failure, with the architecture supporting multi-master replication, performing effectively in multi-region configurations.</p>
+                <hr class="is-yellow mt-auto">
             </div>
-            <div class="col-lg-5">
-                <h3 class="display-5">Easy to use</h3>
-                <p>ClickHouse is simple and works out-of-the-box. It streamlines all your data processing: ingest all your structured data into the system and it becomes instantly available for building reports. SQL dialect allows expressing the desired result without involving any custom non-standard API that could be found in some alternative systems.</p>
-            </div>
-            <div class="col-lg-1">
-                <img data-src="images/index/shield.svg" alt="Highly reliable" title="Highly reliable" width="60" />
-            </div>
-            <div class="col-lg-5">
-                <h3 id="highly-reliable" class="display-5">Highly reliable</h3>
-                <p>ClickHouse DBMS can be configured as a purely distributed system located on independent nodes, without any single points of failure. It also includes a lot of enterprise-grade security features and fail-safe mechanisms against human errors.</p>
+            <div class="col-lg-6 d-flex mx-auto mx-lg-0 flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
+                <img class="icon" src="/images/icons/icon-security.svg">
+                <h3 class="display-3">Security</h3>
+                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse comes with enterprise grade security features and fail-safe mechanisms protecting against data corruption from application bugs and human errors.</p>
+                <hr class="is-yellow mt-auto">
             </div>
         </div>
     </div>
diff --git a/website/thank-you/index.html b/website/thank-you/index.html
new file mode 100644
index 00000000000..2f1a172e277
--- /dev/null
+++ b/website/thank-you/index.html
@@ -0,0 +1,25 @@
+{% set prefetch_items = [
+    ('/docs/en/', 'document')
+] %}
+
+{% extends "templates/base.html" %}
+
+{% block extra_meta %}
+{% include "templates/common_fonts.html" %}
+{% endblock %}
+
+{% block nav %}
+
+{% include "templates/global/nav.html" %}
+
+{% endblock %}
+
+{% block content %}
+
+{% include "templates/contact-thank-you/hero.html" %}
+{% include "templates/contact-thank-you/overview.html" %}
+
+{% include "templates/global/newsletter.html" %}
+{% include "templates/global/github_stars.html" %}
+
+{% endblock %}
diff --git a/ya.make b/ya.make
deleted file mode 100644
index 7f7c1bbce2f..00000000000
--- a/ya.make
+++ /dev/null
@@ -1,12 +0,0 @@
-# What are "ya.make" files?
-# "ya.make" file is a configuration file for "ya" - an internal Yandex build system that is used to build internal Yandex monorepository.
-# We don't use nor "ya" build system neither the Yandex monorepository for development of ClickHouse and you should not pay attention to these files.
-# But ClickHouse source code is synchronized with internal Yandex monorepository, that's why "ya.make" files exist.
-
-OWNER(g:clickhouse)
-
-RECURSE(
-    base
-    programs
-    src
-)