diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56d117d05dd..83c1cbf1eb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### Table of Contents
 **[ClickHouse release v22.9, 2022-09-22](#229)**<br/>
-**[ClickHouse release v22.8, 2022-08-18](#228)**<br/>
+**[ClickHouse release v22.8-lts, 2022-08-18](#228)**<br/>
 **[ClickHouse release v22.7, 2022-07-21](#227)**<br/>
 **[ClickHouse release v22.6, 2022-06-16](#226)**<br/>
 **[ClickHouse release v22.5, 2022-05-19](#225)**<br/>
@@ -10,10 +10,10 @@
 **[ClickHouse release v22.1, 2022-01-18](#221)**<br/>
 **[Changelog for 2021](https://clickhouse.com/docs/en/whats-new/changelog/2021/)**<br/>
 
-
 ### <a id="229"></a> ClickHouse release 22.9, 2022-09-22
 
 #### Backward Incompatible Change
+
 * Upgrade from 20.3 and older to 22.9 and newer should be done through an intermediate version if there are any `ReplicatedMergeTree` tables, otherwise server with the new version will not start. [#40641](https://github.com/ClickHouse/ClickHouse/pull/40641) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Remove the functions `accurate_Cast` and `accurate_CastOrNull` (they are different to `accurateCast` and `accurateCastOrNull` by underscore in the name and they are not affected by the value of `cast_keep_nullable` setting). These functions were undocumented, untested, unused, and unneeded. They appeared to be alive due to code generalization. [#40682](https://github.com/ClickHouse/ClickHouse/pull/40682) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Add a test to ensure that every new table function will be documented. See [#40649](https://github.com/ClickHouse/ClickHouse/issues/40649). Rename table function `MeiliSearch` to `meilisearch`. [#40709](https://github.com/ClickHouse/ClickHouse/pull/40709) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -21,6 +21,7 @@
 * Make interpretation of YAML configs to be more conventional. [#41044](https://github.com/ClickHouse/ClickHouse/pull/41044) ([Vitaly Baranov](https://github.com/vitlibar)).
 
 #### New Feature
+
 * Support `insert_quorum = 'auto'` to use majority number. [#39970](https://github.com/ClickHouse/ClickHouse/pull/39970) ([Sachin](https://github.com/SachinSetiya)).
 * Add embedded dashboards to ClickHouse server. This is a demo project about how to achieve 90% results with 1% effort using ClickHouse features. [#40461](https://github.com/ClickHouse/ClickHouse/pull/40461) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Added new settings constraint writability kind `changeable_in_readonly`. [#40631](https://github.com/ClickHouse/ClickHouse/pull/40631) ([Sergei Trifonov](https://github.com/serxa)).
@@ -38,6 +39,7 @@
 * Improvement for in-memory data parts: remove completely processed WAL files. [#40592](https://github.com/ClickHouse/ClickHouse/pull/40592) ([Azat Khuzhin](https://github.com/azat)).
 
 #### Performance Improvement
+
 * Implement compression of marks and primary key. Close [#34437](https://github.com/ClickHouse/ClickHouse/issues/34437). [#37693](https://github.com/ClickHouse/ClickHouse/pull/37693) ([zhongyuankai](https://github.com/zhongyuankai)).
 * Allow to load marks with threadpool in advance. Regulated by setting `load_marks_asynchronously` (default: 0). [#40821](https://github.com/ClickHouse/ClickHouse/pull/40821) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Virtual filesystem over s3 will use random object names split into multiple path prefixes for better performance on AWS. [#40968](https://github.com/ClickHouse/ClickHouse/pull/40968) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -58,6 +60,7 @@
 * Parallel hash JOIN for Float data types might be suboptimal. Make it better. [#41183](https://github.com/ClickHouse/ClickHouse/pull/41183) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
 #### Improvement
+
 * During startup and ATTACH call, `ReplicatedMergeTree` tables will be readonly until the ZooKeeper connection is made and the setup is finished. [#40148](https://github.com/ClickHouse/ClickHouse/pull/40148) ([Antonio Andelic](https://github.com/antonio2368)).
 * Add `enable_extended_results_for_datetime_functions` option to return results of type Date32 for functions toStartOfYear, toStartOfISOYear, toStartOfQuarter, toStartOfMonth, toStartOfWeek, toMonday and toLastDayOfMonth when argument is Date32 or DateTime64, otherwise results of Date type are returned. For compatibility reasons default value is ‘0’. [#41214](https://github.com/ClickHouse/ClickHouse/pull/41214) ([Roman Vasin](https://github.com/rvasin)).
 * For security and stability reasons, CatBoost models are no longer evaluated within the ClickHouse server. Instead, the evaluation is now done in the clickhouse-library-bridge, a separate process that loads the catboost library and communicates with the server process via HTTP. [#40897](https://github.com/ClickHouse/ClickHouse/pull/40897) ([Robert Schulze](https://github.com/rschu1ze)). [#39629](https://github.com/ClickHouse/ClickHouse/pull/39629) ([Robert Schulze](https://github.com/rschu1ze)).
@@ -108,6 +111,7 @@
 * Add `has_lightweight_delete` to system.parts. [#41564](https://github.com/ClickHouse/ClickHouse/pull/41564) ([Kseniia Sumarokova](https://github.com/kssenii)).
 
 #### Build/Testing/Packaging Improvement
+
 * Enforce documentation for every setting. [#40644](https://github.com/ClickHouse/ClickHouse/pull/40644) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Enforce documentation for every current metric. [#40645](https://github.com/ClickHouse/ClickHouse/pull/40645) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Enforce documentation for every profile event counter. Write the documentation where it was missing. [#40646](https://github.com/ClickHouse/ClickHouse/pull/40646) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -217,15 +221,16 @@
 * Fix read bytes/rows in X-ClickHouse-Summary with materialized views. [#41586](https://github.com/ClickHouse/ClickHouse/pull/41586) ([Raúl Marín](https://github.com/Algunenano)).
 * Fix possible `pipeline stuck` exception for queries with `OFFSET`. The error was found with `enable_optimize_predicate_expression = 0` and always false condition in `WHERE`. Fixes [#41383](https://github.com/ClickHouse/ClickHouse/issues/41383). [#41588](https://github.com/ClickHouse/ClickHouse/pull/41588) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
-
-### <a id="228"></a> ClickHouse release 22.8, 2022-08-18
+### <a id="228"></a> ClickHouse release 22.8-lts, 2022-08-18
 
 #### Backward Incompatible Change
+
 * Extended range of `Date32` and `DateTime64` to support dates from the year 1900 to 2299. In previous versions, the supported interval was only from the year 1925 to 2283. The implementation is using the proleptic Gregorian calendar (which is conformant with [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601):2004 (clause 3.2.1 The Gregorian calendar)) instead of accounting for historical transitions from the Julian to the Gregorian calendar. This change affects implementation-specific behavior for out-of-range arguments. E.g. if in previous versions the value of `1899-01-01` was clamped to `1925-01-01`, in the new version it will be clamped to `1900-01-01`. It changes the behavior of rounding with `toStartOfInterval` if you pass `INTERVAL 3 QUARTER` up to one quarter because the intervals are counted from an implementation-specific point of time. Closes [#28216](https://github.com/ClickHouse/ClickHouse/issues/28216), improves [#38393](https://github.com/ClickHouse/ClickHouse/issues/38393). [#39425](https://github.com/ClickHouse/ClickHouse/pull/39425) ([Roman Vasin](https://github.com/rvasin)).
 * Now, all relevant dictionary sources respect `remote_url_allow_hosts` setting. It was already done for HTTP, Cassandra, Redis. Added ClickHouse, MongoDB, MySQL, PostgreSQL. Host is checked only for dictionaries created from DDL. [#39184](https://github.com/ClickHouse/ClickHouse/pull/39184) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Make the remote filesystem cache composable, allow not to evict certain files (regarding idx, mrk, ..), delete old cache version. Now it is possible to configure cache over Azure blob storage disk, over Local disk, over StaticWeb disk, etc. This PR is marked backward incompatible because cache configuration changes and in order for cache to work need to update the config file. Old cache will still be used with new configuration. The server will startup fine with the old cache configuration. Closes https://github.com/ClickHouse/ClickHouse/issues/36140. Closes https://github.com/ClickHouse/ClickHouse/issues/37889. ([Kseniia Sumarokova](https://github.com/kssenii)). [#36171](https://github.com/ClickHouse/ClickHouse/pull/36171))
 
 #### New Feature
+
 * Query parameters can be set in interactive mode as `SET param_abc = 'def'` and transferred via the native protocol as settings. [#39906](https://github.com/ClickHouse/ClickHouse/pull/39906) ([Nikita Taranov](https://github.com/nickitat)).
 * Quota key can be set in the native protocol ([Yakov Olkhovsky](https://github.com/ClickHouse/ClickHouse/pull/39874)).
 * Added a setting `exact_rows_before_limit` (0/1). When enabled, ClickHouse will provide exact value for `rows_before_limit_at_least` statistic, but with the cost that the data before limit will have to be read completely. This closes [#6613](https://github.com/ClickHouse/ClickHouse/issues/6613). [#25333](https://github.com/ClickHouse/ClickHouse/pull/25333) ([kevin wan](https://github.com/MaxWk)).
@@ -240,12 +245,14 @@
 * Add new setting schema_inference_hints that allows to specify structure hints in schema inference for specific columns. Closes [#39569](https://github.com/ClickHouse/ClickHouse/issues/39569). [#40068](https://github.com/ClickHouse/ClickHouse/pull/40068) ([Kruglov Pavel](https://github.com/Avogar)).
 
 #### Experimental Feature
+
 * Support SQL standard DELETE FROM syntax on merge tree tables and lightweight delete implementation for merge tree families. [#37893](https://github.com/ClickHouse/ClickHouse/pull/37893) ([Jianmei Zhang](https://github.com/zhangjmruc)) ([Alexander Gololobov](https://github.com/davenger)). Note: this new feature does not make ClickHouse an HTAP DBMS.
 
 #### Performance Improvement
+
 * Improved memory usage during memory efficient merging of aggregation results. [#39429](https://github.com/ClickHouse/ClickHouse/pull/39429) ([Nikita Taranov](https://github.com/nickitat)).
 * Added concurrency control logic to limit total number of concurrent threads created by queries. [#37558](https://github.com/ClickHouse/ClickHouse/pull/37558) ([Sergei Trifonov](https://github.com/serxa)). Add `concurrent_threads_soft_limit parameter` to increase performance in case of high QPS by means of limiting total number of threads for all queries. [#37285](https://github.com/ClickHouse/ClickHouse/pull/37285) ([Roman Vasin](https://github.com/rvasin)).
-* Add `SLRU` cache policy for uncompressed cache and marks cache. ([Kseniia Sumarokova](https://github.com/kssenii)). [#34651](https://github.com/ClickHouse/ClickHouse/pull/34651) ([alexX512](https://github.com/alexX512)). Decoupling local cache function and cache algorithm [#38048](https://github.com/ClickHouse/ClickHouse/pull/38048) ([Han Shukai](https://github.com/KinderRiven)). 
+* Add `SLRU` cache policy for uncompressed cache and marks cache. ([Kseniia Sumarokova](https://github.com/kssenii)). [#34651](https://github.com/ClickHouse/ClickHouse/pull/34651) ([alexX512](https://github.com/alexX512)). Decoupling local cache function and cache algorithm [#38048](https://github.com/ClickHouse/ClickHouse/pull/38048) ([Han Shukai](https://github.com/KinderRiven)).
 * Intel® In-Memory Analytics Accelerator (Intel® IAA) is a hardware accelerator available in the upcoming generation of Intel® Xeon® Scalable processors ("Sapphire Rapids"). Its goal is to speed up common operations in analytics like data (de)compression and filtering. ClickHouse gained the new "DeflateQpl" compression codec which utilizes the Intel® IAA offloading technology to provide a high-performance DEFLATE implementation. The codec uses the [Intel® Query Processing Library (QPL)](https://github.com/intel/qpl) which abstracts access to the hardware accelerator, respectively to a software fallback in case the hardware accelerator is not available. DEFLATE provides in general higher compression rates than ClickHouse's LZ4 default codec, and as a result, offers less disk I/O and lower main memory consumption. [#36654](https://github.com/ClickHouse/ClickHouse/pull/36654) ([jasperzhu](https://github.com/jinjunzh)). [#39494](https://github.com/ClickHouse/ClickHouse/pull/39494) ([Robert Schulze](https://github.com/rschu1ze)).
 * `DISTINCT` in order with `ORDER BY`: Deduce way to sort based on input stream sort description. Skip sorting if input stream is already sorted. [#38719](https://github.com/ClickHouse/ClickHouse/pull/38719) ([Igor Nikonov](https://github.com/devcrafter)). Improve memory usage (significantly) and query execution time + use `DistinctSortedChunkTransform` for final distinct when `DISTINCT` columns match `ORDER BY` columns, but rename to `DistinctSortedStreamTransform` in `EXPLAIN PIPELINE` → this improves memory usage significantly + remove unnecessary allocations in hot loop in `DistinctSortedChunkTransform`. [#39432](https://github.com/ClickHouse/ClickHouse/pull/39432) ([Igor Nikonov](https://github.com/devcrafter)). Use `DistinctSortedTransform` only when sort description is applicable to DISTINCT columns, otherwise fall back to ordinary DISTINCT implementation + it allows making less checks during `DistinctSortedTransform` execution. [#39528](https://github.com/ClickHouse/ClickHouse/pull/39528) ([Igor Nikonov](https://github.com/devcrafter)). Fix: `DistinctSortedTransform` didn't take advantage of sorting. It never cleared HashSet since clearing_columns were detected incorrectly (always empty). So, it basically worked as ordinary `DISTINCT` (`DistinctTransform`). The fix reduces memory usage significantly. [#39538](https://github.com/ClickHouse/ClickHouse/pull/39538) ([Igor Nikonov](https://github.com/devcrafter)).
 * Use local node as first priority to get structure of remote table when executing `cluster` and similar table functions. [#39440](https://github.com/ClickHouse/ClickHouse/pull/39440) ([Mingliang Pan](https://github.com/liangliangpan)).
@@ -256,6 +263,7 @@
 * Improve bytes to bits mask transform for SSE/AVX/AVX512. [#39586](https://github.com/ClickHouse/ClickHouse/pull/39586) ([Guo Wangyang](https://github.com/guowangy)).
 
 #### Improvement
+
 * Normalize `AggregateFunction` types and state representations because optimizations like [#35788](https://github.com/ClickHouse/ClickHouse/pull/35788) will treat `count(not null columns)` as `count()`, which might confuses distributed interpreters with the following error : `Conversion from AggregateFunction(count) to AggregateFunction(count, Int64) is not supported`. [#39420](https://github.com/ClickHouse/ClickHouse/pull/39420) ([Amos Bird](https://github.com/amosbird)). The functions with identical states can be used in materialized views interchangeably.
 * Rework and simplify the `system.backups` table, remove the `internal` column, allow user to set the ID of operation, add columns `num_files`, `uncompressed_size`, `compressed_size`, `start_time`, `end_time`. [#39503](https://github.com/ClickHouse/ClickHouse/pull/39503) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Improved structure of DDL query result table for `Replicated` database (separate columns with shard and replica name, more clear status) - `CREATE TABLE ... ON CLUSTER` queries can be normalized on initiator first if `distributed_ddl_entry_format_version` is set to 3 (default value). It means that `ON CLUSTER` queries may not work if initiator does not belong to the cluster that specified in query. Fixes [#37318](https://github.com/ClickHouse/ClickHouse/issues/37318), [#39500](https://github.com/ClickHouse/ClickHouse/issues/39500) - Ignore `ON CLUSTER` clause if database is `Replicated` and cluster name equals to database name. Related to [#35570](https://github.com/ClickHouse/ClickHouse/issues/35570) - Miscellaneous minor fixes for `Replicated` database engine - Check metadata consistency when starting up `Replicated` database, start replica recovery in case of mismatch of local metadata and metadata in Keeper. Resolves [#24880](https://github.com/ClickHouse/ClickHouse/issues/24880). [#37198](https://github.com/ClickHouse/ClickHouse/pull/37198) ([Alexander Tokmakov](https://github.com/tavplubix)).
@@ -294,6 +302,7 @@
 * Add support for LARGE_BINARY/LARGE_STRING with Arrow (Closes [#32401](https://github.com/ClickHouse/ClickHouse/issues/32401)). [#40293](https://github.com/ClickHouse/ClickHouse/pull/40293) ([Josh Taylor](https://github.com/joshuataylor)).
 
 #### Build/Testing/Packaging Improvement
+
 * [ClickFiddle](https://fiddle.clickhouse.com/): A new tool for testing ClickHouse versions in read/write mode (**Igor Baliuk**).
 * ClickHouse binary is made self-extracting [#35775](https://github.com/ClickHouse/ClickHouse/pull/35775) ([Yakov Olkhovskiy, Arthur Filatenkov](https://github.com/yakov-olkhovskiy)).
 * Update tzdata to 2022b to support the new timezone changes. See https://github.com/google/cctz/pull/226. Chile's 2022 DST start is delayed from September 4 to September 11. Iran plans to stop observing DST permanently, after it falls back on 2022-09-21. There are corrections of the historical time zone of Asia/Tehran in the year 1977: Iran adopted standard time in 1935, not 1946. In 1977 it observed DST from 03-21 23:00 to 10-20 24:00; its 1978 transitions were on 03-24 and 08-05, not 03-20 and 10-20; and its spring 1979 transition was on 05-27, not 03-21 (https://data.iana.org/time-zones/tzdb/NEWS). ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -308,6 +317,7 @@
 * Docker: Now entrypoint.sh in docker image creates and executes chown for all folders it found in config for multidisk setup [#17717](https://github.com/ClickHouse/ClickHouse/issues/17717). [#39121](https://github.com/ClickHouse/ClickHouse/pull/39121) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 
 #### Bug Fix
+
 * Fix possible segfault in `CapnProto` input format. This bug was found and send through ClickHouse bug-bounty [program](https://github.com/ClickHouse/ClickHouse/issues/38986) by *kiojj*. [#40241](https://github.com/ClickHouse/ClickHouse/pull/40241) ([Kruglov Pavel](https://github.com/Avogar)).
 * Fix a very rare case of incorrect behavior of array subscript operator. This closes [#28720](https://github.com/ClickHouse/ClickHouse/issues/28720). [#40185](https://github.com/ClickHouse/ClickHouse/pull/40185) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Fix insufficient argument check for encryption functions (found by query fuzzer). This closes [#39987](https://github.com/ClickHouse/ClickHouse/issues/39987). [#40194](https://github.com/ClickHouse/ClickHouse/pull/40194) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -358,16 +368,17 @@
 * A fix for reverse DNS resolution. [#40134](https://github.com/ClickHouse/ClickHouse/pull/40134) ([Arthur Passos](https://github.com/arthurpassos)).
 * Fix unexpected result `arrayDifference` of `Array(UInt32). [#40211](https://github.com/ClickHouse/ClickHouse/pull/40211) ([Duc Canh Le](https://github.com/canhld94)).
 
-
 ### <a id="227"></a> ClickHouse release 22.7, 2022-07-21
 
 #### Upgrade Notes
+
 * Enable setting `enable_positional_arguments` by default. It allows queries like `SELECT ... ORDER BY 1, 2` where 1, 2 are the references to the select clause. If you need to return the old behavior, disable this setting. [#38204](https://github.com/ClickHouse/ClickHouse/pull/38204) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Disable `format_csv_allow_single_quotes` by default. See [#37096](https://github.com/ClickHouse/ClickHouse/issues/37096). ([Kruglov Pavel](https://github.com/Avogar)).
 * `Ordinary` database engine and old storage definition syntax for `*MergeTree` tables are deprecated. By default it's not possible to create new databases with `Ordinary` engine. If `system` database has `Ordinary` engine it will be automatically converted to `Atomic` on server startup. There are settings to keep old behavior (`allow_deprecated_database_ordinary` and `allow_deprecated_syntax_for_merge_tree`), but these settings may be removed in future releases. [#38335](https://github.com/ClickHouse/ClickHouse/pull/38335) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Force rewriting comma join to inner by default (set default value `cross_to_inner_join_rewrite = 2`). To have old behavior set `cross_to_inner_join_rewrite = 1`. [#39326](https://github.com/ClickHouse/ClickHouse/pull/39326) ([Vladimir C](https://github.com/vdimir)). If you will face any incompatibilities, you can turn this setting back.
 
 #### New Feature
+
 * Support expressions with window functions. Closes [#19857](https://github.com/ClickHouse/ClickHouse/issues/19857). [#37848](https://github.com/ClickHouse/ClickHouse/pull/37848) ([Dmitry Novik](https://github.com/novikd)).
 * Add new `direct` join algorithm for `EmbeddedRocksDB` tables, see [#33582](https://github.com/ClickHouse/ClickHouse/issues/33582). [#35363](https://github.com/ClickHouse/ClickHouse/pull/35363) ([Vladimir C](https://github.com/vdimir)).
 * Added full sorting merge join algorithm. [#35796](https://github.com/ClickHouse/ClickHouse/pull/35796) ([Vladimir C](https://github.com/vdimir)).
@@ -395,9 +406,11 @@
 * Add `clickhouse-diagnostics` binary to the packages. [#38647](https://github.com/ClickHouse/ClickHouse/pull/38647) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
 #### Experimental Feature
+
 * Adds new setting `implicit_transaction` to run standalone queries inside a transaction. It handles both creation and closing (via COMMIT if the query succeeded or ROLLBACK if it didn't) of the transaction automatically. [#38344](https://github.com/ClickHouse/ClickHouse/pull/38344) ([Raúl Marín](https://github.com/Algunenano)).
 
 #### Performance Improvement
+
 * Distinct optimization for sorted columns. Use specialized distinct transformation in case input stream is sorted by column(s) in distinct. Optimization can be applied to pre-distinct, final distinct, or both. Initial implementation by @dimarub2000. [#37803](https://github.com/ClickHouse/ClickHouse/pull/37803) ([Igor Nikonov](https://github.com/devcrafter)).
 * Improve performance of `ORDER BY`, `MergeTree` merges, window functions using batch version of `BinaryHeap`. [#38022](https://github.com/ClickHouse/ClickHouse/pull/38022) ([Maksim Kita](https://github.com/kitaisreal)).
 * More parallel execution for queries with `FINAL` [#36396](https://github.com/ClickHouse/ClickHouse/pull/36396) ([Nikita Taranov](https://github.com/nickitat)).
@@ -407,7 +420,7 @@
 * Improve performance of insertion to columns of type `JSON`. [#38320](https://github.com/ClickHouse/ClickHouse/pull/38320) ([Anton Popov](https://github.com/CurtizJ)).
 * Optimized insertion and lookups in the HashTable. [#38413](https://github.com/ClickHouse/ClickHouse/pull/38413) ([Nikita Taranov](https://github.com/nickitat)).
 * Fix performance degradation from [#32493](https://github.com/ClickHouse/ClickHouse/issues/32493). [#38417](https://github.com/ClickHouse/ClickHouse/pull/38417) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Improve performance of joining with numeric columns using SIMD instructions. [#37235](https://github.com/ClickHouse/ClickHouse/pull/37235) ([zzachimed](https://github.com/zzachimed)). [#38565](https://github.com/ClickHouse/ClickHouse/pull/38565) ([Maksim Kita](https://github.com/kitaisreal)). 
+* Improve performance of joining with numeric columns using SIMD instructions. [#37235](https://github.com/ClickHouse/ClickHouse/pull/37235) ([zzachimed](https://github.com/zzachimed)). [#38565](https://github.com/ClickHouse/ClickHouse/pull/38565) ([Maksim Kita](https://github.com/kitaisreal)).
 * Norm and Distance functions for arrays speed up 1.2-2 times. [#38740](https://github.com/ClickHouse/ClickHouse/pull/38740) ([Alexander Gololobov](https://github.com/davenger)).
 * Add AVX-512 VBMI optimized `copyOverlap32Shuffle` for LZ4 decompression. In other words, LZ4 decompression performance is improved. [#37891](https://github.com/ClickHouse/ClickHouse/pull/37891) ([Guo Wangyang](https://github.com/guowangy)).
 * `ORDER BY (a, b)` will use all the same benefits as `ORDER BY a, b`. [#38873](https://github.com/ClickHouse/ClickHouse/pull/38873) ([Igor Nikonov](https://github.com/devcrafter)).
@@ -419,6 +432,7 @@
 * The table `system.asynchronous_metric_log` is further optimized for storage space. This closes [#38134](https://github.com/ClickHouse/ClickHouse/issues/38134). See the [YouTube video](https://www.youtube.com/watch?v=0fSp9SF8N8A). [#38428](https://github.com/ClickHouse/ClickHouse/pull/38428) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
 #### Improvement
+
 * Support SQL standard CREATE INDEX and DROP INDEX syntax. [#35166](https://github.com/ClickHouse/ClickHouse/pull/35166) ([Jianmei Zhang](https://github.com/zhangjmruc)).
 * Send profile events for INSERT queries (previously only SELECT was supported). [#37391](https://github.com/ClickHouse/ClickHouse/pull/37391) ([Azat Khuzhin](https://github.com/azat)).
 * Implement in order aggregation (`optimize_aggregation_in_order`) for fully materialized projections. [#37469](https://github.com/ClickHouse/ClickHouse/pull/37469) ([Azat Khuzhin](https://github.com/azat)).
@@ -464,6 +478,7 @@
 * Allow to declare `RabbitMQ` queue without default arguments `x-max-length` and `x-overflow`. [#39259](https://github.com/ClickHouse/ClickHouse/pull/39259) ([rnbondarenko](https://github.com/rnbondarenko)).
 
 #### Build/Testing/Packaging Improvement
+
 * Apply Clang Thread Safety Analysis (TSA) annotations to ClickHouse. [#38068](https://github.com/ClickHouse/ClickHouse/pull/38068) ([Robert Schulze](https://github.com/rschu1ze)).
 * Adapt universal installation script for FreeBSD. [#39302](https://github.com/ClickHouse/ClickHouse/pull/39302) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Preparation for building on `s390x` platform. [#39193](https://github.com/ClickHouse/ClickHouse/pull/39193) ([Harry Lee](https://github.com/HarryLeeIBM)).
@@ -473,6 +488,7 @@
 * Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 
 #### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
 * Fix rounding for `Decimal128/Decimal256` with more than 19-digits long scale. [#38027](https://github.com/ClickHouse/ClickHouse/pull/38027) ([Igor Nikonov](https://github.com/devcrafter)).
 * Fixed crash caused by data race in storage `Hive` (integration table engine). [#38887](https://github.com/ClickHouse/ClickHouse/pull/38887) ([lgbo](https://github.com/lgbo-ustc)).
 * Fix crash when executing GRANT ALL ON *.* with ON CLUSTER. It was broken in https://github.com/ClickHouse/ClickHouse/pull/35767. This closes [#38618](https://github.com/ClickHouse/ClickHouse/issues/38618). [#38674](https://github.com/ClickHouse/ClickHouse/pull/38674) ([Vitaly Baranov](https://github.com/vitlibar)).
@@ -529,6 +545,7 @@
 ### <a id="226"></a> ClickHouse release 22.6, 2022-06-16
 
 #### Backward Incompatible Change
+
 * Remove support for octal number literals in SQL. In previous versions they were parsed as Float64. [#37765](https://github.com/ClickHouse/ClickHouse/pull/37765) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Changes how settings using `seconds` as type are parsed to support floating point values (for example: `max_execution_time=0.5`). Infinity or NaN values will throw an exception. [#37187](https://github.com/ClickHouse/ClickHouse/pull/37187) ([Raúl Marín](https://github.com/Algunenano)).
 * Changed format of binary serialization of columns of experimental type `Object`. New format is more convenient to implement by third-party clients. [#37482](https://github.com/ClickHouse/ClickHouse/pull/37482) ([Anton Popov](https://github.com/CurtizJ)).
@@ -537,6 +554,7 @@
 * If you run different ClickHouse versions on a cluster with AArch64 CPU or mix AArch64 and amd64 on a cluster, and use distributed queries with GROUP BY multiple keys of fixed-size type that fit in 256 bits but don't fit in 64 bits, and the size of the result is huge, the data will not be fully aggregated in the result of these queries during upgrade. Workaround: upgrade with downtime instead of a rolling upgrade.
 
 #### New Feature
+
 * Add `GROUPING` function. It allows to disambiguate the records in the queries with `ROLLUP`, `CUBE` or `GROUPING SETS`. Closes [#19426](https://github.com/ClickHouse/ClickHouse/issues/19426). [#37163](https://github.com/ClickHouse/ClickHouse/pull/37163) ([Dmitry Novik](https://github.com/novikd)).
 * A new codec [FPC](https://userweb.cs.txstate.edu/~burtscher/papers/dcc07a.pdf) algorithm for floating point data compression. [#37553](https://github.com/ClickHouse/ClickHouse/pull/37553) ([Mikhail Guzov](https://github.com/koloshmet)).
 * Add new columnar JSON formats: `JSONColumns`, `JSONCompactColumns`, `JSONColumnsWithMetadata`. Closes [#36338](https://github.com/ClickHouse/ClickHouse/issues/36338) Closes [#34509](https://github.com/ClickHouse/ClickHouse/issues/34509). [#36975](https://github.com/ClickHouse/ClickHouse/pull/36975) ([Kruglov Pavel](https://github.com/Avogar)).
@@ -557,11 +575,13 @@
 * Added `SYSTEM UNFREEZE` query that deletes the whole backup regardless if the corresponding table is deleted or not. [#36424](https://github.com/ClickHouse/ClickHouse/pull/36424) ([Vadim Volodin](https://github.com/PolyProgrammist)).
 
 #### Experimental Feature
+
 * Enables `POPULATE` for `WINDOW VIEW`. [#36945](https://github.com/ClickHouse/ClickHouse/pull/36945) ([vxider](https://github.com/Vxider)).
 * `ALTER TABLE ... MODIFY QUERY` support for `WINDOW VIEW`. [#37188](https://github.com/ClickHouse/ClickHouse/pull/37188) ([vxider](https://github.com/Vxider)).
 * This PR changes the behavior of the `ENGINE` syntax in `WINDOW VIEW`, to make it like in `MATERIALIZED VIEW`. [#37214](https://github.com/ClickHouse/ClickHouse/pull/37214) ([vxider](https://github.com/Vxider)).
 
 #### Performance Improvement
+
 * Added numerous optimizations for ARM NEON [#38093](https://github.com/ClickHouse/ClickHouse/pull/38093)([Daniel Kutenin](https://github.com/danlark1)), ([Alexandra Pilipyuk](https://github.com/chalice19)) Note: if you run different ClickHouse versions on a cluster with ARM CPU and use distributed queries with GROUP BY multiple keys of fixed-size type that fit in 256 bits but don't fit in 64 bits, the result of the aggregation query will be wrong during upgrade. Workaround: upgrade with downtime instead of a rolling upgrade.
 * Improve performance and memory usage for select of subset of columns for formats Native, Protobuf, CapnProto, JSONEachRow, TSKV, all formats with suffixes WithNames/WithNamesAndTypes. Previously while selecting only subset of columns from files in these formats all columns were read and stored in memory. Now only required columns are read. This PR enables setting `input_format_skip_unknown_fields` by default, because otherwise in case of select of subset of columns exception will be thrown. [#37192](https://github.com/ClickHouse/ClickHouse/pull/37192) ([Kruglov Pavel](https://github.com/Avogar)).
 * Now more filters can be pushed down for join. [#37472](https://github.com/ClickHouse/ClickHouse/pull/37472) ([Amos Bird](https://github.com/amosbird)).
@@ -592,6 +612,7 @@
 * In function: CompressedWriteBuffer::nextImpl(), there is an unnecessary write-copy step that would happen frequently during inserting data. Below shows the differentiation with this patch: - Before: 1. Compress "working_buffer" into "compressed_buffer" 2. write-copy into "out" - After: Directly Compress "working_buffer" into "out". [#37242](https://github.com/ClickHouse/ClickHouse/pull/37242) ([jasperzhu](https://github.com/jinjunzh)).
 
 #### Improvement
+
 * Support types with non-standard defaults in ROLLUP, CUBE, GROUPING SETS. Closes [#37360](https://github.com/ClickHouse/ClickHouse/issues/37360). [#37667](https://github.com/ClickHouse/ClickHouse/pull/37667) ([Dmitry Novik](https://github.com/novikd)).
 * Fix stack traces collection on ARM. Closes [#37044](https://github.com/ClickHouse/ClickHouse/issues/37044). Closes [#15638](https://github.com/ClickHouse/ClickHouse/issues/15638). [#37797](https://github.com/ClickHouse/ClickHouse/pull/37797) ([Maksim Kita](https://github.com/kitaisreal)).
 * Client will try every IP address returned by DNS resolution until successful connection. [#37273](https://github.com/ClickHouse/ClickHouse/pull/37273) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
@@ -633,6 +654,7 @@
 * Add implicit grants with grant option too. For example `GRANT CREATE TABLE ON test.* TO A WITH GRANT OPTION` now allows `A` to execute `GRANT CREATE VIEW ON test.* TO B`. [#38017](https://github.com/ClickHouse/ClickHouse/pull/38017) ([Vitaly Baranov](https://github.com/vitlibar)).
 
 #### Build/Testing/Packaging Improvement
+
 * Use `clang-14` and LLVM infrastructure version 14 for builds. This closes [#34681](https://github.com/ClickHouse/ClickHouse/issues/34681). [#34754](https://github.com/ClickHouse/ClickHouse/pull/34754) ([Alexey Milovidov](https://github.com/alexey-milovidov)). Note: `clang-14` has [a bug](https://github.com/google/sanitizers/issues/1540) in ThreadSanitizer that makes our CI work worse.
 * Allow to drop privileges at startup. This simplifies Docker images. Closes [#36293](https://github.com/ClickHouse/ClickHouse/issues/36293). [#36341](https://github.com/ClickHouse/ClickHouse/pull/36341) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Add docs spellcheck to CI. [#37790](https://github.com/ClickHouse/ClickHouse/pull/37790) ([Vladimir C](https://github.com/vdimir)).
@@ -690,7 +712,6 @@
 * Fix possible heap-use-after-free error when reading system.projection_parts and system.projection_parts_columns . This fixes [#37184](https://github.com/ClickHouse/ClickHouse/issues/37184). [#37185](https://github.com/ClickHouse/ClickHouse/pull/37185) ([Amos Bird](https://github.com/amosbird)).
 * Fixed `DateTime64` fractional seconds behavior prior to Unix epoch. [#37697](https://github.com/ClickHouse/ClickHouse/pull/37697) ([Andrey Zvonov](https://github.com/zvonand)). [#37039](https://github.com/ClickHouse/ClickHouse/pull/37039) ([李扬](https://github.com/taiyang-li)).
 
-
 ### <a id="225"></a> ClickHouse release 22.5, 2022-05-19
 
 #### Upgrade Notes
@@ -743,7 +764,7 @@
 * Implement partial GROUP BY key for optimize_aggregation_in_order. [#35111](https://github.com/ClickHouse/ClickHouse/pull/35111) ([Azat Khuzhin](https://github.com/azat)).
 
 #### Improvement
- 
+
 * Show names of erroneous files in case of parsing errors while executing table functions `file`, `s3` and `url`. [#36314](https://github.com/ClickHouse/ClickHouse/pull/36314) ([Anton Popov](https://github.com/CurtizJ)).
 * Allowed to increase the number of threads for executing background operations (merges, mutations, moves and fetches) at runtime if they are specified at top level config. [#36425](https://github.com/ClickHouse/ClickHouse/pull/36425) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Now date time conversion functions that generates time before 1970-01-01 00:00:00 with partial hours/minutes timezones will be saturated to zero instead of overflow. This is the continuation of https://github.com/ClickHouse/ClickHouse/pull/29953 which addresses https://github.com/ClickHouse/ClickHouse/pull/29953#discussion_r800550280 . Mark as improvement because it's implementation defined behavior (and very rare case) and we are allowed to break it. [#36656](https://github.com/ClickHouse/ClickHouse/pull/36656) ([Amos Bird](https://github.com/amosbird)).
@@ -852,7 +873,6 @@
 * Fix ALTER DROP COLUMN of nested column with compact parts (i.e. `ALTER TABLE x DROP COLUMN n`, when there is column `n.d`). [#35797](https://github.com/ClickHouse/ClickHouse/pull/35797) ([Azat Khuzhin](https://github.com/azat)).
 * Fix substring function range error length when `offset` and `length` is negative constant and `s` is not constant. [#33861](https://github.com/ClickHouse/ClickHouse/pull/33861) ([RogerYK](https://github.com/RogerYK)).
 
-
 ### <a id="224"></a> ClickHouse release 22.4, 2022-04-19
 
 #### Backward Incompatible Change
@@ -1004,8 +1024,7 @@
 * Fix mutations in tables with enabled sparse columns. [#35284](https://github.com/ClickHouse/ClickHouse/pull/35284) ([Anton Popov](https://github.com/CurtizJ)).
 * Do not delay final part writing by default (fixes possible `Memory limit exceeded` during `INSERT` by adding `max_insert_delayed_streams_for_parallel_write` with default to 1000 for writes to s3 and disabled as before otherwise). [#34780](https://github.com/ClickHouse/ClickHouse/pull/34780) ([Azat Khuzhin](https://github.com/azat)).
 
-
-## <a id="223"></a> ClickHouse release v22.3-lts, 2022-03-17
+### <a id="223"></a> ClickHouse release v22.3-lts, 2022-03-17
 
 #### Backward Incompatible Change
 
@@ -1132,7 +1151,6 @@
 * Fix incorrect result of trivial count query when part movement feature is used [#34089](https://github.com/ClickHouse/ClickHouse/issues/34089). [#34385](https://github.com/ClickHouse/ClickHouse/pull/34385) ([nvartolomei](https://github.com/nvartolomei)).
 * Fix inconsistency of `max_query_size` limitation in distributed subqueries. [#34078](https://github.com/ClickHouse/ClickHouse/pull/34078) ([Chao Ma](https://github.com/godliness)).
 
-
 ### <a id="222"></a> ClickHouse release v22.2, 2022-02-17
 
 #### Upgrade Notes
@@ -1308,7 +1326,6 @@
 * Fix issue [#18206](https://github.com/ClickHouse/ClickHouse/issues/18206). [#33977](https://github.com/ClickHouse/ClickHouse/pull/33977) ([Vitaly Baranov](https://github.com/vitlibar)).
 * This PR allows using multiple LDAP storages in the same list of user directories. It worked earlier but was broken because LDAP tests are disabled (they are part of the testflows tests). [#33574](https://github.com/ClickHouse/ClickHouse/pull/33574) ([Vitaly Baranov](https://github.com/vitlibar)).
 
-
 ### <a id="221"></a> ClickHouse release v22.1, 2022-01-18
 
 #### Upgrade Notes
@@ -1335,7 +1352,6 @@
 * Add function `decodeURLFormComponent` slightly different to `decodeURLComponent`. Close [#10298](https://github.com/ClickHouse/ClickHouse/issues/10298). [#33451](https://github.com/ClickHouse/ClickHouse/pull/33451) ([SuperDJY](https://github.com/cmsxbc)).
 * Allow to split `GraphiteMergeTree` rollup rules for plain/tagged metrics (optional rule_type field). [#33494](https://github.com/ClickHouse/ClickHouse/pull/33494) ([Michail Safronov](https://github.com/msaf1980)).
 
-
 #### Performance Improvement
 
 * Support moving conditions to `PREWHERE` (setting `optimize_move_to_prewhere`) for tables of `Merge` engine if its all underlying tables supports `PREWHERE`. [#33300](https://github.com/ClickHouse/ClickHouse/pull/33300) ([Anton Popov](https://github.com/CurtizJ)).
@@ -1351,7 +1367,6 @@
 * Optimize selecting of MergeTree parts that can be moved between volumes. [#33225](https://github.com/ClickHouse/ClickHouse/pull/33225) ([OnePiece](https://github.com/zhongyuankai)).
 * Fix `sparse_hashed` dict performance with sequential keys (wrong hash function). [#32536](https://github.com/ClickHouse/ClickHouse/pull/32536) ([Azat Khuzhin](https://github.com/azat)).
 
-
 #### Experimental Feature
 
 * Parallel reading from multiple replicas within a shard during distributed query without using sample key. To enable this, set `allow_experimental_parallel_reading_from_replicas = 1` and `max_parallel_replicas` to any number. This closes [#26748](https://github.com/ClickHouse/ClickHouse/issues/26748). [#29279](https://github.com/ClickHouse/ClickHouse/pull/29279) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
@@ -1364,7 +1379,6 @@
 * Fix ACL with explicit digit hash in `clickhouse-keeper`: now the behavior consistent with ZooKeeper and generated digest is always accepted. [#33249](https://github.com/ClickHouse/ClickHouse/pull/33249) ([小路](https://github.com/nicelulu)). [#33246](https://github.com/ClickHouse/ClickHouse/pull/33246).
 * Fix unexpected projection removal when detaching parts. [#32067](https://github.com/ClickHouse/ClickHouse/pull/32067) ([Amos Bird](https://github.com/amosbird)).
 
-
 #### Improvement
 
 * Now date time conversion functions that generates time before `1970-01-01 00:00:00` will be saturated to zero instead of overflow. [#29953](https://github.com/ClickHouse/ClickHouse/pull/29953) ([Amos Bird](https://github.com/amosbird)). It also fixes a bug in index analysis if date truncation function would yield result before the Unix epoch.
@@ -1411,7 +1425,6 @@
 * Updating `modification_time` for data part in `system.parts` after part movement [#32964](https://github.com/ClickHouse/ClickHouse/issues/32964). [#32965](https://github.com/ClickHouse/ClickHouse/pull/32965) ([save-my-heart](https://github.com/save-my-heart)).
 * Potential issue, cannot be exploited: integer overflow may happen in array resize. [#33024](https://github.com/ClickHouse/ClickHouse/pull/33024) ([varadarajkumar](https://github.com/varadarajkumar)).
 
-
 #### Build/Testing/Packaging Improvement
 
 * Add packages, functional tests and Docker builds for AArch64 (ARM) version of ClickHouse. [#32911](https://github.com/ClickHouse/ClickHouse/pull/32911) ([Mikhail f. Shiryaev](https://github.com/Felixoid)). [#32415](https://github.com/ClickHouse/ClickHouse/pull/32415)
@@ -1426,7 +1439,6 @@
 * Inject git information into clickhouse binary file. So we can get source code revision easily from clickhouse binary file. [#33124](https://github.com/ClickHouse/ClickHouse/pull/33124) ([taiyang-li](https://github.com/taiyang-li)).
 * Remove obsolete code from ConfigProcessor. Yandex specific code is not used anymore. The code contained one minor defect. This defect was reported by [Mallik Hassan](https://github.com/SadiHassan) in [#33032](https://github.com/ClickHouse/ClickHouse/issues/33032). This closes [#33032](https://github.com/ClickHouse/ClickHouse/issues/33032). [#33026](https://github.com/ClickHouse/ClickHouse/pull/33026) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 
-
 #### Bug Fix (user-visible misbehavior in official stable or prestable release)
 
 * Several fixes for format parsing. This is relevant if `clickhouse-server` is open for write access to adversary. Specifically crafted input data for `Native` format may lead to reading uninitialized memory or crash. This is relevant if `clickhouse-server` is open for write access to adversary. [#33050](https://github.com/ClickHouse/ClickHouse/pull/33050) ([Heena Bansal](https://github.com/HeenaBansal2009)). Fixed Apache Avro Union type index out of boundary issue in Apache Avro binary format. [#33022](https://github.com/ClickHouse/ClickHouse/pull/33022) ([Harry Lee](https://github.com/HarryLeeIBM)). Fix null pointer dereference in `LowCardinality` data when deserializing `LowCardinality` data in the Native format. [#33021](https://github.com/ClickHouse/ClickHouse/pull/33021) ([Harry Lee](https://github.com/HarryLeeIBM)).
@@ -1485,5 +1497,4 @@
 * Fix possible crash (or incorrect result) in case of `LowCardinality` arguments of window function. Fixes [#31114](https://github.com/ClickHouse/ClickHouse/issues/31114). [#31888](https://github.com/ClickHouse/ClickHouse/pull/31888) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix hang up with command `DROP TABLE system.query_log sync`. [#33293](https://github.com/ClickHouse/ClickHouse/pull/33293) ([zhanghuajie](https://github.com/zhanghuajieHIT)).
 
-
 ## [Changelog for 2021](https://clickhouse.com/docs/en/whats-new/changelog/2021)
diff --git a/README.md b/README.md
index 9f4a39a2c97..003b78a3cbb 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ ClickHouse® is an open-source column-oriented database management system that a
 * [Documentation](https://clickhouse.com/docs/en/) provides more in-depth information.
 * [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
 * [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg) and [Telegram](https://telegram.me/clickhouse_en) allow chatting with ClickHouse users in real-time.
-* [Blog](https://clickhouse.com/blog/en/) contains various ClickHouse-related articles, as well as announcements and reports about events.
+* [Blog](https://clickhouse.com/blog/) contains various ClickHouse-related articles, as well as announcements and reports about events.
 * [Code Browser (Woboq)](https://clickhouse.com/codebrowser/ClickHouse/index.html) with syntax highlight and navigation.
 * [Code Browser (github.dev)](https://github.dev/ClickHouse/ClickHouse) with syntax highlight, powered by github.dev.
 * [Contacts](https://clickhouse.com/company/contact) can help to get your questions answered if there are any.
diff --git a/base/base/ReplxxLineReader.cpp b/base/base/ReplxxLineReader.cpp
index a014fa4b8f2..e0dc81af5b0 100644
--- a/base/base/ReplxxLineReader.cpp
+++ b/base/base/ReplxxLineReader.cpp
@@ -151,7 +151,7 @@ public:
     {
         size_t dot_pos = path.rfind('.');
         if (dot_pos != std::string::npos)
-            fd = ::mkstemps(path.data(), path.size() - dot_pos);
+            fd = ::mkstemps(path.data(), static_cast<int>(path.size() - dot_pos));
         else
             fd = ::mkstemp(path.data());
 
@@ -408,7 +408,7 @@ ReplxxLineReader::ReplxxLineReader(
             // In a simplest case use simple comment.
             commented_line = fmt::format("-- {}", state.text());
         }
-        rx.set_state(replxx::Replxx::State(commented_line.c_str(), commented_line.size()));
+        rx.set_state(replxx::Replxx::State(commented_line.c_str(), static_cast<int>(commented_line.size())));
 
         return rx.invoke(Replxx::ACTION::COMMIT_LINE, code);
     };
@@ -480,7 +480,7 @@ void ReplxxLineReader::openEditor()
         if (executeCommand(argv) == 0)
         {
             const std::string & new_query = readFile(editor_file.getPath());
-            rx.set_state(replxx::Replxx::State(new_query.c_str(), new_query.size()));
+            rx.set_state(replxx::Replxx::State(new_query.c_str(), static_cast<int>(new_query.size())));
         }
     }
     catch (const std::runtime_error & e)
@@ -526,7 +526,7 @@ void ReplxxLineReader::openInteractiveHistorySearch()
         {
             std::string new_query = readFile(output_file.getPath());
             rightTrim(new_query);
-            rx.set_state(replxx::Replxx::State(new_query.c_str(), new_query.size()));
+            rx.set_state(replxx::Replxx::State(new_query.c_str(), static_cast<int>(new_query.size())));
         }
     }
     catch (const std::runtime_error & e)
diff --git a/base/base/StringRef.h b/base/base/StringRef.h
index 5ee197021ca..a3e32ff5058 100644
--- a/base/base/StringRef.h
+++ b/base/base/StringRef.h
@@ -265,7 +265,7 @@ inline size_t hashLessThan16(const char * data, size_t size)
 
 struct CRC32Hash
 {
-    size_t operator() (StringRef x) const
+    unsigned operator() (StringRef x) const
     {
         const char * pos = x.data;
         size_t size = x.size;
@@ -275,22 +275,22 @@ struct CRC32Hash
 
         if (size < 8)
         {
-            return hashLessThan8(x.data, x.size);
+            return static_cast<unsigned>(hashLessThan8(x.data, x.size));
         }
 
         const char * end = pos + size;
-        size_t res = -1ULL;
+        unsigned res = -1U;
 
         do
         {
             UInt64 word = unalignedLoad<UInt64>(pos);
-            res = CRC_INT(res, word);
+            res = static_cast<unsigned>(CRC_INT(res, word));
 
             pos += 8;
         } while (pos + 8 < end);
 
         UInt64 word = unalignedLoad<UInt64>(end - 8);    /// I'm not sure if this is normal.
-        res = CRC_INT(res, word);
+        res = static_cast<unsigned>(CRC_INT(res, word));
 
         return res;
     }
@@ -302,7 +302,7 @@ struct StringRefHash : CRC32Hash {};
 
 struct CRC32Hash
 {
-    size_t operator() (StringRef /* x */) const
+    unsigned operator() (StringRef /* x */) const
     {
        throw std::logic_error{"Not implemented CRC32Hash without SSE"};
     }
diff --git a/base/base/itoa.h b/base/base/itoa.h
index 5e0b18d50c0..dd3e3cc96fe 100644
--- a/base/base/itoa.h
+++ b/base/base/itoa.h
@@ -122,7 +122,7 @@ QuotientAndRemainder<N> static inline split(UnsignedOfSize<N> value)
     constexpr DivisionBy10PowN<N> division;
 
     UnsignedOfSize<N> quotient = (division.multiplier * (UnsignedOfSize<2 * N>(value) + division.add)) >> division.shift;
-    UnsignedOfSize<N / 2> remainder = value - quotient * pow10<UnsignedOfSize<N / 2>>(N);
+    UnsignedOfSize<N / 2> remainder = static_cast<UnsignedOfSize<N / 2>>(value - quotient * pow10<UnsignedOfSize<N / 2>>(N));
 
     return {quotient, remainder};
 }
diff --git a/base/base/safeExit.cpp b/base/base/safeExit.cpp
index e4f9e80759e..ddb93dac65b 100644
--- a/base/base/safeExit.cpp
+++ b/base/base/safeExit.cpp
@@ -1,10 +1,8 @@
 #if defined(OS_LINUX)
 #    include <sys/syscall.h>
 #endif
-#include <cstdlib>
 #include <unistd.h>
 #include <base/safeExit.h>
-#include <base/defines.h>
 
 [[noreturn]] void safeExit(int code)
 {
diff --git a/base/base/wide_integer_impl.h b/base/base/wide_integer_impl.h
index eb2edcb98ff..1b5f502722c 100644
--- a/base/base/wide_integer_impl.h
+++ b/base/base/wide_integer_impl.h
@@ -227,6 +227,8 @@ struct integer<Bits, Signed>::_impl
     template <typename T>
     __attribute__((no_sanitize("undefined"))) constexpr static auto to_Integral(T f) noexcept
     {
+        /// NOTE: this can be called with DB::Decimal, and in this case, result
+        /// will be wrong
         if constexpr (std::is_signed_v<T>)
             return static_cast<int64_t>(f);
         else
diff --git a/cmake/cpu_features.cmake b/cmake/cpu_features.cmake
index 6707d703372..7cba7c7548d 100644
--- a/cmake/cpu_features.cmake
+++ b/cmake/cpu_features.cmake
@@ -61,8 +61,14 @@ elseif (ARCH_AARCH64)
     endif ()
 
 elseif (ARCH_PPC64LE)
+    # By Default, build for power8 and up, allow building for power9 and up
     # Note that gcc and clang have support for x86 SSE2 intrinsics when building for PowerPC
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -mcpu=power8 -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
+    option (POWER9 "Build for Power 9 CPU and above" 0)
+    if(POWER9)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -mcpu=power9 -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
+    else ()
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -mcpu=power8 -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
+    endif ()
 
 elseif (ARCH_AMD64)
     option (ENABLE_SSSE3 "Use SSSE3 instructions on x86_64" 1)
diff --git a/cmake/ld.lld.in b/cmake/ld.lld.in
index 9736dab1bc3..78a264a0089 100755
--- a/cmake/ld.lld.in
+++ b/cmake/ld.lld.in
@@ -3,15 +3,15 @@
 # This is a workaround for bug in llvm/clang,
 # that does not produce .debug_aranges with LTO
 #
-# NOTE: this is a temporary solution, that should be removed once [1] will be
-# resolved.
+# NOTE: this is a temporary solution, that should be removed after upgrading to
+# clang-16/llvm-16.
 #
-#   [1]: https://discourse.llvm.org/t/clang-does-not-produce-full-debug-aranges-section-with-thinlto/64898/8
+# Refs: https://reviews.llvm.org/D133092
 
 # NOTE: only -flto=thin is supported.
 # NOTE: it is not possible to check was there -gdwarf-aranges initially or not.
 if [[ "$*" =~ -plugin-opt=thinlto ]]; then
-    exec "@LLD_PATH@" -mllvm -generate-arange-section "$@"
+    exec "@LLD_PATH@" -plugin-opt=-generate-arange-section "$@"
 else
     exec "@LLD_PATH@" "$@"
 fi
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 57d39899a40..8a17d97cf13 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -117,7 +117,7 @@ endif()
 # Archiver
 
 if (COMPILER_GCC)
-    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-14" "llvm-ar-13" "llvm-ar-12")
+    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-15" "llvm-ar-14" "llvm-ar-13" "llvm-ar-12")
 else ()
     find_program (LLVM_AR_PATH NAMES "llvm-ar-${COMPILER_VERSION_MAJOR}" "llvm-ar")
 endif ()
@@ -131,7 +131,7 @@ message(STATUS "Using archiver: ${CMAKE_AR}")
 # Ranlib
 
 if (COMPILER_GCC)
-    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-14" "llvm-ranlib-13" "llvm-ranlib-12")
+    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-15" "llvm-ranlib-14" "llvm-ranlib-13" "llvm-ranlib-12")
 else ()
     find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib-${COMPILER_VERSION_MAJOR}" "llvm-ranlib")
 endif ()
@@ -145,7 +145,7 @@ message(STATUS "Using ranlib: ${CMAKE_RANLIB}")
 # Install Name Tool
 
 if (COMPILER_GCC)
-    find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool" "llvm-install-name-tool-14" "llvm-install-name-tool-13" "llvm-install-name-tool-12")
+    find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool" "llvm-install-name-tool-15" "llvm-install-name-tool-14" "llvm-install-name-tool-13" "llvm-install-name-tool-12")
 else ()
     find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool-${COMPILER_VERSION_MAJOR}" "llvm-install-name-tool")
 endif ()
@@ -159,7 +159,7 @@ message(STATUS "Using install-name-tool: ${CMAKE_INSTALL_NAME_TOOL}")
 # Objcopy
 
 if (COMPILER_GCC)
-    find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-14" "llvm-objcopy-13" "llvm-objcopy-12" "objcopy")
+    find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-15" "llvm-objcopy-14" "llvm-objcopy-13" "llvm-objcopy-12" "objcopy")
 else ()
     find_program (OBJCOPY_PATH NAMES "llvm-objcopy-${COMPILER_VERSION_MAJOR}" "llvm-objcopy" "objcopy")
 endif ()
@@ -173,7 +173,7 @@ endif ()
 # Strip
 
 if (COMPILER_GCC)
-    find_program (STRIP_PATH NAMES "llvm-strip" "llvm-strip-14" "llvm-strip-13" "llvm-strip-12" "strip")
+    find_program (STRIP_PATH NAMES "llvm-strip" "llvm-strip-15" "llvm-strip-14" "llvm-strip-13" "llvm-strip-12" "strip")
 else ()
     find_program (STRIP_PATH NAMES "llvm-strip-${COMPILER_VERSION_MAJOR}" "llvm-strip" "strip")
 endif ()
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index 89f3a62ba2e..8364b0c2c08 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -27,7 +27,6 @@ if (COMPILER_CLANG)
     no_warning(sign-conversion)
     no_warning(implicit-int-conversion)
     no_warning(implicit-int-float-conversion)
-    no_warning(shorten-64-to-32)
     no_warning(ctad-maybe-unsupported) # clang 9+, linux-only
     no_warning(disabled-macro-expansion)
     no_warning(documentation-unknown-command)
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index f914c0d2d3f..c2b16ae6dd6 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -114,6 +114,7 @@ if (ENABLE_TESTS)
 endif()
 
 add_contrib (llvm-project-cmake llvm-project)
+add_contrib (libfuzzer-cmake llvm-project)
 add_contrib (libxml2-cmake libxml2)
 add_contrib (aws-s3-cmake
     aws
diff --git a/contrib/libfuzzer-cmake/CMakeLists.txt b/contrib/libfuzzer-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..ff3a91d828e
--- /dev/null
+++ b/contrib/libfuzzer-cmake/CMakeLists.txt
@@ -0,0 +1,35 @@
+set(COMPILER_RT_FUZZER_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/compiler-rt/lib/fuzzer")
+
+set(FUZZER_SRCS
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerCrossOver.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerDataFlowTrace.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerDriver.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsDlsym.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsWeak.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtFunctionsWindows.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCounters.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCountersDarwin.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerExtraCountersWindows.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerFork.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIO.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIOPosix.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerIOWindows.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerLoop.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMerge.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMutate.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerSHA1.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerTracePC.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtil.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilDarwin.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilFuchsia.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilLinux.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilPosix.cpp"
+    "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerUtilWindows.cpp"
+)
+
+add_library(_fuzzer_no_main STATIC ${FUZZER_SRCS})
+add_library(ch_contrib::fuzzer_no_main ALIAS _fuzzer_no_main)
+
+add_library(_fuzzer STATIC ${FUZZER_SRCS} "${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerMain.cpp")
+add_library(ch_contrib::fuzzer ALIAS _fuzzer)
+
diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt
index b9dd2558348..466adf6aff0 100644
--- a/contrib/rocksdb-cmake/CMakeLists.txt
+++ b/contrib/rocksdb-cmake/CMakeLists.txt
@@ -78,23 +78,13 @@ endif()
 
 include(CheckCCompilerFlag)
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-  CHECK_C_COMPILER_FLAG("-mcpu=power9" HAS_POWER9)
-  if(HAS_POWER9)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=power9 -mtune=power9")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power9 -mtune=power9")
+  if(POWER9)
+    set(HAS_POWER9 1)
+    set(HAS_ALTIVEC 1)
   else()
-    CHECK_C_COMPILER_FLAG("-mcpu=power8" HAS_POWER8)
-    if(HAS_POWER8)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=power8 -mtune=power8")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power8 -mtune=power8")
-    endif(HAS_POWER8)
-  endif(HAS_POWER9)
-  CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC)
-  if(HAS_ALTIVEC)
-    message(STATUS " HAS_ALTIVEC yes")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maltivec")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maltivec")
-  endif(HAS_ALTIVEC)
+    set(HAS_POWER8 1)
+    set(HAS_ALTIVEC 1)
+  endif(POWER9)
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
 
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64|ARM64")
diff --git a/docker/test/codebrowser/Dockerfile b/docker/test/codebrowser/Dockerfile
index ceed93c3ac7..b76b8234c81 100644
--- a/docker/test/codebrowser/Dockerfile
+++ b/docker/test/codebrowser/Dockerfile
@@ -36,10 +36,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # repo versions doesn't work correctly with C++17
 # also we push reports to s3, so we add index.html to subfolder urls
 # https://github.com/ClickHouse-Extras/woboq_codebrowser/commit/37e15eaf377b920acb0b48dbe82471be9203f76b
-# TODO: remove branch in a few weeks after merge, e.g. in May or June 2022
-#
-# FIXME: update location of a repo
-RUN git clone https://github.com/azat/woboq_codebrowser --branch llvm-15 \
+RUN git clone https://github.com/ClickHouse/woboq_codebrowser \
   && cd woboq_codebrowser \
   && cmake . -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-${LLVM_VERSION} -DCMAKE_C_COMPILER=clang-${LLVM_VERSION} \
   && ninja \
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
old mode 100755
new mode 100644
index 6b9954c2431..27c96acbae1
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -47,7 +47,6 @@ function install_packages()
 
 function configure()
 {
-    export ZOOKEEPER_FAULT_INJECTION=1
     # install test configs
     export USE_DATABASE_ORDINARY=1
     export EXPORT_S3_STORAGE_POLICIES=1
@@ -203,6 +202,7 @@ quit
 
 install_packages package_folder
 
+export ZOOKEEPER_FAULT_INJECTION=1
 configure
 
 azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
@@ -243,6 +243,7 @@ stop
 
 # Let's enable S3 storage by default
 export USE_S3_STORAGE_FOR_MERGE_TREE=1
+export ZOOKEEPER_FAULT_INJECTION=1
 configure
 
 # But we still need default disk because some tables loaded only into it
@@ -375,6 +376,8 @@ else
     install_packages previous_release_package_folder
 
     # Start server from previous release
+    # Previous version may not be ready for fault injections
+    export ZOOKEEPER_FAULT_INJECTION=0
     configure
 
     # Avoid "Setting s3_check_objects_after_upload is neither a builtin setting..."
@@ -389,12 +392,23 @@ else
 
     clickhouse-client --query="SELECT 'Server version: ', version()"
 
-    # Install new package before running stress test because we should use new clickhouse-client and new clickhouse-test
-    # But we should leave old binary in /usr/bin/ for gdb (so it will print sane stacktarces)
+    # Install new package before running stress test because we should use new
+    # clickhouse-client and new clickhouse-test.
+    #
+    # But we should leave old binary in /usr/bin/ and debug symbols in
+    # /usr/lib/debug/usr/bin (if any) for gdb and internal DWARF parser, so it
+    # will print sane stacktraces and also to avoid possible crashes.
+    #
+    # FIXME: those files can be extracted directly from debian package, but
+    # actually better solution will be to use different PATH instead of playing
+    # games with files from packages.
     mv /usr/bin/clickhouse previous_release_package_folder/
+    mv /usr/lib/debug/usr/bin/clickhouse.debug previous_release_package_folder/
     install_packages package_folder
     mv /usr/bin/clickhouse package_folder/
+    mv /usr/lib/debug/usr/bin/clickhouse.debug package_folder/
     mv previous_release_package_folder/clickhouse /usr/bin/
+    mv previous_release_package_folder/clickhouse.debug /usr/lib/debug/usr/bin/clickhouse.debug
 
     mkdir tmp_stress_output
 
@@ -410,6 +424,8 @@ else
 
     # Start new server
     mv package_folder/clickhouse /usr/bin/
+    mv package_folder/clickhouse.debug /usr/lib/debug/usr/bin/clickhouse.debug
+    export ZOOKEEPER_FAULT_INJECTION=1
     configure
     start 500
     clickhouse-client --query "SELECT 'Backward compatibility check: Server successfully started', 'OK'" >> /test_output/test_results.tsv \
diff --git a/docker/test/util/Dockerfile b/docker/test/util/Dockerfile
index 57880bfc1d6..57544bdc090 100644
--- a/docker/test/util/Dockerfile
+++ b/docker/test/util/Dockerfile
@@ -5,6 +5,7 @@ FROM ubuntu:20.04
 ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
+# 15.0.2
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=15
 
 RUN apt-get update \
@@ -58,6 +59,9 @@ RUN apt-get update \
 RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
 # for external_symbolizer_path
 RUN ln -s /usr/bin/llvm-symbolizer-${LLVM_VERSION} /usr/bin/llvm-symbolizer
+# FIXME: workaround for "The imported target "merge-fdata" references the file" error
+# https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/-/commit/992e52c0b156a5ba9c6a8a54f8c4857ddd3d371d
+RUN sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|llvm-bolt\|merge-fdata\|MLIR\)/ {s|^|#|}' /usr/lib/llvm-${LLVM_VERSION}/lib/cmake/llvm/LLVMExports-*.cmake
 
 ARG CCACHE_VERSION=4.6.1
 RUN mkdir /tmp/ccache \
diff --git a/docs/en/development/architecture.md b/docs/en/development/architecture.md
index c13b2519b84..fe644c43889 100644
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@@ -49,27 +49,13 @@ When we calculate some function over columns in a block, we add another column w
 
 Blocks are created for every processed chunk of data. Note that for the same type of calculation, the column names and types remain the same for different blocks, and only column data changes. It is better to split block data from the block header because small block sizes have a high overhead of temporary strings for copying shared_ptrs and column names.
 
-## Block Streams {#block-streams}
+## Processors
 
-Block streams are for processing data. We use streams of blocks to read data from somewhere, perform data transformations, or write data to somewhere. `IBlockInputStream` has the `read` method to fetch the next block while available. `IBlockOutputStream` has the `write` method to push the block somewhere.
-
-Streams are responsible for:
-
-1.  Reading or writing to a table. The table just returns a stream for reading or writing blocks.
-2.  Implementing data formats. For example, if you want to output data to a terminal in `Pretty` format, you create a block output stream where you push blocks, and it formats them.
-3.  Performing data transformations. Let’s say you have `IBlockInputStream` and want to create a filtered stream. You create `FilterBlockInputStream` and initialize it with your stream. Then when you pull a block from `FilterBlockInputStream`, it pulls a block from your stream, filters it, and returns the filtered block to you. Query execution pipelines are represented this way.
-
-There are more sophisticated transformations. For example, when you pull from `AggregatingBlockInputStream`, it reads all data from its source, aggregates it, and then returns a stream of aggregated data for you. Another example: `UnionBlockInputStream` accepts many input sources in the constructor and also a number of threads. It launches multiple threads and reads from multiple sources in parallel.
-
-> Block streams use the “pull” approach to control flow: when you pull a block from the first stream, it consequently pulls the required blocks from nested streams, and the entire execution pipeline will work. Neither “pull” nor “push” is the best solution, because control flow is implicit, and that limits the implementation of various features like simultaneous execution of multiple queries (merging many pipelines together). This limitation could be overcome with coroutines or just running extra threads that wait for each other. We may have more possibilities if we make control flow explicit: if we locate the logic for passing data from one calculation unit to another outside of those calculation units. Read this [article](http://journal.stuffwithstuff.com/2013/01/13/iteration-inside-and-out/) for more thoughts.
-
-We should note that the query execution pipeline creates temporary data at each step. We try to keep block size small enough so that temporary data fits in the CPU cache. With that assumption, writing and reading temporary data is almost free in comparison with other calculations. We could consider an alternative, which is to fuse many operations in the pipeline together. It could make the pipeline as short as possible and remove much of the temporary data, which could be an advantage, but it also has drawbacks. For example, a split pipeline makes it easy to implement caching intermediate data, stealing intermediate data from similar queries running at the same time, and merging pipelines for similar queries.
+See the description at [https://github.com/ClickHouse/ClickHouse/blob/master/src/Processors/IProcessor.h](https://github.com/ClickHouse/ClickHouse/blob/master/src/Processors/IProcessor.h).
 
 ## Formats {#formats}
 
-Data formats are implemented with block streams. There are “presentational” formats only suitable for the output of data to the client, such as `Pretty` format, which provides only `IBlockOutputStream`. And there are input/output formats, such as `TabSeparated` or `JSONEachRow`.
-
-There are also row streams: `IRowInputStream` and `IRowOutputStream`. They allow you to pull/push data by individual rows, not by blocks. And they are only needed to simplify the implementation of row-oriented formats. The wrappers `BlockInputStreamFromRowInputStream` and `BlockOutputStreamFromRowOutputStream` allow you to convert row-oriented streams to regular block-oriented streams.
+Data formats are implemented with processors.
 
 ## I/O {#io}
 
diff --git a/docs/en/development/browse-code.md b/docs/en/development/browse-code.md
deleted file mode 100644
index 0d064cc9b0c..00000000000
--- a/docs/en/development/browse-code.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-slug: /en/development/browse-code
-sidebar_label: Source Code Browser
-sidebar_position: 72
-description: Various ways to browse and edit the source code
----
-
-# Browse ClickHouse Source Code 
-
-You can use the **Woboq** online code browser available [here](https://clickhouse.com/codebrowser/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.
-
-If you’re interested what IDE to use, we recommend CLion, QT Creator, VS Code and KDevelop (with caveats). You can use any favorite IDE. Vim and Emacs also count.
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 9dc7e300d45..486baac2310 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -419,6 +419,8 @@ Supported data types: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `St
 
 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.
 
+There are also special-purpose and experimental indexes to support approximate nearest neighbor (ANN) queries. See [here](annindexes.md) for details.
+
 The following functions can use the filter: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions), [notIn](../../../sql-reference/functions/in-functions), [has](../../../sql-reference/functions/array-functions#hasarr-elem), [hasAny](../../../sql-reference/functions/array-functions#hasany), [hasAll](../../../sql-reference/functions/array-functions#hasall).
 
 Example of index creation for `Map` data type
diff --git a/docs/en/operations/backup.md b/docs/en/operations/backup.md
index d26d8f27820..a755e3ef9a6 100644
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@@ -171,6 +171,55 @@ end_time:          2022-08-30 09:21:46
 1 row in set. Elapsed: 0.002 sec.
 ```
 
+## Backup to S3
+
+It is possible to `BACKUP`/`RESTORE` to S3, but this disk should be configured
+in a proper way, since by default you will need to backup metadata from local
+disk to make backup full.
+
+First of all, you need to configure S3 disk in a special way:
+
+```xml
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <s3_plain>
+                <type>s3_plain</type>
+                <endpoint></endpoint>
+                <access_key_id></access_key_id>
+                <secret_access_key></secret_access_key>
+            </s3_plain>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                </volumes>
+            </s3>
+        </policies>
+    </storage_configuration>
+
+    <backups>
+        <allowed_disk>s3_plain</allowed_disk>
+    </backups>
+</clickhouse>
+```
+
+And then `BACKUP`/`RESTORE` as usual:
+
+```sql
+BACKUP TABLE data TO Disk('s3_plain', 'cloud_backup');
+RESTORE TABLE data AS data_restored FROM Disk('s3_plain', 'cloud_backup');
+```
+
+:::note
+But keep in mind that:
+- This disk should not be used for `MergeTree` itself, only for `BACKUP`/`RESTORE`
+- It has excessive API calls
+:::
+
 ## Alternatives
 
 ClickHouse stores data on disk, and there are many ways to backup disks.  These are some alternatives that have been used in the past, and that may fit in well in your environment.
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index 76f66db924f..15fc9ef0c89 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -271,11 +271,7 @@ Result:
 The return type of `toStartOf*`, `toLastDayOfMonth`, `toMonday`, `timeSlot` functions described below is determined by the configuration parameter [enable_extended_results_for_datetime_functions](../../operations/settings/settings#enable-extended-results-for-datetime-functions) which is `0` by default.
 
 Behavior for
-* `enable_extended_results_for_datetime_functions = 0`: Functions `toStartOfYear`, `toStartOfISOYear`, `toStartOfQuarter`, `toStartOfMonth`, `toStartOfWeek`, `toLastDayOfMonth`, `toMonday` return `Date` or `DateTime`. Functions `toStartOfDay`, `toStartOfHour`, `toStartOfFifteenMinutes`, `toStartOfTenMinutes`, `toStartOfFiveMinutes`, `toStartOfMinute`, `timeSlot` return `DateTime`. Though these functions can take values of the extended types `Date32` and `DateTime64` as an argument, passing them a time outside the normal range (year 1970 to 2149 for `Date` / 2106 for `DateTime`) will produce wrong results. In case argument is out of normal range:
-  * If the argument is smaller than 1970, the result will be calculated from the argument `1970-01-01 (00:00:00)` instead.
-  * If the return type is `DateTime` and the argument is larger than `2106-02-07 08:28:15`, the result will be calculated from the argument `2106-02-07 08:28:15` instead.
-  * If the return type is `Date` and the argument is larger than `2149-06-06`, the result will be calculated from the argument `2149-06-06` instead.
-  *  If `toLastDayOfMonth` is called with an argument greater then `2149-05-31`, the result will be calculated from the argument `2149-05-31` instead.
+* `enable_extended_results_for_datetime_functions = 0`: Functions `toStartOfYear`, `toStartOfISOYear`, `toStartOfQuarter`, `toStartOfMonth`, `toStartOfWeek`, `toLastDayOfMonth`, `toMonday` return `Date` or `DateTime`. Functions `toStartOfDay`, `toStartOfHour`, `toStartOfFifteenMinutes`, `toStartOfTenMinutes`, `toStartOfFiveMinutes`, `toStartOfMinute`, `timeSlot` return `DateTime`. Though these functions can take values of the extended types `Date32` and `DateTime64` as an argument, passing them a time outside the normal range (year 1970 to 2149 for `Date` / 2106 for `DateTime`) will produce wrong results.
 * `enable_extended_results_for_datetime_functions = 1`:
   * Functions `toStartOfYear`, `toStartOfISOYear`, `toStartOfQuarter`, `toStartOfMonth`, `toStartOfWeek`, `toLastDayOfMonth`, `toMonday` return `Date` or `DateTime` if their argument is a `Date` or `DateTime`, and they return `Date32` or `DateTime64` if their argument is a `Date32` or `DateTime64`.
   * Functions `toStartOfDay`, `toStartOfHour`, `toStartOfFifteenMinutes`, `toStartOfTenMinutes`, `toStartOfFiveMinutes`, `toStartOfMinute`, `timeSlot` return `DateTime` if their argument is a `Date` or `DateTime`, and they return `DateTime64` if their argument is a `Date32` or `DateTime64`.
@@ -302,25 +298,22 @@ Returns the date.
 Rounds down a date or date with time to the first day of the month.
 Returns the date.
 
-## toLastDayOfMonth
-
-Rounds up a date or date with time to the last day of the month.
-Returns the date.
+:::note
+The behavior of parsing incorrect dates is implementation specific. ClickHouse may return zero date, throw an exception or do “natural” overflow.
+:::
 
 If `toLastDayOfMonth` is called with an argument of type `Date` greater then 2149-05-31, the result will be calculated from the argument 2149-05-31 instead.
 
 ## toMonday
 
 Rounds down a date or date with time to the nearest Monday.
-As a special case, date arguments `1970-01-01`, `1970-01-02`, `1970-01-03` and `1970-01-04` return date `1970-01-01`.
 Returns the date.
 
 ## toStartOfWeek(t\[,mode\])
 
 Rounds down a date or date with time to the nearest Sunday or Monday by mode.
 Returns the date.
-As a special case, date arguments `1970-01-01`, `1970-01-02`, `1970-01-03` and `1970-01-04` (and `1970-01-05` if `mode` is `1`) return date `1970-01-01`.
-The `mode` argument works exactly like the mode argument to toWeek(). For the single-argument syntax, a mode value of 0 is used.
+The mode argument works exactly like the mode argument to toWeek(). For the single-argument syntax, a mode value of 0 is used.
 
 ## toStartOfDay
 
@@ -671,9 +664,9 @@ Aliases: `dateDiff`, `DATE_DIFF`.
     - `quarter`
     - `year`
 
--   `startdate` — The first time value to subtract (the subtrahend). [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+-   `startdate` — The first time value to subtract (the subtrahend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
--   `enddate` — The second time value to subtract from (the minuend). [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+-   `enddate` — The second time value to subtract from (the minuend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
 -   `timezone` — [Timezone name](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) (optional). If specified, it is applied to both `startdate` and `enddate`. If not specified, timezones of `startdate` and `enddate` are used. If they are not the same, the result is unspecified. [String](../../sql-reference/data-types/string.md).
 
@@ -1075,7 +1068,7 @@ Example:
 SELECT timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600));
 SELECT timeSlots(toDateTime('1980-12-12 21:01:02', 'UTC'), toUInt32(600), 299);
 SELECT timeSlots(toDateTime64('1980-12-12 21:01:02.1234', 4, 'UTC'), toDecimal64(600.1, 1), toDecimal64(299, 0));
-```
+``` 
 ``` text
 ┌─timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600))─┐
 │ ['2012-01-01 12:00:00','2012-01-01 12:30:00']               │
@@ -1163,7 +1156,7 @@ dateName(date_part, date)
 **Arguments**
 
 -   `date_part` — Date part. Possible values: 'year', 'quarter', 'month', 'week', 'dayofyear', 'day', 'weekday', 'hour', 'minute', 'second'. [String](../../sql-reference/data-types/string.md).
--   `date` — Date. [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
+-   `date` — Date. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 -   `timezone` — Timezone. Optional. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index b80d75e3611..6490d4c2272 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -571,7 +571,7 @@ Example:
 
 ``` sql
 SELECT
-    transform(domain(Referer), ['yandex.ru', 'google.ru', 'vk.com'], ['www.yandex', 'example.com']) AS s,
+    transform(domain(Referer), ['yandex.ru', 'google.ru', 'vkontakte.ru'], ['www.yandex', 'example.com', 'vk.com']) AS s,
     count() AS c
 FROM test.hits
 GROUP BY domain(Referer)
diff --git a/docs/en/sql-reference/statements/misc.md b/docs/en/sql-reference/statements/misc.md
deleted file mode 100644
index d812dd2008a..00000000000
--- a/docs/en/sql-reference/statements/misc.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-slug: /en/sql-reference/statements/misc
-toc_hidden: true
-sidebar_position: 70
----
-
-# Miscellaneous Statements
-
--   [ATTACH](../../sql-reference/statements/attach.md)
--   [CHECK TABLE](../../sql-reference/statements/check-table.md)
--   [DESCRIBE TABLE](../../sql-reference/statements/describe-table.md)
--   [DETACH](../../sql-reference/statements/detach.md)
--   [DROP](../../sql-reference/statements/drop.md)
--   [EXISTS](../../sql-reference/statements/exists.md)
--   [KILL](../../sql-reference/statements/kill.md)
--   [OPTIMIZE](../../sql-reference/statements/optimize.md)
--   [RENAME](../../sql-reference/statements/rename.md)
--   [SET](../../sql-reference/statements/set.md)
--   [SET ROLE](../../sql-reference/statements/set-role.md)
--   [TRUNCATE](../../sql-reference/statements/truncate.md)
--   [USE](../../sql-reference/statements/use.md)
diff --git a/docs/ru/development/browse-code.md b/docs/ru/development/browse-code.md
deleted file mode 100644
index 640b1ac3693..00000000000
--- a/docs/ru/development/browse-code.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-slug: /ru/development/browse-code
-sidebar_position: 72
-sidebar_label: "Навигация по коду ClickHouse"
----
-
-
-# Навигация по коду ClickHouse {#navigatsiia-po-kodu-clickhouse}
-
-Для навигации по коду онлайн доступен **Woboq**, он расположен [здесь](https://clickhouse.com/codebrowser/ClickHouse/src/index.html). В нём реализовано удобное перемещение между исходными файлами, семантическая подсветка, подсказки, индексация и поиск. Слепок кода обновляется ежедневно.
-
-Также вы можете просматривать исходники на [GitHub](https://github.com/ClickHouse/ClickHouse).
-
-Если вы интересуетесь, какую среду разработки выбрать для работы с ClickHouse, мы рекомендуем CLion, QT Creator, VSCode или KDevelop (с некоторыми предостережениями). Вы можете использовать свою любимую среду разработки, Vim и Emacs тоже считаются.
diff --git a/docs/ru/sql-reference/data-types/date.md b/docs/ru/sql-reference/data-types/date.md
index 7254b82f461..185fe28d567 100644
--- a/docs/ru/sql-reference/data-types/date.md
+++ b/docs/ru/sql-reference/data-types/date.md
@@ -6,7 +6,7 @@ sidebar_label: Date
 
 # Date {#data-type-date}
 
-Дата. Хранится в двух байтах в виде (беззнакового) числа дней, прошедших от 1970-01-01. Позволяет хранить значения от чуть больше, чем начала unix-эпохи до верхнего порога, определяющегося константой на этапе компиляции (сейчас - до 2149 года, последний полностью поддерживаемый год - 2148).
+Дата. Хранится в двух байтах в виде (беззнакового) числа дней, прошедших от 1970-01-01. Позволяет хранить значения от чуть больше, чем начала unix-эпохи до верхнего порога, определяющегося константой на этапе компиляции (сейчас - до 2106 года, последний полностью поддерживаемый год - 2105).
 
 Диапазон значений: \[1970-01-01, 2149-06-06\].
 
diff --git a/docs/ru/sql-reference/functions/date-time-functions.md b/docs/ru/sql-reference/functions/date-time-functions.md
index a7d2ce49fae..80e2561a8d7 100644
--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@@ -272,15 +272,9 @@ SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp;
 
 Поведение для
 * `enable_extended_results_for_datetime_functions = 0`: Функции `toStartOf*`, `toLastDayOfMonth`, `toMonday` возвращают `Date` или `DateTime`. Функции `toStartOfDay`, `toStartOfHour`, `toStartOfFifteenMinutes`, `toStartOfTenMinutes`, `toStartOfFiveMinutes`, `toStartOfMinute`, `timeSlot` возвращают `DateTime`. Хотя эти функции могут принимать значения типа `Date32` или `DateTime64` в качестве аргумента, при обработке аргумента вне нормального диапазона значений (`1970` - `2148` для `Date` и `1970-01-01 00:00:00`-`2106-02-07 08:28:15` для `DateTime`) будет получен некорректный результат.
-В случае если значение аргумента вне нормального диапазона:
-    * `1970-01-01 (00:00:00)` будет возвращён для моментов времени до 1970 года,
-    * `2106-02-07 08:28:15` будет взят в качестве аргумента, если полученный аргумент превосходит данное значение и возвращаемый тип - `DateTime`,
-    * `2149-06-06` будет взят в качестве аргумента, если полученный аргумент превосходит данное значение и возвращаемый тип - `Date`,
-    * `2149-05-31` будет результатом функции `toLastDayOfMonth` при обработке аргумента больше `2149-05-31`.
 * `enable_extended_results_for_datetime_functions = 1`:
     * Функции `toStartOfYear`, `toStartOfISOYear`, `toStartOfQuarter`, `toStartOfMonth`, `toStartOfWeek`, `toLastDayOfMonth`, `toMonday` возвращают `Date` или `DateTime` если их аргумент `Date` или `DateTime` и они возвращают `Date32` или `DateTime64` если их аргумент `Date32` или `DateTime64`.
     * Функции `toStartOfDay`, `toStartOfHour`, `toStartOfFifteenMinutes`, `toStartOfTenMinutes`, `toStartOfFiveMinutes`, `toStartOfMinute`, `timeSlot` возвращают `DateTime` если их аргумент `Date` или `DateTime` и они возвращают `DateTime64` если их аргумент `Date32` или `DateTime64`.
-
 :::
 
 ## toStartOfYear {#tostartofyear}
@@ -321,20 +315,20 @@ SELECT toStartOfISOYear(toDate('2017-01-01')) AS ISOYear20170101;
 Округляет дату или дату-с-временем до последнего числа месяца.
 Возвращается дата.
 
-Если `toLastDayOfMonth` вызывается с аргументом типа `Date` большим чем 2149-05-31, то результат будет вычислен от аргумента 2149-05-31.
-
+:::note "Attention"
+    Возвращаемое значение для некорректных дат зависит от реализации. ClickHouse может вернуть нулевую дату, выбросить исключение, или выполнить «естественное» перетекание дат между месяцами.
+:::
+    
 ## toMonday {#tomonday}
 
 Округляет дату или дату-с-временем вниз до ближайшего понедельника.
-Частный случай: для дат `1970-01-01`, `1970-01-02`, `1970-01-03` и `1970-01-04` результатом будет `1970-01-01`.
 Возвращается дата.
 
 ## toStartOfWeek(t[,mode]) {#tostartofweek}
 
 Округляет дату или дату со временем до ближайшего воскресенья или понедельника в соответствии с mode.
 Возвращается дата.
-Частный случай: для дат `1970-01-01`, `1970-01-02`, `1970-01-03` и `1970-01-04` (и `1970-01-05`, если `mode` равен `1`) результатом будет `1970-01-01`.
-Аргумент `mode` работает точно так же, как аргумент mode [toWeek()](#toweek). Если аргумент mode опущен, то используется режим 0.
+Аргумент mode работает точно так же, как аргумент mode [toWeek()](#toweek). Если аргумент mode опущен, то используется режим 0.
 
 ## toStartOfDay {#tostartofday}
 
@@ -721,9 +715,9 @@ date_diff('unit', startdate, enddate, [timezone])
     - `quarter`
     - `year`
 
--   `startdate` — первая дата или дата со временем, которая вычитается из `enddate`. [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+-   `startdate` — первая дата или дата со временем, которая вычитается из `enddate`. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md).
 
--   `enddate` — вторая дата или дата со временем, из которой вычитается `startdate`. [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+-   `enddate` — вторая дата или дата со временем, из которой вычитается `startdate`. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md).
 
 -   `timezone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) (необязательно). Если этот аргумент указан, то он применяется как для `startdate`, так и для `enddate`. Если этот аргумент не указан, то используются часовые пояса аргументов `startdate` и `enddate`. Если часовые пояса аргументов `startdate` и `enddate` не совпадают, то результат не определен. [String](../../sql-reference/data-types/string.md).
 
@@ -975,8 +969,7 @@ SELECT now('Europe/Moscow');
 
 ## timeSlots(StartTime, Duration,\[, Size\]) {#timeslotsstarttime-duration-size}
 Для интервала, начинающегося в `StartTime` и длящегося `Duration` секунд, возвращает массив моментов времени, кратных `Size`. Параметр `Size` указывать необязательно, по умолчанию он равен 1800 секундам (30 минутам) - необязательный параметр.
-Данная функция может использоваться, например, для анализа количества просмотров страницы за соответствующую сессию.
-Аргумент `StartTime` может иметь тип `DateTime` или `DateTime64`. В случае, если используется `DateTime`, аргументы `Duration` и `Size` должны иметь тип `UInt32`; Для DateTime64 они должны быть типа `Decimal64`.
+
 Возвращает массив DateTime/DateTime64 (тип будет совпадать с типом параметра ’StartTime’). Для DateTime64 масштаб(scale) возвращаемой величины может отличаться от масштаба фргумента ’StartTime’ --- результат будет иметь наибольший масштаб среди всех данных аргументов.
 
 Пример использования:
@@ -1085,7 +1078,7 @@ dateName(date_part, date)
 **Аргументы**
 
 -   `date_part` — часть даты. Возможные значения: 'year', 'quarter', 'month', 'week', 'dayofyear', 'day', 'weekday', 'hour', 'minute', 'second'. [String](../../sql-reference/data-types/string.md).
--   `date` — дата. [Date](../../sql-reference/data-types/date.md), [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md).
+-   `date` — дата. [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md).
 -   `timezone` — часовой пояс. Необязательный аргумент. [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемое значение**
diff --git a/docs/ru/sql-reference/functions/other-functions.md b/docs/ru/sql-reference/functions/other-functions.md
index 5c8584cd2a0..af21ccd6bed 100644
--- a/docs/ru/sql-reference/functions/other-functions.md
+++ b/docs/ru/sql-reference/functions/other-functions.md
@@ -568,7 +568,7 @@ ORDER BY c DESC
 
 ``` sql
 SELECT
-    transform(domain(Referer), ['yandex.ru', 'google.ru', 'vk.com'], ['www.yandex', 'example.com']) AS s,
+    transform(domain(Referer), ['yandex.ru', 'google.ru', 'vkontakte.ru'], ['www.yandex', 'example.com', 'vk.com']) AS s,
     count() AS c
 FROM test.hits
 GROUP BY domain(Referer)
diff --git a/docs/ru/sql-reference/statements/misc.md b/docs/ru/sql-reference/statements/misc.md
deleted file mode 100644
index 437215f20ce..00000000000
--- a/docs/ru/sql-reference/statements/misc.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-slug: /ru/sql-reference/statements/misc
-sidebar_position: 41
----
-
-# Прочие виды запросов {#prochie-vidy-zaprosov}
-
--   [ATTACH](../../sql-reference/statements/attach.md)
--   [CHECK TABLE](../../sql-reference/statements/check-table.md)
--   [DESCRIBE TABLE](../../sql-reference/statements/describe-table.md)
--   [DETACH](../../sql-reference/statements/detach.md)
--   [DROP](../../sql-reference/statements/drop.md)
--   [EXISTS](../../sql-reference/statements/exists.md)
--   [KILL](../../sql-reference/statements/kill.md)
--   [OPTIMIZE](../../sql-reference/statements/optimize.md)
--   [RENAME](../../sql-reference/statements/rename.md)
--   [SET](../../sql-reference/statements/set.md)
--   [SET ROLE](../../sql-reference/statements/set-role.md)
--   [TRUNCATE](../../sql-reference/statements/truncate.md)
--   [USE](../../sql-reference/statements/use.md)
-
diff --git a/docs/zh/development/browse-code.md b/docs/zh/development/browse-code.md
deleted file mode 100644
index 16382a94ed5..00000000000
--- a/docs/zh/development/browse-code.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-slug: /zh/development/browse-code
-sidebar_position: 63
-sidebar_label: "\u6D4F\u89C8\u6E90\u4EE3\u7801"
----
-
-# 浏览ClickHouse源代码 {#browse-clickhouse-source-code}
-
-您可以使用 **Woboq** 在线代码浏览器 [点击这里](https://clickhouse.com/codebrowser/ClickHouse/src/index.html). 它提供了代码导航和语义突出显示、搜索和索引。 代码快照每天更新。
-
-此外，您还可以像往常一样浏览源代码 [GitHub](https://github.com/ClickHouse/ClickHouse)
-
-如果你希望了解哪种IDE较好，我们推荐使用CLion，QT Creator，VS Code和KDevelop（有注意事项）。 您可以使用任何您喜欢的IDE。 Vim和Emacs也可以。
diff --git a/docs/zh/getting-started/example-datasets/cell-towers.mdx b/docs/zh/getting-started/example-datasets/cell-towers.mdx
index ece13445210..9738680519a 100644
--- a/docs/zh/getting-started/example-datasets/cell-towers.mdx
+++ b/docs/zh/getting-started/example-datasets/cell-towers.mdx
@@ -1,9 +1,232 @@
 ---
 slug: /zh/getting-started/example-datasets/cell-towers
-sidebar_label: Cell Towers
-title: "Cell Towers"
+sidebar_label: 蜂窝信号塔
+sidebar_position: 3
+title: "蜂窝信号塔"
 ---
 
-import Content from '@site/docs/en/getting-started/example-datasets/cell-towers.md';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+import CodeBlock from '@theme/CodeBlock';
+import ActionsMenu from '@site/docs/en/_snippets/_service_actions_menu.md';
+import SQLConsoleDetail from '@site/docs/en/_snippets/_launch_sql_console.md';
+
+该数据集来自 [OpenCellid](https://www.opencellid.org/) - 世界上最大的蜂窝信号塔的开放数据库。
+
+截至 2021 年，它拥有超过 4000 万条关于全球蜂窝信号塔（GSM、LTE、UMTS 等）的记录及其地理坐标和元数据（国家代码、网络等）。
+
+OpenCelliD 项目在 `Creative Commons Attribution-ShareAlike 4.0 International License` 协议下许可使用，我们根据相同许可条款重新分发此数据集的快照。登录后即可下载最新版本的数据集。
+
+
+## 获取数据集 {#get-the-dataset}
+
+<Tabs groupId="deployMethod">
+<TabItem value="serverless" label="ClickHouse Cloud" default>
+
+在 ClickHouse Cloud 上可以通过一个按钮实现通过 S3 上传此数据集。登录你的 ClickHouse Cloud 组织，或通过 [ClickHouse.cloud](https://clickhouse.cloud) 创建免费试用版。<ActionsMenu menu="Load Data" />
+
+从 **Sample data** 选项卡中选择 **Cell Towers** 数据集，然后选择 **Load data**：
+
+![加载数据集](@site/docs/en/_snippets/images/cloud-load-data-sample.png)
+
+检查 cell_towers 的表结构：
+
+```sql 
+DESCRIBE TABLE cell_towers 
+```
+
+<SQLConsoleDetail />
+
+</TabItem>
+<TabItem value="selfmanaged" label="Self-managed">
+
+1. 下载 2021 年 2 月以来的数据集快照：[cell_towers.csv.xz](https://datasets.clickhouse.com/cell_towers.csv.xz) (729 MB)。
+
+2. 验证完整性（可选步骤）：
+
+```bash 
+md5sum cell_towers.csv.xz 
+```
+
+```response 
+8cf986f4a0d9f12c6f384a0e9192c908 cell_towers.csv.xz 
+```
+
+3. 使用以下命令解压：
+
+```bash 
+xz -d cell_towers.csv.xz 
+```
+
+4. 创建表：
+
+```sql
+CREATE TABLE cell_towers
+(
+    radio Enum8('' = 0, 'CDMA' = 1, 'GSM' = 2, 'LTE' = 3, 'NR' = 4, 'UMTS' = 5),
+    mcc UInt16,
+    net UInt16,
+    area UInt16,
+    cell UInt64,
+    unit Int16,
+    lon Float64,
+    lat Float64,
+    range UInt32,
+    samples UInt32,
+    changeable UInt8,
+    created DateTime,
+    updated DateTime,
+    averageSignal UInt8
+)
+ENGINE = MergeTree ORDER BY (radio, mcc, net, created);
+```
+
+5. 插入数据集：
+
+```bash 
+clickhouse-client --query "INSERT INTO cell_towers FORMAT CSVWithNames" < cell_towers.csv 
+```
+
+</TabItem>
+</Tabs>
+
+## 查询示例 {#examples}
+
+1. 按类型划分的基站数量：
+
+```sql
+SELECT radio, count() AS c FROM cell_towers GROUP BY radio ORDER BY c DESC
+```
+```response
+┌─radio─┬────────c─┐
+│ UMTS  │ 20686487 │
+│ LTE   │ 12101148 │
+│ GSM   │  9931312 │
+│ CDMA  │   556344 │
+│ NR    │      867 │
+└───────┴──────────┘
+
+5 rows in set. Elapsed: 0.011 sec. Processed 43.28 million rows, 43.28 MB (3.83 billion rows/s., 3.83 GB/s.)
+```
+
+2. 各个[移动国家代码（MCC）](https://en.wikipedia.org/wiki/Mobile_country_code)对应的蜂窝信号塔数量：
+
+```sql
+SELECT mcc, count() FROM cell_towers GROUP BY mcc ORDER BY count() DESC LIMIT 10
+```
+```response
+┌─mcc─┬─count()─┐
+│ 310 │ 5024650 │
+│ 262 │ 2622423 │
+│ 250 │ 1953176 │
+│ 208 │ 1891187 │
+│ 724 │ 1836150 │
+│ 404 │ 1729151 │
+│ 234 │ 1618924 │
+│ 510 │ 1353998 │
+│ 440 │ 1343355 │
+│ 311 │ 1332798 │
+└─────┴─────────┘
+
+10 rows in set. Elapsed: 0.019 sec. Processed 43.28 million rows, 86.55 MB (2.33 billion rows/s., 4.65 GB/s.)
+```
+
+排名靠前的国家是：美国、德国和俄罗斯。
+
+你可以通过在 ClickHouse 中创建一个 [External Dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) 来解码这些值。
+
+## 用例：合并地理数据 {#use-case}
+
+使用 `pointInPolygon` 函数。
+
+1. 创建一个用于存储多边形的表：
+
+<Tabs groupId="deployMethod">
+<TabItem value="serverless" label="ClickHouse Cloud" default>
+
+```sql
+CREATE TABLE moscow (polygon Array(Tuple(Float64, Float64)))
+ORDER BY polygon;
+```
+
+</TabItem>
+<TabItem value="selfmanaged" label="Self-managed">
+
+```sql
+CREATE TEMPORARY TABLE
+moscow (polygon Array(Tuple(Float64, Float64)));
+```
+
+</TabItem>
+</Tabs>
+
+2. 以下点大致上构造了莫斯科的地理围栏（除“新莫斯科”外）：
+
+```sql
+INSERT INTO moscow VALUES ([(37.84172564285271, 55.78000432402266),
+(37.8381207618713, 55.775874525970494), (37.83979446823122, 55.775626746008065), (37.84243326983639, 55.77446586811748), (37.84262672750849, 55.771974101091104), (37.84153238623039, 55.77114545193181), (37.841124690460184, 55.76722010265554),
+(37.84239076983644, 55.76654891107098), (37.842283558197025, 55.76258709833121), (37.8421759312134, 55.758073999993734), (37.84198330422974, 55.75381499999371), (37.8416827275085, 55.749277102484484), (37.84157576190186, 55.74794544108413),
+(37.83897929098507, 55.74525257875241), (37.83739676451868, 55.74404373042019), (37.838732481460525, 55.74298009816793), (37.841183997352545, 55.743060321833575), (37.84097476190185, 55.73938799999373), (37.84048155819702, 55.73570799999372),
+(37.840095812164286, 55.73228210777237), (37.83983814285274, 55.73080491981639), (37.83846476321406, 55.729799917464675), (37.83835745269769, 55.72919751082619), (37.838636380279524, 55.72859509486539), (37.8395161005249, 55.727705075632784),
+(37.83897964285276, 55.722727886185154), (37.83862557539366, 55.72034817326636), (37.83559735744853, 55.71944437307499), (37.835370708803126, 55.71831419154461), (37.83738169402022, 55.71765218986692), (37.83823396494291, 55.71691750159089),
+(37.838056931213345, 55.71547311301385), (37.836812846557606, 55.71221445615604), (37.83522525396725, 55.709331054395555), (37.83269301586908, 55.70953687463627), (37.829667367706236, 55.70903403789297), (37.83311126588435, 55.70552351822608),
+(37.83058993121339, 55.70041317726053), (37.82983872750851, 55.69883771404813), (37.82934501586913, 55.69718947487017), (37.828926414016685, 55.69504441658371), (37.82876530422971, 55.69287499999378), (37.82894754100031, 55.690759754047335),
+(37.827697554878185, 55.68951421135665), (37.82447346292115, 55.68965045405069), (37.83136543914793, 55.68322046195302), (37.833554015869154, 55.67814012759211), (37.83544184655761, 55.67295011628339), (37.837480388885474, 55.6672498719639),
+(37.838960677246064, 55.66316274139358), (37.83926093121332, 55.66046999999383), (37.839025050262435, 55.65869897264431), (37.83670784390257, 55.65794084879904), (37.835656529083245, 55.65694309303843), (37.83704060449217, 55.65689306460552),
+(37.83696819873806, 55.65550363526252), (37.83760389616388, 55.65487847246661), (37.83687972750851, 55.65356745541324), (37.83515216004943, 55.65155951234079), (37.83312418518067, 55.64979413590619), (37.82801726983639, 55.64640836412121),
+(37.820614174591, 55.64164525405531), (37.818908190475426, 55.6421883258084), (37.81717543386075, 55.64112490388471), (37.81690987037274, 55.63916106913107), (37.815099354492155, 55.637925371757085), (37.808769150787356, 55.633798276884455),
+(37.80100123544311, 55.62873670012244), (37.79598013491824, 55.62554336109055), (37.78634567724606, 55.62033499605651), (37.78334147619623, 55.618768681480326), (37.77746201055901, 55.619855533402706), (37.77527329626457, 55.61909966711279),
+(37.77801986242668, 55.618770300976294), (37.778212973541216, 55.617257701952106), (37.77784818518065, 55.61574504433011), (37.77016867724609, 55.61148576294007), (37.760191219573976, 55.60599579539028), (37.75338926983641, 55.60227892751446),
+(37.746329965606634, 55.59920577639331), (37.73939925396728, 55.59631430313617), (37.73273665739439, 55.5935318803559), (37.7299954450912, 55.59350760316188), (37.7268679946899, 55.59469840523759), (37.72626726983634, 55.59229549697373),
+(37.7262673598022, 55.59081598950582), (37.71897193121335, 55.5877595845419), (37.70871550793456, 55.58393177431724), (37.700497489410374, 55.580917323756644), (37.69204305026244, 55.57778089778455), (37.68544477378839, 55.57815154690915),
+(37.68391050793454, 55.57472945079756), (37.678803592590306, 55.57328235936491), (37.6743402539673, 55.57255251445782), (37.66813862698363, 55.57216388774464), (37.617927457672096, 55.57505691895805), (37.60443099999999, 55.5757737568051),
+(37.599683515869145, 55.57749105910326), (37.59754177842709, 55.57796291823627), (37.59625834786988, 55.57906686095235), (37.59501783265684, 55.57746616444403), (37.593090671936025, 55.57671634534502), (37.587018007904, 55.577944600233785),
+(37.578692203704804, 55.57982895000019), (37.57327546607398, 55.58116294118248), (37.57385012109279, 55.581550362779), (37.57399562266922, 55.5820107079112), (37.5735356072979, 55.58226289171689), (37.57290393054962, 55.582393529795155),
+(37.57037722355653, 55.581919415056234), (37.5592298306885, 55.584471614867844), (37.54189249206543, 55.58867650795186), (37.5297256269836, 55.59158133551745), (37.517837865081766, 55.59443656218868), (37.51200186508174, 55.59635625174229),
+(37.506808949737554, 55.59907823904434), (37.49820432275389, 55.6062944994944), (37.494406071441674, 55.60967103463367), (37.494760001358024, 55.61066689753365), (37.49397137107085, 55.61220931698269), (37.49016528606031, 55.613417718449064),
+(37.48773249206542, 55.61530616333343), (37.47921386508177, 55.622640129112334), (37.470652153442394, 55.62993723476164), (37.46273446298218, 55.6368075123157), (37.46350692265317, 55.64068225239439), (37.46050283203121, 55.640794546982576),
+(37.457627470916734, 55.64118904154646), (37.450718034393326, 55.64690488145138), (37.44239252645875, 55.65397824729769), (37.434587576721185, 55.66053543155961), (37.43582144975277, 55.661693766520735), (37.43576786245721, 55.662755031737014),
+(37.430982915344174, 55.664610641628116), (37.428547447097685, 55.66778515273695), (37.42945134592044, 55.668633314343566), (37.42859571562949, 55.66948145750025), (37.4262836402282, 55.670813882451405), (37.418709037048295, 55.6811141674414),
+(37.41922139651101, 55.68235377885389), (37.419218771842885, 55.68359335082235), (37.417196501327446, 55.684375235224735), (37.41607020370478, 55.68540557585352), (37.415640857147146, 55.68686637150793), (37.414632153442334, 55.68903015131686),
+(37.413344899475064, 55.690896881757396), (37.41171432275391, 55.69264232162232), (37.40948282275393, 55.69455101638112), (37.40703674603271, 55.69638690385348), (37.39607169577025, 55.70451821283731), (37.38952706878662, 55.70942491932811),
+(37.387778313491815, 55.71149057784176), (37.39049275399779, 55.71419814298992), (37.385557272491454, 55.7155489617061), (37.38388335714726, 55.71849856042102), (37.378368238098155, 55.7292763261685), (37.37763597123337, 55.730845879211614),
+(37.37890062088197, 55.73167906388319), (37.37750451918789, 55.734703664681774), (37.375610832015965, 55.734851959522246), (37.3723813571472, 55.74105626086403), (37.37014935714723, 55.746115620904355), (37.36944173016362, 55.750883999993725),
+(37.36975304365541, 55.76335905525834), (37.37244070571134, 55.76432079697595), (37.3724259757175, 55.76636979670426), (37.369922155757884, 55.76735417953104), (37.369892695770275, 55.76823419316575), (37.370214730163575, 55.782312184391266),
+(37.370493611114505, 55.78436801120489), (37.37120164550783, 55.78596427165359), (37.37284851456452, 55.7874378183096), (37.37608325135799, 55.7886695054807), (37.3764587460632, 55.78947647305964), (37.37530000265506, 55.79146512926804),
+(37.38235915344241, 55.79899647809345), (37.384344043655396, 55.80113596939471), (37.38594269577028, 55.80322699999366), (37.38711208598329, 55.804919036911976), (37.3880239841309, 55.806610999993666), (37.38928977249147, 55.81001864976979),
+(37.39038389947512, 55.81348641242801), (37.39235781481933, 55.81983538336746), (37.393709457672124, 55.82417822811877), (37.394685720901464, 55.82792275755836), (37.39557615344238, 55.830447148154136), (37.39844478226658, 55.83167107969975),
+(37.40019761214057, 55.83151823557964), (37.400398790382326, 55.83264967594742), (37.39659544313046, 55.83322180909622), (37.39667059524539, 55.83402792148566), (37.39682089947515, 55.83638877400216), (37.39643489154053, 55.83861656112751),
+(37.3955338994751, 55.84072348043264), (37.392680272491454, 55.84502158126453), (37.39241188227847, 55.84659117913199), (37.392529730163616, 55.84816071336481), (37.39486835714723, 55.85288092980303), (37.39873052645878, 55.859893456073635),
+(37.40272161111449, 55.86441833633205), (37.40697072750854, 55.867579567544375), (37.410007082016016, 55.868369880337), (37.4120992989502, 55.86920843741314), (37.412668021163924, 55.87055369615854), (37.41482461111453, 55.87170587948249),
+(37.41862266137694, 55.873183961039565), (37.42413732540892, 55.874879126654704), (37.4312182698669, 55.875614937236705), (37.43111093783558, 55.8762723478417), (37.43332105622856, 55.87706546369396), (37.43385747619623, 55.87790681284802),
+(37.441303050262405, 55.88027084462084), (37.44747234260555, 55.87942070143253), (37.44716141796871, 55.88072960917233), (37.44769797085568, 55.88121221323979), (37.45204320500181, 55.882080694420715), (37.45673176190186, 55.882346110794586),
+(37.463383999999984, 55.88252729504517), (37.46682797486874, 55.88294937719063), (37.470014457672086, 55.88361266759345), (37.47751410450743, 55.88546991372396), (37.47860317658232, 55.88534929207307), (37.48165826025772, 55.882563306475106),
+(37.48316434442331, 55.8815803226785), (37.483831555817645, 55.882427612793315), (37.483182967125686, 55.88372791409729), (37.483092277908824, 55.88495581062434), (37.4855716508179, 55.8875561994203), (37.486440636245746, 55.887827444039566),
+(37.49014203439328, 55.88897899871799), (37.493210285705544, 55.890208937135604), (37.497512451065035, 55.891342397444696), (37.49780744510645, 55.89174030252967), (37.49940333499519, 55.89239745507079), (37.50018383334346, 55.89339220941865),
+(37.52421672750851, 55.903869074155224), (37.52977457672118, 55.90564076517974), (37.53503220370484, 55.90661661218259), (37.54042858064267, 55.90714113744566), (37.54320461007303, 55.905645048442985), (37.545686966066306, 55.906608607018505),
+(37.54743976120755, 55.90788552162358), (37.55796999999999, 55.90901557907218), (37.572711542327866, 55.91059395704873), (37.57942799999998, 55.91073854155573), (37.58502865872187, 55.91009969268444), (37.58739968913264, 55.90794809960554),
+(37.59131567193598, 55.908713267595054), (37.612687423278814, 55.902866854295375), (37.62348079629517, 55.90041967242986), (37.635797880950896, 55.898141151686396), (37.649487626983664, 55.89639275532968), (37.65619302513125, 55.89572360207488),
+(37.66294133862307, 55.895295577183965), (37.66874564418033, 55.89505457604897), (37.67375601586915, 55.89254677027454), (37.67744661901856, 55.8947775867987), (37.688347, 55.89450045676125), (37.69480554232789, 55.89422926332761),
+(37.70107096560668, 55.89322256101114), (37.705962965606716, 55.891763491662616), (37.711885134918205, 55.889110234998974), (37.71682005026245, 55.886577568759876), (37.7199315476074, 55.88458159806678), (37.72234560316464, 55.882281005794134),
+(37.72364385977171, 55.8809452036196), (37.725371142837474, 55.8809722706006), (37.727870902099546, 55.88037213862385), (37.73394330422971, 55.877941504088696), (37.745339592590376, 55.87208120378722), (37.75525267724611, 55.86703807949492),
+(37.76919976190188, 55.859821640197474), (37.827835219574, 55.82962968399116), (37.83341438888553, 55.82575289922351), (37.83652584655761, 55.82188784027888), (37.83809213491821, 55.81612575504693), (37.83605359521481, 55.81460347077685),
+(37.83632178569025, 55.81276696067908), (37.838623105812026, 55.811486181656385), (37.83912198147584, 55.807329380532785), (37.839079078033414, 55.80510270463816), (37.83965844708251, 55.79940712529036), (37.840581150787344, 55.79131399999368),
+(37.84172564285271, 55.78000432402266)]);
+```
+
+3. 检查莫斯科有多少个蜂窝信号塔：
+
+```sql
+SELECT count() FROM cell_towers
+WHERE pointInPolygon((lon, lat), (SELECT * FROM moscow))
+```
+```response
+┌─count()─┐
+│  310463 │
+└─────────┘
+
+1 rows in set. Elapsed: 0.067 sec. Processed 43.28 million rows, 692.42 MB (645.83 million rows/s., 10.33 GB/s.)
+```
+
+虽然不能创建临时表，但此数据集仍可在 [Playground](https://play.clickhouse.com/play?user=play) 中进行交互式的请求, [example](https://play.clickhouse.com/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=).
 
-<Content />
diff --git a/docs/zh/getting-started/example-datasets/menus.mdx b/docs/zh/getting-started/example-datasets/menus.mdx
index 250b8a4cd37..10e9f2bd318 100644
--- a/docs/zh/getting-started/example-datasets/menus.mdx
+++ b/docs/zh/getting-started/example-datasets/menus.mdx
@@ -1,9 +1,352 @@
----
-slug: /zh/getting-started/example-datasets/menus
-sidebar_label: New York Public Library "What's on the Menu?" Dataset
-title: "New York Public Library \"What's on the Menu?\" Dataset"
+--- 
+slug: /zh/getting-started/example-datasets/menus 
+sidebar_label: '纽约公共图书馆“菜单上有什么？”数据集'
+title: '纽约公共图书馆“菜单上有什么？”数据集'
 ---
 
-import Content from '@site/docs/en/getting-started/example-datasets/menus.md';
+该数据集由纽约公共图书馆创建。其中含有有关酒店、餐馆和咖啡馆的菜单上的菜肴及其价格的历史数据。
 
-<Content />
+来源：http://menus.nypl.org/data 
+数据为开放数据。
+
+数据来自于图书馆中的档案，因此可能不完整，以至于难以进行统计分析。尽管如此，该数据集也是非常有意思的。数据集中只有 130 万条关于菜单中的菜肴的记录 - 这对于 ClickHouse 来说是一个非常小的数据量，但这仍是一个很好的例子。
+
+## 下载数据集 {#download-dataset}
+
+运行命令：
+
+```bash
+wget https://s3.amazonaws.com/menusdata.nypl.org/gzips/2021_08_01_07_01_17_data.tgz
+```
+
+如果有需要可以使用 http://menus.nypl.org/data 中的最新链接。下载的大小约为 35 MB。
+
+## 解压数据集 {#unpack-dataset}
+
+```bash
+tar xvf 2021_08_01_07_01_17_data.tgz
+```
+
+解压后的的大小约为 150 MB。
+
+数据集由四个表组成： 
+
+- `Menu` - 有关菜单的信息，其中包含：餐厅名称，看到菜单的日期等 
+- `Dish` - 有关菜肴的信息，其中包含：菜肴名称以及一些特征。 
+- `MenuPage` - 有关菜单中页面的信息，每个页面都属于某个 `Menu`。 
+- `MenuItem` - 菜单项。某个菜单页面上的菜肴及其价格：指向 `Dish` 和 `MenuPage`的链接。
+
+## 创建表 {#create-tables}
+
+使用 [Decimal](/docs/zh/sql-reference/data-types/decimal.md) 数据类型来存储价格。
+
+```sql
+CREATE TABLE dish
+(
+    id UInt32,
+    name String,
+    description String,
+    menus_appeared UInt32,
+    times_appeared Int32,
+    first_appeared UInt16,
+    last_appeared UInt16,
+    lowest_price Decimal64(3),
+    highest_price Decimal64(3)
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu
+(
+    id UInt32,
+    name String,
+    sponsor String,
+    event String,
+    venue String,
+    place String,
+    physical_description String,
+    occasion String,
+    notes String,
+    call_number String,
+    keywords String,
+    language String,
+    date String,
+    location String,
+    location_type String,
+    currency String,
+    currency_symbol String,
+    status String,
+    page_count UInt16,
+    dish_count UInt16
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu_page
+(
+    id UInt32,
+    menu_id UInt32,
+    page_number UInt16,
+    image_id String,
+    full_height UInt16,
+    full_width UInt16,
+    uuid UUID
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu_item
+(
+    id UInt32,
+    menu_page_id UInt32,
+    price Decimal64(3),
+    high_price Decimal64(3),
+    dish_id UInt32,
+    created_at DateTime,
+    updated_at DateTime,
+    xpos Float64,
+    ypos Float64
+) ENGINE = MergeTree ORDER BY id;
+```
+
+## 导入数据 {#import-data}
+
+执行以下命令将数据导入 ClickHouse：
+
+```bash
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO dish FORMAT CSVWithNames" < Dish.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO menu FORMAT CSVWithNames" < Menu.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO menu_page FORMAT CSVWithNames" < MenuPage.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --date_time_input_format best_effort --query "INSERT INTO menu_item FORMAT CSVWithNames" < MenuItem.csv
+```
+
+因为数据由带有标题的 CSV 表示，所以使用 [CSVWithNames](/docs/zh/interfaces/formats.md#csvwithnames) 格式。
+
+因为只有双引号用于数据字段，单引号可以在值内，所以禁用了 `format_csv_allow_single_quotes` 以避免混淆 CSV 解析器。
+
+因为数据中没有 [NULL](/docs/zh/sql-reference/syntax.md#null-literal) 值，所以禁用 [input_format_null_as_default](/docs/zh/operations/settings/settings.md#settings-input-format-null-as-default)。不然 ClickHouse 将会尝试解析 `\N` 序列，并可能与数据中的 `\` 混淆。
+
+设置 [date_time_input_format best_effort](/docs/zh/operations/settings/settings.md#settings-date_time_input_format) 以便解析各种格式的 [DateTime](/docs/zh/sql-reference/data-types/datetime.md)字段。例如，识别像“2000-01-01 01:02”这样没有秒数的 ISO-8601 时间字符串。如果没有此设置，则仅允许使用固定的 DateTime 格式。
+
+## 非规范化数据 {#denormalize-data}
+
+数据以 [规范化形式] (https://en.wikipedia.org/wiki/Database_normalization#Normal_forms) 在多个表格中呈现。这意味着如果你想进行如查询菜单项中的菜名这类的查询，则必须执行 [JOIN](/docs/zh/sql-reference/statements/select/join.md#select-join)。在典型的分析任务中，预先处理联接的数据以避免每次都执行“联接”会更有效率。这中操作被称为“非规范化”数据。
+
+我们将创建一个表“menu_item_denorm”，其中将包含所有联接在一起的数据：
+
+```sql
+CREATE TABLE menu_item_denorm
+ENGINE = MergeTree ORDER BY (dish_name, created_at)
+AS SELECT
+    price,
+    high_price,
+    created_at,
+    updated_at,
+    xpos,
+    ypos,
+    dish.id AS dish_id,
+    dish.name AS dish_name,
+    dish.description AS dish_description,
+    dish.menus_appeared AS dish_menus_appeared,
+    dish.times_appeared AS dish_times_appeared,
+    dish.first_appeared AS dish_first_appeared,
+    dish.last_appeared AS dish_last_appeared,
+    dish.lowest_price AS dish_lowest_price,
+    dish.highest_price AS dish_highest_price,
+    menu.id AS menu_id,
+    menu.name AS menu_name,
+    menu.sponsor AS menu_sponsor,
+    menu.event AS menu_event,
+    menu.venue AS menu_venue,
+    menu.place AS menu_place,
+    menu.physical_description AS menu_physical_description,
+    menu.occasion AS menu_occasion,
+    menu.notes AS menu_notes,
+    menu.call_number AS menu_call_number,
+    menu.keywords AS menu_keywords,
+    menu.language AS menu_language,
+    menu.date AS menu_date,
+    menu.location AS menu_location,
+    menu.location_type AS menu_location_type,
+    menu.currency AS menu_currency,
+    menu.currency_symbol AS menu_currency_symbol,
+    menu.status AS menu_status,
+    menu.page_count AS menu_page_count,
+    menu.dish_count AS menu_dish_count
+FROM menu_item
+    JOIN dish ON menu_item.dish_id = dish.id
+    JOIN menu_page ON menu_item.menu_page_id = menu_page.id
+    JOIN menu ON menu_page.menu_id = menu.id;
+```
+
+## 验证数据 {#validate-data}
+
+请求：
+
+```sql
+SELECT count() FROM menu_item_denorm;
+```
+
+结果：
+
+```text
+┌─count()─┐
+│ 1329175 │
+└─────────┘
+```
+
+## 运行一些查询 {#run-queries}
+
+### 菜品的平均历史价格 {#query-averaged-historical-prices}
+
+请求：
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 100, 100)
+FROM menu_item_denorm
+WHERE (menu_currency = 'Dollars') AND (d > 0) AND (d < 2022)
+GROUP BY d
+ORDER BY d ASC;
+```
+
+结果：
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 100, 100)─┐
+│ 1850 │     618 │                  1.5 │ █▍                           │
+│ 1860 │    1634 │                 1.29 │ █▎                           │
+│ 1870 │    2215 │                 1.36 │ █▎                           │
+│ 1880 │    3909 │                 1.01 │ █                            │
+│ 1890 │    8837 │                  1.4 │ █▍                           │
+│ 1900 │  176292 │                 0.68 │ ▋                            │
+│ 1910 │  212196 │                 0.88 │ ▊                            │
+│ 1920 │  179590 │                 0.74 │ ▋                            │
+│ 1930 │   73707 │                  0.6 │ ▌                            │
+│ 1940 │   58795 │                 0.57 │ ▌                            │
+│ 1950 │   41407 │                 0.95 │ ▊                            │
+│ 1960 │   51179 │                 1.32 │ █▎                           │
+│ 1970 │   12914 │                 1.86 │ █▋                           │
+│ 1980 │    7268 │                 4.35 │ ████▎                        │
+│ 1990 │   11055 │                 6.03 │ ██████                       │
+│ 2000 │    2467 │                11.85 │ ███████████▋                 │
+│ 2010 │     597 │                25.66 │ █████████████████████████▋   │
+└──────┴─────────┴──────────────────────┴──────────────────────────────┘
+```
+
+带上一粒盐。
+
+### 汉堡价格 {#query-burger-prices}
+
+请求：
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100)
+FROM menu_item_denorm
+WHERE (menu_currency = 'Dollars') AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%burger%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+结果：
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)───────────┐
+│ 1880 │       2 │                 0.42 │ ▋                                     │
+│ 1890 │       7 │                 0.85 │ █▋                                    │
+│ 1900 │     399 │                 0.49 │ ▊                                     │
+│ 1910 │     589 │                 0.68 │ █▎                                    │
+│ 1920 │     280 │                 0.56 │ █                                     │
+│ 1930 │      74 │                 0.42 │ ▋                                     │
+│ 1940 │     119 │                 0.59 │ █▏                                    │
+│ 1950 │     134 │                 1.09 │ ██▏                                   │
+│ 1960 │     272 │                 0.92 │ █▋                                    │
+│ 1970 │     108 │                 1.18 │ ██▎                                   │
+│ 1980 │      88 │                 2.82 │ █████▋                                │
+│ 1990 │     184 │                 3.68 │ ███████▎                              │
+│ 2000 │      21 │                 7.14 │ ██████████████▎                       │
+│ 2010 │       6 │                18.42 │ ████████████████████████████████████▋ │
+└──────┴─────────┴──────────────────────┴───────────────────────────────────────┘
+```
+
+###伏特加{#query-vodka}
+
+请求：
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100)
+FROM menu_item_denorm
+WHERE (menu_currency IN ('Dollars', '')) AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%vodka%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+结果：
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)─┐
+│ 1910 │       2 │                    0 │                             │
+│ 1920 │       1 │                  0.3 │ ▌                           │
+│ 1940 │      21 │                 0.42 │ ▋                           │
+│ 1950 │      14 │                 0.59 │ █▏                          │
+│ 1960 │     113 │                 2.17 │ ████▎                       │
+│ 1970 │      37 │                 0.68 │ █▎                          │
+│ 1980 │      19 │                 2.55 │ █████                       │
+│ 1990 │      86 │                  3.6 │ ███████▏                    │
+│ 2000 │       2 │                 3.98 │ ███████▊                    │
+└──────┴─────────┴──────────────────────┴─────────────────────────────┘
+```
+
+要查询 `Vodka`，必须声明通过 `ILIKE '%vodka%'` 进行查询。
+
+### 鱼子酱 {#query-caviar}
+
+列出鱼子酱的价格。另外，列出任何带有鱼子酱的菜肴的名称。
+
+请求：
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100),
+    any(dish_name)
+FROM menu_item_denorm
+WHERE (menu_currency IN ('Dollars', '')) AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%caviar%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+结果：
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)──────┬─any(dish_name)──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ 1090 │       1 │                    0 │                                  │ Caviar                                                                                                                              │
+│ 1880 │       3 │                    0 │                                  │ Caviar                                                                                                                              │
+│ 1890 │      39 │                 0.59 │ █▏                               │ Butter and caviar                                                                                                                   │
+│ 1900 │    1014 │                 0.34 │ ▋                                │ Anchovy Caviar on Toast                                                                                                             │
+│ 1910 │    1588 │                 1.35 │ ██▋                              │ 1/1 Brötchen Caviar                                                                                                                 │
+│ 1920 │     927 │                 1.37 │ ██▋                              │ ASTRAKAN CAVIAR                                                                                                                     │
+│ 1930 │     289 │                 1.91 │ ███▋                             │ Astrachan caviar                                                                                                                    │
+│ 1940 │     201 │                 0.83 │ █▋                               │ (SPECIAL) Domestic Caviar Sandwich                                                                                                  │
+│ 1950 │      81 │                 2.27 │ ████▌                            │ Beluga Caviar                                                                                                                       │
+│ 1960 │     126 │                 2.21 │ ████▍                            │ Beluga Caviar                                                                                                                       │
+│ 1970 │     105 │                 0.95 │ █▊                               │ BELUGA MALOSSOL CAVIAR AMERICAN DRESSING                                                                                            │
+│ 1980 │      12 │                 7.22 │ ██████████████▍                  │ Authentic Iranian Beluga Caviar the world's finest black caviar presented in ice garni and a sampling of chilled 100° Russian vodka │
+│ 1990 │      74 │                14.42 │ ████████████████████████████▋    │ Avocado Salad, Fresh cut avocado with caviare                                                                                       │
+│ 2000 │       3 │                 7.82 │ ███████████████▋                 │ Aufgeschlagenes Kartoffelsueppchen mit Forellencaviar                                                                               │
+│ 2010 │       6 │                15.58 │ ███████████████████████████████▏ │ "OYSTERS AND PEARLS" "Sabayon" of Pearl Tapioca with Island Creek Oysters and Russian Sevruga Caviar                                │
+└──────┴─────────┴──────────────────────┴──────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+至少他们有伏特加配鱼子酱。真棒。
+
+## 在线 Playground{#playground}
+
+此数据集已经上传到了 ClickHouse Playground 中，[example](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICByb3VuZCh0b1VJbnQzMk9yWmVybyhleHRyYWN0KG1lbnVfZGF0ZSwgJ15cXGR7NH0nKSksIC0xKSBBUyBkLAogICAgY291bnQoKSwKICAgIHJvdW5kKGF2ZyhwcmljZSksIDIpLAogICAgYmFyKGF2ZyhwcmljZSksIDAsIDUwLCAxMDApLAogICAgYW55KGRpc2hfbmFtZSkKRlJPTSBtZW51X2l0ZW1fZGVub3JtCldIRVJFIChtZW51X2N1cnJlbmN5IElOICgnRG9sbGFycycsICcnKSkgQU5EIChkID4gMCkgQU5EIChkIDwgMjAyMikgQU5EIChkaXNoX25hbWUgSUxJS0UgJyVjYXZpYXIlJykKR1JPVVAgQlkgZApPUkRFUiBCWSBkIEFTQw==)。
diff --git a/docs/zh/getting-started/example-datasets/opensky.mdx b/docs/zh/getting-started/example-datasets/opensky.mdx
index e8d5367e970..92cd104e06e 100644
--- a/docs/zh/getting-started/example-datasets/opensky.mdx
+++ b/docs/zh/getting-started/example-datasets/opensky.mdx
@@ -1,9 +1,416 @@
----
+--- 
 slug: /zh/getting-started/example-datasets/opensky
-sidebar_label: Air Traffic Data
-title: "Crowdsourced air traffic data from The OpenSky Network 2020"
+sidebar_label: 空中交通数据
+description: 该数据集中的数据是从完整的 OpenSky 数据集中衍生而来的，对其中的数据进行了必要的清理，用以展示在 COVID-19 期间空中交通的发展。
+title: "来自 The OpenSky Network 2020 的众包空中交通数据"
 ---
 
-import Content from '@site/docs/en/getting-started/example-datasets/opensky.md';
+该数据集中的数据是从完整的 OpenSky 数据集中派生和清理的，以说明 COVID-19 大流行期间空中交通的发展。它涵盖了自 2019 年 1 月 1 日以来该网络中 2500 多名成员观测到的所有航班。直到 COVID-19 大流行结束，更多数据将定期的更新到数据集中。
 
-<Content />
+来源：https://zenodo.org/record/5092942#.YRBCyTpRXYd
+
+Martin Strohmeier、Xavier Olive、Jannis Lübbe、Matthias Schäfer 和 Vincent Lenders “来自 OpenSky 网络 2019-2020 的众包空中交通数据”地球系统科学数据 13(2)，2021 https://doi.org/10.5194/essd- 13-357-2021
+
+## 下载数据集 {#download-dataset}
+
+运行命令：
+
+```bash
+wget -O- https://zenodo.org/record/5092942 | grep -oP 'https://zenodo.org/record/5092942/files/flightlist_\d+_\d+\.csv\.gz' | xargs wget
+```
+
+Download will take about 2 minutes with good internet connection. There are 30 files with total size of 4.3 GB.
+
+## 创建表 {#create-table}
+
+```sql
+CREATE TABLE opensky
+(
+    callsign String,
+    number String,
+    icao24 String,
+    registration String,
+    typecode String,
+    origin String,
+    destination String,
+    firstseen DateTime,
+    lastseen DateTime,
+    day DateTime,
+    latitude_1 Float64,
+    longitude_1 Float64,
+    altitude_1 Float64,
+    latitude_2 Float64,
+    longitude_2 Float64,
+    altitude_2 Float64
+) ENGINE = MergeTree ORDER BY (origin, destination, callsign);
+```
+
+## 导入数据 {#import-data}
+
+将数据并行导入到 ClickHouse：
+
+```bash
+ls -1 flightlist_*.csv.gz | xargs -P100 -I{} bash -c 'gzip -c -d "{}" | clickhouse-client --date_time_input_format best_effort --query "INSERT INTO opensky FORMAT CSVWithNames"'
+```
+
+- 这里我们将文件列表（`ls -1 flightlist_*.csv.gz`）传递给`xargs`以进行并行处理。 `xargs -P100` 指定最多使用 100 个并行工作程序，但由于我们只有 30 个文件，工作程序的数量将只有 30 个。 
+- 对于每个文件，`xargs` 将通过 `bash -c` 为每个文件运行一个脚本文件。该脚本通过使用 `{}` 表示文件名占位符，然后 `xargs` 由命令进行填充（使用 `-I{}`）。 
+- 该脚本会将文件 (`gzip -c -d "{}"`) 解压缩到标准输出（`-c` 参数），并将输出重定向到 `clickhouse-client`。 
+- 我们还要求使用扩展解析器解析 [DateTime](../../sql-reference/data-types/datetime.md) 字段 ([--date_time_input_format best_effort](../../operations/settings/ settings.md#settings-date_time_input_format)) 以识别具有时区偏移的 ISO-8601 格式。
+
+最后，`clickhouse-client` 会以 [CSVWithNames](../../interfaces/formats.md#csvwithnames) 格式读取输入数据然后执行插入。 
+
+并行导入需要 24 秒。
+
+如果您不想使用并行导入，以下是顺序导入的方式：
+
+```bash
+for file in flightlist_*.csv.gz; do gzip -c -d "$file" | clickhouse-client --date_time_input_format best_effort --query "INSERT INTO opensky FORMAT CSVWithNames"; done
+```
+
+## 验证数据 {#validate-data}
+
+请求：
+
+```sql
+SELECT count() FROM opensky;
+```
+
+结果：
+
+```text
+┌──count()─┐
+│ 66010819 │
+└──────────┘
+```
+
+ClickHouse 中的数据集大小只有 2.66 GiB，检查一下。
+
+请求：
+
+```sql
+SELECT formatReadableSize(total_bytes) FROM system.tables WHERE name = 'opensky';
+```
+
+结果：
+
+```text
+┌─formatReadableSize(total_bytes)─┐
+│ 2.66 GiB                        │
+└─────────────────────────────────┘
+```
+
+## 运行一些查询 {#run-queries}
+
+总行驶距离为 680 亿公里。
+
+请求：
+
+```sql
+SELECT formatReadableQuantity(sum(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)) / 1000) FROM opensky;
+```
+
+结果：
+
+```text
+┌─formatReadableQuantity(divide(sum(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)), 1000))─┐
+│ 68.72 billion                                                                                            │
+└──────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+平均飞行距离约为 1000 公里。
+
+请求：
+
+```sql
+SELECT avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)) FROM opensky;
+```
+
+结果：
+
+```text
+┌─avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2))─┐
+│                                                 1041090.6465708319 │
+└────────────────────────────────────────────────────────────────────┘
+```
+
+### 最繁忙的始发机场和观测到的平均距离{#busy-airports-average-distance}
+
+请求：
+
+```sql
+SELECT
+    origin,
+    count(),
+    round(avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2))) AS distance,
+    bar(distance, 0, 10000000, 100) AS bar
+FROM opensky
+WHERE origin != ''
+GROUP BY origin
+ORDER BY count() DESC
+LIMIT 100;
+```
+
+结果：
+
+```text
+     ┌─origin─┬─count()─┬─distance─┬─bar────────────────────────────────────┐
+  1. │ KORD   │  745007 │  1546108 │ ███████████████▍                       │
+  2. │ KDFW   │  696702 │  1358721 │ █████████████▌                         │
+  3. │ KATL   │  667286 │  1169661 │ ███████████▋                           │
+  4. │ KDEN   │  582709 │  1287742 │ ████████████▊                          │
+  5. │ KLAX   │  581952 │  2628393 │ ██████████████████████████▎            │
+  6. │ KLAS   │  447789 │  1336967 │ █████████████▎                         │
+  7. │ KPHX   │  428558 │  1345635 │ █████████████▍                         │
+  8. │ KSEA   │  412592 │  1757317 │ █████████████████▌                     │
+  9. │ KCLT   │  404612 │   880355 │ ████████▋                              │
+ 10. │ VIDP   │  363074 │  1445052 │ ██████████████▍                        │
+ 11. │ EDDF   │  362643 │  2263960 │ ██████████████████████▋                │
+ 12. │ KSFO   │  361869 │  2445732 │ ████████████████████████▍              │
+ 13. │ KJFK   │  349232 │  2996550 │ █████████████████████████████▊         │
+ 14. │ KMSP   │  346010 │  1287328 │ ████████████▋                          │
+ 15. │ LFPG   │  344748 │  2206203 │ ██████████████████████                 │
+ 16. │ EGLL   │  341370 │  3216593 │ ████████████████████████████████▏      │
+ 17. │ EHAM   │  340272 │  2116425 │ █████████████████████▏                 │
+ 18. │ KEWR   │  337696 │  1826545 │ ██████████████████▎                    │
+ 19. │ KPHL   │  320762 │  1291761 │ ████████████▊                          │
+ 20. │ OMDB   │  308855 │  2855706 │ ████████████████████████████▌          │
+ 21. │ UUEE   │  307098 │  1555122 │ ███████████████▌                       │
+ 22. │ KBOS   │  304416 │  1621675 │ ████████████████▏                      │
+ 23. │ LEMD   │  291787 │  1695097 │ ████████████████▊                      │
+ 24. │ YSSY   │  272979 │  1875298 │ ██████████████████▋                    │
+ 25. │ KMIA   │  265121 │  1923542 │ ███████████████████▏                   │
+ 26. │ ZGSZ   │  263497 │   745086 │ ███████▍                               │
+ 27. │ EDDM   │  256691 │  1361453 │ █████████████▌                         │
+ 28. │ WMKK   │  254264 │  1626688 │ ████████████████▎                      │
+ 29. │ CYYZ   │  251192 │  2175026 │ █████████████████████▋                 │
+ 30. │ KLGA   │  248699 │  1106935 │ ███████████                            │
+ 31. │ VHHH   │  248473 │  3457658 │ ██████████████████████████████████▌    │
+ 32. │ RJTT   │  243477 │  1272744 │ ████████████▋                          │
+ 33. │ KBWI   │  241440 │  1187060 │ ███████████▋                           │
+ 34. │ KIAD   │  239558 │  1683485 │ ████████████████▋                      │
+ 35. │ KIAH   │  234202 │  1538335 │ ███████████████▍                       │
+ 36. │ KFLL   │  223447 │  1464410 │ ██████████████▋                        │
+ 37. │ KDAL   │  212055 │  1082339 │ ██████████▋                            │
+ 38. │ KDCA   │  207883 │  1013359 │ ██████████▏                            │
+ 39. │ LIRF   │  207047 │  1427965 │ ██████████████▎                        │
+ 40. │ PANC   │  206007 │  2525359 │ █████████████████████████▎             │
+ 41. │ LTFJ   │  205415 │   860470 │ ████████▌                              │
+ 42. │ KDTW   │  204020 │  1106716 │ ███████████                            │
+ 43. │ VABB   │  201679 │  1300865 │ █████████████                          │
+ 44. │ OTHH   │  200797 │  3759544 │ █████████████████████████████████████▌ │
+ 45. │ KMDW   │  200796 │  1232551 │ ████████████▎                          │
+ 46. │ KSAN   │  198003 │  1495195 │ ██████████████▊                        │
+ 47. │ KPDX   │  197760 │  1269230 │ ████████████▋                          │
+ 48. │ SBGR   │  197624 │  2041697 │ ████████████████████▍                  │
+ 49. │ VOBL   │  189011 │  1040180 │ ██████████▍                            │
+ 50. │ LEBL   │  188956 │  1283190 │ ████████████▋                          │
+ 51. │ YBBN   │  188011 │  1253405 │ ████████████▌                          │
+ 52. │ LSZH   │  187934 │  1572029 │ ███████████████▋                       │
+ 53. │ YMML   │  187643 │  1870076 │ ██████████████████▋                    │
+ 54. │ RCTP   │  184466 │  2773976 │ ███████████████████████████▋           │
+ 55. │ KSNA   │  180045 │   778484 │ ███████▋                               │
+ 56. │ EGKK   │  176420 │  1694770 │ ████████████████▊                      │
+ 57. │ LOWW   │  176191 │  1274833 │ ████████████▋                          │
+ 58. │ UUDD   │  176099 │  1368226 │ █████████████▋                         │
+ 59. │ RKSI   │  173466 │  3079026 │ ██████████████████████████████▋        │
+ 60. │ EKCH   │  172128 │  1229895 │ ████████████▎                          │
+ 61. │ KOAK   │  171119 │  1114447 │ ███████████▏                           │
+ 62. │ RPLL   │  170122 │  1440735 │ ██████████████▍                        │
+ 63. │ KRDU   │  167001 │   830521 │ ████████▎                              │
+ 64. │ KAUS   │  164524 │  1256198 │ ████████████▌                          │
+ 65. │ KBNA   │  163242 │  1022726 │ ██████████▏                            │
+ 66. │ KSDF   │  162655 │  1380867 │ █████████████▋                         │
+ 67. │ ENGM   │  160732 │   910108 │ █████████                              │
+ 68. │ LIMC   │  160696 │  1564620 │ ███████████████▋                       │
+ 69. │ KSJC   │  159278 │  1081125 │ ██████████▋                            │
+ 70. │ KSTL   │  157984 │  1026699 │ ██████████▎                            │
+ 71. │ UUWW   │  156811 │  1261155 │ ████████████▌                          │
+ 72. │ KIND   │  153929 │   987944 │ █████████▊                             │
+ 73. │ ESSA   │  153390 │  1203439 │ ████████████                           │
+ 74. │ KMCO   │  153351 │  1508657 │ ███████████████                        │
+ 75. │ KDVT   │  152895 │    74048 │ ▋                                      │
+ 76. │ VTBS   │  152645 │  2255591 │ ██████████████████████▌                │
+ 77. │ CYVR   │  149574 │  2027413 │ ████████████████████▎                  │
+ 78. │ EIDW   │  148723 │  1503985 │ ███████████████                        │
+ 79. │ LFPO   │  143277 │  1152964 │ ███████████▌                           │
+ 80. │ EGSS   │  140830 │  1348183 │ █████████████▍                         │
+ 81. │ KAPA   │  140776 │   420441 │ ████▏                                  │
+ 82. │ KHOU   │  138985 │  1068806 │ ██████████▋                            │
+ 83. │ KTPA   │  138033 │  1338223 │ █████████████▍                         │
+ 84. │ KFFZ   │  137333 │    55397 │ ▌                                      │
+ 85. │ NZAA   │  136092 │  1581264 │ ███████████████▋                       │
+ 86. │ YPPH   │  133916 │  1271550 │ ████████████▋                          │
+ 87. │ RJBB   │  133522 │  1805623 │ ██████████████████                     │
+ 88. │ EDDL   │  133018 │  1265919 │ ████████████▋                          │
+ 89. │ ULLI   │  130501 │  1197108 │ ███████████▊                           │
+ 90. │ KIWA   │  127195 │   250876 │ ██▌                                    │
+ 91. │ KTEB   │  126969 │  1189414 │ ███████████▊                           │
+ 92. │ VOMM   │  125616 │  1127757 │ ███████████▎                           │
+ 93. │ LSGG   │  123998 │  1049101 │ ██████████▍                            │
+ 94. │ LPPT   │  122733 │  1779187 │ █████████████████▋                     │
+ 95. │ WSSS   │  120493 │  3264122 │ ████████████████████████████████▋      │
+ 96. │ EBBR   │  118539 │  1579939 │ ███████████████▋                       │
+ 97. │ VTBD   │  118107 │   661627 │ ██████▌                                │
+ 98. │ KVNY   │  116326 │   692960 │ ██████▊                                │
+ 99. │ EDDT   │  115122 │   941740 │ █████████▍                             │
+100. │ EFHK   │  114860 │  1629143 │ ████████████████▎                      │
+     └────────┴─────────┴──────────┴────────────────────────────────────────┘
+```
+
+### 每周来自莫斯科三个主要机场的航班数量 {#flights-from-moscow}
+
+请求：
+
+```sql
+SELECT
+    toMonday(day) AS k,
+    count() AS c,
+    bar(c, 0, 10000, 100) AS bar
+FROM opensky
+WHERE origin IN ('UUEE', 'UUDD', 'UUWW')
+GROUP BY k
+ORDER BY k ASC;
+```
+
+结果：
+
+```text
+     ┌──────────k─┬────c─┬─bar──────────────────────────────────────────────────────────────────────────┐
+  1. │ 2018-12-31 │ 5248 │ ████████████████████████████████████████████████████▍                        │
+  2. │ 2019-01-07 │ 6302 │ ███████████████████████████████████████████████████████████████              │
+  3. │ 2019-01-14 │ 5701 │ █████████████████████████████████████████████████████████                    │
+  4. │ 2019-01-21 │ 5638 │ ████████████████████████████████████████████████████████▍                    │
+  5. │ 2019-01-28 │ 5731 │ █████████████████████████████████████████████████████████▎                   │
+  6. │ 2019-02-04 │ 5683 │ ████████████████████████████████████████████████████████▋                    │
+  7. │ 2019-02-11 │ 5759 │ █████████████████████████████████████████████████████████▌                   │
+  8. │ 2019-02-18 │ 5736 │ █████████████████████████████████████████████████████████▎                   │
+  9. │ 2019-02-25 │ 5873 │ ██████████████████████████████████████████████████████████▋                  │
+ 10. │ 2019-03-04 │ 5965 │ ███████████████████████████████████████████████████████████▋                 │
+ 11. │ 2019-03-11 │ 5900 │ ███████████████████████████████████████████████████████████                  │
+ 12. │ 2019-03-18 │ 5823 │ ██████████████████████████████████████████████████████████▏                  │
+ 13. │ 2019-03-25 │ 5899 │ ██████████████████████████████████████████████████████████▊                  │
+ 14. │ 2019-04-01 │ 6043 │ ████████████████████████████████████████████████████████████▍                │
+ 15. │ 2019-04-08 │ 6098 │ ████████████████████████████████████████████████████████████▊                │
+ 16. │ 2019-04-15 │ 6196 │ █████████████████████████████████████████████████████████████▊               │
+ 17. │ 2019-04-22 │ 6486 │ ████████████████████████████████████████████████████████████████▋            │
+ 18. │ 2019-04-29 │ 6682 │ ██████████████████████████████████████████████████████████████████▋          │
+ 19. │ 2019-05-06 │ 6739 │ ███████████████████████████████████████████████████████████████████▍         │
+ 20. │ 2019-05-13 │ 6600 │ ██████████████████████████████████████████████████████████████████           │
+ 21. │ 2019-05-20 │ 6575 │ █████████████████████████████████████████████████████████████████▋           │
+ 22. │ 2019-05-27 │ 6786 │ ███████████████████████████████████████████████████████████████████▋         │
+ 23. │ 2019-06-03 │ 6872 │ ████████████████████████████████████████████████████████████████████▋        │
+ 24. │ 2019-06-10 │ 7045 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 25. │ 2019-06-17 │ 7045 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 26. │ 2019-06-24 │ 6852 │ ████████████████████████████████████████████████████████████████████▌        │
+ 27. │ 2019-07-01 │ 7248 │ ████████████████████████████████████████████████████████████████████████▍    │
+ 28. │ 2019-07-08 │ 7284 │ ████████████████████████████████████████████████████████████████████████▋    │
+ 29. │ 2019-07-15 │ 7142 │ ███████████████████████████████████████████████████████████████████████▍     │
+ 30. │ 2019-07-22 │ 7108 │ ███████████████████████████████████████████████████████████████████████      │
+ 31. │ 2019-07-29 │ 7251 │ ████████████████████████████████████████████████████████████████████████▌    │
+ 32. │ 2019-08-05 │ 7403 │ ██████████████████████████████████████████████████████████████████████████   │
+ 33. │ 2019-08-12 │ 7457 │ ██████████████████████████████████████████████████████████████████████████▌  │
+ 34. │ 2019-08-19 │ 7502 │ ███████████████████████████████████████████████████████████████████████████  │
+ 35. │ 2019-08-26 │ 7540 │ ███████████████████████████████████████████████████████████████████████████▍ │
+ 36. │ 2019-09-02 │ 7237 │ ████████████████████████████████████████████████████████████████████████▎    │
+ 37. │ 2019-09-09 │ 7328 │ █████████████████████████████████████████████████████████████████████████▎   │
+ 38. │ 2019-09-16 │ 5566 │ ███████████████████████████████████████████████████████▋                     │
+ 39. │ 2019-09-23 │ 7049 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 40. │ 2019-09-30 │ 6880 │ ████████████████████████████████████████████████████████████████████▋        │
+ 41. │ 2019-10-07 │ 6518 │ █████████████████████████████████████████████████████████████████▏           │
+ 42. │ 2019-10-14 │ 6688 │ ██████████████████████████████████████████████████████████████████▊          │
+ 43. │ 2019-10-21 │ 6667 │ ██████████████████████████████████████████████████████████████████▋          │
+ 44. │ 2019-10-28 │ 6303 │ ███████████████████████████████████████████████████████████████              │
+ 45. │ 2019-11-04 │ 6298 │ ██████████████████████████████████████████████████████████████▊              │
+ 46. │ 2019-11-11 │ 6137 │ █████████████████████████████████████████████████████████████▎               │
+ 47. │ 2019-11-18 │ 6051 │ ████████████████████████████████████████████████████████████▌                │
+ 48. │ 2019-11-25 │ 5820 │ ██████████████████████████████████████████████████████████▏                  │
+ 49. │ 2019-12-02 │ 5942 │ ███████████████████████████████████████████████████████████▍                 │
+ 50. │ 2019-12-09 │ 4891 │ ████████████████████████████████████████████████▊                            │
+ 51. │ 2019-12-16 │ 5682 │ ████████████████████████████████████████████████████████▋                    │
+ 52. │ 2019-12-23 │ 6111 │ █████████████████████████████████████████████████████████████                │
+ 53. │ 2019-12-30 │ 5870 │ ██████████████████████████████████████████████████████████▋                  │
+ 54. │ 2020-01-06 │ 5953 │ ███████████████████████████████████████████████████████████▌                 │
+ 55. │ 2020-01-13 │ 5698 │ ████████████████████████████████████████████████████████▊                    │
+ 56. │ 2020-01-20 │ 5339 │ █████████████████████████████████████████████████████▍                       │
+ 57. │ 2020-01-27 │ 5566 │ ███████████████████████████████████████████████████████▋                     │
+ 58. │ 2020-02-03 │ 5801 │ ██████████████████████████████████████████████████████████                   │
+ 59. │ 2020-02-10 │ 5692 │ ████████████████████████████████████████████████████████▊                    │
+ 60. │ 2020-02-17 │ 5912 │ ███████████████████████████████████████████████████████████                  │
+ 61. │ 2020-02-24 │ 6031 │ ████████████████████████████████████████████████████████████▎                │
+ 62. │ 2020-03-02 │ 6105 │ █████████████████████████████████████████████████████████████                │
+ 63. │ 2020-03-09 │ 5823 │ ██████████████████████████████████████████████████████████▏                  │
+ 64. │ 2020-03-16 │ 4659 │ ██████████████████████████████████████████████▌                              │
+ 65. │ 2020-03-23 │ 3720 │ █████████████████████████████████████▏                                       │
+ 66. │ 2020-03-30 │ 1720 │ █████████████████▏                                                           │
+ 67. │ 2020-04-06 │  849 │ ████████▍                                                                    │
+ 68. │ 2020-04-13 │  710 │ ███████                                                                      │
+ 69. │ 2020-04-20 │  725 │ ███████▏                                                                     │
+ 70. │ 2020-04-27 │  920 │ █████████▏                                                                   │
+ 71. │ 2020-05-04 │  859 │ ████████▌                                                                    │
+ 72. │ 2020-05-11 │ 1047 │ ██████████▍                                                                  │
+ 73. │ 2020-05-18 │ 1135 │ ███████████▎                                                                 │
+ 74. │ 2020-05-25 │ 1266 │ ████████████▋                                                                │
+ 75. │ 2020-06-01 │ 1793 │ █████████████████▊                                                           │
+ 76. │ 2020-06-08 │ 1979 │ ███████████████████▋                                                         │
+ 77. │ 2020-06-15 │ 2297 │ ██████████████████████▊                                                      │
+ 78. │ 2020-06-22 │ 2788 │ ███████████████████████████▊                                                 │
+ 79. │ 2020-06-29 │ 3389 │ █████████████████████████████████▊                                           │
+ 80. │ 2020-07-06 │ 3545 │ ███████████████████████████████████▍                                         │
+ 81. │ 2020-07-13 │ 3569 │ ███████████████████████████████████▋                                         │
+ 82. │ 2020-07-20 │ 3784 │ █████████████████████████████████████▋                                       │
+ 83. │ 2020-07-27 │ 3960 │ ███████████████████████████████████████▌                                     │
+ 84. │ 2020-08-03 │ 4323 │ ███████████████████████████████████████████▏                                 │
+ 85. │ 2020-08-10 │ 4581 │ █████████████████████████████████████████████▋                               │
+ 86. │ 2020-08-17 │ 4791 │ ███████████████████████████████████████████████▊                             │
+ 87. │ 2020-08-24 │ 4928 │ █████████████████████████████████████████████████▎                           │
+ 88. │ 2020-08-31 │ 4687 │ ██████████████████████████████████████████████▋                              │
+ 89. │ 2020-09-07 │ 4643 │ ██████████████████████████████████████████████▍                              │
+ 90. │ 2020-09-14 │ 4594 │ █████████████████████████████████████████████▊                               │
+ 91. │ 2020-09-21 │ 4478 │ ████████████████████████████████████████████▋                                │
+ 92. │ 2020-09-28 │ 4382 │ ███████████████████████████████████████████▋                                 │
+ 93. │ 2020-10-05 │ 4261 │ ██████████████████████████████████████████▌                                  │
+ 94. │ 2020-10-12 │ 4243 │ ██████████████████████████████████████████▍                                  │
+ 95. │ 2020-10-19 │ 3941 │ ███████████████████████████████████████▍                                     │
+ 96. │ 2020-10-26 │ 3616 │ ████████████████████████████████████▏                                        │
+ 97. │ 2020-11-02 │ 3586 │ ███████████████████████████████████▋                                         │
+ 98. │ 2020-11-09 │ 3403 │ ██████████████████████████████████                                           │
+ 99. │ 2020-11-16 │ 3336 │ █████████████████████████████████▎                                           │
+100. │ 2020-11-23 │ 3230 │ ████████████████████████████████▎                                            │
+101. │ 2020-11-30 │ 3183 │ ███████████████████████████████▋                                             │
+102. │ 2020-12-07 │ 3285 │ ████████████████████████████████▋                                            │
+103. │ 2020-12-14 │ 3367 │ █████████████████████████████████▋                                           │
+104. │ 2020-12-21 │ 3748 │ █████████████████████████████████████▍                                       │
+105. │ 2020-12-28 │ 3986 │ ███████████████████████████████████████▋                                     │
+106. │ 2021-01-04 │ 3906 │ ███████████████████████████████████████                                      │
+107. │ 2021-01-11 │ 3425 │ ██████████████████████████████████▎                                          │
+108. │ 2021-01-18 │ 3144 │ ███████████████████████████████▍                                             │
+109. │ 2021-01-25 │ 3115 │ ███████████████████████████████▏                                             │
+110. │ 2021-02-01 │ 3285 │ ████████████████████████████████▋                                            │
+111. │ 2021-02-08 │ 3321 │ █████████████████████████████████▏                                           │
+112. │ 2021-02-15 │ 3475 │ ██████████████████████████████████▋                                          │
+113. │ 2021-02-22 │ 3549 │ ███████████████████████████████████▍                                         │
+114. │ 2021-03-01 │ 3755 │ █████████████████████████████████████▌                                       │
+115. │ 2021-03-08 │ 3080 │ ██████████████████████████████▋                                              │
+116. │ 2021-03-15 │ 3789 │ █████████████████████████████████████▊                                       │
+117. │ 2021-03-22 │ 3804 │ ██████████████████████████████████████                                       │
+118. │ 2021-03-29 │ 4238 │ ██████████████████████████████████████████▍                                  │
+119. │ 2021-04-05 │ 4307 │ ███████████████████████████████████████████                                  │
+120. │ 2021-04-12 │ 4225 │ ██████████████████████████████████████████▎                                  │
+121. │ 2021-04-19 │ 4391 │ ███████████████████████████████████████████▊                                 │
+122. │ 2021-04-26 │ 4868 │ ████████████████████████████████████████████████▋                            │
+123. │ 2021-05-03 │ 4977 │ █████████████████████████████████████████████████▋                           │
+124. │ 2021-05-10 │ 5164 │ ███████████████████████████████████████████████████▋                         │
+125. │ 2021-05-17 │ 4986 │ █████████████████████████████████████████████████▋                           │
+126. │ 2021-05-24 │ 5024 │ ██████████████████████████████████████████████████▏                          │
+127. │ 2021-05-31 │ 4824 │ ████████████████████████████████████████████████▏                            │
+128. │ 2021-06-07 │ 5652 │ ████████████████████████████████████████████████████████▌                    │
+129. │ 2021-06-14 │ 5613 │ ████████████████████████████████████████████████████████▏                    │
+130. │ 2021-06-21 │ 6061 │ ████████████████████████████████████████████████████████████▌                │
+131. │ 2021-06-28 │ 2554 │ █████████████████████████▌                                                   │
+     └────────────┴──────┴──────────────────────────────────────────────────────────────────────────────┘
+```
+
+### 在线 Playground {#playground}
+
+你可以使用交互式资源 [Online Playground](https://play.clickhouse.com/play?user=play) 来尝试对此数据集的其他查询。 例如, [执行这个查询](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICBvcmlnaW4sCiAgICBjb3VudCgpLAogICAgcm91bmQoYXZnKGdlb0Rpc3RhbmNlKGxvbmdpdHVkZV8xLCBsYXRpdHVkZV8xLCBsb25naXR1ZGVfMiwgbGF0aXR1ZGVfMikpKSBBUyBkaXN0YW5jZSwKICAgIGJhcihkaXN0YW5jZSwgMCwgMTAwMDAwMDAsIDEwMCkgQVMgYmFyCkZST00gb3BlbnNreQpXSEVSRSBvcmlnaW4gIT0gJycKR1JPVVAgQlkgb3JpZ2luCk9SREVSIEJZIGNvdW50KCkgREVTQwpMSU1JVCAxMDA=). 但是，请注意无法在 Playground 中创建临时表。
diff --git a/docs/zh/getting-started/example-datasets/recipes.mdx b/docs/zh/getting-started/example-datasets/recipes.mdx
index da3a2ac541b..b7ed92962c5 100644
--- a/docs/zh/getting-started/example-datasets/recipes.mdx
+++ b/docs/zh/getting-started/example-datasets/recipes.mdx
@@ -1,9 +1,339 @@
----
-slug: /zh/getting-started/example-datasets/recipes
-sidebar_label: Recipes Dataset
-title: "Recipes Dataset"
+--- 
+slug: /zh/getting-started/example-datasets/recipes 
+sidebar_label: 食谱数据集
+title: "食谱数据集"
 ---
 
-import Content from '@site/docs/en/getting-started/example-datasets/recipes.md';
+RecipeNLG 数据集可在 [此处](https://recipenlg.cs.put.poznan.pl/dataset) 下载。其中包含 220 万份食谱。大小略小于 1 GB。
 
-<Content />
+## 下载并解压数据集
+
+1. 进入下载页面[https://recipenlg.cs.put.poznan.pl/dataset](https://recipenlg.cs.put.poznan.pl/dataset)。 
+2. 接受条款和条件并下载 zip 文件。 
+3. 使用 `unzip` 解压 zip 文件，得到 `full_dataset.csv` 文件。
+
+## 创建表
+
+运行 clickhouse-client 并执行以下 CREATE 请求：
+
+``` sql
+CREATE TABLE recipes
+(
+    title String,
+    ingredients Array(String),
+    directions Array(String),
+    link String,
+    source LowCardinality(String),
+    NER Array(String)
+) ENGINE = MergeTree ORDER BY title;
+```
+
+## 插入数据
+
+运行以下命令：
+
+``` bash
+clickhouse-client --query "
+    INSERT INTO recipes
+    SELECT
+        title,
+        JSONExtract(ingredients, 'Array(String)'),
+        JSONExtract(directions, 'Array(String)'),
+        link,
+        source,
+        JSONExtract(NER, 'Array(String)')
+    FROM input('num UInt32, title String, ingredients String, directions String, link String, source LowCardinality(String), NER String')
+    FORMAT CSVWithNames
+" --input_format_with_names_use_header 0 --format_csv_allow_single_quote 0 --input_format_allow_errors_num 10 < full_dataset.csv
+```
+
+这是一个展示如何解析自定义 CSV，这其中涉及了许多调整。
+
+说明： 
+- 数据集为 CSV 格式，但在插入时需要一些预处理；使用表函数 [input](../../sql-reference/table-functions/input.md) 进行预处理； 
+- CSV 文件的结构在表函数 `input` 的参数中指定； 
+- 字段 `num`（行号）是不需要的 - 可以忽略并从文件中进行解析； 
+- 使用 `FORMAT CSVWithNames`，因为标题不包含第一个字段的名称，因此 CSV 中的标题将被忽略（通过命令行参数 `--input_format_with_names_use_header 0`）； 
+- 文件仅使用双引号将 CSV 字符串括起来；一些字符串没有用双引号括起来，单引号也不能被解析为括起来的字符串 - 所以添加`--format_csv_allow_single_quote 0`参数接受文件中的单引号； 
+- 由于某些 CSV 的字符串的开头包含 `\M/` 因此无法被解析； CSV 中唯一可能以反斜杠开头的值是 `\N`，这个值被解析为 SQL NULL。通过添加`--input_format_allow_errors_num 10`参数，允许在导入过程中跳过 10 个格式错误； 
+- 在数据集中的 Ingredients、directions 和 NER 字段为数组；但这些数组并没有以一般形式表示：这些字段作为 JSON 序列化为字符串，然后放入 CSV 中 - 在导入是将它们解析为字符串，然后使用 [JSONExtract](../../sql-reference/functions/json-functions.md ) 函数将其转换为数组。
+
+## 验证插入的数据
+
+通过检查行数：
+
+请求：
+
+``` sql
+SELECT count() FROM recipes;
+```
+
+结果：
+
+``` text
+┌─count()─┐
+│ 2231141 │
+└─────────┘
+```
+
+## 示例查询
+
+### 按配方数量排列的顶级组件：
+
+在此示例中，我们学习如何使用 [arrayJoin](../../sql-reference/functions/array-join/) 函数将数组扩展为行的集合。
+
+请求：
+
+``` sql
+SELECT
+    arrayJoin(NER) AS k,
+    count() AS c
+FROM recipes
+GROUP BY k
+ORDER BY c DESC
+LIMIT 50
+```
+
+结果：
+
+``` text
+┌─k────────────────────┬──────c─┐
+│ salt                 │ 890741 │
+│ sugar                │ 620027 │
+│ butter               │ 493823 │
+│ flour                │ 466110 │
+│ eggs                 │ 401276 │
+│ onion                │ 372469 │
+│ garlic               │ 358364 │
+│ milk                 │ 346769 │
+│ water                │ 326092 │
+│ vanilla              │ 270381 │
+│ olive oil            │ 197877 │
+│ pepper               │ 179305 │
+│ brown sugar          │ 174447 │
+│ tomatoes             │ 163933 │
+│ egg                  │ 160507 │
+│ baking powder        │ 148277 │
+│ lemon juice          │ 146414 │
+│ Salt                 │ 122557 │
+│ cinnamon             │ 117927 │
+│ sour cream           │ 116682 │
+│ cream cheese         │ 114423 │
+│ margarine            │ 112742 │
+│ celery               │ 112676 │
+│ baking soda          │ 110690 │
+│ parsley              │ 102151 │
+│ chicken              │ 101505 │
+│ onions               │  98903 │
+│ vegetable oil        │  91395 │
+│ oil                  │  85600 │
+│ mayonnaise           │  84822 │
+│ pecans               │  79741 │
+│ nuts                 │  78471 │
+│ potatoes             │  75820 │
+│ carrots              │  75458 │
+│ pineapple            │  74345 │
+│ soy sauce            │  70355 │
+│ black pepper         │  69064 │
+│ thyme                │  68429 │
+│ mustard              │  65948 │
+│ chicken broth        │  65112 │
+│ bacon                │  64956 │
+│ honey                │  64626 │
+│ oregano              │  64077 │
+│ ground beef          │  64068 │
+│ unsalted butter      │  63848 │
+│ mushrooms            │  61465 │
+│ Worcestershire sauce │  59328 │
+│ cornstarch           │  58476 │
+│ green pepper         │  58388 │
+│ Cheddar cheese       │  58354 │
+└──────────────────────┴────────┘
+
+50 rows in set. Elapsed: 0.112 sec. Processed 2.23 million rows, 361.57 MB (19.99 million rows/s., 3.24 GB/s.)
+```
+
+### 最复杂的草莓食谱
+
+``` sql
+SELECT
+    title,
+    length(NER),
+    length(directions)
+FROM recipes
+WHERE has(NER, 'strawberry')
+ORDER BY length(directions) DESC
+LIMIT 10
+```
+
+结果：
+
+``` text
+┌─title────────────────────────────────────────────────────────────┬─length(NER)─┬─length(directions)─┐
+│ Chocolate-Strawberry-Orange Wedding Cake                         │          24 │                126 │
+│ Strawberry Cream Cheese Crumble Tart                             │          19 │                 47 │
+│ Charlotte-Style Ice Cream                                        │          11 │                 45 │
+│ Sinfully Good a Million Layers Chocolate Layer Cake, With Strawb │          31 │                 45 │
+│ Sweetened Berries With Elderflower Sherbet                       │          24 │                 44 │
+│ Chocolate-Strawberry Mousse Cake                                 │          15 │                 42 │
+│ Rhubarb Charlotte with Strawberries and Rum                      │          20 │                 42 │
+│ Chef Joey's Strawberry Vanilla Tart                              │           7 │                 37 │
+│ Old-Fashioned Ice Cream Sundae Cake                              │          17 │                 37 │
+│ Watermelon Cake                                                  │          16 │                 36 │
+└──────────────────────────────────────────────────────────────────┴─────────────┴────────────────────┘
+
+10 rows in set. Elapsed: 0.215 sec. Processed 2.23 million rows, 1.48 GB (10.35 million rows/s., 6.86 GB/s.)
+```
+
+在此示例中，我们使用 [has](../../sql-reference/functions/array-functions/#hasarr-elem) 函数来按过滤数组类型元素并按 directions 的数量进行排序。
+
+有一个婚礼蛋糕需要整个126个步骤来制作！显示 directions：
+
+请求：
+
+``` sql
+SELECT arrayJoin(directions)
+FROM recipes
+WHERE title = 'Chocolate-Strawberry-Orange Wedding Cake'
+```
+
+结果：
+
+``` text
+┌─arrayJoin(directions)───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ Position 1 rack in center and 1 rack in bottom third of oven and preheat to 350F.                                                                                           │
+│ Butter one 5-inch-diameter cake pan with 2-inch-high sides, one 8-inch-diameter cake pan with 2-inch-high sides and one 12-inch-diameter cake pan with 2-inch-high sides.   │
+│ Dust pans with flour; line bottoms with parchment.                                                                                                                          │
+│ Combine 1/3 cup orange juice and 2 ounces unsweetened chocolate in heavy small saucepan.                                                                                    │
+│ Stir mixture over medium-low heat until chocolate melts.                                                                                                                    │
+│ Remove from heat.                                                                                                                                                           │
+│ Gradually mix in 1 2/3 cups orange juice.                                                                                                                                   │
+│ Sift 3 cups flour, 2/3 cup cocoa, 2 teaspoons baking soda, 1 teaspoon salt and 1/2 teaspoon baking powder into medium bowl.                                                 │
+│ using electric mixer, beat 1 cup (2 sticks) butter and 3 cups sugar in large bowl until blended (mixture will look grainy).                                                 │
+│ Add 4 eggs, 1 at a time, beating to blend after each.                                                                                                                       │
+│ Beat in 1 tablespoon orange peel and 1 tablespoon vanilla extract.                                                                                                          │
+│ Add dry ingredients alternately with orange juice mixture in 3 additions each, beating well after each addition.                                                            │
+│ Mix in 1 cup chocolate chips.                                                                                                                                               │
+│ Transfer 1 cup plus 2 tablespoons batter to prepared 5-inch pan, 3 cups batter to prepared 8-inch pan and remaining batter (about 6 cups) to 12-inch pan.                   │
+│ Place 5-inch and 8-inch pans on center rack of oven.                                                                                                                        │
+│ Place 12-inch pan on lower rack of oven.                                                                                                                                    │
+│ Bake cakes until tester inserted into center comes out clean, about 35 minutes.                                                                                             │
+│ Transfer cakes in pans to racks and cool completely.                                                                                                                        │
+│ Mark 4-inch diameter circle on one 6-inch-diameter cardboard cake round.                                                                                                    │
+│ Cut out marked circle.                                                                                                                                                      │
+│ Mark 7-inch-diameter circle on one 8-inch-diameter cardboard cake round.                                                                                                    │
+│ Cut out marked circle.                                                                                                                                                      │
+│ Mark 11-inch-diameter circle on one 12-inch-diameter cardboard cake round.                                                                                                  │
+│ Cut out marked circle.                                                                                                                                                      │
+│ Cut around sides of 5-inch-cake to loosen.                                                                                                                                  │
+│ Place 4-inch cardboard over pan.                                                                                                                                            │
+│ Hold cardboard and pan together; turn cake out onto cardboard.                                                                                                              │
+│ Peel off parchment.Wrap cakes on its cardboard in foil.                                                                                                                     │
+│ Repeat turning out, peeling off parchment and wrapping cakes in foil, using 7-inch cardboard for 8-inch cake and 11-inch cardboard for 12-inch cake.                        │
+│ Using remaining ingredients, make 1 more batch of cake batter and bake 3 more cake layers as described above.                                                               │
+│ Cool cakes in pans.                                                                                                                                                         │
+│ Cover cakes in pans tightly with foil.                                                                                                                                      │
+│ (Can be prepared ahead.                                                                                                                                                     │
+│ Let stand at room temperature up to 1 day or double-wrap all cake layers and freeze up to 1 week.                                                                           │
+│ Bring cake layers to room temperature before using.)                                                                                                                        │
+│ Place first 12-inch cake on its cardboard on work surface.                                                                                                                  │
+│ Spread 2 3/4 cups ganache over top of cake and all the way to edge.                                                                                                         │
+│ Spread 2/3 cup jam over ganache, leaving 1/2-inch chocolate border at edge.                                                                                                 │
+│ Drop 1 3/4 cups white chocolate frosting by spoonfuls over jam.                                                                                                             │
+│ Gently spread frosting over jam, leaving 1/2-inch chocolate border at edge.                                                                                                 │
+│ Rub some cocoa powder over second 12-inch cardboard.                                                                                                                        │
+│ Cut around sides of second 12-inch cake to loosen.                                                                                                                          │
+│ Place cardboard, cocoa side down, over pan.                                                                                                                                 │
+│ Turn cake out onto cardboard.                                                                                                                                               │
+│ Peel off parchment.                                                                                                                                                         │
+│ Carefully slide cake off cardboard and onto filling on first 12-inch cake.                                                                                                  │
+│ Refrigerate.                                                                                                                                                                │
+│ Place first 8-inch cake on its cardboard on work surface.                                                                                                                   │
+│ Spread 1 cup ganache over top all the way to edge.                                                                                                                          │
+│ Spread 1/4 cup jam over, leaving 1/2-inch chocolate border at edge.                                                                                                         │
+│ Drop 1 cup white chocolate frosting by spoonfuls over jam.                                                                                                                  │
+│ Gently spread frosting over jam, leaving 1/2-inch chocolate border at edge.                                                                                                 │
+│ Rub some cocoa over second 8-inch cardboard.                                                                                                                                │
+│ Cut around sides of second 8-inch cake to loosen.                                                                                                                           │
+│ Place cardboard, cocoa side down, over pan.                                                                                                                                 │
+│ Turn cake out onto cardboard.                                                                                                                                               │
+│ Peel off parchment.                                                                                                                                                         │
+│ Slide cake off cardboard and onto filling on first 8-inch cake.                                                                                                             │
+│ Refrigerate.                                                                                                                                                                │
+│ Place first 5-inch cake on its cardboard on work surface.                                                                                                                   │
+│ Spread 1/2 cup ganache over top of cake and all the way to edge.                                                                                                            │
+│ Spread 2 tablespoons jam over, leaving 1/2-inch chocolate border at edge.                                                                                                   │
+│ Drop 1/3 cup white chocolate frosting by spoonfuls over jam.                                                                                                                │
+│ Gently spread frosting over jam, leaving 1/2-inch chocolate border at edge.                                                                                                 │
+│ Rub cocoa over second 6-inch cardboard.                                                                                                                                     │
+│ Cut around sides of second 5-inch cake to loosen.                                                                                                                           │
+│ Place cardboard, cocoa side down, over pan.                                                                                                                                 │
+│ Turn cake out onto cardboard.                                                                                                                                               │
+│ Peel off parchment.                                                                                                                                                         │
+│ Slide cake off cardboard and onto filling on first 5-inch cake.                                                                                                             │
+│ Chill all cakes 1 hour to set filling.                                                                                                                                      │
+│ Place 12-inch tiered cake on its cardboard on revolving cake stand.                                                                                                         │
+│ Spread 2 2/3 cups frosting over top and sides of cake as a first coat.                                                                                                      │
+│ Refrigerate cake.                                                                                                                                                           │
+│ Place 8-inch tiered cake on its cardboard on cake stand.                                                                                                                    │
+│ Spread 1 1/4 cups frosting over top and sides of cake as a first coat.                                                                                                      │
+│ Refrigerate cake.                                                                                                                                                           │
+│ Place 5-inch tiered cake on its cardboard on cake stand.                                                                                                                    │
+│ Spread 3/4 cup frosting over top and sides of cake as a first coat.                                                                                                         │
+│ Refrigerate all cakes until first coats of frosting set, about 1 hour.                                                                                                      │
+│ (Cakes can be made to this point up to 1 day ahead; cover and keep refrigerate.)                                                                                            │
+│ Prepare second batch of frosting, using remaining frosting ingredients and following directions for first batch.                                                            │
+│ Spoon 2 cups frosting into pastry bag fitted with small star tip.                                                                                                           │
+│ Place 12-inch cake on its cardboard on large flat platter.                                                                                                                  │
+│ Place platter on cake stand.                                                                                                                                                │
+│ Using icing spatula, spread 2 1/2 cups frosting over top and sides of cake; smooth top.                                                                                     │
+│ Using filled pastry bag, pipe decorative border around top edge of cake.                                                                                                    │
+│ Refrigerate cake on platter.                                                                                                                                                │
+│ Place 8-inch cake on its cardboard on cake stand.                                                                                                                           │
+│ Using icing spatula, spread 1 1/2 cups frosting over top and sides of cake; smooth top.                                                                                     │
+│ Using pastry bag, pipe decorative border around top edge of cake.                                                                                                           │
+│ Refrigerate cake on its cardboard.                                                                                                                                          │
+│ Place 5-inch cake on its cardboard on cake stand.                                                                                                                           │
+│ Using icing spatula, spread 3/4 cup frosting over top and sides of cake; smooth top.                                                                                        │
+│ Using pastry bag, pipe decorative border around top edge of cake, spooning more frosting into bag if necessary.                                                             │
+│ Refrigerate cake on its cardboard.                                                                                                                                          │
+│ Keep all cakes refrigerated until frosting sets, about 2 hours.                                                                                                             │
+│ (Can be prepared 2 days ahead.                                                                                                                                              │
+│ Cover loosely; keep refrigerated.)                                                                                                                                          │
+│ Place 12-inch cake on platter on work surface.                                                                                                                              │
+│ Press 1 wooden dowel straight down into and completely through center of cake.                                                                                              │
+│ Mark dowel 1/4 inch above top of frosting.                                                                                                                                  │
+│ Remove dowel and cut with serrated knife at marked point.                                                                                                                   │
+│ Cut 4 more dowels to same length.                                                                                                                                           │
+│ Press 1 cut dowel back into center of cake.                                                                                                                                 │
+│ Press remaining 4 cut dowels into cake, positioning 3 1/2 inches inward from cake edges and spacing evenly.                                                                 │
+│ Place 8-inch cake on its cardboard on work surface.                                                                                                                         │
+│ Press 1 dowel straight down into and completely through center of cake.                                                                                                     │
+│ Mark dowel 1/4 inch above top of frosting.                                                                                                                                  │
+│ Remove dowel and cut with serrated knife at marked point.                                                                                                                   │
+│ Cut 3 more dowels to same length.                                                                                                                                           │
+│ Press 1 cut dowel back into center of cake.                                                                                                                                 │
+│ Press remaining 3 cut dowels into cake, positioning 2 1/2 inches inward from edges and spacing evenly.                                                                      │
+│ Using large metal spatula as aid, place 8-inch cake on its cardboard atop dowels in 12-inch cake, centering carefully.                                                      │
+│ Gently place 5-inch cake on its cardboard atop dowels in 8-inch cake, centering carefully.                                                                                  │
+│ Using citrus stripper, cut long strips of orange peel from oranges.                                                                                                         │
+│ Cut strips into long segments.                                                                                                                                              │
+│ To make orange peel coils, wrap peel segment around handle of wooden spoon; gently slide peel off handle so that peel keeps coiled shape.                                   │
+│ Garnish cake with orange peel coils, ivy or mint sprigs, and some berries.                                                                                                  │
+│ (Assembled cake can be made up to 8 hours ahead.                                                                                                                            │
+│ Let stand at cool room temperature.)                                                                                                                                        │
+│ Remove top and middle cake tiers.                                                                                                                                           │
+│ Remove dowels from cakes.                                                                                                                                                   │
+│ Cut top and middle cakes into slices.                                                                                                                                       │
+│ To cut 12-inch cake: Starting 3 inches inward from edge and inserting knife straight down, cut through from top to bottom to make 6-inch-diameter circle in center of cake. │
+│ Cut outer portion of cake into slices; cut inner portion into slices and serve with strawberries.                                                                           │
+└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+126 rows in set. Elapsed: 0.011 sec. Processed 8.19 thousand rows, 5.34 MB (737.75 thousand rows/s., 480.59 MB/s.)
+```
+
+### 在线 Playground
+
+此数据集也可在 [在线 Playground](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==) 中体验。
+
+[原文链接](https://clickhouse.com/docs/en/getting-started/example-datasets/recipes/)
diff --git a/docs/zh/getting-started/example-datasets/uk-price-paid.mdx b/docs/zh/getting-started/example-datasets/uk-price-paid.mdx
index 3a14a3ce55d..058f0ae421a 100644
--- a/docs/zh/getting-started/example-datasets/uk-price-paid.mdx
+++ b/docs/zh/getting-started/example-datasets/uk-price-paid.mdx
@@ -42,9 +42,9 @@ ORDER BY (postcode1, postcode2, addr1, addr2);
 
 - 将`postcode` 拆分为两个不同的列 - `postcode1` 和 `postcode2`，因为这更适合存储和查询 
 - 将`time` 字段转换为日期为它只包含 00:00 时间 
-- 忽略 [UUid](../../sql-reference/data-types/uuid.md) 字段，因为我们不需要它进行分析 
-- 使用 [transform](../../sql-reference/functions/other-functions.md#transform) 函数将 `Enum` 字段 `type` 和 `duration` 转换为更易读的 `Enum` 字段 
-- 将 `is_new` 字段从单字符串（` Y`/`N`) 到 [UInt8](../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-uint256-int8-int16-int32-int64 -int128-int256) 字段为 0 或 1 
+- 忽略 [UUid](/docs/zh/sql-reference/data-types/uuid.md) 字段，因为我们不需要它进行分析 
+- 使用 [transform](/docs/zh/sql-reference/functions/other-functions.md#transform) 函数将 `Enum` 字段 `type` 和 `duration` 转换为更易读的 `Enum` 字段 
+- 将 `is_new` 字段从单字符串（` Y`/`N`) 到 [UInt8](/docs/zh/sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-uint256-int8-int16-int32-int64 -int128-int256) 字段为 0 或 1 
 - 删除最后两列，因为它们都具有相同的值（即 0）
 
 `url` 函数将来自网络服务器的数据流式传输到 ClickHouse 表中。以下命令将 500 万行插入到 `uk_price_paid` 表中：
@@ -342,7 +342,7 @@ LIMIT 100
 
 ## 使用 Projection 加速查询 {#speedup-with-projections}
 
-[Projections](../../sql-reference/statements/alter/projection.md) 允许我们通过存储任意格式的预先聚合的数据来提高查询速度。在此示例中，我们创建了一个按年份、地区和城镇分组的房产的平均价格、总价格和数量的 Projection。在执行时，如果 ClickHouse 认为 Projection 可以提高查询的性能，它将使用 Projection（何时使用由 ClickHouse 决定）。
+[Projections](/docs/zh/sql-reference/statements/alter/projection.mdx) 允许我们通过存储任意格式的预先聚合的数据来提高查询速度。在此示例中，我们创建了一个按年份、地区和城镇分组的房产的平均价格、总价格和数量的 Projection。在执行时，如果 ClickHouse 认为 Projection 可以提高查询的性能，它将使用 Projection（何时使用由 ClickHouse 决定）。
 
 ### 构建投影{#build-projection}
 
diff --git a/docs/zh/sql-reference/data-types/date.md b/docs/zh/sql-reference/data-types/date.md
index 9b1acdbe939..a8874151e75 100644
--- a/docs/zh/sql-reference/data-types/date.md
+++ b/docs/zh/sql-reference/data-types/date.md
@@ -3,7 +3,7 @@ slug: /zh/sql-reference/data-types/date
 ---
 # 日期 {#date}
 
-日期类型，用两个字节存储，表示从 1970-01-01 (无符号) 到当前的日期值。允许存储从 Unix 纪元开始到编译阶段定义的上限阈值常量（目前上限是2149年，但最终完全支持的年份为2148）。最小值输出为1970-01-01。
+日期类型，用两个字节存储，表示从 1970-01-01 (无符号) 到当前的日期值。允许存储从 Unix 纪元开始到编译阶段定义的上限阈值常量（目前上限是2106年，但最终完全支持的年份为2105）。最小值输出为1970-01-01。
 
 值的范围: \[1970-01-01, 2149-06-06\]。
 
diff --git a/docs/zh/sql-reference/functions/other-functions.md b/docs/zh/sql-reference/functions/other-functions.md
index a475420ba64..62d2a377ff1 100644
--- a/docs/zh/sql-reference/functions/other-functions.md
+++ b/docs/zh/sql-reference/functions/other-functions.md
@@ -237,7 +237,7 @@ ORDER BY c DESC
 
 ``` sql
 SELECT
-    transform(domain(Referer), ['yandex.ru', 'google.ru', 'vk.com'], ['www.yandex', 'example.com']) AS s,
+    transform(domain(Referer), ['yandex.ru', 'google.ru', 'vkontakte.ru'], ['www.yandex', 'example.com', 'vk.com']) AS s,
     count() AS c
 FROM test.hits
 GROUP BY domain(Referer)
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index e616cb8cf72..58569a32619 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -1108,15 +1108,21 @@ void Client::processConfig()
     else
         format = config().getString("format", is_interactive ? "PrettyCompact" : "TabSeparated");
 
-    format_max_block_size = config().getInt("format_max_block_size", global_context->getSettingsRef().max_block_size);
+    format_max_block_size = config().getUInt64("format_max_block_size",
+        global_context->getSettingsRef().max_block_size);
 
     insert_format = "Values";
 
     /// Setting value from cmd arg overrides one from config
     if (global_context->getSettingsRef().max_insert_block_size.changed)
+    {
         insert_format_max_block_size = global_context->getSettingsRef().max_insert_block_size;
+    }
     else
-        insert_format_max_block_size = config().getInt("insert_format_max_block_size", global_context->getSettingsRef().max_insert_block_size);
+    {
+        insert_format_max_block_size = config().getUInt64("insert_format_max_block_size",
+            global_context->getSettingsRef().max_insert_block_size);
+    }
 
     ClientInfo & client_info = global_context->getClientInfo();
     client_info.setInitialQuery();
diff --git a/programs/client/clickhouse-client.xml b/programs/client/clickhouse-client.xml
index 66e7afd8f8c..00f5b26eddf 100644
--- a/programs/client/clickhouse-client.xml
+++ b/programs/client/clickhouse-client.xml
@@ -19,7 +19,6 @@
             {host}
             {port}
             {user}
-            {database}
             {display_name}
         Terminal colors: https://misc.flogisoft.com/bash/tip_colors_and_formatting
         See also: https://wiki.hackzine.org/development/misc/readline-color-prompt.html
diff --git a/programs/copier/ZooKeeperStaff.h b/programs/copier/ZooKeeperStaff.h
index a9e04578607..3d4a11186e3 100644
--- a/programs/copier/ZooKeeperStaff.h
+++ b/programs/copier/ZooKeeperStaff.h
@@ -47,8 +47,8 @@ public:
     WrappingUInt32 epoch;
     WrappingUInt32 counter;
     explicit Zxid(UInt64 _zxid)
-            : epoch(_zxid >> 32)
-            , counter(_zxid)
+            : epoch(static_cast<UInt32>(_zxid >> 32))
+            , counter(static_cast<UInt32>(_zxid))
     {}
 
     bool operator<=(const Zxid & other) const
diff --git a/programs/diagnostics/go.mod b/programs/diagnostics/go.mod
index 19fc2ec8202..fb1568ea491 100644
--- a/programs/diagnostics/go.mod
+++ b/programs/diagnostics/go.mod
@@ -1,6 +1,6 @@
 module github.com/ClickHouse/ClickHouse/programs/diagnostics
 
-go 1.17
+go 1.19
 
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.0.12
diff --git a/programs/diagnostics/go.sum b/programs/diagnostics/go.sum
index dd1b18ce0c7..aa69472e9c2 100644
--- a/programs/diagnostics/go.sum
+++ b/programs/diagnostics/go.sum
@@ -65,7 +65,6 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/ClickHouse/clickhouse-go v1.5.3 h1:Vok8zUb/wlqc9u8oEqQzBMBRDoFd8NxPRqgYEqMnV88=
 github.com/ClickHouse/clickhouse-go v1.5.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 github.com/ClickHouse/clickhouse-go/v2 v2.0.12 h1:Nbl/NZwoM6LGJm7smNBgvtdr/rxjlIssSW3eG/Nmb9E=
 github.com/ClickHouse/clickhouse-go/v2 v2.0.12/go.mod h1:u4RoNQLLM2W6hNSPYrIESLJqaWSInZVmfM+MlaAhXcg=
@@ -457,7 +456,6 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
-github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -663,9 +661,7 @@ github.com/paulmach/protoscan v0.2.1-0.20210522164731-4e53c6875432/go.mod h1:2sV
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v4 v4.1.12/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE=
 github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -717,7 +713,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
 github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
-github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
@@ -1083,7 +1078,6 @@ golang.org/x/sys v0.0.0-20211109184856-51b60fd695b3/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1202,7 +1196,6 @@ google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdr
 google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
 google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
 google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw=
-google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/programs/disks/DisksApp.cpp b/programs/disks/DisksApp.cpp
index 749ccb3e503..91472a8df33 100644
--- a/programs/disks/DisksApp.cpp
+++ b/programs/disks/DisksApp.cpp
@@ -57,7 +57,7 @@ void DisksApp::addOptions(
         ("config-file,C", po::value<String>(), "Set config file")
         ("disk", po::value<String>(), "Set disk name")
         ("command_name", po::value<String>(), "Name for command to do")
-        ("send-logs", "Send logs")
+        ("save-logs", "Save logs to a file")
         ("log-level", po::value<String>(), "Logging level")
         ;
 
@@ -82,10 +82,10 @@ void DisksApp::processOptions()
         config().setString("config-file", options["config-file"].as<String>());
     if (options.count("disk"))
         config().setString("disk", options["disk"].as<String>());
-    if (options.count("send-logs"))
-        config().setBool("send-logs", true);
+    if (options.count("save-logs"))
+        config().setBool("save-logs", true);
     if (options.count("log-level"))
-        Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
+        config().setString("log-level", options["log-level"].as<String>());
 }
 
 void DisksApp::init(std::vector<String> & common_arguments)
@@ -149,15 +149,6 @@ void DisksApp::parseAndCheckOptions(
 
 int DisksApp::main(const std::vector<String> & /*args*/)
 {
-    if (config().has("send-logs"))
-    {
-        auto log_level = config().getString("log-level", "trace");
-        Poco::Logger::root().setLevel(Poco::Logger::parseLevel(log_level));
-
-        auto log_path = config().getString("logger.clickhouse-disks", "/var/log/clickhouse-server/clickhouse-disks.log");
-        Poco::Logger::root().setChannel(Poco::AutoPtr<Poco::FileChannel>(new Poco::FileChannel(log_path)));
-    }
-
     if (config().has("config-file") || fs::exists(getDefaultConfigFileName()))
     {
         String config_path = config().getString("config-file", getDefaultConfigFileName());
@@ -171,6 +162,20 @@ int DisksApp::main(const std::vector<String> & /*args*/)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "No config-file specifiged");
     }
 
+    if (config().has("save-logs"))
+    {
+        auto log_level = config().getString("log-level", "trace");
+        Poco::Logger::root().setLevel(Poco::Logger::parseLevel(log_level));
+
+        auto log_path = config().getString("logger.clickhouse-disks", "/var/log/clickhouse-server/clickhouse-disks.log");
+        Poco::Logger::root().setChannel(Poco::AutoPtr<Poco::FileChannel>(new Poco::FileChannel(log_path)));
+    }
+    else
+    {
+        auto log_level = config().getString("log-level", "none");
+        Poco::Logger::root().setLevel(Poco::Logger::parseLevel(log_level));
+    }
+
     registerDisks();
     registerFormats();
 
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index 00c86571265..8028ccde72d 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -893,7 +893,7 @@ namespace
         if (fs::exists(pid_file))
         {
             ReadBufferFromFile in(pid_file.string());
-            UInt64 pid;
+            Int32 pid;
             if (tryReadIntText(pid, in))
             {
                 fmt::print("{} file exists and contains pid = {}.\n", pid_file.string(), pid);
@@ -982,9 +982,9 @@ namespace
         return 0;
     }
 
-    UInt64 isRunning(const fs::path & pid_file)
+    int isRunning(const fs::path & pid_file)
     {
-        UInt64 pid = 0;
+        int pid = 0;
 
         if (fs::exists(pid_file))
         {
@@ -1057,7 +1057,7 @@ namespace
         if (force && do_not_kill)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Specified flags are incompatible");
 
-        UInt64 pid = isRunning(pid_file);
+        int pid = isRunning(pid_file);
 
         if (!pid)
             return 0;
diff --git a/programs/keeper/CMakeLists.txt b/programs/keeper/CMakeLists.txt
index ce176ccade5..9266a4ca419 100644
--- a/programs/keeper/CMakeLists.txt
+++ b/programs/keeper/CMakeLists.txt
@@ -45,6 +45,7 @@ if (BUILD_STANDALONE_KEEPER)
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperLogStore.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperServer.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperSnapshotManager.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperSnapshotManagerS3.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperStateMachine.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperStateManager.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperStorage.cpp
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
index 5077f59b7dd..e1d03b40b66 100644
--- a/programs/keeper/Keeper.cpp
+++ b/programs/keeper/Keeper.cpp
@@ -68,12 +68,12 @@ namespace ErrorCodes
 namespace
 {
 
-int waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t seconds_to_wait)
+size_t waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t seconds_to_wait)
 {
-    const int sleep_max_ms = 1000 * seconds_to_wait;
-    const int sleep_one_ms = 100;
-    int sleep_current_ms = 0;
-    int current_connections = 0;
+    const size_t sleep_max_ms = 1000 * seconds_to_wait;
+    const size_t sleep_one_ms = 100;
+    size_t sleep_current_ms = 0;
+    size_t current_connections = 0;
     for (;;)
     {
         current_connections = 0;
@@ -441,7 +441,7 @@ int Keeper::main(const std::vector<std::string> & /*args*/)
         main_config_reloader.reset();
 
         LOG_DEBUG(log, "Waiting for current connections to Keeper to finish.");
-        int current_connections = 0;
+        size_t current_connections = 0;
         for (auto & server : *servers)
         {
             server.stop();
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index e7bc019f597..070f86aaad2 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -546,9 +546,14 @@ void LocalServer::processConfig()
 
     /// Setting value from cmd arg overrides one from config
     if (global_context->getSettingsRef().max_insert_block_size.changed)
+    {
         insert_format_max_block_size = global_context->getSettingsRef().max_insert_block_size;
+    }
     else
-        insert_format_max_block_size = config().getInt("insert_format_max_block_size", global_context->getSettingsRef().max_insert_block_size);
+    {
+        insert_format_max_block_size = config().getUInt64("insert_format_max_block_size",
+            global_context->getSettingsRef().max_insert_block_size);
+    }
 
     /// Sets external authenticators config (LDAP, Kerberos).
     global_context->setExternalAuthenticatorsConfig(config());
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index bdf26c9e730..7fdc5a54d8a 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -279,7 +279,7 @@ Float transformFloatMantissa(Float x, UInt64 seed)
     constexpr size_t mantissa_num_bits = std::is_same_v<Float, Float32> ? 23 : 52;
 
     UInt x_uint = bit_cast<UInt>(x);
-    x_uint = feistelNetwork(x_uint, mantissa_num_bits, seed);
+    x_uint = static_cast<UInt>(feistelNetwork(x_uint, mantissa_num_bits, seed));
     return bit_cast<Float>(x_uint);
 }
 
@@ -511,13 +511,13 @@ public:
         for (size_t i = 0; i < size; ++i)
         {
             UInt32 src_datetime = src_data[i];
-            UInt32 src_date = date_lut.toDate(src_datetime);
+            UInt32 src_date = static_cast<UInt32>(date_lut.toDate(src_datetime));
 
             Int32 src_diff = src_datetime - src_prev_value;
-            Int32 res_diff = transformSigned(src_diff, seed);
+            Int32 res_diff = static_cast<Int32>(transformSigned(src_diff, seed));
 
             UInt32 new_datetime = res_prev_value + res_diff;
-            UInt32 new_time = new_datetime - date_lut.toDate(new_datetime);
+            UInt32 new_time = new_datetime - static_cast<UInt32>(date_lut.toDate(new_datetime));
             res_data[i] = src_date + new_time;
 
             src_prev_value = src_datetime;
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 0ea2495af78..bf11947d436 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -183,7 +183,10 @@ void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServ
         if (columns.empty())
             throw Exception("Columns definition was not returned", ErrorCodes::LOGICAL_ERROR);
 
-        WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
+        WriteBufferFromHTTPServerResponse out(
+            response,
+            request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD,
+            keep_alive_timeout);
         try
         {
             writeStringBinary(columns.toString(), out);
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.cpp b/programs/odbc-bridge/ODBCBlockInputStream.cpp
index dec4c249b4b..5bbc39dc559 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockInputStream.cpp
@@ -139,7 +139,7 @@ void ODBCSource::insertValue(
             readDateTimeText(time, in, assert_cast<const DataTypeDateTime *>(data_type.get())->getTimeZone());
             if (time < 0)
                 time = 0;
-            assert_cast<ColumnUInt32 &>(column).insertValue(time);
+            assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(time));
             break;
         }
         case ValueType::vtDateTime64:
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index a296f87b084..b412b579539 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -82,13 +82,17 @@
 #if USE_BORINGSSL
 #include <Compression/CompressionCodecEncrypted.h>
 #endif
+#include <Server/HTTP/HTTPServerConnectionFactory.h>
 #include <Server/MySQLHandlerFactory.h>
 #include <Server/PostgreSQLHandlerFactory.h>
+#include <Server/ProxyV1HandlerFactory.h>
+#include <Server/TLSHandlerFactory.h>
 #include <Server/CertificateReloader.h>
 #include <Server/ProtocolServerAdapter.h>
 #include <Server/HTTP/HTTPServer.h>
 #include <Interpreters/AsynchronousInsertQueue.h>
 #include <filesystem>
+#include <unordered_set>
 
 #include "config.h"
 #include "config_version.h"
@@ -224,12 +228,12 @@ catch (...)
             path));
 }
 
-int waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t seconds_to_wait)
+size_t waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t seconds_to_wait)
 {
-    const int sleep_max_ms = 1000 * seconds_to_wait;
-    const int sleep_one_ms = 100;
-    int sleep_current_ms = 0;
-    int current_connections = 0;
+    const size_t sleep_max_ms = 1000 * seconds_to_wait;
+    const size_t sleep_one_ms = 100;
+    size_t sleep_current_ms = 0;
+    size_t current_connections = 0;
     for (;;)
     {
         current_connections = 0;
@@ -387,7 +391,16 @@ bool getListenTry(const Poco::Util::AbstractConfiguration & config)
 {
     bool listen_try = config.getBool("listen_try", false);
     if (!listen_try)
-        listen_try = DB::getMultipleValuesFromConfig(config, "", "listen_host").empty();
+    {
+        Poco::Util::AbstractConfiguration::Keys protocols;
+        config.keys("protocols", protocols);
+        listen_try =
+            DB::getMultipleValuesFromConfig(config, "", "listen_host").empty() &&
+            std::none_of(protocols.begin(), protocols.end(), [&](const auto & protocol)
+            {
+                return config.has("protocols." + protocol + ".host") && config.has("protocols." + protocol + ".port");
+            });
+    }
     return listen_try;
 }
 
@@ -920,7 +933,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         else
         {
             rlim_t old = rlim.rlim_cur;
-            rlim.rlim_cur = config().getUInt("max_open_files", rlim.rlim_max);
+            rlim.rlim_cur = config().getUInt("max_open_files", static_cast<unsigned>(rlim.rlim_max));
             int rc = setrlimit(RLIMIT_NOFILE, &rlim);
             if (rc != 0)
                 LOG_WARNING(log, "Cannot set max number of file descriptors to {}. Try to specify max_open_files according to your system limits. error: {}", rlim.rlim_cur, errnoToString());
@@ -1494,7 +1507,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         if (!servers_to_start_before_tables.empty())
         {
             LOG_DEBUG(log, "Waiting for current connections to servers for tables to finish.");
-            int current_connections = 0;
+            size_t current_connections = 0;
             for (auto & server : servers_to_start_before_tables)
             {
                 server.stop();
@@ -1780,7 +1793,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
             is_cancelled = true;
 
-            int current_connections = 0;
+            size_t current_connections = 0;
             {
                 std::lock_guard lock(servers_lock);
                 for (auto & server : servers)
@@ -1837,6 +1850,82 @@ int Server::main(const std::vector<std::string> & /*args*/)
     return Application::EXIT_OK;
 }
 
+std::unique_ptr<TCPProtocolStackFactory> Server::buildProtocolStackFromConfig(
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & protocol,
+    Poco::Net::HTTPServerParams::Ptr http_params,
+    AsynchronousMetrics & async_metrics,
+    bool & is_secure)
+{
+    auto create_factory = [&](const std::string & type, const std::string & conf_name) -> TCPServerConnectionFactory::Ptr
+    {
+        if (type == "tcp")
+            return TCPServerConnectionFactory::Ptr(new TCPHandlerFactory(*this, false, false));
+
+        if (type == "tls")
+#if USE_SSL
+            return TCPServerConnectionFactory::Ptr(new TLSHandlerFactory(*this, conf_name));
+#else
+            throw Exception{"SSL support for TCP protocol is disabled because Poco library was built without NetSSL support.",
+                            ErrorCodes::SUPPORT_IS_DISABLED};
+#endif
+
+        if (type == "proxy1")
+            return TCPServerConnectionFactory::Ptr(new ProxyV1HandlerFactory(*this, conf_name));
+        if (type == "mysql")
+            return TCPServerConnectionFactory::Ptr(new MySQLHandlerFactory(*this));
+        if (type == "postgres")
+            return TCPServerConnectionFactory::Ptr(new PostgreSQLHandlerFactory(*this));
+        if (type == "http")
+            return TCPServerConnectionFactory::Ptr(
+                new HTTPServerConnectionFactory(context(), http_params, createHandlerFactory(*this, config, async_metrics, "HTTPHandler-factory"))
+            );
+        if (type == "prometheus")
+            return TCPServerConnectionFactory::Ptr(
+                new HTTPServerConnectionFactory(context(), http_params, createHandlerFactory(*this, config, async_metrics, "PrometheusHandler-factory"))
+            );
+        if (type == "interserver")
+            return TCPServerConnectionFactory::Ptr(
+                new HTTPServerConnectionFactory(context(), http_params, createHandlerFactory(*this, config, async_metrics, "InterserverIOHTTPHandler-factory"))
+            );
+
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Protocol configuration error, unknown protocol name '{}'", type);
+    };
+
+    std::string conf_name = "protocols." + protocol;
+    std::string prefix = conf_name + ".";
+    std::unordered_set<std::string> pset {conf_name};
+
+    auto stack = std::make_unique<TCPProtocolStackFactory>(*this, conf_name);
+
+    while (true)
+    {
+        // if there is no "type" - it's a reference to another protocol and this is just an endpoint
+        if (config.has(prefix + "type"))
+        {
+            std::string type = config.getString(prefix + "type");
+            if (type == "tls")
+            {
+                if (is_secure)
+                    throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Protocol '{}' contains more than one TLS layer", protocol);
+                is_secure = true;
+            }
+
+            stack->append(create_factory(type, conf_name));
+        }
+
+        if (!config.has(prefix + "impl"))
+            break;
+
+        conf_name = "protocols." + config.getString(prefix + "impl");
+        prefix = conf_name + ".";
+
+        if (!pset.insert(conf_name).second)
+            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Protocol '{}' configuration contains a loop on '{}'", protocol, conf_name);
+    }
+
+    return stack;
+}
 
 void Server::createServers(
     Poco::Util::AbstractConfiguration & config,
@@ -1855,6 +1944,55 @@ void Server::createServers(
     http_params->setTimeout(settings.http_receive_timeout);
     http_params->setKeepAliveTimeout(keep_alive_timeout);
 
+    Poco::Util::AbstractConfiguration::Keys protocols;
+    config.keys("protocols", protocols);
+
+    for (const auto & protocol : protocols)
+    {
+        std::vector<std::string> hosts;
+        if (config.has("protocols." + protocol + ".host"))
+            hosts.push_back(config.getString("protocols." + protocol + ".host"));
+        else
+            hosts = listen_hosts;
+
+        for (const auto & host : hosts)
+        {
+            std::string conf_name = "protocols." + protocol;
+            std::string prefix = conf_name + ".";
+
+            if (!config.has(prefix + "port"))
+                continue;
+
+            std::string description {"<undefined> protocol"};
+            if (config.has(prefix + "description"))
+                description = config.getString(prefix + "description");
+            std::string port_name = prefix + "port";
+            bool is_secure = false;
+            auto stack = buildProtocolStackFromConfig(config, protocol, http_params, async_metrics, is_secure);
+
+            if (stack->empty())
+                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Protocol '{}' stack empty", protocol);
+
+            createServer(config, host, port_name.c_str(), listen_try, start_servers, servers, [&](UInt16 port) -> ProtocolServerAdapter
+            {
+                Poco::Net::ServerSocket socket;
+                auto address = socketBindListen(config, socket, host, port, is_secure);
+                socket.setReceiveTimeout(settings.receive_timeout);
+                socket.setSendTimeout(settings.send_timeout);
+
+                return ProtocolServerAdapter(
+                    host,
+                    port_name.c_str(),
+                    description + ": " + address.toString(),
+                    std::make_unique<TCPServer>(
+                        stack.release(),
+                        server_pool,
+                        socket,
+                        new Poco::Net::TCPServerParams));
+            });
+        }
+    }
+
     for (const auto & listen_host : listen_hosts)
     {
         /// HTTP
@@ -2102,13 +2240,50 @@ void Server::updateServers(
     {
         if (!server.isStopping())
         {
-            bool has_host = std::find(listen_hosts.begin(), listen_hosts.end(), server.getListenHost()) != listen_hosts.end();
-            bool has_port = !config.getString(server.getPortName(), "").empty();
+            std::string port_name = server.getPortName();
+            bool has_host = false;
+            bool is_http = false;
+            if (port_name.starts_with("protocols."))
+            {
+                std::string protocol = port_name.substr(0, port_name.find_last_of('.'));
+                has_host = config.has(protocol + ".host");
 
-            /// NOTE: better to compare using getPortName() over using
-            /// dynamic_cast<> since HTTPServer is also used for prometheus and
-            /// internal replication communications.
-            bool is_http = server.getPortName() == "http_port" || server.getPortName() == "https_port";
+                std::string conf_name = protocol;
+                std::string prefix = protocol + ".";
+                std::unordered_set<std::string> pset {conf_name};
+                while (true)
+                {
+                    if (config.has(prefix + "type"))
+                    {
+                        std::string type = config.getString(prefix + "type");
+                        if (type == "http")
+                        {
+                            is_http = true;
+                            break;
+                        }
+                    }
+
+                    if (!config.has(prefix + "impl"))
+                        break;
+
+                    conf_name = "protocols." + config.getString(prefix + "impl");
+                    prefix = conf_name + ".";
+
+                    if (!pset.insert(conf_name).second)
+                        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Protocol '{}' configuration contains a loop on '{}'", protocol, conf_name);
+                }
+            }
+            else
+            {
+                /// NOTE: better to compare using getPortName() over using
+                /// dynamic_cast<> since HTTPServer is also used for prometheus and
+                /// internal replication communications.
+                is_http = server.getPortName() == "http_port" || server.getPortName() == "https_port";
+            }
+
+            if (!has_host)
+                has_host = std::find(listen_hosts.begin(), listen_hosts.end(), server.getListenHost()) != listen_hosts.end();
+            bool has_port = !config.getString(port_name, "").empty();
             bool force_restart = is_http && !isSameConfiguration(previous_config, config, "http_handlers");
             if (force_restart)
                 LOG_TRACE(log, "<http_handlers> had been changed, will reload {}", server.getDescription());
diff --git a/programs/server/Server.h b/programs/server/Server.h
index 44a5a441e43..53841b1fcd4 100644
--- a/programs/server/Server.h
+++ b/programs/server/Server.h
@@ -3,6 +3,8 @@
 #include <Server/IServer.h>
 
 #include <Daemon/BaseDaemon.h>
+#include <Server/TCPProtocolStackFactory.h>
+#include <Poco/Net/HTTPServerParams.h>
 
 /** Server provides three interfaces:
   * 1. HTTP - simple interface for any applications.
@@ -77,6 +79,13 @@ private:
         UInt16 port,
         [[maybe_unused]] bool secure = false) const;
 
+    std::unique_ptr<TCPProtocolStackFactory> buildProtocolStackFromConfig(
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & protocol,
+        Poco::Net::HTTPServerParams::Ptr http_params,
+        AsynchronousMetrics & async_metrics,
+        bool & is_secure);
+
     using CreateServerFunc = std::function<ProtocolServerAdapter(UInt16)>;
     void createServer(
         Poco::Util::AbstractConfiguration & config,
diff --git a/src/Access/Common/AllowedClientHosts.cpp b/src/Access/Common/AllowedClientHosts.cpp
index 2f8151bf757..905f7ba08b5 100644
--- a/src/Access/Common/AllowedClientHosts.cpp
+++ b/src/Access/Common/AllowedClientHosts.cpp
@@ -236,7 +236,7 @@ void AllowedClientHosts::IPSubnet::set(const IPAddress & prefix_, const IPAddres
 
 void AllowedClientHosts::IPSubnet::set(const IPAddress & prefix_, size_t num_prefix_bits)
 {
-    set(prefix_, IPAddress(num_prefix_bits, prefix_.family()));
+    set(prefix_, IPAddress(static_cast<unsigned>(num_prefix_bits), prefix_.family()));
 }
 
 void AllowedClientHosts::IPSubnet::set(const IPAddress & address)
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index ff1ee6f3609..2affbc293ec 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -254,7 +254,7 @@ bool LDAPClient::openConnection()
 #endif
 
     {
-        const int search_timeout = params.search_timeout.count();
+        const int search_timeout = static_cast<int>(params.search_timeout.count());
         diag(ldap_set_option(handle, LDAP_OPT_TIMELIMIT, &search_timeout));
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionAnalysisOfVariance.cpp b/src/AggregateFunctions/AggregateFunctionAnalysisOfVariance.cpp
new file mode 100644
index 00000000000..ffb651b3288
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionAnalysisOfVariance.cpp
@@ -0,0 +1,38 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionAnalysisOfVariance.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+namespace
+{
+
+AggregateFunctionPtr createAggregateFunctionAnalysisOfVariance(const std::string & name, const DataTypes & arguments, const Array & parameters, const Settings *)
+{
+    assertNoParameters(name, parameters);
+    assertBinary(name, arguments);
+
+    if (!isNumber(arguments[0]) || !isNumber(arguments[1]))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Aggregate function {} only supports numerical types", name);
+
+    return std::make_shared<AggregateFunctionAnalysisOfVariance>(arguments, parameters);
+}
+
+}
+
+void registerAggregateFunctionAnalysisOfVariance(AggregateFunctionFactory & factory)
+{
+    AggregateFunctionProperties properties = { .is_order_dependent = false };
+    factory.registerFunction("analysisOfVariance", {createAggregateFunctionAnalysisOfVariance, properties}, AggregateFunctionFactory::CaseInsensitive);
+
+    /// This is widely used term
+    factory.registerAlias("anova", "analysisOfVariance", AggregateFunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionAnalysisOfVariance.h b/src/AggregateFunctions/AggregateFunctionAnalysisOfVariance.h
new file mode 100644
index 00000000000..efb6426a96c
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionAnalysisOfVariance.h
@@ -0,0 +1,98 @@
+#pragma once
+
+#include <IO/VarInt.h>
+#include <IO/WriteHelpers.h>
+
+#include <array>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnsCommon.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/Moments.h>
+#include "Common/NaNUtils.h"
+#include <Common/assert_cast.h>
+#include <Core/Types.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+class AggregateFunctionAnalysisOfVarianceData final : public AnalysisOfVarianceMoments<Float64>
+{
+};
+
+
+/// One way analysis of variance
+/// Provides a statistical test of whether two or more population means are equal (null hypothesis)
+/// Has an assumption that subjects from group i have normal distribution.
+/// Accepts two arguments - a value and a group number which this value belongs to.
+/// Groups are enumerated starting from 0 and there should be at least two groups to perform a test
+/// Moreover there should be at least one group with the number of observations greater than one.
+class AggregateFunctionAnalysisOfVariance final : public IAggregateFunctionDataHelper<AggregateFunctionAnalysisOfVarianceData, AggregateFunctionAnalysisOfVariance>
+{
+public:
+    explicit AggregateFunctionAnalysisOfVariance(const DataTypes & arguments, const Array & params)
+    : IAggregateFunctionDataHelper(arguments, params)
+    {}
+
+    DataTypePtr getReturnType() const override
+    {
+        DataTypes types {std::make_shared<DataTypeNumber<Float64>>(), std::make_shared<DataTypeNumber<Float64>>() };
+        Strings names {"f_statistic", "p_value"};
+        return std::make_shared<DataTypeTuple>(
+            std::move(types),
+            std::move(names)
+        );
+    }
+
+    String getName() const override { return "analysisOfVariance"; }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
+    {
+        data(place).add(columns[0]->getFloat64(row_num), columns[1]->getUInt(row_num));
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
+    {
+        data(place).merge(data(rhs));
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        data(place).write(buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
+    {
+        data(place).read(buf);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        auto f_stat = data(place).getFStatistic();
+        if (std::isinf(f_stat) || isNaN(f_stat))
+            throw Exception("F statistic is not defined or infinite for these arguments", ErrorCodes::BAD_ARGUMENTS);
+
+        auto p_value = data(place).getPValue(f_stat);
+
+        /// Because p-value is a probability.
+        p_value = std::min(1.0, std::max(0.0, p_value));
+
+        auto & column_tuple = assert_cast<ColumnTuple &>(to);
+        auto & column_stat = assert_cast<ColumnVector<Float64> &>(column_tuple.getColumn(0));
+        auto & column_value = assert_cast<ColumnVector<Float64> &>(column_tuple.getColumn(1));
+
+        column_stat.getData().push_back(f_stat);
+        column_value.getData().push_back(p_value);
+    }
+
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionArray.h b/src/AggregateFunctions/AggregateFunctionArray.h
index abefe8e0de1..c6e29e77318 100644
--- a/src/AggregateFunctions/AggregateFunctionArray.h
+++ b/src/AggregateFunctions/AggregateFunctionArray.h
@@ -156,6 +156,11 @@ public:
         nested_func->insertResultInto(place, to, arena);
     }
 
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        nested_func->insertMergeResultInto(place, to, arena);
+    }
+
     bool allocatesMemoryInArena() const override
     {
         return nested_func->allocatesMemoryInArena();
diff --git a/src/AggregateFunctions/AggregateFunctionDistinct.h b/src/AggregateFunctions/AggregateFunctionDistinct.h
index 482d21363fe..9884e92f425 100644
--- a/src/AggregateFunctions/AggregateFunctionDistinct.h
+++ b/src/AggregateFunctions/AggregateFunctionDistinct.h
@@ -196,7 +196,8 @@ public:
         this->data(place).deserialize(buf, arena);
     }
 
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    template <bool MergeResult>
+    void insertResultIntoImpl(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const
     {
         auto arguments = this->data(place).getArguments(this->argument_types);
         ColumnRawPtrs arguments_raw(arguments.size());
@@ -205,7 +206,20 @@ public:
 
         assert(!arguments.empty());
         nested_func->addBatchSinglePlace(0, arguments[0]->size(), getNestedPlace(place), arguments_raw.data(), arena);
-        nested_func->insertResultInto(getNestedPlace(place), to, arena);
+        if constexpr (MergeResult)
+            nested_func->insertMergeResultInto(getNestedPlace(place), to, arena);
+        else
+            nested_func->insertResultInto(getNestedPlace(place), to, arena);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<false>(place, to, arena);
+    }
+
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<true>(place, to, arena);
     }
 
     size_t sizeOfData() const override
diff --git a/src/AggregateFunctions/AggregateFunctionForEach.h b/src/AggregateFunctions/AggregateFunctionForEach.h
index 07713dcb304..62794ac0f53 100644
--- a/src/AggregateFunctions/AggregateFunctionForEach.h
+++ b/src/AggregateFunctions/AggregateFunctionForEach.h
@@ -257,7 +257,8 @@ public:
         }
     }
 
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    template <bool merge>
+    void insertResultIntoImpl(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const
     {
         AggregateFunctionForEachData & state = data(place);
 
@@ -268,13 +269,26 @@ public:
         char * nested_state = state.array_of_aggregate_datas;
         for (size_t i = 0; i < state.dynamic_array_size; ++i)
         {
-            nested_func->insertResultInto(nested_state, elems_to, arena);
+            if constexpr (merge)
+                nested_func->insertMergeResultInto(nested_state, elems_to, arena);
+            else
+                nested_func->insertResultInto(nested_state, elems_to, arena);
             nested_state += nested_size_of_data;
         }
 
         offsets_to.push_back(offsets_to.back() + state.dynamic_array_size);
     }
 
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<false>(place, to, arena);
+    }
+
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<true>(place, to, arena);
+    }
+
     bool allocatesMemoryInArena() const override
     {
         return true;
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
index fd8357e3ba8..dacde67f3ca 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
@@ -45,7 +45,8 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        assert_cast<ColumnVector<T> &>(to).getData().push_back(this->data(place).rbs.size());
+        assert_cast<ColumnVector<T> &>(to).getData().push_back(
+            static_cast<T>(this->data(place).rbs.size()));
     }
 };
 
@@ -142,7 +143,8 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        assert_cast<ColumnVector<T> &>(to).getData().push_back(this->data(place).rbs.size());
+        assert_cast<ColumnVector<T> &>(to).getData().push_back(
+            static_cast<T>(this->data(place).rbs.size()));
     }
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
index 21ba7cd7301..801526432ae 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
@@ -426,7 +426,7 @@ public:
             return 0;
 
         if (isSmall())
-            return small.find(x) != small.end();
+            return small.find(static_cast<T>(x)) != small.end();
         else
             return rb->contains(static_cast<Value>(x));
     }
diff --git a/src/AggregateFunctions/AggregateFunctionHistogram.h b/src/AggregateFunctions/AggregateFunctionHistogram.h
index 9031eb73c09..18bfc085ba3 100644
--- a/src/AggregateFunctions/AggregateFunctionHistogram.h
+++ b/src/AggregateFunctions/AggregateFunctionHistogram.h
@@ -136,8 +136,8 @@ private:
 
         for (size_t i = 0; i <= size; ++i)
         {
-            previous[i] = i - 1;
-            next[i] = i + 1;
+            previous[i] = static_cast<UInt32>(i - 1);
+            next[i] = static_cast<UInt32>(i + 1);
         }
 
         next[size] = 0;
@@ -157,7 +157,7 @@ private:
         auto quality = [&](UInt32 i) { return points[next[i]].mean - points[i].mean; };
 
         for (size_t i = 0; i + 1 < size; ++i)
-            queue.push({quality(i), i});
+            queue.push({quality(static_cast<UInt32>(i)), i});
 
         while (new_size > max_bins && !queue.empty())
         {
@@ -217,7 +217,7 @@ private:
                 points[left] = points[right];
             }
         }
-        size = left + 1;
+        size = static_cast<UInt32>(left + 1);
     }
 
 public:
diff --git a/src/AggregateFunctions/AggregateFunctionIf.h b/src/AggregateFunctions/AggregateFunctionIf.h
index 79312dff2c7..ccc4809dd06 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.h
+++ b/src/AggregateFunctions/AggregateFunctionIf.h
@@ -183,6 +183,11 @@ public:
         nested_func->insertResultInto(place, to, arena);
     }
 
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        nested_func->insertMergeResultInto(place, to, arena);
+    }
+
     bool allocatesMemoryInArena() const override
     {
         return nested_func->allocatesMemoryInArena();
diff --git a/src/AggregateFunctions/AggregateFunctionMap.h b/src/AggregateFunctions/AggregateFunctionMap.h
index 4cb26fcc8d1..d349fc05944 100644
--- a/src/AggregateFunctions/AggregateFunctionMap.h
+++ b/src/AggregateFunctions/AggregateFunctionMap.h
@@ -264,7 +264,8 @@ public:
         }
     }
 
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    template <bool merge>
+    void insertResultIntoImpl(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const
     {
         auto & map_column = assert_cast<ColumnMap &>(to);
         auto & nested_column = map_column.getNestedColumn();
@@ -288,13 +289,26 @@ public:
         for (auto & key : keys)
         {
             key_column.insert(key);
-            nested_func->insertResultInto(merged_maps[key], val_column, arena);
+            if constexpr (merge)
+                nested_func->insertMergeResultInto(merged_maps[key], val_column, arena);
+            else
+                nested_func->insertResultInto(merged_maps[key], val_column, arena);
         }
 
         IColumn::Offsets & res_offsets = nested_column.getOffsets();
         res_offsets.push_back(val_column.size());
     }
 
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<false>(place, to, arena);
+    }
+
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<true>(place, to, arena);
+    }
+
     bool allocatesMemoryInArena() const override { return true; }
 
     AggregateFunctionPtr getNestedFunction() const override { return nested_func; }
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index 783fa0606b5..f8d252cf8e9 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -540,7 +540,7 @@ public:
     /// Assuming to.has()
     void changeImpl(StringRef value, Arena * arena)
     {
-        Int32 value_size = value.size;
+        Int32 value_size = static_cast<Int32>(value.size);
 
         if (value_size <= MAX_SMALL_STRING_SIZE)
         {
@@ -555,7 +555,7 @@ public:
             if (capacity < value_size)
             {
                 /// Don't free large_data here.
-                capacity = roundUpToPowerOfTwoOrZero(value_size);
+                capacity = static_cast<Int32>(roundUpToPowerOfTwoOrZero(value_size));
                 large_data = arena->alloc(capacity);
             }
 
diff --git a/src/AggregateFunctions/AggregateFunctionNull.h b/src/AggregateFunctions/AggregateFunctionNull.h
index f3a3f55972f..deed06b8bf2 100644
--- a/src/AggregateFunctions/AggregateFunctionNull.h
+++ b/src/AggregateFunctions/AggregateFunctionNull.h
@@ -163,14 +163,18 @@ public:
         }
     }
 
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    template <bool merge>
+    void insertResultIntoImpl(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const
     {
         if constexpr (result_is_nullable)
         {
             ColumnNullable & to_concrete = assert_cast<ColumnNullable &>(to);
             if (getFlag(place))
             {
-                nested_function->insertResultInto(nestedPlace(place), to_concrete.getNestedColumn(), arena);
+                if constexpr (merge)
+                    nested_function->insertMergeResultInto(nestedPlace(place), to_concrete.getNestedColumn(), arena);
+                else
+                    nested_function->insertResultInto(nestedPlace(place), to_concrete.getNestedColumn(), arena);
                 to_concrete.getNullMapData().push_back(0);
             }
             else
@@ -180,10 +184,23 @@ public:
         }
         else
         {
-            nested_function->insertResultInto(nestedPlace(place), to, arena);
+            if constexpr (merge)
+                nested_function->insertMergeResultInto(nestedPlace(place), to, arena);
+            else
+                nested_function->insertResultInto(nestedPlace(place), to, arena);
         }
     }
 
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<false>(place, to, arena);
+    }
+
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<true>(place, to, arena);
+    }
+
     bool allocatesMemoryInArena() const override
     {
         return nested_function->allocatesMemoryInArena();
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.h b/src/AggregateFunctions/AggregateFunctionOrFill.h
index c5a0d60224a..eff4fb2bdc0 100644
--- a/src/AggregateFunctions/AggregateFunctionOrFill.h
+++ b/src/AggregateFunctions/AggregateFunctionOrFill.h
@@ -265,10 +265,11 @@ public:
         }
     }
 
-    void insertResultInto(
+    template <bool merge>
+    void insertResultIntoImpl(
         AggregateDataPtr __restrict place,
         IColumn & to,
-        Arena * arena) const override
+        Arena * arena) const
     {
         if (place[size_of_data])
         {
@@ -277,7 +278,12 @@ public:
                 // -OrNull
 
                 if (inner_nullable)
-                    nested_function->insertResultInto(place, to, arena);
+                {
+                    if constexpr (merge)
+                        nested_function->insertMergeResultInto(place, to, arena);
+                    else
+                        nested_function->insertResultInto(place, to, arena);
+                }
                 else
                 {
                     ColumnNullable & col = typeid_cast<ColumnNullable &>(to);
@@ -289,14 +295,26 @@ public:
             else
             {
                 // -OrDefault
-
-                nested_function->insertResultInto(place, to, arena);
+                if constexpr (merge)
+                    nested_function->insertMergeResultInto(place, to, arena);
+                else
+                    nested_function->insertResultInto(place, to, arena);
             }
         }
         else
             to.insertDefault();
     }
 
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<false>(place, to, arena);
+    }
+
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<true>(place, to, arena);
+    }
+
     AggregateFunctionPtr getNestedFunction() const override { return nested_function; }
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.cpp b/src/AggregateFunctions/AggregateFunctionQuantile.cpp
index 38b3c91be69..60e759b45a3 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.cpp
@@ -46,7 +46,7 @@ AggregateFunctionPtr createAggregateFunctionQuantile(
     if (which.idx == TypeIndex::DateTime64) return std::make_shared<Function<DateTime64, false>>(argument_types, params);
 
     if (which.idx == TypeIndex::Int128) return std::make_shared<Function<Int128, true>>(argument_types, params);
-    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<Int128, true>>(argument_types, params);
+    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<UInt128, true>>(argument_types, params);
     if (which.idx == TypeIndex::Int256) return std::make_shared<Function<Int256, true>>(argument_types, params);
     if (which.idx == TypeIndex::UInt256) return std::make_shared<Function<UInt256, true>>(argument_types, params);
 
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.cpp b/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.cpp
index a9486da25fa..1605056e5d9 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.cpp
@@ -40,7 +40,7 @@ AggregateFunctionPtr createAggregateFunctionQuantile(
     if (which.idx == TypeIndex::DateTime) return std::make_shared<Function<DataTypeDateTime::FieldType, false>>(argument_types, params);
 
     if (which.idx == TypeIndex::Int128) return std::make_shared<Function<Int128, true>>(argument_types, params);
-    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<Int128, true>>(argument_types, params);
+    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<UInt128, true>>(argument_types, params);
     if (which.idx == TypeIndex::Int256) return std::make_shared<Function<Int256, true>>(argument_types, params);
     if (which.idx == TypeIndex::UInt256) return std::make_shared<Function<UInt256, true>>(argument_types, params);
 
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp b/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
index 39de9d0eeaf..e9a3edf1e05 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
@@ -47,7 +47,7 @@ AggregateFunctionPtr createAggregateFunctionQuantile(
     if (which.idx == TypeIndex::DateTime64) return std::make_shared<Function<DateTime64, false>>(argument_types, params);
 
     if (which.idx == TypeIndex::Int128) return std::make_shared<Function<Int128, true>>(argument_types, params);
-    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<Int128, true>>(argument_types, params);
+    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<UInt128, true>>(argument_types, params);
     if (which.idx == TypeIndex::Int256) return std::make_shared<Function<Int256, true>>(argument_types, params);
     if (which.idx == TypeIndex::UInt256) return std::make_shared<Function<UInt256, true>>(argument_types, params);
 
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp b/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
index 63e4d3df24b..e9b6012dcdb 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
@@ -46,7 +46,7 @@ AggregateFunctionPtr createAggregateFunctionQuantile(
     if (which.idx == TypeIndex::DateTime64) return std::make_shared<Function<DateTime64, false>>(argument_types, params);
 
     if (which.idx == TypeIndex::Int128) return std::make_shared<Function<Int128, true>>(argument_types, params);
-    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<Int128, true>>(argument_types, params);
+    if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<UInt128, true>>(argument_types, params);
     if (which.idx == TypeIndex::Int256) return std::make_shared<Function<Int256, true>>(argument_types, params);
     if (which.idx == TypeIndex::UInt256) return std::make_shared<Function<UInt256, true>>(argument_types, params);
 
diff --git a/src/AggregateFunctions/AggregateFunctionResample.h b/src/AggregateFunctions/AggregateFunctionResample.h
index 471a6820939..fe04ada1a77 100644
--- a/src/AggregateFunctions/AggregateFunctionResample.h
+++ b/src/AggregateFunctions/AggregateFunctionResample.h
@@ -195,17 +195,33 @@ public:
         return std::make_shared<DataTypeArray>(nested_function->getReturnType());
     }
 
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    template <bool merge>
+    void insertResultIntoImpl(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const
     {
         auto & col = assert_cast<ColumnArray &>(to);
         auto & col_offsets = assert_cast<ColumnArray::ColumnOffsets &>(col.getOffsetsColumn());
 
         for (size_t i = 0; i < total; ++i)
-            nested_function->insertResultInto(place + i * size_of_data, col.getData(), arena);
+        {
+            if constexpr (merge)
+                nested_function->insertMergeResultInto(place + i * size_of_data, col.getData(), arena);
+            else
+                nested_function->insertResultInto(place + i * size_of_data, col.getData(), arena);
+        }
 
         col_offsets.getData().push_back(col.getData().size());
     }
 
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<false>(place, to, arena);
+    }
+
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        insertResultIntoImpl<true>(place, to, arena);
+    }
+
     AggregateFunctionPtr getNestedFunction() const override { return nested_function; }
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionRetention.h b/src/AggregateFunctions/AggregateFunctionRetention.h
index a949b5e93f6..18d04fb1ea4 100644
--- a/src/AggregateFunctions/AggregateFunctionRetention.h
+++ b/src/AggregateFunctions/AggregateFunctionRetention.h
@@ -44,7 +44,7 @@ struct AggregateFunctionRetentionData
 
     void serialize(WriteBuffer & buf) const
     {
-        UInt32 event_value = events.to_ulong();
+        UInt32 event_value = static_cast<UInt32>(events.to_ulong());
         writeBinary(event_value, buf);
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
index 5c1ab803f19..bcea408d26b 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -272,7 +272,7 @@ private:
 
                     actions.emplace_back(PatternActionType::SpecificEvent, event_number - 1);
                     dfa_states.back().transition = DFATransition::SpecificEvent;
-                    dfa_states.back().event = event_number - 1;
+                    dfa_states.back().event = static_cast<uint32_t>(event_number - 1);
                     dfa_states.emplace_back();
                     conditions_in_pattern.set(event_number - 1);
                 }
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
index 423b53b03f3..c29055ae8db 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
@@ -226,7 +226,7 @@ public:
         for (UInt8 i = 0; i < events_size; ++i)
             if (assert_cast<const ColumnVector<UInt8> *>(columns[min_required_args + i])->getData()[row_num])
                 node->events_bitset.set(i);
-        node->event_time = timestamp;
+        node->event_time = static_cast<DataTypeDateTime::FieldType>(timestamp);
 
         node->can_be_base = assert_cast<const ColumnVector<UInt8> *>(columns[base_cond_column_idx])->getData()[row_num];
 
@@ -365,7 +365,7 @@ public:
     /// The first matched event is 0x00000001, the second one is 0x00000002, the third one is 0x00000004, and so on.
     UInt32 getNextNodeIndex(Data & data) const
     {
-        const UInt32 unmatched_idx = data.value.size();
+        const UInt32 unmatched_idx = static_cast<UInt32>(data.value.size());
 
         if (data.value.size() <= events_size)
             return unmatched_idx;
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index cb017053fd7..f0fbdd2f2e4 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -165,7 +165,7 @@ private:
             {
                 for (size_t i = 0; i <= diff_x; ++i)
                 {
-                    auto it = data.points.find(min_x_local + i);
+                    auto it = data.points.find(static_cast<X>(min_x_local + i));
                     bool found = it != data.points.end();
                     value += getBar(found ? std::round(((it->getMapped() - min_y) / diff_y) * 7) + 1 : 0.0);
                 }
@@ -173,7 +173,7 @@ private:
             else
             {
                 for (size_t i = 0; i <= diff_x; ++i)
-                    value += getBar(data.points.has(min_x_local + i) ? 1 : 0);
+                    value += getBar(data.points.has(min_x_local + static_cast<X>(i)) ? 1 : 0);
             }
         }
         else
@@ -202,7 +202,7 @@ private:
                 if (i == bound.first) // is bound
                 {
                     Float64 proportion = bound.second - bound.first;
-                    auto it = data.points.find(min_x_local + i);
+                    auto it = data.points.find(min_x_local + static_cast<X>(i));
                     bool found = (it != data.points.end());
                     if (found && proportion > 0)
                         new_y = new_y.value_or(0) + it->getMapped() * proportion;
@@ -229,7 +229,7 @@ private:
                 }
                 else
                 {
-                    auto it = data.points.find(min_x_local + i);
+                    auto it = data.points.find(min_x_local + static_cast<X>(i));
                     if (it != data.points.end())
                         new_y = new_y.value_or(0) + it->getMapped();
                 }
@@ -267,8 +267,8 @@ public:
         if (params.size() == 3)
         {
             specified_min_max_x = true;
-            min_x = params.at(1).safeGet<X>();
-            max_x = params.at(2).safeGet<X>();
+            min_x = static_cast<X>(params.at(1).safeGet<X>());
+            max_x = static_cast<X>(params.at(2).safeGet<X>());
         }
         else
         {
diff --git a/src/AggregateFunctions/AggregateFunctionState.h b/src/AggregateFunctions/AggregateFunctionState.h
index 6ab3dbab625..20ccb2e543c 100644
--- a/src/AggregateFunctions/AggregateFunctionState.h
+++ b/src/AggregateFunctions/AggregateFunctionState.h
@@ -111,6 +111,11 @@ public:
         assert_cast<ColumnAggregateFunction &>(to).getData().push_back(place);
     }
 
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        assert_cast<ColumnAggregateFunction &>(to).insertFrom(place);
+    }
+
     /// Aggregate function or aggregate function state.
     bool isState() const override { return true; }
 
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.h b/src/AggregateFunctions/AggregateFunctionUniq.h
index d44937b3f9d..fe2530800cc 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -175,8 +175,9 @@ struct OneAdder
         {
             if constexpr (!std::is_same_v<T, String>)
             {
+                using ValueType = typename decltype(data.set)::value_type;
                 const auto & value = assert_cast<const ColumnVector<T> &>(column).getElement(row_num);
-                data.set.insert(AggregateFunctionUniqTraits<T>::hash(value));
+                data.set.insert(static_cast<ValueType>(AggregateFunctionUniqTraits<T>::hash(value)));
             }
             else
             {
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.h b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
index 51020abe826..47b3081225b 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
@@ -43,7 +43,7 @@ namespace detail
     {
         static Ret hash(UInt128 x)
         {
-            return sipHash64(x);
+            return static_cast<Ret>(sipHash64(x));
         }
     };
 
diff --git a/src/AggregateFunctions/AggregateFunctionWelchTTest.cpp b/src/AggregateFunctions/AggregateFunctionWelchTTest.cpp
index 74000296a2d..3a72e0e92bb 100644
--- a/src/AggregateFunctions/AggregateFunctionWelchTTest.cpp
+++ b/src/AggregateFunctions/AggregateFunctionWelchTTest.cpp
@@ -40,7 +40,15 @@ struct WelchTTestData : public TTestMoments<Float64>
         Float64 denominator_x = sx2 * sx2 / (nx * nx * (nx - 1));
         Float64 denominator_y = sy2 * sy2 / (ny * ny * (ny - 1));
 
-        return numerator / (denominator_x + denominator_y);
+        auto result = numerator / (denominator_x + denominator_y);
+
+        if (result <= 0 || std::isinf(result) || isNaN(result))
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Cannot calculate p_value, because the t-distribution \
+                has inappropriate value of degrees of freedom (={}). It should be > 0", result);
+
+        return result;
     }
 
     std::tuple<Float64, Float64> getResult() const
diff --git a/src/AggregateFunctions/IAggregateFunction.cpp b/src/AggregateFunctions/IAggregateFunction.cpp
index 25d2a9a4530..7da341cc5b9 100644
--- a/src/AggregateFunctions/IAggregateFunction.cpp
+++ b/src/AggregateFunctions/IAggregateFunction.cpp
@@ -53,9 +53,12 @@ String IAggregateFunction::getDescription() const
 
 bool IAggregateFunction::haveEqualArgumentTypes(const IAggregateFunction & rhs) const
 {
-    return std::equal(argument_types.begin(), argument_types.end(),
-                      rhs.argument_types.begin(), rhs.argument_types.end(),
-                      [](const auto & t1, const auto & t2) { return t1->equals(*t2); });
+    return std::equal(
+        argument_types.begin(),
+        argument_types.end(),
+        rhs.argument_types.begin(),
+        rhs.argument_types.end(),
+        [](const auto & t1, const auto & t2) { return t1->equals(*t2); });
 }
 
 bool IAggregateFunction::haveSameStateRepresentation(const IAggregateFunction & rhs) const
@@ -67,11 +70,7 @@ bool IAggregateFunction::haveSameStateRepresentation(const IAggregateFunction &
 
 bool IAggregateFunction::haveSameStateRepresentationImpl(const IAggregateFunction & rhs) const
 {
-    bool res = getName() == rhs.getName()
-        && parameters == rhs.parameters
-        && haveEqualArgumentTypes(rhs);
-    assert(res == (getStateType()->getName() == rhs.getStateType()->getName()));
-    return res;
+    return getStateType()->equals(*rhs.getStateType());
 }
 
 }
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index d272eac9d10..7d2fe6ae8e3 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -164,6 +164,18 @@ public:
     /// window function.
     virtual void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const = 0;
 
+    /// Special method for aggregate functions with -State combinator, it behaves the same way as insertResultInto,
+    /// but if we need to insert AggregateData into ColumnAggregateFunction we use special method
+    /// insertInto that inserts default value and then performs merge with provided AggregateData
+    /// instead of just copying pointer to this AggregateData. Used in WindowTransform.
+    virtual void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const
+    {
+        if (isState())
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Function {} is marked as State but method insertMergeResultInto is not implemented");
+
+        insertResultInto(place, to, arena);
+    }
+
     /// Used for machine learning methods. Predict result from trained model.
     /// Will insert result into `to` column for rows in range [offset, offset + limit).
     virtual void predictValues(
diff --git a/src/AggregateFunctions/Moments.h b/src/AggregateFunctions/Moments.h
index 45a77e9cfdb..16279cb93a4 100644
--- a/src/AggregateFunctions/Moments.h
+++ b/src/AggregateFunctions/Moments.h
@@ -4,7 +4,9 @@
 #include <IO/ReadHelpers.h>
 #include <boost/math/distributions/students_t.hpp>
 #include <boost/math/distributions/normal.hpp>
+#include <boost/math/distributions/fisher_f.hpp>
 #include <cfloat>
+#include <numeric>
 
 
 namespace DB
@@ -13,6 +15,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int BAD_ARGUMENTS;
     extern const int DECIMAL_OVERFLOW;
 }
 
@@ -476,4 +479,127 @@ struct ZTestMoments
     }
 };
 
+template <typename T>
+struct AnalysisOfVarianceMoments
+{
+    /// Sums of values within a group
+    std::vector<T> xs1{};
+    /// Sums of squared values within a group
+    std::vector<T> xs2{};
+    /// Sizes of each group. Total number of observations is just a sum of all these values
+    std::vector<size_t> ns{};
+
+    void resizeIfNeeded(size_t possible_size)
+    {
+        if (xs1.size() >= possible_size)
+            return;
+
+        xs1.resize(possible_size, 0.0);
+        xs2.resize(possible_size, 0.0);
+        ns.resize(possible_size, 0);
+    }
+
+    void add(T value, size_t group)
+    {
+        resizeIfNeeded(group + 1);
+        xs1[group] += value;
+        xs2[group] += value * value;
+        ns[group] += 1;
+    }
+
+    void merge(const AnalysisOfVarianceMoments & rhs)
+    {
+        resizeIfNeeded(rhs.xs1.size());
+        for (size_t i = 0; i < rhs.xs1.size(); ++i)
+        {
+            xs1[i] += rhs.xs1[i];
+            xs2[i] += rhs.xs2[i];
+            ns[i] += rhs.ns[i];
+        }
+    }
+
+    void write(WriteBuffer & buf) const
+    {
+        writeVectorBinary(xs1, buf);
+        writeVectorBinary(xs2, buf);
+        writeVectorBinary(ns, buf);
+    }
+
+    void read(ReadBuffer & buf)
+    {
+        readVectorBinary(xs1, buf);
+        readVectorBinary(xs2, buf);
+        readVectorBinary(ns, buf);
+    }
+
+    Float64 getMeanAll() const
+    {
+        const auto n = std::accumulate(ns.begin(), ns.end(), 0UL);
+        if (n == 0)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There are no observations to calculate mean value");
+
+        return std::accumulate(xs1.begin(), xs1.end(), 0.0) / n;
+    }
+
+    Float64 getMeanGroup(size_t group) const
+    {
+        if (ns[group] == 0)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no observations for group {}", group);
+
+        return xs1[group] / ns[group];
+    }
+
+    Float64 getBetweenGroupsVariation() const
+    {
+        Float64 res = 0;
+        auto mean = getMeanAll();
+
+        for (size_t i = 0; i < xs1.size(); ++i)
+        {
+            auto group_mean = getMeanGroup(i);
+            res += ns[i] * (group_mean - mean) * (group_mean - mean);
+        }
+        return res;
+    }
+
+    Float64 getWithinGroupsVariation() const
+    {
+        Float64 res = 0;
+        for (size_t i = 0; i < xs1.size(); ++i)
+        {
+            auto group_mean = getMeanGroup(i);
+            res += xs2[i] + ns[i] * group_mean * group_mean - 2 * group_mean * xs1[i];
+        }
+        return res;
+    }
+
+    Float64 getFStatistic() const
+    {
+        const auto k = xs1.size();
+        const auto n = std::accumulate(ns.begin(), ns.end(), 0UL);
+
+        if (k == 1)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There should be more than one group to calculate f-statistics");
+
+        if (k == n)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is only one observation in each group");
+
+        return (getBetweenGroupsVariation() * (n - k)) / (getWithinGroupsVariation() * (k - 1));
+    }
+
+    Float64 getPValue(Float64 f_statistic) const
+    {
+        const auto k = xs1.size();
+        const auto n = std::accumulate(ns.begin(), ns.end(), 0UL);
+
+        if (k == 1)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There should be more than one group to calculate f-statistics");
+
+        if (k == n)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is only one observation in each group");
+
+        return 1.0f - boost::math::cdf(boost::math::fisher_f(k - 1, n - k), f_statistic);
+    }
+};
+
 }
diff --git a/src/AggregateFunctions/ReservoirSamplerDeterministic.h b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
index a64c02e823b..557fd93a3a9 100644
--- a/src/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -84,7 +84,7 @@ public:
         if (isNaN(v))
             return;
 
-        UInt32 hash = intHash64(determinator);
+        UInt32 hash = static_cast<UInt32>(intHash64(determinator));
         insertImpl(v, hash);
         sorted = false;
         ++total_values;
diff --git a/src/AggregateFunctions/UniquesHashSet.h b/src/AggregateFunctions/UniquesHashSet.h
index 5c82ec10691..777ec0edc7e 100644
--- a/src/AggregateFunctions/UniquesHashSet.h
+++ b/src/AggregateFunctions/UniquesHashSet.h
@@ -118,7 +118,7 @@ private:
 
     HashValue hash(Value key) const
     {
-        return Hash()(key);
+        return static_cast<HashValue>(Hash()(key));
     }
 
     /// Delete all values whose hashes do not divide by 2 ^ skip_degree
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 57cfbb029d4..ecf6ab51367 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -72,6 +72,7 @@ void registerAggregateFunctionNothing(AggregateFunctionFactory &);
 void registerAggregateFunctionExponentialMovingAverage(AggregateFunctionFactory &);
 void registerAggregateFunctionSparkbar(AggregateFunctionFactory &);
 void registerAggregateFunctionIntervalLengthSum(AggregateFunctionFactory &);
+void registerAggregateFunctionAnalysisOfVariance(AggregateFunctionFactory &);
 
 class AggregateFunctionCombinatorFactory;
 void registerAggregateFunctionCombinatorIf(AggregateFunctionCombinatorFactory &);
@@ -156,6 +157,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionIntervalLengthSum(factory);
         registerAggregateFunctionExponentialMovingAverage(factory);
         registerAggregateFunctionSparkbar(factory);
+        registerAggregateFunctionAnalysisOfVariance(factory);
 
         registerWindowFunctions(factory);
     }
diff --git a/src/Backups/BackupFactory.cpp b/src/Backups/BackupFactory.cpp
index a23cc70658b..7c870737b1d 100644
--- a/src/Backups/BackupFactory.cpp
+++ b/src/Backups/BackupFactory.cpp
@@ -32,10 +32,12 @@ void BackupFactory::registerBackupEngine(const String & engine_name, const Creat
 }
 
 void registerBackupEnginesFileAndDisk(BackupFactory &);
+void registerBackupEngineS3(BackupFactory &);
 
 void registerBackupEngines(BackupFactory & factory)
 {
     registerBackupEnginesFileAndDisk(factory);
+    registerBackupEngineS3(factory);
 }
 
 BackupFactory::BackupFactory()
diff --git a/src/Backups/BackupIO_S3.cpp b/src/Backups/BackupIO_S3.cpp
new file mode 100644
index 00000000000..12038a8a30c
--- /dev/null
+++ b/src/Backups/BackupIO_S3.cpp
@@ -0,0 +1,375 @@
+#include <Backups/BackupIO_S3.h>
+
+#if USE_AWS_S3
+#include <Common/quoteString.h>
+#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Interpreters/Context.h>
+#include <Storages/StorageS3Settings.h>
+#include <IO/IOThreadPool.h>
+#include <IO/ReadBufferFromS3.h>
+#include <IO/WriteBufferFromS3.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <aws/core/auth/AWSCredentials.h>
+#include <aws/s3/S3Client.h>
+#include <filesystem>
+
+#include <aws/s3/model/ListObjectsRequest.h>
+
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int S3_ERROR;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+    std::shared_ptr<Aws::S3::S3Client>
+    makeS3Client(const S3::URI & s3_uri, const String & access_key_id, const String & secret_access_key, const ContextPtr & context)
+    {
+        auto settings = context->getStorageS3Settings().getSettings(s3_uri.uri.toString());
+
+        Aws::Auth::AWSCredentials credentials(access_key_id, secret_access_key);
+        HeaderCollection headers;
+        if (access_key_id.empty())
+        {
+            credentials = Aws::Auth::AWSCredentials(settings.auth_settings.access_key_id, settings.auth_settings.secret_access_key);
+            headers = settings.auth_settings.headers;
+        }
+
+        S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
+            settings.auth_settings.region,
+            context->getRemoteHostFilter(),
+            static_cast<unsigned>(context->getGlobalContext()->getSettingsRef().s3_max_redirects),
+            context->getGlobalContext()->getSettingsRef().enable_s3_requests_logging,
+            /* for_disk_s3 = */ false);
+
+        client_configuration.endpointOverride = s3_uri.endpoint;
+        client_configuration.maxConnections = static_cast<unsigned>(context->getSettingsRef().s3_max_connections);
+        /// Increase connect timeout
+        client_configuration.connectTimeoutMs = 10 * 1000;
+        /// Requests in backups can be extremely long, set to one hour
+        client_configuration.requestTimeoutMs = 60 * 60 * 1000;
+
+        return S3::ClientFactory::instance().create(
+            client_configuration,
+            s3_uri.is_virtual_hosted_style,
+            credentials.GetAWSAccessKeyId(),
+            credentials.GetAWSSecretKey(),
+            settings.auth_settings.server_side_encryption_customer_key_base64,
+            std::move(headers),
+            settings.auth_settings.use_environment_credentials.value_or(
+                context->getConfigRef().getBool("s3.use_environment_credentials", false)),
+            settings.auth_settings.use_insecure_imds_request.value_or(
+                context->getConfigRef().getBool("s3.use_insecure_imds_request", false)));
+    }
+
+    Aws::Vector<Aws::S3::Model::Object> listObjects(Aws::S3::S3Client & client, const S3::URI & s3_uri, const String & file_name)
+    {
+        Aws::S3::Model::ListObjectsRequest request;
+        request.SetBucket(s3_uri.bucket);
+        request.SetPrefix(fs::path{s3_uri.key} / file_name);
+        request.SetMaxKeys(1);
+        auto outcome = client.ListObjects(request);
+        if (!outcome.IsSuccess())
+            throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
+        return outcome.GetResult().GetContents();
+    }
+}
+
+
+BackupReaderS3::BackupReaderS3(
+    const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, const ContextPtr & context_)
+    : s3_uri(s3_uri_)
+    , client(makeS3Client(s3_uri_, access_key_id_, secret_access_key_, context_))
+    , max_single_read_retries(context_->getSettingsRef().s3_max_single_read_retries)
+    , read_settings(context_->getReadSettings())
+{
+}
+
+DataSourceDescription BackupReaderS3::getDataSourceDescription() const
+{
+    return DataSourceDescription{DataSourceType::S3, s3_uri.endpoint, false, false};
+}
+
+
+BackupReaderS3::~BackupReaderS3() = default;
+
+bool BackupReaderS3::fileExists(const String & file_name)
+{
+    return !listObjects(*client, s3_uri, file_name).empty();
+}
+
+UInt64 BackupReaderS3::getFileSize(const String & file_name)
+{
+    auto objects = listObjects(*client, s3_uri, file_name);
+    if (objects.empty())
+        throw Exception(ErrorCodes::S3_ERROR, "Object {} must exist");
+    return objects[0].GetSize();
+}
+
+std::unique_ptr<SeekableReadBuffer> BackupReaderS3::readFile(const String & file_name)
+{
+    return std::make_unique<ReadBufferFromS3>(
+        client, s3_uri.bucket, fs::path(s3_uri.key) / file_name, s3_uri.version_id, max_single_read_retries, read_settings);
+}
+
+
+BackupWriterS3::BackupWriterS3(
+    const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, const ContextPtr & context_)
+    : s3_uri(s3_uri_)
+    , client(makeS3Client(s3_uri_, access_key_id_, secret_access_key_, context_))
+    , max_single_read_retries(context_->getSettingsRef().s3_max_single_read_retries)
+    , read_settings(context_->getReadSettings())
+    , rw_settings(context_->getStorageS3Settings().getSettings(s3_uri.uri.toString()).rw_settings)
+{
+    rw_settings.updateFromSettingsIfEmpty(context_->getSettingsRef());
+}
+
+DataSourceDescription BackupWriterS3::getDataSourceDescription() const
+{
+    return DataSourceDescription{DataSourceType::S3, s3_uri.endpoint, false, false};
+}
+
+bool BackupWriterS3::supportNativeCopy(DataSourceDescription data_source_description) const
+{
+    return getDataSourceDescription() == data_source_description;
+}
+
+
+void BackupWriterS3::copyObjectImpl(
+    const String & src_bucket,
+    const String & src_key,
+    const String & dst_bucket,
+    const String & dst_key,
+    std::optional<Aws::S3::Model::HeadObjectResult> head,
+    std::optional<ObjectAttributes> metadata) const
+{
+    Aws::S3::Model::CopyObjectRequest request;
+    request.SetCopySource(src_bucket + "/" + src_key);
+    request.SetBucket(dst_bucket);
+    request.SetKey(dst_key);
+    if (metadata)
+    {
+        request.SetMetadata(*metadata);
+        request.SetMetadataDirective(Aws::S3::Model::MetadataDirective::REPLACE);
+    }
+
+    auto outcome = client->CopyObject(request);
+
+    if (!outcome.IsSuccess() && outcome.GetError().GetExceptionName() == "EntityTooLarge")
+    { // Can't come here with MinIO, MinIO allows single part upload for large objects.
+        copyObjectMultipartImpl(src_bucket, src_key, dst_bucket, dst_key, head, metadata);
+        return;
+    }
+
+    if (!outcome.IsSuccess())
+        throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
+
+}
+
+Aws::S3::Model::HeadObjectOutcome BackupWriterS3::requestObjectHeadData(const std::string & bucket_from, const std::string & key) const
+{
+    Aws::S3::Model::HeadObjectRequest request;
+    request.SetBucket(bucket_from);
+    request.SetKey(key);
+
+    return client->HeadObject(request);
+}
+
+void BackupWriterS3::copyObjectMultipartImpl(
+    const String & src_bucket,
+    const String & src_key,
+    const String & dst_bucket,
+    const String & dst_key,
+    std::optional<Aws::S3::Model::HeadObjectResult> head,
+    std::optional<ObjectAttributes> metadata) const
+{
+    if (!head)
+        head = requestObjectHeadData(src_bucket, src_key).GetResult();
+
+    size_t size = head->GetContentLength();
+
+    String multipart_upload_id;
+
+    {
+        Aws::S3::Model::CreateMultipartUploadRequest request;
+        request.SetBucket(dst_bucket);
+        request.SetKey(dst_key);
+        if (metadata)
+            request.SetMetadata(*metadata);
+
+        auto outcome = client->CreateMultipartUpload(request);
+
+        if (!outcome.IsSuccess())
+            throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
+
+        multipart_upload_id = outcome.GetResult().GetUploadId();
+    }
+
+    std::vector<String> part_tags;
+
+    size_t upload_part_size = rw_settings.min_upload_part_size;
+    for (size_t position = 0, part_number = 1; position < size; ++part_number, position += upload_part_size)
+    {
+        Aws::S3::Model::UploadPartCopyRequest part_request;
+        part_request.SetCopySource(src_bucket + "/" + src_key);
+        part_request.SetBucket(dst_bucket);
+        part_request.SetKey(dst_key);
+        part_request.SetUploadId(multipart_upload_id);
+        part_request.SetPartNumber(static_cast<int>(part_number));
+        part_request.SetCopySourceRange(fmt::format("bytes={}-{}", position, std::min(size, position + upload_part_size) - 1));
+
+        auto outcome = client->UploadPartCopy(part_request);
+        if (!outcome.IsSuccess())
+        {
+            Aws::S3::Model::AbortMultipartUploadRequest abort_request;
+            abort_request.SetBucket(dst_bucket);
+            abort_request.SetKey(dst_key);
+            abort_request.SetUploadId(multipart_upload_id);
+            client->AbortMultipartUpload(abort_request);
+            // In error case we throw exception later with first error from UploadPartCopy
+        }
+        if (!outcome.IsSuccess())
+            throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
+
+        auto etag = outcome.GetResult().GetCopyPartResult().GetETag();
+        part_tags.push_back(etag);
+    }
+
+    {
+        Aws::S3::Model::CompleteMultipartUploadRequest req;
+        req.SetBucket(dst_bucket);
+        req.SetKey(dst_key);
+        req.SetUploadId(multipart_upload_id);
+
+        Aws::S3::Model::CompletedMultipartUpload multipart_upload;
+        for (size_t i = 0; i < part_tags.size(); ++i)
+        {
+            Aws::S3::Model::CompletedPart part;
+            multipart_upload.AddParts(part.WithETag(part_tags[i]).WithPartNumber(static_cast<int>(i) + 1));
+        }
+
+        req.SetMultipartUpload(multipart_upload);
+
+        auto outcome = client->CompleteMultipartUpload(req);
+
+        if (!outcome.IsSuccess())
+            throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
+    }
+}
+
+void BackupWriterS3::copyFileNative(DiskPtr from_disk, const String & file_name_from, const String & file_name_to)
+{
+    if (!from_disk)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot natively copy data to disk without source disk");
+
+    auto objects = from_disk->getStorageObjects(file_name_from);
+    if (objects.size() > 1)
+    {
+        copyFileThroughBuffer(from_disk->readFile(file_name_from), file_name_to);
+    }
+    else
+    {
+        auto object_storage = from_disk->getObjectStorage();
+        std::string source_bucket = object_storage->getObjectsNamespace();
+        auto file_path = fs::path(s3_uri.key) / file_name_to;
+
+        auto head = requestObjectHeadData(source_bucket, objects[0].absolute_path).GetResult();
+        static constexpr int64_t multipart_upload_threashold = 5UL * 1024 * 1024 * 1024;
+        if (head.GetContentLength() >= multipart_upload_threashold)
+        {
+            copyObjectMultipartImpl(
+                source_bucket, objects[0].absolute_path, s3_uri.bucket, file_path, head);
+        }
+        else
+        {
+            copyObjectImpl(
+                source_bucket, objects[0].absolute_path, s3_uri.bucket, file_path, head);
+        }
+    }
+}
+
+
+BackupWriterS3::~BackupWriterS3() = default;
+
+bool BackupWriterS3::fileExists(const String & file_name)
+{
+    return !listObjects(*client, s3_uri, file_name).empty();
+}
+
+UInt64 BackupWriterS3::getFileSize(const String & file_name)
+{
+    auto objects = listObjects(*client, s3_uri, file_name);
+    if (objects.empty())
+        throw Exception(ErrorCodes::S3_ERROR, "Object {} must exist");
+    return objects[0].GetSize();
+}
+
+bool BackupWriterS3::fileContentsEqual(const String & file_name, const String & expected_file_contents)
+{
+    if (listObjects(*client, s3_uri, file_name).empty())
+        return false;
+
+    try
+    {
+        auto in = std::make_unique<ReadBufferFromS3>(
+            client, s3_uri.bucket, fs::path(s3_uri.key) / file_name, s3_uri.version_id, max_single_read_retries, read_settings);
+        String actual_file_contents(expected_file_contents.size(), ' ');
+        return (in->read(actual_file_contents.data(), actual_file_contents.size()) == actual_file_contents.size())
+            && (actual_file_contents == expected_file_contents) && in->eof();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        return false;
+    }
+}
+
+std::unique_ptr<WriteBuffer> BackupWriterS3::writeFile(const String & file_name)
+{
+    return std::make_unique<WriteBufferFromS3>(
+        client,
+        s3_uri.bucket,
+        fs::path(s3_uri.key) / file_name,
+        rw_settings,
+        std::nullopt,
+        DBMS_DEFAULT_BUFFER_SIZE,
+        threadPoolCallbackRunner<void>(IOThreadPool::get(), "BackupWriterS3"));
+}
+
+void BackupWriterS3::removeFiles(const Strings & file_names)
+{
+    /// One call of DeleteObjects() cannot remove more than 1000 keys.
+    size_t chunk_size_limit = 1000;
+
+    size_t current_position = 0;
+    while (current_position < file_names.size())
+    {
+        std::vector<Aws::S3::Model::ObjectIdentifier> current_chunk;
+        for (; current_position < file_names.size() && current_chunk.size() < chunk_size_limit; ++current_position)
+        {
+            Aws::S3::Model::ObjectIdentifier obj;
+            obj.SetKey(fs::path(s3_uri.key) / file_names[current_position]);
+            current_chunk.push_back(obj);
+        }
+
+        Aws::S3::Model::Delete delkeys;
+        delkeys.SetObjects(current_chunk);
+        Aws::S3::Model::DeleteObjectsRequest request;
+        request.SetBucket(s3_uri.bucket);
+        request.SetDelete(delkeys);
+
+        auto outcome = client->DeleteObjects(request);
+        if (!outcome.IsSuccess())
+            throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
+    }
+}
+
+}
+
+#endif
diff --git a/src/Backups/BackupIO_S3.h b/src/Backups/BackupIO_S3.h
new file mode 100644
index 00000000000..471ddcc06e6
--- /dev/null
+++ b/src/Backups/BackupIO_S3.h
@@ -0,0 +1,92 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_AWS_S3
+#include <Backups/BackupIO.h>
+#include <IO/S3Common.h>
+#include <IO/ReadSettings.h>
+#include <Storages/StorageS3Settings.h>
+
+#include <aws/s3/S3Client.h>
+#include <aws/s3/model/CopyObjectRequest.h>
+#include <aws/s3/model/ListObjectsV2Request.h>
+#include <aws/s3/model/HeadObjectRequest.h>
+#include <aws/s3/model/DeleteObjectRequest.h>
+#include <aws/s3/model/DeleteObjectsRequest.h>
+#include <aws/s3/model/CreateMultipartUploadRequest.h>
+#include <aws/s3/model/CompleteMultipartUploadRequest.h>
+#include <aws/s3/model/UploadPartCopyRequest.h>
+#include <aws/s3/model/AbortMultipartUploadRequest.h>
+#include <aws/s3/model/HeadObjectResult.h>
+#include <aws/s3/model/ListObjectsV2Result.h>
+
+namespace DB
+{
+
+/// Represents a backup stored to AWS S3.
+class BackupReaderS3 : public IBackupReader
+{
+public:
+    BackupReaderS3(const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, const ContextPtr & context_);
+    ~BackupReaderS3() override;
+
+    bool fileExists(const String & file_name) override;
+    UInt64 getFileSize(const String & file_name) override;
+    std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) override;
+    DataSourceDescription getDataSourceDescription() const override;
+
+private:
+    S3::URI s3_uri;
+    std::shared_ptr<Aws::S3::S3Client> client;
+    UInt64 max_single_read_retries;
+    ReadSettings read_settings;
+};
+
+
+class BackupWriterS3 : public IBackupWriter
+{
+public:
+    BackupWriterS3(const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, const ContextPtr & context_);
+    ~BackupWriterS3() override;
+
+    bool fileExists(const String & file_name) override;
+    UInt64 getFileSize(const String & file_name) override;
+    bool fileContentsEqual(const String & file_name, const String & expected_file_contents) override;
+    std::unique_ptr<WriteBuffer> writeFile(const String & file_name) override;
+    void removeFiles(const Strings & file_names) override;
+
+    DataSourceDescription getDataSourceDescription() const override;
+    bool supportNativeCopy(DataSourceDescription data_source_description) const override;
+    void copyFileNative(DiskPtr from_disk, const String & file_name_from, const String & file_name_to) override;
+
+private:
+
+    Aws::S3::Model::HeadObjectOutcome requestObjectHeadData(const std::string & bucket_from, const std::string & key) const;
+
+    void copyObjectImpl(
+        const String & src_bucket,
+        const String & src_key,
+        const String & dst_bucket,
+        const String & dst_key,
+        std::optional<Aws::S3::Model::HeadObjectResult> head = std::nullopt,
+        std::optional<ObjectAttributes> metadata = std::nullopt) const;
+
+    void copyObjectMultipartImpl(
+        const String & src_bucket,
+        const String & src_key,
+        const String & dst_bucket,
+        const String & dst_key,
+        std::optional<Aws::S3::Model::HeadObjectResult> head = std::nullopt,
+        std::optional<ObjectAttributes> metadata = std::nullopt) const;
+
+    S3::URI s3_uri;
+    std::shared_ptr<Aws::S3::S3Client> client;
+    UInt64 max_single_read_retries;
+    ReadSettings read_settings;
+    S3Settings::ReadWriteSettings rw_settings;
+};
+
+}
+
+#endif
diff --git a/src/Backups/BackupImpl.cpp b/src/Backups/BackupImpl.cpp
index 8b648af44ec..2d58e993364 100644
--- a/src/Backups/BackupImpl.cpp
+++ b/src/Backups/BackupImpl.cpp
@@ -455,6 +455,7 @@ void BackupImpl::createLockFile()
     assert(uuid);
     auto out = writer->writeFile(lock_file_name);
     writeUUIDText(*uuid, *out);
+    out->finalize();
 }
 
 bool BackupImpl::checkLockFile(bool throw_if_failed) const
diff --git a/src/Backups/BackupSettings.cpp b/src/Backups/BackupSettings.cpp
index a4b20e0b863..295ab723326 100644
--- a/src/Backups/BackupSettings.cpp
+++ b/src/Backups/BackupSettings.cpp
@@ -62,7 +62,6 @@ namespace
 #define LIST_OF_BACKUP_SETTINGS(M) \
     M(String, id) \
     M(String, compression_method) \
-    M(Int64, compression_level) \
     M(String, password) \
     M(Bool, structure_only) \
     M(Bool, async) \
@@ -72,6 +71,7 @@ namespace
     M(String, host_id) \
     M(String, coordination_zk_path) \
     M(OptionalUUID, backup_uuid)
+    /// M(Int64, compression_level)
 
 BackupSettings BackupSettings::fromBackupQuery(const ASTBackupQuery & query)
 {
@@ -82,6 +82,9 @@ BackupSettings BackupSettings::fromBackupQuery(const ASTBackupQuery & query)
         const auto & settings = query.settings->as<const ASTSetQuery &>().changes;
         for (const auto & setting : settings)
         {
+            if (setting.name == "compression_level")
+                res.compression_level = static_cast<int>(SettingFieldInt64{setting.value}.value);
+            else
 #define GET_SETTINGS_FROM_BACKUP_QUERY_HELPER(TYPE, NAME) \
             if (setting.name == #NAME) \
                 res.NAME = SettingField##TYPE{setting.value}.value; \
diff --git a/src/Backups/registerBackupEngineS3.cpp b/src/Backups/registerBackupEngineS3.cpp
new file mode 100644
index 00000000000..4d628e57b5c
--- /dev/null
+++ b/src/Backups/registerBackupEngineS3.cpp
@@ -0,0 +1,129 @@
+#include "config.h"
+
+#include <Backups/BackupFactory.h>
+#include <Common/Exception.h>
+
+#if USE_AWS_S3
+#include <Backups/BackupIO_S3.h>
+#include <Backups/BackupImpl.h>
+#include <IO/Archives/hasRegisteredArchiveFileExtension.h>
+#include <Interpreters/Context.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <filesystem>
+#endif
+
+
+namespace DB
+{
+namespace fs = std::filesystem;
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int SUPPORT_IS_DISABLED;
+}
+
+#if USE_AWS_S3
+namespace
+{
+    String removeFileNameFromURL(String & url)
+    {
+        Poco::URI url2{url};
+        String path = url2.getPath();
+        size_t slash_pos = path.find_last_of('/');
+        String file_name = path.substr(slash_pos + 1);
+        path.resize(slash_pos + 1);
+        url2.setPath(path);
+        url = url2.toString();
+        return file_name;
+    }
+}
+#endif
+
+
+void registerBackupEngineS3(BackupFactory & factory)
+{
+    auto creator_fn = []([[maybe_unused]] const BackupFactory::CreateParams & params) -> std::unique_ptr<IBackup>
+    {
+#if USE_AWS_S3
+        String backup_name = params.backup_info.toString();
+        const String & id_arg = params.backup_info.id_arg;
+        const auto & args = params.backup_info.args;
+
+        String s3_uri, access_key_id, secret_access_key;
+
+        if (!id_arg.empty())
+        {
+            const auto & config = params.context->getConfigRef();
+            auto config_prefix = "named_collections." + id_arg;
+
+            if (!config.has(config_prefix))
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", id_arg);
+
+            s3_uri = config.getString(config_prefix + ".url");
+            access_key_id = config.getString(config_prefix + ".access_key_id", "");
+            secret_access_key = config.getString(config_prefix + ".secret_access_key", "");
+
+            if (config.has(config_prefix + ".filename"))
+                s3_uri = fs::path(s3_uri) / config.getString(config_prefix + ".filename");
+
+            if (args.size() > 1)
+                throw Exception(
+                    "Backup S3 requires 1 or 2 arguments: named_collection, [filename]",
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+            if (args.size() == 1)
+                s3_uri = fs::path(s3_uri) / args[0].safeGet<String>();
+        }
+        else
+        {
+            if ((args.size() != 1) && (args.size() != 3))
+                throw Exception(
+                    "Backup S3 requires 1 or 3 arguments: url, [access_key_id, secret_access_key]",
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+            s3_uri = args[0].safeGet<String>();
+            if (args.size() >= 3)
+            {
+                access_key_id = args[1].safeGet<String>();
+                secret_access_key = args[2].safeGet<String>();
+            }
+        }
+
+        BackupImpl::ArchiveParams archive_params;
+        if (hasRegisteredArchiveFileExtension(s3_uri))
+        {
+            if (params.is_internal_backup)
+                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Using archives with backups on clusters is disabled");
+
+            archive_params.archive_name = removeFileNameFromURL(s3_uri);
+            archive_params.compression_method = params.compression_method;
+            archive_params.compression_level = params.compression_level;
+            archive_params.password = params.password;
+        }
+        else
+        {
+            if (!params.password.empty())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Password is not applicable, backup cannot be encrypted");
+        }
+
+        if (params.open_mode == IBackup::OpenMode::READ)
+        {
+            auto reader = std::make_shared<BackupReaderS3>(S3::URI{Poco::URI{s3_uri}}, access_key_id, secret_access_key, params.context);
+            return std::make_unique<BackupImpl>(backup_name, archive_params, params.base_backup_info, reader, params.context);
+        }
+        else
+        {
+            auto writer = std::make_shared<BackupWriterS3>(S3::URI{Poco::URI{s3_uri}}, access_key_id, secret_access_key, params.context);
+            return std::make_unique<BackupImpl>(backup_name, archive_params, params.base_backup_info, writer, params.context, params.is_internal_backup, params.backup_coordination, params.backup_uuid);
+        }
+#else
+        throw Exception("S3 support is disabled", ErrorCodes::SUPPORT_IS_DISABLED);
+#endif
+    };
+
+    factory.registerBackupEngine("S3", creator_fn);
+}
+
+}
diff --git a/src/Bridge/IBridge.h b/src/Bridge/IBridge.h
index 2f35c361cca..68af8860cb3 100644
--- a/src/Bridge/IBridge.h
+++ b/src/Bridge/IBridge.h
@@ -43,7 +43,7 @@ private:
     std::string hostname;
     size_t port;
     std::string log_level;
-    size_t max_server_connections;
+    unsigned max_server_connections;
     size_t http_timeout;
 
     Poco::Logger * log;
diff --git a/src/BridgeHelper/IBridgeHelper.h b/src/BridgeHelper/IBridgeHelper.h
index a3348c81b68..b7fac3f1303 100644
--- a/src/BridgeHelper/IBridgeHelper.h
+++ b/src/BridgeHelper/IBridgeHelper.h
@@ -43,7 +43,7 @@ protected:
 
     virtual String serviceFileName() const = 0;
 
-    virtual size_t getDefaultPort() const = 0;
+    virtual unsigned getDefaultPort() const = 0;
 
     virtual bool startBridgeManually() const = 0;
 
diff --git a/src/BridgeHelper/LibraryBridgeHelper.h b/src/BridgeHelper/LibraryBridgeHelper.h
index 447a4c713f4..1723d1f8fb4 100644
--- a/src/BridgeHelper/LibraryBridgeHelper.h
+++ b/src/BridgeHelper/LibraryBridgeHelper.h
@@ -23,7 +23,7 @@ protected:
 
     String serviceFileName() const override { return serviceAlias(); }
 
-    size_t getDefaultPort() const override { return DEFAULT_PORT; }
+    unsigned getDefaultPort() const override { return DEFAULT_PORT; }
 
     bool startBridgeManually() const override { return false; }
 
diff --git a/src/BridgeHelper/XDBCBridgeHelper.h b/src/BridgeHelper/XDBCBridgeHelper.h
index b62cb277ecb..139c1ab9726 100644
--- a/src/BridgeHelper/XDBCBridgeHelper.h
+++ b/src/BridgeHelper/XDBCBridgeHelper.h
@@ -109,7 +109,7 @@ protected:
 
     String getName() const override { return BridgeHelperMixin::getName(); }
 
-    size_t getDefaultPort() const override { return DEFAULT_PORT; }
+    unsigned getDefaultPort() const override { return DEFAULT_PORT; }
 
     String serviceAlias() const override { return BridgeHelperMixin::serviceAlias(); }
 
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 0a2fbcf9f46..5d7de8ec799 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -1,7 +1,6 @@
 #include <Client/ClientBase.h>
 
 #include <iostream>
-#include <iomanip>
 #include <filesystem>
 #include <map>
 #include <unordered_map>
@@ -9,7 +8,6 @@
 #include "config.h"
 
 #include <Common/DateLUT.h>
-#include <Common/LocalDate.h>
 #include <Common/MemoryTracker.h>
 #include <base/argsToConfig.h>
 #include <base/LineReader.h>
@@ -32,7 +30,6 @@
 #include <Common/clearPasswordFromCommandLine.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/filesystemHelpers.h>
-#include <Common/Config/configReadClient.h>
 #include <Common/NetException.h>
 #include <Storages/ColumnsDescription.h>
 
@@ -70,10 +67,10 @@
 #include <IO/WriteBufferFromOStream.h>
 #include <IO/CompressionMethod.h>
 #include <Client/InternalTextLogs.h>
-#include <boost/algorithm/string/replace.hpp>
 #include <IO/ForkWriteBuffer.h>
 #include <Parsers/Kusto/ParserKQLStatement.h>
 
+
 namespace fs = std::filesystem;
 using namespace std::literals;
 
@@ -340,7 +337,7 @@ ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, bool allow_mu
 
 
 /// Consumes trailing semicolons and tries to consume the same-line trailing comment.
-void ClientBase::adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, int max_parser_depth)
+void ClientBase::adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, uint32_t max_parser_depth)
 {
     // We have to skip the trailing semicolon that might be left
     // after VALUES parsing or just after a normal semicolon-terminated query.
@@ -553,7 +550,7 @@ try
                 out_file_buf = wrapWriteBufferWithCompressionMethod(
                     std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
                     compression_method,
-                    compression_level
+                    static_cast<int>(compression_level)
                 );
 
                 if (query_with_output->is_into_outfile_with_stdout)
@@ -1605,6 +1602,8 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
     if (this_query_begin >= all_queries_end)
         return MultiQueryProcessingStage::QUERIES_END;
 
+    unsigned max_parser_depth = static_cast<unsigned>(global_context->getSettingsRef().max_parser_depth);
+
     // If there are only comments left until the end of file, we just
     // stop. The parser can't handle this situation because it always
     // expects that there is some query that it can parse.
@@ -1614,7 +1613,7 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
     // and it makes more sense to treat them as such.
     {
         Tokens tokens(this_query_begin, all_queries_end);
-        IParser::Pos token_iterator(tokens, global_context->getSettingsRef().max_parser_depth);
+        IParser::Pos token_iterator(tokens, max_parser_depth);
         if (!token_iterator.isValid())
             return MultiQueryProcessingStage::QUERIES_END;
     }
@@ -1635,7 +1634,7 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
         if (ignore_error)
         {
             Tokens tokens(this_query_begin, all_queries_end);
-            IParser::Pos token_iterator(tokens, global_context->getSettingsRef().max_parser_depth);
+            IParser::Pos token_iterator(tokens, max_parser_depth);
             while (token_iterator->type != TokenType::Semicolon && token_iterator.isValid())
                 ++token_iterator;
             this_query_begin = token_iterator->end;
@@ -1675,7 +1674,7 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
     // after we have processed the query. But even this guess is
     // beneficial so that we see proper trailing comments in "echo" and
     // server log.
-    adjustQueryEnd(this_query_end, all_queries_end, global_context->getSettingsRef().max_parser_depth);
+    adjustQueryEnd(this_query_end, all_queries_end, max_parser_depth);
     return MultiQueryProcessingStage::EXECUTE_QUERY;
 }
 
@@ -1869,7 +1868,9 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                 if (insert_ast && isSyncInsertWithData(*insert_ast, global_context))
                 {
                     this_query_end = insert_ast->end;
-                    adjustQueryEnd(this_query_end, all_queries_end, global_context->getSettingsRef().max_parser_depth);
+                    adjustQueryEnd(
+                        this_query_end, all_queries_end,
+                        static_cast<unsigned>(global_context->getSettingsRef().max_parser_depth));
                 }
 
                 // Report error.
@@ -1925,7 +1926,7 @@ bool ClientBase::processQueryText(const String & text)
 
 String ClientBase::prompt() const
 {
-    return boost::replace_all_copy(prompt_by_server_display_name, "{database}", config().getString("database", "default"));
+    return prompt_by_server_display_name;
 }
 
 
@@ -2350,7 +2351,7 @@ void ClientBase::init(int argc, char ** argv)
     if (options.count("print-profile-events"))
         config().setBool("print-profile-events", true);
     if (options.count("profile-events-delay-ms"))
-        config().setInt("profile-events-delay-ms", options["profile-events-delay-ms"].as<UInt64>());
+        config().setUInt64("profile-events-delay-ms", options["profile-events-delay-ms"].as<UInt64>());
     if (options.count("progress"))
         config().setBool("progress", true);
     if (options.count("echo"))
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index 01edb65e135..27f29f24949 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -72,7 +72,7 @@ protected:
     void processParsedSingleQuery(const String & full_query, const String & query_to_execute,
         ASTPtr parsed_query, std::optional<bool> echo_query_ = {}, bool report_error = false);
 
-    static void adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, int max_parser_depth);
+    static void adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, uint32_t max_parser_depth);
     ASTPtr parseQuery(const char *& pos, const char * end, bool allow_multi_statements) const;
     static void setupSignalHandler();
 
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
index f1802467b57..c7392a86a7e 100644
--- a/src/Client/HedgedConnections.cpp
+++ b/src/Client/HedgedConnections.cpp
@@ -338,7 +338,7 @@ HedgedConnections::ReplicaLocation HedgedConnections::getReadyReplicaLocation(As
             offset_states[location.offset].replicas[location.index].change_replica_timeout.reset();
             offset_states[location.offset].replicas[location.index].is_change_replica_timeout_expired = true;
             offset_states[location.offset].next_replica_in_process = true;
-            offsets_queue.push(location.offset);
+            offsets_queue.push(static_cast<int>(location.offset));
             ProfileEvents::increment(ProfileEvents::HedgedRequestsChangeReplica);
             startNewReplica();
         }
diff --git a/src/Client/HedgedConnectionsFactory.cpp b/src/Client/HedgedConnectionsFactory.cpp
index 81067f51d29..bed73b1c200 100644
--- a/src/Client/HedgedConnectionsFactory.cpp
+++ b/src/Client/HedgedConnectionsFactory.cpp
@@ -362,7 +362,7 @@ void HedgedConnectionsFactory::removeReplicaFromEpoll(int index, int fd)
     timeout_fd_to_replica_index.erase(replicas[index].change_replica_timeout.getDescriptor());
 }
 
-int HedgedConnectionsFactory::numberOfProcessingReplicas() const
+size_t HedgedConnectionsFactory::numberOfProcessingReplicas() const
 {
     if (epoll.empty())
         return 0;
@@ -381,7 +381,7 @@ HedgedConnectionsFactory::State HedgedConnectionsFactory::setBestUsableReplica(C
             && result.is_usable
             && !replicas[i].is_ready
             && (!skip_replicas_with_two_level_aggregation_incompatibility || !isTwoLevelAggregationIncompatible(&*result.entry)))
-            indexes.push_back(i);
+            indexes.push_back(static_cast<int>(i));
     }
 
     if (indexes.empty())
diff --git a/src/Client/HedgedConnectionsFactory.h b/src/Client/HedgedConnectionsFactory.h
index c5e8d493efa..194e962d549 100644
--- a/src/Client/HedgedConnectionsFactory.h
+++ b/src/Client/HedgedConnectionsFactory.h
@@ -70,7 +70,7 @@ public:
 
     const ConnectionTimeouts & getConnectionTimeouts() const { return timeouts; }
 
-    int numberOfProcessingReplicas() const;
+    size_t numberOfProcessingReplicas() const;
 
     /// Tell Factory to not return connections with two level aggregation incompatibility.
     void skipReplicasWithTwoLevelAggregationIncompatibility() { skip_replicas_with_two_level_aggregation_incompatibility = true; }
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
index 7ac68324915..476386889d2 100644
--- a/src/Client/LocalConnection.cpp
+++ b/src/Client/LocalConnection.cpp
@@ -6,8 +6,6 @@
 #include <Processors/Executors/PushingAsyncPipelineExecutor.h>
 #include <Storages/IStorage.h>
 #include <Core/Protocol.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeString.h>
 
 
 namespace DB
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index 72cd4c46477..87eda765a7a 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -393,24 +393,38 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
         Poco::Net::Socket::SocketList write_list;
         Poco::Net::Socket::SocketList except_list;
 
-        for (const ReplicaState & state : replica_states)
-        {
-            Connection * connection = state.connection;
-            if (connection != nullptr)
-                read_list.push_back(*connection->socket);
-        }
-
         auto timeout = is_draining ? drain_timeout : receive_timeout;
-        int n = Poco::Net::Socket::select(
-            read_list,
-            write_list,
-            except_list,
-            timeout);
+        int n = 0;
+
+        /// EINTR loop
+        while (true)
+        {
+            read_list.clear();
+            for (const ReplicaState & state : replica_states)
+            {
+                Connection * connection = state.connection;
+                if (connection != nullptr)
+                    read_list.push_back(*connection->socket);
+            }
+
+            /// poco returns 0 on EINTR, let's reset errno to ensure that EINTR came from select().
+            errno = 0;
+
+            n = Poco::Net::Socket::select(
+                read_list,
+                write_list,
+                except_list,
+                timeout);
+            if (n <= 0 && errno == EINTR)
+                continue;
+            break;
+        }
 
         /// We treat any error as timeout for simplicity.
         /// And we also check if read_list is still empty just in case.
         if (n <= 0 || read_list.empty())
         {
+            const auto & addresses = dumpAddressesUnlocked();
             for (ReplicaState & state : replica_states)
             {
                 Connection * connection = state.connection;
@@ -423,7 +437,7 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
             throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
                 "Timeout ({} ms) exceeded while reading from {}",
                 timeout.totalMilliseconds(),
-                dumpAddressesUnlocked());
+                addresses);
         }
     }
 
diff --git a/src/Client/QueryFuzzer.cpp b/src/Client/QueryFuzzer.cpp
index f0c4313e8a8..d5cd4ef1548 100644
--- a/src/Client/QueryFuzzer.cpp
+++ b/src/Client/QueryFuzzer.cpp
@@ -81,9 +81,9 @@ Field QueryFuzzer::getRandomField(int type)
     {
         static constexpr UInt64 scales[] = {0, 1, 2, 10};
         return DecimalField<Decimal64>(
-            bad_int64_values[fuzz_rand() % (sizeof(bad_int64_values)
-                / sizeof(*bad_int64_values))],
-            scales[fuzz_rand() % (sizeof(scales) / sizeof(*scales))]);
+            bad_int64_values[fuzz_rand() % (sizeof(bad_int64_values) / sizeof(*bad_int64_values))],
+            static_cast<UInt32>(scales[fuzz_rand() % (sizeof(scales) / sizeof(*scales))])
+        );
     }
     default:
         assert(false);
@@ -468,6 +468,16 @@ bool QueryFuzzer::isSuitableForFuzzing(const ASTCreateQuery & create)
     return create.columns_list && create.columns_list->columns;
 }
 
+static String getOriginalTableName(const String & full_name)
+{
+    return full_name.substr(0, full_name.find("__fuzz_"));
+}
+
+static String getFuzzedTableName(const String & original_name, size_t index)
+{
+    return original_name + "__fuzz_" + toString(index);
+}
+
 void QueryFuzzer::fuzzCreateQuery(ASTCreateQuery & create)
 {
     if (create.columns_list && create.columns_list->columns)
@@ -501,10 +511,9 @@ void QueryFuzzer::fuzzCreateQuery(ASTCreateQuery & create)
     }
 
     auto full_name = create.getTable();
-    auto original_name = full_name.substr(0, full_name.find("__fuzz_"));
-
+    auto original_name = getOriginalTableName(full_name);
     size_t index = index_of_fuzzed_table[original_name]++;
-    auto new_name = original_name + "__fuzz_" + toString(index);
+    auto new_name = getFuzzedTableName(original_name, index);
 
     create.setTable(new_name);
 
@@ -665,7 +674,8 @@ void QueryFuzzer::fuzzTableName(ASTTableExpression & table)
     if (table_id.empty())
         return;
 
-    auto it = original_table_name_to_fuzzed.find(table_id.getTableName());
+    auto original_name = getOriginalTableName(table_id.getTableName());
+    auto it = original_table_name_to_fuzzed.find(original_name);
     if (it != original_table_name_to_fuzzed.end() && !it->second.empty())
     {
         auto new_table_name = it->second.begin();
@@ -728,7 +738,7 @@ ASTs QueryFuzzer::getDropQueriesForFuzzedTables(const ASTDropQuery & drop_query)
     /// Drop all created tables, not only unique ones.
     for (size_t i = 0; i < it->second; ++i)
     {
-        auto fuzzed_name = table_name + "__fuzz_" + toString(i);
+        auto fuzzed_name = getFuzzedTableName(table_name, i);
         auto & query = queries.emplace_back(drop_query.clone());
         query->as<ASTDropQuery>()->setTable(fuzzed_name);
         /// Just in case add IF EXISTS to avoid exceptions.
@@ -749,7 +759,9 @@ void QueryFuzzer::notifyQueryFailed(ASTPtr ast)
         if (pos != std::string::npos)
         {
             auto original_name = table_name.substr(0, pos);
-            original_table_name_to_fuzzed[original_name].erase(table_name);
+            auto it = original_table_name_to_fuzzed.find(original_name);
+            if (it != original_table_name_to_fuzzed.end())
+                it->second.erase(table_name);
         }
     };
 
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index bb56baf9216..d34ae640962 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -277,13 +277,13 @@ void ColumnArray::updateWeakHash32(WeakHash32 & hash) const
     {
         /// This row improves hash a little bit according to integration tests.
         /// It is the same as to use previous hash value as the first element of array.
-        hash_data[i] = intHashCRC32(hash_data[i]);
+        hash_data[i] = static_cast<UInt32>(intHashCRC32(hash_data[i]));
 
         for (size_t row = prev_offset; row < offsets_data[i]; ++row)
             /// It is probably not the best way to combine hashes.
             /// But much better then xor which lead to similar hash for arrays like [1], [1, 1, 1], [1, 1, 1, 1, 1], ...
             /// Much better implementation - to add offsets as an optional argument to updateWeakHash32.
-            hash_data[i] = intHashCRC32(internal_hash_data[row], hash_data[i]);
+            hash_data[i] = static_cast<UInt32>(intHashCRC32(internal_hash_data[row], hash_data[i]));
 
         prev_offset = offsets_data[i];
     }
@@ -569,8 +569,8 @@ void ColumnArray::expand(const IColumn::Filter & mask, bool inverted)
     if (mask.size() < offsets_data.size())
         throw Exception("Mask size should be no less than data size.", ErrorCodes::LOGICAL_ERROR);
 
-    int index = mask.size() - 1;
-    int from = offsets_data.size() - 1;
+    ssize_t index = mask.size() - 1;
+    ssize_t from = offsets_data.size() - 1;
     offsets_data.resize(mask.size());
     UInt64 last_offset = offsets_data[from];
     while (index >= 0)
diff --git a/src/Columns/ColumnCompressed.cpp b/src/Columns/ColumnCompressed.cpp
index 292c6968b86..cdf604d89f7 100644
--- a/src/Columns/ColumnCompressed.cpp
+++ b/src/Columns/ColumnCompressed.cpp
@@ -27,8 +27,8 @@ std::shared_ptr<Memory<>> ColumnCompressed::compressBuffer(const void * data, si
     auto compressed_size = LZ4_compress_default(
         reinterpret_cast<const char *>(data),
         compressed.data(),
-        data_size,
-        max_dest_size);
+        static_cast<int>(data_size),
+        static_cast<int>(max_dest_size));
 
     if (compressed_size <= 0)
         throw Exception(ErrorCodes::CANNOT_COMPRESS, "Cannot compress column");
@@ -51,8 +51,8 @@ void ColumnCompressed::decompressBuffer(
     auto processed_size = LZ4_decompress_safe(
         reinterpret_cast<const char *>(compressed_data),
         reinterpret_cast<char *>(decompressed_data),
-        compressed_size,
-        decompressed_size);
+        static_cast<int>(compressed_size),
+        static_cast<int>(decompressed_size));
 
     if (processed_size <= 0)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress column");
diff --git a/src/Columns/ColumnConst.cpp b/src/Columns/ColumnConst.cpp
index 1864c0194f7..ca691d16f36 100644
--- a/src/Columns/ColumnConst.cpp
+++ b/src/Columns/ColumnConst.cpp
@@ -148,7 +148,7 @@ void ColumnConst::updateWeakHash32(WeakHash32 & hash) const
     size_t data_hash = element_hash.getData()[0];
 
     for (auto & value : hash.getData())
-        value = intHashCRC32(data_hash, value);
+        value = static_cast<UInt32>(intHashCRC32(data_hash, value));
 }
 
 void ColumnConst::compareColumn(
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index 63b76dbb230..33efe440220 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -109,7 +109,7 @@ void ColumnDecimal<T>::updateWeakHash32(WeakHash32 & hash) const
 
     while (begin < end)
     {
-        *hash_data = intHashCRC32(*begin, *hash_data);
+        *hash_data = static_cast<UInt32>(intHashCRC32(*begin, *hash_data));
         ++begin;
         ++hash_data;
     }
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index 7038579d436..a45d4a0b5f1 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -277,8 +277,8 @@ void ColumnFixedString::expand(const IColumn::Filter & mask, bool inverted)
     if (mask.size() < size())
         throw Exception("Mask size should be no less than data size.", ErrorCodes::LOGICAL_ERROR);
 
-    int index = mask.size() - 1;
-    int from = size() - 1;
+    ssize_t index = mask.size() - 1;
+    ssize_t from = size() - 1;
     chars.resize_fill(mask.size() * n, 0);
     while (index >= 0)
     {
diff --git a/src/Columns/ColumnLowCardinality.cpp b/src/Columns/ColumnLowCardinality.cpp
index 17e9bd97669..0981a5b01fa 100644
--- a/src/Columns/ColumnLowCardinality.cpp
+++ b/src/Columns/ColumnLowCardinality.cpp
@@ -46,7 +46,7 @@ namespace
 
         HashMap<T, T> hash_map;
         for (auto val : index)
-            hash_map.insert({val, hash_map.size()});
+            hash_map.insert({val, static_cast<T>(hash_map.size())});
 
         auto res_col = ColumnVector<T>::create();
         auto & data = res_col->getData();
@@ -632,7 +632,7 @@ void ColumnLowCardinality::Index::convertPositions()
 
             /// TODO: Optimize with SSE?
             for (size_t i = 0; i < size; ++i)
-                new_data[i] = data[i];
+                new_data[i] = static_cast<CurIndexType>(data[i]);
 
             positions = std::move(new_positions);
             size_of_type = sizeof(IndexType);
@@ -717,7 +717,7 @@ void ColumnLowCardinality::Index::insertPositionsRange(const IColumn & column, U
                 positions_data.resize(size + limit);
 
                 for (UInt64 i = 0; i < limit; ++i)
-                    positions_data[size + i] = column_data[offset + i];
+                    positions_data[size + i] = static_cast<CurIndexType>(column_data[offset + i]);
             };
 
             callForType(std::move(copy), size_of_type);
@@ -789,7 +789,7 @@ void ColumnLowCardinality::Index::updateWeakHash(WeakHash32 & hash, WeakHash32 &
         auto size = data.size();
 
         for (size_t i = 0; i < size; ++i)
-            hash_data[i] = intHashCRC32(dict_hash_data[data[i]], hash_data[i]);
+            hash_data[i] = static_cast<UInt32>(intHashCRC32(dict_hash_data[data[i]], hash_data[i]));
     };
 
     callForType(std::move(update_weak_hash), size_of_type);
diff --git a/src/Columns/ColumnString.cpp b/src/Columns/ColumnString.cpp
index 9c8082dcd22..982951f05b0 100644
--- a/src/Columns/ColumnString.cpp
+++ b/src/Columns/ColumnString.cpp
@@ -168,8 +168,8 @@ void ColumnString::expand(const IColumn::Filter & mask, bool inverted)
     /// We cannot change only offsets, because each string should end with terminating zero byte.
     /// So, we will insert one zero byte when mask value is zero.
 
-    int index = mask.size() - 1;
-    int from = offsets_data.size() - 1;
+    ssize_t index = mask.size() - 1;
+    ssize_t from = offsets_data.size() - 1;
     /// mask.size() - offsets_data.size() should be equal to the number of zeros in mask
     /// (if not, one of exceptions below will throw) and we can calculate the resulting chars size.
     UInt64 last_offset = offsets_data[from] + (mask.size() - offsets_data.size());
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index bba10bfebf0..a1579a46ae0 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -550,7 +550,7 @@ MutableColumnPtr ColumnUnique<ColumnType>::uniqueInsertRangeImpl(
     auto insert_key = [&](StringRef ref, ReverseIndex<UInt64, ColumnType> & cur_index) -> MutableColumnPtr
     {
         auto inserted_pos = cur_index.insert(ref);
-        positions[num_added_rows] = inserted_pos;
+        positions[num_added_rows] = static_cast<IndexType>(inserted_pos);
         if (inserted_pos == next_position)
             return update_position(next_position);
 
@@ -562,9 +562,9 @@ MutableColumnPtr ColumnUnique<ColumnType>::uniqueInsertRangeImpl(
         auto row = start + num_added_rows;
 
         if (null_map && (*null_map)[row])
-            positions[num_added_rows] = getNullValueIndex();
+            positions[num_added_rows] = static_cast<IndexType>(getNullValueIndex());
         else if (column->compareAt(getNestedTypeDefaultValueIndex(), row, *src_column, 1) == 0)
-            positions[num_added_rows] = getNestedTypeDefaultValueIndex();
+            positions[num_added_rows] = static_cast<IndexType>(getNestedTypeDefaultValueIndex());
         else
         {
             auto ref = src_column->getDataAt(row);
@@ -576,7 +576,7 @@ MutableColumnPtr ColumnUnique<ColumnType>::uniqueInsertRangeImpl(
                 if (insertion_point == reverse_index.lastInsertionPoint())
                     res = insert_key(ref, *secondary_index);
                 else
-                    positions[num_added_rows] = insertion_point;
+                    positions[num_added_rows] = static_cast<IndexType>(insertion_point);
             }
             else
                 res = insert_key(ref, reverse_index);
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index cb570c87498..19a6e6bfa87 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -84,7 +84,7 @@ void ColumnVector<T>::updateWeakHash32(WeakHash32 & hash) const
 
     while (begin < end)
     {
-        *hash_data = hashCRC32(*begin, *hash_data);
+        *hash_data = static_cast<UInt32>(hashCRC32(*begin, *hash_data));
         ++begin;
         ++hash_data;
     }
diff --git a/src/Columns/MaskOperations.cpp b/src/Columns/MaskOperations.cpp
index 3120828921f..e320e1d57a3 100644
--- a/src/Columns/MaskOperations.cpp
+++ b/src/Columns/MaskOperations.cpp
@@ -22,8 +22,8 @@ void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & ma
     if (mask.size() < data.size())
         throw Exception("Mask size should be no less than data size.", ErrorCodes::LOGICAL_ERROR);
 
-    int from = data.size() - 1;
-    int index = mask.size() - 1;
+    ssize_t from = data.size() - 1;
+    ssize_t index = mask.size() - 1;
     data.resize(mask.size());
     while (index >= 0)
     {
@@ -317,7 +317,7 @@ int checkShortCircuitArguments(const ColumnsWithTypeAndName & arguments)
     for (size_t i = 0; i != arguments.size(); ++i)
     {
         if (checkAndGetShortCircuitArgument(arguments[i].column))
-            last_short_circuit_argument_index = i;
+            last_short_circuit_argument_index = static_cast<int>(i);
     }
 
     return last_short_circuit_argument_index;
diff --git a/src/Columns/tests/gtest_weak_hash_32.cpp b/src/Columns/tests/gtest_weak_hash_32.cpp
index 2fa6c0ea8ac..8027bd4d6cc 100644
--- a/src/Columns/tests/gtest_weak_hash_32.cpp
+++ b/src/Columns/tests/gtest_weak_hash_32.cpp
@@ -164,7 +164,7 @@ TEST(WeakHash32, ColumnVectorU32)
 
     for (int idx [[maybe_unused]] : {1, 2})
     {
-        for (uint64_t i = 0; i < 65536; ++i)
+        for (uint32_t i = 0; i < 65536; ++i)
             data.push_back(i << 16u);
     }
 
@@ -181,7 +181,7 @@ TEST(WeakHash32, ColumnVectorI32)
 
     for (int idx [[maybe_unused]] : {1, 2})
     {
-        for (int64_t i = -32768; i < 32768; ++i)
+        for (int32_t i = -32768; i < 32768; ++i)
             data.push_back(i << 16); //-V610
     }
 
@@ -240,7 +240,7 @@ TEST(WeakHash32, ColumnVectorU128)
             val.items[0] = i << 32u;
             val.items[1] = i << 32u;
             data.push_back(val);
-            eq_data.push_back(i);
+            eq_data.push_back(static_cast<UInt32>(i));
         }
     }
 
@@ -274,7 +274,7 @@ TEST(WeakHash32, ColumnDecimal32)
 
     for (int idx [[maybe_unused]] : {1, 2})
     {
-        for (int64_t i = -32768; i < 32768; ++i)
+        for (int32_t i = -32768; i < 32768; ++i)
             data.push_back(i << 16); //-V610
     }
 
@@ -326,7 +326,7 @@ TEST(WeakHash32, ColumnString1)
 
     for (int idx [[maybe_unused]] : {1, 2})
     {
-        for (int64_t i = 0; i < 65536; ++i)
+        for (int32_t i = 0; i < 65536; ++i)
         {
             data.push_back(i);
             auto str = std::to_string(i);
@@ -359,7 +359,7 @@ TEST(WeakHash32, ColumnString2)
     {
         size_t max_size = 3000;
         char letter = 'a';
-        for (int64_t i = 0; i < 65536; ++i)
+        for (int32_t i = 0; i < 65536; ++i)
         {
             data.push_back(i);
             size_t s = (i % max_size) + 1;
@@ -401,7 +401,7 @@ TEST(WeakHash32, ColumnString3)
         char letter = 'a';
         for (int64_t i = 0; i < 65536; ++i)
         {
-            data.push_back(i);
+            data.push_back(static_cast<UInt32>(i));
             size_t s = (i % max_size) + 1;
             std::string str(s,'\0');
             str[0] = letter;
@@ -430,7 +430,7 @@ TEST(WeakHash32, ColumnFixedString)
         char letter = 'a';
         for (int64_t i = 0; i < 65536; ++i)
         {
-            data.push_back(i);
+            data.push_back(static_cast<UInt32>(i));
             size_t s = (i % max_size) + 1;
             std::string str(s, letter);
             col->insertData(str.data(), str.size());
@@ -471,7 +471,7 @@ TEST(WeakHash32, ColumnArray)
         UInt32 cur = 0;
         for (int64_t i = 0; i < 65536; ++i)
         {
-            eq_data.push_back(i);
+            eq_data.push_back(static_cast<UInt32>(i));
             size_t s = (i % max_size) + 1;
 
             cur_off += s;
@@ -505,9 +505,9 @@ TEST(WeakHash32, ColumnArray2)
     UInt64 cur_off = 0;
     for (int idx [[maybe_unused]] : {1, 2})
     {
-        for (int64_t i = 0; i < 1000; ++i)
+        for (int32_t i = 0; i < 1000; ++i)
         {
-            for (size_t j = 0; j < 1000; ++j)
+            for (uint32_t j = 0; j < 1000; ++j)
             {
                 eq_data.push_back(i * 1000 + j);
 
@@ -556,7 +556,7 @@ TEST(WeakHash32, ColumnArrayArray)
         UInt32 cur = 1;
         for (int64_t i = 0; i < 3000; ++i)
         {
-            eq_data.push_back(i);
+            eq_data.push_back(static_cast<UInt32>(i));
             size_t s = (i % max_size) + 1;
 
             cur_off2 += s;
@@ -667,7 +667,7 @@ TEST(WeakHash32, ColumnTupleUInt64UInt64)
         {
             data1.push_back(l);
             data2.push_back(i << 32u);
-            eq.push_back(l * 65536 + i);
+            eq.push_back(static_cast<UInt32>(l * 65536 + i));
         }
     }
 
@@ -695,7 +695,7 @@ TEST(WeakHash32, ColumnTupleUInt64String)
 
         size_t max_size = 3000;
         char letter = 'a';
-        for (int64_t i = 0; i < 65536; ++i)
+        for (int32_t i = 0; i < 65536; ++i)
         {
             data1.push_back(l);
             eq.push_back(l * 65536 + i);
@@ -737,7 +737,7 @@ TEST(WeakHash32, ColumnTupleUInt64FixedString)
         for (int64_t i = 0; i < 65536; ++i)
         {
             data1.push_back(l);
-            eq.push_back(l * 65536 + i);
+            eq.push_back(static_cast<Int32>(l * 65536 + i));
 
             size_t s = (i % max_size) + 1;
             std::string str(s, letter);
@@ -778,7 +778,7 @@ TEST(WeakHash32, ColumnTupleUInt64Array)
         auto l = idx % 2;
 
         UInt32 cur = 0;
-        for (int64_t i = 0; i < 65536; ++i)
+        for (int32_t i = 0; i < 65536; ++i)
         {
             data1.push_back(l);
             eq_data.push_back(l * 65536 + i);
diff --git a/src/Common/CombinedCardinalityEstimator.h b/src/Common/CombinedCardinalityEstimator.h
index 3f4b481dce9..1911cafeaa2 100644
--- a/src/Common/CombinedCardinalityEstimator.h
+++ b/src/Common/CombinedCardinalityEstimator.h
@@ -65,7 +65,7 @@ public:
 private:
     using Small = SmallSet<Key, small_set_size_max>;
     using Medium = HashContainer;
-    using Large = HyperLogLogCounter<K, Hash, HashValueType, DenominatorType, BiasEstimator, mode>;
+    using Large = HyperLogLogCounter<K, Key, Hash, HashValueType, DenominatorType, BiasEstimator, mode>;
 
 public:
     CombinedCardinalityEstimator()
diff --git a/src/Common/DateLUTImpl.cpp b/src/Common/DateLUTImpl.cpp
index c4b32a3466b..6eb8b47b114 100644
--- a/src/Common/DateLUTImpl.cpp
+++ b/src/Common/DateLUTImpl.cpp
@@ -149,9 +149,9 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
 
     /// Fill lookup table for years and months.
     size_t year_months_lut_index = 0;
-    size_t first_day_of_last_month = 0;
+    unsigned first_day_of_last_month = 0;
 
-    for (size_t day = 0; day < DATE_LUT_SIZE; ++day)
+    for (unsigned day = 0; day < DATE_LUT_SIZE; ++day)
     {
         const Values & values = lut[day];
 
diff --git a/src/Common/DateLUTImpl.h b/src/Common/DateLUTImpl.h
index a0d5a976f35..3afbb6735dc 100644
--- a/src/Common/DateLUTImpl.h
+++ b/src/Common/DateLUTImpl.h
@@ -73,7 +73,7 @@ private:
             return LUTIndex(0);
         if (index >= DATE_LUT_SIZE)
             return LUTIndex(DATE_LUT_SIZE - 1);
-        return LUTIndex{index};
+        return LUTIndex{static_cast<UInt32>(index)};
     }
 
     template <typename T>
@@ -229,12 +229,12 @@ private:
         if (t >= lut[guess].date)
         {
             if (guess + 1 >= DATE_LUT_SIZE || t < lut[guess + 1].date)
-                return LUTIndex(guess);
+                return LUTIndex(static_cast<unsigned>(guess));
 
-            return LUTIndex(guess + 1);
+            return LUTIndex(static_cast<unsigned>(guess) + 1);
         }
 
-        return LUTIndex(guess ? guess - 1 : 0);
+        return LUTIndex(guess ? static_cast<unsigned>(guess) - 1 : 0);
     }
 
     static inline LUTIndex toLUTIndex(DayNum d)
@@ -272,11 +272,11 @@ private:
         if (likely(offset_is_whole_number_of_hours_during_epoch))
         {
             if (likely(x >= 0))
-                return x / divisor * divisor;
+                return static_cast<DateOrTime>(x / divisor * divisor);
 
             /// Integer division for negative numbers rounds them towards zero (up).
             /// We will shift the number so it will be rounded towards -inf (down).
-            return (x + 1 - divisor) / divisor * divisor;
+            return static_cast<DateOrTime>((x + 1 - divisor) / divisor * divisor);
         }
 
         Time date = find(x).date;
@@ -285,7 +285,7 @@ private:
         {
             if (unlikely(res < 0))
                 return 0;
-            return res;
+            return static_cast<DateOrTime>(res);
         }
         else
             return res;
@@ -509,7 +509,7 @@ public:
         if (time >= lut[index].time_at_offset_change())
             time += lut[index].amount_of_offset_change();
 
-        unsigned res = time / 3600;
+        unsigned res = static_cast<unsigned>(time / 3600);
 
         /// In case time was changed backwards at the start of next day, we will repeat the hour 23.
         return res <= 23 ? res : 23;
@@ -548,8 +548,8 @@ public:
         {
             Time res = t % 60;
             if (likely(res >= 0))
-                return res;
-            return res + 60;
+                return static_cast<unsigned>(res);
+            return static_cast<unsigned>(res) + 60;
         }
 
         LUTIndex index = findIndex(t);
@@ -895,6 +895,19 @@ public:
         return toRelativeHourNum(lut[toLUTIndex(v)].date);
     }
 
+    /// The same formula is used for positive time (after Unix epoch) and negative time (before Unix epoch).
+    /// It’s needed for correct work of dateDiff function.
+    inline Time toStableRelativeHourNum(Time t) const
+    {
+        return (t + DATE_LUT_ADD + 86400 - offset_at_start_of_epoch) / 3600 - (DATE_LUT_ADD / 3600);
+    }
+
+    template <typename DateOrTime>
+    inline Time toStableRelativeHourNum(DateOrTime v) const
+    {
+        return toStableRelativeHourNum(lut[toLUTIndex(v)].date);
+    }
+
     inline Time toRelativeMinuteNum(Time t) const /// NOLINT
     {
         return (t + DATE_LUT_ADD) / 60 - (DATE_LUT_ADD / 60);
@@ -960,7 +973,7 @@ public:
         if constexpr (std::is_same_v<Date, DayNum>)
             return DayNum(4 + (d - 4) / days * days);
         else
-            return ExtendedDayNum(4 + (d - 4) / days * days);
+            return ExtendedDayNum(static_cast<Int32>(4 + (d - 4) / days * days));
     }
 
     template <typename Date>
@@ -970,9 +983,9 @@ public:
         if (days == 1)
             return toDate(d);
         if constexpr (std::is_same_v<Date, DayNum>)
-            return lut_saturated[toLUTIndex(ExtendedDayNum(d / days * days))].date;
+            return lut_saturated[toLUTIndex(ExtendedDayNum(static_cast<Int32>(d / days * days)))].date;
         else
-            return lut[toLUTIndex(ExtendedDayNum(d / days * days))].date;
+            return lut[toLUTIndex(ExtendedDayNum(static_cast<Int32>(d / days * days)))].date;
     }
 
     template <typename DateOrTime>
@@ -1021,7 +1034,7 @@ public:
         {
             if (unlikely(res < 0))
                 return 0;
-            return res;
+            return static_cast<DateOrTime>(res);
         }
         else
             return res;
@@ -1034,8 +1047,8 @@ public:
         if (likely(offset_is_whole_number_of_minutes_during_epoch))
         {
             if (likely(t >= 0))
-                return t / divisor * divisor;
-            return (t + 1 - divisor) / divisor * divisor;
+                return static_cast<DateOrTime>(t / divisor * divisor);
+            return static_cast<DateOrTime>((t + 1 - divisor) / divisor * divisor);
         }
 
         Time date = find(t).date;
@@ -1044,7 +1057,7 @@ public:
         {
             if (unlikely(res < 0))
                 return 0;
-            return res;
+            return static_cast<UInt32>(res);
         }
         else
             return res;
@@ -1058,7 +1071,7 @@ public:
         if (seconds % 60 == 0)
             return toStartOfMinuteInterval(t, seconds / 60);
 
-        return roundDown(t, seconds);
+        return static_cast<DateOrTime>(roundDown(t, seconds));
     }
 
     inline LUTIndex makeLUTIndex(Int16 year, UInt8 month, UInt8 day_of_month) const
@@ -1236,9 +1249,9 @@ public:
         return lut[new_index].date + time;
     }
 
-    inline NO_SANITIZE_UNDEFINED Time addWeeks(Time t, Int32 delta) const
+    inline NO_SANITIZE_UNDEFINED Time addWeeks(Time t, Int64 delta) const
     {
-        return addDays(t, static_cast<Int64>(delta) * 7);
+        return addDays(t, delta * 7);
     }
 
     inline UInt8 saturateDayOfMonth(Int16 year, UInt8 month, UInt8 day_of_month) const
@@ -1318,9 +1331,9 @@ public:
     }
 
     template <typename DateOrTime>
-    inline auto addQuarters(DateOrTime d, Int32 delta) const
+    inline auto addQuarters(DateOrTime d, Int64 delta) const
     {
-        return addMonths(d, static_cast<Int64>(delta) * 3);
+        return addMonths(d, delta * 3);
     }
 
     template <typename DateOrTime>
diff --git a/src/Common/Dwarf.h b/src/Common/Dwarf.h
index 09178c66d47..ef6364b6b18 100644
--- a/src/Common/Dwarf.h
+++ b/src/Common/Dwarf.h
@@ -218,7 +218,7 @@ private:
         // Offset from start to first attribute
         uint8_t attr_offset;
         // Offset within debug info.
-        uint32_t offset;
+        uint64_t offset;
         uint64_t code;
         DIEAbbreviation abbr;
     };
@@ -252,10 +252,10 @@ private:
         uint8_t unit_type = DW_UT_compile; // DW_UT_compile or DW_UT_skeleton
         uint8_t addr_size = 0;
         // Offset in .debug_info of this compilation unit.
-        uint32_t offset = 0;
-        uint32_t size = 0;
+        uint64_t offset = 0;
+        uint64_t size = 0;
         // Offset in .debug_info for the first DIE in this compilation unit.
-        uint32_t first_die = 0;
+        uint64_t first_die = 0;
         uint64_t abbrev_offset = 0;
 
         // The beginning of the CU's contribution to .debug_addr
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index 4d798173698..f36ab576766 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -48,6 +48,9 @@ inline DB::UInt64 intHash64(DB::UInt64 x)
 #include <arm_acle.h>
 #endif
 
+/// NOTE: Intel intrinsic can be confusing.
+/// - https://code.google.com/archive/p/sse-intrinsics/wikis/PmovIntrinsicBug.wiki
+/// - https://stackoverflow.com/questions/15752770/mm-crc32-u64-poorly-defined
 inline DB::UInt64 intHashCRC32(DB::UInt64 x)
 {
 #ifdef __SSE4_2__
@@ -56,16 +59,16 @@ inline DB::UInt64 intHashCRC32(DB::UInt64 x)
     return __crc32cd(-1U, x);
 #else
     /// On other platforms we do not have CRC32. NOTE This can be confusing.
+    /// NOTE: consider using intHash32()
     return intHash64(x);
 #endif
 }
-
 inline DB::UInt64 intHashCRC32(DB::UInt64 x, DB::UInt64 updated_value)
 {
 #ifdef __SSE4_2__
     return _mm_crc32_u64(updated_value, x);
 #elif defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
-    return  __crc32cd(updated_value, x);
+    return __crc32cd(static_cast<UInt32>(updated_value), x);
 #else
     /// On other platforms we do not have CRC32. NOTE This can be confusing.
     return intHash64(x) ^ updated_value;
@@ -123,14 +126,14 @@ inline UInt32 updateWeakHash32(const DB::UInt8 * pos, size_t size, DB::UInt32 up
         }
 
         reinterpret_cast<unsigned char *>(&value)[7] = size;
-        return intHashCRC32(value, updated_value);
+        return static_cast<UInt32>(intHashCRC32(value, updated_value));
     }
 
     const auto * end = pos + size;
     while (pos + 8 <= end)
     {
         auto word = unalignedLoad<UInt64>(pos);
-        updated_value = intHashCRC32(word, updated_value);
+        updated_value = static_cast<UInt32>(intHashCRC32(word, updated_value));
 
         pos += 8;
     }
@@ -148,7 +151,7 @@ inline UInt32 updateWeakHash32(const DB::UInt8 * pos, size_t size, DB::UInt32 up
         /// Use least byte to store tail length.
         word |= tail_size;
         /// Now word is '\3\0\0\0\0XYZ'
-        updated_value = intHashCRC32(word, updated_value);
+        updated_value = static_cast<UInt32>(intHashCRC32(word, updated_value));
     }
 
     return updated_value;
@@ -302,8 +305,8 @@ struct UInt128HashCRC32
     size_t operator()(UInt128 x) const
     {
         UInt64 crc = -1ULL;
-        crc = __crc32cd(crc, x.items[0]);
-        crc = __crc32cd(crc, x.items[1]);
+        crc = __crc32cd(static_cast<UInt32>(crc), x.items[0]);
+        crc = __crc32cd(static_cast<UInt32>(crc), x.items[1]);
         return crc;
     }
 };
@@ -358,10 +361,10 @@ struct UInt256HashCRC32
     size_t operator()(UInt256 x) const
     {
         UInt64 crc = -1ULL;
-        crc = __crc32cd(crc, x.items[0]);
-        crc = __crc32cd(crc, x.items[1]);
-        crc = __crc32cd(crc, x.items[2]);
-        crc = __crc32cd(crc, x.items[3]);
+        crc = __crc32cd(static_cast<UInt32>(crc), x.items[0]);
+        crc = __crc32cd(static_cast<UInt32>(crc), x.items[1]);
+        crc = __crc32cd(static_cast<UInt32>(crc), x.items[2]);
+        crc = __crc32cd(static_cast<UInt32>(crc), x.items[3]);
         return crc;
     }
 };
@@ -423,7 +426,7 @@ inline DB::UInt32 intHash32(DB::UInt64 key)
     key = key + (key << 6);
     key = key ^ ((key >> 22) | (key << 42));
 
-    return key;
+    return static_cast<UInt32>(key);
 }
 
 
diff --git a/src/Common/HashTable/TwoLevelHashTable.h b/src/Common/HashTable/TwoLevelHashTable.h
index b8d5eedd430..5acc8b19195 100644
--- a/src/Common/HashTable/TwoLevelHashTable.h
+++ b/src/Common/HashTable/TwoLevelHashTable.h
@@ -44,8 +44,8 @@ protected:
 public:
     using Impl = ImplTable;
 
-    static constexpr size_t NUM_BUCKETS = 1ULL << BITS_FOR_BUCKET;
-    static constexpr size_t MAX_BUCKET = NUM_BUCKETS - 1;
+    static constexpr UInt32 NUM_BUCKETS = 1ULL << BITS_FOR_BUCKET;
+    static constexpr UInt32 MAX_BUCKET = NUM_BUCKETS - 1;
 
     size_t hash(const Key & x) const { return Hash::operator()(x); }
 
@@ -286,13 +286,13 @@ public:
 
     void write(DB::WriteBuffer & wb) const
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             impls[i].write(wb);
     }
 
     void writeText(DB::WriteBuffer & wb) const
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
         {
             if (i != 0)
                 DB::writeChar(',', wb);
@@ -302,13 +302,13 @@ public:
 
     void read(DB::ReadBuffer & rb)
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             impls[i].read(rb);
     }
 
     void readText(DB::ReadBuffer & rb)
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
         {
             if (i != 0)
                 DB::assertChar(',', rb);
@@ -320,7 +320,7 @@ public:
     size_t size() const
     {
         size_t res = 0;
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             res += impls[i].size();
 
         return res;
@@ -328,7 +328,7 @@ public:
 
     bool empty() const
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             if (!impls[i].empty())
                 return false;
 
@@ -338,7 +338,7 @@ public:
     size_t getBufferSizeInBytes() const
     {
         size_t res = 0;
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             res += impls[i].getBufferSizeInBytes();
 
         return res;
diff --git a/src/Common/HashTable/TwoLevelStringHashTable.h b/src/Common/HashTable/TwoLevelStringHashTable.h
index 77acca5e707..ea1914348b2 100644
--- a/src/Common/HashTable/TwoLevelStringHashTable.h
+++ b/src/Common/HashTable/TwoLevelStringHashTable.h
@@ -13,8 +13,8 @@ public:
     using Key = StringRef;
     using Impl = ImplTable;
 
-    static constexpr size_t NUM_BUCKETS = 1ULL << BITS_FOR_BUCKET;
-    static constexpr size_t MAX_BUCKET = NUM_BUCKETS - 1;
+    static constexpr UInt32 NUM_BUCKETS = 1ULL << BITS_FOR_BUCKET;
+    static constexpr UInt32 MAX_BUCKET = NUM_BUCKETS - 1;
 
     // TODO: currently hashing contains redundant computations when doing distributed or external aggregations
     size_t hash(const Key & x) const
@@ -175,13 +175,13 @@ public:
 
     void write(DB::WriteBuffer & wb) const
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             impls[i].write(wb);
     }
 
     void writeText(DB::WriteBuffer & wb) const
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
         {
             if (i != 0)
                 DB::writeChar(',', wb);
@@ -191,13 +191,13 @@ public:
 
     void read(DB::ReadBuffer & rb)
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             impls[i].read(rb);
     }
 
     void readText(DB::ReadBuffer & rb)
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
         {
             if (i != 0)
                 DB::assertChar(',', rb);
@@ -208,7 +208,7 @@ public:
     size_t size() const
     {
         size_t res = 0;
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             res += impls[i].size();
 
         return res;
@@ -216,7 +216,7 @@ public:
 
     bool empty() const
     {
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             if (!impls[i].empty())
                 return false;
 
@@ -226,7 +226,7 @@ public:
     size_t getBufferSizeInBytes() const
     {
         size_t res = 0;
-        for (size_t i = 0; i < NUM_BUCKETS; ++i)
+        for (UInt32 i = 0; i < NUM_BUCKETS; ++i)
             res += impls[i].getBufferSizeInBytes();
 
         return res;
diff --git a/src/Common/HyperLogLogCounter.h b/src/Common/HyperLogLogCounter.h
index 36db00a5982..32c04d85d57 100644
--- a/src/Common/HyperLogLogCounter.h
+++ b/src/Common/HyperLogLogCounter.h
@@ -264,7 +264,8 @@ enum class HyperLogLogMode
 /// of Algorithms).
 template <
     UInt8 precision,
-    typename Hash = IntHash32<UInt64>,
+    typename Key = UInt64,
+    typename Hash = IntHash32<Key>,
     typename HashValueType = UInt32,
     typename DenominatorType = double,
     typename BiasEstimator = TrivialBiasEstimator,
@@ -409,7 +410,9 @@ private:
 
     inline HashValueType getHash(Value key) const
     {
-        return Hash::operator()(key);
+        /// NOTE: this should be OK, since value is the same as key for HLL.
+        return static_cast<HashValueType>(
+            Hash::operator()(static_cast<Key>(key)));
     }
 
     /// Update maximum rank for current bucket.
@@ -532,6 +535,7 @@ private:
 template
 <
     UInt8 precision,
+    typename Key,
     typename Hash,
     typename HashValueType,
     typename DenominatorType,
@@ -542,6 +546,7 @@ template
 details::LogLUT<precision> HyperLogLogCounter
 <
     precision,
+    Key,
     Hash,
     HashValueType,
     DenominatorType,
@@ -555,6 +560,7 @@ details::LogLUT<precision> HyperLogLogCounter
 /// Serialization format must not be changed.
 using HLL12 = HyperLogLogCounter<
     12,
+    UInt64,
     IntHash32<UInt64>,
     UInt32,
     double,
diff --git a/src/Common/HyperLogLogWithSmallSetOptimization.h b/src/Common/HyperLogLogWithSmallSetOptimization.h
index 39c00660ebe..1d2408186de 100644
--- a/src/Common/HyperLogLogWithSmallSetOptimization.h
+++ b/src/Common/HyperLogLogWithSmallSetOptimization.h
@@ -26,7 +26,7 @@ class HyperLogLogWithSmallSetOptimization : private boost::noncopyable
 {
 private:
     using Small = SmallSet<Key, small_set_size>;
-    using Large = HyperLogLogCounter<K, Hash, UInt32, DenominatorType>;
+    using Large = HyperLogLogCounter<K, Key, Hash, UInt32, DenominatorType>;
     using LargeValueType = typename Large::value_type;
 
     Small small;
diff --git a/src/Common/OptimizedRegularExpression.cpp b/src/Common/OptimizedRegularExpression.cpp
index 60efab69433..e95bc42a1ea 100644
--- a/src/Common/OptimizedRegularExpression.cpp
+++ b/src/Common/OptimizedRegularExpression.cpp
@@ -506,8 +506,16 @@ unsigned OptimizedRegularExpressionImpl<thread_safe>::match(const char * subject
 
         DB::PODArrayWithStackMemory<StringPieceType, 128> pieces(limit);
 
-        if (!re2->Match(StringPieceType(subject, subject_size), 0, subject_size, RegexType::UNANCHORED, pieces.data(), pieces.size()))
+        if (!re2->Match(
+            StringPieceType(subject, subject_size),
+            0,
+            subject_size,
+            RegexType::UNANCHORED,
+            pieces.data(),
+            static_cast<int>(pieces.size())))
+        {
             return 0;
+        }
         else
         {
             matches.resize(limit);
diff --git a/src/Common/OvercommitTracker.cpp b/src/Common/OvercommitTracker.cpp
index c7730667f55..bb477d6019d 100644
--- a/src/Common/OvercommitTracker.cpp
+++ b/src/Common/OvercommitTracker.cpp
@@ -5,6 +5,7 @@
 #include <Common/ProfileEvents.h>
 #include <Interpreters/ProcessList.h>
 
+
 namespace ProfileEvents
 {
     extern const Event MemoryOvercommitWaitTimeMicroseconds;
@@ -170,7 +171,8 @@ void UserOvercommitTracker::pickQueryToExcludeImpl()
 
 GlobalOvercommitTracker::GlobalOvercommitTracker(DB::ProcessList * process_list_)
     : OvercommitTracker(process_list_)
-{}
+{
+}
 
 void GlobalOvercommitTracker::pickQueryToExcludeImpl()
 {
@@ -180,16 +182,16 @@ void GlobalOvercommitTracker::pickQueryToExcludeImpl()
     // This is guaranteed by locking global_mutex in OvercommitTracker::needToStopQuery.
     for (auto const & query : process_list->processes)
     {
-        if (query.isKilled())
+        if (query->isKilled())
             continue;
 
         Int64 user_soft_limit = 0;
-        if (auto const * user_process_list = query.getUserProcessList())
+        if (auto const * user_process_list = query->getUserProcessList())
             user_soft_limit = user_process_list->user_memory_tracker.getSoftLimit();
         if (user_soft_limit == 0)
             continue;
 
-        auto * memory_tracker = query.getMemoryTracker();
+        auto * memory_tracker = query->getMemoryTracker();
         if (!memory_tracker)
             continue;
         auto ratio = memory_tracker->getOvercommitRatio(user_soft_limit);
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
index 42b5b3d0990..9939a5738da 100644
--- a/src/Common/PoolWithFailoverBase.h
+++ b/src/Common/PoolWithFailoverBase.h
@@ -339,7 +339,7 @@ struct PoolWithFailoverBase<TNestedPool>::PoolState
     Int64 config_priority = 1;
     /// Priority from the GetPriorityFunc.
     Int64 priority = 0;
-    UInt32 random = 0;
+    UInt64 random = 0;
 
     void randomize()
     {
@@ -353,7 +353,7 @@ struct PoolWithFailoverBase<TNestedPool>::PoolState
     }
 
 private:
-    std::minstd_rand rng = std::minstd_rand(randomSeed());
+    std::minstd_rand rng = std::minstd_rand(static_cast<uint_fast32_t>(randomSeed()));
 };
 
 template <typename TNestedPool>
diff --git a/src/Common/QueryProfiler.cpp b/src/Common/QueryProfiler.cpp
index 7266b9b9553..b50e0c0ab49 100644
--- a/src/Common/QueryProfiler.cpp
+++ b/src/Common/QueryProfiler.cpp
@@ -132,11 +132,11 @@ QueryProfilerBase<ProfilerImpl>::QueryProfilerBase(UInt64 thread_id, int clock_t
         sev.sigev_signo = pause_signal;
 
 #if defined(OS_FREEBSD)
-        sev._sigev_un._threadid = thread_id;
+        sev._sigev_un._threadid = static_cast<pid_t>(thread_id);
 #elif defined(USE_MUSL)
-        sev.sigev_notify_thread_id = thread_id;
+        sev.sigev_notify_thread_id = static_cast<pid_t>(thread_id);
 #else
-        sev._sigev_un._tid = thread_id;
+        sev._sigev_un._tid = static_cast<pid_t>(thread_id);
 #endif
         timer_t local_timer_id;
         if (timer_create(clock_type, &sev, &local_timer_id))
diff --git a/src/Common/RadixSort.h b/src/Common/RadixSort.h
index 9ca43bee30c..739bec8d9dd 100644
--- a/src/Common/RadixSort.h
+++ b/src/Common/RadixSort.h
@@ -273,13 +273,13 @@ private:
 
         {
             /// Replace the histograms with the accumulated sums: the value in position i is the sum of the previous positions minus one.
-            size_t sums[NUM_PASSES] = {0};
+            CountType sums[NUM_PASSES] = {0};
 
             for (size_t i = 0; i < HISTOGRAM_SIZE; ++i)
             {
                 for (size_t pass = 0; pass < NUM_PASSES; ++pass)
                 {
-                    size_t tmp = histograms[pass * HISTOGRAM_SIZE + i] + sums[pass];
+                    CountType tmp = histograms[pass * HISTOGRAM_SIZE + i] + sums[pass];
                     histograms[pass * HISTOGRAM_SIZE + i] = sums[pass] - 1;
                     sums[pass] = tmp;
                 }
diff --git a/src/Common/StringSearcher.h b/src/Common/StringSearcher.h
index b8f8a9d3a88..048e7a1f34c 100644
--- a/src/Common/StringSearcher.h
+++ b/src/Common/StringSearcher.h
@@ -40,7 +40,7 @@ public:
 #ifdef __SSE2__
 protected:
     static constexpr auto n = sizeof(__m128i);
-    const int page_size = ::getPageSize();
+    const Int64 page_size = ::getPageSize();
 
     bool pageSafe(const void * const ptr) const
     {
diff --git a/src/Common/ThreadPool.cpp b/src/Common/ThreadPool.cpp
index 0b89139fa53..b70b1fc5e60 100644
--- a/src/Common/ThreadPool.cpp
+++ b/src/Common/ThreadPool.cpp
@@ -87,7 +87,7 @@ void ThreadPoolImpl<Thread>::setQueueSize(size_t value)
 
 template <typename Thread>
 template <typename ReturnType>
-ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, int priority, std::optional<uint64_t> wait_microseconds, bool propagate_opentelemetry_tracing_context)
+ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, ssize_t priority, std::optional<uint64_t> wait_microseconds, bool propagate_opentelemetry_tracing_context)
 {
     auto on_error = [&](const std::string & reason)
     {
@@ -163,19 +163,19 @@ ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, int priority, std::opti
 }
 
 template <typename Thread>
-void ThreadPoolImpl<Thread>::scheduleOrThrowOnError(Job job, int priority)
+void ThreadPoolImpl<Thread>::scheduleOrThrowOnError(Job job, ssize_t priority)
 {
     scheduleImpl<void>(std::move(job), priority, std::nullopt);
 }
 
 template <typename Thread>
-bool ThreadPoolImpl<Thread>::trySchedule(Job job, int priority, uint64_t wait_microseconds) noexcept
+bool ThreadPoolImpl<Thread>::trySchedule(Job job, ssize_t priority, uint64_t wait_microseconds) noexcept
 {
     return scheduleImpl<bool>(std::move(job), priority, wait_microseconds);
 }
 
 template <typename Thread>
-void ThreadPoolImpl<Thread>::scheduleOrThrow(Job job, int priority, uint64_t wait_microseconds, bool propagate_opentelemetry_tracing_context)
+void ThreadPoolImpl<Thread>::scheduleOrThrow(Job job, ssize_t priority, uint64_t wait_microseconds, bool propagate_opentelemetry_tracing_context)
 {
     scheduleImpl<void>(std::move(job), priority, wait_microseconds, propagate_opentelemetry_tracing_context);
 }
diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index 76ada9e0d75..6742a554a85 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -50,13 +50,13 @@ public:
     /// NOTE: Probably you should call wait() if exception was thrown. If some previously scheduled jobs are using some objects,
     /// located on stack of current thread, the stack must not be unwinded until all jobs finished. However,
     /// if ThreadPool is a local object, it will wait for all scheduled jobs in own destructor.
-    void scheduleOrThrowOnError(Job job, int priority = 0);
+    void scheduleOrThrowOnError(Job job, ssize_t priority = 0);
 
     /// Similar to scheduleOrThrowOnError(...). Wait for specified amount of time and schedule a job or return false.
-    bool trySchedule(Job job, int priority = 0, uint64_t wait_microseconds = 0) noexcept;
+    bool trySchedule(Job job, ssize_t priority = 0, uint64_t wait_microseconds = 0) noexcept;
 
     /// Similar to scheduleOrThrowOnError(...). Wait for specified amount of time and schedule a job or throw an exception.
-    void scheduleOrThrow(Job job, int priority = 0, uint64_t wait_microseconds = 0, bool propagate_opentelemetry_tracing_context = true);
+    void scheduleOrThrow(Job job, ssize_t priority = 0, uint64_t wait_microseconds = 0, bool propagate_opentelemetry_tracing_context = true);
 
     /// Wait for all currently active jobs to be done.
     /// You may call schedule and wait many times in arbitrary order.
@@ -96,10 +96,10 @@ private:
     struct JobWithPriority
     {
         Job job;
-        int priority;
+        ssize_t priority;
         DB::OpenTelemetry::TracingContextOnThread thread_trace_context;
 
-        JobWithPriority(Job job_, int priority_, const DB::OpenTelemetry::TracingContextOnThread& thread_trace_context_)
+        JobWithPriority(Job job_, ssize_t priority_, const DB::OpenTelemetry::TracingContextOnThread& thread_trace_context_)
             : job(job_), priority(priority_), thread_trace_context(thread_trace_context_) {}
 
         bool operator< (const JobWithPriority & rhs) const
@@ -113,7 +113,7 @@ private:
     std::exception_ptr first_exception;
 
     template <typename ReturnType>
-    ReturnType scheduleImpl(Job job, int priority, std::optional<uint64_t> wait_microseconds, bool propagate_opentelemetry_tracing_context = true);
+    ReturnType scheduleImpl(Job job, ssize_t priority, std::optional<uint64_t> wait_microseconds, bool propagate_opentelemetry_tracing_context = true);
 
     void worker(typename std::list<Thread>::iterator thread_it);
 
diff --git a/src/Common/ThreadProfileEvents.cpp b/src/Common/ThreadProfileEvents.cpp
index baa77468a13..76a4d8b1adf 100644
--- a/src/Common/ThreadProfileEvents.cpp
+++ b/src/Common/ThreadProfileEvents.cpp
@@ -121,7 +121,7 @@ TasksStatsCounters::TasksStatsCounters(const UInt64 tid, const MetricsProvider p
         stats_getter = [metrics_provider = std::make_shared<TaskStatsInfoGetter>(), tid]()
                 {
                     ::taskstats result{};
-                    metrics_provider->getStat(result, tid);
+                    metrics_provider->getStat(result, static_cast<pid_t>(tid));
                     return result;
                 };
         break;
@@ -526,7 +526,7 @@ void PerfEventsCounters::finalizeProfileEvents(ProfileEvents::Counters & profile
             continue;
 
         constexpr ssize_t bytes_to_read = sizeof(current_values[0]);
-        const int bytes_read = read(fd, &current_values[i], bytes_to_read);
+        const ssize_t bytes_read = read(fd, &current_values[i], bytes_to_read);
 
         if (bytes_read != bytes_to_read)
         {
diff --git a/src/Common/UTF8Helpers.h b/src/Common/UTF8Helpers.h
index ce90af3d5ce..623a62a6f79 100644
--- a/src/Common/UTF8Helpers.h
+++ b/src/Common/UTF8Helpers.h
@@ -99,7 +99,10 @@ requires (sizeof(CharT) == 1)
 size_t convertCodePointToUTF8(int code_point, CharT * out_bytes, size_t out_length)
 {
     static const Poco::UTF8Encoding utf8;
-    int res = utf8.convert(code_point, reinterpret_cast<uint8_t *>(out_bytes), out_length);
+    int res = utf8.convert(
+        code_point,
+        reinterpret_cast<uint8_t *>(out_bytes),
+        static_cast<int>(out_length));
     assert(res >= 0);
     return res;
 }
@@ -109,7 +112,9 @@ requires (sizeof(CharT) == 1)
 std::optional<uint32_t> convertUTF8ToCodePoint(const CharT * in_bytes, size_t in_length)
 {
     static const Poco::UTF8Encoding utf8;
-    int res = utf8.queryConvert(reinterpret_cast<const uint8_t *>(in_bytes), in_length);
+    int res = utf8.queryConvert(
+        reinterpret_cast<const uint8_t *>(in_bytes),
+        static_cast<int>(in_length));
 
     if (res >= 0)
         return res;
diff --git a/src/Common/Volnitsky.h b/src/Common/Volnitsky.h
index 6f5948b6564..a27fd36f704 100644
--- a/src/Common/Volnitsky.h
+++ b/src/Common/Volnitsky.h
@@ -404,7 +404,8 @@ public:
         /// And also adding from the end guarantees that we will find first occurrence because we will lookup bigger offsets first.
         for (auto i = static_cast<ssize_t>(needle_size - sizeof(VolnitskyTraits::Ngram)); i >= 0; --i)
         {
-            bool ok = VolnitskyTraits::putNGram<CaseSensitive, ASCII>(needle + i, i + 1, needle, needle_size, callback);
+            bool ok = VolnitskyTraits::putNGram<CaseSensitive, ASCII>(
+                needle + i, static_cast<int>(i + 1), needle, needle_size, callback);
 
             /** `putNGramUTF8CaseInsensitive` does not work if characters with lower and upper cases
               * are represented by different number of bytes or code points.
diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp
index 098dc522eeb..134374f98d0 100644
--- a/src/Common/ZooKeeper/TestKeeper.cpp
+++ b/src/Common/ZooKeeper/TestKeeper.cpp
@@ -218,7 +218,7 @@ std::pair<ResponsePtr, Undo> TestKeeperCreateRequest::process(TestKeeper::Contai
             created_node.stat.ctime = std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
             created_node.stat.mtime = created_node.stat.ctime;
             created_node.stat.numChildren = 0;
-            created_node.stat.dataLength = data.length();
+            created_node.stat.dataLength = static_cast<int>(data.length());
             created_node.data = data;
             created_node.is_ephemeral = is_ephemeral;
             created_node.is_sequental = is_sequential;
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index 5098788fb2e..f7d5bccc0e0 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -45,7 +45,7 @@ struct ShuffleHost
 {
     String host;
     Int64 priority = 0;
-    UInt32 random = 0;
+    UInt64 random = 0;
 
     void randomize()
     {
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index a565a322790..d49800b1abe 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -724,7 +724,7 @@ void ZooKeeperRequest::createLogElements(LogElements & elems) const
     elem.has_watch = has_watch;
     elem.op_num = static_cast<uint32_t>(getOpNum());
     elem.path = getPath();
-    elem.request_idx = elems.size() - 1;
+    elem.request_idx = static_cast<uint32_t>(elems.size() - 1);
 }
 
 
@@ -762,7 +762,7 @@ void ZooKeeperCheckRequest::createLogElements(LogElements & elems) const
 void ZooKeeperMultiRequest::createLogElements(LogElements & elems) const
 {
     ZooKeeperRequest::createLogElements(elems);
-    elems.back().requests_size = requests.size();
+    elems.back().requests_size = static_cast<uint32_t>(requests.size());
     for (const auto & request : requests)
     {
         auto & req = dynamic_cast<ZooKeeperRequest &>(*request);
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index f70dac74a6a..ebab18b5ed7 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -546,7 +546,7 @@ void ZooKeeper::sendAuth(const String & scheme, const String & data)
     if (read_xid != AUTH_XID)
         throw Exception(Error::ZMARSHALLINGERROR, "Unexpected event received in reply to auth request: {}", read_xid);
 
-    int32_t actual_length = in->count() - count_before_event;
+    int32_t actual_length = static_cast<int32_t>(in->count() - count_before_event);
     if (length != actual_length)
         throw Exception(Error::ZMARSHALLINGERROR, "Response length doesn't match. Expected: {}, actual: {}", length, actual_length);
 
@@ -821,7 +821,7 @@ void ZooKeeper::receiveEvent()
             }
         }
 
-        int32_t actual_length = in->count() - count_before_event;
+        int32_t actual_length = static_cast<int32_t>(in->count() - count_before_event);
         if (length != actual_length)
             throw Exception(Error::ZMARSHALLINGERROR, "Response length doesn't match. Expected: {}, actual: {}", length, actual_length);
 
diff --git a/src/Common/examples/arena_with_free_lists.cpp b/src/Common/examples/arena_with_free_lists.cpp
index dcb777abc42..4f209ccb5b2 100644
--- a/src/Common/examples/arena_with_free_lists.cpp
+++ b/src/Common/examples/arena_with_free_lists.cpp
@@ -176,11 +176,11 @@ struct Dictionary
         {
             case AttributeUnderlyingTypeTest::UInt8: std::get<ContainerPtrType<UInt8>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
             case AttributeUnderlyingTypeTest::UInt16: std::get<ContainerPtrType<UInt16>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
-            case AttributeUnderlyingTypeTest::UInt32: std::get<ContainerPtrType<UInt32>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
+            case AttributeUnderlyingTypeTest::UInt32: std::get<ContainerPtrType<UInt32>>(attribute.arrays)[idx] = static_cast<UInt32>(value.get<UInt64>()); break;
             case AttributeUnderlyingTypeTest::UInt64: std::get<ContainerPtrType<UInt64>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
             case AttributeUnderlyingTypeTest::Int8: std::get<ContainerPtrType<Int8>>(attribute.arrays)[idx] = value.get<Int64>(); break;
             case AttributeUnderlyingTypeTest::Int16: std::get<ContainerPtrType<Int16>>(attribute.arrays)[idx] = value.get<Int64>(); break;
-            case AttributeUnderlyingTypeTest::Int32: std::get<ContainerPtrType<Int32>>(attribute.arrays)[idx] = value.get<Int64>(); break;
+            case AttributeUnderlyingTypeTest::Int32: std::get<ContainerPtrType<Int32>>(attribute.arrays)[idx] = static_cast<Int32>(value.get<Int64>()); break;
             case AttributeUnderlyingTypeTest::Int64: std::get<ContainerPtrType<Int64>>(attribute.arrays)[idx] = value.get<Int64>(); break;
             case AttributeUnderlyingTypeTest::Float32: std::get<ContainerPtrType<Float32>>(attribute.arrays)[idx] = static_cast<Float32>(value.get<Float64>()); break;
             case AttributeUnderlyingTypeTest::Float64: std::get<ContainerPtrType<Float64>>(attribute.arrays)[idx] = value.get<Float64>(); break;
diff --git a/src/Common/examples/array_cache.cpp b/src/Common/examples/array_cache.cpp
index f6bbbba4cbc..c1267d3c9cf 100644
--- a/src/Common/examples/array_cache.cpp
+++ b/src/Common/examples/array_cache.cpp
@@ -46,9 +46,9 @@ int main(int argc, char ** argv)
 
     size_t cache_size = DB::parse<size_t>(argv[1]);
     size_t num_threads = DB::parse<size_t>(argv[2]);
-    size_t num_iterations = DB::parse<size_t>(argv[3]);
+    int num_iterations = DB::parse<int>(argv[3]);
     size_t region_max_size = DB::parse<size_t>(argv[4]);
-    size_t max_key = DB::parse<size_t>(argv[5]);
+    int max_key = DB::parse<int>(argv[5]);
 
     using Cache = ArrayCache<int, int>;
     Cache cache(cache_size);
@@ -60,7 +60,7 @@ int main(int argc, char ** argv)
         {
             pcg64 generator(randomSeed());
 
-            for (size_t j = 0; j < num_iterations; ++j)
+            for (int j = 0; j < num_iterations; ++j)
             {
                 size_t size = std::uniform_int_distribution<size_t>(1, region_max_size)(generator);
                 int key = std::uniform_int_distribution<int>(1, max_key)(generator);
diff --git a/src/Common/examples/average.cpp b/src/Common/examples/average.cpp
index d2802717fc8..749bad848cc 100644
--- a/src/Common/examples/average.cpp
+++ b/src/Common/examples/average.cpp
@@ -425,7 +425,7 @@ Float NO_INLINE microsort(const PODArray<UInt8> & keys, const PODArray<Float> &
     for (size_t i = 1; i < HISTOGRAM_SIZE; ++i)
         positions[i] = positions[i - 1] + count[i - 1];
 
-    for (size_t i = 0; i < size; ++i)
+    for (UInt32 i = 0; i < size; ++i)
         *positions[keys[i]]++ = i;
 
     /// Update states.
diff --git a/src/Common/examples/parallel_aggregation.cpp b/src/Common/examples/parallel_aggregation.cpp
index f54c4cee12c..bd252b330f3 100644
--- a/src/Common/examples/parallel_aggregation.cpp
+++ b/src/Common/examples/parallel_aggregation.cpp
@@ -492,7 +492,7 @@ int main(int argc, char ** argv)
 
         watch.restart();
 
-        for (size_t i = 0; i < MapTwoLevel::NUM_BUCKETS; ++i)
+        for (unsigned i = 0; i < MapTwoLevel::NUM_BUCKETS; ++i)
             pool.scheduleOrThrowOnError([&] { merge2(maps.data(), num_threads, i); });
 
         pool.wait();
@@ -545,7 +545,7 @@ int main(int argc, char ** argv)
 
         watch.restart();
 
-        for (size_t i = 0; i < MapTwoLevel::NUM_BUCKETS; ++i)
+        for (unsigned i = 0; i < MapTwoLevel::NUM_BUCKETS; ++i)
             pool.scheduleOrThrowOnError([&] { merge2(maps.data(), num_threads, i); });
 
         pool.wait();
diff --git a/src/Common/filesystemHelpers.cpp b/src/Common/filesystemHelpers.cpp
index 4c60a6ddac0..07a08dc7fbc 100644
--- a/src/Common/filesystemHelpers.cpp
+++ b/src/Common/filesystemHelpers.cpp
@@ -258,7 +258,7 @@ size_t getSizeFromFileDescriptor(int fd, const String & file_name)
     return buf.st_size;
 }
 
-int getINodeNumberFromPath(const String & path)
+Int64 getINodeNumberFromPath(const String & path)
 {
     struct stat file_stat;
     if (stat(path.data(), &file_stat))
diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h
index 9faaabb42f2..0e6e16941bb 100644
--- a/src/Common/filesystemHelpers.h
+++ b/src/Common/filesystemHelpers.h
@@ -74,7 +74,7 @@ std::optional<size_t> tryGetSizeFromFilePath(const String & path);
 
 /// Get inode number for a file path.
 /// Will not work correctly if filesystem does not support inodes.
-int getINodeNumberFromPath(const String & path);
+Int64 getINodeNumberFromPath(const String & path);
 
 }
 
diff --git a/src/Common/formatIPv6.cpp b/src/Common/formatIPv6.cpp
index 2e08828f724..bc1878c0bc6 100644
--- a/src/Common/formatIPv6.cpp
+++ b/src/Common/formatIPv6.cpp
@@ -80,7 +80,7 @@ static void printInteger(char *& out, T value)
 
 void formatIPv6(const unsigned char * src, char *& dst, uint8_t zeroed_tail_bytes_count)
 {
-    struct { int base, len; } best{-1, 0}, cur{-1, 0};
+    struct { Int64 base, len; } best{-1, 0}, cur{-1, 0};
     std::array<UInt16, IPV6_BINARY_LENGTH / sizeof(UInt16)> words{};
 
     /** Preprocess:
@@ -122,14 +122,18 @@ void formatIPv6(const unsigned char * src, char *& dst, uint8_t zeroed_tail_byte
         best.base = -1;
 
     /// Format the result.
-    for (const int i : collections::range(0, words.size()))
+    for (const size_t i : collections::range(0, words.size()))
     {
         /// Are we inside the best run of 0x00's?
-        if (best.base != -1 && i >= best.base && i < (best.base + best.len))
+        if (best.base != -1)
         {
-            if (i == best.base)
-                *dst++ = ':';
-            continue;
+            size_t best_base = static_cast<size_t>(best.base);
+            if (i >= best_base && i < (best_base + best.len))
+            {
+                if (i == best_base)
+                    *dst++ = ':';
+                continue;
+            }
         }
 
         /// Are we following an initial run of 0x00s or any real hex?
diff --git a/src/Common/getCurrentProcessFDCount.cpp b/src/Common/getCurrentProcessFDCount.cpp
index 4c0f328c853..6217d92fbc1 100644
--- a/src/Common/getCurrentProcessFDCount.cpp
+++ b/src/Common/getCurrentProcessFDCount.cpp
@@ -7,10 +7,10 @@
 #include <filesystem>
 
 
-int getCurrentProcessFDCount()
+Int64 getCurrentProcessFDCount()
 {
     namespace fs = std::filesystem;
-    int result = -1;
+    Int64 result = -1;
 #if defined(OS_LINUX)  || defined(OS_DARWIN)
     using namespace DB;
 
diff --git a/src/Common/getCurrentProcessFDCount.h b/src/Common/getCurrentProcessFDCount.h
index 583b99f6c13..f6273580df7 100644
--- a/src/Common/getCurrentProcessFDCount.h
+++ b/src/Common/getCurrentProcessFDCount.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <base/types.h>
+
 /// Get current process file descriptor count
 /// @return -1 os doesn't support "lsof" command or some error occurs.
-int getCurrentProcessFDCount();
+Int64 getCurrentProcessFDCount();
diff --git a/src/Common/getNumberOfPhysicalCPUCores.cpp b/src/Common/getNumberOfPhysicalCPUCores.cpp
index 7bb68b324b2..7a1f10b6435 100644
--- a/src/Common/getNumberOfPhysicalCPUCores.cpp
+++ b/src/Common/getNumberOfPhysicalCPUCores.cpp
@@ -48,7 +48,7 @@ static unsigned getNumberOfPhysicalCPUCoresImpl()
     /// Let's limit ourself to the number of physical cores.
     /// But if the number of logical cores is small - maybe it is a small machine
     /// or very limited cloud instance and it is reasonable to use all the cores.
-    if (cpu_count >= 8)
+    if (cpu_count >= 32)
         cpu_count /= 2;
 #endif
 
diff --git a/src/Common/intExp.h b/src/Common/intExp.h
index 3529990ef3b..69b0f09975a 100644
--- a/src/Common/intExp.h
+++ b/src/Common/intExp.h
@@ -47,6 +47,11 @@ namespace common
 
 constexpr inline int exp10_i32(int x)
 {
+    if (x < 0)
+        return 0;
+    if (x > 9)
+        return std::numeric_limits<int>::max();
+
     constexpr int values[] =
     {
         1,
@@ -65,6 +70,11 @@ constexpr inline int exp10_i32(int x)
 
 constexpr inline int64_t exp10_i64(int x)
 {
+    if (x < 0)
+        return 0;
+    if (x > 18)
+        return std::numeric_limits<int64_t>::max();
+
     constexpr int64_t values[] =
     {
         1LL,
@@ -92,6 +102,11 @@ constexpr inline int64_t exp10_i64(int x)
 
 constexpr inline Int128 exp10_i128(int x)
 {
+    if (x < 0)
+        return 0;
+    if (x > 38)
+        return std::numeric_limits<Int128>::max();
+
     constexpr Int128 values[] =
     {
         static_cast<Int128>(1LL),
@@ -140,6 +155,11 @@ constexpr inline Int128 exp10_i128(int x)
 
 inline Int256 exp10_i256(int x)
 {
+    if (x < 0)
+        return 0;
+    if (x > 76)
+        return std::numeric_limits<Int256>::max();
+
     using Int256 = Int256;
     static constexpr Int256 i10e18{1000000000000000000ll};
     static const Int256 values[] = {
@@ -231,8 +251,10 @@ inline Int256 exp10_i256(int x)
 template <typename T>
 constexpr inline T intExp10OfSize(int x)
 {
-    if constexpr (sizeof(T) <= 8)
-        return intExp10(x);
+    if constexpr (sizeof(T) <= 4)
+        return static_cast<T>(common::exp10_i32(x));
+    else if constexpr (sizeof(T) <= 8)
+        return common::exp10_i64(x);
     else if constexpr (sizeof(T) <= 16)
         return common::exp10_i128(x);
     else
diff --git a/src/Common/mysqlxx/PoolWithFailover.cpp b/src/Common/mysqlxx/PoolWithFailover.cpp
index f3dee1a6776..0ed231cdf8d 100644
--- a/src/Common/mysqlxx/PoolWithFailover.cpp
+++ b/src/Common/mysqlxx/PoolWithFailover.cpp
@@ -42,8 +42,8 @@ PoolWithFailover::PoolWithFailover(
         /// which triggers massive re-constructing of connection pools.
         /// The state of PRNGs like std::mt19937 is considered to be quite heavy
         /// thus here we attempt to optimize its construction.
-        static thread_local std::mt19937 rnd_generator(
-                std::hash<std::thread::id>{}(std::this_thread::get_id()) + std::clock());
+        static thread_local std::mt19937 rnd_generator(static_cast<uint_fast32_t>(
+                std::hash<std::thread::id>{}(std::this_thread::get_id()) + std::clock()));
         for (auto & [_, replicas] : replicas_by_priority)
         {
             if (replicas.size() > 1)
diff --git a/src/Common/mysqlxx/Value.cpp b/src/Common/mysqlxx/Value.cpp
index 85b63b722a2..6954080f864 100644
--- a/src/Common/mysqlxx/Value.cpp
+++ b/src/Common/mysqlxx/Value.cpp
@@ -124,7 +124,7 @@ double Value::readFloatText(const char * buf, size_t length) const
             case 'E':
             {
                 ++buf;
-                Int32 exponent = readIntText(buf, end - buf);
+                Int32 exponent = static_cast<Int32>(readIntText(buf, end - buf));
                 x *= preciseExp10(exponent);
                 if (negative)
                     x = -x;
diff --git a/src/Common/mysqlxx/mysqlxx/Row.h b/src/Common/mysqlxx/mysqlxx/Row.h
index 6ef40ff2060..5690389d1cf 100644
--- a/src/Common/mysqlxx/mysqlxx/Row.h
+++ b/src/Common/mysqlxx/mysqlxx/Row.h
@@ -44,9 +44,9 @@ public:
     /** Получить значение по индексу.
       * Здесь используется int, а не unsigned, чтобы не было неоднозначности с тем же методом, принимающим const char *.
       */
-    Value operator[] (int n) const
+    Value operator[] (size_t n) const
     {
-        if (unlikely(static_cast<size_t>(n) >= res->getNumFields()))
+        if (unlikely(n >= res->getNumFields()))
             throw Exception("Index of column is out of range.");
         return Value(row[n], lengths[n], res);
     }
diff --git a/src/Common/mysqlxx/mysqlxx/Value.h b/src/Common/mysqlxx/mysqlxx/Value.h
index 46fcee0753f..892e5a19d93 100644
--- a/src/Common/mysqlxx/mysqlxx/Value.h
+++ b/src/Common/mysqlxx/mysqlxx/Value.h
@@ -242,8 +242,8 @@ template <> inline unsigned char        Value::get<unsigned char        >() cons
 template <> inline char8_t              Value::get<char8_t              >() const { return getUInt(); }
 template <> inline short                Value::get<short                >() const { return getInt(); } /// NOLINT
 template <> inline unsigned short       Value::get<unsigned short       >() const { return getUInt(); } /// NOLINT
-template <> inline int                  Value::get<int                  >() const { return getInt(); }
-template <> inline unsigned int         Value::get<unsigned int         >() const { return getUInt(); }
+template <> inline int                  Value::get<int                  >() const { return static_cast<int>(getInt()); }
+template <> inline unsigned int         Value::get<unsigned int         >() const { return static_cast<unsigned int>(getUInt()); }
 template <> inline long                 Value::get<long                 >() const { return getInt(); } /// NOLINT
 template <> inline unsigned long        Value::get<unsigned long        >() const { return getUInt(); } /// NOLINT
 template <> inline long long            Value::get<long long            >() const { return getInt(); } /// NOLINT
diff --git a/src/Common/parseGlobs.cpp b/src/Common/parseGlobs.cpp
index 8e9195f9842..439852907a1 100644
--- a/src/Common/parseGlobs.cpp
+++ b/src/Common/parseGlobs.cpp
@@ -68,14 +68,14 @@ std::string makeRegexpPatternFromGlobs(const std::string & initial_str_with_glob
                 output_width = std::max(range_begin_width, range_end_width);
 
             if (leading_zeros)
-                oss_for_replacing << std::setfill('0') << std::setw(output_width);
+                oss_for_replacing << std::setfill('0') << std::setw(static_cast<int>(output_width));
             oss_for_replacing << range_begin;
 
             for (size_t i = range_begin + 1; i <= range_end; ++i)
             {
                 oss_for_replacing << '|';
                 if (leading_zeros)
-                    oss_for_replacing << std::setfill('0') << std::setw(output_width);
+                    oss_for_replacing << std::setfill('0') << std::setw(static_cast<int>(output_width));
                 oss_for_replacing << i;
             }
         }
diff --git a/src/Common/parseRemoteDescription.cpp b/src/Common/parseRemoteDescription.cpp
index 1f614945491..c8434b0993e 100644
--- a/src/Common/parseRemoteDescription.cpp
+++ b/src/Common/parseRemoteDescription.cpp
@@ -82,8 +82,8 @@ std::vector<String> parseRemoteDescription(const String & description, size_t l,
         /// Either the numeric interval (8..10) or equivalent expression in brackets
         if (description[i] == '{')
         {
-            int cnt = 1;
-            int last_dot = -1; /// The rightmost pair of points, remember the index of the right of the two
+            ssize_t cnt = 1;
+            ssize_t last_dot = -1; /// The rightmost pair of points, remember the index of the right of the two
             size_t m;
             std::vector<String> buffer;
             bool have_splitter = false;
diff --git a/src/Common/safe_cast.h b/src/Common/safe_cast.h
new file mode 100644
index 00000000000..133808ca259
--- /dev/null
+++ b/src/Common/safe_cast.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+template <class To, class From>
+To safe_cast(From from)
+{
+    constexpr auto max = std::numeric_limits<To>::max();
+    if (from > max)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Overflow ({} > {})", from, max);
+    return static_cast<To>(from);
+}
+
+}
diff --git a/src/Common/tests/gtest_DateLUTImpl.cpp b/src/Common/tests/gtest_DateLUTImpl.cpp
index 49013625ed3..6ae934b2296 100644
--- a/src/Common/tests/gtest_DateLUTImpl.cpp
+++ b/src/Common/tests/gtest_DateLUTImpl.cpp
@@ -58,7 +58,7 @@ FailuresCount countFailures(const ::testing::TestResult & test_result)
     const size_t count = test_result.total_part_count();
     for (size_t i = 0; i < count; ++i)
     {
-        const auto & part = test_result.GetTestPartResult(i);
+        const auto & part = test_result.GetTestPartResult(static_cast<int>(i));
         if (part.nonfatally_failed())
         {
             ++failures.non_fatal;
@@ -134,6 +134,7 @@ TEST(DateLUTTest, TimeValuesInMiddleOfRange)
     EXPECT_EQ(lut.toRelativeMonthNum(time), 24237 /*unsigned*/);
     EXPECT_EQ(lut.toRelativeQuarterNum(time), 8078 /*unsigned*/);
     EXPECT_EQ(lut.toRelativeHourNum(time), 435736 /*time_t*/);
+    EXPECT_EQ(lut.toStableRelativeHourNum(time), 435757 /*time_t*/);
     EXPECT_EQ(lut.toRelativeMinuteNum(time), 26144180 /*time_t*/);
     EXPECT_EQ(lut.toStartOfMinuteInterval(time, 6), 1568650680 /*time_t*/);
     EXPECT_EQ(lut.toStartOfSecondInterval(time, 7), 1568650811 /*time_t*/);
@@ -196,6 +197,7 @@ TEST(DateLUTTest, TimeValuesAtLeftBoderOfRange)
     EXPECT_EQ(lut.toRelativeMonthNum(time), 23641 /*unsigned*/); // ?
     EXPECT_EQ(lut.toRelativeQuarterNum(time), 7880 /*unsigned*/); // ?
     EXPECT_EQ(lut.toRelativeHourNum(time), 0 /*time_t*/);
+    EXPECT_EQ(lut.toStableRelativeHourNum(time), 24 /*time_t*/);
     EXPECT_EQ(lut.toRelativeMinuteNum(time), 0 /*time_t*/);
     EXPECT_EQ(lut.toStartOfMinuteInterval(time, 6), 0 /*time_t*/);
     EXPECT_EQ(lut.toStartOfSecondInterval(time, 7), 0 /*time_t*/);
@@ -259,6 +261,7 @@ TEST(DateLUTTest, TimeValuesAtRightBoderOfRangeOfOldLUT)
     EXPECT_EQ(lut.toRelativeMonthNum(time), 25273 /*unsigned*/);
     EXPECT_EQ(lut.toRelativeQuarterNum(time), 8424 /*unsigned*/);
     EXPECT_EQ(lut.toRelativeHourNum(time), 1192873 /*time_t*/);
+    EXPECT_EQ(lut.toStableRelativeHourNum(time), 1192897 /*time_t*/);
     EXPECT_EQ(lut.toRelativeMinuteNum(time), 71572397 /*time_t*/);
     EXPECT_EQ(lut.toStartOfMinuteInterval(time, 6), 4294343520 /*time_t*/);
     EXPECT_EQ(lut.toStartOfSecondInterval(time, 7), 4294343872 /*time_t*/);
diff --git a/src/Common/tests/gtest_hash_table.cpp b/src/Common/tests/gtest_hash_table.cpp
index b06ee5a666e..fd0b2495fde 100644
--- a/src/Common/tests/gtest_hash_table.cpp
+++ b/src/Common/tests/gtest_hash_table.cpp
@@ -216,27 +216,27 @@ TEST(HashTable, Erase)
         using Cont = HashSet<int, DefaultHash<int>, HashTableGrowerWithPrecalculation<1>>;
         Cont cont;
 
-        for (size_t i = 0; i < 5000; ++i)
+        for (int i = 0; i < 5000; ++i)
         {
             cont.insert(i);
         }
 
-        for (size_t i = 0; i < 2500; ++i)
+        for (int i = 0; i < 2500; ++i)
         {
             cont.erase(i);
         }
 
-        for (size_t i = 5000; i < 10000; ++i)
+        for (int i = 5000; i < 10000; ++i)
         {
             cont.insert(i);
         }
 
-        for (size_t i = 5000; i < 10000; ++i)
+        for (int i = 5000; i < 10000; ++i)
         {
             cont.erase(i);
         }
 
-        for (size_t i = 2500; i < 5000; ++i)
+        for (int i = 2500; i < 5000; ++i)
         {
             cont.erase(i);
         }
diff --git a/src/Common/tests/gtest_lru_hash_map.cpp b/src/Common/tests/gtest_lru_hash_map.cpp
index 562ee667b7b..f45a503be43 100644
--- a/src/Common/tests/gtest_lru_hash_map.cpp
+++ b/src/Common/tests/gtest_lru_hash_map.cpp
@@ -26,7 +26,7 @@ void testInsert(size_t elements_to_insert_size, size_t map_size)
     std::vector<int> expected;
 
     for (size_t i = 0; i < elements_to_insert_size; ++i)
-        map.insert(i, i);
+        map.insert(static_cast<int>(i), static_cast<int>(i));
 
     for (size_t i = elements_to_insert_size - map_size; i < elements_to_insert_size; ++i)
         expected.emplace_back(i);
diff --git a/src/Common/waitForPid.cpp b/src/Common/waitForPid.cpp
index 73d88c68adb..2cf80de644d 100644
--- a/src/Common/waitForPid.cpp
+++ b/src/Common/waitForPid.cpp
@@ -54,7 +54,7 @@ namespace DB
 
 static int syscall_pidfd_open(pid_t pid)
 {
-    return syscall(SYS_pidfd_open, pid, 0);
+    return static_cast<int>(syscall(SYS_pidfd_open, pid, 0));
 }
 
 static bool supportsPidFdOpen()
@@ -170,7 +170,8 @@ bool waitForPid(pid_t pid, size_t timeout_in_seconds)
     /// If timeout is positive try waitpid without block in loop until
     /// process is normally terminated or waitpid return error
 
-    int timeout_in_ms = timeout_in_seconds * 1000;
+    /// NOTE: timeout casted to int, since poll() accept int for timeout
+    int timeout_in_ms = static_cast<int>(timeout_in_seconds * 1000);
     while (timeout_in_ms > 0)
     {
         int waitpid_res = HANDLE_EINTR(waitpid(pid, &status, WNOHANG));
diff --git a/src/Compression/CompressedReadBufferBase.cpp b/src/Compression/CompressedReadBufferBase.cpp
index 9101caf568e..0492b7faec5 100644
--- a/src/Compression/CompressedReadBufferBase.cpp
+++ b/src/Compression/CompressedReadBufferBase.cpp
@@ -279,7 +279,7 @@ static void readHeaderAndGetCodec(const char * compressed_buffer, size_t size_de
 void CompressedReadBufferBase::decompressTo(char * to, size_t size_decompressed, size_t size_compressed_without_checksum)
 {
     readHeaderAndGetCodec(compressed_buffer, size_decompressed, codec, allow_different_codecs);
-    codec->decompress(compressed_buffer, size_compressed_without_checksum, to);
+    codec->decompress(compressed_buffer, static_cast<UInt32>(size_compressed_without_checksum), to);
 }
 
 void CompressedReadBufferBase::decompress(BufferBase::Buffer & to, size_t size_decompressed, size_t size_compressed_without_checksum)
@@ -300,7 +300,7 @@ void CompressedReadBufferBase::decompress(BufferBase::Buffer & to, size_t size_d
         to = BufferBase::Buffer(compressed_buffer + header_size, compressed_buffer + size_compressed_without_checksum);
     }
     else
-        codec->decompress(compressed_buffer, size_compressed_without_checksum, to.begin());
+        codec->decompress(compressed_buffer, static_cast<UInt32>(size_compressed_without_checksum), to.begin());
 }
 
 void CompressedReadBufferBase::flushAsynchronousDecompressRequests() const
diff --git a/src/Compression/CompressedWriteBuffer.cpp b/src/Compression/CompressedWriteBuffer.cpp
index 6c1dbd9e00c..82beeea37cd 100644
--- a/src/Compression/CompressedWriteBuffer.cpp
+++ b/src/Compression/CompressedWriteBuffer.cpp
@@ -3,6 +3,7 @@
 
 #include <base/types.h>
 #include <base/unaligned.h>
+#include <base/defines.h>
 
 #include <Compression/CompressionFactory.h>
 #include "CompressedWriteBuffer.h"
@@ -22,7 +23,8 @@ void CompressedWriteBuffer::nextImpl()
     if (!offset())
         return;
 
-    size_t decompressed_size = offset();
+    chassert(offset() <= INT_MAX);
+    UInt32 decompressed_size = static_cast<UInt32>(offset());
     UInt32 compressed_reserve_size = codec->getCompressedReserveSize(decompressed_size);
 
     /** During compression we need buffer with capacity >= compressed_reserve_size + CHECKSUM_SIZE.
diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index 816f242672a..c1278cb88de 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -353,7 +353,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 
     writer.flush();
 
-    return (dest - dest_start) + (writer.count() + 7) / 8;
+    return static_cast<UInt32>((dest - dest_start) + (writer.count() + 7) / 8);
 }
 
 template <typename ValueType>
@@ -414,7 +414,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
         if (write_spec.data_bits != 0)
         {
             const UInt8 sign = reader.readBit();
-            double_delta = reader.readBits(write_spec.data_bits - 1) + 1;
+            double_delta = static_cast<UnsignedDeltaType>(reader.readBits(write_spec.data_bits - 1) + 1);
             if (sign)
             {
                 /// It's well defined for unsigned data types.
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index a9550c9e28d..02b640ae402 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -7,6 +7,7 @@
 #include <Compression/CompressionCodecEncrypted.h>
 #include <Poco/Logger.h>
 #include <Common/logger_useful.h>
+#include <Common/safe_cast.h>
 
 // This depends on BoringSSL-specific API, notably <openssl/aead.h>.
 #if USE_SSL
@@ -480,7 +481,8 @@ UInt32 CompressionCodecEncrypted::doCompressData(const char * source, UInt32 sou
     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;
+    size_t out_size = out_len + keyid_size + nonce_size;
+    return safe_cast<UInt32>(out_size);
 }
 
 void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
diff --git a/src/Compression/CompressionCodecFPC.cpp b/src/Compression/CompressionCodecFPC.cpp
index 247eb73b65b..48eba210b60 100644
--- a/src/Compression/CompressionCodecFPC.cpp
+++ b/src/Compression/CompressionCodecFPC.cpp
@@ -453,9 +453,9 @@ UInt32 CompressionCodecFPC::doCompressData(const char * source, UInt32 source_si
     switch (float_width)
     {
         case sizeof(Float64):
-            return HEADER_SIZE + FPCOperation<UInt64>(destination, level).encode(src);
+            return static_cast<UInt32>(HEADER_SIZE + FPCOperation<UInt64>(destination, level).encode(src));
         case sizeof(Float32):
-            return HEADER_SIZE + FPCOperation<UInt32>(destination, level).encode(src);
+            return static_cast<UInt32>(HEADER_SIZE + FPCOperation<UInt32>(destination, level).encode(src));
         default:
             break;
     }
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 0ca3e5660e0..0da6ff46dbc 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -259,7 +259,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     writer.flush();
 
-    return (dest - dest_start) + (writer.count() + 7) / 8;
+    return static_cast<UInt32>((dest - dest_start) + (writer.count() + 7) / 8);
 }
 
 template <typename T>
@@ -320,7 +320,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
                         ErrorCodes::CANNOT_DECOMPRESS);
             }
 
-            xored_data = reader.readBits(curr_xored_info.data_bits);
+            xored_data = static_cast<T>(reader.readBits(curr_xored_info.data_bits));
             xored_data <<= curr_xored_info.trailing_zero_bits;
             curr_value = prev_value ^ xored_data;
         }
diff --git a/src/Compression/CompressionCodecLZ4.cpp b/src/Compression/CompressionCodecLZ4.cpp
index 12f138dc95a..5b93e7ef60f 100644
--- a/src/Compression/CompressionCodecLZ4.cpp
+++ b/src/Compression/CompressionCodecLZ4.cpp
@@ -134,7 +134,7 @@ void registerCodecLZ4HC(CompressionCodecFactory & factory)
             if (!literal)
                 throw Exception("LZ4HC codec argument must be integer", ErrorCodes::ILLEGAL_CODEC_PARAMETER);
 
-            level = literal->value.safeGet<UInt64>();
+            level = static_cast<int>(literal->value.safeGet<UInt64>());
         }
 
         return std::make_shared<CompressionCodecLZ4HC>(level);
diff --git a/src/Compression/CompressionCodecMultiple.cpp b/src/Compression/CompressionCodecMultiple.cpp
index 8ad054673e1..628c2d97d86 100644
--- a/src/Compression/CompressionCodecMultiple.cpp
+++ b/src/Compression/CompressionCodecMultiple.cpp
@@ -48,7 +48,7 @@ UInt32 CompressionCodecMultiple::getMaxCompressedDataSize(UInt32 uncompressed_si
         compressed_size = codec->getCompressedReserveSize(compressed_size);
 
     ///    TotalCodecs  ByteForEachCodec       data
-    return sizeof(UInt8) + codecs.size() + compressed_size;
+    return static_cast<UInt32>(sizeof(UInt8) + codecs.size() + compressed_size);
 }
 
 UInt32 CompressionCodecMultiple::doCompressData(const char * source, UInt32 source_size, char * dest) const
@@ -73,7 +73,7 @@ UInt32 CompressionCodecMultiple::doCompressData(const char * source, UInt32 sour
 
     memcpy(&dest[1 + codecs.size()], uncompressed_buf.data(), source_size);
 
-    return 1 + codecs.size() + source_size;
+    return static_cast<UInt32>(1 + codecs.size() + source_size);
 }
 
 void CompressionCodecMultiple::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 decompressed_size) const
diff --git a/src/Compression/CompressionCodecT64.cpp b/src/Compression/CompressionCodecT64.cpp
index bfcebad9676..cc8ce24476f 100644
--- a/src/Compression/CompressionCodecT64.cpp
+++ b/src/Compression/CompressionCodecT64.cpp
@@ -550,7 +550,7 @@ void decompressData(const char * src, UInt32 bytes_size, char * dst, UInt32 unco
     UInt32 num_bits = getValuableBitsNumber(min, max);
     if (!num_bits)
     {
-        T min_value = min;
+        T min_value = static_cast<T>(min);
         for (UInt32 i = 0; i < num_elements; ++i, dst += sizeof(T))
             unalignedStore<T>(dst, min_value);
         return;
@@ -572,14 +572,14 @@ void decompressData(const char * src, UInt32 bytes_size, char * dst, UInt32 unco
     T upper_max [[maybe_unused]] = 0;
     T sign_bit [[maybe_unused]] = 0;
     if (num_bits < 64)
-        upper_min = static_cast<UInt64>(min) >> num_bits << num_bits;
+        upper_min = static_cast<T>(static_cast<UInt64>(min) >> num_bits << num_bits);
 
     if constexpr (is_signed_v<T>)
     {
         if (min < 0 && max >= 0 && num_bits < 64)
         {
-            sign_bit = 1ull << (num_bits - 1);
-            upper_max = static_cast<UInt64>(max) >> num_bits << num_bits;
+            sign_bit = static_cast<T>(1ull << (num_bits - 1));
+            upper_max = static_cast<T>(static_cast<UInt64>(max) >> num_bits << num_bits);
         }
     }
 
diff --git a/src/Compression/CompressionCodecZSTD.cpp b/src/Compression/CompressionCodecZSTD.cpp
index b47c8c4b080..f1c50840e54 100644
--- a/src/Compression/CompressionCodecZSTD.cpp
+++ b/src/Compression/CompressionCodecZSTD.cpp
@@ -65,7 +65,7 @@ void CompressionCodecZSTD::updateHash(SipHash & hash) const
 
 UInt32 CompressionCodecZSTD::getMaxCompressedDataSize(UInt32 uncompressed_size) const
 {
-    return ZSTD_compressBound(uncompressed_size);
+    return static_cast<UInt32>(ZSTD_compressBound(uncompressed_size));
 }
 
 
@@ -84,7 +84,7 @@ UInt32 CompressionCodecZSTD::doCompressData(const char * source, UInt32 source_s
     if (ZSTD_isError(compressed_size))
         throw Exception("Cannot compress block with ZSTD: " + std::string(ZSTD_getErrorName(compressed_size)), ErrorCodes::CANNOT_COMPRESS);
 
-    return compressed_size;
+    return static_cast<UInt32>(compressed_size);
 }
 
 
@@ -124,18 +124,20 @@ void registerCodecZSTD(CompressionCodecFactory & factory)
             if (!literal)
                 throw Exception("ZSTD codec argument must be integer", ErrorCodes::ILLEGAL_CODEC_PARAMETER);
 
-            level = literal->value.safeGet<UInt64>();
+            level = static_cast<int>(literal->value.safeGet<UInt64>());
             if (level > ZSTD_maxCLevel())
-                throw Exception(
-                    "ZSTD codec can't have level more than " + toString(ZSTD_maxCLevel()) + ", given " + toString(level),
-                    ErrorCodes::ILLEGAL_CODEC_PARAMETER);
+            {
+                throw Exception(ErrorCodes::ILLEGAL_CODEC_PARAMETER,
+                    "ZSTD codec can't have level more than {}, given {}",
+                    ZSTD_maxCLevel(), level);
+            }
             if (arguments->children.size() > 1)
             {
                 const auto * window_literal = children[1]->as<ASTLiteral>();
                 if (!window_literal)
                     throw Exception("ZSTD codec second argument must be integer", ErrorCodes::ILLEGAL_CODEC_PARAMETER);
 
-                const int window_log = window_literal->value.safeGet<UInt64>();
+                const int window_log = static_cast<int>(window_literal->value.safeGet<UInt64>());
 
                 ZSTD_bounds window_log_bounds = ZSTD_cParam_getBounds(ZSTD_c_windowLog);
                 if (ZSTD_isError(window_log_bounds.error))
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 2df3edb23ad..c203b3e9d5c 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -391,7 +391,7 @@ CodecTestSequence generateSeq(Generator gen, const char* gen_name, B Begin = 0,
 
     for (auto i = Begin; i < End; i += direction)
     {
-        const T v = gen(static_cast<T>(i));
+        const T v = static_cast<T>(gen(i));
 
         unalignedStoreLE<T>(write_pos, v);
         write_pos += sizeof(v);
@@ -464,13 +464,15 @@ void testTranscoding(Timer & timer, ICompressionCodec & codec, const CodecTestSe
 {
     const auto & source_data = test_sequence.serialized_data;
 
-    const UInt32 encoded_max_size = codec.getCompressedReserveSize(source_data.size());
+    const UInt32 encoded_max_size = codec.getCompressedReserveSize(
+        static_cast<UInt32>(source_data.size()));
     PODArray<char> encoded(encoded_max_size);
 
     timer.start();
 
     assert(source_data.data() != nullptr); // Codec assumes that source buffer is not null.
-    const UInt32 encoded_size = codec.compress(source_data.data(), source_data.size(), encoded.data());
+    const UInt32 encoded_size = codec.compress(
+        source_data.data(), static_cast<UInt32>(source_data.size()), encoded.data());
     timer.report("encoding");
 
     encoded.resize(encoded_size);
@@ -478,7 +480,8 @@ void testTranscoding(Timer & timer, ICompressionCodec & codec, const CodecTestSe
     PODArray<char> decoded(source_data.size());
 
     timer.start();
-    const UInt32 decoded_size = codec.decompress(encoded.data(), encoded.size(), decoded.data());
+    const UInt32 decoded_size = codec.decompress(
+        encoded.data(), static_cast<UInt32>(encoded.size()), decoded.data());
     timer.report("decoding");
 
     decoded.resize(decoded_size);
@@ -542,10 +545,12 @@ TEST_P(CodecTestCompatibility, Encoding)
     const auto & source_data = data_sequence.serialized_data;
 
     // Just encode the data with codec
-    const UInt32 encoded_max_size = codec->getCompressedReserveSize(source_data.size());
+    const UInt32 encoded_max_size = codec->getCompressedReserveSize(
+        static_cast<UInt32>(source_data.size()));
     PODArray<char> encoded(encoded_max_size);
 
-    const UInt32 encoded_size = codec->compress(source_data.data(), source_data.size(), encoded.data());
+    const UInt32 encoded_size = codec->compress(
+        source_data.data(), static_cast<UInt32>(source_data.size()), encoded.data());
     encoded.resize(encoded_size);
     SCOPED_TRACE(::testing::Message("encoded:  ") << AsHexString(encoded));
 
@@ -560,7 +565,8 @@ TEST_P(CodecTestCompatibility, Decoding)
     const auto codec = makeCodec(codec_spec.codec_statement, expected.data_type);
 
     PODArray<char> decoded(expected.serialized_data.size());
-    const UInt32 decoded_size = codec->decompress(encoded_data.c_str(), encoded_data.size(), decoded.data());
+    const UInt32 decoded_size = codec->decompress(
+        encoded_data.c_str(), static_cast<UInt32>(encoded_data.size()), decoded.data());
     decoded.resize(decoded_size);
 
     ASSERT_TRUE(EqualByteContainers(expected.data_type->getSizeOfValueInMemory(), expected.serialized_data, decoded));
@@ -716,7 +722,7 @@ template <typename T>
 struct RandomGenerator
 {
     explicit RandomGenerator(T seed = 0, T value_min = std::numeric_limits<T>::min(), T value_max = std::numeric_limits<T>::max())
-        : random_engine(seed),
+        : random_engine(static_cast<uint_fast32_t>(seed)),
           distribution(value_min, value_max)
     {
     }
@@ -1206,8 +1212,7 @@ auto PrimesWithMultiplierGenerator = [](int multiplier = 1)
         };
         static const size_t count = sizeof(vals)/sizeof(vals[0]);
 
-        using T = decltype(i);
-        return static_cast<T>(vals[i % count] * static_cast<T>(multiplier));
+        return static_cast<UInt64>(vals[i % count]) * multiplier;
     };
 };
 
diff --git a/src/Coordination/KeeperDispatcher.cpp b/src/Coordination/KeeperDispatcher.cpp
index d725ecb5cfe..6e9116d4b75 100644
--- a/src/Coordination/KeeperDispatcher.cpp
+++ b/src/Coordination/KeeperDispatcher.cpp
@@ -1,14 +1,21 @@
 #include <Coordination/KeeperDispatcher.h>
+
+#include <Poco/Path.h>
+#include <Poco/Util/AbstractConfiguration.h>
+
+#include <Common/hex.h>
 #include <Common/setThreadName.h>
 #include <Common/ZooKeeper/KeeperException.h>
-#include <future>
-#include <chrono>
-#include <Poco/Path.h>
-#include <Common/hex.h>
-#include <filesystem>
 #include <Common/checkStackSize.h>
 #include <Common/CurrentMetrics.h>
 
+
+#include <future>
+#include <chrono>
+#include <filesystem>
+#include <iterator>
+#include <limits>
+
 namespace CurrentMetrics
 {
     extern const Metric KeeperAliveConnections;
@@ -32,9 +39,7 @@ KeeperDispatcher::KeeperDispatcher()
     : responses_queue(std::numeric_limits<size_t>::max())
     , configuration_and_settings(std::make_shared<KeeperConfigurationAndSettings>())
     , log(&Poco::Logger::get("KeeperDispatcher"))
-{
-}
-
+{}
 
 void KeeperDispatcher::requestThread()
 {
@@ -191,7 +196,13 @@ void KeeperDispatcher::snapshotThread()
 
         try
         {
-            task.create_snapshot(std::move(task.snapshot));
+            auto snapshot_path = task.create_snapshot(std::move(task.snapshot));
+
+            if (snapshot_path.empty())
+                continue;
+
+            if (isLeader())
+                snapshot_s3.uploadSnapshot(snapshot_path);
         }
         catch (...)
         {
@@ -285,7 +296,9 @@ void KeeperDispatcher::initialize(const Poco::Util::AbstractConfiguration & conf
     responses_thread = ThreadFromGlobalPool([this] { responseThread(); });
     snapshot_thread = ThreadFromGlobalPool([this] { snapshotThread(); });
 
-    server = std::make_unique<KeeperServer>(configuration_and_settings, config, responses_queue, snapshots_queue);
+    snapshot_s3.startup(config);
+
+    server = std::make_unique<KeeperServer>(configuration_and_settings, config, responses_queue, snapshots_queue, snapshot_s3);
 
     try
     {
@@ -312,7 +325,6 @@ void KeeperDispatcher::initialize(const Poco::Util::AbstractConfiguration & conf
     /// Start it after keeper server start
     session_cleaner_thread = ThreadFromGlobalPool([this] { sessionCleanerTask(); });
     update_configuration_thread = ThreadFromGlobalPool([this] { updateConfigurationThread(); });
-    updateConfiguration(config);
 
     LOG_DEBUG(log, "Dispatcher initialized");
 }
@@ -415,6 +427,8 @@ void KeeperDispatcher::shutdown()
         if (server)
             server->shutdown();
 
+        snapshot_s3.shutdown();
+
         CurrentMetrics::set(CurrentMetrics::KeeperAliveConnections, 0);
 
     }
@@ -678,6 +692,8 @@ void KeeperDispatcher::updateConfiguration(const Poco::Util::AbstractConfigurati
         if (!push_result)
             throw Exception(ErrorCodes::SYSTEM_ERROR, "Cannot push configuration update to queue");
     }
+
+    snapshot_s3.updateS3Configuration(config);
 }
 
 void KeeperDispatcher::updateKeeperStatLatency(uint64_t process_time_ms)
diff --git a/src/Coordination/KeeperDispatcher.h b/src/Coordination/KeeperDispatcher.h
index 3b524b24ed7..0003867adbe 100644
--- a/src/Coordination/KeeperDispatcher.h
+++ b/src/Coordination/KeeperDispatcher.h
@@ -14,6 +14,7 @@
 #include <Coordination/CoordinationSettings.h>
 #include <Coordination/Keeper4LWInfo.h>
 #include <Coordination/KeeperConnectionStats.h>
+#include <Coordination/KeeperSnapshotManagerS3.h>
 
 namespace DB
 {
@@ -76,6 +77,8 @@ private:
     /// Counter for new session_id requests.
     std::atomic<int64_t> internal_session_id_counter{0};
 
+    KeeperSnapshotManagerS3 snapshot_s3;
+
     /// Thread put requests to raft
     void requestThread();
     /// Thread put responses for subscribed sessions
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index 7a0cee746c6..a097cb57bc6 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -8,6 +8,7 @@
 #include <string>
 #include <Coordination/KeeperStateMachine.h>
 #include <Coordination/KeeperStateManager.h>
+#include <Coordination/KeeperSnapshotManagerS3.h>
 #include <Coordination/LoggerWrapper.h>
 #include <Coordination/ReadBufferFromNuraftBuffer.h>
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
@@ -105,7 +106,8 @@ KeeperServer::KeeperServer(
     const KeeperConfigurationAndSettingsPtr & configuration_and_settings_,
     const Poco::Util::AbstractConfiguration & config,
     ResponsesQueue & responses_queue_,
-    SnapshotsQueue & snapshots_queue_)
+    SnapshotsQueue & snapshots_queue_,
+    KeeperSnapshotManagerS3 & snapshot_manager_s3)
     : server_id(configuration_and_settings_->server_id)
     , coordination_settings(configuration_and_settings_->coordination_settings)
     , log(&Poco::Logger::get("KeeperServer"))
@@ -125,6 +127,7 @@ KeeperServer::KeeperServer(
         configuration_and_settings_->snapshot_storage_path,
         coordination_settings,
         keeper_context,
+        config.getBool("keeper_server.upload_snapshot_on_exit", true) ? &snapshot_manager_s3 : nullptr,
         checkAndGetSuperdigest(configuration_and_settings_->super_digest));
 
     state_manager = nuraft::cs_new<KeeperStateManager>(
@@ -281,8 +284,9 @@ void KeeperServer::launchRaftServer(const Poco::Util::AbstractConfiguration & co
     params.client_req_timeout_
         = getValueOrMaxInt32AndLogWarning(coordination_settings->operation_timeout_ms.totalMilliseconds(), "operation_timeout_ms", log);
     params.auto_forwarding_ = coordination_settings->auto_forwarding;
-    params.auto_forwarding_req_timeout_
-        = std::max<uint64_t>(coordination_settings->operation_timeout_ms.totalMilliseconds() * 2, std::numeric_limits<int32_t>::max());
+    params.auto_forwarding_req_timeout_ = std::max<int32_t>(
+        static_cast<int32_t>(coordination_settings->operation_timeout_ms.totalMilliseconds() * 2),
+        std::numeric_limits<int32_t>::max());
     params.auto_forwarding_req_timeout_
         = getValueOrMaxInt32AndLogWarning(coordination_settings->operation_timeout_ms.totalMilliseconds() * 2, "operation_timeout_ms", log);
     params.max_append_size_
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
index 6873ef2a01e..a33e29b4540 100644
--- a/src/Coordination/KeeperServer.h
+++ b/src/Coordination/KeeperServer.h
@@ -71,7 +71,8 @@ public:
         const KeeperConfigurationAndSettingsPtr & settings_,
         const Poco::Util::AbstractConfiguration & config_,
         ResponsesQueue & responses_queue_,
-        SnapshotsQueue & snapshots_queue_);
+        SnapshotsQueue & snapshots_queue_,
+        KeeperSnapshotManagerS3 & snapshot_manager_s3);
 
     /// Load state machine from the latest snapshot and load log storage. Start NuRaft with required settings.
     void startup(const Poco::Util::AbstractConfiguration & config, bool enable_ipv6 = true);
diff --git a/src/Coordination/KeeperSnapshotManager.h b/src/Coordination/KeeperSnapshotManager.h
index c00ce9421e7..52647712083 100644
--- a/src/Coordination/KeeperSnapshotManager.h
+++ b/src/Coordination/KeeperSnapshotManager.h
@@ -87,7 +87,7 @@ public:
 };
 
 using KeeperStorageSnapshotPtr = std::shared_ptr<KeeperStorageSnapshot>;
-using CreateSnapshotCallback = std::function<void(KeeperStorageSnapshotPtr &&)>;
+using CreateSnapshotCallback = std::function<std::string(KeeperStorageSnapshotPtr &&)>;
 
 
 using SnapshotMetaAndStorage = std::pair<SnapshotMetadataPtr, KeeperStoragePtr>;
diff --git a/src/Coordination/KeeperSnapshotManagerS3.cpp b/src/Coordination/KeeperSnapshotManagerS3.cpp
new file mode 100644
index 00000000000..2e19d496407
--- /dev/null
+++ b/src/Coordination/KeeperSnapshotManagerS3.cpp
@@ -0,0 +1,311 @@
+#include <Coordination/KeeperSnapshotManagerS3.h>
+
+#if USE_AWS_S3
+#include <Core/UUID.h>
+
+#include <Common/Exception.h>
+#include <Common/setThreadName.h>
+
+#include <IO/S3Common.h>
+#include <IO/WriteBufferFromS3.h>
+#include <IO/ReadBufferFromS3.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/S3/PocoHTTPClient.h>
+#include <IO/WriteHelpers.h>
+#include <IO/copyData.h>
+
+#include <aws/core/auth/AWSCredentials.h>
+#include <aws/s3/S3Client.h>
+#include <aws/s3/S3Errors.h>
+#include <aws/s3/model/HeadObjectRequest.h>
+#include <aws/s3/model/DeleteObjectRequest.h>
+
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+struct KeeperSnapshotManagerS3::S3Configuration
+{
+    S3Configuration(S3::URI uri_, S3::AuthSettings auth_settings_, std::shared_ptr<const Aws::S3::S3Client> client_)
+        : uri(std::move(uri_))
+        , auth_settings(std::move(auth_settings_))
+        , client(std::move(client_))
+    {}
+
+    S3::URI uri;
+    S3::AuthSettings auth_settings;
+    std::shared_ptr<const Aws::S3::S3Client> client;
+};
+
+KeeperSnapshotManagerS3::KeeperSnapshotManagerS3()
+    : snapshots_s3_queue(std::numeric_limits<size_t>::max())
+    , log(&Poco::Logger::get("KeeperSnapshotManagerS3"))
+    , uuid(UUIDHelpers::generateV4())
+{}
+
+void KeeperSnapshotManagerS3::updateS3Configuration(const Poco::Util::AbstractConfiguration & config)
+{
+    try
+    {
+        const std::string config_prefix = "keeper_server.s3_snapshot";
+
+        if (!config.has(config_prefix))
+        {
+            std::lock_guard client_lock{snapshot_s3_client_mutex};
+            if (snapshot_s3_client)
+                LOG_INFO(log, "S3 configuration was removed");
+            snapshot_s3_client = nullptr;
+            return;
+        }
+
+        auto auth_settings = S3::AuthSettings::loadFromConfig(config_prefix, config);
+
+        auto endpoint = config.getString(config_prefix + ".endpoint");
+        auto new_uri = S3::URI{Poco::URI(endpoint)};
+
+        {
+            std::lock_guard client_lock{snapshot_s3_client_mutex};
+            // if client is not changed (same auth settings, same endpoint) we don't need to update
+            if (snapshot_s3_client && snapshot_s3_client->client && auth_settings == snapshot_s3_client->auth_settings
+                && snapshot_s3_client->uri.uri == new_uri.uri)
+                return;
+        }
+
+        LOG_INFO(log, "S3 configuration was updated");
+
+        auto credentials = Aws::Auth::AWSCredentials(auth_settings.access_key_id, auth_settings.secret_access_key);
+        HeaderCollection headers = auth_settings.headers;
+
+        static constexpr size_t s3_max_redirects = 10;
+        static constexpr bool enable_s3_requests_logging = false;
+
+        if (!new_uri.key.empty())
+        {
+            LOG_ERROR(log, "Invalid endpoint defined for S3, it shouldn't contain key, endpoint: {}", endpoint);
+            return;
+        }
+
+        S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
+            auth_settings.region,
+            RemoteHostFilter(), s3_max_redirects,
+            enable_s3_requests_logging,
+            /* for_disk_s3 = */ false);
+
+        client_configuration.endpointOverride = new_uri.endpoint;
+
+        auto client = S3::ClientFactory::instance().create(
+            client_configuration,
+            new_uri.is_virtual_hosted_style,
+            credentials.GetAWSAccessKeyId(),
+            credentials.GetAWSSecretKey(),
+            auth_settings.server_side_encryption_customer_key_base64,
+            std::move(headers),
+            auth_settings.use_environment_credentials.value_or(false),
+            auth_settings.use_insecure_imds_request.value_or(false));
+
+        auto new_client = std::make_shared<KeeperSnapshotManagerS3::S3Configuration>(std::move(new_uri), std::move(auth_settings), std::move(client));
+
+        {
+            std::lock_guard client_lock{snapshot_s3_client_mutex};
+            snapshot_s3_client = std::move(new_client);
+        }
+        LOG_INFO(log, "S3 client was updated");
+    }
+    catch (...)
+    {
+        LOG_ERROR(log, "Failed to create an S3 client for snapshots");
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+std::shared_ptr<KeeperSnapshotManagerS3::S3Configuration> KeeperSnapshotManagerS3::getSnapshotS3Client() const
+{
+    std::lock_guard lock{snapshot_s3_client_mutex};
+    return snapshot_s3_client;
+}
+
+void KeeperSnapshotManagerS3::uploadSnapshotImpl(const std::string & snapshot_path)
+{
+    try
+    {
+        auto s3_client = getSnapshotS3Client();
+        if (s3_client == nullptr)
+            return;
+
+        S3Settings::ReadWriteSettings read_write_settings;
+        read_write_settings.upload_part_size_multiply_parts_count_threshold = 10000;
+
+        const auto create_writer = [&](const auto & key)
+        {
+            return WriteBufferFromS3
+            {
+                s3_client->client,
+                s3_client->uri.bucket,
+                key,
+                read_write_settings
+            };
+        };
+
+        const auto file_exists = [&](const auto & key)
+        {
+            Aws::S3::Model::HeadObjectRequest request;
+            request.SetBucket(s3_client->uri.bucket);
+            request.SetKey(key);
+            auto outcome = s3_client->client->HeadObject(request);
+
+            if (outcome.IsSuccess())
+                return true;
+
+            const auto & error = outcome.GetError();
+            if (error.GetErrorType() != Aws::S3::S3Errors::NO_SUCH_KEY && error.GetErrorType() != Aws::S3::S3Errors::RESOURCE_NOT_FOUND)
+                throw S3Exception(error.GetErrorType(), "Failed to verify existence of lock file: {}", error.GetMessage());
+
+            return false;
+        };
+
+
+        LOG_INFO(log, "Will try to upload snapshot on {} to S3", snapshot_path);
+        ReadBufferFromFile snapshot_file(snapshot_path);
+
+        auto snapshot_name = fs::path(snapshot_path).filename().string();
+        auto lock_file = fmt::format(".{}_LOCK", snapshot_name);
+
+        if (file_exists(snapshot_name))
+        {
+            LOG_ERROR(log, "Snapshot {} already exists", snapshot_name);
+            return;
+        }
+
+        // First we need to verify that there isn't already a lock file for the snapshot we want to upload
+        // Only leader uploads a snapshot, but there can be a rare case where we have 2 leaders in NuRaft
+        if (file_exists(lock_file))
+        {
+            LOG_ERROR(log, "Lock file for {} already, exists. Probably a different node is already uploading the snapshot", snapshot_name);
+            return;
+        }
+
+        // We write our UUID to lock file
+        LOG_DEBUG(log, "Trying to create a lock file");
+        WriteBufferFromS3 lock_writer = create_writer(lock_file);
+        writeUUIDText(uuid, lock_writer);
+        lock_writer.finalize();
+
+        // We read back the written UUID, if it's the same we can upload the file
+        ReadBufferFromS3 lock_reader
+        {
+            s3_client->client,
+            s3_client->uri.bucket,
+            lock_file,
+            "",
+            1,
+            {}
+        };
+
+        std::string read_uuid;
+        readStringUntilEOF(read_uuid, lock_reader);
+
+        if (read_uuid != toString(uuid))
+        {
+            LOG_ERROR(log, "Failed to create a lock file");
+            return;
+        }
+
+        SCOPE_EXIT(
+        {
+            LOG_INFO(log, "Removing lock file");
+            try
+            {
+                Aws::S3::Model::DeleteObjectRequest delete_request;
+                delete_request.SetBucket(s3_client->uri.bucket);
+                delete_request.SetKey(lock_file);
+                auto delete_outcome = s3_client->client->DeleteObject(delete_request);
+                if (!delete_outcome.IsSuccess())
+                    throw S3Exception(delete_outcome.GetError().GetMessage(), delete_outcome.GetError().GetErrorType());
+            }
+            catch (...)
+            {
+                LOG_INFO(log, "Failed to delete lock file for {} from S3", snapshot_path);
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        });
+
+        WriteBufferFromS3 snapshot_writer = create_writer(snapshot_name);
+        copyData(snapshot_file, snapshot_writer);
+        snapshot_writer.finalize();
+
+        LOG_INFO(log, "Successfully uploaded {} to S3", snapshot_path);
+    }
+    catch (...)
+    {
+        LOG_INFO(log, "Failure during upload of {} to S3", snapshot_path);
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void KeeperSnapshotManagerS3::snapshotS3Thread()
+{
+    setThreadName("KeeperS3SnpT");
+
+    while (!shutdown_called)
+    {
+        std::string snapshot_path;
+        if (!snapshots_s3_queue.pop(snapshot_path))
+            break;
+
+        if (shutdown_called)
+            break;
+
+        uploadSnapshotImpl(snapshot_path);
+    }
+}
+
+void KeeperSnapshotManagerS3::uploadSnapshot(const std::string & path, bool async_upload)
+{
+    if (getSnapshotS3Client() == nullptr)
+        return;
+
+    if (async_upload)
+    {
+        if (!snapshots_s3_queue.push(path))
+            LOG_WARNING(log, "Failed to add snapshot {} to S3 queue", path);
+
+        return;
+    }
+
+    uploadSnapshotImpl(path);
+}
+
+void KeeperSnapshotManagerS3::startup(const Poco::Util::AbstractConfiguration & config)
+{
+    updateS3Configuration(config);
+    snapshot_s3_thread = ThreadFromGlobalPool([this] { snapshotS3Thread(); });
+}
+
+void KeeperSnapshotManagerS3::shutdown()
+{
+    if (shutdown_called)
+        return;
+
+    LOG_DEBUG(log, "Shutting down KeeperSnapshotManagerS3");
+    shutdown_called = true;
+
+    try
+    {
+        snapshots_s3_queue.finish();
+        if (snapshot_s3_thread.joinable())
+            snapshot_s3_thread.join();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+
+    LOG_INFO(log, "KeeperSnapshotManagerS3 shut down");
+}
+
+}
+
+#endif
diff --git a/src/Coordination/KeeperSnapshotManagerS3.h b/src/Coordination/KeeperSnapshotManagerS3.h
new file mode 100644
index 00000000000..5b62d114aae
--- /dev/null
+++ b/src/Coordination/KeeperSnapshotManagerS3.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "config.h"
+
+#include <Poco/Util/AbstractConfiguration.h>
+
+#if USE_AWS_S3
+#include <Common/ConcurrentBoundedQueue.h>
+#include <Common/ThreadPool.h>
+#include <Common/logger_useful.h>
+
+#include <string>
+#endif
+
+namespace DB
+{
+
+#if USE_AWS_S3
+class KeeperSnapshotManagerS3
+{
+public:
+    KeeperSnapshotManagerS3();
+
+    void updateS3Configuration(const Poco::Util::AbstractConfiguration & config);
+    void uploadSnapshot(const std::string & path, bool async_upload = true);
+
+    void startup(const Poco::Util::AbstractConfiguration & config);
+    void shutdown();
+private:
+    using SnapshotS3Queue = ConcurrentBoundedQueue<std::string>;
+    SnapshotS3Queue snapshots_s3_queue;
+
+    /// Upload new snapshots to S3
+    ThreadFromGlobalPool snapshot_s3_thread;
+
+    struct S3Configuration;
+    mutable std::mutex snapshot_s3_client_mutex;
+    std::shared_ptr<S3Configuration> snapshot_s3_client;
+
+    std::atomic<bool> shutdown_called{false};
+
+    Poco::Logger * log;
+
+    UUID uuid;
+
+    std::shared_ptr<S3Configuration> getSnapshotS3Client() const;
+
+    void uploadSnapshotImpl(const std::string & snapshot_path);
+
+    /// Thread upload snapshots to S3 in the background
+    void snapshotS3Thread();
+};
+#else
+class KeeperSnapshotManagerS3
+{
+public:
+    KeeperSnapshotManagerS3() = default;
+
+    void updateS3Configuration(const Poco::Util::AbstractConfiguration &) {}
+    void uploadSnapshot(const std::string &, [[maybe_unused]] bool async_upload = true) {}
+
+    void startup(const Poco::Util::AbstractConfiguration &) {}
+
+    void shutdown() {}
+};
+#endif
+
+}
diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp
index c5a66ce29ca..ee5bfa48357 100644
--- a/src/Coordination/KeeperStateMachine.cpp
+++ b/src/Coordination/KeeperStateMachine.cpp
@@ -44,6 +44,7 @@ KeeperStateMachine::KeeperStateMachine(
     const std::string & snapshots_path_,
     const CoordinationSettingsPtr & coordination_settings_,
     const KeeperContextPtr & keeper_context_,
+    KeeperSnapshotManagerS3 * snapshot_manager_s3_,
     const std::string & superdigest_)
     : coordination_settings(coordination_settings_)
     , snapshot_manager(
@@ -59,6 +60,7 @@ KeeperStateMachine::KeeperStateMachine(
     , log(&Poco::Logger::get("KeeperStateMachine"))
     , superdigest(superdigest_)
     , keeper_context(keeper_context_)
+    , snapshot_manager_s3(snapshot_manager_s3_)
 {
 }
 
@@ -400,13 +402,22 @@ void KeeperStateMachine::create_snapshot(nuraft::snapshot & s, nuraft::async_res
         }
 
         when_done(ret, exception);
+
+        return ret ? latest_snapshot_path : "";
     };
 
 
     if (keeper_context->server_state == KeeperContext::Phase::SHUTDOWN)
     {
         LOG_INFO(log, "Creating a snapshot during shutdown because 'create_snapshot_on_exit' is enabled.");
-        snapshot_task.create_snapshot(std::move(snapshot_task.snapshot));
+        auto snapshot_path = snapshot_task.create_snapshot(std::move(snapshot_task.snapshot));
+
+        if (!snapshot_path.empty() && snapshot_manager_s3)
+        {
+            LOG_INFO(log, "Uploading snapshot {} during shutdown because 'upload_snapshot_on_exit' is enabled.", snapshot_path);
+            snapshot_manager_s3->uploadSnapshot(snapshot_path, /* asnyc_upload */ false);
+        }
+
         return;
     }
 
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
index fbd4fdc5ac2..ffc7fce1cfe 100644
--- a/src/Coordination/KeeperStateMachine.h
+++ b/src/Coordination/KeeperStateMachine.h
@@ -2,11 +2,13 @@
 
 #include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperSnapshotManager.h>
+#include <Coordination/KeeperSnapshotManagerS3.h>
+#include <Coordination/KeeperContext.h>
 #include <Coordination/KeeperStorage.h>
+
 #include <libnuraft/nuraft.hxx>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/logger_useful.h>
-#include <Coordination/KeeperContext.h>
 
 
 namespace DB
@@ -26,6 +28,7 @@ public:
         const std::string & snapshots_path_,
         const CoordinationSettingsPtr & coordination_settings_,
         const KeeperContextPtr & keeper_context_,
+        KeeperSnapshotManagerS3 * snapshot_manager_s3_,
         const std::string & superdigest_ = "");
 
     /// Read state from the latest snapshot
@@ -146,6 +149,8 @@ private:
     const std::string superdigest;
 
     KeeperContextPtr keeper_context;
+
+    KeeperSnapshotManagerS3 * snapshot_manager_s3;
 };
 
 }
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index a30a32b5735..875dccfd705 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -922,7 +922,7 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
         stat.version = 0;
         stat.aversion = 0;
         stat.cversion = 0;
-        stat.dataLength = request.data.length();
+        stat.dataLength = static_cast<Int32>(request.data.length());
         stat.ephemeralOwner = request.is_ephemeral ? session_id : 0;
 
         new_deltas.emplace_back(
@@ -1222,7 +1222,7 @@ struct KeeperStorageSetRequestProcessor final : public KeeperStorageRequestProce
                     value.stat.version++;
                     value.stat.mzxid = zxid;
                     value.stat.mtime = time;
-                    value.stat.dataLength = data.length();
+                    value.stat.dataLength = static_cast<Int32>(data.length());
                     value.setData(data);
                 },
                 request.version});
diff --git a/src/Coordination/SummingStateMachine.cpp b/src/Coordination/SummingStateMachine.cpp
index ae3d2b06d75..4151b727744 100644
--- a/src/Coordination/SummingStateMachine.cpp
+++ b/src/Coordination/SummingStateMachine.cpp
@@ -71,10 +71,10 @@ void SummingStateMachine::createSnapshotInternal(nuraft::snapshot & s)
     snapshots[s.get_last_log_idx()] = ctx;
 
     // Maintain last 3 snapshots only.
-    int num = snapshots.size();
+    ssize_t num = snapshots.size();
     auto entry = snapshots.begin();
 
-    for (int ii = 0; ii < num - MAX_SNAPSHOTS; ++ii)
+    for (ssize_t ii = 0; ii < num - MAX_SNAPSHOTS; ++ii)
     {
         if (entry == snapshots.end())
             break;
diff --git a/src/Coordination/ZooKeeperDataReader.cpp b/src/Coordination/ZooKeeperDataReader.cpp
index 6702c4cc718..3b803c18dbf 100644
--- a/src/Coordination/ZooKeeperDataReader.cpp
+++ b/src/Coordination/ZooKeeperDataReader.cpp
@@ -119,7 +119,7 @@ int64_t deserializeStorageData(KeeperStorage & storage, ReadBuffer & in, Poco::L
         Coordination::read(node.stat.pzxid, in);
         if (!path.empty())
         {
-            node.stat.dataLength = node.getData().length();
+            node.stat.dataLength = static_cast<Int32>(node.getData().length());
             node.seq_num = node.stat.cversion;
             storage.container.insertOrReplace(path, node);
 
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index 5bb1ecc7c85..fa4c42dd82a 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -941,7 +941,7 @@ TEST_P(CoordinationTest, SnapshotableHashMapTrySnapshot)
     EXPECT_EQ(itr->active_in_map, true);
     itr = std::next(itr);
     EXPECT_EQ(itr, map_snp.end());
-    for (size_t i = 0; i < 5; ++i)
+    for (int i = 0; i < 5; ++i)
     {
         EXPECT_TRUE(map_snp.insert("/hello" + std::to_string(i), i).second);
     }
@@ -1318,7 +1318,7 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
 
     ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
-    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings, keeper_context);
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings, keeper_context, nullptr);
     state_machine->init();
     DB::KeeperLogStore changelog("./logs", settings->rotate_log_storage_interval, true, enable_compression);
     changelog.init(state_machine->last_commit_index() + 1, settings->reserved_log_items);
@@ -1359,7 +1359,7 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
     }
 
     SnapshotsQueue snapshots_queue1{1};
-    auto restore_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue1, "./snapshots", settings, keeper_context);
+    auto restore_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue1, "./snapshots", settings, keeper_context, nullptr);
     restore_machine->init();
     EXPECT_EQ(restore_machine->last_commit_index(), total_logs - total_logs % settings->snapshot_distance);
 
@@ -1471,7 +1471,7 @@ TEST_P(CoordinationTest, TestEphemeralNodeRemove)
 
     ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
-    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings, keeper_context);
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings, keeper_context, nullptr);
     state_machine->init();
 
     std::shared_ptr<ZooKeeperCreateRequest> request_c = std::make_shared<ZooKeeperCreateRequest>();
@@ -1982,7 +1982,7 @@ TEST_P(CoordinationTest, TestListRequestTypes)
 
     KeeperStorage storage{500, "", keeper_context};
 
-    int64_t zxid = 0;
+    int32_t zxid = 0;
 
     static constexpr std::string_view test_path = "/list_request_type/node";
 
diff --git a/src/Core/DecimalComparison.h b/src/Core/DecimalComparison.h
index 530722a2519..953c98f80b4 100644
--- a/src/Core/DecimalComparison.h
+++ b/src/Core/DecimalComparison.h
@@ -230,7 +230,7 @@ private:
         if constexpr (is_decimal<B>)
             y = b.value;
         else
-            y = b;
+            y = static_cast<CompareInt>(b);
 
         if constexpr (_check_overflow)
         {
diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h
index 0f2158fb83b..263f78af5cc 100644
--- a/src/Core/DecimalFunctions.h
+++ b/src/Core/DecimalFunctions.h
@@ -241,7 +241,7 @@ inline DecimalComponents<DecimalType> split(const DecimalType & decimal, UInt32
  * If scale is to big, result is undefined.
  */
 template <typename DecimalType>
-inline typename DecimalType::NativeType getWholePart(const DecimalType & decimal, size_t scale)
+inline typename DecimalType::NativeType getWholePart(const DecimalType & decimal, UInt32 scale)
 {
     if (scale == 0)
         return decimal.value;
@@ -273,7 +273,7 @@ inline typename DecimalType::NativeType getFractionalPartWithScaleMultiplier(
  * If scale is to big, result is undefined.
  */
 template <typename DecimalType>
-inline typename DecimalType::NativeType getFractionalPart(const DecimalType & decimal, size_t scale)
+inline typename DecimalType::NativeType getFractionalPart(const DecimalType & decimal, UInt32 scale)
 {
     if (scale == 0)
         return 0;
@@ -283,7 +283,7 @@ inline typename DecimalType::NativeType getFractionalPart(const DecimalType & de
 
 /// Decimal to integer/float conversion
 template <typename To, typename DecimalType, typename ReturnType>
-ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
+ReturnType convertToImpl(const DecimalType & decimal, UInt32 scale, To & result)
 {
     using DecimalNativeType = typename DecimalType::NativeType;
     static constexpr bool throw_exception = std::is_void_v<ReturnType>;
@@ -334,7 +334,7 @@ ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
 
 
 template <typename To, typename DecimalType>
-To convertTo(const DecimalType & decimal, size_t scale)
+To convertTo(const DecimalType & decimal, UInt32 scale)
 {
     To result;
     convertToImpl<To, DecimalType, void>(decimal, scale, result);
@@ -342,7 +342,7 @@ To convertTo(const DecimalType & decimal, size_t scale)
 }
 
 template <typename To, typename DecimalType>
-bool tryConvertTo(const DecimalType & decimal, size_t scale, To & result)
+bool tryConvertTo(const DecimalType & decimal, UInt32 scale, To & result)
 {
     return convertToImpl<To, DecimalType, bool>(decimal, scale, result);
 }
diff --git a/src/Core/MySQL/MySQLReplication.cpp b/src/Core/MySQL/MySQLReplication.cpp
index 87566eade54..6f3ac1b40e9 100644
--- a/src/Core/MySQL/MySQLReplication.cpp
+++ b/src/Core/MySQL/MySQLReplication.cpp
@@ -161,7 +161,7 @@ namespace MySQLReplication
     /// https://dev.mysql.com/doc/internals/en/table-map-event.html
     void TableMapEvent::parseImpl(ReadBuffer & payload)
     {
-        column_count = readLengthEncodedNumber(payload);
+        column_count = static_cast<UInt32>(readLengthEncodedNumber(payload));
         for (auto i = 0U; i < column_count; ++i)
         {
             UInt8 v = 0x00;
@@ -283,7 +283,7 @@ namespace MySQLReplication
 
     void RowsEvent::parseImpl(ReadBuffer & payload)
     {
-        number_columns = readLengthEncodedNumber(payload);
+        number_columns = static_cast<UInt32>(readLengthEncodedNumber(payload));
         size_t columns_bitmap_size = (number_columns + 7) / 8;
         switch (header.type)
         {
@@ -494,7 +494,7 @@ namespace MySQLReplication
                                 readBigEndianStrict(payload, reinterpret_cast<char *>(&uintpart), 6);
                                 intpart = uintpart - 0x800000000000L;
                                 ltime = intpart;
-                                frac = std::abs(intpart % (1L << 24));
+                                frac = static_cast<Int32>(std::abs(intpart % (1L << 24)));
                                 break;
                             }
                             default:
@@ -536,7 +536,7 @@ namespace MySQLReplication
                         readBigEndianStrict(payload, reinterpret_cast<char *>(&val), 5);
                         readTimeFractionalPart(payload, fsp, meta);
 
-                        UInt32 year_month = readBits(val, 1, 17, 40);
+                        UInt32 year_month = static_cast<UInt32>(readBits(val, 1, 17, 40));
                         time_t date_time = DateLUT::instance().makeDateTime(
                             year_month / 13, year_month % 13, readBits(val, 18, 5, 40)
                             , readBits(val, 23, 5, 40), readBits(val, 28, 6, 40), readBits(val, 34, 6, 40)
@@ -625,7 +625,7 @@ namespace MySQLReplication
                                 {
                                     UInt32 val = 0;
                                     readBigEndianStrict(payload, reinterpret_cast<char *>(&val), 4);
-                                    res *= intExp10OfSize<DecimalType>(digits_per_integer);
+                                    res *= intExp10OfSize<typename DecimalType::NativeType>(static_cast<int>(digits_per_integer));
                                     res += (val ^ mask);
                                 }
                             }
@@ -638,7 +638,7 @@ namespace MySQLReplication
                                 {
                                     UInt32 val = 0;
                                     readBigEndianStrict(payload, reinterpret_cast<char *>(&val), 4);
-                                    res *= intExp10OfSize<DecimalType>(digits_per_integer);
+                                    res *= intExp10OfSize<typename DecimalType::NativeType>(static_cast<int>(digits_per_integer));
                                     res += (val ^ mask);
                                 }
 
@@ -651,7 +651,7 @@ namespace MySQLReplication
                                     if (to_read) //-V547
                                     {
                                         readBigEndianStrict(payload, reinterpret_cast<char *>(&val), to_read);
-                                        res *= intExp10OfSize<DecimalType>(compressed_decimals);
+                                        res *= intExp10OfSize<typename DecimalType::NativeType>(static_cast<int>(compressed_decimals));
                                         res += (val ^ (mask & compressed_integer_align_numbers[compressed_decimals]));
                                     }
                                 }
diff --git a/src/Core/MySQL/PacketsReplication.cpp b/src/Core/MySQL/PacketsReplication.cpp
index ec5e8868cc5..74c6ca2d81f 100644
--- a/src/Core/MySQL/PacketsReplication.cpp
+++ b/src/Core/MySQL/PacketsReplication.cpp
@@ -57,7 +57,7 @@ void BinlogDumpGTID::writePayloadImpl(WriteBuffer & buffer) const
     const UInt64 position = 4;
     buffer.write(reinterpret_cast<const char *>(&position), 8);
 
-    UInt32 gtid_size = gtid_datas.size();
+    UInt32 gtid_size = static_cast<UInt32>(gtid_datas.size());
     buffer.write(reinterpret_cast<const char *>(&gtid_size), 4);
     buffer.write(gtid_datas.data(), gtid_datas.size());
 }
diff --git a/src/Core/PostgreSQL/insertPostgreSQLValue.cpp b/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
index 61a0a91ab2e..e5f3a0f91c3 100644
--- a/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
+++ b/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
@@ -100,7 +100,7 @@ void insertPostgreSQLValue(
             readDateTimeText(time, in, assert_cast<const DataTypeDateTime *>(data_type.get())->getTimeZone());
             if (time < 0)
                 time = 0;
-            assert_cast<ColumnUInt32 &>(column).insertValue(time);
+            assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(time));
             break;
         }
         case ExternalResultDescription::ValueType::vtDateTime64:
diff --git a/src/Core/PostgreSQLProtocol.h b/src/Core/PostgreSQLProtocol.h
index 908518eff5e..994494fc92f 100644
--- a/src/Core/PostgreSQLProtocol.h
+++ b/src/Core/PostgreSQLProtocol.h
@@ -336,7 +336,12 @@ public:
     Int32 size() const override
     {
         // message length part + (1 + sizes of other fields + 1) + null byte in the end of the message
-        return 4 + (1 + enum_to_string[severity].size() + 1) + (1 + sql_state.size() + 1) + (1 + message.size() + 1) + 1;
+        return static_cast<Int32>(
+            4 +
+            (1 + enum_to_string[severity].size() + 1) +
+            (1 + sql_state.size() + 1) +
+            (1 + message.size() + 1) +
+            1);
     }
 
     MessageType getMessageType() const override
@@ -518,7 +523,7 @@ public:
 
     Int32 size() const override
     {
-        return 4 + name.size() + 1 + value.size() + 1;
+        return static_cast<Int32>(4 + name.size() + 1 + value.size() + 1);
     }
 
     MessageType getMessageType() const override
@@ -633,7 +638,7 @@ public:
         // + object ID of the table (Int32 and always zero) + attribute number of the column (Int16 and always zero)
         // + type object id (Int32) + data type size (Int16)
         // + type modifier (Int32 and always -1) + format code (Int16)
-        return (name.size() + 1) + 4 + 2 + 4 + 2 + 4 + 2;
+        return static_cast<Int32>((name.size() + 1) + 4 + 2 + 4 + 2 + 4 + 2);
     }
 };
 
@@ -682,7 +687,7 @@ public:
 
     Int32 size() const override
     {
-        return str.size();
+        return static_cast<Int32>(str.size());
     }
 };
 
@@ -762,7 +767,7 @@ public:
 
     Int32 size() const override
     {
-        return 4 + value.size() + 1;
+        return static_cast<Int32>(4 + value.size() + 1);
     }
 
     MessageType getMessageType() const override
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 1f784497b34..0b8d24b1abc 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -84,7 +84,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     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, 16*1024*1024, "The minimum size of part to upload during multipart upload to S3.", 0) \
     M(UInt64, s3_upload_part_size_multiply_factor, 2, "Multiply s3_min_upload_part_size by this factor each time s3_multiply_parts_count_threshold parts were uploaded from a single write to S3.", 0) \
-    M(UInt64, s3_upload_part_size_multiply_parts_count_threshold, 1000, "Each time this number of parts was uploaded to S3 s3_min_upload_part_size multiplied by s3_upload_part_size_multiply_factor.", 0) \
+    M(UInt64, s3_upload_part_size_multiply_parts_count_threshold, 500, "Each time this number of parts was uploaded to S3 s3_min_upload_part_size multiplied by s3_upload_part_size_multiply_factor.", 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_unexpected_write_error_retries, 4, "The maximum number of retries in case of unexpected errors during S3 write.", 0) \
@@ -331,8 +331,8 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(UInt64, max_bytes_before_remerge_sort, 1000000000, "In case of ORDER BY with LIMIT, when memory usage is higher than specified threshold, perform additional steps of merging blocks before final merge to keep just top LIMIT rows.", 0) \
     M(Float, remerge_sort_lowered_memory_bytes_ratio, 2., "If memory usage after remerge does not reduced by this ratio, remerge will be disabled.", 0) \
     \
-    M(UInt64, max_result_rows, 0, "Limit on result size in rows. Also checked for intermediate data sent from remote servers.", 0) \
-    M(UInt64, max_result_bytes, 0, "Limit on result size in bytes (uncompressed). Also checked for intermediate data sent from remote servers.", 0) \
+    M(UInt64, max_result_rows, 0, "Limit on result size in rows. The query will stop after processing a block of data if the threshold is met, but it will not cut the last block of the result, therefore the result size can be larger than the threshold.", 0) \
+    M(UInt64, max_result_bytes, 0, "Limit on result size in bytes (uncompressed).  The query will stop after processing a block of data if the threshold is met, but it will not cut the last block of the result, therefore the result size can be larger than the threshold. Caveats: the result size in memory is taken into account for this threshold. Even if the result size is small, it can reference larger data structures in memory, representing dictionaries of LowCardinality columns, and Arenas of AggregateFunction columns, so the threshold can be exceeded despite the small result size. The setting is fairly low level and should be used with caution.", 0) \
     M(OverflowMode, result_overflow_mode, OverflowMode::THROW, "What to do when the limit is exceeded.", 0) \
     \
     /* TODO: Check also when merging and finalizing aggregate functions. */ \
diff --git a/src/Core/tests/gtest_DecimalFunctions.cpp b/src/Core/tests/gtest_DecimalFunctions.cpp
index 1712785488e..08f25ddd97c 100644
--- a/src/Core/tests/gtest_DecimalFunctions.cpp
+++ b/src/Core/tests/gtest_DecimalFunctions.cpp
@@ -17,18 +17,13 @@ struct DecimalUtilsSplitAndCombineTestParam
     DecimalUtils::DecimalComponents<Decimal64> components;
 };
 
-std::ostream & operator << (std::ostream & ostr, const DecimalUtilsSplitAndCombineTestParam & param)
-{
-    return ostr << param.description;
-}
-
 class DecimalUtilsSplitAndCombineTest : public ::testing::TestWithParam<DecimalUtilsSplitAndCombineTestParam>
 {};
 
 template <typename DecimalType>
 void testSplit(const DecimalUtilsSplitAndCombineTestParam & param)
 {
-    const DecimalType decimal_value = param.decimal_value;
+    const DecimalType decimal_value(static_cast<typename DecimalType::NativeType>(param.decimal_value.value));
     const auto & actual_components = DecimalUtils::split(decimal_value, param.scale);
 
     EXPECT_EQ(param.components.whole, actual_components.whole);
@@ -39,21 +34,28 @@ template <typename DecimalType>
 void testDecimalFromComponents(const DecimalUtilsSplitAndCombineTestParam & param)
 {
     EXPECT_EQ(param.decimal_value,
-              DecimalUtils::decimalFromComponents<DecimalType>(param.components.whole, param.components.fractional, param.scale));
+              DecimalUtils::decimalFromComponents<DecimalType>(
+                  static_cast<typename DecimalType::NativeType>(param.components.whole),
+                  static_cast<typename DecimalType::NativeType>(param.components.fractional),
+                  param.scale));
 }
 
 template <typename DecimalType>
 void testGetWhole(const DecimalUtilsSplitAndCombineTestParam & param)
 {
     EXPECT_EQ(param.components.whole,
-              DecimalUtils::getWholePart(DecimalType{param.decimal_value}, param.scale));
+              DecimalUtils::getWholePart(
+                  DecimalType{static_cast<typename DecimalType::NativeType>(param.decimal_value.value)},
+                  param.scale));
 }
 
 template <typename DecimalType>
 void testGetFractional(const DecimalUtilsSplitAndCombineTestParam & param)
 {
     EXPECT_EQ(param.components.fractional,
-              DecimalUtils::getFractionalPart(DecimalType{param.decimal_value}, param.scale));
+              DecimalUtils::getFractionalPart(
+                  DecimalType{static_cast<typename DecimalType::NativeType>(param.decimal_value.value)},
+                  param.scale));
 }
 
 // Unfortunately typed parametrized tests () are not supported in this version of gtest, so I have to emulate by hand.
@@ -144,6 +146,17 @@ TEST_P(DecimalUtilsSplitAndCombineForDateTime64Test, getFractionalPartDateTime64
 
 }
 
+namespace std // NOLINT(cert-dcl58-cpp)
+{
+
+std::ostream & operator << (std::ostream & ostr, const DecimalUtilsSplitAndCombineTestParam & param) // NOLINT(cert-dcl58-cpp)
+{
+    return ostr << param.description;
+}
+
+}
+
+
 // Intentionally small values that fit into 32-bit in order to cover Decimal32, Decimal64 and Decimal128 with single set of data.
 INSTANTIATE_TEST_SUITE_P(Basic,
     DecimalUtilsSplitAndCombineTest,
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index 2dddfd6874a..758f85e688f 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -575,7 +575,8 @@ void BaseDaemon::closeFDs()
     {
         int max_fd = -1;
 #if defined(_SC_OPEN_MAX)
-        max_fd = sysconf(_SC_OPEN_MAX);
+        // fd cannot be > INT_MAX
+        max_fd = static_cast<int>(sysconf(_SC_OPEN_MAX));
         if (max_fd == -1)
 #endif
             max_fd = 256; /// bad fallback
diff --git a/src/Daemon/SentryWriter.cpp b/src/Daemon/SentryWriter.cpp
index a6033af6fe3..bb330162818 100644
--- a/src/Daemon/SentryWriter.cpp
+++ b/src/Daemon/SentryWriter.cpp
@@ -189,7 +189,7 @@ void SentryWriter::onFault(int sig, const std::string & error_message, const Sta
                     sentry_value_set_by_key(sentry_frame, "filename", sentry_value_new_string(current_frame.file.value().c_str()));
 
                 if (current_frame.line.has_value())
-                    sentry_value_set_by_key(sentry_frame, "lineno", sentry_value_new_int32(current_frame.line.value()));
+                    sentry_value_set_by_key(sentry_frame, "lineno", sentry_value_new_int32(static_cast<int32_t>(current_frame.line.value())));
 
                 sentry_value_append(sentry_frames, sentry_frame);
             }
diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
index 8c0f0b95025..7056fcff42f 100644
--- a/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -10,6 +10,7 @@
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/Serializations/SerializationAggregateFunction.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/transformTypesRecursively.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 
@@ -241,6 +242,23 @@ static DataTypePtr create(const ASTPtr & arguments)
     return std::make_shared<DataTypeAggregateFunction>(function, argument_types, params_row, version);
 }
 
+void setVersionToAggregateFunctions(DataTypePtr & type, bool if_empty, std::optional<size_t> revision)
+{
+    auto callback = [revision, if_empty](DataTypePtr & column_type)
+    {
+        const auto * aggregate_function_type = typeid_cast<const DataTypeAggregateFunction *>(column_type.get());
+        if (aggregate_function_type && aggregate_function_type->isVersioned())
+        {
+            if (revision)
+                aggregate_function_type->updateVersionFromRevision(*revision, if_empty);
+            else
+                aggregate_function_type->setVersion(0, if_empty);
+        }
+    };
+
+    callOnNestedSimpleTypes(type, callback);
+}
+
 
 void registerDataTypeAggregateFunction(DataTypeFactory & factory)
 {
diff --git a/src/DataTypes/DataTypeAggregateFunction.h b/src/DataTypes/DataTypeAggregateFunction.h
index 39fbfb62917..4a92e6c5703 100644
--- a/src/DataTypes/DataTypeAggregateFunction.h
+++ b/src/DataTypes/DataTypeAggregateFunction.h
@@ -70,8 +70,6 @@ public:
 
     bool isVersioned() const { return function->isVersioned(); }
 
-    size_t getVersionFromRevision(size_t revision) const { return function->getVersionFromRevision(revision); }
-
     /// Version is not empty only if it was parsed from AST or implicitly cast to 0 or version according
     /// to server revision.
     /// It is ok to have an empty version value here - then for serialization a default (latest)
@@ -84,6 +82,13 @@ public:
 
         version = version_;
     }
+
+    void updateVersionFromRevision(size_t revision, bool if_empty) const
+    {
+        setVersion(function->getVersionFromRevision(revision), if_empty);
+    }
 };
 
+void setVersionToAggregateFunctions(DataTypePtr & type, bool if_empty, std::optional<size_t> revision = std::nullopt);
+
 }
diff --git a/src/DataTypes/DataTypeEnum.cpp b/src/DataTypes/DataTypeEnum.cpp
index c58e186b980..aab328eaa33 100644
--- a/src/DataTypes/DataTypeEnum.cpp
+++ b/src/DataTypes/DataTypeEnum.cpp
@@ -102,7 +102,7 @@ bool DataTypeEnum<Type>::textCanContainOnlyValidUTF8() const
             if (pos + length > end)
                 return false;
 
-            if (Poco::UTF8Encoding::isLegal(reinterpret_cast<const unsigned char *>(pos), length))
+            if (Poco::UTF8Encoding::isLegal(reinterpret_cast<const unsigned char *>(pos), static_cast<int>(length)))
                 pos += length;
             else
                 return false;
diff --git a/src/DataTypes/Native.h b/src/DataTypes/Native.h
index 40086b14a0c..9782c5d64e9 100644
--- a/src/DataTypes/Native.h
+++ b/src/DataTypes/Native.h
@@ -224,7 +224,7 @@ static inline std::pair<llvm::Value *, llvm::Value *> nativeCastToCommon(llvm::I
         size_t rhs_bit_width = rhs->getType()->getIntegerBitWidth() + (!rhs_is_signed && lhs_is_signed);
 
         size_t max_bit_width = std::max(lhs_bit_width, rhs_bit_width);
-        common = b.getIntNTy(max_bit_width);
+        common = b.getIntNTy(static_cast<unsigned>(max_bit_width));
     }
     else
     {
diff --git a/src/DataTypes/Serializations/SerializationDate.cpp b/src/DataTypes/Serializations/SerializationDate.cpp
index 60db191a9dc..678817017e0 100644
--- a/src/DataTypes/Serializations/SerializationDate.cpp
+++ b/src/DataTypes/Serializations/SerializationDate.cpp
@@ -76,9 +76,9 @@ void SerializationDate::serializeTextCSV(const IColumn & column, size_t row_num,
 
 void SerializationDate::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
-    LocalDate value;
+    DayNum value;
     readCSV(value, istr);
-    assert_cast<ColumnUInt16 &>(column).getData().push_back(value.getDayNum());
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(value);
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationDateTime.cpp b/src/DataTypes/Serializations/SerializationDateTime.cpp
index fd56c1baebd..7238d3ce190 100644
--- a/src/DataTypes/Serializations/SerializationDateTime.cpp
+++ b/src/DataTypes/Serializations/SerializationDateTime.cpp
@@ -75,7 +75,7 @@ void SerializationDateTime::deserializeTextEscaped(IColumn & column, ReadBuffer
     readText(x, istr, settings, time_zone, utc_time_zone);
     if (x < 0)
         x = 0;
-    assert_cast<ColumnType &>(column).getData().push_back(x);
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
 }
 
 void SerializationDateTime::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -99,7 +99,9 @@ void SerializationDateTime::deserializeTextQuoted(IColumn & column, ReadBuffer &
     }
     if (x < 0)
         x = 0;
-    assert_cast<ColumnType &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+
+    /// It's important to do this at the end - for exception safety.
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
 }
 
 void SerializationDateTime::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -123,7 +125,7 @@ void SerializationDateTime::deserializeTextJSON(IColumn & column, ReadBuffer & i
     }
     if (x < 0)
         x = 0;
-    assert_cast<ColumnType &>(column).getData().push_back(x);
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
 }
 
 void SerializationDateTime::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -153,7 +155,7 @@ void SerializationDateTime::deserializeTextCSV(IColumn & column, ReadBuffer & is
     if (x < 0)
         x = 0;
 
-    assert_cast<ColumnType &>(column).getData().push_back(x);
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationInfoTuple.cpp b/src/DataTypes/Serializations/SerializationInfoTuple.cpp
index d0fa5572a48..6c326743e8a 100644
--- a/src/DataTypes/Serializations/SerializationInfoTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationInfoTuple.cpp
@@ -124,7 +124,7 @@ void SerializationInfoTuple::fromJSON(const Poco::JSON::Object & object)
             "Expected: {}, got: {}", elems.size(), subcolumns->size());
 
     for (size_t i = 0; i < elems.size(); ++i)
-        elems[i]->fromJSON(*subcolumns->getObject(i));
+        elems[i]->fromJSON(*subcolumns->getObject(static_cast<unsigned>(i)));
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.cpp b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
index dfe0188c8e7..761adf3b765 100644
--- a/src/DataTypes/Serializations/SerializationLowCardinality.cpp
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
@@ -385,13 +385,13 @@ namespace
                 }
                 else if (map[val] == 0 && val != zero_pos_value)
                 {
-                    map[val] = cur_pos;
+                    map[val] = static_cast<T>(cur_pos);
                     ++cur_pos;
                 }
             }
             else
             {
-                T shifted_val = val - dict_size;
+                T shifted_val = static_cast<T>(val - dict_size);
                 if (cur_overflowed_pos == 0)
                 {
                     zero_pos_overflowed_value = shifted_val;
@@ -399,7 +399,7 @@ namespace
                 }
                 else if (overflow_map[shifted_val] == 0 && shifted_val != zero_pos_overflowed_value)
                 {
-                    overflow_map[shifted_val] = cur_overflowed_pos;
+                    overflow_map[shifted_val] = static_cast<T>(cur_overflowed_pos);
                     ++cur_overflowed_pos;
                 }
             }
@@ -429,7 +429,7 @@ namespace
             if (val < dict_size)
                 val = map[val];
             else
-                val = overflow_map[val - dict_size] + cur_pos;
+                val = overflow_map[val - dict_size] + static_cast<T>(cur_pos);
         }
 
         return {std::move(dictionary_map), std::move(additional_keys_map)};
diff --git a/src/DataTypes/getLeastSupertype.cpp b/src/DataTypes/getLeastSupertype.cpp
index fee3cf1553e..82c8cadc6a1 100644
--- a/src/DataTypes/getLeastSupertype.cpp
+++ b/src/DataTypes/getLeastSupertype.cpp
@@ -447,8 +447,8 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
     /// For String and FixedString, or for different FixedStrings, the common type is String.
     /// No other types are compatible with Strings. TODO Enums?
     {
-        UInt32 have_string = type_ids.count(TypeIndex::String);
-        UInt32 have_fixed_string = type_ids.count(TypeIndex::FixedString);
+        size_t have_string = type_ids.count(TypeIndex::String);
+        size_t have_fixed_string = type_ids.count(TypeIndex::FixedString);
 
         if (have_string || have_fixed_string)
         {
@@ -462,10 +462,10 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
 
     /// For Date and DateTime/DateTime64, the common type is DateTime/DateTime64. No other types are compatible.
     {
-        UInt32 have_date = type_ids.count(TypeIndex::Date);
-        UInt32 have_date32 = type_ids.count(TypeIndex::Date32);
-        UInt32 have_datetime = type_ids.count(TypeIndex::DateTime);
-        UInt32 have_datetime64 = type_ids.count(TypeIndex::DateTime64);
+        size_t have_date = type_ids.count(TypeIndex::Date);
+        size_t have_date32 = type_ids.count(TypeIndex::Date32);
+        size_t have_datetime = type_ids.count(TypeIndex::DateTime);
+        size_t have_datetime64 = type_ids.count(TypeIndex::DateTime64);
 
         if (have_date || have_date32 || have_datetime || have_datetime64)
         {
@@ -526,26 +526,24 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
 
     /// Decimals
     {
-        UInt32 have_decimal32 = type_ids.count(TypeIndex::Decimal32);
-        UInt32 have_decimal64 = type_ids.count(TypeIndex::Decimal64);
-        UInt32 have_decimal128 = type_ids.count(TypeIndex::Decimal128);
+        size_t have_decimal32 = type_ids.count(TypeIndex::Decimal32);
+        size_t have_decimal64 = type_ids.count(TypeIndex::Decimal64);
+        size_t have_decimal128 = type_ids.count(TypeIndex::Decimal128);
 
         if (have_decimal32 || have_decimal64 || have_decimal128)
         {
-            UInt32 num_supported = have_decimal32 + have_decimal64 + have_decimal128;
+            size_t num_supported = have_decimal32 + have_decimal64 + have_decimal128;
 
             std::vector<TypeIndex> int_ids = {TypeIndex::Int8, TypeIndex::UInt8, TypeIndex::Int16, TypeIndex::UInt16,
-                                            TypeIndex::Int32, TypeIndex::UInt32, TypeIndex::Int64, TypeIndex::UInt64};
-            std::vector<UInt32> num_ints(int_ids.size(), 0);
+                                              TypeIndex::Int32, TypeIndex::UInt32, TypeIndex::Int64, TypeIndex::UInt64};
 
             TypeIndex max_int = TypeIndex::Nothing;
-            for (size_t i = 0; i < int_ids.size(); ++i)
+            for (auto int_id : int_ids)
             {
-                UInt32 num = type_ids.count(int_ids[i]);
-                num_ints[i] = num;
+                size_t num = type_ids.count(int_id);
                 num_supported += num;
                 if (num)
-                    max_int = int_ids[i];
+                    max_int = int_id;
             }
 
             if (num_supported != type_ids.size())
diff --git a/src/DataTypes/transformTypesRecursively.cpp b/src/DataTypes/transformTypesRecursively.cpp
index 3544c7e477d..57128966565 100644
--- a/src/DataTypes/transformTypesRecursively.cpp
+++ b/src/DataTypes/transformTypesRecursively.cpp
@@ -175,4 +175,10 @@ void transformTypesRecursively(DataTypes & types, std::function<void(DataTypes &
     transform_simple_types(types);
 }
 
+void callOnNestedSimpleTypes(DataTypePtr & type, std::function<void(DataTypePtr &)> callback)
+{
+    DataTypes types = {type};
+    transformTypesRecursively(types, [callback](auto & data_types){ callback(data_types[0]); }, {});
+}
+
 }
diff --git a/src/DataTypes/transformTypesRecursively.h b/src/DataTypes/transformTypesRecursively.h
index 5cb8f095494..54e6f2102ad 100644
--- a/src/DataTypes/transformTypesRecursively.h
+++ b/src/DataTypes/transformTypesRecursively.h
@@ -14,4 +14,6 @@ namespace DB
 /// Function transform_complex_types will be applied to complex types (Array/Map/Tuple) after recursive call to their nested types.
 void transformTypesRecursively(DataTypes & types, std::function<void(DataTypes &)> transform_simple_types, std::function<void(DataTypes &)> transform_complex_types);
 
+void callOnNestedSimpleTypes(DataTypePtr & type, std::function<void(DataTypePtr &)> callback);
+
 }
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 796142884a3..88aa086fe65 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -716,8 +716,12 @@ ASTPtr DatabaseOnDisk::getCreateQueryFromStorage(const String & table_name, cons
     auto ast_storage = std::make_shared<ASTStorage>();
     ast_storage->set(ast_storage->engine, ast_engine);
 
-    auto create_table_query = DB::getCreateQueryFromStorage(storage, ast_storage, false,
-                                                            getContext()->getSettingsRef().max_parser_depth, throw_on_error);
+    unsigned max_parser_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
+    auto create_table_query = DB::getCreateQueryFromStorage(storage,
+                                                            ast_storage,
+                                                            false,
+                                                            max_parser_depth,
+                                                            throw_on_error);
 
     create_table_query->set(create_table_query->as<ASTCreateQuery>()->comment,
                             std::make_shared<ASTLiteral>("SYSTEM TABLE is built on the fly."));
diff --git a/src/Databases/MySQL/DatabaseMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp
index 80301732ff8..5f59f6497e2 100644
--- a/src/Databases/MySQL/DatabaseMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMySQL.cpp
@@ -164,8 +164,13 @@ ASTPtr DatabaseMySQL::getCreateTableQueryImpl(const String & table_name, Context
         std::erase_if(storage_children, [&](const ASTPtr & element) { return element.get() == ast_storage->settings; });
         ast_storage->settings = nullptr;
     }
-    auto create_table_query = DB::getCreateQueryFromStorage(storage, table_storage_define, true,
-                                                            getContext()->getSettingsRef().max_parser_depth, throw_on_error);
+
+    unsigned max_parser_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
+    auto create_table_query = DB::getCreateQueryFromStorage(storage,
+                                                            table_storage_define,
+                                                            true,
+                                                            max_parser_depth,
+                                                            throw_on_error);
     return create_table_query;
 }
 
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
index 604dc220fed..ed9199a359f 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
@@ -478,8 +478,9 @@ static inline UInt32 randomNumber()
 {
     std::mt19937 rng;
     rng.seed(std::random_device()());
-    std::uniform_int_distribution<std::mt19937::result_type> dist6(std::numeric_limits<UInt32>::min(), std::numeric_limits<UInt32>::max());
-    return dist6(rng);
+    std::uniform_int_distribution<std::mt19937::result_type> dist6(
+        std::numeric_limits<UInt32>::min(), std::numeric_limits<UInt32>::max());
+    return static_cast<UInt32>(dist6(rng));
 }
 
 bool MaterializedMySQLSyncThread::prepareSynchronized(MaterializeMetadata & metadata)
@@ -679,11 +680,11 @@ static void writeFieldsToColumn(
                 if (write_data_to_null_map(value, index))
                 {
                     if (value.getType() == Field::Types::UInt64)
-                        casted_int32_column->insertValue(value.get<Int32>());
+                        casted_int32_column->insertValue(static_cast<Int32>(value.get<Int32>()));
                     else if (value.getType() == Field::Types::Int64)
                     {
                         /// For MYSQL_TYPE_INT24
-                        const Int32 & num = value.get<Int32>();
+                        const Int32 & num = static_cast<Int32>(value.get<Int32>());
                         casted_int32_column->insertValue(num & 0x800000 ? num | 0xFF000000 : num);
                     }
                     else
diff --git a/src/Databases/SQLite/DatabaseSQLite.cpp b/src/Databases/SQLite/DatabaseSQLite.cpp
index 44a392ce1f2..83c5ebe00d3 100644
--- a/src/Databases/SQLite/DatabaseSQLite.cpp
+++ b/src/Databases/SQLite/DatabaseSQLite.cpp
@@ -192,8 +192,10 @@ ASTPtr DatabaseSQLite::getCreateTableQueryImpl(const String & table_name, Contex
     /// Add table_name to engine arguments
     storage_engine_arguments->children.insert(storage_engine_arguments->children.begin() + 1, std::make_shared<ASTLiteral>(table_id.table_name));
 
+    unsigned max_parser_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
     auto create_table_query = DB::getCreateQueryFromStorage(storage, table_storage_define, true,
-                                                            getContext()->getSettingsRef().max_parser_depth, throw_on_error);
+                                                            max_parser_depth,
+                                                            throw_on_error);
 
     return create_table_query;
 }
diff --git a/src/Dictionaries/CassandraSource.cpp b/src/Dictionaries/CassandraSource.cpp
index fd5982443fa..878921c53d0 100644
--- a/src/Dictionaries/CassandraSource.cpp
+++ b/src/Dictionaries/CassandraSource.cpp
@@ -32,7 +32,7 @@ CassandraSource::CassandraSource(
     , has_more_pages(cass_true)
 {
     description.init(sample_block);
-    cassandraCheck(cass_statement_set_paging_size(statement, max_block_size));
+    cassandraCheck(cass_statement_set_paging_size(statement, static_cast<int>(max_block_size)));
 }
 
 void CassandraSource::insertValue(IColumn & column, ValueType type, const CassValue * cass_value)
diff --git a/src/Dictionaries/Embedded/GeodataProviders/HierarchyFormatReader.cpp b/src/Dictionaries/Embedded/GeodataProviders/HierarchyFormatReader.cpp
index f91bbaa12a6..68bd6142416 100644
--- a/src/Dictionaries/Embedded/GeodataProviders/HierarchyFormatReader.cpp
+++ b/src/Dictionaries/Embedded/GeodataProviders/HierarchyFormatReader.cpp
@@ -31,7 +31,7 @@ bool RegionsHierarchyFormatReader::readNext(RegionEntry & entry)
             UInt64 population_big = 0;
             DB::readIntText(population_big, *input);
             population = population_big > std::numeric_limits<RegionPopulation>::max() ? std::numeric_limits<RegionPopulation>::max()
-                                                                                       : population_big;
+                                                                                       : static_cast<RegionPopulation>(population_big);
         }
         DB::assertChar('\n', *input);
 
diff --git a/src/Dictionaries/RedisSource.cpp b/src/Dictionaries/RedisSource.cpp
index 4208d5fa63b..50a73e52010 100644
--- a/src/Dictionaries/RedisSource.cpp
+++ b/src/Dictionaries/RedisSource.cpp
@@ -109,7 +109,7 @@ namespace DB
                     readDateTimeText(time, in);
                     if (time < 0)
                         time = 0;
-                    assert_cast<ColumnUInt32 &>(column).insertValue(time);
+                    assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(time));
                     break;
                 }
                 case ValueType::vtUUID:
diff --git a/src/Dictionaries/SSDCacheDictionaryStorage.h b/src/Dictionaries/SSDCacheDictionaryStorage.h
index 5f73352a4c9..428b4321ffd 100644
--- a/src/Dictionaries/SSDCacheDictionaryStorage.h
+++ b/src/Dictionaries/SSDCacheDictionaryStorage.h
@@ -675,7 +675,7 @@ public:
             pointers.push_back(&requests.back());
         }
 
-        AIOContext aio_context(read_from_file_buffer_blocks_size);
+        AIOContext aio_context(static_cast<unsigned>(read_from_file_buffer_blocks_size));
 
         PaddedPODArray<bool> processed(requests.size(), false);
         PaddedPODArray<io_event> events;
@@ -735,7 +735,8 @@ public:
                 ++to_pop;
 
             /// add new io tasks
-            const int new_tasks_count = std::min(read_from_file_buffer_blocks_size - (to_push - to_pop), requests.size() - to_push);
+            const int new_tasks_count = static_cast<int>(std::min(
+                read_from_file_buffer_blocks_size - (to_push - to_pop), requests.size() - to_push));
 
             int pushed = 0;
             while (new_tasks_count > 0 && (pushed = io_submit(aio_context.ctx, new_tasks_count, &pointers[to_push])) <= 0)
diff --git a/src/Disks/DiskDecorator.cpp b/src/Disks/DiskDecorator.cpp
index 73540aaa0ab..af17289c8af 100644
--- a/src/Disks/DiskDecorator.cpp
+++ b/src/Disks/DiskDecorator.cpp
@@ -241,6 +241,11 @@ DiskObjectStoragePtr DiskDecorator::createDiskObjectStorage()
     return delegate->createDiskObjectStorage();
 }
 
+ObjectStoragePtr DiskDecorator::getObjectStorage()
+{
+    return delegate->getObjectStorage();
+}
+
 DiskPtr DiskDecorator::getNestedDisk() const
 {
     if (const auto * decorator = dynamic_cast<const DiskDecorator *>(delegate.get()))
diff --git a/src/Disks/DiskDecorator.h b/src/Disks/DiskDecorator.h
index dcd12ab4bbf..25278f905ba 100644
--- a/src/Disks/DiskDecorator.h
+++ b/src/Disks/DiskDecorator.h
@@ -89,6 +89,7 @@ public:
     void getRemotePathsRecursive(const String & path, std::vector<LocalPathWithObjectStoragePaths> & paths_map) override { return delegate->getRemotePathsRecursive(path, paths_map); }
 
     DiskObjectStoragePtr createDiskObjectStorage() override;
+    ObjectStoragePtr getObjectStorage() override;
     NameSet getCacheLayersNames() const override { return delegate->getCacheLayersNames(); }
 
     MetadataStoragePtr getMetadataStorage() override { return delegate->getMetadataStorage(); }
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index ba843235345..4a7be740ccf 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -366,6 +366,14 @@ public:
     /// Return current disk revision.
     virtual UInt64 getRevision() const { return 0; }
 
+    virtual ObjectStoragePtr getObjectStorage()
+    {
+        throw Exception(
+            ErrorCodes::NOT_IMPLEMENTED,
+            "Method getObjectStorage() is not implemented for disk type: {}",
+            getDataSourceDescription().type);
+    }
+
     /// Create disk object storage according to disk type.
     /// For example for DiskLocal create DiskObjectStorage(LocalObjectStorage),
     /// for DiskObjectStorage create just a copy.
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
index ba041efe24a..899d06b4ed7 100644
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
@@ -68,7 +68,7 @@ private:
 
     IAsynchronousReader & reader;
 
-    Int32 priority;
+    Int64 priority;
 
     std::shared_ptr<ReadBufferFromRemoteFSGather> impl;
 
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.cpp b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
index fb13ed7eec8..8814d12d6eb 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -82,6 +82,11 @@ DiskTransactionPtr DiskObjectStorage::createTransaction()
     return std::make_shared<FakeDiskTransaction>(*this);
 }
 
+ObjectStoragePtr DiskObjectStorage::getObjectStorage()
+{
+    return object_storage;
+}
+
 DiskTransactionPtr DiskObjectStorage::createObjectStorageTransaction()
 {
     return std::make_shared<DiskObjectStorageTransaction>(
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.h b/src/Disks/ObjectStorages/DiskObjectStorage.h
index 14fb84d7a15..333fcb258e4 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.h
@@ -166,6 +166,8 @@ public:
 
     UInt64 getRevision() const override;
 
+    ObjectStoragePtr getObjectStorage() override;
+
     DiskObjectStoragePtr createDiskObjectStorage() override;
 
     bool supportsCache() const override;
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
index 56cc20098ba..dc4898559c0 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
@@ -67,14 +67,6 @@ void DiskObjectStorageMetadata::deserialize(ReadBuffer & buf)
     }
 }
 
-void DiskObjectStorageMetadata::createFromSingleObject(const std::string & relative_path, size_t bytes_size, size_t ref_count_, bool read_only_)
-{
-    storage_objects.emplace_back(relative_path, bytes_size);
-    total_size = bytes_size;
-    ref_count = ref_count_;
-    read_only = read_only_;
-}
-
 void DiskObjectStorageMetadata::deserializeFromString(const std::string & data)
 {
     ReadBufferFromString buf(data);
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.h b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.h
index 09e0f4ee85b..d3ea5795dd3 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.h
@@ -50,7 +50,6 @@ public:
 
     void deserialize(ReadBuffer & buf);
     void deserializeFromString(const std::string & data);
-    void createFromSingleObject(const std::string & relative_path, size_t bytes_size, size_t ref_count_, bool is_read_only_);
 
     void serialize(WriteBuffer & buf, bool sync) const;
     std::string serializeToString() const;
diff --git a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
index b1c8340ef1b..65cf012ddab 100644
--- a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
+++ b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
@@ -9,6 +9,7 @@
 namespace DB
 {
 
+/// Store metadata in the disk itself.
 class FakeMetadataStorageFromDisk final : public IMetadataStorage
 {
 private:
diff --git a/src/Disks/ObjectStorages/LocalObjectStorage.h b/src/Disks/ObjectStorages/LocalObjectStorage.h
index 644c5249d8f..0e4c71b4a47 100644
--- a/src/Disks/ObjectStorages/LocalObjectStorage.h
+++ b/src/Disks/ObjectStorages/LocalObjectStorage.h
@@ -12,6 +12,7 @@ class Logger;
 namespace DB
 {
 
+/// Treat local disk as an object storage (for interface compatibility).
 class LocalObjectStorage : public IObjectStorage
 {
 public:
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDisk.h b/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
index 8c1fb6edd14..b06a2a41f2b 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
@@ -10,6 +10,8 @@
 namespace DB
 {
 
+/// Store metadata on a separate disk
+/// (used for object storages, like S3 and related).
 class MetadataStorageFromDisk final : public IMetadataStorage
 {
 private:
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
new file mode 100644
index 00000000000..35cd3be15d2
--- /dev/null
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
@@ -0,0 +1,229 @@
+#include "MetadataStorageFromPlainObjectStorage.h"
+#include <Disks/IDisk.h>
+#include <Disks/ObjectStorages/StaticDirectoryIterator.h>
+#include <Common/filesystemHelpers.h>
+#include <Common/logger_useful.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+    extern const int LOGICAL_ERROR;
+}
+
+MetadataStorageFromPlainObjectStorage::MetadataStorageFromPlainObjectStorage(
+    ObjectStoragePtr object_storage_,
+    const std::string & object_storage_root_path_)
+    : object_storage(object_storage_)
+    , object_storage_root_path(object_storage_root_path_)
+{
+}
+
+MetadataTransactionPtr MetadataStorageFromPlainObjectStorage::createTransaction() const
+{
+    return std::make_shared<MetadataStorageFromPlainObjectStorageTransaction>(*this);
+}
+
+const std::string & MetadataStorageFromPlainObjectStorage::getPath() const
+{
+    return object_storage_root_path;
+}
+
+bool MetadataStorageFromPlainObjectStorage::exists(const std::string & path) const
+{
+    auto object = StoredObject::create(*object_storage, fs::path(object_storage_root_path) / path);
+    return object_storage->exists(object);
+}
+
+bool MetadataStorageFromPlainObjectStorage::isFile(const std::string & path) const
+{
+    /// NOTE: This check is inaccurate and has excessive API calls
+    return !isDirectory(path) && exists(path);
+}
+
+bool MetadataStorageFromPlainObjectStorage::isDirectory(const std::string & path) const
+{
+    std::string directory = path;
+    trimRight(directory);
+    directory += "/";
+
+    /// NOTE: This check is far from ideal, since it work only if the directory
+    /// really has files, and has excessive API calls
+    RelativePathsWithSize children;
+    object_storage->listPrefix(directory, children);
+    return !children.empty();
+}
+
+Poco::Timestamp MetadataStorageFromPlainObjectStorage::getLastModified(const std::string &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getLastModified is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+struct stat MetadataStorageFromPlainObjectStorage::stat(const std::string &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "stat is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+time_t MetadataStorageFromPlainObjectStorage::getLastChanged(const std::string &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getLastChanged is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+uint64_t MetadataStorageFromPlainObjectStorage::getFileSize(const String & path) const
+{
+    RelativePathsWithSize children;
+    object_storage->listPrefix(path, children);
+    if (children.empty())
+        return 0;
+    if (children.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "listPrefix() return multiple paths ({}) for {}", children.size(), path);
+    return children.front().bytes_size;
+}
+
+std::vector<std::string> MetadataStorageFromPlainObjectStorage::listDirectory(const std::string & path) const
+{
+    RelativePathsWithSize children;
+    object_storage->listPrefix(path, children);
+
+    std::vector<std::string> result;
+    for (const auto & path_size : children)
+    {
+        result.push_back(path_size.relative_path);
+    }
+    return result;
+}
+
+DirectoryIteratorPtr MetadataStorageFromPlainObjectStorage::iterateDirectory(const std::string & path) const
+{
+    /// NOTE: this is not required for BACKUP/RESTORE, but this is a first step
+    /// towards MergeTree on plain S3.
+    auto paths = listDirectory(path);
+    std::vector<std::filesystem::path> fs_paths(paths.begin(), paths.end());
+    return std::make_unique<StaticDirectoryIterator>(std::move(fs_paths));
+}
+
+std::string MetadataStorageFromPlainObjectStorage::readFileToString(const std::string &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "readFileToString is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+std::unordered_map<String, String> MetadataStorageFromPlainObjectStorage::getSerializedMetadata(const std::vector<String> &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getSerializedMetadata is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+StoredObjects MetadataStorageFromPlainObjectStorage::getStorageObjects(const std::string & path) const
+{
+    std::string blob_name = object_storage->generateBlobNameForPath(path);
+
+    std::string object_path = fs::path(object_storage_root_path) / blob_name;
+    size_t object_size = getFileSize(object_path);
+
+    auto object = StoredObject::create(*object_storage, object_path, object_size, /* exists */true);
+    return {std::move(object)};
+}
+
+uint32_t MetadataStorageFromPlainObjectStorage::getHardlinkCount(const std::string &) const
+{
+    return 1;
+}
+
+const IMetadataStorage & MetadataStorageFromPlainObjectStorageTransaction::getStorageForNonTransactionalReads() const
+{
+    return metadata_storage;
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::writeStringToFile(const std::string &, const std::string & /* data */)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "writeStringToFile is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::setLastModified(const std::string &, const Poco::Timestamp &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "setLastModified is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::unlinkFile(const std::string & path)
+{
+    auto object = StoredObject::create(*metadata_storage.object_storage, fs::path(metadata_storage.object_storage_root_path) / path);
+    metadata_storage.object_storage->removeObject(object);
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::removeRecursive(const std::string &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "removeRecursive is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::createDirectory(const std::string &)
+{
+    /// Noop. It is an Object Storage not a filesystem.
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::createDirectoryRecursive(const std::string &)
+{
+    /// Noop. It is an Object Storage not a filesystem.
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::removeDirectory(const std::string &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "removeDirectory is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::moveFile(const std::string & /* path_from */, const std::string & /* path_to */)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "moveFile is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::moveDirectory(const std::string & /* path_from */, const std::string & /* path_to */)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "moveDirectory is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::replaceFile(const std::string & /* path_from */, const std::string & /* path_to */)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "replaceFile is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::chmod(const String &, mode_t)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "chmod is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::setReadOnly(const std::string &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "setReadOnly is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::createHardLink(const std::string & /* path_from */, const std::string & /* path_to */)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "createHardLink is not implemented for MetadataStorageFromPlainObjectStorage");
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::createEmptyMetadataFile(const std::string &)
+{
+    /// Noop, no separate metadata.
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::createMetadataFile(
+    const std::string &, const std::string & /* blob_name */, uint64_t /* size_in_bytes */)
+{
+    /// Noop, no separate metadata.
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::addBlobToMetadata(
+    const std::string &, const std::string & /* blob_name */, uint64_t /* size_in_bytes */)
+{
+    /// Noop, local metadata files is only one file, it is the metadata file itself.
+}
+
+void MetadataStorageFromPlainObjectStorageTransaction::unlinkMetadata(const std::string &)
+{
+    /// Noop, no separate metadata.
+}
+
+}
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
new file mode 100644
index 00000000000..bd993918413
--- /dev/null
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
@@ -0,0 +1,129 @@
+#pragma once
+
+#include <Disks/IDisk.h>
+#include <Disks/ObjectStorages/IMetadataStorage.h>
+#include <Disks/ObjectStorages/MetadataFromDiskTransactionState.h>
+#include <Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.h>
+
+
+namespace DB
+{
+
+/// Object storage is used as a filesystem, in a limited form:
+/// - no directory concept, files only
+/// - no stat/chmod/...
+/// - no move/...
+/// - limited unlink support
+///
+/// Also it has excessive API calls.
+///
+/// It is used to allow BACKUP/RESTORE to ObjectStorage (S3/...) with the same
+/// structure as on disk MergeTree, and does not requires metadata from local
+/// disk to restore.
+class MetadataStorageFromPlainObjectStorage final : public IMetadataStorage
+{
+private:
+    friend class MetadataStorageFromPlainObjectStorageTransaction;
+
+    ObjectStoragePtr object_storage;
+    std::string object_storage_root_path;
+
+public:
+    MetadataStorageFromPlainObjectStorage(
+        ObjectStoragePtr object_storage_,
+        const std::string & object_storage_root_path_);
+
+    MetadataTransactionPtr createTransaction() const override;
+
+    const std::string & getPath() const override;
+
+    bool exists(const std::string & path) const override;
+
+    bool isFile(const std::string & path) const override;
+
+    bool isDirectory(const std::string & path) const override;
+
+    uint64_t getFileSize(const String & path) const override;
+
+    Poco::Timestamp getLastModified(const std::string & path) const override;
+
+    time_t getLastChanged(const std::string & path) const override;
+
+    bool supportsChmod() const override { return false; }
+
+    bool supportsStat() const override { return false; }
+
+    struct stat stat(const String & path) const override;
+
+    std::vector<std::string> listDirectory(const std::string & path) const override;
+
+    DirectoryIteratorPtr iterateDirectory(const std::string & path) const override;
+
+    std::string readFileToString(const std::string & path) const override;
+
+    std::unordered_map<String, String> getSerializedMetadata(const std::vector<String> & file_paths) const override;
+
+    uint32_t getHardlinkCount(const std::string & path) const override;
+
+    DiskPtr getDisk() const { return {}; }
+
+    StoredObjects getStorageObjects(const std::string & path) const override;
+
+    std::string getObjectStorageRootPath() const override { return object_storage_root_path; }
+};
+
+class MetadataStorageFromPlainObjectStorageTransaction final : public IMetadataTransaction
+{
+private:
+    const MetadataStorageFromPlainObjectStorage & metadata_storage;
+
+    std::vector<MetadataOperationPtr> operations;
+public:
+    MetadataStorageFromPlainObjectStorageTransaction(const MetadataStorageFromPlainObjectStorage & metadata_storage_)
+        : metadata_storage(metadata_storage_)
+    {}
+
+    ~MetadataStorageFromPlainObjectStorageTransaction() override = default;
+
+    const IMetadataStorage & getStorageForNonTransactionalReads() const final;
+
+    void commit() final {}
+
+    void writeStringToFile(const std::string & path, const std::string & data) override;
+
+    void createEmptyMetadataFile(const std::string & path) override;
+
+    void createMetadataFile(const std::string & path, const std::string & blob_name, uint64_t size_in_bytes) override;
+
+    void addBlobToMetadata(const std::string & path, const std::string & blob_name, uint64_t size_in_bytes) override;
+
+    void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) override;
+
+    bool supportsChmod() const override { return false; }
+
+    void chmod(const String & path, mode_t mode) override;
+
+    void setReadOnly(const std::string & path) override;
+
+    void unlinkFile(const std::string & path) override;
+
+    void createDirectory(const std::string & path) override;
+
+    void createDirectoryRecursive(const std::string & path) override;
+
+    void removeDirectory(const std::string & path) override;
+
+    void removeRecursive(const std::string & path) override;
+
+    void createHardLink(const std::string & path_from, const std::string & path_to) override;
+
+    void moveFile(const std::string & path_from, const std::string & path_to) override;
+
+    void moveDirectory(const std::string & path_from, const std::string & path_to) override;
+
+    void replaceFile(const std::string & path_from, const std::string & path_to) override;
+
+    void unlinkMetadata(const std::string & path) override;
+};
+
+}
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index 213f744d84f..e627a807bd8 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -482,7 +482,7 @@ void S3ObjectStorage::copyObjectMultipartImpl(
         part_request.SetBucket(dst_bucket);
         part_request.SetKey(dst_key);
         part_request.SetUploadId(multipart_upload_id);
-        part_request.SetPartNumber(part_number);
+        part_request.SetPartNumber(static_cast<int>(part_number));
         part_request.SetCopySourceRange(fmt::format("bytes={}-{}", position, std::min(size, position + upload_part_size) - 1));
 
         auto outcome = client_ptr->UploadPartCopy(part_request);
@@ -515,7 +515,7 @@ void S3ObjectStorage::copyObjectMultipartImpl(
         for (size_t i = 0; i < part_tags.size(); ++i)
         {
             Aws::S3::Model::CompletedPart part;
-            multipart_upload.AddParts(part.WithETag(part_tags[i]).WithPartNumber(i + 1));
+            multipart_upload.AddParts(part.WithETag(part_tags[i]).WithPartNumber(static_cast<int>(i) + 1));
         }
 
         req.SetMultipartUpload(multipart_upload);
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
index ce5235d4323..a193653db9a 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
@@ -43,8 +43,11 @@ struct S3ObjectStorageSettings
 
 class S3ObjectStorage : public IObjectStorage
 {
-public:
+private:
+    friend class S3PlainObjectStorage;
+
     S3ObjectStorage(
+        const char * logger_name,
         std::unique_ptr<Aws::S3::S3Client> && client_,
         std::unique_ptr<S3ObjectStorageSettings> && s3_settings_,
         String version_id_,
@@ -61,6 +64,15 @@ public:
         data_source_description.description = connection_string;
         data_source_description.is_cached = false;
         data_source_description.is_encrypted = false;
+
+        log = &Poco::Logger::get(logger_name);
+    }
+
+public:
+    template <class ...Args>
+    S3ObjectStorage(std::unique_ptr<Aws::S3::S3Client> && client_, Args && ...args)
+        : S3ObjectStorage("S3ObjectStorage", std::move(client_), std::forward<Args>(args)...)
+    {
     }
 
     DataSourceDescription getDataSourceDescription() const override
@@ -181,10 +193,26 @@ private:
 
     const String version_id;
 
-    Poco::Logger * log = &Poco::Logger::get("S3ObjectStorage");
+    Poco::Logger * log;
     DataSourceDescription data_source_description;
 };
 
+/// Do not encode keys, store as-is, and do not require separate disk for metadata.
+/// But because of this does not support renames/hardlinks/attrs/...
+///
+/// NOTE: This disk has excessive API calls.
+class S3PlainObjectStorage : public S3ObjectStorage
+{
+public:
+    std::string generateBlobNameForPath(const std::string & path) override { return path; }
+    std::string getName() const override { return "S3PlainObjectStorage"; }
+
+    template <class ...Args>
+    S3PlainObjectStorage(Args && ...args)
+        : S3ObjectStorage("S3PlainObjectStorage", std::forward<Args>(args)...)
+    {}
+};
+
 }
 
 #endif
diff --git a/src/Disks/ObjectStorages/S3/diskSettings.cpp b/src/Disks/ObjectStorages/S3/diskSettings.cpp
index 1635cb5c552..e61987163d2 100644
--- a/src/Disks/ObjectStorages/S3/diskSettings.cpp
+++ b/src/Disks/ObjectStorages/S3/diskSettings.cpp
@@ -116,7 +116,8 @@ std::unique_ptr<Aws::S3::S3Client> getClient(const Poco::Util::AbstractConfigura
 {
     S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
         config.getString(config_prefix + ".region", ""),
-        context->getRemoteHostFilter(), context->getGlobalContext()->getSettingsRef().s3_max_redirects,
+        context->getRemoteHostFilter(),
+        static_cast<int>(context->getGlobalContext()->getSettingsRef().s3_max_redirects),
         context->getGlobalContext()->getSettingsRef().enable_s3_requests_logging,
         /* for_disk_s3 = */ true);
 
diff --git a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
index 62cacde3f14..e09aef22122 100644
--- a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
+++ b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
@@ -18,6 +18,7 @@
 #include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
 #include <Disks/ObjectStorages/S3/diskSettings.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
+#include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
 #include <IO/S3Common.h>
 
 #include <Storages/StorageS3Settings.h>
@@ -122,15 +123,31 @@ void registerDiskS3(DiskFactory & factory)
         if (uri.key.back() != '/')
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "S3 path must ends with '/', but '{}' doesn't.", uri.key);
 
-        auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
-
-        auto metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, uri.key);
         S3Capabilities s3_capabilities = getCapabilitiesFromConfig(config, config_prefix);
+        std::shared_ptr<S3ObjectStorage> s3_storage;
 
-        auto s3_storage = std::make_unique<S3ObjectStorage>(
-            getClient(config, config_prefix, context),
-            getSettings(config, config_prefix, context),
-            uri.version_id, s3_capabilities, uri.bucket, uri.endpoint);
+        String type = config.getString(config_prefix + ".type");
+        chassert(type == "s3" || type == "s3_plain");
+
+        MetadataStoragePtr metadata_storage;
+        if (type == "s3_plain")
+        {
+            s3_storage = std::make_shared<S3PlainObjectStorage>(
+                getClient(config, config_prefix, context),
+                getSettings(config, config_prefix, context),
+                uri.version_id, s3_capabilities, uri.bucket, uri.endpoint);
+            metadata_storage = std::make_shared<MetadataStorageFromPlainObjectStorage>(s3_storage, uri.key);
+        }
+        else
+        {
+            s3_storage = std::make_shared<S3ObjectStorage>(
+                getClient(config, config_prefix, context),
+                getSettings(config, config_prefix, context),
+                uri.version_id, s3_capabilities, uri.bucket, uri.endpoint);
+
+            auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
+            metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, uri.key);
+        }
 
         bool skip_access_check = config.getBool(config_prefix + ".skip_access_check", false);
 
@@ -156,7 +173,7 @@ void registerDiskS3(DiskFactory & factory)
         std::shared_ptr<DiskObjectStorage> s3disk = std::make_shared<DiskObjectStorage>(
             name,
             uri.key,
-            "DiskS3",
+            type == "s3" ? "DiskS3" : "DiskS3Plain",
             std::move(metadata_storage),
             std::move(s3_storage),
             send_metadata,
@@ -177,6 +194,7 @@ void registerDiskS3(DiskFactory & factory)
         return std::make_shared<DiskRestartProxy>(disk_result);
     };
     factory.registerDiskType("s3", creator);
+    factory.registerDiskType("s3_plain", creator);
 }
 
 }
diff --git a/src/Disks/ObjectStorages/StaticDirectoryIterator.h b/src/Disks/ObjectStorages/StaticDirectoryIterator.h
new file mode 100644
index 00000000000..891bdb688f0
--- /dev/null
+++ b/src/Disks/ObjectStorages/StaticDirectoryIterator.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <Disks/DirectoryIterator.h>
+#include <vector>
+#include <filesystem>
+#include <string>
+
+namespace DB
+{
+
+class StaticDirectoryIterator final : public IDirectoryIterator
+{
+public:
+    explicit StaticDirectoryIterator(std::vector<std::filesystem::path> && dir_file_paths_)
+        : dir_file_paths(std::move(dir_file_paths_))
+        , iter(dir_file_paths.begin())
+    {}
+
+    void next() override { ++iter; }
+
+    bool isValid() const override { return iter != dir_file_paths.end(); }
+
+    std::string path() const override { return iter->string(); }
+
+    std::string name() const override { return iter->filename(); }
+
+private:
+    std::vector<std::filesystem::path> dir_file_paths;
+    std::vector<std::filesystem::path>::iterator iter;
+};
+
+}
diff --git a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
index f13a51ddc03..06e36a2ddd8 100644
--- a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
+++ b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
@@ -1,5 +1,6 @@
 #include "MetadataStorageFromStaticFilesWebServer.h"
 #include <Disks/IDisk.h>
+#include <Disks/ObjectStorages/StaticDirectoryIterator.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/logger_useful.h>
 #include <Common/escapeForFileName.h>
@@ -16,26 +17,6 @@ namespace ErrorCodes
     extern const int NETWORK_ERROR;
 }
 
-class DiskWebServerDirectoryIterator final : public IDirectoryIterator
-{
-public:
-    explicit DiskWebServerDirectoryIterator(std::vector<fs::path> && dir_file_paths_)
-        : dir_file_paths(std::move(dir_file_paths_)), iter(dir_file_paths.begin()) {}
-
-    void next() override { ++iter; }
-
-    bool isValid() const override { return iter != dir_file_paths.end(); }
-
-    String path() const override { return iter->string(); }
-
-    String name() const override { return iter->filename(); }
-
-private:
-    std::vector<fs::path> dir_file_paths;
-    std::vector<fs::path>::iterator iter;
-};
-
-
 MetadataStorageFromStaticFilesWebServer::MetadataStorageFromStaticFilesWebServer(
     const WebObjectStorage & object_storage_)
     : object_storage(object_storage_)
@@ -169,7 +150,7 @@ DirectoryIteratorPtr MetadataStorageFromStaticFilesWebServer::iterateDirectory(c
 
     if (!initializeIfNeeded(path))
     {
-        return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
+        return std::make_unique<StaticDirectoryIterator>(std::move(dir_file_paths));
     }
 
     assertExists(path);
@@ -181,7 +162,7 @@ DirectoryIteratorPtr MetadataStorageFromStaticFilesWebServer::iterateDirectory(c
     }
 
     LOG_TRACE(object_storage.log, "Iterate directory {} with {} files", path, dir_file_paths.size());
-    return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
+    return std::make_unique<StaticDirectoryIterator>(std::move(dir_file_paths));
 }
 
 std::string MetadataStorageFromStaticFilesWebServer::readFileToString(const std::string &) const
diff --git a/src/Formats/CapnProtoUtils.cpp b/src/Formats/CapnProtoUtils.cpp
index b8702380aa7..a7ff065aca5 100644
--- a/src/Formats/CapnProtoUtils.cpp
+++ b/src/Formats/CapnProtoUtils.cpp
@@ -138,7 +138,7 @@ static String getCapnProtoFullTypeName(const capnp::Type & type)
             auto enum_schema = type.asEnum();
             String enum_name = "Enum(";
             auto enumerants = enum_schema.getEnumerants();
-            for (size_t i = 0; i != enumerants.size(); ++i)
+            for (unsigned i = 0; i != enumerants.size(); ++i)
             {
                 enum_name += String(enumerants[i].getProto().getName()) + " = " + std::to_string(enumerants[i].getOrdinal());
                 if (i + 1 != enumerants.size())
diff --git a/src/Formats/EscapingRuleUtils.cpp b/src/Formats/EscapingRuleUtils.cpp
index f1a97c84fec..e47525d089a 100644
--- a/src/Formats/EscapingRuleUtils.cpp
+++ b/src/Formats/EscapingRuleUtils.cpp
@@ -11,6 +11,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeObject.h>
 #include <DataTypes/getLeastSupertype.h>
@@ -18,6 +19,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromString.h>
+#include <IO/parseDateTimeBestEffort.h>
 #include <Parsers/TokenIterator.h>
 
 
@@ -453,23 +455,51 @@ void transformInferredJSONTypesIfNeeded(DataTypePtr & first, DataTypePtr & secon
     second = std::move(types[1]);
 }
 
-DataTypePtr tryInferDateOrDateTime(const std::string_view & field, const FormatSettings & settings)
+bool tryInferDate(const std::string_view & field)
 {
-    if (settings.try_infer_dates)
+    ReadBufferFromString buf(field);
+    DayNum tmp;
+    return tryReadDateText(tmp, buf) && buf.eof();
+}
+
+bool tryInferDateTime(const std::string_view & field, const FormatSettings & settings)
+{
+    ReadBufferFromString buf(field);
+    Float64 tmp_float;
+    /// Check if it's just a number, and if so, don't try to infer DateTime from it,
+    /// because we can interpret this number as a timestamp and it will lead to
+    /// inferring DateTime instead of simple Int64/Float64 in some cases.
+    if (tryReadFloatText(tmp_float, buf) && buf.eof())
+        return false;
+
+    buf.seek(0, SEEK_SET); /// Return position to the beginning
+    DateTime64 tmp;
+    switch (settings.date_time_input_format)
     {
-        ReadBufferFromString buf(field);
-        DayNum tmp;
-        if (tryReadDateText(tmp, buf) && buf.eof())
-            return makeNullable(std::make_shared<DataTypeDate>());
+        case FormatSettings::DateTimeInputFormat::Basic:
+            if (tryReadDateTime64Text(tmp, 9, buf) && buf.eof())
+                return true;
+            break;
+        case FormatSettings::DateTimeInputFormat::BestEffort:
+            if (tryParseDateTime64BestEffort(tmp, 9, buf, DateLUT::instance(), DateLUT::instance("UTC")) && buf.eof())
+                return true;
+            break;
+        case FormatSettings::DateTimeInputFormat::BestEffortUS:
+            if (tryParseDateTime64BestEffortUS(tmp, 9, buf, DateLUT::instance(), DateLUT::instance("UTC")) && buf.eof())
+                return true;
+            break;
     }
 
-    if (settings.try_infer_datetimes)
-    {
-        ReadBufferFromString buf(field);
-        DateTime64 tmp;
-        if (tryReadDateTime64Text(tmp, 9, buf) && buf.eof())
-            return makeNullable(std::make_shared<DataTypeDateTime64>(9));
-    }
+    return false;
+}
+
+DataTypePtr tryInferDateOrDateTime(const std::string_view & field, const FormatSettings & settings)
+{
+    if (settings.try_infer_dates && tryInferDate(field))
+        return makeNullable(std::make_shared<DataTypeDate>());
+
+    if (settings.try_infer_datetimes && tryInferDateTime(field, settings))
+        return makeNullable(std::make_shared<DataTypeDateTime64>(9));
 
     return nullptr;
 }
@@ -846,4 +876,19 @@ String getAdditionalFormatInfoByEscapingRule(const FormatSettings & settings, Fo
     return result;
 }
 
+
+void checkSupportedDelimiterAfterField(FormatSettings::EscapingRule escaping_rule, const String & delimiter, const DataTypePtr & type)
+{
+    if (escaping_rule != FormatSettings::EscapingRule::Escaped)
+        return;
+
+    bool is_supported_delimiter_after_string = !delimiter.empty() && (delimiter.front() == '\t' || delimiter.front() == '\n');
+    if (is_supported_delimiter_after_string)
+        return;
+
+    /// Nullptr means that field is skipped and it's equivalent to String
+    if (!type || isString(removeNullable(removeLowCardinality(type))))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "'Escaped' serialization requires delimiter after String field to start with '\\t' or '\\n'");
+}
+
 }
diff --git a/src/Formats/EscapingRuleUtils.h b/src/Formats/EscapingRuleUtils.h
index 901679b6a05..c8b710002a5 100644
--- a/src/Formats/EscapingRuleUtils.h
+++ b/src/Formats/EscapingRuleUtils.h
@@ -77,6 +77,8 @@ void transformInferredTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, c
 void transformInferredJSONTypesIfNeeded(DataTypes & types, const FormatSettings & settings, const std::unordered_set<const IDataType *> * numbers_parsed_from_json_strings = nullptr);
 void transformInferredJSONTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings);
 
-String getAdditionalFormatInfoByEscapingRule(const FormatSettings & settings,FormatSettings::EscapingRule escaping_rule);
+String getAdditionalFormatInfoByEscapingRule(const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule);
+
+void checkSupportedDelimiterAfterField(FormatSettings::EscapingRule escaping_rule, const String & delimiter, const DataTypePtr & type);
 
 }
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index bfe651dd1af..a882fcf5009 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -303,7 +303,7 @@ InputFormatPtr FormatFactory::getInputFormat(
 
 static void addExistingProgressToOutputFormat(OutputFormatPtr format, ContextPtr context)
 {
-    auto * element_id = context->getProcessListElement();
+    auto element_id = context->getProcessListElement();
     if (element_id)
     {
         /// While preparing the query there might have been progress (for example in subscalar subqueries) so add it here
diff --git a/src/Formats/NativeReader.cpp b/src/Formats/NativeReader.cpp
index 2500158374d..98688bf03b7 100644
--- a/src/Formats/NativeReader.cpp
+++ b/src/Formats/NativeReader.cpp
@@ -145,12 +145,7 @@ Block NativeReader::read()
         readBinary(type_name, istr);
         column.type = data_type_factory.get(type_name);
 
-        const auto * aggregate_function_data_type = typeid_cast<const DataTypeAggregateFunction *>(column.type.get());
-        if (aggregate_function_data_type && aggregate_function_data_type->isVersioned())
-        {
-            auto version = aggregate_function_data_type->getVersionFromRevision(server_revision);
-            aggregate_function_data_type->setVersion(version, /*if_empty=*/ true);
-        }
+        setVersionToAggregateFunctions(column.type, true, server_revision);
 
         SerializationPtr serialization;
         if (server_revision >= DBMS_MIN_REVISION_WITH_CUSTOM_SERIALIZATION)
diff --git a/src/Formats/NativeWriter.cpp b/src/Formats/NativeWriter.cpp
index 9d4cfb68d56..0cae2a2e789 100644
--- a/src/Formats/NativeWriter.cpp
+++ b/src/Formats/NativeWriter.cpp
@@ -11,9 +11,8 @@
 #include <Formats/NativeWriter.h>
 
 #include <Common/typeid_cast.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/NestedUtils.h>
 #include <Columns/ColumnSparse.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 
 namespace DB
@@ -116,19 +115,7 @@ void NativeWriter::write(const Block & block)
         writeStringBinary(column.name, ostr);
 
         bool include_version = client_revision >= DBMS_MIN_REVISION_WITH_AGGREGATE_FUNCTIONS_VERSIONING;
-        const auto * aggregate_function_data_type = typeid_cast<const DataTypeAggregateFunction *>(column.type.get());
-        if (aggregate_function_data_type && aggregate_function_data_type->isVersioned())
-        {
-            if (include_version)
-            {
-                auto version = aggregate_function_data_type->getVersionFromRevision(client_revision);
-                aggregate_function_data_type->setVersion(version, /* if_empty */true);
-            }
-            else
-            {
-                aggregate_function_data_type->setVersion(0, /* if_empty */false);
-            }
-        }
+        setVersionToAggregateFunctions(column.type, include_version, include_version ? std::optional<size_t>(client_revision) : std::nullopt);
 
         /// Type
         String type_name = column.type->getName();
diff --git a/src/Formats/ProtobufSerializer.cpp b/src/Formats/ProtobufSerializer.cpp
index 567a2a9ee98..2f56c4242e5 100644
--- a/src/Formats/ProtobufSerializer.cpp
+++ b/src/Formats/ProtobufSerializer.cpp
@@ -864,7 +864,7 @@ namespace
                 case FieldTypeId::TYPE_ENUM:
                 {
                     write_function = [this](std::string_view str) { writeInt(stringToProtobufEnumValue(str)); };
-                    read_function = [this](PaddedPODArray<UInt8> & str) { protobufEnumValueToStringAppend(readInt(), str); };
+                    read_function = [this](PaddedPODArray<UInt8> & str) { protobufEnumValueToStringAppend(static_cast<int>(readInt()), str); };
                     default_function = [this]() -> String { return field_descriptor.default_value_enum()->name(); };
                     break;
                 }
@@ -1029,7 +1029,7 @@ namespace
                 case FieldTypeId::TYPE_ENUM:
                 {
                     this->write_function = [this](NumberType value) { writeInt(enumDataTypeValueToProtobufEnumValue(value)); };
-                    this->read_function = [this]() -> NumberType { return protobufEnumValueToEnumDataTypeValue(readInt()); };
+                    this->read_function = [this]() -> NumberType { return protobufEnumValueToEnumDataTypeValue(static_cast<NumberType>(readInt())); };
                     this->default_function = [this]() -> NumberType { return protobufEnumValueToEnumDataTypeValue(this->field_descriptor.default_value_enum()->number()); };
                     break;
                 }
@@ -1539,10 +1539,13 @@ namespace
                     read_function = [this]() -> UInt32
                     {
                         readStr(text_buffer);
-                        return stringToDateTime(text_buffer, date_lut);
+                        return static_cast<UInt32>(stringToDateTime(text_buffer, date_lut));
                     };
 
-                    default_function = [this]() -> UInt32 { return stringToDateTime(field_descriptor.default_value_string(), date_lut); };
+                    default_function = [this]() -> UInt32
+                    {
+                        return static_cast<UInt32>(stringToDateTime(field_descriptor.default_value_string(), date_lut));
+                    };
                     break;
                 }
 
diff --git a/src/Functions/CRC.cpp b/src/Functions/CRC.cpp
index 92f0130c19b..91b549873a3 100644
--- a/src/Functions/CRC.cpp
+++ b/src/Functions/CRC.cpp
@@ -15,7 +15,7 @@ struct CRCBase
     {
         for (size_t i = 0; i < 256; ++i)
         {
-            T c = i;
+            T c = static_cast<T>(i);
             for (size_t j = 0; j < 8; ++j)
                 c = c & 1 ? polynomial ^ (c >> 1) : c >> 1;
             tab[i] = c;
@@ -58,7 +58,7 @@ struct CRC32ZLIBImpl
 
     static UInt32 makeCRC(const unsigned char *buf, size_t size)
     {
-        return crc32_z(0L, buf, size);
+        return static_cast<UInt32>(crc32_z(0L, buf, size));
     }
 };
 
diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h
index b690463d456..413c81d1400 100644
--- a/src/Functions/CustomWeekTransforms.h
+++ b/src/Functions/CustomWeekTransforms.h
@@ -62,10 +62,7 @@ struct ToStartOfWeekImpl
 
     static inline UInt16 execute(Int64 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
-        if (t < 0)
-            return 0;
-
-        return time_zone.toFirstDayNumOfWeek(DayNum(std::min(Int32(time_zone.toDayNum(t)), Int32(DATE_LUT_MAX_DAY_NUM))), week_mode);
+        return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
     }
     static inline UInt16 execute(UInt32 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
@@ -73,10 +70,7 @@ struct ToStartOfWeekImpl
     }
     static inline UInt16 execute(Int32 d, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
-        if (d < 0)
-            return 0;
-
-        return time_zone.toFirstDayNumOfWeek(DayNum(std::min(d, Int32(DATE_LUT_MAX_DAY_NUM))), week_mode);
+        return time_zone.toFirstDayNumOfWeek(ExtendedDayNum(d), week_mode);
     }
     static inline UInt16 execute(UInt16 d, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
@@ -134,14 +128,17 @@ struct WeekTransformer
     void
     vector(const FromVectorType & vec_from, ToVectorType & vec_to, UInt8 week_mode, const DateLUTImpl & time_zone) const
     {
+        using ValueType = typename ToVectorType::value_type;
         size_t size = vec_from.size();
         vec_to.resize(size);
 
         for (size_t i = 0; i < size; ++i)
+        {
             if constexpr (is_extended_result)
-                vec_to[i] = transform.executeExtendedResult(vec_from[i], week_mode, time_zone);
+                vec_to[i] = static_cast<ValueType>(transform.executeExtendedResult(vec_from[i], week_mode, time_zone));
             else
-                vec_to[i] = transform.execute(vec_from[i], week_mode, time_zone);
+                vec_to[i] = static_cast<ValueType>(transform.execute(vec_from[i], week_mode, time_zone));
+        }
     }
 
 private:
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index 217f158cc8e..aa1e1f86569 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -55,15 +55,15 @@ struct ToDateImpl
 
     static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return t < 0 ? 0 : std::min(Int32(time_zone.toDayNum(t)), Int32(DATE_LUT_MAX_DAY_NUM));
+        return UInt16(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toDayNum(t);
+        return UInt16(time_zone.toDayNum(t));
     }
-    static inline UInt16 execute(Int32 t, const DateLUTImpl &)
+    static inline UInt16 execute(Int32, const DateLUTImpl &)
     {
-        return t < 0 ? 0 : std::min(t, Int32(DATE_LUT_MAX_DAY_NUM));
+        throwDateIsNotSupported(name);
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl &)
     {
@@ -104,30 +104,19 @@ struct ToStartOfDayImpl
 
     static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
     {
-        if (t.whole < 0 || (t.whole >= 0 && t.fractional < 0))
-            return 0;
-
-        return time_zone.toDate(std::min<Int64>(t.whole, Int64(0xffffffff)));
+        return static_cast<UInt32>(time_zone.toDate(static_cast<time_t>(t.whole)));
     }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toDate(t);
+        return static_cast<UInt32>(time_zone.toDate(t));
     }
     static inline UInt32 execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        if (d < 0)
-            return 0;
-
-        auto date_time = time_zone.fromDayNum(ExtendedDayNum(d));
-        if (date_time <= 0xffffffff)
-            return date_time;
-        else
-            return time_zone.toDate(0xffffffff);
+        return static_cast<UInt32>(time_zone.toDate(ExtendedDayNum(d)));
     }
     static inline UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        auto date_time = time_zone.fromDayNum(ExtendedDayNum(d));
-        return date_time < 0xffffffff ? date_time : time_zone.toDate(0xffffffff);
+        return static_cast<UInt32>(time_zone.toDate(DayNum(d)));
     }
     static inline DecimalUtils::DecimalComponents<DateTime64> executeExtendedResult(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
     {
@@ -147,16 +136,17 @@ struct ToMondayImpl
 
     static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return t < 0 ? 0 : time_zone.toFirstDayNumOfWeek(ExtendedDayNum(
-                   std::min(Int32(time_zone.toDayNum(t)), Int32(DATE_LUT_MAX_DAY_NUM))));
+        //return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t));
+        return time_zone.toFirstDayNumOfWeek(t);
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
+        //return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t));
         return time_zone.toFirstDayNumOfWeek(t);
     }
     static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return d < 0 ? 0 : time_zone.toFirstDayNumOfWeek(ExtendedDayNum(std::min(d, Int32(DATE_LUT_MAX_DAY_NUM))));
+        return time_zone.toFirstDayNumOfWeek(ExtendedDayNum(d));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
@@ -179,15 +169,15 @@ struct ToStartOfMonthImpl
 
     static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return t < 0 ? 0 : time_zone.toFirstDayNumOfMonth(ExtendedDayNum(std::min(Int32(time_zone.toDayNum(t)), Int32(DATE_LUT_MAX_DAY_NUM))));
+        return time_zone.toFirstDayNumOfMonth(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfMonth(ExtendedDayNum(time_zone.toDayNum(t)));
+        return time_zone.toFirstDayNumOfMonth(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return d < 0 ? 0 : time_zone.toFirstDayNumOfMonth(ExtendedDayNum(std::min(d, Int32(DATE_LUT_MAX_DAY_NUM))));
+        return time_zone.toFirstDayNumOfMonth(ExtendedDayNum(d));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
@@ -211,11 +201,7 @@ struct ToLastDayOfMonthImpl
 
     static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        if (t < 0)
-            return 0;
-
-        /// 0xFFF9 is Int value for 2149-05-31 -- the last day where we can actually find LastDayOfMonth. This will also be the return value.
-        return time_zone.toLastDayNumOfMonth(ExtendedDayNum(std::min(Int32(time_zone.toDayNum(t)), Int32(0xFFF9))));
+        return time_zone.toLastDayNumOfMonth(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
@@ -223,16 +209,11 @@ struct ToLastDayOfMonthImpl
     }
     static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        if (d < 0)
-            return 0;
-
-        /// 0xFFF9 is Int value for 2149-05-31 -- the last day where we can actually find LastDayOfMonth. This will also be the return value.
-        return time_zone.toLastDayNumOfMonth(ExtendedDayNum(std::min(d, Int32(0xFFF9))));
+        return time_zone.toLastDayNumOfMonth(ExtendedDayNum(d));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        /// 0xFFF9 is Int value for 2149-05-31 -- the last day where we can actually find LastDayOfMonth. This will also be the return value.
-        return time_zone.toLastDayNumOfMonth(DayNum(std::min(d, UInt16(0xFFF9))));
+        return time_zone.toLastDayNumOfMonth(DayNum(d));
     }
     static inline Int64 executeExtendedResult(Int64 t, const DateLUTImpl & time_zone)
     {
@@ -251,7 +232,7 @@ struct ToStartOfQuarterImpl
 
     static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return t < 0 ? 0 : time_zone.toFirstDayNumOfQuarter(ExtendedDayNum(std::min<Int64>(Int64(time_zone.toDayNum(t)), Int64(DATE_LUT_MAX_DAY_NUM))));
+        return time_zone.toFirstDayNumOfQuarter(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
@@ -259,7 +240,7 @@ struct ToStartOfQuarterImpl
     }
     static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return d < 0 ? 0 : time_zone.toFirstDayNumOfQuarter(ExtendedDayNum(std::min<Int32>(d, Int32(DATE_LUT_MAX_DAY_NUM))));
+        return time_zone.toFirstDayNumOfQuarter(ExtendedDayNum(d));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
@@ -282,7 +263,7 @@ struct ToStartOfYearImpl
 
     static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return t < 0 ? 0 : time_zone.toFirstDayNumOfYear(ExtendedDayNum(std::min(Int32(time_zone.toDayNum(t)), Int32(DATE_LUT_MAX_DAY_NUM))));
+        return time_zone.toFirstDayNumOfYear(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
@@ -290,7 +271,7 @@ struct ToStartOfYearImpl
     }
     static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return d < 0 ? 0 : time_zone.toFirstDayNumOfYear(ExtendedDayNum(std::min(d, Int32(DATE_LUT_MAX_DAY_NUM))));
+        return time_zone.toFirstDayNumOfYear(ExtendedDayNum(d));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
@@ -316,11 +297,11 @@ struct ToTimeImpl
 
     static UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toTime(t.whole) + 86400;
+        return static_cast<UInt32>(time_zone.toTime(t.whole) + 86400);
     }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toTime(t) + 86400;
+        return static_cast<UInt32>(time_zone.toTime(t) + 86400);
     }
     static inline UInt32 execute(Int32, const DateLUTImpl &)
     {
@@ -340,10 +321,7 @@ struct ToStartOfMinuteImpl
 
     static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
     {
-        if (t.whole < 0 || (t.whole >= 0 && t.fractional < 0))
-            return 0;
-
-        return time_zone.toStartOfMinute(std::min<Int64>(t.whole, Int64(0xffffffff)));
+        return static_cast<UInt32>(time_zone.toStartOfMinute(t.whole));
     }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
@@ -541,7 +519,7 @@ struct ToStartOfFiveMinutesImpl
 
     static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toStartOfFiveMinutes(t.whole);
+        return static_cast<UInt32>(time_zone.toStartOfFiveMinutes(t.whole));
     }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
@@ -573,7 +551,7 @@ struct ToStartOfTenMinutesImpl
 
     static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toStartOfTenMinutes(t.whole);
+        return static_cast<UInt32>(time_zone.toStartOfTenMinutes(t.whole));
     }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
@@ -605,7 +583,7 @@ struct ToStartOfFifteenMinutesImpl
 
     static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toStartOfFifteenMinutes(t.whole);
+        return static_cast<UInt32>(time_zone.toStartOfFifteenMinutes(t.whole));
     }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
@@ -638,7 +616,7 @@ struct TimeSlotImpl
 
     static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl &)
     {
-        return t.whole / 1800 * 1800;
+        return static_cast<UInt32>(t.whole / 1800 * 1800);
     }
 
     static inline UInt32 execute(UInt32 t, const DateLUTImpl &)
@@ -677,10 +655,7 @@ struct ToStartOfHourImpl
 
     static inline UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & time_zone)
     {
-        if (t.whole < 0 || (t.whole >= 0 && t.fractional < 0))
-            return 0;
-
-        return time_zone.toStartOfHour(std::min<Int64>(t.whole, Int64(0xffffffff)));
+        return static_cast<UInt32>(time_zone.toStartOfHour(t.whole));
     }
 
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
@@ -1034,21 +1009,39 @@ struct ToISOWeekImpl
     using FactorTransform = ToISOYearImpl;
 };
 
+enum class ResultPrecision
+{
+    Standard,
+    Extended
+};
+
+/// Standard precision results (precision_ == ResultPrecision::Standard) potentially lead to overflows when returning values.
+/// This mode is used by SQL functions "toRelative*Num()" which cannot easily be changed due to backward compatibility.
+/// According to documentation, these functions merely need to compute the time difference to a deterministic, fixed point in the past.
+/// As a future TODO, we should fix their behavior in a backwards-compatible way.
+/// See https://github.com/ClickHouse/ClickHouse/issues/41977#issuecomment-1267536814.
+template <ResultPrecision precision_>
 struct ToRelativeYearNumImpl
 {
     static constexpr auto name = "toRelativeYearNum";
 
-    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    static inline auto execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toYear(t);
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int16>(time_zone.toYear(t));
+        else
+            return static_cast<UInt16>(time_zone.toYear(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toYear(static_cast<time_t>(t));
     }
-    static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
+    static inline auto execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toYear(ExtendedDayNum(d));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int16>(time_zone.toYear(ExtendedDayNum(d)));
+        else
+            return static_cast<UInt16>(time_zone.toYear(ExtendedDayNum(d)));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
@@ -1058,21 +1051,28 @@ struct ToRelativeYearNumImpl
     using FactorTransform = ZeroTransform;
 };
 
+template <ResultPrecision precision_>
 struct ToRelativeQuarterNumImpl
 {
     static constexpr auto name = "toRelativeQuarterNum";
 
-    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    static inline auto execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeQuarterNum(t);
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int32>(time_zone.toRelativeQuarterNum(t));
+        else
+            return static_cast<UInt16>(time_zone.toRelativeQuarterNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toRelativeQuarterNum(static_cast<time_t>(t));
     }
-    static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
+    static inline auto execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeQuarterNum(ExtendedDayNum(d));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int32>(time_zone.toRelativeQuarterNum(ExtendedDayNum(d)));
+        else
+            return static_cast<UInt16>(time_zone.toRelativeQuarterNum(ExtendedDayNum(d)));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
@@ -1082,21 +1082,28 @@ struct ToRelativeQuarterNumImpl
     using FactorTransform = ZeroTransform;
 };
 
+template <ResultPrecision precision_>
 struct ToRelativeMonthNumImpl
 {
     static constexpr auto name = "toRelativeMonthNum";
 
-    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    static inline auto execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeMonthNum(t);
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int32>(time_zone.toRelativeMonthNum(t));
+        else
+            return static_cast<UInt16>(time_zone.toRelativeMonthNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toRelativeMonthNum(static_cast<time_t>(t));
     }
-    static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
+    static inline auto execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeMonthNum(ExtendedDayNum(d));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int32>(time_zone.toRelativeMonthNum(ExtendedDayNum(d)));
+        else
+            return static_cast<UInt16>(time_zone.toRelativeMonthNum(ExtendedDayNum(d)));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
@@ -1106,21 +1113,28 @@ struct ToRelativeMonthNumImpl
     using FactorTransform = ZeroTransform;
 };
 
+template <ResultPrecision precision_>
 struct ToRelativeWeekNumImpl
 {
     static constexpr auto name = "toRelativeWeekNum";
 
-    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    static inline auto execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeWeekNum(t);
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int32>(time_zone.toRelativeWeekNum(t));
+        else
+            return static_cast<UInt16>(time_zone.toRelativeWeekNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toRelativeWeekNum(static_cast<time_t>(t));
     }
-    static inline UInt16 execute(Int32 d, const DateLUTImpl & time_zone)
+    static inline auto execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeWeekNum(ExtendedDayNum(d));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int32>(time_zone.toRelativeWeekNum(ExtendedDayNum(d)));
+        else
+            return static_cast<UInt16>(time_zone.toRelativeWeekNum(ExtendedDayNum(d)));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
@@ -1130,21 +1144,28 @@ struct ToRelativeWeekNumImpl
     using FactorTransform = ZeroTransform;
 };
 
+template <ResultPrecision precision_>
 struct ToRelativeDayNumImpl
 {
     static constexpr auto name = "toRelativeDayNum";
 
-    static inline UInt16 execute(Int64 t, const DateLUTImpl & time_zone)
+    static inline auto execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toDayNum(t);
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int64>(time_zone.toDayNum(t));
+        else
+            return static_cast<UInt16>(time_zone.toDayNum(t));
     }
     static inline UInt16 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
         return time_zone.toDayNum(static_cast<time_t>(t));
     }
-    static inline UInt16 execute(Int32 d, const DateLUTImpl &)
+    static inline auto execute(Int32 d, const DateLUTImpl &)
     {
-        return static_cast<ExtendedDayNum>(d);
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int32>(static_cast<ExtendedDayNum>(d));
+        else
+            return static_cast<UInt16>(static_cast<ExtendedDayNum>(d));
     }
     static inline UInt16 execute(UInt16 d, const DateLUTImpl &)
     {
@@ -1154,55 +1175,75 @@ struct ToRelativeDayNumImpl
     using FactorTransform = ZeroTransform;
 };
 
-
+template <ResultPrecision precision_>
 struct ToRelativeHourNumImpl
 {
     static constexpr auto name = "toRelativeHourNum";
 
-    static inline UInt32 execute(Int64 t, const DateLUTImpl & time_zone)
+    static inline auto execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeHourNum(t);
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int64>(time_zone.toStableRelativeHourNum(t));
+        else
+            return static_cast<UInt32>(time_zone.toRelativeHourNum(t));
     }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeHourNum(static_cast<time_t>(t));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<UInt32>(time_zone.toStableRelativeHourNum(static_cast<time_t>(t)));
+        else
+            return static_cast<UInt32>(time_zone.toRelativeHourNum(static_cast<time_t>(t)));
     }
-    static inline UInt32 execute(Int32 d, const DateLUTImpl & time_zone)
+    static inline auto execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeHourNum(ExtendedDayNum(d));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int64>(time_zone.toStableRelativeHourNum(ExtendedDayNum(d)));
+        else
+            return static_cast<UInt32>(time_zone.toRelativeHourNum(ExtendedDayNum(d)));
     }
     static inline UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeHourNum(DayNum(d));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<UInt32>(time_zone.toStableRelativeHourNum(DayNum(d)));
+        else
+            return static_cast<UInt32>(time_zone.toRelativeHourNum(DayNum(d)));
     }
 
     using FactorTransform = ZeroTransform;
 };
 
+template <ResultPrecision precision_>
 struct ToRelativeMinuteNumImpl
 {
     static constexpr auto name = "toRelativeMinuteNum";
 
-    static inline UInt32 execute(Int64 t, const DateLUTImpl & time_zone)
+    static inline auto execute(Int64 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeMinuteNum(t);
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int64>(time_zone.toRelativeMinuteNum(t));
+        else
+            return static_cast<UInt32>(time_zone.toRelativeMinuteNum(t));
     }
     static inline UInt32 execute(UInt32 t, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeMinuteNum(static_cast<time_t>(t));
+        return static_cast<UInt32>(time_zone.toRelativeMinuteNum(static_cast<time_t>(t)));
     }
-    static inline UInt32 execute(Int32 d, const DateLUTImpl & time_zone)
+    static inline auto execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeMinuteNum(ExtendedDayNum(d));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int64>(time_zone.toRelativeMinuteNum(ExtendedDayNum(d)));
+        else
+            return static_cast<UInt32>(time_zone.toRelativeMinuteNum(ExtendedDayNum(d)));
     }
     static inline UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.toRelativeMinuteNum(DayNum(d));
+        return static_cast<UInt32>(time_zone.toRelativeMinuteNum(DayNum(d)));
     }
 
     using FactorTransform = ZeroTransform;
 };
 
+template <ResultPrecision precision_>
 struct ToRelativeSecondNumImpl
 {
     static constexpr auto name = "toRelativeSecondNum";
@@ -1215,13 +1256,16 @@ struct ToRelativeSecondNumImpl
     {
         return t;
     }
-    static inline UInt32 execute(Int32 d, const DateLUTImpl & time_zone)
+    static inline auto execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.fromDayNum(ExtendedDayNum(d));
+        if constexpr (precision_ == ResultPrecision::Extended)
+            return static_cast<Int64>(time_zone.fromDayNum(ExtendedDayNum(d)));
+        else
+            return static_cast<UInt32>(time_zone.fromDayNum(ExtendedDayNum(d)));
     }
     static inline UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return time_zone.fromDayNum(DayNum(d));
+        return static_cast<UInt32>(time_zone.fromDayNum(DayNum(d)));
     }
 
     using FactorTransform = ZeroTransform;
@@ -1306,14 +1350,17 @@ struct Transformer
     template <typename FromTypeVector, typename ToTypeVector>
     static void vector(const FromTypeVector & vec_from, ToTypeVector & vec_to, const DateLUTImpl & time_zone, const Transform & transform)
     {
+        using ValueType = typename ToTypeVector::value_type;
         size_t size = vec_from.size();
         vec_to.resize(size);
 
         for (size_t i = 0; i < size; ++i)
+        {
             if constexpr (is_extended_result)
-                vec_to[i] = transform.executeExtendedResult(vec_from[i], time_zone);
+                vec_to[i] = static_cast<ValueType>(transform.executeExtendedResult(vec_from[i], time_zone));
             else
-                vec_to[i] = transform.execute(vec_from[i], time_zone);
+                vec_to[i] = static_cast<ValueType>(transform.execute(vec_from[i], time_zone));
+        }
     }
 };
 
diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index e120595c4d9..98e5c690eb9 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -163,7 +163,7 @@ struct ModuloImpl
                     return static_cast<Result>(int_a % static_cast<CastA>(int_b));
             }
             else
-                return IntegerAType(a) % IntegerBType(b);
+                return static_cast<Result>(IntegerAType(a) % IntegerBType(b));
         }
     }
 
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index baa3c65537d..52a2da66c72 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -415,8 +415,8 @@ public:
             {
                 for (size_t i = 0; i < size; ++i)
                     c[i] = applyScaled<true>(
-                        unwrap<op_case, OpCase::LeftConstant>(a, i),
-                        unwrap<op_case, OpCase::RightConstant>(b, i),
+                        static_cast<NativeResultType>(unwrap<op_case, OpCase::LeftConstant>(a, i)),
+                        static_cast<NativeResultType>(unwrap<op_case, OpCase::RightConstant>(b, i)),
                         scale_a);
                 return;
             }
@@ -424,8 +424,8 @@ public:
             {
                 for (size_t i = 0; i < size; ++i)
                     c[i] = applyScaled<false>(
-                        unwrap<op_case, OpCase::LeftConstant>(a, i),
-                        unwrap<op_case, OpCase::RightConstant>(b, i),
+                        static_cast<NativeResultType>(unwrap<op_case, OpCase::LeftConstant>(a, i)),
+                        static_cast<NativeResultType>(unwrap<op_case, OpCase::RightConstant>(b, i)),
                         scale_b);
                 return;
             }
@@ -436,8 +436,8 @@ public:
             {
                 for (size_t i = 0; i < size; ++i)
                     c[i] = applyScaled<true, false>(
-                        unwrap<op_case, OpCase::LeftConstant>(a, i),
-                        unwrap<op_case, OpCase::RightConstant>(b, i),
+                        static_cast<NativeResultType>(unwrap<op_case, OpCase::LeftConstant>(a, i)),
+                        static_cast<NativeResultType>(unwrap<op_case, OpCase::RightConstant>(b, i)),
                         scale_a);
                 return;
             }
@@ -445,8 +445,8 @@ public:
             {
                 for (size_t i = 0; i < size; ++i)
                     c[i] = applyScaled<false, false>(
-                        unwrap<op_case, OpCase::LeftConstant>(a, i),
-                        unwrap<op_case, OpCase::RightConstant>(b, i),
+                        static_cast<NativeResultType>(unwrap<op_case, OpCase::LeftConstant>(a, i)),
+                        static_cast<NativeResultType>(unwrap<op_case, OpCase::RightConstant>(b, i)),
                         scale_b);
                 return;
             }
@@ -456,12 +456,20 @@ public:
         {
             processWithRightNullmapImpl<op_case>(a, b, c, size, right_nullmap, [&scale_a](const auto & left, const auto & right)
             {
-                return applyScaledDiv<is_decimal_a>(left, right, scale_a);
+                return applyScaledDiv<is_decimal_a>(
+                    static_cast<NativeResultType>(left), right, scale_a);
             });
             return;
         }
 
-        processWithRightNullmapImpl<op_case>(a, b, c, size, right_nullmap, [](const auto & left, const auto & right){ return apply(left, right); });
+        processWithRightNullmapImpl<op_case>(
+            a, b, c, size, right_nullmap,
+            [](const auto & left, const auto & right)
+            {
+                return apply(
+                    static_cast<NativeResultType>(left),
+                    static_cast<NativeResultType>(right));
+            });
     }
 
     template <bool is_decimal_a, bool is_decimal_b, class A, class B>
@@ -899,10 +907,10 @@ class FunctionBinaryArithmetic : public IFunction
             std::swap(new_arguments[0], new_arguments[1]);
 
         /// Change interval argument type to its representation
-        new_arguments[1].type = std::make_shared<DataTypeNumber<DataTypeInterval::FieldType>>();
+        if (WhichDataType(new_arguments[1].type).isInterval())
+            new_arguments[1].type = std::make_shared<DataTypeNumber<DataTypeInterval::FieldType>>();
 
         auto function = function_builder->build(new_arguments);
-
         return function->execute(new_arguments, result_type, input_rows_count);
     }
 
@@ -995,8 +1003,10 @@ class FunctionBinaryArithmetic : public IFunction
         /// non-vector result
         if (col_left_const && col_right_const)
         {
-            const NativeResultType const_a = helperGetOrConvert<T0, ResultDataType>(col_left_const, left);
-            const NativeResultType const_b = helperGetOrConvert<T1, ResultDataType>(col_right_const, right);
+            const NativeResultType const_a = static_cast<NativeResultType>(
+                helperGetOrConvert<T0, ResultDataType>(col_left_const, left));
+            const NativeResultType const_b = static_cast<NativeResultType>(
+                helperGetOrConvert<T1, ResultDataType>(col_right_const, right));
 
             ResultType res = {};
             if (!right_nullmap || !(*right_nullmap)[0])
@@ -1020,14 +1030,16 @@ class FunctionBinaryArithmetic : public IFunction
         }
         else if (col_left_const && col_right)
         {
-            const NativeResultType const_a = helperGetOrConvert<T0, ResultDataType>(col_left_const, left);
+            const NativeResultType const_a = static_cast<NativeResultType>(
+                helperGetOrConvert<T0, ResultDataType>(col_left_const, left));
 
             helperInvokeEither<OpCase::LeftConstant, left_is_decimal, right_is_decimal, OpImpl, OpImplCheck>(
                 const_a, col_right->getData(), vec_res, scale_a, scale_b, right_nullmap);
         }
         else if (col_left && col_right_const)
         {
-            const NativeResultType const_b = helperGetOrConvert<T1, ResultDataType>(col_right_const, right);
+            const NativeResultType const_b = static_cast<NativeResultType>(
+                helperGetOrConvert<T1, ResultDataType>(col_right_const, right));
 
             helperInvokeEither<OpCase::RightConstant, left_is_decimal, right_is_decimal, OpImpl, OpImplCheck>(
                 col_left->getData(), const_b, vec_res, scale_a, scale_b, right_nullmap);
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index 29dcf87316d..2259cc71f07 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -63,7 +63,7 @@ struct AddNanosecondsImpl
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
         Int64 multiplier = DecimalUtils::scaleMultiplier<DateTime64>(9);
-        return t * multiplier + delta;
+        return static_cast<UInt32>(t * multiplier + delta);
     }
 
     static inline NO_SANITIZE_UNDEFINED DateTime64 execute(UInt16, Int64, const DateLUTImpl &, UInt16 = 0)
@@ -107,7 +107,7 @@ struct AddMicrosecondsImpl
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
         Int64 multiplier = DecimalUtils::scaleMultiplier<DateTime64>(6);
-        return t * multiplier + delta;
+        return static_cast<UInt32>(t * multiplier + delta);
     }
 
     static inline NO_SANITIZE_UNDEFINED DateTime64 execute(UInt16, Int64, const DateLUTImpl &, UInt16 = 0)
@@ -151,7 +151,7 @@ struct AddMillisecondsImpl
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
         Int64 multiplier = DecimalUtils::scaleMultiplier<DateTime64>(3);
-        return t * multiplier + delta;
+        return static_cast<UInt32>(t * multiplier + delta);
     }
 
     static inline NO_SANITIZE_UNDEFINED DateTime64 execute(UInt16, Int64, const DateLUTImpl &, UInt16 = 0)
@@ -183,7 +183,7 @@ struct AddSecondsImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
-        return t + delta;
+        return static_cast<UInt32>(t + delta);
     }
 
     static inline NO_SANITIZE_UNDEFINED Int64 execute(Int32 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
@@ -194,7 +194,7 @@ struct AddSecondsImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
-        return time_zone.fromDayNum(DayNum(d)) + delta;
+        return static_cast<UInt32>(time_zone.fromDayNum(DayNum(d)) + delta);
     }
 };
 
@@ -216,7 +216,7 @@ struct AddMinutesImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
-        return t + delta * 60;
+        return static_cast<UInt32>(t + delta * 60);
     }
 
     static inline NO_SANITIZE_UNDEFINED Int64 execute(Int32 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
@@ -227,7 +227,7 @@ struct AddMinutesImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
-        return time_zone.fromDayNum(DayNum(d)) + delta * 60;
+        return static_cast<UInt32>(time_zone.fromDayNum(DayNum(d)) + delta * 60);
     }
 };
 
@@ -249,7 +249,7 @@ struct AddHoursImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
-        return t + delta * 3600;
+        return static_cast<UInt32>(t + delta * 3600);
     }
 
     static inline NO_SANITIZE_UNDEFINED Int64 execute(Int32 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
@@ -260,7 +260,7 @@ struct AddHoursImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
-        return time_zone.fromDayNum(DayNum(d)) + delta * 3600;
+        return static_cast<UInt32>(time_zone.fromDayNum(DayNum(d)) + delta * 3600);
     }
 };
 
@@ -284,7 +284,7 @@ struct AddDaysImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
-        return time_zone.addDays(t, delta);
+        return static_cast<UInt32>(time_zone.addDays(t, delta));
     }
 
     static inline NO_SANITIZE_UNDEFINED UInt16 execute(UInt16 d, Int64 delta, const DateLUTImpl &, UInt16 = 0)
@@ -294,7 +294,7 @@ struct AddDaysImpl
 
     static inline NO_SANITIZE_UNDEFINED Int32 execute(Int32 d, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
-        return d + delta;
+        return static_cast<Int32>(d + delta);
     }
 };
 
@@ -303,32 +303,32 @@ struct AddWeeksImpl
     static constexpr auto name = "addWeeks";
 
     static inline NO_SANITIZE_UNDEFINED DecimalUtils::DecimalComponents<DateTime64>
-    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int32 delta, const DateLUTImpl & time_zone, UInt16 = 0)
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
         return {time_zone.addWeeks(t.whole, delta), t.fractional};
     }
 
     static inline NO_SANITIZE_UNDEFINED DateTime64
-    execute(DateTime64 t, Int32 delta, const DateLUTImpl & time_zone, UInt16 scale = 0)
+    execute(DateTime64 t, Int64 delta, const DateLUTImpl & time_zone, UInt16 scale = 0)
     {
         auto multiplier = DecimalUtils::scaleMultiplier<DateTime64>(scale);
         auto d = std::div(t, multiplier);
         return time_zone.addDays(d.quot, delta * 7) * multiplier + d.rem;
     }
 
-    static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int32 delta, const DateLUTImpl & time_zone, UInt16 = 0)
+    static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
-        return time_zone.addWeeks(t, delta);
+        return static_cast<UInt32>(time_zone.addWeeks(t, delta));
     }
 
-    static inline NO_SANITIZE_UNDEFINED UInt16 execute(UInt16 d, Int32 delta, const DateLUTImpl &, UInt16 = 0)
+    static inline NO_SANITIZE_UNDEFINED UInt16 execute(UInt16 d, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
-        return d + delta * 7;
+        return static_cast<UInt16>(d + delta * 7);
     }
 
-    static inline NO_SANITIZE_UNDEFINED Int32 execute(Int32 d, Int32 delta, const DateLUTImpl &, UInt16 = 0)
+    static inline NO_SANITIZE_UNDEFINED Int32 execute(Int32 d, Int64 delta, const DateLUTImpl &, UInt16 = 0)
     {
-        return d + delta * 7;
+        return static_cast<Int32>(d + delta * 7);
     }
 };
 
@@ -352,7 +352,7 @@ struct AddMonthsImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
-        return time_zone.addMonths(t, delta);
+        return static_cast<UInt32>(time_zone.addMonths(t, delta));
     }
 
     static inline NO_SANITIZE_UNDEFINED UInt16 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
@@ -371,30 +371,30 @@ struct AddQuartersImpl
     static constexpr auto name = "addQuarters";
 
     static inline DecimalUtils::DecimalComponents<DateTime64>
-    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int32 delta, const DateLUTImpl & time_zone, UInt16 = 0)
+    execute(DecimalUtils::DecimalComponents<DateTime64> t, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
         return {time_zone.addQuarters(t.whole, delta), t.fractional};
     }
 
     static inline NO_SANITIZE_UNDEFINED DateTime64
-    execute(DateTime64 t, Int32 delta, const DateLUTImpl & time_zone, UInt16 scale = 0)
+    execute(DateTime64 t, Int64 delta, const DateLUTImpl & time_zone, UInt16 scale = 0)
     {
         auto multiplier = DecimalUtils::scaleMultiplier<DateTime64>(scale);
         auto d = std::div(t, multiplier);
         return time_zone.addQuarters(d.quot, delta) * multiplier + d.rem;
     }
 
-    static inline UInt32 execute(UInt32 t, Int32 delta, const DateLUTImpl & time_zone, UInt16 = 0)
+    static inline UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
-        return time_zone.addQuarters(t, delta);
+        return static_cast<UInt32>(time_zone.addQuarters(t, delta));
     }
 
-    static inline UInt16 execute(UInt16 d, Int32 delta, const DateLUTImpl & time_zone, UInt16 = 0)
+    static inline UInt16 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
         return time_zone.addQuarters(DayNum(d), delta);
     }
 
-    static inline Int32 execute(Int32 d, Int32 delta, const DateLUTImpl & time_zone, UInt16 = 0)
+    static inline Int32 execute(Int32 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
         return time_zone.addQuarters(ExtendedDayNum(d), delta);
     }
@@ -420,7 +420,7 @@ struct AddYearsImpl
 
     static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
     {
-        return time_zone.addYears(t, delta);
+        return static_cast<UInt32>(time_zone.addYears(t, delta));
     }
 
     static inline NO_SANITIZE_UNDEFINED UInt16 execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone, UInt16 = 0)
diff --git a/src/Functions/FunctionIfBase.h b/src/Functions/FunctionIfBase.h
index 2b0f8289914..4c9ecf78a12 100644
--- a/src/Functions/FunctionIfBase.h
+++ b/src/Functions/FunctionIfBase.h
@@ -67,7 +67,7 @@ public:
 
         b.SetInsertPoint(join);
 
-        auto * phi = b.CreatePHI(toNativeType(b, return_type), returns.size());
+        auto * phi = b.CreatePHI(toNativeType(b, return_type), static_cast<unsigned>(returns.size()));
         for (const auto & [block, value] : returns)
             phi->addIncoming(value, block);
 
diff --git a/src/Functions/FunctionSQLJSON.h b/src/Functions/FunctionSQLJSON.h
index dce953ddc6f..3a0f4f483b3 100644
--- a/src/Functions/FunctionSQLJSON.h
+++ b/src/Functions/FunctionSQLJSON.h
@@ -164,7 +164,7 @@ public:
         /// 2. Create ASTPtr
         /// 3. Parser(Tokens, ASTPtr) -> complete AST
         /// 4. Execute functions: call getNextItem on generator and handle each item
-        uint32_t parse_depth = getContext()->getSettingsRef().max_parser_depth;
+        unsigned parse_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
 #if USE_SIMDJSON
         if (getContext()->getSettingsRef().allow_simdjson)
             return FunctionSQLJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count, parse_depth);
diff --git a/src/Functions/FunctionShowCertificate.h b/src/Functions/FunctionShowCertificate.h
index 32041e55b00..3c30d8138e5 100644
--- a/src/Functions/FunctionShowCertificate.h
+++ b/src/Functions/FunctionShowCertificate.h
@@ -2,6 +2,9 @@
 
 #include "config.h"
 
+#include <memory>
+#include <string>
+
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnString.h>
@@ -33,14 +36,18 @@ class FunctionShowCertificate : public IFunction
 public:
     static constexpr auto name = "showCertificate";
 
-    static FunctionPtr create(ContextPtr)
+    static FunctionPtr create(ContextPtr ctx)
     {
 #if !defined(USE_SSL) || USE_SSL == 0
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSL support is disabled");
 #endif
-        return std::make_shared<FunctionShowCertificate>();
+        return std::make_shared<FunctionShowCertificate>(ctx->getQueryContext()->getClientInfo().certificate);
     }
 
+    std::string certificate;
+
+    explicit FunctionShowCertificate(const std::string & certificate_ = "") : certificate(certificate_) {}
+
     String getName() const override { return name; }
 
     size_t getNumberOfArguments() const override { return 0; }
@@ -61,7 +68,15 @@ public:
         if (input_rows_count)
         {
 #if USE_SSL
-            if (const X509 * cert = SSL_CTX_get0_certificate(Poco::Net::SSLManager::instance().defaultServerContext()->sslContext()))
+            std::unique_ptr<Poco::Crypto::X509Certificate> x509_cert;
+            if (!certificate.empty())
+                x509_cert = std::make_unique<Poco::Crypto::X509Certificate>(certificate);
+
+            const X509 * cert = x509_cert ?
+                x509_cert->certificate() :
+                SSL_CTX_get0_certificate(Poco::Net::SSLManager::instance().defaultServerContext()->sslContext());
+
+            if (cert)
             {
                 BIO * b = BIO_new(BIO_s_mem());
                 SCOPE_EXIT(
diff --git a/src/Functions/FunctionSnowflake.h b/src/Functions/FunctionSnowflake.h
index f4a62e509ed..998db98890a 100644
--- a/src/Functions/FunctionSnowflake.h
+++ b/src/Functions/FunctionSnowflake.h
@@ -109,7 +109,8 @@ public:
 
         for (size_t i = 0; i < input_rows_count; ++i)
         {
-            result_data[i] = ((source_data[i] >> time_shift) + snowflake_epoch) / 1000;
+            result_data[i] = static_cast<UInt32>(
+                ((source_data[i] >> time_shift) + snowflake_epoch) / 1000);
         }
         return res_column;
     }
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index 8c248d79c4b..d869ccccca8 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -57,7 +57,7 @@ public:
 
         const auto & source_data = typeid_cast<const ColumnDecimal<DateTime64> &>(col).getData();
 
-        const Int32 scale_diff = typeid_cast<const DataTypeDateTime64 &>(*src.type).getScale() - target_scale;
+        const Int32 scale_diff = static_cast<Int32>(typeid_cast<const DataTypeDateTime64 &>(*src.type).getScale() - target_scale);
         if (scale_diff == 0)
         {
             for (size_t i = 0; i < input_rows_count; ++i)
@@ -140,7 +140,7 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        auto result_column = ColumnDecimal<DateTime64>::create(input_rows_count, target_scale);
+        auto result_column = ColumnDecimal<DateTime64>::create(input_rows_count, static_cast<UInt32>(target_scale));
 
         if (!((executeType<UInt8>(result_column, arguments, input_rows_count))
               || (executeType<UInt16>(result_column, arguments, input_rows_count))
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index 94ff55d180b..ad129a315b3 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -2,6 +2,7 @@
 
 #include "config.h"
 
+#include <Common/safe_cast.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -336,7 +337,7 @@ private:
                     if (EVP_EncryptInit_ex(evp_ctx, evp_cipher, nullptr, nullptr, nullptr) != 1)
                         onError("Failed to initialize encryption context with cipher");
 
-                    if (EVP_CIPHER_CTX_ctrl(evp_ctx, EVP_CTRL_AEAD_SET_IVLEN, iv_value.size, nullptr) != 1)
+                    if (EVP_CIPHER_CTX_ctrl(evp_ctx, EVP_CTRL_AEAD_SET_IVLEN, safe_cast<int>(iv_value.size), nullptr) != 1)
                         onError("Failed to set custom IV length to " + std::to_string(iv_value.size));
 
                     if (EVP_EncryptInit_ex(evp_ctx, nullptr, nullptr,
@@ -350,7 +351,7 @@ private:
                         const auto aad_data = aad_column->getDataAt(row_idx);
                         int tmp_len = 0;
                         if (aad_data.size != 0 && EVP_EncryptUpdate(evp_ctx, nullptr, &tmp_len,
-                                reinterpret_cast<const unsigned char *>(aad_data.data), aad_data.size) != 1)
+                                reinterpret_cast<const unsigned char *>(aad_data.data), safe_cast<int>(aad_data.size)) != 1)
                             onError("Failed to set AAD data");
                     }
                 }
@@ -636,7 +637,7 @@ private:
                         onError("Failed to initialize cipher context 1");
 
                     // 1.a.1 : Set custom IV length
-                    if (EVP_CIPHER_CTX_ctrl(evp_ctx, EVP_CTRL_AEAD_SET_IVLEN, iv_value.size, nullptr) != 1)
+                    if (EVP_CIPHER_CTX_ctrl(evp_ctx, EVP_CTRL_AEAD_SET_IVLEN, safe_cast<int>(iv_value.size), nullptr) != 1)
                         onError("Failed to set custom IV length to " + std::to_string(iv_value.size));
 
                     // 1.a.1 : Init CTX with key and IV
@@ -651,7 +652,7 @@ private:
                         StringRef aad_data = aad_column->getDataAt(row_idx);
                         int tmp_len = 0;
                         if (aad_data.size != 0 && EVP_DecryptUpdate(evp_ctx, nullptr, &tmp_len,
-                                reinterpret_cast<const unsigned char *>(aad_data.data), aad_data.size) != 1)
+                                reinterpret_cast<const unsigned char *>(aad_data.data), safe_cast<int>(aad_data.size)) != 1)
                             onError("Failed to sed AAD data");
                     }
                 }
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 8cbe3b0e532..9bf2c4022fc 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -101,7 +101,7 @@ inline UInt32 extractToDecimalScale(const ColumnWithTypeAndName & named_column)
 
     Field field;
     named_column.column->get(0, field);
-    return field.get<UInt32>();
+    return static_cast<UInt32>(field.get<UInt32>());
 }
 
 /// Function toUnixTimestamp has exactly the same implementation as toDateTime of String type.
@@ -302,11 +302,6 @@ struct ConvertImpl
     }
 };
 
-/** Conversion of Date32 to Date: check bounds.
-  */
-template <typename Name> struct ConvertImpl<DataTypeDate32, DataTypeDate, Name, ConvertDefaultBehaviorTag>
-    : DateTimeTransformImpl<DataTypeDate32, DataTypeDate, ToDateImpl> {};
-
 /** Conversion of DateTime to Date: throw off time component.
   */
 template <typename Name> struct ConvertImpl<DataTypeDateTime, DataTypeDate, Name, ConvertDefaultBehaviorTag>
@@ -325,17 +320,12 @@ struct ToDateTimeImpl
 
     static UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        auto date_time = time_zone.fromDayNum(ExtendedDayNum(d));
-        return date_time <= 0xffffffff ? UInt32(date_time) : UInt32(0xffffffff);
+        return static_cast<UInt32>(time_zone.fromDayNum(DayNum(d)));
     }
 
-    static UInt32 execute(Int32 d, const DateLUTImpl & time_zone)
+    static Int64 execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        if (d < 0)
-            return 0;
-
-        auto date_time = time_zone.fromDayNum(ExtendedDayNum(d));
-        return date_time <= 0xffffffff ? date_time : 0xffffffff;
+        return time_zone.fromDayNum(ExtendedDayNum(d));
     }
 
     static UInt32 execute(UInt32 dt, const DateLUTImpl & /*time_zone*/)
@@ -343,21 +333,10 @@ struct ToDateTimeImpl
         return dt;
     }
 
-    static UInt32 execute(Int64 d, const DateLUTImpl & time_zone)
+    // TODO: return UInt32 ???
+    static Int64 execute(Int64 dt64, const DateLUTImpl & /*time_zone*/)
     {
-        if (d < 0)
-            return 0;
-
-        auto date_time = time_zone.toDate(d);
-        return date_time <= 0xffffffff ? date_time : 0xffffffff;
-    }
-
-    static UInt32 execute(const DecimalUtils::DecimalComponents<DateTime64> & t, const DateLUTImpl & /*time_zone*/)
-    {
-        if (t.whole < 0 || (t.whole >= 0 && t.fractional < 0))
-            return 0;
-
-        return std::min<Int64>(t.whole, Int64(0xFFFFFFFF));
+        return dt64;
     }
 };
 
@@ -377,12 +356,9 @@ struct ToDateTransform32Or64
     static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & time_zone)
     {
         // since converting to Date, no need in values outside of default LUT range.
-        if (from < 0)
-            return 0;
-
         return (from < DATE_LUT_MAX_DAY_NUM)
             ? from
-            : std::min<Int32>(Int32(time_zone.toDayNum(from)), Int32(DATE_LUT_MAX_DAY_NUM));
+            : time_zone.toDayNum(std::min(time_t(from), time_t(0xFFFFFFFF)));
     }
 };
 
@@ -397,14 +373,9 @@ struct ToDateTransform32Or64Signed
         /// The function should be monotonic (better for query optimizations), so we saturate instead of overflow.
         if (from < 0)
             return 0;
-
-        auto day_num = time_zone.toDayNum(ExtendedDayNum(static_cast<Int32>(from)));
-        return day_num < DATE_LUT_MAX_DAY_NUM ? day_num : DATE_LUT_MAX_DAY_NUM;
-
         return (from < DATE_LUT_MAX_DAY_NUM)
-            ? from
-            : std::min<Int32>(Int32(time_zone.toDayNum(static_cast<UInt16>(from))), Int32(0xFFFFFFFF));
-
+            ? static_cast<ToType>(from)
+            : time_zone.toDayNum(std::min(time_t(from), time_t(0xFFFFFFFF)));
     }
 };
 
@@ -434,8 +405,8 @@ struct ToDate32Transform32Or64
     static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & time_zone)
     {
         return (from < DATE_LUT_MAX_EXTEND_DAY_NUM)
-            ? from
-            : std::min<Int32>(Int32(time_zone.toDayNum(from)), Int32(DATE_LUT_MAX_EXTEND_DAY_NUM));
+            ? static_cast<ToType>(from)
+            : time_zone.toDayNum(std::min(time_t(from), time_t(0xFFFFFFFF)));
     }
 };
 
@@ -451,7 +422,7 @@ struct ToDate32Transform32Or64Signed
             return daynum_min_offset;
         return (from < DATE_LUT_MAX_EXTEND_DAY_NUM)
             ? static_cast<ToType>(from)
-            : time_zone.toDayNum(std::min<Int64>(Int64(from), Int64(0xFFFFFFFF)));
+            : time_zone.toDayNum(std::min(time_t(Int64(from)), time_t(0xFFFFFFFF)));
     }
 };
 
@@ -477,49 +448,35 @@ struct ToDate32Transform8Or16Signed
   */
 template <typename Name> struct ConvertImpl<DataTypeUInt32, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeUInt32, DataTypeDate, ToDateTransform32Or64<UInt32, UInt16>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeUInt64, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeUInt64, DataTypeDate, ToDateTransform32Or64<UInt64, UInt16>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeInt8, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeInt8, DataTypeDate, ToDateTransform8Or16Signed<Int8, UInt16>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeInt16, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeInt16, DataTypeDate, ToDateTransform8Or16Signed<Int16, UInt16>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeInt32, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeInt32, DataTypeDate, ToDateTransform32Or64Signed<Int32, UInt16>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeInt64, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeInt64, DataTypeDate, ToDateTransform32Or64Signed<Int64, UInt16>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeFloat32, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeFloat32, DataTypeDate, ToDateTransform32Or64Signed<Float32, UInt16>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeFloat64, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeFloat64, DataTypeDate, ToDateTransform32Or64Signed<Float64, UInt16>> {};
 
 template <typename Name> struct ConvertImpl<DataTypeUInt32, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeUInt32, DataTypeDate32, ToDate32Transform32Or64<UInt32, Int32>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeUInt64, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeUInt64, DataTypeDate32, ToDate32Transform32Or64<UInt64, Int32>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeInt8, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeInt8, DataTypeDate32, ToDate32Transform8Or16Signed<Int8, Int32>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeInt16, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeInt16, DataTypeDate32, ToDate32Transform8Or16Signed<Int16, Int32>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeInt32, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeInt32, DataTypeDate32, ToDate32Transform32Or64Signed<Int32, Int32>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeInt64, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeInt64, DataTypeDate32, ToDate32Transform32Or64Signed<Int64, Int32>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeFloat32, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeFloat32, DataTypeDate32, ToDate32Transform32Or64Signed<Float32, Int32>> {};
-
 template <typename Name> struct ConvertImpl<DataTypeFloat64, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeFloat64, DataTypeDate32, ToDate32Transform32Or64Signed<Float64, Int32>> {};
 
@@ -531,7 +488,7 @@ struct ToDateTimeTransform64
 
     static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
     {
-        return std::min<Int64>(Int64(from), Int64(0xFFFFFFFF));
+        return static_cast<ToType>(std::min(time_t(from), time_t(0xFFFFFFFF)));
     }
 };
 
@@ -553,12 +510,11 @@ struct ToDateTimeTransform64Signed
 {
     static constexpr auto name = "toDateTime";
 
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & /* time_zone */)
+    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
     {
         if (from < 0)
             return 0;
-
-        return std::min<Int64>(Int64(from), Int64(0xFFFFFFFF));
+        return static_cast<ToType>(std::min(time_t(from), time_t(0xFFFFFFFF)));
     }
 };
 
@@ -618,8 +574,8 @@ struct ToDateTime64TransformSigned
 
     NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
     {
-        from = std::max<time_t>(from, LUT_MIN_TIME);
-        from = std::min<time_t>(from, LUT_MAX_TIME);
+        from = static_cast<FromType>(std::max<time_t>(from, LUT_MIN_TIME));
+        from = static_cast<FromType>(std::min<time_t>(from, LUT_MAX_TIME));
         return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(from, 0, scale_multiplier);
     }
 };
@@ -678,6 +634,8 @@ struct FromDateTime64Transform
     }
 };
 
+/** Conversion of DateTime64 to Date or DateTime: discards fractional part.
+ */
 template <typename Name> struct ConvertImpl<DataTypeDateTime64, DataTypeDate, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDate, TransformDateTime64<ToDateImpl>> {};
 template <typename Name> struct ConvertImpl<DataTypeDateTime64, DataTypeDateTime, Name, ConvertDefaultBehaviorTag>
@@ -701,7 +659,7 @@ struct ToDateTime64Transform
 
     DateTime64::NativeType execute(Int32 d, const DateLUTImpl & time_zone) const
     {
-        const auto dt = time_zone.fromDayNum(ExtendedDayNum(d));
+        const auto dt = ToDateTimeImpl::execute(d, time_zone);
         return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
     }
 
@@ -979,7 +937,7 @@ inline void convertFromTime<DataTypeDate>(DataTypeDate::FieldType & x, time_t &
 template <>
 inline void convertFromTime<DataTypeDate32>(DataTypeDate32::FieldType & x, time_t & time)
 {
-    x = time;
+    x = static_cast<UInt32>(time);
 }
 
 template <>
@@ -990,7 +948,7 @@ inline void convertFromTime<DataTypeDateTime>(DataTypeDateTime::FieldType & x, t
     else if (unlikely(time > 0xFFFFFFFF))
         x = 0xFFFFFFFF;
     else
-        x = time;
+        x = static_cast<UInt32>(time);
 }
 
 /** Conversion of strings to numbers, dates, datetimes: through parsing.
@@ -1070,7 +1028,7 @@ inline bool tryParseImpl<DataTypeDateTime>(DataTypeDateTime::FieldType & x, Read
     time_t tmp = 0;
     if (!tryReadDateTimeText(tmp, rb, *time_zone))
         return false;
-    x = tmp;
+    x = static_cast<UInt32>(tmp);
     return true;
 }
 
@@ -1855,7 +1813,7 @@ private:
                 {
                     /// Account for optional timezone argument.
                     if (arguments.size() != 2 && arguments.size() != 3)
-                        throw Exception{"Function " + getName() + " expects 2 or 3 arguments for DateTime64.",
+                        throw Exception{"Function " + getName() + " expects 2 or 3 arguments for DataTypeDateTime64.",
                             ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION};
                 }
                 else if (arguments.size() != 2)
@@ -2285,15 +2243,24 @@ struct ToDateMonotonicity
     {
         auto which = WhichDataType(type);
         if (which.isDateOrDate32() || which.isDateTime() || which.isDateTime64() || which.isInt8() || which.isInt16() || which.isUInt8() || which.isUInt16())
+        {
             return { .is_monotonic = true, .is_always_monotonic = true };
+        }
         else if (
-            (which.isUInt() && ((left.isNull() || left.get<UInt64>() < 0xFFFF) && (right.isNull() || right.get<UInt64>() >= 0xFFFF)))
-            || (which.isInt() && ((left.isNull() || left.get<Int64>() < 0xFFFF) && (right.isNull() || right.get<Int64>() >= 0xFFFF)))
-            || (which.isFloat() && ((left.isNull() || left.get<Float64>() < 0xFFFF) && (right.isNull() || right.get<Float64>() >= 0xFFFF)))
-            || !type.isValueRepresentedByNumber())
+            ((left.getType() == Field::Types::UInt64 || left.isNull()) && (right.getType() == Field::Types::UInt64 || right.isNull())
+                && ((left.isNull() || left.get<UInt64>() < 0xFFFF) && (right.isNull() || right.get<UInt64>() >= 0xFFFF)))
+            || ((left.getType() == Field::Types::Int64 || left.isNull()) && (right.getType() == Field::Types::Int64 || right.isNull())
+                && ((left.isNull() || left.get<Int64>() < 0xFFFF) && (right.isNull() || right.get<Int64>() >= 0xFFFF)))
+            || (((left.getType() == Field::Types::Float64 || left.isNull()) && (right.getType() == Field::Types::Float64 || right.isNull())
+                && ((left.isNull() || left.get<Float64>() < 0xFFFF) && (right.isNull() || right.get<Float64>() >= 0xFFFF))))
+            || !isNativeNumber(type))
+        {
             return {};
+        }
         else
+        {
             return { .is_monotonic = true, .is_always_monotonic = true };
+        }
     }
 };
 
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 33b6b075ebe..ec0a489471b 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -15,6 +15,7 @@
 
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
+#include <Common/safe_cast.h>
 #include <Common/HashTable/Hash.h>
 #include <xxhash.h>
 
@@ -636,10 +637,10 @@ struct ImplBLAKE3
     static void apply(const char * begin, const size_t size, unsigned char* out_char_data)
     {
         #if defined(MEMORY_SANITIZER)
-            auto err_msg = blake3_apply_shim_msan_compat(begin, size, out_char_data);
+            auto err_msg = blake3_apply_shim_msan_compat(begin, safe_cast<uint32_t>(size), out_char_data);
             __msan_unpoison(out_char_data, length);
         #else
-            auto err_msg = blake3_apply_shim(begin, size, out_char_data);
+            auto err_msg = blake3_apply_shim(begin, safe_cast<uint32_t>(size), out_char_data);
         #endif
         if (err_msg != nullptr)
         {
diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index aefc82d2f5d..493fc36ca3c 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -231,7 +231,7 @@ private:
             {
                 case MoveType::ConstIndex:
                 {
-                    if (!moveToElementByIndex<JSONParser>(res_element, moves[j].index, key))
+                    if (!moveToElementByIndex<JSONParser>(res_element, static_cast<int>(moves[j].index), key))
                         return false;
                     break;
                 }
@@ -245,7 +245,7 @@ private:
                 case MoveType::Index:
                 {
                     Int64 index = (*arguments[j + 1].column)[row].get<Int64>();
-                    if (!moveToElementByIndex<JSONParser>(res_element, index, key))
+                    if (!moveToElementByIndex<JSONParser>(res_element, static_cast<int>(index), key))
                         return false;
                     break;
                 }
diff --git a/src/Functions/FunctionsLanguageClassification.cpp b/src/Functions/FunctionsLanguageClassification.cpp
index ecc958a0a0c..ebdb2f1afaa 100644
--- a/src/Functions/FunctionsLanguageClassification.cpp
+++ b/src/Functions/FunctionsLanguageClassification.cpp
@@ -83,7 +83,10 @@ struct FunctionDetectLanguageImpl
 
             if (UTF8::isValidUTF8(str, str_len))
             {
-                auto lang = CLD2::DetectLanguage(reinterpret_cast<const char *>(str), str_len, true, &is_reliable);
+                auto lang = CLD2::DetectLanguage(
+                    reinterpret_cast<const char *>(str),
+                    static_cast<int>(str_len),
+                    true, &is_reliable);
                 res = codeISO(LanguageCode(lang));
             }
             else
@@ -178,7 +181,10 @@ public:
 
             if (UTF8::isValidUTF8(str, str_len))
             {
-                CLD2::DetectLanguageSummary(reinterpret_cast<const char *>(str), str_len, true, result_lang_top3, pc, bytes, &is_reliable);
+                CLD2::DetectLanguageSummary(
+                    reinterpret_cast<const char *>(str),
+                    static_cast<int>(str_len),
+                    true, result_lang_top3, pc, bytes, &is_reliable);
 
                 for (size_t j = 0; j < top_N; ++j)
                 {
diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h
index d7e8ffb0c9f..22471a151d2 100644
--- a/src/Functions/FunctionsLogical.h
+++ b/src/Functions/FunctionsLogical.h
@@ -193,7 +193,7 @@ public:
         auto * next = b.GetInsertBlock();
         auto * stop = llvm::BasicBlock::Create(next->getContext(), "", next->getParent());
         b.SetInsertPoint(stop);
-        auto * phi = b.CreatePHI(b.getInt8Ty(), values.size());
+        auto * phi = b.CreatePHI(b.getInt8Ty(), static_cast<unsigned>(values.size()));
         for (size_t i = 0; i < types.size(); ++i)
         {
             b.SetInsertPoint(next);
diff --git a/src/Functions/FunctionsRandom.cpp b/src/Functions/FunctionsRandom.cpp
index 96c41225242..40522fa1a6e 100644
--- a/src/Functions/FunctionsRandom.cpp
+++ b/src/Functions/FunctionsRandom.cpp
@@ -37,7 +37,7 @@ namespace
         UInt32 next()
         {
             current = current * a + c;
-            return current >> 16;
+            return static_cast<UInt32>(current >> 16);
         }
     };
 
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index ccab6e9feca..283f1ea5a43 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -178,7 +178,7 @@ struct IntegerRoundingComputation
                 return;
             }
         }
-        *out = compute(*in, scale);
+        *out = compute(*in, static_cast<T>(scale));
     }
 
     static ALWAYS_INLINE void compute(const T * __restrict in, T scale, T * __restrict out) requires(!std::integral<T>)
@@ -436,7 +436,7 @@ public:
         scale_arg = in_scale - scale_arg;
         if (scale_arg > 0)
         {
-            auto scale = intExp10OfSize<T>(scale_arg);
+            auto scale = intExp10OfSize<NativeType>(scale_arg);
 
             const NativeType * __restrict p_in = reinterpret_cast<const NativeType *>(in.data());
             const NativeType * end_in = reinterpret_cast<const NativeType *>(in.data()) + in.size();
diff --git a/src/Functions/FunctionsStringHash.cpp b/src/Functions/FunctionsStringHash.cpp
index e7dbe4087f2..949503e2367 100644
--- a/src/Functions/FunctionsStringHash.cpp
+++ b/src/Functions/FunctionsStringHash.cpp
@@ -35,13 +35,13 @@ struct Hash
 #ifdef __SSE4_2__
         return _mm_crc32_u64(crc, val);
 #elif defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
-        return __crc32cd(crc, val);
+        return __crc32cd(static_cast<UInt32>(crc), val);
 #else
         throw Exception("String hash is not implemented without sse4.2 support", ErrorCodes::NOT_IMPLEMENTED);
 #endif
     }
 
-    static UInt64 crc32u32(UInt64 crc [[maybe_unused]], UInt32 val [[maybe_unused]])
+    static UInt64 crc32u32(UInt32 crc [[maybe_unused]], UInt32 val [[maybe_unused]])
     {
 #ifdef __SSE4_2__
         return _mm_crc32_u32(crc, val);
@@ -52,7 +52,7 @@ struct Hash
 #endif
     }
 
-    static UInt64 crc32u16(UInt64 crc [[maybe_unused]], UInt16 val [[maybe_unused]])
+    static UInt64 crc32u16(UInt32 crc [[maybe_unused]], UInt16 val [[maybe_unused]])
     {
 #ifdef __SSE4_2__
         return _mm_crc32_u16(crc, val);
@@ -63,7 +63,7 @@ struct Hash
 #endif
     }
 
-    static UInt64 crc32u8(UInt64 crc [[maybe_unused]], UInt8 val [[maybe_unused]])
+    static UInt64 crc32u8(UInt32 crc [[maybe_unused]], UInt8 val [[maybe_unused]])
     {
 #ifdef __SSE4_2__
         return _mm_crc32_u8(crc, val);
@@ -84,7 +84,7 @@ struct Hash
             if constexpr (CaseInsensitive)
                 x |= 0x20u; /// see toLowerIfAlphaASCII from StringUtils.h
 
-            crc = crc32u8(crc, x);
+            crc = crc32u8(static_cast<UInt32>(crc), x);
             --size;
             ++start;
         }
@@ -96,7 +96,7 @@ struct Hash
             if constexpr (CaseInsensitive)
                 x |= 0x2020u;
 
-            crc = crc32u16(crc, x);
+            crc = crc32u16(static_cast<UInt32>(crc), x);
             size -= 2;
             start += 2;
         }
@@ -108,7 +108,7 @@ struct Hash
             if constexpr (CaseInsensitive)
                 x |= 0x20202020u;
 
-            crc = crc32u32(crc, x);
+            crc = crc32u32(static_cast<UInt32>(crc), x);
             size -= 4;
             start += 4;
         }
diff --git a/src/Functions/FunctionsTimeWindow.h b/src/Functions/FunctionsTimeWindow.h
index 3ea397e4c7d..4346e691046 100644
--- a/src/Functions/FunctionsTimeWindow.h
+++ b/src/Functions/FunctionsTimeWindow.h
@@ -64,7 +64,7 @@ struct ToStartOfTransform;
     {
         static UInt32 execute(UInt32 t, UInt64 delta, const DateLUTImpl & time_zone)
         {
-            return time_zone.toStartOfDayInterval(time_zone.toDayNum(t), delta);
+            return static_cast<UInt32>(time_zone.toStartOfDayInterval(time_zone.toDayNum(t), delta));
         }
     };
 
@@ -74,7 +74,7 @@ struct ToStartOfTransform;
     { \
         static UInt32 execute(UInt32 t, UInt64 delta, const DateLUTImpl & time_zone) \
         { \
-            return time_zone.toStartOf##INTERVAL_KIND##Interval(t, delta); \
+            return static_cast<UInt32>(time_zone.toStartOf##INTERVAL_KIND##Interval(t, delta)); \
         } \
     };
     TRANSFORM_TIME(Hour)
@@ -114,7 +114,7 @@ template<> \
     template <> \
     struct AddTime<IntervalKind::INTERVAL_KIND> \
     { \
-        static inline auto execute(UInt16 d, UInt64 delta, const DateLUTImpl & time_zone) \
+        static inline auto execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone) \
         { \
             return time_zone.add##INTERVAL_KIND##s(ExtendedDayNum(d), delta); \
         } \
@@ -127,14 +127,18 @@ template<> \
     template <>
     struct AddTime<IntervalKind::Week>
     {
-        static inline NO_SANITIZE_UNDEFINED ExtendedDayNum execute(UInt16 d, UInt64 delta, const DateLUTImpl &) { return ExtendedDayNum(d + delta * 7);}
+        static inline NO_SANITIZE_UNDEFINED ExtendedDayNum execute(UInt16 d, UInt64 delta, const DateLUTImpl &)
+        {
+            return ExtendedDayNum(static_cast<Int32>(d + delta * 7));
+        }
     };
 
 #define ADD_TIME(INTERVAL_KIND, INTERVAL) \
     template <> \
     struct AddTime<IntervalKind::INTERVAL_KIND> \
     { \
-        static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &) { return t + delta * INTERVAL; } \
+        static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &) \
+        { return static_cast<UInt32>(t + delta * INTERVAL); } \
     };
     ADD_TIME(Day, 86400)
     ADD_TIME(Hour, 3600)
diff --git a/src/Functions/GregorianDate.h b/src/Functions/GregorianDate.h
index ef2b9e6eede..a64ae752509 100644
--- a/src/Functions/GregorianDate.h
+++ b/src/Functions/GregorianDate.h
@@ -38,7 +38,7 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        explicit GregorianDate(is_integer auto mjd);
+        explicit GregorianDate(is_integer auto modified_julian_day);
 
         /** Convert to Modified Julian Day. The type T is an integral type
           * which should be at least 32 bits wide, and should preferably
@@ -89,7 +89,8 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        explicit OrdinalDate(is_integer auto mjd);
+        template <is_integer DayT>
+        explicit OrdinalDate(DayT modified_julian_day);
 
         /** Convert to Modified Julian Day. The type T is an integral
           * type which should be at least 32 bits wide, and should
@@ -257,9 +258,9 @@ namespace DB
     }
 
     template <typename YearT>
-    GregorianDate<YearT>::GregorianDate(is_integer auto mjd)
+    GregorianDate<YearT>::GregorianDate(is_integer auto modified_julian_day)
     {
-        const OrdinalDate<YearT> ord(mjd);
+        const OrdinalDate<YearT> ord(modified_julian_day);
         const MonthDay md(gd::is_leap_year(ord.year()), ord.dayOfYear());
         year_       = ord.year();
         month_      = md.month();
@@ -329,9 +330,24 @@ namespace DB
     }
 
     template <typename YearT>
-    OrdinalDate<YearT>::OrdinalDate(is_integer auto mjd)
+    template <is_integer DayT>
+    OrdinalDate<YearT>::OrdinalDate(DayT modified_julian_day)
     {
-        const auto a         = mjd + 678575;
+        /// This function supports day number from -678941 to 2973119 (which represent 0000-01-01 and 9999-12-31 respectively).
+
+        if constexpr (is_signed_v<DayT> && std::numeric_limits<DayT>::lowest() < -678941)
+            if (modified_julian_day < -678941)
+                throw Exception(
+                    ErrorCodes::CANNOT_FORMAT_DATETIME,
+                    "Value cannot be represented as date because it's out of range");
+
+        if constexpr (std::numeric_limits<DayT>::max() > 2973119)
+            if (modified_julian_day > 2973119)
+                throw Exception(
+                    ErrorCodes::CANNOT_FORMAT_DATETIME,
+                    "Value cannot be represented as date because it's out of range");
+
+        const auto a         = modified_julian_day + 678575;
         const auto quad_cent = gd::div(a, 146097);
         const auto b         = gd::mod(a, 146097);
         const auto cent      = gd::min(gd::div(b, 36524), 3);
@@ -339,8 +355,9 @@ namespace DB
         const auto quad      = gd::div(c, 1461);
         const auto d         = gd::mod(c, 1461);
         const auto y         = gd::min(gd::div(d, 365), 3);
+
         day_of_year_ = d - y * 365 + 1;
-        year_      = quad_cent * 400 + cent * 100 + quad * 4 + y + 1;
+        year_ = static_cast<YearT>(quad_cent * 400 + cent * 100 + quad * 4 + y + 1);
     }
 
     template <typename YearT>
diff --git a/src/Functions/JSONPath/Generator/GeneratorJSONPath.h b/src/Functions/JSONPath/Generator/GeneratorJSONPath.h
index fe00f06bbbf..3d646a6ff31 100644
--- a/src/Functions/JSONPath/Generator/GeneratorJSONPath.h
+++ b/src/Functions/JSONPath/Generator/GeneratorJSONPath.h
@@ -89,7 +89,7 @@ public:
             for (size_t i = current_visitor; i < visitors.size(); ++i)
             {
                 status = visitors[i]->visit(current);
-                current_visitor = i;
+                current_visitor = static_cast<int>(i);
                 if (status == VisitorStatus::Error || status == VisitorStatus::Ignore)
                 {
                     break;
diff --git a/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp b/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
index bc153b9d747..03c006774c0 100644
--- a/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
+++ b/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
@@ -46,7 +46,7 @@ bool ParserJSONPathRange::parseImpl(Pos & pos, ASTPtr & node, Expected & expecte
         {
             return false;
         }
-        range_indices.first = number_ptr->as<ASTLiteral>()->value.get<UInt32>();
+        range_indices.first = static_cast<UInt32>(number_ptr->as<ASTLiteral>()->value.get<UInt32>());
 
         if (pos->type == TokenType::Comma || pos->type == TokenType::ClosingSquareBracket)
         {
@@ -63,7 +63,7 @@ bool ParserJSONPathRange::parseImpl(Pos & pos, ASTPtr & node, Expected & expecte
             {
                 return false;
             }
-            range_indices.second = number_ptr->as<ASTLiteral>()->value.get<UInt32>();
+            range_indices.second = static_cast<UInt32>(number_ptr->as<ASTLiteral>()->value.get<UInt32>());
         }
         else
         {
diff --git a/src/Functions/MultiMatchAllIndicesImpl.h b/src/Functions/MultiMatchAllIndicesImpl.h
index 3490c854f22..8e355405093 100644
--- a/src/Functions/MultiMatchAllIndicesImpl.h
+++ b/src/Functions/MultiMatchAllIndicesImpl.h
@@ -116,7 +116,7 @@ struct MultiMatchAllIndicesImpl
             err = hs_scan(
                 regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + offset,
-                length,
+                static_cast<unsigned>(length),
                 0,
                 smart_scratch.get(),
                 on_match,
@@ -227,7 +227,7 @@ struct MultiMatchAllIndicesImpl
             err = hs_scan(
                 regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + prev_haystack_offset,
-                cur_haystack_length,
+                static_cast<unsigned>(cur_haystack_length),
                 0,
                 smart_scratch.get(),
                 on_match,
diff --git a/src/Functions/MultiMatchAnyImpl.h b/src/Functions/MultiMatchAnyImpl.h
index 2d4db261bb4..4b02e78dc25 100644
--- a/src/Functions/MultiMatchAnyImpl.h
+++ b/src/Functions/MultiMatchAnyImpl.h
@@ -136,7 +136,7 @@ struct MultiMatchAnyImpl
             err = hs_scan(
                 regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + offset,
-                length,
+                static_cast<unsigned>(length),
                 0,
                 smart_scratch.get(),
                 on_match,
@@ -260,7 +260,7 @@ struct MultiMatchAnyImpl
             err = hs_scan(
                 regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + prev_haystack_offset,
-                cur_haystack_length,
+                static_cast<unsigned>(cur_haystack_length),
                 0,
                 smart_scratch.get(),
                 on_match,
diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h
index 0ffe05fbffc..37517313879 100644
--- a/src/Functions/PolygonUtils.h
+++ b/src/Functions/PolygonUtils.h
@@ -625,7 +625,7 @@ UInt128 sipHash128(Polygon && polygon)
 
     auto hash_ring = [&hash](const auto & ring)
     {
-        UInt32 size = ring.size();
+        UInt32 size = static_cast<UInt32>(ring.size());
         hash.update(size);
         hash.update(reinterpret_cast<const char *>(ring.data()), size * sizeof(ring[0]));
     };
diff --git a/src/Functions/Regexps.h b/src/Functions/Regexps.h
index 1e40c845788..c1ff83d04fe 100644
--- a/src/Functions/Regexps.h
+++ b/src/Functions/Regexps.h
@@ -207,7 +207,7 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
     {
         ids.reset(new unsigned int[patterns.size()]);
         for (size_t i = 0; i < patterns.size(); ++i)
-            ids[i] = i + 1;
+            ids[i] = static_cast<unsigned>(i + 1);
     }
 
     hs_error_t err;
@@ -216,7 +216,7 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
             patterns.data(),
             flags.data(),
             ids.get(),
-            patterns.size(),
+            static_cast<unsigned>(patterns.size()),
             HS_MODE_BLOCK,
             nullptr,
             &db,
@@ -227,7 +227,7 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
             flags.data(),
             ids.get(),
             ext_exprs_ptrs.data(),
-            patterns.size(),
+            static_cast<unsigned>(patterns.size()),
             HS_MODE_BLOCK,
             nullptr,
             &db,
diff --git a/src/Functions/ReplaceRegexpImpl.h b/src/Functions/ReplaceRegexpImpl.h
index 88bc48a6d8c..a1d17ce9da1 100644
--- a/src/Functions/ReplaceRegexpImpl.h
+++ b/src/Functions/ReplaceRegexpImpl.h
@@ -189,7 +189,7 @@ struct ReplaceRegexpImpl
         /// Cannot perform search for whole columns. Will process each string separately.
         for (size_t i = 0; i < size; ++i)
         {
-            int from = i > 0 ? offsets[i - 1] : 0;
+            size_t from = i > 0 ? offsets[i - 1] : 0;
             re2_st::StringPiece input(reinterpret_cast<const char *>(data.data() + from), offsets[i] - from - 1);
 
             processString(input, res_data, res_offset, searcher, num_captures, instructions);
@@ -220,7 +220,7 @@ struct ReplaceRegexpImpl
 
         for (size_t i = 0; i < size; ++i)
         {
-            int from = i * n;
+            size_t from = i * n;
             re2_st::StringPiece input(reinterpret_cast<const char *>(data.data() + from), n);
 
             processString(input, res_data, res_offset, searcher, num_captures, instructions);
diff --git a/src/Functions/URL/CMakeLists.txt b/src/Functions/URL/CMakeLists.txt
index 6328476543d..0e148e87604 100644
--- a/src/Functions/URL/CMakeLists.txt
+++ b/src/Functions/URL/CMakeLists.txt
@@ -2,6 +2,7 @@ include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_functions_url .)
 add_library(clickhouse_functions_url OBJECT ${clickhouse_functions_url_sources} ${clickhouse_functions_url_headers})
 target_link_libraries(clickhouse_functions_url PRIVATE dbms)
+set_source_files_properties(tldLookup.generated.cpp PROPERTIES COMPILE_FLAGS -Wno-shorten-64-to-32)
 
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
     target_compile_options(clickhouse_functions_url PRIVATE "-g0")
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index 7b72060f0c0..c8eae78dfaa 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -223,7 +223,7 @@ struct ArrayAggregateImpl
                         if (unlikely(result_scale > DecimalUtils::max_precision<AggregationType>))
                             throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds", result_scale);
 
-                        res[i] = DecimalUtils::convertTo<ResultType>(product, result_scale);
+                        res[i] = DecimalUtils::convertTo<ResultType>(product, static_cast<UInt32>(result_scale));
                     }
                     else
                     {
@@ -332,7 +332,7 @@ struct ArrayAggregateImpl
                 if (unlikely(result_scale > DecimalUtils::max_precision<AggregationType>))
                     throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds", result_scale);
 
-                res[i] = DecimalUtils::convertTo<ResultType>(aggregate_value, result_scale);
+                res[i] = DecimalUtils::convertTo<ResultType>(aggregate_value, static_cast<UInt32>(result_scale));
             }
             else
             {
diff --git a/src/Functions/array/arrayCount.cpp b/src/Functions/array/arrayCount.cpp
index cb902206e8b..f7ded051e5e 100644
--- a/src/Functions/array/arrayCount.cpp
+++ b/src/Functions/array/arrayCount.cpp
@@ -49,7 +49,7 @@ struct ArrayCountImpl
                 size_t pos = 0;
                 for (size_t i = 0; i < offsets.size(); ++i)
                 {
-                    out_counts[i] = offsets[i] - pos;
+                    out_counts[i] = static_cast<UInt32>(offsets[i] - pos);
                     pos = offsets[i];
                 }
 
@@ -73,7 +73,7 @@ struct ArrayCountImpl
                 if (filter[pos])
                     ++count;
             }
-            out_counts[i] = count;
+            out_counts[i] = static_cast<UInt32>(count);
         }
 
         return out_column;
diff --git a/src/Functions/array/arrayEnumerate.cpp b/src/Functions/array/arrayEnumerate.cpp
index b20f91fe2dd..666e01899bd 100644
--- a/src/Functions/array/arrayEnumerate.cpp
+++ b/src/Functions/array/arrayEnumerate.cpp
@@ -60,7 +60,7 @@ public:
             for (auto off : offsets)
             {
                 for (ColumnArray::Offset j = prev_off; j < off; ++j)
-                    res_values[j] = j - prev_off + 1;
+                    res_values[j] = static_cast<UInt32>(j - prev_off + 1);
                 prev_off = off;
             }
 
diff --git a/src/Functions/array/arrayEnumerateRanked.cpp b/src/Functions/array/arrayEnumerateRanked.cpp
index 7c4b755e020..d19781f97c3 100644
--- a/src/Functions/array/arrayEnumerateRanked.cpp
+++ b/src/Functions/array/arrayEnumerateRanked.cpp
@@ -38,7 +38,7 @@ ArraysDepths getArraysDepths(const ColumnsWithTypeAndName & arguments)
             if (depths.size() < array_num && prev_array_depth)
                 depths.emplace_back(prev_array_depth);
 
-            prev_array_depth = type_array->getNumberOfDimensions();
+            prev_array_depth = static_cast<DepthType>(type_array->getNumberOfDimensions());
             ++array_num;
         }
         else
@@ -55,7 +55,7 @@ ArraysDepths getArraysDepths(const ColumnsWithTypeAndName & arguments)
 
                 if (i == 0)
                 {
-                    clear_depth = value;
+                    clear_depth = static_cast<DepthType>(value);
                 }
                 else
                 {
diff --git a/src/Functions/array/arrayFirstLastIndex.cpp b/src/Functions/array/arrayFirstLastIndex.cpp
index f7355eb2b38..effcb04ab48 100644
--- a/src/Functions/array/arrayFirstLastIndex.cpp
+++ b/src/Functions/array/arrayFirstLastIndex.cpp
@@ -61,7 +61,7 @@ struct ArrayFirstLastIndexImpl
                         if constexpr (strategy == ArrayFirstLastIndexStrategy::First)
                             out_index[offset_index] = 1;
                         else
-                            out_index[offset_index] = end_offset - start_offset;
+                            out_index[offset_index] = static_cast<UInt32>(end_offset - start_offset);
                     }
                     else
                     {
@@ -113,7 +113,7 @@ struct ArrayFirstLastIndexImpl
                 }
             }
 
-            out_index[offset_index] = result_index;
+            out_index[offset_index] = static_cast<UInt32>(result_index);
         }
 
         return out_column;
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index fd16f1fc986..c93e67d4b1c 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -152,13 +152,6 @@ ColumnPtr FunctionArrayReduce::executeImpl(const ColumnsWithTypeAndName & argume
     MutableColumnPtr result_holder = result_type->createColumn();
     IColumn & res_col = *result_holder;
 
-    /// AggregateFunction's states should be inserted into column using specific way
-    auto * res_col_aggregate_function = typeid_cast<ColumnAggregateFunction *>(&res_col);
-
-    if (!res_col_aggregate_function && agg_func.isState())
-        throw Exception("State function " + agg_func.getName() + " inserts results into non-state column "
-                        + result_type->getName(), ErrorCodes::ILLEGAL_COLUMN);
-
     PODArray<AggregateDataPtr> places(input_rows_count);
     for (size_t i = 0; i < input_rows_count; ++i)
     {
@@ -190,10 +183,9 @@ ColumnPtr FunctionArrayReduce::executeImpl(const ColumnsWithTypeAndName & argume
     }
 
     for (size_t i = 0; i < input_rows_count; ++i)
-        if (!res_col_aggregate_function)
-            agg_func.insertResultInto(places[i], res_col, arena.get());
-        else
-            res_col_aggregate_function->insertFrom(places[i]);
+        /// We should use insertMergeResultInto to insert result into ColumnAggregateFunction
+        /// correctly if result contains AggregateFunction's states
+        agg_func.insertMergeResultInto(places[i], res_col, arena.get());
     return result_holder;
 }
 
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index d2a382e86ba..11d5e03eb3d 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -202,13 +202,6 @@ ColumnPtr FunctionArrayReduceInRanges::executeImpl(
 
     result_arr->getOffsets().insert(ranges_offsets->begin(), ranges_offsets->end());
 
-    /// AggregateFunction's states should be inserted into column using specific way
-    auto * res_col_aggregate_function = typeid_cast<ColumnAggregateFunction *>(&result_data);
-
-    if (!res_col_aggregate_function && agg_func.isState())
-        throw Exception("State function " + agg_func.getName() + " inserts results into non-state column "
-                        + result_type->getName(), ErrorCodes::ILLEGAL_COLUMN);
-
     /// Perform the aggregation
 
     size_t begin = 0;
@@ -379,11 +372,9 @@ ColumnPtr FunctionArrayReduceInRanges::executeImpl(
                 for (size_t k = local_begin; k < local_end; ++k)
                     true_func->add(place, aggregate_arguments, begin + k, arena.get());
             }
-
-            if (!res_col_aggregate_function)
-                agg_func.insertResultInto(place, result_data, arena.get());
-            else
-                res_col_aggregate_function->insertFrom(place);
+            /// We should use insertMergeResultInto to insert result into ColumnAggregateFunction
+            /// correctly if result contains AggregateFunction's states
+            agg_func.insertMergeResultInto(place, result_data, arena.get());
         }
     }
 
diff --git a/src/Functions/array/arrayUniq.cpp b/src/Functions/array/arrayUniq.cpp
index ff75efaae71..a43c21508d9 100644
--- a/src/Functions/array/arrayUniq.cpp
+++ b/src/Functions/array/arrayUniq.cpp
@@ -233,7 +233,7 @@ void FunctionArrayUniq::executeMethodImpl(
             method.emplaceKey(set, j, pool);
         }
 
-        res_values[i] = set.size() + found_null;
+        res_values[i] = static_cast<UInt32>(set.size() + found_null);
         prev_off = off;
     }
 }
diff --git a/src/Functions/array/range.cpp b/src/Functions/array/range.cpp
index 6b3d8ad1139..3b5bb686e60 100644
--- a/src/Functions/array/range.cpp
+++ b/src/Functions/array/range.cpp
@@ -97,7 +97,7 @@ private:
             for (size_t row_idx = 0, rows = in->size(); row_idx < rows; ++row_idx)
             {
                 for (size_t elem_idx = 0, elems = in_data[row_idx]; elem_idx < elems; ++elem_idx)
-                    out_data[offset + elem_idx] = elem_idx;
+                    out_data[offset + elem_idx] = static_cast<T>(elem_idx);
 
                 offset += in_data[row_idx];
                 out_offsets[row_idx] = offset;
@@ -153,7 +153,7 @@ private:
         {
             for (size_t st = start, ed = end_data[row_idx]; st < ed; st += step)
             {
-                out_data[offset++] = st;
+                out_data[offset++] = static_cast<T>(st);
 
                 if (st > st + step)
                     throw Exception{"A call to function " + getName() + " overflows, investigate the values of arguments you are passing",
@@ -212,7 +212,7 @@ private:
         {
             for (size_t st = start_data[row_idx], ed = end_data[row_idx]; st < ed; st += step)
             {
-                out_data[offset++] = st;
+                out_data[offset++] = static_cast<T>(st);
 
                 if (st > st + step)
                     throw Exception{"A call to function " + getName() + " overflows, investigate the values of arguments you are passing",
@@ -271,7 +271,7 @@ private:
         {
             for (size_t st = start, ed = end_data[row_idx]; st < ed; st += step_data[row_idx])
             {
-                out_data[offset++] = st;
+                out_data[offset++] = static_cast<T>(st);
 
                 if (st > st + step_data[row_idx])
                     throw Exception{"A call to function " + getName() + " overflows, investigate the values of arguments you are passing",
@@ -333,7 +333,7 @@ private:
         {
             for (size_t st = start_data[row_idx], ed = end_start[row_idx]; st < ed; st += step_data[row_idx])
             {
-                out_data[offset++] = st;
+                out_data[offset++] = static_cast<T>(st);
 
                 if (st > st + step_data[row_idx])
                     throw Exception{"A call to function " + getName() + " overflows, investigate the values of arguments you are passing",
@@ -407,7 +407,7 @@ private:
 
             if ((res = executeConstStartStep<UInt8>(column_ptrs[1], start, step, input_rows_count)) ||
                 (res = executeConstStartStep<UInt16>(column_ptrs[1], start, step, input_rows_count)) ||
-                (res = executeConstStartStep<UInt32>(column_ptrs[1], start, step, input_rows_count)) ||
+                (res = executeConstStartStep<UInt32>(column_ptrs[1], static_cast<UInt32>(start), static_cast<UInt32>(step), input_rows_count)) ||
                 (res = executeConstStartStep<UInt64>(column_ptrs[1], start, step, input_rows_count)))
             {
             }
@@ -418,7 +418,7 @@ private:
 
             if ((res = executeConstStart<UInt8>(column_ptrs[1], column_ptrs[2], start, input_rows_count)) ||
                 (res = executeConstStart<UInt16>(column_ptrs[1], column_ptrs[2], start, input_rows_count)) ||
-                (res = executeConstStart<UInt32>(column_ptrs[1], column_ptrs[2], start, input_rows_count)) ||
+                (res = executeConstStart<UInt32>(column_ptrs[1], column_ptrs[2], static_cast<UInt32>(start), input_rows_count)) ||
                 (res = executeConstStart<UInt64>(column_ptrs[1], column_ptrs[2], start, input_rows_count)))
             {
             }
@@ -429,7 +429,7 @@ private:
 
             if ((res = executeConstStep<UInt8>(column_ptrs[0], column_ptrs[1], step, input_rows_count)) ||
                 (res = executeConstStep<UInt16>(column_ptrs[0], column_ptrs[1], step, input_rows_count)) ||
-                (res = executeConstStep<UInt32>(column_ptrs[0], column_ptrs[1], step, input_rows_count)) ||
+                (res = executeConstStep<UInt32>(column_ptrs[0], column_ptrs[1], static_cast<UInt32>(step), input_rows_count)) ||
                 (res = executeConstStep<UInt64>(column_ptrs[0], column_ptrs[1], step, input_rows_count)))
             {
             }
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index b8bf3c11698..b33fcf32de1 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -61,25 +61,30 @@ public:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() != 3 && arguments.size() != 4)
-            throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
-                + toString(arguments.size()) + ", should be 3 or 4",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Number of arguments for function {} doesn't match: passed {}, should be 3 or 4",
+                getName(), arguments.size());
 
         if (!isString(arguments[0]))
-            throw Exception("First argument for function " + getName() + " (unit) must be String",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "First argument for function {} (unit) must be String",
+                getName());
 
-        if (!isDate(arguments[1]) && !isDateTime(arguments[1]) && !isDateTime64(arguments[1]))
-            throw Exception("Second argument for function " + getName() + " must be Date or DateTime",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        if (!isDate(arguments[1]) && !isDate32(arguments[1]) && !isDateTime(arguments[1]) && !isDateTime64(arguments[1]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Second argument for function {} must be Date, Date32, DateTime or DateTime64",
+                getName());
 
-        if (!isDate(arguments[2]) && !isDateTime(arguments[2]) && !isDateTime64(arguments[2]))
-            throw Exception("Third argument for function " + getName() + " must be Date or DateTime",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        if (!isDate(arguments[2]) && !isDate32(arguments[2]) && !isDateTime(arguments[2]) && !isDateTime64(arguments[2]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Third argument for function {} must be Date, Date32, DateTime or DateTime64",
+                getName()
+                );
 
         if (arguments.size() == 4 && !isString(arguments[3]))
-            throw Exception("Fourth argument for function " + getName() + " (timezone) must be String",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Fourth argument for function {} (timezone) must be String",
+                getName());
 
         return std::make_shared<DataTypeInt64>();
     }
@@ -91,7 +96,9 @@ public:
     {
         const auto * unit_column = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
         if (!unit_column)
-            throw Exception("First argument for function " + getName() + " must be constant String", ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                "First argument for function {} must be constant String",
+                getName());
 
         String unit = Poco::toLower(unit_column->getValue<String>());
 
@@ -105,23 +112,24 @@ public:
         const auto & timezone_y = extractTimeZoneFromFunctionArguments(arguments, 3, 2);
 
         if (unit == "year" || unit == "yy" || unit == "yyyy")
-            dispatchForColumns<ToRelativeYearNumImpl>(x, y, timezone_x, timezone_y, res->getData());
+            dispatchForColumns<ToRelativeYearNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "quarter" || unit == "qq" || unit == "q")
-            dispatchForColumns<ToRelativeQuarterNumImpl>(x, y, timezone_x, timezone_y, res->getData());
+            dispatchForColumns<ToRelativeQuarterNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "month" || unit == "mm" || unit == "m")
-            dispatchForColumns<ToRelativeMonthNumImpl>(x, y, timezone_x, timezone_y, res->getData());
+            dispatchForColumns<ToRelativeMonthNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "week" || unit == "wk" || unit == "ww")
-            dispatchForColumns<ToRelativeWeekNumImpl>(x, y, timezone_x, timezone_y, res->getData());
+            dispatchForColumns<ToRelativeWeekNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "day" || unit == "dd" || unit == "d")
-            dispatchForColumns<ToRelativeDayNumImpl>(x, y, timezone_x, timezone_y, res->getData());
+            dispatchForColumns<ToRelativeDayNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "hour" || unit == "hh" || unit == "h")
-            dispatchForColumns<ToRelativeHourNumImpl>(x, y, timezone_x, timezone_y, res->getData());
+            dispatchForColumns<ToRelativeHourNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "minute" || unit == "mi" || unit == "n")
-            dispatchForColumns<ToRelativeMinuteNumImpl>(x, y, timezone_x, timezone_y, res->getData());
+            dispatchForColumns<ToRelativeMinuteNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "second" || unit == "ss" || unit == "s")
-            dispatchForColumns<ToRelativeSecondNumImpl>(x, y, timezone_x, timezone_y, res->getData());
+            dispatchForColumns<ToRelativeSecondNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
         else
-            throw Exception("Function " + getName() + " does not support '" + unit + "' unit", ErrorCodes::BAD_ARGUMENTS);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Function {} does not support '{}' unit", getName(), unit);
 
         return res;
     }
@@ -137,16 +145,22 @@ private:
             dispatchForSecondColumn<Transform>(*x_vec_16, y, timezone_x, timezone_y, result);
         else if (const auto * x_vec_32 = checkAndGetColumn<ColumnUInt32>(&x))
             dispatchForSecondColumn<Transform>(*x_vec_32, y, timezone_x, timezone_y, result);
+        else if (const auto * x_vec_32_s = checkAndGetColumn<ColumnInt32>(&x))
+            dispatchForSecondColumn<Transform>(*x_vec_32_s, y, timezone_x, timezone_y, result);
         else if (const auto * x_vec_64 = checkAndGetColumn<ColumnDateTime64>(&x))
             dispatchForSecondColumn<Transform>(*x_vec_64, y, timezone_x, timezone_y, result);
         else if (const auto * x_const_16 = checkAndGetColumnConst<ColumnUInt16>(&x))
             dispatchConstForSecondColumn<Transform>(x_const_16->getValue<UInt16>(), y, timezone_x, timezone_y, result);
         else if (const auto * x_const_32 = checkAndGetColumnConst<ColumnUInt32>(&x))
             dispatchConstForSecondColumn<Transform>(x_const_32->getValue<UInt32>(), y, timezone_x, timezone_y, result);
+        else if (const auto * x_const_32_s = checkAndGetColumnConst<ColumnInt32>(&x))
+            dispatchConstForSecondColumn<Transform>(x_const_32_s->getValue<Int32>(), y, timezone_x, timezone_y, result);
         else if (const auto * x_const_64 = checkAndGetColumnConst<ColumnDateTime64>(&x))
             dispatchConstForSecondColumn<Transform>(x_const_64->getValue<DecimalField<DateTime64>>(), y, timezone_x, timezone_y, result);
         else
-            throw Exception("Illegal column for first argument of function " + getName() + ", must be Date, DateTime or DateTime64", ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal column for first argument of function {}, must be Date, Date32, DateTime or DateTime64",
+                getName());
     }
 
     template <typename Transform, typename LeftColumnType>
@@ -159,16 +173,22 @@ private:
             vectorVector<Transform>(x, *y_vec_16, timezone_x, timezone_y, result);
         else if (const auto * y_vec_32 = checkAndGetColumn<ColumnUInt32>(&y))
             vectorVector<Transform>(x, *y_vec_32, timezone_x, timezone_y, result);
+        else if (const auto * y_vec_32_s = checkAndGetColumn<ColumnInt32>(&y))
+            vectorVector<Transform>(x, *y_vec_32_s, timezone_x, timezone_y, result);
         else if (const auto * y_vec_64 = checkAndGetColumn<ColumnDateTime64>(&y))
             vectorVector<Transform>(x, *y_vec_64, timezone_x, timezone_y, result);
         else if (const auto * y_const_16 = checkAndGetColumnConst<ColumnUInt16>(&y))
             vectorConstant<Transform>(x, y_const_16->getValue<UInt16>(), timezone_x, timezone_y, result);
         else if (const auto * y_const_32 = checkAndGetColumnConst<ColumnUInt32>(&y))
             vectorConstant<Transform>(x, y_const_32->getValue<UInt32>(), timezone_x, timezone_y, result);
+        else if (const auto * y_const_32_s = checkAndGetColumnConst<ColumnInt32>(&y))
+            vectorConstant<Transform>(x, y_const_32_s->getValue<Int32>(), timezone_x, timezone_y, result);
         else if (const auto * y_const_64 = checkAndGetColumnConst<ColumnDateTime64>(&y))
             vectorConstant<Transform>(x, y_const_64->getValue<DecimalField<DateTime64>>(), timezone_x, timezone_y, result);
         else
-            throw Exception("Illegal column for second argument of function " + getName() + ", must be Date or DateTime", ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal column for second argument of function {}, must be Date, Date32, DateTime or DateTime64",
+                getName());
     }
 
     template <typename Transform, typename T1>
@@ -181,10 +201,14 @@ private:
             constantVector<Transform>(x, *y_vec_16, timezone_x, timezone_y, result);
         else if (const auto * y_vec_32 = checkAndGetColumn<ColumnUInt32>(&y))
             constantVector<Transform>(x, *y_vec_32, timezone_x, timezone_y, result);
+        else if (const auto * y_vec_32_s = checkAndGetColumn<ColumnInt32>(&y))
+            constantVector<Transform>(x, *y_vec_32_s, timezone_x, timezone_y, result);
         else if (const auto * y_vec_64 = checkAndGetColumn<ColumnDateTime64>(&y))
             constantVector<Transform>(x, *y_vec_64, timezone_x, timezone_y, result);
         else
-            throw Exception("Illegal column for second argument of function " + getName() + ", must be Date or DateTime", ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal column for second argument of function {}, must be Date, Date32, DateTime or DateTime64",
+                getName());
     }
 
     template <typename Transform, typename LeftColumnType, typename RightColumnType>
diff --git a/src/Functions/dateName.cpp b/src/Functions/dateName.cpp
index 3911b1cf838..36c0be49190 100644
--- a/src/Functions/dateName.cpp
+++ b/src/Functions/dateName.cpp
@@ -4,6 +4,7 @@
 #include <IO/WriteHelpers.h>
 
 #include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeString.h>
@@ -34,6 +35,11 @@ template <> struct DataTypeToTimeTypeMap<DataTypeDate>
     using TimeType = UInt16;
 };
 
+template <> struct DataTypeToTimeTypeMap<DataTypeDate32>
+{
+    using TimeType = Int32;
+};
+
 template <> struct DataTypeToTimeTypeMap<DataTypeDateTime>
 {
     using TimeType = UInt32;
@@ -72,7 +78,7 @@ public:
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
                 "Number of arguments for function {} doesn't match: passed {}",
                 getName(),
-                toString(arguments.size()));
+                arguments.size());
 
         if (!WhichDataType(arguments[0].type).isString())
             throw Exception(
@@ -83,7 +89,7 @@ public:
 
         WhichDataType first_argument_type(arguments[1].type);
 
-        if (!(first_argument_type.isDate() || first_argument_type.isDateTime() || first_argument_type.isDateTime64()))
+        if (!(first_argument_type.isDate() || first_argument_type.isDateTime() || first_argument_type.isDate32() || first_argument_type.isDateTime64()))
             throw Exception(
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                 "Illegal type {} of 2 argument of function {}. Must be a date or a date with time",
@@ -108,6 +114,7 @@ public:
         ColumnPtr res;
 
         if (!((res = executeType<DataTypeDate>(arguments, result_type))
+            || (res = executeType<DataTypeDate32>(arguments, result_type))
             || (res = executeType<DataTypeDateTime>(arguments, result_type))
             || (res = executeType<DataTypeDateTime64>(arguments, result_type))))
             throw Exception(
diff --git a/src/Functions/divide/divideImpl.cpp b/src/Functions/divide/divideImpl.cpp
index 6c151dfefb5..940f4b35df9 100644
--- a/src/Functions/divide/divideImpl.cpp
+++ b/src/Functions/divide/divideImpl.cpp
@@ -18,7 +18,7 @@ namespace NAMESPACE
 template <typename A, typename B, typename ResultType>
 void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
 {
-    libdivide::divider<A> divider(b);
+    libdivide::divider<A> divider(static_cast<A>(b));
     const A * a_end = a_pos + size;
 
 #if defined(__SSE2__)
diff --git a/src/Functions/errorCodeToName.cpp b/src/Functions/errorCodeToName.cpp
index 1736311c6cc..0025d38c8f2 100644
--- a/src/Functions/errorCodeToName.cpp
+++ b/src/Functions/errorCodeToName.cpp
@@ -45,7 +45,8 @@ public:
         for (size_t i = 0; i < input_rows_count; ++i)
         {
             const Int64 error_code = input_column.getInt(i);
-            std::string_view error_name = ErrorCodes::getName(error_code);
+            std::string_view error_name =
+                ErrorCodes::getName(static_cast<ErrorCodes::ErrorCode>(error_code));
             col_res->insertData(error_name.data(), error_name.size());
         }
 
diff --git a/src/Functions/extractAllGroups.h b/src/Functions/extractAllGroups.h
index 06b16181c94..e077086a359 100644
--- a/src/Functions/extractAllGroups.h
+++ b/src/Functions/extractAllGroups.h
@@ -136,7 +136,8 @@ public:
                 const auto * end = pos + current_row.size();
                 while (pos < end
                     && regexp->Match({pos, static_cast<size_t>(end - pos)},
-                        0, end - pos, regexp->UNANCHORED, matched_groups.data(), matched_groups.size()))
+                        0, end - pos, regexp->UNANCHORED,
+                        matched_groups.data(), static_cast<int>(matched_groups.size())))
                 {
                     // 1 is to exclude group #0 which is whole re match.
                     for (size_t group = 1; group <= groups_count; ++group)
@@ -179,7 +180,8 @@ public:
                 const auto * end = pos + current_row.size;
                 while (pos < end
                     && regexp->Match({pos, static_cast<size_t>(end - pos)},
-                        0, end - pos, regexp->UNANCHORED, matched_groups.data(), matched_groups.size()))
+                        0, end - pos, regexp->UNANCHORED, matched_groups.data(),
+                        static_cast<int>(matched_groups.size())))
                 {
                     // 1 is to exclude group #0 which is whole re match.
                     for (size_t group = 1; group <= groups_count; ++group)
diff --git a/src/Functions/extractGroups.cpp b/src/Functions/extractGroups.cpp
index eb6e609a4be..8ec389827db 100644
--- a/src/Functions/extractGroups.cpp
+++ b/src/Functions/extractGroups.cpp
@@ -90,7 +90,8 @@ public:
             std::string_view current_row = column_haystack->getDataAt(i).toView();
 
             if (re2->Match(re2_st::StringPiece(current_row.data(), current_row.size()),
-                0, current_row.size(), re2_st::RE2::UNANCHORED, matched_groups.data(), matched_groups.size()))
+                0, current_row.size(), re2_st::RE2::UNANCHORED, matched_groups.data(),
+                static_cast<int>(matched_groups.size())))
             {
                 // 1 is to exclude group #0 which is whole re match.
                 for (size_t group = 1; group <= groups_count; ++group)
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index 09071c5c1a0..a10c059b342 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -499,7 +499,7 @@ public:
             else
             {
                 for (auto & instruction : instructions)
-                    instruction.perform(pos, vec[i], time_zone);
+                    instruction.perform(pos, static_cast<UInt32>(vec[i]), time_zone);
             }
 
             dst_offsets[i] = pos - begin;
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index b7dcce9c188..08352553b9c 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -17,7 +17,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int BAD_ARGUMENTS;
 }
@@ -114,13 +113,6 @@ ColumnPtr FunctionInitializeAggregation::executeImpl(const ColumnsWithTypeAndNam
     MutableColumnPtr result_holder = result_type->createColumn();
     IColumn & res_col = *result_holder;
 
-    /// AggregateFunction's states should be inserted into column using specific way
-    auto * res_col_aggregate_function = typeid_cast<ColumnAggregateFunction *>(&res_col);
-
-    if (!res_col_aggregate_function && agg_func.isState())
-        throw Exception("State function " + agg_func.getName() + " inserts results into non-state column "
-                        + result_type->getName(), ErrorCodes::ILLEGAL_COLUMN);
-
     PODArray<AggregateDataPtr> places(input_rows_count);
     for (size_t i = 0; i < input_rows_count; ++i)
     {
@@ -151,10 +143,9 @@ ColumnPtr FunctionInitializeAggregation::executeImpl(const ColumnsWithTypeAndNam
     }
 
     for (size_t i = 0; i < input_rows_count; ++i)
-        if (!res_col_aggregate_function)
-            agg_func.insertResultInto(places[i], res_col, arena.get());
-        else
-            res_col_aggregate_function->insertFrom(places[i]);
+        /// We should use insertMergeResultInto to insert result into ColumnAggregateFunction
+        /// correctly if result contains AggregateFunction's states
+        agg_func.insertMergeResultInto(places[i], res_col, arena.get());
     return result_holder;
 }
 
diff --git a/src/Functions/makeDate.cpp b/src/Functions/makeDate.cpp
index e2d93c0fdc9..c9571a7333d 100644
--- a/src/Functions/makeDate.cpp
+++ b/src/Functions/makeDate.cpp
@@ -294,7 +294,7 @@ public:
             else if (unlikely(date_time > 0x0ffffffffll))
                 date_time = 0x0ffffffffll;
 
-            result_data[i] = date_time;
+            result_data[i] = static_cast<UInt32>(date_time);
         }
 
         return res_column;
@@ -365,7 +365,7 @@ public:
             fraction_data = &typeid_cast<const ColumnFloat64 &>(*converted_arguments[6]).getData();
         }
 
-        auto res_column = ColumnDecimal<DateTime64>::create(input_rows_count, precision);
+        auto res_column = ColumnDecimal<DateTime64>::create(input_rows_count, static_cast<UInt32>(precision));
         auto & result_data = res_column->getData();
 
         const auto & year_data = typeid_cast<const ColumnFloat32 &>(*converted_arguments[0]).getData();
@@ -411,7 +411,10 @@ public:
                     fraction = max_fraction;
             }
 
-            result_data[i] = DecimalUtils::decimalFromComponents<DateTime64>(date_time, static_cast<Int64>(fraction), precision);
+            result_data[i] = DecimalUtils::decimalFromComponents<DateTime64>(
+                date_time,
+                static_cast<Int64>(fraction),
+                static_cast<UInt32>(precision));
         }
 
         return res_column;
diff --git a/src/Functions/minus.cpp b/src/Functions/minus.cpp
index 3668e4afc18..04877a42b18 100644
--- a/src/Functions/minus.cpp
+++ b/src/Functions/minus.cpp
@@ -23,7 +23,7 @@ struct MinusImpl
             return static_cast<Result>(static_cast<CastA>(a)) - static_cast<Result>(static_cast<CastB>(b));
         }
         else
-            return static_cast<Result>(a) - b;
+            return static_cast<Result>(a) - static_cast<Result>(b);
     }
 
     /// Apply operation and check overflow. It's used for Deciamal operations. @returns true if overflowed, false otherwise.
diff --git a/src/Functions/modulo.cpp b/src/Functions/modulo.cpp
index 9a3aa12037f..b2411899160 100644
--- a/src/Functions/modulo.cpp
+++ b/src/Functions/modulo.cpp
@@ -80,7 +80,7 @@ struct ModuloByConstantImpl
             || (std::is_signed_v<A> && std::is_signed_v<B> && b < std::numeric_limits<A>::lowest())))
         {
             for (size_t i = 0; i < size; ++i)
-                dst[i] = src[i];
+                dst[i] = static_cast<ResultType>(src[i]);
             return;
         }
 
@@ -101,16 +101,19 @@ struct ModuloByConstantImpl
 
         if (b & (b - 1))
         {
-            libdivide::divider<A> divider(b);
+            libdivide::divider<A> divider(static_cast<A>(b));
             for (size_t i = 0; i < size; ++i)
-                dst[i] = src[i] - (src[i] / divider) * b; /// NOTE: perhaps, the division semantics with the remainder of negative numbers is not preserved.
+            {
+                /// NOTE: perhaps, the division semantics with the remainder of negative numbers is not preserved.
+                dst[i] = static_cast<ResultType>(src[i] - (src[i] / divider) * b);
+            }
         }
         else
         {
             // gcc libdivide doesn't work well for pow2 division
             auto mask = b - 1;
             for (size_t i = 0; i < size; ++i)
-                dst[i] = src[i] & mask;
+                dst[i] = static_cast<ResultType>(src[i] & mask);
         }
     }
 
diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index c5225d3317f..a6df4235d60 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -130,7 +130,7 @@ public:
                                 ". Expected const integer.",
                                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-            scale = argument.column->get64(0);
+            scale = static_cast<UInt32>(argument.column->get64(0));
         }
         if (arguments.size() == 2)
         {
diff --git a/src/Functions/nowInBlock.cpp b/src/Functions/nowInBlock.cpp
index db72e791587..c771d83225a 100644
--- a/src/Functions/nowInBlock.cpp
+++ b/src/Functions/nowInBlock.cpp
@@ -74,7 +74,7 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
-        return ColumnUInt32::create(input_rows_count, time(nullptr));
+        return ColumnUInt32::create(input_rows_count, static_cast<UInt32>(time(nullptr)));
     }
 };
 
diff --git a/src/Functions/plus.cpp b/src/Functions/plus.cpp
index 4b81c23584c..cd9cf6cec5c 100644
--- a/src/Functions/plus.cpp
+++ b/src/Functions/plus.cpp
@@ -25,7 +25,7 @@ struct PlusImpl
             return static_cast<Result>(static_cast<CastA>(a)) + static_cast<Result>(static_cast<CastB>(b));
         }
         else
-            return static_cast<Result>(a) + b;
+            return static_cast<Result>(a) + static_cast<Result>(b);
     }
 
     /// Apply operation and check overflow. It's used for Deciamal operations. @returns true if overflowed, false otherwise.
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index f69886ad71f..07b7f013cac 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -102,7 +102,7 @@ private:
             Float64 ellipse_data[4];
             for (const auto idx : collections::range(0, 4))
             {
-                int arg_idx = 2 + 4 * ellipse_idx + idx;
+                size_t arg_idx = 2 + 4 * ellipse_idx + idx;
                 const auto * column = arguments[arg_idx].column.get();
                 if (const auto * col = checkAndGetColumnConst<ColumnVector<Float64>>(column))
                 {
diff --git a/src/Functions/randDistribution.cpp b/src/Functions/randDistribution.cpp
new file mode 100644
index 00000000000..94dad4fdc89
--- /dev/null
+++ b/src/Functions/randDistribution.cpp
@@ -0,0 +1,472 @@
+#include <Functions/IFunction.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionFactory.h>
+#include "Common/Exception.h"
+#include <Common/NaNUtils.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Common/FieldVisitorConvertToNumber.h>
+#include <Common/ProfileEvents.h>
+#include <Common/assert_cast.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/Context_fwd.h>
+
+#include <random>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+struct UniformDistribution
+{
+    using ReturnType = DataTypeFloat64;
+    static constexpr const char * getName() { return "randUniform"; }
+    static constexpr size_t getNumberOfArguments() { return 2; }
+
+    static void generate(Float64 min, Float64 max, ColumnFloat64::Container & container)
+    {
+        auto distribution = std::uniform_real_distribution<>(min, max);
+        for (auto & elem : container)
+            elem = distribution(thread_local_rng);
+    }
+};
+
+struct NormalDistribution
+{
+    using ReturnType = DataTypeFloat64;
+    static constexpr const char * getName() { return "randNormal"; }
+    static constexpr size_t getNumberOfArguments() { return 2; }
+
+    static void generate(Float64 mean, Float64 variance, ColumnFloat64::Container & container)
+    {
+        auto distribution = std::normal_distribution<>(mean, variance);
+        for (auto & elem : container)
+            elem = distribution(thread_local_rng);
+    }
+};
+
+struct LogNormalDistribution
+{
+    using ReturnType = DataTypeFloat64;
+    static constexpr const char * getName() { return "randLogNormal"; }
+    static constexpr size_t getNumberOfArguments() { return 2; }
+
+    static void generate(Float64 mean, Float64 variance, ColumnFloat64::Container & container)
+    {
+        auto distribution = std::lognormal_distribution<>(mean, variance);
+        for (auto & elem : container)
+            elem = distribution(thread_local_rng);
+    }
+};
+
+struct ExponentialDistribution
+{
+    using ReturnType = DataTypeFloat64;
+    static constexpr const char * getName() { return "randExponential"; }
+    static constexpr size_t getNumberOfArguments() { return 1; }
+
+    static void generate(Float64 lambda, ColumnFloat64::Container & container)
+    {
+        auto distribution = std::exponential_distribution<>(lambda);
+        for (auto & elem : container)
+            elem = distribution(thread_local_rng);
+    }
+};
+
+struct ChiSquaredDistribution
+{
+    using ReturnType = DataTypeFloat64;
+    static constexpr const char * getName() { return "randChiSquared"; }
+    static constexpr size_t getNumberOfArguments() { return 1; }
+
+    static void generate(Float64 degree_of_freedom, ColumnFloat64::Container & container)
+    {
+        auto distribution = std::chi_squared_distribution<>(degree_of_freedom);
+        for (auto & elem : container)
+            elem = distribution(thread_local_rng);
+    }
+};
+
+struct StudentTDistribution
+{
+    using ReturnType = DataTypeFloat64;
+    static constexpr const char * getName() { return "randStudentT"; }
+    static constexpr size_t getNumberOfArguments() { return 1; }
+
+    static void generate(Float64 degree_of_freedom, ColumnFloat64::Container & container)
+    {
+        auto distribution = std::student_t_distribution<>(degree_of_freedom);
+        for (auto & elem : container)
+            elem = distribution(thread_local_rng);
+    }
+};
+
+struct FisherFDistribution
+{
+    using ReturnType = DataTypeFloat64;
+    static constexpr const char * getName() { return "randFisherF"; }
+    static constexpr size_t getNumberOfArguments() { return 2; }
+
+    static void generate(Float64 d1, Float64 d2, ColumnFloat64::Container & container)
+    {
+        auto distribution = std::fisher_f_distribution<>(d1, d2);
+        for (auto & elem : container)
+            elem = distribution(thread_local_rng);
+    }
+};
+
+struct BernoulliDistribution
+{
+    using ReturnType = DataTypeUInt8;
+    static constexpr const char * getName() { return "randBernoulli"; }
+    static constexpr size_t getNumberOfArguments() { return 1; }
+
+    static void generate(Float64 p, ColumnUInt8::Container & container)
+    {
+        if (p < 0.0f || p > 1.0f)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of function {} should be inside [0, 1] because it is a probability", getName());
+
+        auto distribution = std::bernoulli_distribution(p);
+        for (auto & elem : container)
+            elem = static_cast<UInt8>(distribution(thread_local_rng));
+    }
+};
+
+struct BinomialDistribution
+{
+    using ReturnType = DataTypeUInt64;
+    static constexpr const char * getName() { return "randBinomial"; }
+    static constexpr size_t getNumberOfArguments() { return 2; }
+
+    static void generate(UInt64 t, Float64 p, ColumnUInt64::Container & container)
+    {
+        if (p < 0.0f || p > 1.0f)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of function {} should be inside [0, 1] because it is a probability", getName());
+
+        auto distribution = std::binomial_distribution(t, p);
+        for (auto & elem : container)
+            elem = static_cast<UInt64>(distribution(thread_local_rng));
+    }
+};
+
+struct NegativeBinomialDistribution
+{
+    using ReturnType = DataTypeUInt64;
+    static constexpr const char * getName() { return "randNegativeBinomial"; }
+    static constexpr size_t getNumberOfArguments() { return 2; }
+
+    static void generate(UInt64 t, Float64 p, ColumnUInt64::Container & container)
+    {
+        if (p < 0.0f || p > 1.0f)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of function {} should be inside [0, 1] because it is a probability", getName());
+
+        auto distribution = std::negative_binomial_distribution(t, p);
+        for (auto & elem : container)
+            elem = static_cast<UInt64>(distribution(thread_local_rng));
+    }
+};
+
+struct PoissonDistribution
+{
+    using ReturnType = DataTypeUInt64;
+    static constexpr const char * getName() { return "randPoisson"; }
+    static constexpr size_t getNumberOfArguments() { return 1; }
+
+    static void generate(UInt64 n, ColumnUInt64::Container & container)
+    {
+        auto distribution = std::poisson_distribution(n);
+        for (auto & elem : container)
+            elem = static_cast<UInt64>(distribution(thread_local_rng));
+    }
+};
+
+}
+
+/** Function which will generate values according to the specified distribution
+  * Accepts only constant arguments
+  * Similar to the functions rand and rand64 an additional 'tag' argument could be added to the
+  * end of arguments list (this argument will be ignored) which will guarantee that functions are not sticked together
+  * during optimisations.
+  * Example: SELECT randNormal(0, 1, 1), randNormal(0, 1, 2) FROM numbers(10)
+  * This query will return two different columns
+  */
+template <typename Distribution>
+class FunctionRandomDistribution : public IFunction
+{
+private:
+
+    template <typename ResultType>
+    ResultType getParameterFromConstColumn(size_t parameter_number, const ColumnsWithTypeAndName & arguments) const
+    {
+        if (parameter_number >= arguments.size())
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR, "Parameter number ({}) is greater than the size of arguments ({}). This is a bug", parameter_number, arguments.size());
+
+        const IColumn * col = arguments[parameter_number].column.get();
+
+        if (!isColumnConst(*col))
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Parameter number {} of function must be constant.", parameter_number, getName());
+
+        auto parameter = applyVisitor(FieldVisitorConvertToNumber<ResultType>(), assert_cast<const ColumnConst &>(*col).getField());
+
+        if (isNaN(parameter) || !std::isfinite(parameter))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parameter number {} of function {} cannot be NaN of infinite", parameter_number, getName());
+
+        return parameter;
+    }
+
+public:
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionRandomDistribution<Distribution>>();
+    }
+
+    static constexpr auto name = Distribution::getName();
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return Distribution::getNumberOfArguments(); }
+    bool isVariadic() const override { return true; }
+    bool isDeterministic() const override { return false; }
+    bool isDeterministicInScopeOfQuery() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        auto desired = Distribution::getNumberOfArguments();
+        if (arguments.size() != desired && arguments.size() != desired + 1)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Wrong number of arguments for function {}. Should be {} or {}", getName(), desired, desired + 1);
+
+        for (size_t i = 0; i < Distribution::getNumberOfArguments(); ++i)
+        {
+            const auto & type = arguments[i];
+            WhichDataType which(type);
+            if (!which.isFloat() && !which.isNativeUInt())
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Illegal type {} of argument of function {}, expected Float64 or integer", type->getName(), getName());
+        }
+
+        return std::make_shared<typename Distribution::ReturnType>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        if constexpr (std::is_same_v<Distribution, BernoulliDistribution>)
+        {
+            auto res_column = ColumnUInt8::create(input_rows_count);
+            auto & res_data = res_column->getData();
+            Distribution::generate(getParameterFromConstColumn<Float64>(0, arguments), res_data);
+            return res_column;
+        }
+        else if constexpr (std::is_same_v<Distribution, BinomialDistribution> || std::is_same_v<Distribution, NegativeBinomialDistribution>)
+        {
+            auto res_column = ColumnUInt64::create(input_rows_count);
+            auto & res_data = res_column->getData();
+            Distribution::generate(getParameterFromConstColumn<UInt64>(0, arguments), getParameterFromConstColumn<Float64>(1, arguments), res_data);
+            return res_column;
+        }
+        else if constexpr (std::is_same_v<Distribution, PoissonDistribution>)
+        {
+            auto res_column = ColumnUInt64::create(input_rows_count);
+            auto & res_data = res_column->getData();
+            Distribution::generate(getParameterFromConstColumn<UInt64>(0, arguments), res_data);
+            return res_column;
+        }
+        else
+        {
+            auto res_column = ColumnFloat64::create(input_rows_count);
+            auto & res_data = res_column->getData();
+            if constexpr (Distribution::getNumberOfArguments() == 1)
+            {
+                Distribution::generate(getParameterFromConstColumn<Float64>(0, arguments), res_data);
+            }
+            else if constexpr (Distribution::getNumberOfArguments() == 2)
+            {
+                Distribution::generate(getParameterFromConstColumn<Float64>(0, arguments), getParameterFromConstColumn<Float64>(1, arguments), res_data);
+            }
+            else
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "More than two argument specified for function {}", getName());
+            }
+
+            return res_column;
+        }
+    }
+};
+
+
+REGISTER_FUNCTION(Distribution)
+{
+    factory.registerFunction<FunctionRandomDistribution<UniformDistribution>>(
+    {
+    R"(
+Returns a random number from the uniform distribution in the specified range.
+Accepts two parameters - minimum bound and maximum bound.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randUniform(0, 1) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+    factory.registerFunction<FunctionRandomDistribution<NormalDistribution>>(
+    {
+    R"(
+Returns a random number from the normal distribution.
+Accepts two parameters - mean and variance.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randNormal(0, 5) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+
+    factory.registerFunction<FunctionRandomDistribution<LogNormalDistribution>>(
+    {
+    R"(
+Returns a random number from the lognormal distribution (a distribution of a random variable whose logarithm is normally distributed).
+Accepts two parameters - mean and variance.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randLogNormal(0, 5) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+
+    factory.registerFunction<FunctionRandomDistribution<ExponentialDistribution>>(
+    {
+    R"(
+Returns a random number from the exponential distribution.
+Accepts one parameter.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randExponential(0, 5) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+
+    factory.registerFunction<FunctionRandomDistribution<ChiSquaredDistribution>>(
+    {
+    R"(
+Returns a random number from the chi-squared distribution (a distribution of a sum of the squares of k independent standard normal random variables).
+Accepts one parameter - degree of freedom.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randChiSquared(5) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+    factory.registerFunction<FunctionRandomDistribution<StudentTDistribution>>(
+    {
+    R"(
+Returns a random number from the t-distribution.
+Accepts one parameter - degree of freedom.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randStudentT(5) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+
+    factory.registerFunction<FunctionRandomDistribution<FisherFDistribution>>(
+    {
+    R"(
+Returns a random number from the f-distribution.
+The F-distribution is the distribution of X = (S1 / d1) / (S2 / d2) where d1 and d2 are degrees of freedom.
+Accepts two parameters - degrees of freedom.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randFisherF(5) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+
+    factory.registerFunction<FunctionRandomDistribution<BernoulliDistribution>>(
+    {
+    R"(
+Returns a random number from the Bernoulli distribution.
+Accepts two parameters - probability of success.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randBernoulli(0.1) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+
+    factory.registerFunction<FunctionRandomDistribution<BinomialDistribution>>(
+    {
+    R"(
+Returns a random number from the binomial distribution.
+Accepts two parameters - number of experiments and probability of success in each experiment.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randBinomial(10, 0.1) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+
+    factory.registerFunction<FunctionRandomDistribution<NegativeBinomialDistribution>>(
+    {
+    R"(
+Returns a random number from the negative binomial distribution.
+Accepts two parameters - number of experiments and probability of success in each experiment.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randNegativeBinomial(10, 0.1) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+
+
+    factory.registerFunction<FunctionRandomDistribution<PoissonDistribution>>(
+    {
+    R"(
+Returns a random number from the poisson distribution.
+Accepts two parameters - the mean number of occurrences.
+
+Typical usage:
+[example:typical]
+)",
+    Documentation::Examples{
+        {"typical", "SELECT randPoisson(3) FROM numbers(100000);"}},
+    Documentation::Categories{"Distribution"}
+    });
+}
+
+}
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index 043db179d71..bcaa603b85d 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -116,8 +116,8 @@ public:
             {
                 UInt64 rand = rng();
 
-                UInt32 code_point1 = generate_code_point(rand);
-                UInt32 code_point2 = generate_code_point(rand >> 32);
+                UInt32 code_point1 = generate_code_point(static_cast<UInt32>(rand));
+                UInt32 code_point2 = generate_code_point(static_cast<UInt32>(rand >> 32u));
 
                 /// We have padding in column buffers that we can overwrite.
                 size_t length1 = UTF8::convertCodePointToUTF8(code_point1, pos, sizeof(int));
diff --git a/src/Functions/runningConcurrency.cpp b/src/Functions/runningConcurrency.cpp
index 37fa11bce8f..c759476006f 100644
--- a/src/Functions/runningConcurrency.cpp
+++ b/src/Functions/runningConcurrency.cpp
@@ -43,6 +43,7 @@ namespace DB
             const typename ColVecArg::Container & vec_end   = col_end->getData();
 
             using ColVecConc = typename ConcurrencyDataType::ColumnType;
+            using FieldType = typename ConcurrencyDataType::FieldType;
             typename ColVecConc::MutablePtr col_concurrency = ColVecConc::create(input_rows_count);
             typename ColVecConc::Container & vec_concurrency = col_concurrency->getData();
 
@@ -74,7 +75,7 @@ namespace DB
                 ongoing_until.erase(
                     ongoing_until.begin(), ongoing_until.upper_bound(begin));
 
-                vec_concurrency[i] = ongoing_until.size();
+                vec_concurrency[i] = static_cast<FieldType>(ongoing_until.size());
             }
 
             return col_concurrency;
diff --git a/src/Functions/runningDifference.h b/src/Functions/runningDifference.h
index f3caf245d08..053d7cb9736 100644
--- a/src/Functions/runningDifference.h
+++ b/src/Functions/runningDifference.h
@@ -117,7 +117,7 @@ private:
         else if (which.isDate())
             f(DataTypeDate::FieldType());
         else if (which.isDate32())
-            f(DataTypeDate::FieldType());
+            f(DataTypeDate32::FieldType());
         else if (which.isDateTime())
             f(DataTypeDateTime::FieldType());
         else
diff --git a/src/Functions/stem.cpp b/src/Functions/stem.cpp
index 9c7ce895fce..91c98ec9b82 100644
--- a/src/Functions/stem.cpp
+++ b/src/Functions/stem.cpp
@@ -51,8 +51,8 @@ struct StemImpl
             /// Note that accessing -1th element is valid for PaddedPODArray.
             size_t original_size = offsets[i] - offsets[i - 1];
             const sb_symbol * result = sb_stemmer_stem(stemmer,
-                                                       reinterpret_cast<const uint8_t *>(data.data() + offsets[i - 1]),
-                                                       original_size - 1);
+                reinterpret_cast<const uint8_t *>(data.data() + offsets[i - 1]),
+                static_cast<int>(original_size - 1));
             size_t new_size = sb_stemmer_length(stemmer) + 1;
 
             memcpy(res_data.data() + data_size, result, new_size);
diff --git a/src/Functions/tests/gtest_has_all.cpp b/src/Functions/tests/gtest_has_all.cpp
index ca7bc80b4aa..1776a461580 100644
--- a/src/Functions/tests/gtest_has_all.cpp
+++ b/src/Functions/tests/gtest_has_all.cpp
@@ -18,9 +18,9 @@ void arrayInit(T* elements_to_have, size_t nb_elements_to_have, T* array_element
 {
     for (size_t i = 0; i < array_size; ++i)
     {
-        array_elements[i] = i;
+        array_elements[i] = static_cast<T>(i);
     }
-    auto [dist, gen] = uni_int_dist(0, array_size - 1);
+    auto [dist, gen] = uni_int_dist(0, static_cast<int>(array_size - 1));
     for (size_t i = 0; i < nb_elements_to_have; ++i)
     {
         elements_to_have[i] = array_elements[dist(gen)];
@@ -28,14 +28,14 @@ void arrayInit(T* elements_to_have, size_t nb_elements_to_have, T* array_element
     if (!all_elements_present)
     {
         /// make one element to be searched for missing from the target array
-        elements_to_have[nb_elements_to_have - 1] = array_size + 1;
+        elements_to_have[nb_elements_to_have - 1] = static_cast<T>(array_size + 1);
     }
 }
 
 void nullMapInit(UInt8 * null_map, size_t null_map_size, size_t nb_null_elements)
 {
     /// -2 to keep the last element of the array non-null
-    auto [dist, gen] = uni_int_dist(0, null_map_size - 2);
+    auto [dist, gen] = uni_int_dist(0, static_cast<int>(null_map_size - 2));
     for (size_t i = 0; i < null_map_size; ++i)
     {
         null_map[i] = 0;
diff --git a/src/Functions/throwIf.cpp b/src/Functions/throwIf.cpp
index 692faf1883c..357c5e0651a 100644
--- a/src/Functions/throwIf.cpp
+++ b/src/Functions/throwIf.cpp
@@ -22,11 +22,6 @@ namespace ErrorCodes
 namespace
 {
 
-/// The regex-based code style check script in CI complains when it sees "ErrorCodes:: ErrorCode" (space added to avoid another match).
-/// Because this expression is only used in this file, don't add some suppression mechanism to the already complex style checker, instead
-/// work around by creating a namespace alias.
-namespace ErrorCodeAlias = ErrorCodes;
-
 /// Throw an exception if the argument is non zero.
 class FunctionThrowIf : public IFunction
 {
@@ -93,7 +88,7 @@ public:
             custom_message = message_column->getValue<String>();
         }
 
-        std::optional<ErrorCodeAlias::ErrorCode> custom_error_code;
+        std::optional<ErrorCodes::ErrorCode> custom_error_code;
         if (allow_custom_error_code_argument && arguments.size() == 3)
         {
             if (!isColumnConst(*(arguments[2].column)))
@@ -125,7 +120,7 @@ public:
 
 private:
     template <typename T>
-    ColumnPtr execute(const IColumn * in_untyped, const std::optional<String> & message, const std::optional<ErrorCodeAlias::ErrorCode> & error_code) const
+    ColumnPtr execute(const IColumn * in_untyped, const std::optional<String> & message, const std::optional<ErrorCodes::ErrorCode> & error_code) const
     {
         const auto * in = checkAndGetColumn<ColumnVector<T>>(in_untyped);
 
diff --git a/src/Functions/timeSlots.cpp b/src/Functions/timeSlots.cpp
index 949ca7bc0e4..e986e32d76f 100644
--- a/src/Functions/timeSlots.cpp
+++ b/src/Functions/timeSlots.cpp
@@ -19,6 +19,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ILLEGAL_COLUMN;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace
@@ -41,6 +42,9 @@ struct TimeSlotsImpl
         const PaddedPODArray<UInt32> & starts, const PaddedPODArray<UInt32> & durations, UInt32 time_slot_size,
         PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
+        if (time_slot_size == 0)
+            throw Exception("Time slot size cannot be zero", ErrorCodes::BAD_ARGUMENTS);
+
         size_t size = starts.size();
 
         result_offsets.resize(size);
@@ -63,6 +67,9 @@ struct TimeSlotsImpl
         const PaddedPODArray<UInt32> & starts, UInt32 duration, UInt32 time_slot_size,
         PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
+        if (time_slot_size == 0)
+            throw Exception("Time slot size cannot be zero", ErrorCodes::BAD_ARGUMENTS);
+
         size_t size = starts.size();
 
         result_offsets.resize(size);
@@ -85,6 +92,9 @@ struct TimeSlotsImpl
         UInt32 start, const PaddedPODArray<UInt32> & durations, UInt32 time_slot_size,
         PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
+        if (time_slot_size == 0)
+            throw Exception("Time slot size cannot be zero", ErrorCodes::BAD_ARGUMENTS);
+
         size_t size = durations.size();
 
         result_offsets.resize(size);
@@ -125,6 +135,9 @@ struct TimeSlotsImpl
 
         ColumnArray::Offset current_offset = 0;
         time_slot_size = time_slot_size.value * ts_multiplier;
+        if (time_slot_size == 0)
+            throw Exception("Time slot size cannot be zero", ErrorCodes::BAD_ARGUMENTS);
+
         for (size_t i = 0; i < size; ++i)
         {
             for (DateTime64 value = (starts[i] * dt_multiplier) / time_slot_size, end = (starts[i] * dt_multiplier + durations[i] * dur_multiplier) / time_slot_size; value <= end; value += 1)
@@ -155,6 +168,9 @@ struct TimeSlotsImpl
         ColumnArray::Offset current_offset = 0;
         duration = duration * dur_multiplier;
         time_slot_size = time_slot_size.value * ts_multiplier;
+        if (time_slot_size == 0)
+            throw Exception("Time slot size cannot be zero", ErrorCodes::BAD_ARGUMENTS);
+
         for (size_t i = 0; i < size; ++i)
         {
             for (DateTime64 value = (starts[i] * dt_multiplier) / time_slot_size, end = (starts[i] * dt_multiplier + duration) / time_slot_size; value <= end; value += 1)
@@ -185,6 +201,9 @@ struct TimeSlotsImpl
         ColumnArray::Offset current_offset = 0;
         start = dt_multiplier * start;
         time_slot_size = time_slot_size.value * ts_multiplier;
+        if (time_slot_size == 0)
+            throw Exception("Time slot size cannot be zero", ErrorCodes::BAD_ARGUMENTS);
+
         for (size_t i = 0; i < size; ++i)
         {
             for (DateTime64 value = start / time_slot_size, end = (start + durations[i] * dur_multiplier) / time_slot_size; value <= end; value += 1)
diff --git a/src/Functions/toRelativeDayNum.cpp b/src/Functions/toRelativeDayNum.cpp
index 241104493cd..db3eb119dcf 100644
--- a/src/Functions/toRelativeDayNum.cpp
+++ b/src/Functions/toRelativeDayNum.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-using FunctionToRelativeDayNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeDayNumImpl>;
+using FunctionToRelativeDayNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeDayNumImpl<ResultPrecision::Standard>>;
 
 REGISTER_FUNCTION(ToRelativeDayNum)
 {
diff --git a/src/Functions/toRelativeHourNum.cpp b/src/Functions/toRelativeHourNum.cpp
index 2404d73c450..838b1bb1ca1 100644
--- a/src/Functions/toRelativeHourNum.cpp
+++ b/src/Functions/toRelativeHourNum.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-using FunctionToRelativeHourNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeHourNumImpl>;
+using FunctionToRelativeHourNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeHourNumImpl<ResultPrecision::Standard>>;
 
 REGISTER_FUNCTION(ToRelativeHourNum)
 {
diff --git a/src/Functions/toRelativeMinuteNum.cpp b/src/Functions/toRelativeMinuteNum.cpp
index a5ecada1e92..e9318517119 100644
--- a/src/Functions/toRelativeMinuteNum.cpp
+++ b/src/Functions/toRelativeMinuteNum.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-using FunctionToRelativeMinuteNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeMinuteNumImpl>;
+using FunctionToRelativeMinuteNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeMinuteNumImpl<ResultPrecision::Standard>>;
 
 REGISTER_FUNCTION(ToRelativeMinuteNum)
 {
diff --git a/src/Functions/toRelativeMonthNum.cpp b/src/Functions/toRelativeMonthNum.cpp
index 8f46e04e483..7b058c3ba12 100644
--- a/src/Functions/toRelativeMonthNum.cpp
+++ b/src/Functions/toRelativeMonthNum.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-using FunctionToRelativeMonthNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeMonthNumImpl>;
+using FunctionToRelativeMonthNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeMonthNumImpl<ResultPrecision::Standard>>;
 
 REGISTER_FUNCTION(ToRelativeMonthNum)
 {
diff --git a/src/Functions/toRelativeQuarterNum.cpp b/src/Functions/toRelativeQuarterNum.cpp
index 8ea0c42ef09..c7702d47f42 100644
--- a/src/Functions/toRelativeQuarterNum.cpp
+++ b/src/Functions/toRelativeQuarterNum.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-using FunctionToRelativeQuarterNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeQuarterNumImpl>;
+using FunctionToRelativeQuarterNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeQuarterNumImpl<ResultPrecision::Standard>>;
 
 REGISTER_FUNCTION(ToRelativeQuarterNum)
 {
diff --git a/src/Functions/toRelativeSecondNum.cpp b/src/Functions/toRelativeSecondNum.cpp
index 7af41ab8334..db80f721fbd 100644
--- a/src/Functions/toRelativeSecondNum.cpp
+++ b/src/Functions/toRelativeSecondNum.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-using FunctionToRelativeSecondNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeSecondNumImpl>;
+using FunctionToRelativeSecondNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeSecondNumImpl<ResultPrecision::Standard>>;
 
 REGISTER_FUNCTION(ToRelativeSecondNum)
 {
diff --git a/src/Functions/toRelativeWeekNum.cpp b/src/Functions/toRelativeWeekNum.cpp
index fe7aec3fd9a..beca00d8cc4 100644
--- a/src/Functions/toRelativeWeekNum.cpp
+++ b/src/Functions/toRelativeWeekNum.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-using FunctionToRelativeWeekNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeWeekNumImpl>;
+using FunctionToRelativeWeekNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeWeekNumImpl<ResultPrecision::Standard>>;
 
 REGISTER_FUNCTION(ToRelativeWeekNum)
 {
diff --git a/src/Functions/toRelativeYearNum.cpp b/src/Functions/toRelativeYearNum.cpp
index 4574d8513e0..b4fe3318129 100644
--- a/src/Functions/toRelativeYearNum.cpp
+++ b/src/Functions/toRelativeYearNum.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-using FunctionToRelativeYearNum = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToRelativeYearNumImpl>;
+using FunctionToRelativeYearNum = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToRelativeYearNumImpl<ResultPrecision::Standard>>;
 
 REGISTER_FUNCTION(ToRelativeYearNum)
 {
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index ac648b87448..32fe574f56a 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -133,17 +133,17 @@ namespace
     {
         static UInt32 execute(UInt16 d, Int64 days, const DateLUTImpl & time_zone, Int64)
         {
-            return time_zone.toStartOfDayInterval(ExtendedDayNum(d), days);
+            return static_cast<UInt32>(time_zone.toStartOfDayInterval(ExtendedDayNum(d), days));
         }
 
         static UInt32 execute(Int32 d, Int64 days, const DateLUTImpl & time_zone, Int64)
         {
-            return time_zone.toStartOfDayInterval(ExtendedDayNum(d), days);
+            return static_cast<UInt32>(time_zone.toStartOfDayInterval(ExtendedDayNum(d), days));
         }
 
         static UInt32 execute(UInt32 t, Int64 days, const DateLUTImpl & time_zone, Int64)
         {
-            return time_zone.toStartOfDayInterval(time_zone.toDayNum(t), days);
+            return static_cast<UInt32>(time_zone.toStartOfDayInterval(time_zone.toDayNum(t), days));
         }
 
         static Int64 execute(Int64 t, Int64 days, const DateLUTImpl & time_zone, Int64 scale_multiplier)
@@ -517,6 +517,7 @@ private:
     ColumnPtr execute(const FromDataType &, const ColumnType & time_column_type, Int64 num_units, const DataTypePtr & result_type, const DateLUTImpl & time_zone, const UInt16 scale) const
     {
         using ToColumnType = typename ToDataType::ColumnType;
+        using ToFieldType = typename ToDataType::FieldType;
 
         const auto & time_data = time_column_type.getData();
         size_t size = time_data.size();
@@ -529,7 +530,8 @@ private:
         Int64 scale_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(scale);
 
         for (size_t i = 0; i != size; ++i)
-            result_data[i] = Transform<unit>::execute(time_data[i], num_units, time_zone, scale_multiplier);
+            result_data[i] = static_cast<ToFieldType>(
+                Transform<unit>::execute(time_data[i], num_units, time_zone, scale_multiplier));
 
         return result_col;
     }
diff --git a/src/Functions/toValidUTF8.cpp b/src/Functions/toValidUTF8.cpp
index 9874e39baa4..4b79bc0bbda 100644
--- a/src/Functions/toValidUTF8.cpp
+++ b/src/Functions/toValidUTF8.cpp
@@ -106,7 +106,7 @@ struct ToValidUTF8Impl
                 /// Sequence was not fully written to this buffer.
                 break;
             }
-            else if (Poco::UTF8Encoding::isLegal(reinterpret_cast<const unsigned char *>(p), len))
+            else if (Poco::UTF8Encoding::isLegal(reinterpret_cast<const unsigned char *>(p), static_cast<int>(len)))
             {
                 /// Valid sequence.
                 p += len;
diff --git a/src/IO/AIO.cpp b/src/IO/AIO.cpp
index fb762271e4d..494ed3bae38 100644
--- a/src/IO/AIO.cpp
+++ b/src/IO/AIO.cpp
@@ -23,22 +23,22 @@ namespace DB
 
 int io_setup(unsigned nr, aio_context_t * ctxp)
 {
-    return syscall(__NR_io_setup, nr, ctxp);
+    return static_cast<int>(syscall(__NR_io_setup, nr, ctxp));
 }
 
 int io_destroy(aio_context_t ctx)
 {
-    return syscall(__NR_io_destroy, ctx);
+    return static_cast<int>(syscall(__NR_io_destroy, ctx));
 }
 
 int io_submit(aio_context_t ctx, long nr, struct iocb * iocbpp[]) // NOLINT
 {
-    return syscall(__NR_io_submit, ctx, nr, iocbpp);
+    return static_cast<int>(syscall(__NR_io_submit, ctx, nr, iocbpp));
 }
 
 int io_getevents(aio_context_t ctx, long min_nr, long max_nr, io_event * events, struct timespec * timeout) // NOLINT
 {
-    return syscall(__NR_io_getevents, ctx, min_nr, max_nr, events, timeout);
+    return static_cast<int>(syscall(__NR_io_getevents, ctx, min_nr, max_nr, events, timeout));
 }
 
 
diff --git a/src/IO/Archives/ZipArchiveReader.cpp b/src/IO/Archives/ZipArchiveReader.cpp
index 3127f299f5c..a7c72c7b575 100644
--- a/src/IO/Archives/ZipArchiveReader.cpp
+++ b/src/IO/Archives/ZipArchiveReader.cpp
@@ -281,7 +281,7 @@ private:
     bool nextImpl() override
     {
         RawHandle raw_handle = handle.getRawHandle();
-        auto bytes_read = unzReadCurrentFile(raw_handle, internal_buffer.begin(), internal_buffer.size());
+        auto bytes_read = unzReadCurrentFile(raw_handle, internal_buffer.begin(), static_cast<int>(internal_buffer.size()));
 
         if (bytes_read < 0)
             checkResult(bytes_read);
diff --git a/src/IO/Archives/ZipArchiveWriter.cpp b/src/IO/Archives/ZipArchiveWriter.cpp
index 817e8132b64..d413783356d 100644
--- a/src/IO/Archives/ZipArchiveWriter.cpp
+++ b/src/IO/Archives/ZipArchiveWriter.cpp
@@ -134,7 +134,8 @@ private:
         if (!offset())
             return;
         RawHandle raw_handle = handle.getRawHandle();
-        checkResult(zipWriteInFileInZip(raw_handle, working_buffer.begin(), offset()));
+        int code = zipWriteInFileInZip(raw_handle, working_buffer.begin(), static_cast<uint32_t>(offset()));
+        checkResult(code);
     }
 
     void checkResult(int code) const { handle.checkResult(code); }
diff --git a/src/IO/Bzip2ReadBuffer.cpp b/src/IO/Bzip2ReadBuffer.cpp
index 9d183393159..9970edcbcf3 100644
--- a/src/IO/Bzip2ReadBuffer.cpp
+++ b/src/IO/Bzip2ReadBuffer.cpp
@@ -85,11 +85,11 @@ bool Bzip2ReadBuffer::nextImpl()
         if (!bz->stream.avail_in)
         {
             in->nextIfAtEnd();
-            bz->stream.avail_in = in->buffer().end() - in->position();
+            bz->stream.avail_in = static_cast<unsigned>(in->buffer().end() - in->position());
             bz->stream.next_in = in->position();
         }
 
-        bz->stream.avail_out = internal_buffer.size();
+        bz->stream.avail_out = static_cast<unsigned>(internal_buffer.size());
         bz->stream.next_out = internal_buffer.begin();
 
         ret = BZ2_bzDecompress(&bz->stream);
@@ -99,7 +99,7 @@ bool Bzip2ReadBuffer::nextImpl()
         if (ret == BZ_STREAM_END && !in->eof())
         {
             bz->reinitialize();
-            bz->stream.avail_in = in->buffer().end() - in->position();
+            bz->stream.avail_in = static_cast<unsigned>(in->buffer().end() - in->position());
             bz->stream.next_in = in->position();
 
             ret = BZ_OK;
diff --git a/src/IO/Bzip2WriteBuffer.cpp b/src/IO/Bzip2WriteBuffer.cpp
index 10a1803fec8..4b6bed70d35 100644
--- a/src/IO/Bzip2WriteBuffer.cpp
+++ b/src/IO/Bzip2WriteBuffer.cpp
@@ -58,7 +58,7 @@ void Bzip2WriteBuffer::nextImpl()
     }
 
     bz->stream.next_in = working_buffer.begin();
-    bz->stream.avail_in = offset();
+    bz->stream.avail_in = static_cast<unsigned>(offset());
 
     try
     {
@@ -66,7 +66,7 @@ void Bzip2WriteBuffer::nextImpl()
         {
             out->nextIfAtEnd();
             bz->stream.next_out = out->position();
-            bz->stream.avail_out = out->buffer().end() - out->position();
+            bz->stream.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
 
             int ret = BZ2_bzCompress(&bz->stream, BZ_RUN);
 
@@ -95,7 +95,7 @@ void Bzip2WriteBuffer::finalizeBefore()
 
     out->nextIfAtEnd();
     bz->stream.next_out = out->position();
-    bz->stream.avail_out = out->buffer().end() - out->position();
+    bz->stream.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
 
     int ret = BZ2_bzCompress(&bz->stream, BZ_FINISH);
 
diff --git a/src/IO/FileEncryptionCommon.cpp b/src/IO/FileEncryptionCommon.cpp
index 13d8acb8c7b..5592da8721c 100644
--- a/src/IO/FileEncryptionCommon.cpp
+++ b/src/IO/FileEncryptionCommon.cpp
@@ -6,6 +6,7 @@
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
 #include <Common/SipHash.h>
+#include <Common/safe_cast.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <cassert>
@@ -84,10 +85,13 @@ namespace
         while (in_size < size)
         {
             out.nextIfAtEnd();
+
             size_t part_size = std::min(size - in_size, out.available());
+            part_size = std::min<size_t>(part_size, INT_MAX);
+
             uint8_t * ciphertext = reinterpret_cast<uint8_t *>(out.position());
             int ciphertext_size = 0;
-            if (!EVP_EncryptUpdate(evp_ctx, ciphertext, &ciphertext_size, &in[in_size], part_size))
+            if (!EVP_EncryptUpdate(evp_ctx, ciphertext, &ciphertext_size, &in[in_size], static_cast<int>(part_size)))
                 throw Exception("Failed to encrypt", ErrorCodes::DATA_ENCRYPTION_ERROR);
 
             in_size += part_size;
@@ -110,7 +114,7 @@ namespace
 
         uint8_t ciphertext[kBlockSize];
         int ciphertext_size = 0;
-        if (!EVP_EncryptUpdate(evp_ctx, ciphertext, &ciphertext_size, padded_data, padded_data_size))
+        if (!EVP_EncryptUpdate(evp_ctx, ciphertext, &ciphertext_size, padded_data, safe_cast<int>(padded_data_size)))
             throw Exception("Failed to encrypt", ErrorCodes::DATA_ENCRYPTION_ERROR);
 
         if (!ciphertext_size)
@@ -142,7 +146,7 @@ namespace
         const uint8_t * in = reinterpret_cast<const uint8_t *>(data);
         uint8_t * plaintext = reinterpret_cast<uint8_t *>(out);
         int plaintext_size = 0;
-        if (!EVP_DecryptUpdate(evp_ctx, plaintext, &plaintext_size, in, size))
+        if (!EVP_DecryptUpdate(evp_ctx, plaintext, &plaintext_size, in, safe_cast<int>(size)))
             throw Exception("Failed to decrypt", ErrorCodes::DATA_ENCRYPTION_ERROR);
         return plaintext_size;
     }
@@ -153,10 +157,9 @@ namespace
         uint8_t padded_data[kBlockSize] = {};
         memcpy(&padded_data[pad_left], data, size);
         size_t padded_data_size = pad_left + size;
-
         uint8_t plaintext[kBlockSize];
         int plaintext_size = 0;
-        if (!EVP_DecryptUpdate(evp_ctx, plaintext, &plaintext_size, padded_data, padded_data_size))
+        if (!EVP_DecryptUpdate(evp_ctx, plaintext, &plaintext_size, padded_data, safe_cast<int>(padded_data_size)))
             throw Exception("Failed to decrypt", ErrorCodes::DATA_ENCRYPTION_ERROR);
 
         if (!plaintext_size)
diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index 9fd48914f64..f33b2399492 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -142,7 +142,7 @@ namespace
                 bool proxy_https_,
                 size_t max_pool_size_,
                 bool resolve_host_ = true)
-            : Base(max_pool_size_, &Poco::Logger::get("HTTPSessionPool"))
+            : Base(static_cast<unsigned>(max_pool_size_), &Poco::Logger::get("HTTPSessionPool"))
             , host(host_)
             , port(port_)
             , https(https_)
@@ -271,7 +271,7 @@ namespace
     };
 }
 
-void setResponseDefaultHeaders(HTTPServerResponse & response, unsigned keep_alive_timeout)
+void setResponseDefaultHeaders(HTTPServerResponse & response, size_t keep_alive_timeout)
 {
     if (!response.getKeepAlive())
         return;
diff --git a/src/IO/HTTPCommon.h b/src/IO/HTTPCommon.h
index 18e83abb83b..51da17d4ca7 100644
--- a/src/IO/HTTPCommon.h
+++ b/src/IO/HTTPCommon.h
@@ -38,7 +38,7 @@ public:
 using PooledHTTPSessionPtr = SingleEndpointHTTPSessionPool::Entry;
 using HTTPSessionPtr = std::shared_ptr<Poco::Net::HTTPClientSession>;
 
-void setResponseDefaultHeaders(HTTPServerResponse & response, unsigned keep_alive_timeout);
+void setResponseDefaultHeaders(HTTPServerResponse & response, size_t keep_alive_timeout);
 
 /// Create session object to perform requests and set required parameters.
 HTTPSessionPtr makeHTTPSession(const Poco::URI & uri, const ConnectionTimeouts & timeouts, bool resolve_host = true);
diff --git a/src/IO/ReadBufferFromPocoSocket.cpp b/src/IO/ReadBufferFromPocoSocket.cpp
index 988ad75cdf4..7ba23dd1588 100644
--- a/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/src/IO/ReadBufferFromPocoSocket.cpp
@@ -29,6 +29,7 @@ namespace ErrorCodes
     extern const int NETWORK_ERROR;
     extern const int SOCKET_TIMEOUT;
     extern const int CANNOT_READ_FROM_SOCKET;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -54,7 +55,10 @@ bool ReadBufferFromPocoSocket::nextImpl()
         while (async_callback && !socket.poll(0, Poco::Net::Socket::SELECT_READ))
             async_callback(socket.impl()->sockfd(), socket.getReceiveTimeout(), socket_description);
 
-        bytes_read = socket.impl()->receiveBytes(internal_buffer.begin(), internal_buffer.size());
+        if (internal_buffer.size() > INT_MAX)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Buffer overflow");
+
+        bytes_read = socket.impl()->receiveBytes(internal_buffer.begin(), static_cast<int>(internal_buffer.size()));
     }
     catch (const Poco::Net::NetException & e)
     {
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index d5b0ce4bebe..27a24eef804 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -1095,6 +1095,7 @@ inline void readText(is_floating_point auto & x, ReadBuffer & buf) { readFloatTe
 
 inline void readText(String & x, ReadBuffer & buf) { readEscapedString(x, buf); }
 inline void readText(LocalDate & x, ReadBuffer & buf) { readDateText(x, buf); }
+inline void readText(DayNum & x, ReadBuffer & buf) { readDateText(x, buf); }
 inline void readText(LocalDateTime & x, ReadBuffer & buf) { readDateTimeText(x, buf); }
 inline void readText(UUID & x, ReadBuffer & buf) { readUUIDText(x, buf); }
 
@@ -1176,6 +1177,7 @@ inline void readCSV(T & x, ReadBuffer & buf)
 
 inline void readCSV(String & x, ReadBuffer & buf, const FormatSettings::CSV & settings) { readCSVString(x, buf, settings); }
 inline void readCSV(LocalDate & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline void readCSV(DayNum & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
 inline void readCSV(LocalDateTime & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
 inline void readCSV(UUID & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
 inline void readCSV(UInt128 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index 57e4369e565..5649638285d 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -2,20 +2,22 @@
 
 #include "config.h"
 
+#include <string>
+#include <vector>
+
 #if USE_AWS_S3
 
 #include <Common/RemoteHostFilter.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/HTTPCommon.h>
 #include <IO/S3/SessionAwareIOStream.h>
-#include <Storages/StorageS3Settings.h>
+#include <Storages/HeaderCollection.h>
 
 #include <aws/core/client/ClientConfiguration.h>
 #include <aws/core/http/HttpClient.h>
 #include <aws/core/http/HttpRequest.h>
 #include <aws/core/http/standard/StandardHttpResponse.h>
 
-
 namespace Aws::Http::Standard
 {
 class StandardHttpResponse;
@@ -23,6 +25,7 @@ class StandardHttpResponse;
 
 namespace DB
 {
+
 class Context;
 }
 
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index df19748b493..859f5ce796b 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -1,9 +1,11 @@
+#include <IO/S3Common.h>
+
+#include <Common/Exception.h>
+#include <Poco/Util/AbstractConfiguration.h>
 #include "config.h"
 
 #if USE_AWS_S3
 
-#    include <IO/S3Common.h>
-
 #    include <Common/quoteString.h>
 
 #    include <IO/WriteBufferFromString.h>
@@ -780,25 +782,16 @@ namespace S3
 
             boost::to_upper(name);
             if (name != S3 && name != COS && name != OBS && name != OSS)
-            {
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Object storage system name is unrecognized in virtual hosted style S3 URI: {}", quoteString(name));
-            }
+
             if (name == S3)
-            {
                 storage_name = name;
-            }
             else if (name == OBS)
-            {
                 storage_name = OBS;
-            }
             else if (name == OSS)
-            {
                 storage_name = OSS;
-            }
             else
-            {
                 storage_name = COSN;
-            }
         }
         else if (re2::RE2::PartialMatch(uri.getPath(), path_style_pattern, &bucket, &key))
         {
@@ -851,8 +844,82 @@ namespace S3
     {
         return getObjectInfo(client_ptr, bucket, key, version_id, throw_on_error, for_disk_s3).size;
     }
+
 }
 
 }
 
 #endif
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INVALID_CONFIG_PARAMETER;
+}
+
+namespace S3
+{
+
+AuthSettings AuthSettings::loadFromConfig(const std::string & config_elem, const Poco::Util::AbstractConfiguration & config)
+{
+    auto access_key_id = config.getString(config_elem + ".access_key_id", "");
+    auto secret_access_key = config.getString(config_elem + ".secret_access_key", "");
+    auto region = config.getString(config_elem + ".region", "");
+    auto server_side_encryption_customer_key_base64 = config.getString(config_elem + ".server_side_encryption_customer_key_base64", "");
+
+    std::optional<bool> use_environment_credentials;
+    if (config.has(config_elem + ".use_environment_credentials"))
+        use_environment_credentials = config.getBool(config_elem + ".use_environment_credentials");
+
+    std::optional<bool> use_insecure_imds_request;
+    if (config.has(config_elem + ".use_insecure_imds_request"))
+        use_insecure_imds_request = config.getBool(config_elem + ".use_insecure_imds_request");
+
+    HeaderCollection headers;
+    Poco::Util::AbstractConfiguration::Keys subconfig_keys;
+    config.keys(config_elem, subconfig_keys);
+    for (const std::string & subkey : subconfig_keys)
+    {
+        if (subkey.starts_with("header"))
+        {
+            auto header_str = config.getString(config_elem + "." + subkey);
+            auto delimiter = header_str.find(':');
+            if (delimiter == std::string::npos)
+                throw Exception("Malformed s3 header value", ErrorCodes::INVALID_CONFIG_PARAMETER);
+            headers.emplace_back(HttpHeader{header_str.substr(0, delimiter), header_str.substr(delimiter + 1, String::npos)});
+        }
+    }
+
+    return AuthSettings
+    {
+        std::move(access_key_id), std::move(secret_access_key),
+        std::move(region),
+        std::move(server_side_encryption_customer_key_base64),
+        std::move(headers),
+        use_environment_credentials,
+        use_insecure_imds_request
+    };
+}
+
+
+void AuthSettings::updateFrom(const AuthSettings & from)
+{
+    /// Update with check for emptyness only parameters which
+    /// can be passed not only from config, but via ast.
+
+    if (!from.access_key_id.empty())
+        access_key_id = from.access_key_id;
+    if (!from.secret_access_key.empty())
+        secret_access_key = from.secret_access_key;
+
+    headers = from.headers;
+    region = from.region;
+    server_side_encryption_customer_key_base64 = from.server_side_encryption_customer_key_base64;
+    use_environment_credentials = from.use_environment_credentials;
+    use_insecure_imds_request = from.use_insecure_imds_request;
+}
+
+}
+}
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 5c27b32985f..93e5eb78c7f 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -1,5 +1,11 @@
 #pragma once
 
+#include <Storages/HeaderCollection.h>
+#include <IO/S3/PocoHTTPClient.h>
+
+#include <string>
+#include <optional>
+
 #include "config.h"
 
 #if USE_AWS_S3
@@ -8,7 +14,6 @@
 #include <aws/core/Aws.h>
 #include <aws/core/client/ClientConfiguration.h>
 #include <aws/s3/S3Errors.h>
-#include <IO/S3/PocoHTTPClient.h>
 #include <Poco/URI.h>
 
 #include <Common/Exception.h>
@@ -27,8 +32,6 @@ namespace ErrorCodes
 }
 
 class RemoteHostFilter;
-struct HttpHeader;
-using HeaderCollection = std::vector<HttpHeader>;
 
 class S3Exception : public Exception
 {
@@ -130,5 +133,33 @@ S3::ObjectInfo getObjectInfo(std::shared_ptr<const Aws::S3::S3Client> client_ptr
 size_t getObjectSize(std::shared_ptr<const Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id, bool throw_on_error, bool for_disk_s3);
 
 }
-
 #endif
+
+namespace Poco::Util
+{
+class AbstractConfiguration;
+};
+
+namespace DB::S3
+{
+
+struct AuthSettings
+{
+    static AuthSettings loadFromConfig(const std::string & config_elem, const Poco::Util::AbstractConfiguration & config);
+
+    std::string access_key_id;
+    std::string secret_access_key;
+    std::string region;
+    std::string server_side_encryption_customer_key_base64;
+
+    HeaderCollection headers;
+
+    std::optional<bool> use_environment_credentials;
+    std::optional<bool> use_insecure_imds_request;
+
+    bool operator==(const AuthSettings & other) const = default;
+
+    void updateFrom(const AuthSettings & from);
+};
+
+}
diff --git a/src/IO/VarInt.h b/src/IO/VarInt.h
index 3161ca6d8a8..816aa8fd057 100644
--- a/src/IO/VarInt.h
+++ b/src/IO/VarInt.h
@@ -83,14 +83,14 @@ inline void readVarUInt(UInt32 & x, ReadBuffer & istr)
 {
     UInt64 tmp;
     readVarUInt(tmp, istr);
-    x = tmp;
+    x = static_cast<UInt32>(tmp);
 }
 
 inline void readVarInt(Int32 & x, ReadBuffer & istr)
 {
     Int64 tmp;
     readVarInt(tmp, istr);
-    x = tmp;
+    x = static_cast<Int32>(tmp);
 }
 
 inline void readVarUInt(UInt16 & x, ReadBuffer & istr)
diff --git a/src/IO/WriteBufferFromPocoSocket.cpp b/src/IO/WriteBufferFromPocoSocket.cpp
index fb4e5df9b59..95d532e9bd4 100644
--- a/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/src/IO/WriteBufferFromPocoSocket.cpp
@@ -31,6 +31,7 @@ namespace ErrorCodes
     extern const int NETWORK_ERROR;
     extern const int SOCKET_TIMEOUT;
     extern const int CANNOT_WRITE_TO_SOCKET;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -55,7 +56,11 @@ void WriteBufferFromPocoSocket::nextImpl()
         try
         {
             CurrentMetrics::Increment metric_increment(CurrentMetrics::NetworkSend);
-            res = socket.impl()->sendBytes(working_buffer.begin() + bytes_written, offset() - bytes_written);
+            char * pos = working_buffer.begin() + bytes_written;
+            size_t size = offset() - bytes_written;
+            if (size > INT_MAX)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Buffer overflow");
+            res = socket.impl()->sendBytes(pos, static_cast<int>(size));
         }
         catch (const Poco::Net::NetException & e)
         {
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 14118c3c04e..f823015bd7d 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -305,7 +305,7 @@ void WriteBufferFromS3::writePart()
         UploadPartTask task;
         auto & tags = TSA_SUPPRESS_WARNING_FOR_WRITE(part_tags); /// Suppress warning because schedule == false.
 
-        fillUploadRequest(task.req, tags.size() + 1);
+        fillUploadRequest(task.req, static_cast<int>(tags.size() + 1));
         processUploadRequest(task);
         tags.push_back(task.tag);
     }
@@ -362,7 +362,7 @@ void WriteBufferFromS3::completeMultipartUpload()
     for (size_t i = 0; i < tags.size(); ++i)
     {
         Aws::S3::Model::CompletedPart part;
-        multipart_upload.AddParts(part.WithETag(tags[i]).WithPartNumber(i + 1));
+        multipart_upload.AddParts(part.WithETag(tags[i]).WithPartNumber(static_cast<int>(i + 1)));
     }
 
     req.SetMultipartUpload(multipart_upload);
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 782e580d8be..28f831856d7 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -110,8 +110,8 @@ private:
 
     std::unique_ptr<PutObjectTask> put_object_task; /// Does not need protection by mutex because of the logic around is_finished field.
     std::list<UploadPartTask> TSA_GUARDED_BY(bg_tasks_mutex) upload_object_tasks;
-    size_t num_added_bg_tasks TSA_GUARDED_BY(bg_tasks_mutex) = 0;
-    size_t num_finished_bg_tasks TSA_GUARDED_BY(bg_tasks_mutex) = 0;
+    int num_added_bg_tasks TSA_GUARDED_BY(bg_tasks_mutex) = 0;
+    int num_finished_bg_tasks TSA_GUARDED_BY(bg_tasks_mutex) = 0;
 
     std::mutex bg_tasks_mutex;
     std::condition_variable bg_tasks_condvar;
diff --git a/src/IO/WriteBufferValidUTF8.cpp b/src/IO/WriteBufferValidUTF8.cpp
index 10e86f01343..4c8e172f43c 100644
--- a/src/IO/WriteBufferValidUTF8.cpp
+++ b/src/IO/WriteBufferValidUTF8.cpp
@@ -102,7 +102,7 @@ void WriteBufferValidUTF8::nextImpl()
             break;
 #endif
 
-        size_t len = length_of_utf8_sequence[static_cast<unsigned char>(*p)];
+        UInt8 len = length_of_utf8_sequence[static_cast<unsigned char>(*p)];
 
         if (len > 4)
         { // NOLINT
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index c3e1e59218f..42d84e080af 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -139,7 +139,7 @@ inline void writeBoolText(bool x, WriteBuffer & buf)
 template <typename T>
 inline size_t writeFloatTextFastPath(T x, char * buffer)
 {
-    int result = 0;
+    Int64 result = 0;
 
     if constexpr (std::is_same_v<T, double>)
     {
diff --git a/src/IO/ZlibDeflatingWriteBuffer.cpp b/src/IO/ZlibDeflatingWriteBuffer.cpp
index c265791e38a..43014096e2a 100644
--- a/src/IO/ZlibDeflatingWriteBuffer.cpp
+++ b/src/IO/ZlibDeflatingWriteBuffer.cpp
@@ -49,7 +49,7 @@ void ZlibDeflatingWriteBuffer::nextImpl()
         return;
 
     zstr.next_in = reinterpret_cast<unsigned char *>(working_buffer.begin());
-    zstr.avail_in = offset();
+    zstr.avail_in = static_cast<unsigned>(offset());
 
     try
     {
@@ -57,7 +57,7 @@ void ZlibDeflatingWriteBuffer::nextImpl()
         {
             out->nextIfAtEnd();
             zstr.next_out = reinterpret_cast<unsigned char *>(out->position());
-            zstr.avail_out = out->buffer().end() - out->position();
+            zstr.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
 
             int rc = deflate(&zstr, Z_NO_FLUSH);
             out->position() = out->buffer().end() - zstr.avail_out;
@@ -96,7 +96,7 @@ void ZlibDeflatingWriteBuffer::finalizeBefore()
     {
         out->nextIfAtEnd();
         zstr.next_out = reinterpret_cast<unsigned char *>(out->position());
-        zstr.avail_out = out->buffer().end() - out->position();
+        zstr.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
 
         int rc = deflate(&zstr, Z_FULL_FLUSH);
         out->position() = out->buffer().end() - zstr.avail_out;
@@ -110,7 +110,7 @@ void ZlibDeflatingWriteBuffer::finalizeBefore()
     {
         out->nextIfAtEnd();
         zstr.next_out = reinterpret_cast<unsigned char *>(out->position());
-        zstr.avail_out = out->buffer().end() - out->position();
+        zstr.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
 
         int rc = deflate(&zstr, Z_FINISH);
         out->position() = out->buffer().end() - zstr.avail_out;
diff --git a/src/IO/ZlibInflatingReadBuffer.cpp b/src/IO/ZlibInflatingReadBuffer.cpp
index 4cb56bef6b1..9c2ee640cbe 100644
--- a/src/IO/ZlibInflatingReadBuffer.cpp
+++ b/src/IO/ZlibInflatingReadBuffer.cpp
@@ -61,11 +61,11 @@ bool ZlibInflatingReadBuffer::nextImpl()
         {
             in->nextIfAtEnd();
             zstr.next_in = reinterpret_cast<unsigned char *>(in->position());
-            zstr.avail_in = in->buffer().end() - in->position();
+            zstr.avail_in = static_cast<unsigned>(in->buffer().end() - in->position());
         }
         /// init output bytes (place, where decompressed data will be)
         zstr.next_out = reinterpret_cast<unsigned char *>(internal_buffer.begin());
-        zstr.avail_out = internal_buffer.size();
+        zstr.avail_out = static_cast<unsigned>(internal_buffer.size());
 
         int rc = inflate(&zstr, Z_NO_FLUSH);
 
diff --git a/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp b/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
index 459f486af18..79fb4ccead5 100644
--- a/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
+++ b/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
@@ -149,7 +149,7 @@ void ZstdDeflatingAppendableWriteBuffer::finalizeZstd()
 {
     try
     {
-        int err = ZSTD_freeCCtx(cctx);
+        size_t 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);
diff --git a/src/IO/ZstdDeflatingWriteBuffer.cpp b/src/IO/ZstdDeflatingWriteBuffer.cpp
index 238645b16df..c7f9b0d718b 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.cpp
+++ b/src/IO/ZstdDeflatingWriteBuffer.cpp
@@ -100,7 +100,7 @@ void ZstdDeflatingWriteBuffer::finalizeAfter()
 {
     try
     {
-        int err = ZSTD_freeCCtx(cctx);
+        size_t 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);
diff --git a/src/IO/examples/valid_utf8_perf.cpp b/src/IO/examples/valid_utf8_perf.cpp
index b95cdb2c27c..f42251188d9 100644
--- a/src/IO/examples/valid_utf8_perf.cpp
+++ b/src/IO/examples/valid_utf8_perf.cpp
@@ -10,7 +10,7 @@ int main(int argc, char ** argv)
     {
         int repeats = 1;
         if (argc >= 2)
-            repeats = std::stol(argv[1]);
+            repeats = static_cast<int>(std::stol(argv[1]));
 
         std::string text((std::istreambuf_iterator<char>(std::cin)),
                           std::istreambuf_iterator<char>());
diff --git a/src/IO/examples/zlib_ng_bug.cpp b/src/IO/examples/zlib_ng_bug.cpp
index 9fe3c961913..f7c3d1eeefe 100644
--- a/src/IO/examples/zlib_ng_bug.cpp
+++ b/src/IO/examples/zlib_ng_bug.cpp
@@ -23,9 +23,9 @@ int main(int, char **)
         throw std::runtime_error("Cannot deflateInit2");
 
     zstr.next_in = in.data();
-    zstr.avail_in = in.size();
+    zstr.avail_in = static_cast<uint32_t>(in.size());
     zstr.next_out = out.data();
-    zstr.avail_out = out.size();
+    zstr.avail_out = static_cast<uint32_t>(out.size());
 
     while (zstr.avail_in > 0)
         if (Z_OK != deflate(&zstr, Z_NO_FLUSH))
diff --git a/src/IO/readDecimalText.h b/src/IO/readDecimalText.h
index 2e06acb2f3e..64374a20574 100644
--- a/src/IO/readDecimalText.h
+++ b/src/IO/readDecimalText.h
@@ -106,7 +106,7 @@ inline bool readDigits(ReadBuffer & buf, T & x, uint32_t & digits, int32_t & exp
                         exponent -= places;
 
                     // TODO: accurate shift10 for big integers
-                    x *= intExp10OfSize<T>(places);
+                    x *= intExp10OfSize<typename T::NativeType>(places);
                     places = 0;
 
                     x += (byte - '0');
diff --git a/src/IO/readFloatText.h b/src/IO/readFloatText.h
index b8d0c1ba3c0..a72ff82008e 100644
--- a/src/IO/readFloatText.h
+++ b/src/IO/readFloatText.h
@@ -349,11 +349,11 @@ ReturnType readFloatTextFastImpl(T & x, ReadBuffer & in)
     constexpr int significant_digits = std::numeric_limits<UInt64>::digits10;
     readUIntTextUpToNSignificantDigits<significant_digits>(before_point, in);
 
-    int read_digits = in.count() - count_after_sign;
+    size_t read_digits = in.count() - count_after_sign;
 
     if (unlikely(read_digits > significant_digits))
     {
-        int before_point_additional_exponent = read_digits - significant_digits;
+        int before_point_additional_exponent = static_cast<int>(read_digits) - significant_digits;
         x = static_cast<T>(shift10(before_point, before_point_additional_exponent));
     }
     else
@@ -377,11 +377,11 @@ ReturnType readFloatTextFastImpl(T & x, ReadBuffer & in)
             ++in.position();
 
         auto after_leading_zeros_count = in.count();
-        auto after_point_num_leading_zeros = after_leading_zeros_count - after_point_count;
+        int after_point_num_leading_zeros = static_cast<int>(after_leading_zeros_count - after_point_count);
 
         readUIntTextUpToNSignificantDigits<significant_digits>(after_point, in);
         read_digits = in.count() - after_leading_zeros_count;
-        after_point_exponent = (read_digits > significant_digits ? -significant_digits : -read_digits) - after_point_num_leading_zeros;
+        after_point_exponent = (read_digits > significant_digits ? -significant_digits : static_cast<int>(-read_digits)) - after_point_num_leading_zeros;
     }
 
     if (checkChar('e', in) || checkChar('E', in))
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index a27745d2cfa..fea013fd075 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -140,7 +140,7 @@ public:
          * when we add lots of column with same prefix. One counter for all
          * prefixes is good enough.
          */
-        int next_unique_suffix;
+        size_t next_unique_suffix;
 
         Data(
             ContextPtr context_,
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index b5d15b0927b..182f2292b28 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -811,6 +811,11 @@ AggregatedDataVariants::Type Aggregator::chooseAggregationMethod()
                 return AggregatedDataVariants::Type::low_cardinality_key32;
             if (size_of_field == 8)
                 return AggregatedDataVariants::Type::low_cardinality_key64;
+            if (size_of_field == 16)
+                return AggregatedDataVariants::Type::low_cardinality_keys128;
+            if (size_of_field == 32)
+                return AggregatedDataVariants::Type::low_cardinality_keys256;
+            throw Exception("Logical error: low cardinality numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.", ErrorCodes::LOGICAL_ERROR);
         }
 
         if (size_of_field == 1)
@@ -1633,14 +1638,14 @@ Block Aggregator::convertOneBucketToBlock(
     Method & method,
     Arena * arena,
     bool final,
-    size_t bucket) const
+    Int32 bucket) const
 {
     // Used in ConvertingAggregatedToChunksSource -> ConvertingAggregatedToChunksTransform (expects single chunk for each bucket_id).
     constexpr bool return_single_block = true;
     Block block = convertToBlockImpl<return_single_block>(
         method, method.data.impls[bucket], arena, data_variants.aggregates_pools, final, method.data.impls[bucket].size());
 
-    block.info.bucket_num = bucket;
+    block.info.bucket_num = static_cast<int>(bucket);
     return block;
 }
 
@@ -1648,7 +1653,7 @@ Block Aggregator::mergeAndConvertOneBucketToBlock(
     ManyAggregatedDataVariants & variants,
     Arena * arena,
     bool final,
-    size_t bucket,
+    Int32 bucket,
     std::atomic<bool> * is_cancelled) const
 {
     auto & merged_data = *variants[0];
@@ -1692,7 +1697,7 @@ void Aggregator::writeToTemporaryFileImpl(
             max_temporary_block_size_bytes = block_size_bytes;
     };
 
-    for (size_t bucket = 0; bucket < Method::Data::NUM_BUCKETS; ++bucket)
+    for (UInt32 bucket = 0; bucket < Method::Data::NUM_BUCKETS; ++bucket)
     {
         Block block = convertOneBucketToBlock(data_variants, method, data_variants.aggregates_pool, false, bucket);
         out.write(block);
@@ -3154,19 +3159,19 @@ void NO_INLINE Aggregator::convertBlockToTwoLevelImpl(
         selector[i] = bucket;
     }
 
-    size_t num_buckets = destinations.size();
+    UInt32 num_buckets = static_cast<UInt32>(destinations.size());
 
     for (size_t column_idx = 0; column_idx < columns; ++column_idx)
     {
         const ColumnWithTypeAndName & src_col = source.getByPosition(column_idx);
         MutableColumns scattered_columns = src_col.column->scatter(num_buckets, selector);
 
-        for (size_t bucket = 0, size = num_buckets; bucket < size; ++bucket)
+        for (UInt32 bucket = 0, size = num_buckets; bucket < size; ++bucket)
         {
             if (!scattered_columns[bucket]->empty())
             {
                 Block & dst = destinations[bucket];
-                dst.info.bucket_num = bucket;
+                dst.info.bucket_num = static_cast<int>(bucket);
                 dst.insert({std::move(scattered_columns[bucket]), src_col.type, src_col.name});
             }
 
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index b8aab7a3343..c81cfa2c0a2 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -1301,13 +1301,13 @@ private:
         Method & method,
         Arena * arena,
         bool final,
-        size_t bucket) const;
+        Int32 bucket) const;
 
     Block mergeAndConvertOneBucketToBlock(
         ManyAggregatedDataVariants & variants,
         Arena * arena,
         bool final,
-        size_t bucket,
+        Int32 bucket,
         std::atomic<bool> * is_cancelled = nullptr) const;
 
     Block prepareBlockAndFillWithoutKey(AggregatedDataVariants & data_variants, bool final, bool is_overflows) const;
diff --git a/src/Interpreters/Cache/FileCache.cpp b/src/Interpreters/Cache/FileCache.cpp
index 20a9f6cce1d..72fa1b3c324 100644
--- a/src/Interpreters/Cache/FileCache.cpp
+++ b/src/Interpreters/Cache/FileCache.cpp
@@ -32,6 +32,8 @@ FileCache::FileCache(
     , allow_persistent_files(cache_settings_.do_not_evict_index_and_mark_files)
     , enable_cache_hits_threshold(cache_settings_.enable_cache_hits_threshold)
     , enable_filesystem_query_cache_limit(cache_settings_.enable_filesystem_query_cache_limit)
+    , enable_bypass_cache_with_threashold(cache_settings_.enable_bypass_cache_with_threashold)
+    , bypass_cache_threashold(cache_settings_.bypass_cache_threashold)
     , log(&Poco::Logger::get("FileCache"))
     , main_priority(std::make_unique<LRUFileCachePriority>())
     , stash_priority(std::make_unique<LRUFileCachePriority>())
@@ -185,6 +187,20 @@ FileSegments FileCache::getImpl(
     /// Given range = [left, right] and non-overlapping ordered set of file segments,
     /// find list [segment1, ..., segmentN] of segments which intersect with given range.
 
+    FileSegments result;
+
+    if (enable_bypass_cache_with_threashold && (range.size() > bypass_cache_threashold))
+    {
+        auto file_segment = std::make_shared<FileSegment>(
+            range.left, range.size(), key, this, FileSegment::State::SKIP_CACHE, CreateFileSegmentSettings{});
+        {
+            std::unique_lock segment_lock(file_segment->mutex);
+            file_segment->detachAssumeStateFinalized(segment_lock);
+        }
+        result.emplace_back(file_segment);
+        return result;
+    }
+
     auto it = files.find(key);
     if (it == files.end())
         return {};
@@ -197,7 +213,6 @@ FileSegments FileCache::getImpl(
         return {};
     }
 
-    FileSegments result;
     auto segment_it = file_segments.lower_bound(range.left);
     if (segment_it == file_segments.end())
     {
@@ -392,7 +407,6 @@ FileSegmentsHolder FileCache::getOrSet(const Key & key, size_t offset, size_t si
 #endif
 
     FileSegment::Range range(offset, offset + size - 1);
-
     /// Get all segments which intersect with the given range.
     auto file_segments = getImpl(key, range, cache_lock);
 
@@ -404,7 +418,6 @@ FileSegmentsHolder FileCache::getOrSet(const Key & key, size_t offset, size_t si
     {
         fillHolesWithEmptyFileSegments(file_segments, key, range, /* fill_with_detached */false, settings, cache_lock);
     }
-
     assert(!file_segments.empty());
     return FileSegmentsHolder(std::move(file_segments));
 }
diff --git a/src/Interpreters/Cache/FileCache.h b/src/Interpreters/Cache/FileCache.h
index 07aea230803..706762b6915 100644
--- a/src/Interpreters/Cache/FileCache.h
+++ b/src/Interpreters/Cache/FileCache.h
@@ -140,6 +140,9 @@ private:
     const size_t enable_cache_hits_threshold;
     const bool enable_filesystem_query_cache_limit;
 
+    const bool enable_bypass_cache_with_threashold;
+    const size_t bypass_cache_threashold;
+
     mutable std::mutex mutex;
     Poco::Logger * log;
 
diff --git a/src/Interpreters/Cache/FileCacheSettings.cpp b/src/Interpreters/Cache/FileCacheSettings.cpp
index 4b8d806bb53..b13cdd2ed04 100644
--- a/src/Interpreters/Cache/FileCacheSettings.cpp
+++ b/src/Interpreters/Cache/FileCacheSettings.cpp
@@ -35,6 +35,13 @@ void FileCacheSettings::loadFromConfig(const Poco::Util::AbstractConfiguration &
     enable_filesystem_query_cache_limit = config.getUInt64(config_prefix + ".enable_filesystem_query_cache_limit", false);
     enable_cache_hits_threshold = config.getUInt64(config_prefix + ".enable_cache_hits_threshold", REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD);
 
+    enable_bypass_cache_with_threashold = config.getUInt64(config_prefix + ".enable_bypass_cache_with_threashold", false);
+
+    if (config.has(config_prefix + ".bypass_cache_threashold"))
+        bypass_cache_threashold = parseWithSizeSuffix<uint64_t>(config.getString(config_prefix + ".bypass_cache_threashold"));
+    else
+         bypass_cache_threashold = REMOTE_FS_OBJECTS_CACHE_BYPASS_THRESHOLD;
+
     do_not_evict_index_and_mark_files = config.getUInt64(config_prefix + ".do_not_evict_index_and_mark_files", false);
 }
 
diff --git a/src/Interpreters/Cache/FileCacheSettings.h b/src/Interpreters/Cache/FileCacheSettings.h
index c6155edad85..80f7b5fa93f 100644
--- a/src/Interpreters/Cache/FileCacheSettings.h
+++ b/src/Interpreters/Cache/FileCacheSettings.h
@@ -20,6 +20,9 @@ struct FileCacheSettings
 
     bool do_not_evict_index_and_mark_files = true;
 
+    bool enable_bypass_cache_with_threashold = false;
+    size_t bypass_cache_threashold = REMOTE_FS_OBJECTS_CACHE_BYPASS_THRESHOLD;
+
     void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
 };
 
diff --git a/src/Interpreters/Cache/FileCache_fwd.h b/src/Interpreters/Cache/FileCache_fwd.h
index 25c16b4e840..72dc1144fb9 100644
--- a/src/Interpreters/Cache/FileCache_fwd.h
+++ b/src/Interpreters/Cache/FileCache_fwd.h
@@ -7,6 +7,7 @@ namespace DB
 static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE = 100 * 1024 * 1024;
 static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS = 1024 * 1024;
 static constexpr int REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD = 0;
+static constexpr size_t REMOTE_FS_OBJECTS_CACHE_BYPASS_THRESHOLD = 256 * 1024 * 1024;;
 
 class FileCache;
 using FileCachePtr = std::shared_ptr<FileCache>;
diff --git a/src/Interpreters/Cache/FileSegment.cpp b/src/Interpreters/Cache/FileSegment.cpp
index cf48c5cd976..418bcee05d9 100644
--- a/src/Interpreters/Cache/FileSegment.cpp
+++ b/src/Interpreters/Cache/FileSegment.cpp
@@ -66,7 +66,7 @@ FileSegment::FileSegment(
         {
             throw Exception(
                 ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR,
-                "Can create cell with either EMPTY, DOWNLOADED, DOWNLOADING state");
+                "Can only create cell with either EMPTY, DOWNLOADED or SKIP_CACHE state");
         }
     }
 }
diff --git a/src/Interpreters/Cache/FileSegment.h b/src/Interpreters/Cache/FileSegment.h
index 617e7173c2f..8f9c0097d77 100644
--- a/src/Interpreters/Cache/FileSegment.h
+++ b/src/Interpreters/Cache/FileSegment.h
@@ -66,10 +66,10 @@ public:
          */
         DOWNLOADING,
         /**
-         * Space reservation for a file segment is incremental, i.e. downaloder reads buffer_size bytes
+         * Space reservation for a file segment is incremental, i.e. downloader reads buffer_size bytes
          * from remote fs -> tries to reserve buffer_size bytes to put them to cache -> writes to cache
          * on successful reservation and stops cache write otherwise. Those, who waited for the same file
-         * file segment, will read downloaded part from cache and remaining part directly from remote fs.
+         * segment, will read downloaded part from cache and remaining part directly from remote fs.
          */
         PARTIALLY_DOWNLOADED_NO_CONTINUATION,
         /**
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index a1096b99325..f7a172b226d 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -69,6 +69,7 @@ public:
 
     Interface interface = Interface::TCP;
     bool is_secure = false;
+    String certificate;
 
     /// For tcp
     String os_user;
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index 6877c0ece06..b76434b23e7 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -423,7 +423,7 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
             info.all_addresses.push_back(address);
 
             auto pool = ConnectionPoolFactory::instance().get(
-                settings.distributed_connections_pool_size,
+                static_cast<unsigned>(settings.distributed_connections_pool_size),
                 address.host_name, address.port,
                 address.default_database, address.user, address.password, address.quota_key,
                 address.cluster, address.cluster_secret,
@@ -497,7 +497,7 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
             for (const auto & replica : replica_addresses)
             {
                 auto replica_pool = ConnectionPoolFactory::instance().get(
-                    settings.distributed_connections_pool_size,
+                    static_cast<unsigned>(settings.distributed_connections_pool_size),
                     replica.host_name, replica.port,
                     replica.default_database, replica.user, replica.password, replica.quota_key,
                     replica.cluster, replica.cluster_secret,
@@ -585,11 +585,11 @@ Cluster::Cluster(
         for (const auto & replica : current)
         {
             auto replica_pool = ConnectionPoolFactory::instance().get(
-                        settings.distributed_connections_pool_size,
-                        replica.host_name, replica.port,
-                        replica.default_database, replica.user, replica.password, replica.quota_key,
-                        replica.cluster, replica.cluster_secret,
-                        "server", replica.compression, replica.secure, replica.priority);
+                static_cast<unsigned>(settings.distributed_connections_pool_size),
+                replica.host_name, replica.port,
+                replica.default_database, replica.user, replica.password, replica.quota_key,
+                replica.cluster, replica.cluster_secret,
+                "server", replica.compression, replica.secure, replica.priority);
             all_replicas.emplace_back(replica_pool);
             if (replica.is_local && !treat_local_as_remote)
                 shard_local_addresses.push_back(replica);
@@ -693,7 +693,7 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
             info.all_addresses.push_back(address);
 
             auto pool = ConnectionPoolFactory::instance().get(
-                settings.distributed_connections_pool_size,
+                static_cast<unsigned>(settings.distributed_connections_pool_size),
                 address.host_name,
                 address.port,
                 address.default_database,
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index fce2e9b2f08..4653491aac9 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -69,7 +69,7 @@ void SelectStreamFactory::createForShard(
             query_ast, header, context, processed_stage, shard_info.shard_num, shard_count, /*replica_num=*/0, /*replica_count=*/0, /*coordinator=*/nullptr));
     };
 
-    auto emplace_remote_stream = [&](bool lazy = false, UInt32 local_delay = 0)
+    auto emplace_remote_stream = [&](bool lazy = false, time_t local_delay = 0)
     {
         remote_shards.emplace_back(Shard{
             .query = query_ast,
@@ -131,7 +131,7 @@ void SelectStreamFactory::createForShard(
             return;
         }
 
-        UInt32 local_delay = replicated_storage->getAbsoluteDelay();
+        UInt64 local_delay = replicated_storage->getAbsoluteDelay();
 
         if (local_delay < max_allowed_delay)
         {
@@ -205,7 +205,7 @@ SelectStreamFactory::ShardPlans SelectStreamFactory::createForShardWithParallelR
         if (!max_allowed_delay)
             return false;
 
-        UInt32 local_delay = replicated_storage->getAbsoluteDelay();
+        UInt64 local_delay = replicated_storage->getAbsoluteDelay();
         return local_delay >= max_allowed_delay;
     };
 
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.h b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
index 440017a8e80..8ebddea4988 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.h
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
@@ -46,7 +46,7 @@ public:
         /// If we connect to replicas lazily.
         /// (When there is a local replica with big delay).
         bool lazy = false;
-        UInt32 local_delay = 0;
+        time_t local_delay = 0;
     };
 
     using Shards = std::vector<Shard>;
diff --git a/src/Interpreters/ClusterProxy/executeQuery.cpp b/src/Interpreters/ClusterProxy/executeQuery.cpp
index d974721627e..e9ec38f3806 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.cpp
+++ b/src/Interpreters/ClusterProxy/executeQuery.cpp
@@ -7,6 +7,7 @@
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/OptimizeShardingKeyRewriteInVisitor.h>
 #include <QueryPipeline/Pipe.h>
+#include <Parsers/queryToString.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromRemote.h>
 #include <Processors/QueryPlan/UnionStep.h>
@@ -26,7 +27,7 @@ namespace ErrorCodes
 namespace ClusterProxy
 {
 
-ContextMutablePtr updateSettingsForCluster(const Cluster & cluster, ContextPtr context, const Settings & settings, Poco::Logger * log)
+ContextMutablePtr updateSettingsForCluster(const Cluster & cluster, ContextPtr context, const Settings & settings, const StorageID & main_table, const SelectQueryInfo * query_info, Poco::Logger * log)
 {
     Settings new_settings = settings;
     new_settings.queue_max_wait_ms = Cluster::saturate(new_settings.queue_max_wait_ms, settings.max_execution_time);
@@ -96,6 +97,20 @@ ContextMutablePtr updateSettingsForCluster(const Cluster & cluster, ContextPtr c
         new_settings.limit.changed = false;
     }
 
+    /// Setting additional_table_filters may be applied to Distributed table.
+    /// In case if query is executed up to WithMergableState on remote shard, it is impossible to filter on initiator.
+    /// We need to propagate the setting, but change the table name from distributed to source.
+    ///
+    /// Here we don't try to analyze setting again. In case if query_info->additional_filter_ast is not empty, some filter was applied.
+    /// It's just easier to add this filter for a source table.
+    if (query_info && query_info->additional_filter_ast)
+    {
+        Tuple tuple;
+        tuple.push_back(main_table.getShortName());
+        tuple.push_back(queryToString(query_info->additional_filter_ast));
+        new_settings.additional_table_filters.value.push_back(std::move(tuple));
+    }
+
     auto new_context = Context::createCopy(context);
     new_context->setSettings(new_settings);
     return new_context;
@@ -121,12 +136,12 @@ void executeQuery(
     std::vector<QueryPlanPtr> plans;
     SelectStreamFactory::Shards remote_shards;
 
-    auto new_context = updateSettingsForCluster(*query_info.getCluster(), context, settings, log);
+    auto new_context = updateSettingsForCluster(*query_info.getCluster(), context, settings, main_table, &query_info, log);
 
     new_context->getClientInfo().distributed_depth += 1;
 
     ThrottlerPtr user_level_throttler;
-    if (auto * process_list_element = context->getProcessListElement())
+    if (auto process_list_element = context->getProcessListElement())
         user_level_throttler = process_list_element->getUserNetworkThrottler();
 
     /// Network bandwidth limit, if needed.
@@ -165,7 +180,7 @@ void executeQuery(
 
         stream_factory.createForShard(shard_info,
             query_ast_for_shard, main_table, table_func_ptr,
-            new_context, plans, remote_shards, shards);
+            new_context, plans, remote_shards, static_cast<UInt32>(shards));
     }
 
     if (!remote_shards.empty())
@@ -228,7 +243,7 @@ void executeQueryWithParallelReplicas(
     const Settings & settings = context->getSettingsRef();
 
     ThrottlerPtr user_level_throttler;
-    if (auto * process_list_element = context->getProcessListElement())
+    if (auto process_list_element = context->getProcessListElement())
         user_level_throttler = process_list_element->getUserNetworkThrottler();
 
     /// Network bandwidth limit, if needed.
@@ -269,7 +284,8 @@ void executeQueryWithParallelReplicas(
             query_ast_for_shard = query_ast;
 
         auto shard_plans = stream_factory.createForShardWithParallelReplicas(shard_info,
-            query_ast_for_shard, main_table, table_func_ptr, throttler, context, shards, query_info.storage_limits);
+            query_ast_for_shard, main_table, table_func_ptr, throttler, context,
+            static_cast<UInt32>(shards), query_info.storage_limits);
 
         if (!shard_plans.local_plan && !shard_plans.remote_plan)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "No plans were generated for reading from shard. This is a bug");
diff --git a/src/Interpreters/ClusterProxy/executeQuery.h b/src/Interpreters/ClusterProxy/executeQuery.h
index 1a5035015a7..ac88752ce74 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.h
+++ b/src/Interpreters/ClusterProxy/executeQuery.h
@@ -35,7 +35,7 @@ class SelectStreamFactory;
 ///
 /// @return new Context with adjusted settings
 ContextMutablePtr updateSettingsForCluster(
-    const Cluster & cluster, ContextPtr context, const Settings & settings, Poco::Logger * log = nullptr);
+    const Cluster & cluster, ContextPtr context, const Settings & settings, const StorageID & main_table, const SelectQueryInfo * query_info = nullptr, Poco::Logger * log = nullptr);
 
 /// Execute a distributed query, creating a query plan, from which the query pipeline can be built.
 /// `stream_factory` object encapsulates the logic of creating plans for a different type of query
diff --git a/src/Interpreters/ConcurrentHashJoin.cpp b/src/Interpreters/ConcurrentHashJoin.cpp
index b7ad56dca91..cc79a71245b 100644
--- a/src/Interpreters/ConcurrentHashJoin.cpp
+++ b/src/Interpreters/ConcurrentHashJoin.cpp
@@ -38,7 +38,7 @@ static UInt32 toPowerOfTwo(UInt32 x)
 ConcurrentHashJoin::ConcurrentHashJoin(ContextPtr context_, std::shared_ptr<TableJoin> table_join_, size_t slots_, const Block & right_sample_block, bool any_take_last_row_)
     : context(context_)
     , table_join(table_join_)
-    , slots(toPowerOfTwo(std::min<size_t>(slots_, 256)))
+    , slots(toPowerOfTwo(std::min<UInt32>(static_cast<UInt32>(slots_), 256)))
 {
     for (size_t i = 0; i < slots; ++i)
     {
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 1de56e950c6..721d701c9a2 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -1463,10 +1463,8 @@ void Context::setCurrentQueryId(const String & query_id)
 
 void Context::killCurrentQuery()
 {
-    if (process_list_elem)
-    {
-        process_list_elem->cancelQuery(true);
-    }
+    if (auto elem = process_list_elem.lock())
+        elem->cancelQuery(true);
 }
 
 String Context::getDefaultFormat() const
@@ -1707,15 +1705,15 @@ ProgressCallback Context::getProgressCallback() const
 }
 
 
-void Context::setProcessListElement(ProcessList::Element * elem)
+void Context::setProcessListElement(QueryStatusPtr elem)
 {
     /// Set to a session or query. In the session, only one query is processed at a time. Therefore, the lock is not needed.
     process_list_elem = elem;
 }
 
-ProcessList::Element * Context::getProcessListElement() const
+QueryStatusPtr Context::getProcessListElement() const
 {
-    return process_list_elem;
+    return process_list_elem.lock();
 }
 
 
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 233f4011ce3..eeb9e8da148 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -68,6 +68,7 @@ class MMappedFileCache;
 class UncompressedCache;
 class ProcessList;
 class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
 class Macros;
 struct Progress;
 struct FileProgress;
@@ -230,7 +231,7 @@ private:
     using FileProgressCallback = std::function<void(const FileProgress & progress)>;
     FileProgressCallback file_progress_callback; /// Callback for tracking progress of file loading.
 
-    QueryStatus * process_list_elem = nullptr;  /// For tracking total resource usage for query.
+    std::weak_ptr<QueryStatus> process_list_elem;  /// For tracking total resource usage for query.
     StorageID insertion_table = StorageID::createEmpty();  /// Saved insertion table in query context
     bool is_distributed = false;  /// Whether the current context it used for distributed query
 
@@ -750,9 +751,9 @@ public:
     /** Set in executeQuery and InterpreterSelectQuery. Then it is used in QueryPipeline,
       *  to update and monitor information about the total number of resources spent for the query.
       */
-    void setProcessListElement(QueryStatus * elem);
+    void setProcessListElement(QueryStatusPtr elem);
     /// Can return nullptr if the query was not inserted into the ProcessList.
-    QueryStatus * getProcessListElement() const;
+    QueryStatusPtr getProcessListElement() const;
 
     /// List all queries.
     ProcessList & getProcessList();
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 8873d851de1..f1fa0955c34 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -114,7 +114,7 @@ DDLWorker::DDLWorker(
 void DDLWorker::startup()
 {
     [[maybe_unused]] bool prev_stop_flag = stop_flag.exchange(false);
-    chassert(true);
+    chassert(prev_stop_flag);
     main_thread = ThreadFromGlobalPool(&DDLWorker::runMainThread, this);
     cleanup_thread = ThreadFromGlobalPool(&DDLWorker::runCleanupThread, this);
 }
@@ -498,7 +498,7 @@ bool DDLWorker::tryExecuteQuery(const String & query, DDLTaskBase & task, const
 
 void DDLWorker::updateMaxDDLEntryID(const String & entry_name)
 {
-    UInt64 id = DDLTaskBase::getLogEntryNumber(entry_name);
+    UInt32 id = DDLTaskBase::getLogEntryNumber(entry_name);
     auto prev_id = max_id.load(std::memory_order_relaxed);
     while (prev_id < id)
     {
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index e3c1fa4c271..5aea460ad2e 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -159,7 +159,7 @@ protected:
     /// How many tasks could be in the queue
     size_t max_tasks_in_queue = 1000;
 
-    std::atomic<UInt64> max_id = 0;
+    std::atomic<UInt32> max_id = 0;
     const CurrentMetrics::Metric * max_entry_metric;
     const CurrentMetrics::Metric * max_pushed_entry_metric;
 };
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index ab6f088ac69..7ceb0bf3a00 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -144,9 +144,9 @@ StoragePtr TemporaryTableHolder::getTable() const
 void DatabaseCatalog::initializeAndLoadTemporaryDatabase()
 {
     drop_delay_sec = getContext()->getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
-    unused_dir_hide_timeout_sec = getContext()->getConfigRef().getInt("database_catalog_unused_dir_hide_timeout_sec", unused_dir_hide_timeout_sec);
-    unused_dir_rm_timeout_sec = getContext()->getConfigRef().getInt("database_catalog_unused_dir_rm_timeout_sec", unused_dir_rm_timeout_sec);
-    unused_dir_cleanup_period_sec = getContext()->getConfigRef().getInt("database_catalog_unused_dir_cleanup_period_sec", unused_dir_cleanup_period_sec);
+    unused_dir_hide_timeout_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_hide_timeout_sec", unused_dir_hide_timeout_sec);
+    unused_dir_rm_timeout_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_rm_timeout_sec", unused_dir_rm_timeout_sec);
+    unused_dir_cleanup_period_sec = getContext()->getConfigRef().getInt64("database_catalog_unused_dir_cleanup_period_sec", unused_dir_cleanup_period_sec);
 
     auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, getContext());
     attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables);
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 7780b335128..26b9b843567 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -232,6 +232,11 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
         data->type = Type::CROSS;
         sample_block_with_columns_to_add = right_sample_block;
     }
+    else if (table_join->getClauses().empty())
+    {
+        data->type = Type::EMPTY;
+        sample_block_with_columns_to_add = right_sample_block;
+    }
     else if (table_join->oneDisjunct())
     {
         const auto & key_names_right = table_join->getOnlyClause().key_names_right;
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index e89aa2244fe..f41ae31b239 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -12,17 +12,14 @@
 #include <Common/hex.h>
 
 #include <Core/Defines.h>
-#include <Core/Settings.h>
 #include <Core/SettingsEnums.h>
 
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
 
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -37,7 +34,6 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Interpreters/executeQuery.h>
-#include <Interpreters/Cluster.h>
 #include <Interpreters/DDLTask.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/InterpreterCreateQuery.h>
@@ -59,7 +55,6 @@
 
 #include <Databases/DatabaseFactory.h>
 #include <Databases/DatabaseReplicated.h>
-#include <Databases/IDatabase.h>
 #include <Databases/DatabaseOnDisk.h>
 #include <Databases/TablesLoader.h>
 #include <Databases/DDLDependencyVisitor.h>
@@ -484,9 +479,8 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
         {
             column_type = DataTypeFactory::instance().get(col_decl.type);
 
-            const auto * aggregate_function_type = typeid_cast<const DataTypeAggregateFunction *>(column_type.get());
-            if (attach && aggregate_function_type && aggregate_function_type->isVersioned())
-                aggregate_function_type->setVersion(0, /* if_empty */true);
+            if (attach)
+                setVersionToAggregateFunctions(column_type, true);
 
             if (col_decl.null_modifier)
             {
@@ -1704,8 +1698,12 @@ void InterpreterCreateQuery::addColumnsDescriptionToCreateQueryIfNecessary(ASTCr
         return;
 
     auto ast_storage = std::make_shared<ASTStorage>();
-    auto query_from_storage = DB::getCreateQueryFromStorage(storage, ast_storage, false,
-                                                            getContext()->getSettingsRef().max_parser_depth, true);
+    unsigned max_parser_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
+    auto query_from_storage = DB::getCreateQueryFromStorage(storage,
+                                                            ast_storage,
+                                                            false,
+                                                            max_parser_depth,
+                                                            true);
     auto & create_query_from_storage = query_from_storage->as<ASTCreateQuery &>();
 
     if (!create.columns_list)
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 51a3dde261a..107740c3b96 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -292,7 +292,7 @@ Chain InterpreterInsertQuery::buildChainImpl(
         out.addSource(std::make_shared<SquashingChunksTransform>(
             out.getInputHeader(),
             table_prefers_large_blocks ? settings.min_insert_block_size_rows : settings.max_block_size,
-            table_prefers_large_blocks ? settings.min_insert_block_size_bytes : 0));
+            table_prefers_large_blocks ? settings.min_insert_block_size_bytes : 0ULL));
     }
 
     auto counting = std::make_shared<CountingTransform>(out.getInputHeader(), thread_status, getContext()->getQuota());
diff --git a/src/Interpreters/JIT/compileFunction.cpp b/src/Interpreters/JIT/compileFunction.cpp
index d3a7eb0cfaa..e12b4894eb0 100644
--- a/src/Interpreters/JIT/compileFunction.cpp
+++ b/src/Interpreters/JIT/compileFunction.cpp
@@ -614,7 +614,7 @@ static void compileSortDescription(llvm::Module & module,
     /** Join results from all comparator steps.
       * Result of columns comparison equals to first compare block where lhs is not equal to lhs or last compare block.
       */
-    auto * compare_result_phi = b.CreatePHI(b.getInt8Ty(), comparator_steps_and_results.size());
+    auto * compare_result_phi = b.CreatePHI(b.getInt8Ty(), static_cast<unsigned>(comparator_steps_and_results.size()));
 
     for (const auto & [block, result_value] : comparator_steps_and_results)
         compare_result_phi->addIncoming(result_value, block);
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
index 40c42f7728e..a0fdafc976c 100644
--- a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
@@ -45,8 +45,7 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
     SelectUnionModesSet current_set_of_modes;
     bool distinct_found = false;
 
-    int i;
-    for (i = union_modes.size() - 1; i >= 0; --i)
+    for (ssize_t i = union_modes.size() - 1; i >= 0; --i)
     {
         current_set_of_modes.insert(union_modes[i]);
         if (const auto * union_ast = typeid_cast<const ASTSelectWithUnionQuery *>(select_list[i + 1].get()))
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index d5194a02513..551d20f835a 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -242,16 +242,21 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
             ///  since allocation and deallocation could happen in different threads
         }
 
-        auto process_it = processes.emplace(processes.end(),
-            query_context, query_, client_info, priorities.insert(settings.priority), std::move(thread_group), query_kind);
+        auto process_it = processes.emplace(processes.end(), std::make_shared<QueryStatus>(
+            query_context,
+            query_,
+            client_info,
+            priorities.insert(static_cast<int>(settings.priority)),
+            std::move(thread_group),
+            query_kind));
 
         increaseQueryKindAmount(query_kind);
 
         res = std::make_shared<Entry>(*this, process_it);
 
-        process_it->setUserProcessList(&user_process_list);
+        (*process_it)->setUserProcessList(&user_process_list);
 
-        user_process_list.queries.emplace(client_info.current_query_id, &res->get());
+        user_process_list.queries.emplace(client_info.current_query_id, res->getQueryStatus());
 
         /// Track memory usage for all simultaneously running queries from single user.
         user_process_list.user_memory_tracker.setOrRaiseHardLimit(settings.max_memory_usage_for_user);
@@ -280,11 +285,11 @@ ProcessListEntry::~ProcessListEntry()
 {
     auto lock = parent.safeLock();
 
-    String user = it->getClientInfo().current_user;
-    String query_id = it->getClientInfo().current_query_id;
-    IAST::QueryKind query_kind = it->query_kind;
+    String user = (*it)->getClientInfo().current_user;
+    String query_id = (*it)->getClientInfo().current_query_id;
+    IAST::QueryKind query_kind = (*it)->query_kind;
 
-    const QueryStatus * process_list_element_ptr = &*it;
+    const QueryStatusPtr process_list_element_ptr = *it;
 
     auto user_process_list_it = parent.user_to_queries.find(user);
     if (user_process_list_it == parent.user_to_queries.end())
@@ -307,7 +312,7 @@ ProcessListEntry::~ProcessListEntry()
     }
 
     /// Wait for the query if it is in the cancellation right now.
-    parent.cancelled_cv.wait(lock.lock, [&]() { return it->is_cancelling == false; });
+    parent.cancelled_cv.wait(lock.lock, [&]() { return process_list_element_ptr->is_cancelling == false; });
 
     /// This removes the memory_tracker of one request.
     parent.processes.erase(it);
@@ -344,6 +349,7 @@ QueryStatus::QueryStatus(
     , client_info(client_info_)
     , thread_group(std::move(thread_group_))
     , priority_handle(std::move(priority_handle_))
+    , global_overcommit_tracker(context_->getGlobalOvercommitTracker())
     , query_kind(query_kind_)
     , num_queries_increment(CurrentMetrics::Query)
 {
@@ -360,8 +366,8 @@ QueryStatus::~QueryStatus()
     {
         if (user_process_list)
             user_process_list->user_overcommit_tracker.onQueryStop(memory_tracker);
-        if (auto shared_context = getContext())
-            shared_context->getGlobalOvercommitTracker()->onQueryStop(memory_tracker);
+        if (global_overcommit_tracker)
+            global_overcommit_tracker->onQueryStop(memory_tracker);
     }
 }
 
@@ -430,7 +436,7 @@ ThrottlerPtr QueryStatus::getUserNetworkThrottler()
 }
 
 
-QueryStatus * ProcessList::tryGetProcessListElement(const String & current_query_id, const String & current_user)
+QueryStatusPtr ProcessList::tryGetProcessListElement(const String & current_query_id, const String & current_user)
 {
     auto user_it = user_to_queries.find(current_user);
     if (user_it != user_to_queries.end())
@@ -442,13 +448,13 @@ QueryStatus * ProcessList::tryGetProcessListElement(const String & current_query
             return query_it->second;
     }
 
-    return nullptr;
+    return {};
 }
 
 
 CancellationCode ProcessList::sendCancelToQuery(const String & current_query_id, const String & current_user, bool kill)
 {
-    QueryStatus * elem;
+    QueryStatusPtr elem;
 
     /// Cancelling the query should be done without the lock.
     ///
@@ -484,7 +490,7 @@ CancellationCode ProcessList::sendCancelToQuery(const String & current_query_id,
 
 void ProcessList::killAllQueries()
 {
-    std::vector<QueryStatus *> cancelled_processes;
+    std::vector<QueryStatusPtr> cancelled_processes;
 
     SCOPE_EXIT({
         auto lock = safeLock();
@@ -498,8 +504,8 @@ void ProcessList::killAllQueries()
         cancelled_processes.reserve(processes.size());
         for (auto & process : processes)
         {
-            cancelled_processes.push_back(&process);
-            process.is_cancelling = true;
+            cancelled_processes.push_back(process);
+            process->is_cancelling = true;
         }
     }
 
@@ -558,7 +564,7 @@ ProcessList::Info ProcessList::getInfo(bool get_thread_list, bool get_profile_ev
 
     per_query_infos.reserve(processes.size());
     for (const auto & process : processes)
-        per_query_infos.emplace_back(process.getInfo(get_thread_list, get_profile_events, get_settings));
+        per_query_infos.emplace_back(process->getInfo(get_thread_list, get_profile_events, get_settings));
 
     return per_query_infos;
 }
diff --git a/src/Interpreters/ProcessList.h b/src/Interpreters/ProcessList.h
index 6943c7cfcd8..5fbdce358f9 100644
--- a/src/Interpreters/ProcessList.h
+++ b/src/Interpreters/ProcessList.h
@@ -133,6 +133,8 @@ protected:
 
     ProcessListForUser * user_process_list = nullptr;
 
+    OvercommitTracker * global_overcommit_tracker = nullptr;
+
     IAST::QueryKind query_kind;
 
     /// This field is unused in this class, but it
@@ -221,6 +223,8 @@ public:
     [[nodiscard]] bool checkTimeLimitSoft();
 };
 
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
+
 
 /// Information of process list for user.
 struct ProcessListForUserInfo
@@ -241,7 +245,7 @@ struct ProcessListForUser
     ProcessListForUser(ContextPtr global_context, ProcessList * global_process_list);
 
     /// query_id -> ProcessListElement(s). There can be multiple queries with the same query_id as long as all queries except one are cancelled.
-    using QueryToElement = std::unordered_map<String, QueryStatus *>;
+    using QueryToElement = std::unordered_map<String, QueryStatusPtr>;
     QueryToElement queries;
 
     ProfileEvents::Counters user_performance_counters{VariableContext::User, &ProfileEvents::global_counters};
@@ -278,7 +282,7 @@ class ProcessList;
 class ProcessListEntry
 {
 private:
-    using Container = std::list<QueryStatus>;
+    using Container = std::list<QueryStatusPtr>;
 
     ProcessList & parent;
     Container::iterator it;
@@ -289,11 +293,8 @@ public:
 
     ~ProcessListEntry();
 
-    QueryStatus * operator->() { return &*it; }
-    const QueryStatus * operator->() const { return &*it; }
-
-    QueryStatus & get() { return *it; }
-    const QueryStatus & get() const { return *it; }
+    QueryStatusPtr getQueryStatus() { return *it; }
+    const QueryStatusPtr getQueryStatus() const { return *it; }
 };
 
 
@@ -319,7 +320,7 @@ protected:
 class ProcessList : public ProcessListBase
 {
 public:
-    using Element = QueryStatus;
+    using Element = QueryStatusPtr;
     using Entry = ProcessListEntry;
     using QueryAmount = UInt64;
 
@@ -358,7 +359,7 @@ protected:
     ThrottlerPtr total_network_throttler;
 
     /// Call under lock. Finds process with specified current_user and current_query_id.
-    QueryStatus * tryGetProcessListElement(const String & current_query_id, const String & current_user);
+    QueryStatusPtr tryGetProcessListElement(const String & current_query_id, const String & current_user);
 
     /// limit for insert. 0 means no limit. Otherwise, when limit exceeded, an exception is thrown.
     size_t max_insert_queries_amount = 0;
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 68076e1fec2..0e553ef145e 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -89,7 +89,7 @@ public:
 
         assert(!sorted.load(std::memory_order_acquire));
 
-        entries.emplace_back(key, row_refs.size());
+        entries.emplace_back(key, static_cast<UInt32>(row_refs.size()));
         row_refs.emplace_back(RowRef(block, row_num));
     }
 
diff --git a/src/Interpreters/RowRefs.h b/src/Interpreters/RowRefs.h
index 2c9f2062a82..294da1da571 100644
--- a/src/Interpreters/RowRefs.h
+++ b/src/Interpreters/RowRefs.h
@@ -29,7 +29,10 @@ struct RowRef
     SizeT row_num = 0;
 
     RowRef() = default;
-    RowRef(const Block * block_, size_t row_num_) : block(block_), row_num(row_num_) {}
+    RowRef(const Block * block_, size_t row_num_)
+        : block(block_)
+        , row_num(static_cast<SizeT>(row_num_))
+    {}
 };
 
 /// Single linked list of references to rows. Used for ALL JOINs (non-unique JOINs)
diff --git a/src/Interpreters/Session.cpp b/src/Interpreters/Session.cpp
index 52588a5f4cc..7639dec813d 100644
--- a/src/Interpreters/Session.cpp
+++ b/src/Interpreters/Session.cpp
@@ -244,7 +244,7 @@ void Session::shutdownNamedSessions()
     NamedSessionsStorage::instance().shutdown();
 }
 
-Session::Session(const ContextPtr & global_context_, ClientInfo::Interface interface_, bool is_secure)
+Session::Session(const ContextPtr & global_context_, ClientInfo::Interface interface_, bool is_secure, const std::string & certificate)
     : auth_id(UUIDHelpers::generateV4()),
       global_context(global_context_),
       log(&Poco::Logger::get(String{magic_enum::enum_name(interface_)} + "-Session"))
@@ -252,6 +252,7 @@ Session::Session(const ContextPtr & global_context_, ClientInfo::Interface inter
     prepared_client_info.emplace();
     prepared_client_info->interface = interface_;
     prepared_client_info->is_secure = is_secure;
+    prepared_client_info->certificate = certificate;
 }
 
 Session::~Session()
diff --git a/src/Interpreters/Session.h b/src/Interpreters/Session.h
index ed4f7809dee..0f17c378915 100644
--- a/src/Interpreters/Session.h
+++ b/src/Interpreters/Session.h
@@ -32,7 +32,7 @@ public:
     /// Stops using named sessions. The method must be called at the server shutdown.
     static void shutdownNamedSessions();
 
-    Session(const ContextPtr & global_context_, ClientInfo::Interface interface_, bool is_secure = false);
+    Session(const ContextPtr & global_context_, ClientInfo::Interface interface_, bool is_secure = false, const std::string & certificate = "");
     ~Session();
 
     Session(const Session &&) = delete;
diff --git a/src/Interpreters/TemporaryDataOnDisk.cpp b/src/Interpreters/TemporaryDataOnDisk.cpp
index 3eb93f1f20e..c5ae6f6c885 100644
--- a/src/Interpreters/TemporaryDataOnDisk.cpp
+++ b/src/Interpreters/TemporaryDataOnDisk.cpp
@@ -20,7 +20,7 @@ namespace ErrorCodes
     extern const int NOT_ENOUGH_SPACE;
 }
 
-void TemporaryDataOnDiskScope::deltaAllocAndCheck(int compressed_delta, int uncompressed_delta)
+void TemporaryDataOnDiskScope::deltaAllocAndCheck(ssize_t compressed_delta, ssize_t uncompressed_delta)
 {
     if (parent)
         parent->deltaAllocAndCheck(compressed_delta, uncompressed_delta);
diff --git a/src/Interpreters/TemporaryDataOnDisk.h b/src/Interpreters/TemporaryDataOnDisk.h
index 81bd2067650..11edc8700d2 100644
--- a/src/Interpreters/TemporaryDataOnDisk.h
+++ b/src/Interpreters/TemporaryDataOnDisk.h
@@ -53,7 +53,7 @@ public:
     VolumePtr getVolume() const { return volume; }
 
 protected:
-    void deltaAllocAndCheck(int compressed_delta, int uncompressed_delta);
+    void deltaAllocAndCheck(ssize_t compressed_delta, ssize_t uncompressed_delta);
 
     TemporaryDataOnDiskScopePtr parent = nullptr;
     VolumePtr volume;
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index 4810174e395..ee126f2da11 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -55,12 +55,12 @@ void ThreadStatus::applyQuerySettings()
 
 #if defined(OS_LINUX)
     /// Set "nice" value if required.
-    Int32 new_os_thread_priority = settings.os_thread_priority;
+    Int32 new_os_thread_priority = static_cast<Int32>(settings.os_thread_priority);
     if (new_os_thread_priority && hasLinuxCapability(CAP_SYS_NICE))
     {
         LOG_TRACE(log, "Setting nice to {}", new_os_thread_priority);
 
-        if (0 != setpriority(PRIO_PROCESS, thread_id, new_os_thread_priority))
+        if (0 != setpriority(PRIO_PROCESS, static_cast<unsigned>(thread_id), new_os_thread_priority))
             throwFromErrno("Cannot 'setpriority'", ErrorCodes::CANNOT_SET_THREAD_PRIORITY);
 
         os_thread_priority = new_os_thread_priority;
@@ -349,7 +349,7 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
     {
         LOG_TRACE(log, "Resetting nice");
 
-        if (0 != setpriority(PRIO_PROCESS, thread_id, 0))
+        if (0 != setpriority(PRIO_PROCESS, static_cast<int>(thread_id), 0))
             LOG_ERROR(log, "Cannot 'setpriority' back to zero: {}", errnoToString());
 
         os_thread_priority = 0;
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index 55156cde7be..9ba171d2665 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -88,7 +88,7 @@ Field convertIntToDecimalType(const Field & from, const DataTypeDecimal<T> & typ
     if (!type.canStoreWhole(value))
         throw Exception("Number is too big to place in " + type.getName(), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
 
-    T scaled_value = type.getScaleMultiplier() * static_cast<T>(value);
+    T scaled_value = type.getScaleMultiplier() * T(static_cast<typename T::NativeType>(value));
     return DecimalField<T>(scaled_value, type.getScale());
 }
 
diff --git a/src/Interpreters/createBlockSelector.cpp b/src/Interpreters/createBlockSelector.cpp
index b1a9a4e9e35..fce9833ddfb 100644
--- a/src/Interpreters/createBlockSelector.cpp
+++ b/src/Interpreters/createBlockSelector.cpp
@@ -50,7 +50,7 @@ IColumn::Selector createBlockSelector(
         /// libdivide support only UInt32 and UInt64.
         using TUInt32Or64 = std::conditional_t<sizeof(UnsignedT) <= 4, UInt32, UInt64>;
 
-        libdivide::divider<TUInt32Or64> divider(total_weight);
+        libdivide::divider<TUInt32Or64> divider(static_cast<TUInt32Or64>(total_weight));
 
         const auto & data = typeid_cast<const ColumnVector<T> &>(column).getData();
 
diff --git a/src/Interpreters/examples/hash_map_string_small.cpp b/src/Interpreters/examples/hash_map_string_small.cpp
index 4a96f717bf7..b58cdfbacd0 100644
--- a/src/Interpreters/examples/hash_map_string_small.cpp
+++ b/src/Interpreters/examples/hash_map_string_small.cpp
@@ -23,7 +23,7 @@
 
 struct SmallStringRef
 {
-    UInt32 size = 0;
+    size_t size = 0;
 
     union
     {
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index abca563de55..479a6b38e8e 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -537,7 +537,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         {
             /// processlist also has query masked now, to avoid secrets leaks though SHOW PROCESSLIST by other users.
             process_list_entry = context->getProcessList().insert(query_for_logging, ast.get(), context);
-            context->setProcessListElement(&process_list_entry->get());
+            context->setProcessListElement(process_list_entry->getQueryStatus());
         }
 
         /// Load external tables if they were provided
@@ -713,9 +713,9 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         if (process_list_entry)
         {
             /// Query was killed before execution
-            if ((*process_list_entry)->isKilled())
-                throw Exception("Query '" + (*process_list_entry)->getInfo().client_info.current_query_id + "' is killed in pending state",
-                    ErrorCodes::QUERY_WAS_CANCELLED);
+            if (process_list_entry->getQueryStatus()->isKilled())
+                throw Exception(ErrorCodes::QUERY_WAS_CANCELLED,
+                    "Query '{}' is killed in pending state", process_list_entry->getQueryStatus()->getInfo().client_info.current_query_id);
         }
 
         /// Hold element of process list till end of query execution.
@@ -859,7 +859,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                                     pulling_pipeline = pipeline.pulling(),
                                     query_span](QueryPipeline & query_pipeline) mutable
             {
-                QueryStatus * process_list_elem = context->getProcessListElement();
+                QueryStatusPtr process_list_elem = context->getProcessListElement();
 
                 if (process_list_elem)
                 {
@@ -944,9 +944,10 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
                                 processor_elem.processor_name = processor->getName();
 
-                                processor_elem.elapsed_us = processor->getElapsedUs();
-                                processor_elem.input_wait_elapsed_us = processor->getInputWaitElapsedUs();
-                                processor_elem.output_wait_elapsed_us = processor->getOutputWaitElapsedUs();
+                                /// NOTE: convert this to UInt64
+                                processor_elem.elapsed_us = static_cast<UInt32>(processor->getElapsedUs());
+                                processor_elem.input_wait_elapsed_us = static_cast<UInt32>(processor->getInputWaitElapsedUs());
+                                processor_elem.output_wait_elapsed_us = static_cast<UInt32>(processor->getOutputWaitElapsedUs());
 
                                 auto stats = processor->getProcessorDataStats();
                                 processor_elem.input_rows = stats.input_rows;
@@ -1025,7 +1026,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.exception_code = getCurrentExceptionCode();
                 elem.exception = getCurrentExceptionMessage(false);
 
-                QueryStatus * process_list_elem = context->getProcessListElement();
+                QueryStatusPtr process_list_elem = context->getProcessListElement();
                 const Settings & current_settings = context->getSettingsRef();
 
                 /// Update performance counters before logging to query_log
diff --git a/src/Parsers/ASTAlterQuery.cpp b/src/Parsers/ASTAlterQuery.cpp
index 2d8193871b0..959fc55c945 100644
--- a/src/Parsers/ASTAlterQuery.cpp
+++ b/src/Parsers/ASTAlterQuery.cpp
@@ -378,7 +378,7 @@ void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState &
     }
     else if (type == ASTAlterCommand::FREEZE_ALL)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << "FREEZE";
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "FREEZE" << (settings.hilite ? hilite_none : "");
 
         if (!with_name.empty())
         {
@@ -399,7 +399,7 @@ void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState &
     }
     else if (type == ASTAlterCommand::UNFREEZE_ALL)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << "UNFREEZE";
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "UNFREEZE" << (settings.hilite ? hilite_none : "");
 
         if (!with_name.empty())
         {
diff --git a/src/Parsers/ASTTTLElement.cpp b/src/Parsers/ASTTTLElement.cpp
index 90278e27c0c..86dd85e0eb8 100644
--- a/src/Parsers/ASTTTLElement.cpp
+++ b/src/Parsers/ASTTTLElement.cpp
@@ -93,7 +93,7 @@ void ASTTTLElement::setExpression(int & pos, ASTPtr && ast)
     {
         if (pos == -1)
         {
-            pos = children.size();
+            pos = static_cast<int>(children.size());
             children.emplace_back(ast);
         }
         else
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index f7a016a59e4..1249baf1859 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -1582,6 +1582,9 @@ public:
     {
         if (parsed_interval_kind)
         {
+            if (elements.size() < 2)
+                return false;
+
             elements[0] = makeASTFunction(interval_kind.toNameOfFunctionToIntervalDataType(), elements[0]);
             node = makeASTFunction(function_name, elements[1], elements[0]);
         }
diff --git a/src/Parsers/ParserSampleRatio.cpp b/src/Parsers/ParserSampleRatio.cpp
index 2f444bcf9e8..b6be04cbcc0 100644
--- a/src/Parsers/ParserSampleRatio.cpp
+++ b/src/Parsers/ParserSampleRatio.cpp
@@ -14,7 +14,7 @@ static bool parseDecimal(const char * pos, const char * end, ASTSampleRatio::Rat
 {
     UInt64 num_before = 0;
     UInt64 num_after = 0;
-    Int64 exponent = 0;
+    Int32 exponent = 0;
 
     const char * pos_after_first_num = tryReadIntText(num_before, pos, end);
 
@@ -28,12 +28,12 @@ static bool parseDecimal(const char * pos, const char * end, ASTSampleRatio::Rat
     if (!has_num_before_point && !has_point)
         return false;
 
-    size_t number_of_digits_after_point = 0;
+    int number_of_digits_after_point = 0;
 
     if (has_point)
     {
         const char * pos_after_second_num = tryReadIntText(num_after, pos, end);
-        number_of_digits_after_point = pos_after_second_num - pos;
+        number_of_digits_after_point = static_cast<int>(pos_after_second_num - pos);
         pos = pos_after_second_num;
     }
 
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index af8c9dc58a6..4a0c60da48d 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -236,7 +236,8 @@ ASTPtr tryParseQuery(
 {
     const char * query_begin = _out_query_end;
     Tokens tokens(query_begin, all_queries_end, max_query_size);
-    IParser::Pos token_iterator(tokens, max_parser_depth);
+    /// NOTE: consider use UInt32 for max_parser_depth setting.
+    IParser::Pos token_iterator(tokens, static_cast<uint32_t>(max_parser_depth));
 
     if (token_iterator->isEnd()
         || token_iterator->type == TokenType::Semicolon)
diff --git a/src/Processors/Executors/CompletedPipelineExecutor.cpp b/src/Processors/Executors/CompletedPipelineExecutor.cpp
index 9e5ea3916bc..a4c7fe2f687 100644
--- a/src/Processors/Executors/CompletedPipelineExecutor.cpp
+++ b/src/Processors/Executors/CompletedPipelineExecutor.cpp
@@ -72,9 +72,9 @@ void CompletedPipelineExecutor::execute()
         data->executor = std::make_shared<PipelineExecutor>(pipeline.processors, pipeline.process_list_element);
         data->executor->setReadProgressCallback(pipeline.getReadProgressCallback());
 
-        /// Avoid passing this to labmda, copy ptr to data instead.
+        /// Avoid passing this to lambda, copy ptr to data instead.
         /// Destructor of unique_ptr copy raw ptr into local variable first, only then calls object destructor.
-        auto func = [data_ptr = data.get(), num_threads = pipeline.getNumThreads(), thread_group = CurrentThread::getGroup()]()
+        auto func = [data_ptr = data.get(), num_threads = pipeline.getNumThreads(), thread_group = CurrentThread::getGroup()]
         {
             threadFunction(*data_ptr, thread_group, num_threads);
         };
diff --git a/src/Processors/Executors/CompletedPipelineExecutor.h b/src/Processors/Executors/CompletedPipelineExecutor.h
index e616cd6a2b7..65fab6035b1 100644
--- a/src/Processors/Executors/CompletedPipelineExecutor.h
+++ b/src/Processors/Executors/CompletedPipelineExecutor.h
@@ -1,7 +1,9 @@
 #pragma once
+
 #include <functional>
 #include <memory>
 
+
 namespace DB
 {
 
diff --git a/src/Processors/Executors/ExecutingGraph.cpp b/src/Processors/Executors/ExecutingGraph.cpp
index 651ede10cfd..9d69abc5e87 100644
--- a/src/Processors/Executors/ExecutingGraph.cpp
+++ b/src/Processors/Executors/ExecutingGraph.cpp
@@ -10,17 +10,17 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-ExecutingGraph::ExecutingGraph(Processors & processors_, bool profile_processors_)
-    : processors(processors_)
+ExecutingGraph::ExecutingGraph(std::shared_ptr<Processors> processors_, bool profile_processors_)
+    : processors(std::move(processors_))
     , profile_processors(profile_processors_)
 {
-    uint64_t num_processors = processors.size();
+    uint64_t num_processors = processors->size();
     nodes.reserve(num_processors);
 
     /// Create nodes.
     for (uint64_t node = 0; node < num_processors; ++node)
     {
-        IProcessor * proc = processors[node].get();
+        IProcessor * proc = processors->at(node).get();
         processors_map[proc] = node;
         nodes.emplace_back(std::make_unique<Node>(proc, node));
     }
@@ -109,10 +109,10 @@ bool ExecutingGraph::expandPipeline(std::stack<uint64_t> & stack, uint64_t pid)
 
     {
         std::lock_guard guard(processors_mutex);
-        processors.insert(processors.end(), new_processors.begin(), new_processors.end());
+        processors->insert(processors->end(), new_processors.begin(), new_processors.end());
     }
 
-    uint64_t num_processors = processors.size();
+    uint64_t num_processors = processors->size();
     std::vector<uint64_t> back_edges_sizes(num_processors, 0);
     std::vector<uint64_t> direct_edge_sizes(num_processors, 0);
 
@@ -126,7 +126,7 @@ bool ExecutingGraph::expandPipeline(std::stack<uint64_t> & stack, uint64_t pid)
 
     while (nodes.size() < num_processors)
     {
-        auto * processor = processors[nodes.size()].get();
+        auto * processor = processors->at(nodes.size()).get();
         if (processors_map.contains(processor))
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Processor {} was already added to pipeline", processor->getName());
 
@@ -386,7 +386,7 @@ bool ExecutingGraph::updateNode(uint64_t pid, Queue & queue, Queue & async_queue
 void ExecutingGraph::cancel()
 {
     std::lock_guard guard(processors_mutex);
-    for (auto & processor : processors)
+    for (auto & processor : *processors)
         processor->cancel();
 }
 
diff --git a/src/Processors/Executors/ExecutingGraph.h b/src/Processors/Executors/ExecutingGraph.h
index 587a2561ae0..b374f968122 100644
--- a/src/Processors/Executors/ExecutingGraph.h
+++ b/src/Processors/Executors/ExecutingGraph.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <Processors/Port.h>
 #include <Processors/IProcessor.h>
 #include <Processors/Executors/UpgradableLock.h>
@@ -6,6 +7,7 @@
 #include <queue>
 #include <stack>
 
+
 namespace DB
 {
 
@@ -123,9 +125,9 @@ public:
     using ProcessorsMap = std::unordered_map<const IProcessor *, uint64_t>;
     ProcessorsMap processors_map;
 
-    explicit ExecutingGraph(Processors & processors_, bool profile_processors_);
+    explicit ExecutingGraph(std::shared_ptr<Processors> processors_, bool profile_processors_);
 
-    const Processors & getProcessors() const { return processors; }
+    const Processors & getProcessors() const { return *processors; }
 
     /// Traverse graph the first time to update all the childless nodes.
     void initializeExecution(Queue & queue);
@@ -149,7 +151,7 @@ private:
     /// All new nodes and nodes with updated ports are pushed into stack.
     bool expandPipeline(std::stack<uint64_t> & stack, uint64_t pid);
 
-    Processors & processors;
+    std::shared_ptr<Processors> processors;
     std::mutex processors_mutex;
 
     UpgradableMutex nodes_mutex;
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index ae20d97604b..3772381de04 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -15,6 +15,7 @@
     #include <Common/Stopwatch.h>
 #endif
 
+
 namespace DB
 {
 
@@ -24,8 +25,8 @@ namespace ErrorCodes
 }
 
 
-PipelineExecutor::PipelineExecutor(Processors & processors, QueryStatus * elem)
-    : process_list_element(elem)
+PipelineExecutor::PipelineExecutor(std::shared_ptr<Processors> & processors, QueryStatusPtr elem)
+    : process_list_element(std::move(elem))
 {
     if (process_list_element)
     {
@@ -41,7 +42,7 @@ PipelineExecutor::PipelineExecutor(Processors & processors, QueryStatus * elem)
         /// If exception was thrown while pipeline initialization, it means that query pipeline was not build correctly.
         /// It is logical error, and we need more information about pipeline.
         WriteBufferFromOwnString buf;
-        printPipeline(processors, buf);
+        printPipeline(*processors, buf);
         buf.finalize();
         exception.addMessage("Query pipeline:\n" + buf.str());
 
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index cea64d309fa..21bde312cbc 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -10,16 +10,19 @@
 #include <queue>
 #include <mutex>
 
+
 namespace DB
 {
 
 class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
 class ExecutingGraph;
 using ExecutingGraphPtr = std::unique_ptr<ExecutingGraph>;
 
 class ReadProgressCallback;
 using ReadProgressCallbackPtr = std::unique_ptr<ReadProgressCallback>;
 
+
 /// Executes query pipeline.
 class PipelineExecutor
 {
@@ -30,7 +33,7 @@ public:
     /// During pipeline execution new processors can appear. They will be added to existing set.
     ///
     /// Explicit graph representation is built in constructor. Throws if graph is not correct.
-    explicit PipelineExecutor(Processors & processors, QueryStatus * elem);
+    explicit PipelineExecutor(std::shared_ptr<Processors> & processors, QueryStatusPtr elem);
     ~PipelineExecutor();
 
     /// Execute pipeline in multiple threads. Must be called once.
@@ -79,7 +82,7 @@ private:
     Poco::Logger * log = &Poco::Logger::get("PipelineExecutor");
 
     /// Now it's used to check if query was killed.
-    QueryStatus * const process_list_element = nullptr;
+    QueryStatusPtr process_list_element;
 
     ReadProgressCallbackPtr read_progress_callback;
 
diff --git a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
index 7a55d26f16c..ee8e94b6f28 100644
--- a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
@@ -129,7 +129,7 @@ PushingAsyncPipelineExecutor::PushingAsyncPipelineExecutor(QueryPipeline & pipel
 
     pushing_source = std::make_shared<PushingAsyncSource>(pipeline.input->getHeader());
     connect(pushing_source->getPort(), *pipeline.input);
-    pipeline.processors.emplace_back(pushing_source);
+    pipeline.processors->emplace_back(pushing_source);
 }
 
 PushingAsyncPipelineExecutor::~PushingAsyncPipelineExecutor()
diff --git a/src/Processors/Executors/PushingPipelineExecutor.cpp b/src/Processors/Executors/PushingPipelineExecutor.cpp
index bf43cd327fe..d9a14704cd0 100644
--- a/src/Processors/Executors/PushingPipelineExecutor.cpp
+++ b/src/Processors/Executors/PushingPipelineExecutor.cpp
@@ -58,7 +58,7 @@ PushingPipelineExecutor::PushingPipelineExecutor(QueryPipeline & pipeline_) : pi
 
     pushing_source = std::make_shared<PushingSource>(pipeline.input->getHeader(), input_wait_flag);
     connect(pushing_source->getPort(), *pipeline.input);
-    pipeline.processors.emplace_back(pushing_source);
+    pipeline.processors->emplace_back(pushing_source);
 }
 
 PushingPipelineExecutor::~PushingPipelineExecutor()
diff --git a/src/Processors/Formats/IRowInputFormat.cpp b/src/Processors/Formats/IRowInputFormat.cpp
index 52395338279..abd91ddcf35 100644
--- a/src/Processors/Formats/IRowInputFormat.cpp
+++ b/src/Processors/Formats/IRowInputFormat.cpp
@@ -188,7 +188,7 @@ Chunk IRowInputFormat::generate()
         }
 
         e.setFileName(getFileNameFromReadBuffer(getReadBuffer()));
-        e.setLineNumber(total_rows);
+        e.setLineNumber(static_cast<int>(total_rows));
         e.addMessage(verbose_diagnostic);
         throw;
     }
diff --git a/src/Processors/Formats/ISchemaReader.cpp b/src/Processors/Formats/ISchemaReader.cpp
index 0e4d3f091b2..a26ed6b0b40 100644
--- a/src/Processors/Formats/ISchemaReader.cpp
+++ b/src/Processors/Formats/ISchemaReader.cpp
@@ -132,6 +132,16 @@ NamesAndTypesList IRowSchemaReader::readSchema()
             ErrorCodes::INCORRECT_DATA,
             "The number of column names {} differs with the number of types {}", column_names.size(), data_types.size());
     }
+    else
+    {
+        std::unordered_set<std::string_view> names_set;
+        for (const auto & name : column_names)
+        {
+            if (names_set.contains(name))
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Duplicate column name found while schema inference: \"{}\"", name);
+            names_set.insert(name);
+        }
+    }
 
     for (size_t i = 0; i != column_names.size(); ++i)
     {
@@ -224,6 +234,9 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
     names_order.reserve(names_and_types.size());
     for (const auto & [name, type] : names_and_types)
     {
+        if (names_to_types.contains(name))
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Duplicate column name found while schema inference: \"{}\"", name);
+
         auto hint_it = hints.find(name);
         if (hint_it != hints.end())
             names_to_types[name] = hint_it->second;
@@ -240,8 +253,13 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
             /// We reached eof.
             break;
 
+        std::unordered_set<std::string_view> names_set; /// We should check for duplicate column names in current row
         for (auto & [name, new_type] : new_names_and_types)
         {
+            if (names_set.contains(name))
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Duplicate column name found while schema inference: \"{}\"", name);
+            names_set.insert(name);
+
             auto it = names_to_types.find(name);
             /// If we didn't see this column before, just add it.
             if (it == names_to_types.end())
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index 70510a165e6..e9b01ec7dda 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -82,7 +82,7 @@ static ColumnWithTypeAndName readColumnWithNumericData(std::shared_ptr<arrow::Ch
     auto & column_data = static_cast<VectorType &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         std::shared_ptr<arrow::Array> chunk = arrow_column->chunk(chunk_i);
         if (chunk->length() == 0)
@@ -108,7 +108,7 @@ static ColumnWithTypeAndName readColumnWithStringData(std::shared_ptr<arrow::Chu
     PaddedPODArray<UInt64> & column_offsets = assert_cast<ColumnString &>(*internal_column).getOffsets();
 
     size_t chars_t_size = 0;
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         ArrowArray & chunk = dynamic_cast<ArrowArray &>(*(arrow_column->chunk(chunk_i)));
         const size_t chunk_length = chunk.length();
@@ -123,7 +123,7 @@ static ColumnWithTypeAndName readColumnWithStringData(std::shared_ptr<arrow::Chu
     column_chars_t.reserve(chars_t_size);
     column_offsets.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         ArrowArray & chunk = dynamic_cast<ArrowArray &>(*(arrow_column->chunk(chunk_i)));
         std::shared_ptr<arrow::Buffer> buffer = chunk.value_data();
@@ -151,7 +151,7 @@ static ColumnWithTypeAndName readColumnWithBooleanData(std::shared_ptr<arrow::Ch
     auto & column_data = assert_cast<ColumnVector<UInt8> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         arrow::BooleanArray & chunk = dynamic_cast<arrow::BooleanArray &>(*(arrow_column->chunk(chunk_i)));
         if (chunk.length() == 0)
@@ -173,7 +173,7 @@ static ColumnWithTypeAndName readColumnWithDate32Data(std::shared_ptr<arrow::Chu
     PaddedPODArray<Int32> & column_data = assert_cast<ColumnVector<Int32> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         arrow::Date32Array & chunk = dynamic_cast<arrow::Date32Array &>(*(arrow_column->chunk(chunk_i)));
 
@@ -198,7 +198,7 @@ static ColumnWithTypeAndName readColumnWithDate64Data(std::shared_ptr<arrow::Chu
     auto & column_data = assert_cast<ColumnVector<UInt32> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         auto & chunk = dynamic_cast<arrow::Date64Array &>(*(arrow_column->chunk(chunk_i)));
         for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
@@ -219,7 +219,7 @@ static ColumnWithTypeAndName readColumnWithTimestampData(std::shared_ptr<arrow::
     auto & column_data = assert_cast<ColumnDecimal<DateTime64> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         const auto & chunk = dynamic_cast<const arrow::TimestampArray &>(*(arrow_column->chunk(chunk_i)));
         for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
@@ -239,7 +239,7 @@ static ColumnWithTypeAndName readColumnWithTimeData(std::shared_ptr<arrow::Chunk
     auto internal_column = internal_type->createColumn();
     internal_column->reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         auto & chunk = dynamic_cast<TimeArray &>(*(arrow_column->chunk(chunk_i)));
         if (chunk.length() == 0)
@@ -272,7 +272,7 @@ static ColumnWithTypeAndName readColumnWithDecimalDataImpl(std::shared_ptr<arrow
     auto & column_data = column.getData();
     column_data.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         auto & chunk = dynamic_cast<DecimalArray &>(*(arrow_column->chunk(chunk_i)));
         for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
@@ -308,7 +308,7 @@ static ColumnPtr readByteMapFromArrowColumn(std::shared_ptr<arrow::ChunkedArray>
     PaddedPODArray<UInt8> & bytemap_data = assert_cast<ColumnVector<UInt8> &>(*nullmap_column).getData();
     bytemap_data.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0; chunk_i != static_cast<size_t>(arrow_column->num_chunks()); ++chunk_i)
+    for (int chunk_i = 0; chunk_i != arrow_column->num_chunks(); ++chunk_i)
     {
         std::shared_ptr<arrow::Array> chunk = arrow_column->chunk(chunk_i);
 
@@ -324,7 +324,7 @@ static ColumnPtr readOffsetsFromArrowListColumn(std::shared_ptr<arrow::ChunkedAr
     ColumnArray::Offsets & offsets_data = assert_cast<ColumnVector<UInt64> &>(*offsets_column).getData();
     offsets_data.reserve(arrow_column->length());
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         arrow::ListArray & list_chunk = dynamic_cast<arrow::ListArray &>(*(arrow_column->chunk(chunk_i)));
         auto arrow_offsets_array = list_chunk.offsets();
@@ -356,7 +356,7 @@ static ColumnWithTypeAndName readColumnWithIndexesDataImpl(std::shared_ptr<arrow
     column_data.reserve(arrow_column->length());
     NumericType shift = is_nullable ? 2 : 1;
 
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         std::shared_ptr<arrow::Array> chunk = arrow_column->chunk(chunk_i);
         if (chunk->length() == 0)
@@ -450,7 +450,8 @@ static ColumnPtr readColumnWithIndexesData(std::shared_ptr<arrow::ChunkedArray>
 #    define DISPATCH(ARROW_NUMERIC_TYPE, CPP_NUMERIC_TYPE) \
             case ARROW_NUMERIC_TYPE: \
             { \
-                    return readColumnWithIndexesDataImpl<CPP_NUMERIC_TYPE>(arrow_column, "", default_value_index, dict_size, is_nullable).column; \
+                    return readColumnWithIndexesDataImpl<CPP_NUMERIC_TYPE>(\
+                        arrow_column, "", default_value_index, static_cast<CPP_NUMERIC_TYPE>(dict_size), is_nullable).column; \
             }
         FOR_ARROW_INDEXES_TYPES(DISPATCH)
 #    undef DISPATCH
@@ -463,7 +464,7 @@ static std::shared_ptr<arrow::ChunkedArray> getNestedArrowColumn(std::shared_ptr
 {
     arrow::ArrayVector array_vector;
     array_vector.reserve(arrow_column->num_chunks());
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
     {
         arrow::ListArray & list_chunk = dynamic_cast<arrow::ListArray &>(*(arrow_column->chunk(chunk_i)));
         std::shared_ptr<arrow::Array> chunk = list_chunk.values();
@@ -582,7 +583,7 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
             auto arrow_type = arrow_column->type();
             auto * arrow_struct_type = assert_cast<arrow::StructType *>(arrow_type.get());
             std::vector<arrow::ArrayVector> nested_arrow_columns(arrow_struct_type->num_fields());
-            for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+            for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
             {
                 arrow::StructArray & struct_chunk = dynamic_cast<arrow::StructArray &>(*(arrow_column->chunk(chunk_i)));
                 for (int i = 0; i < arrow_struct_type->num_fields(); ++i)
@@ -631,7 +632,7 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
             if (!dict_info.values)
             {
                 arrow::ArrayVector dict_array;
-                for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+                for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
                 {
                     arrow::DictionaryArray & dict_chunk = dynamic_cast<arrow::DictionaryArray &>(*(arrow_column->chunk(chunk_i)));
                     dict_array.emplace_back(dict_chunk.dictionary());
@@ -656,7 +657,7 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
             }
 
             arrow::ArrayVector indexes_array;
-            for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+            for (int chunk_i = 0, num_chunks = arrow_column->num_chunks(); chunk_i < num_chunks; ++chunk_i)
             {
                 arrow::DictionaryArray & dict_chunk = dynamic_cast<arrow::DictionaryArray &>(*(arrow_column->chunk(chunk_i)));
                 indexes_array.emplace_back(dict_chunk.indices());
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index 0ec04c61321..80183838277 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -283,14 +283,15 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
             if (root_node->leaves() == 2
                 && (root_node->leafAt(0)->type() == avro::AVRO_NULL || root_node->leafAt(1)->type() == avro::AVRO_NULL))
             {
-                size_t non_null_union_index = root_node->leafAt(0)->type() == avro::AVRO_NULL ? 1 : 0;
+                int non_null_union_index = root_node->leafAt(0)->type() == avro::AVRO_NULL ? 1 : 0;
                 if (target.isNullable())
                 {
-                    auto nested_deserialize = this->createDeserializeFn(root_node->leafAt(non_null_union_index), removeNullable(target_type));
+                    auto nested_deserialize = this->createDeserializeFn(
+                        root_node->leafAt(non_null_union_index), removeNullable(target_type));
                     return [non_null_union_index, nested_deserialize](IColumn & column, avro::Decoder & decoder)
                     {
                         ColumnNullable & col = assert_cast<ColumnNullable &>(column);
-                        size_t union_index = decoder.decodeUnionIndex();
+                        int union_index = static_cast<int>(decoder.decodeUnionIndex());
                         if (union_index == non_null_union_index)
                         {
                             nested_deserialize(col.getNestedColumn(), decoder);
@@ -308,7 +309,7 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
                     auto nested_deserialize = this->createDeserializeFn(root_node->leafAt(non_null_union_index), target_type);
                     return [non_null_union_index, nested_deserialize](IColumn & column, avro::Decoder & decoder)
                     {
-                        size_t union_index = decoder.decodeUnionIndex();
+                        int union_index = static_cast<int>(decoder.decodeUnionIndex());
                         if (union_index == non_null_union_index)
                             nested_deserialize(column, decoder);
                         else
@@ -345,7 +346,8 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
             if (target.isString())
             {
                 std::vector<std::string> symbols;
-                for (size_t i = 0; i < root_node->names(); ++i)
+                symbols.reserve(root_node->names());
+                for (int i = 0; i < static_cast<int>(root_node->names()); ++i)
                 {
                     symbols.push_back(root_node->nameAt(i));
                 }
@@ -360,7 +362,7 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
             {
                 const auto & enum_type = dynamic_cast<const IDataTypeEnum &>(*target_type);
                 Row symbol_mapping;
-                for (size_t i = 0; i < root_node->names(); ++i)
+                for (int i = 0; i < static_cast<int>(root_node->names()); ++i)
                 {
                     symbol_mapping.push_back(enum_type.castToValue(root_node->nameAt(i)));
                 }
@@ -397,7 +399,7 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
                 if (root_node->leaves() != nested_types.size())
                     throw Exception(ErrorCodes::INCORRECT_DATA, "The number of leaves in record doesn't match the number of elements in tuple");
 
-                for (size_t i = 0; i != root_node->leaves(); ++i)
+                for (int i = 0; i != static_cast<int>(root_node->leaves()); ++i)
                 {
                     const auto & name = root_node->nameAt(i);
                     size_t pos = tuple_type.getPositionByName(name);
@@ -505,7 +507,8 @@ AvroDeserializer::SkipFn AvroDeserializer::createSkipFn(avro::NodePtr root_node)
         case avro::AVRO_UNION:
         {
             std::vector<SkipFn> union_skip_fns;
-            for (size_t i = 0; i < root_node->leaves(); ++i)
+            union_skip_fns.reserve(root_node->leaves());
+            for (int i = 0; i < static_cast<int>(root_node->leaves()); ++i)
             {
                 union_skip_fns.push_back(createSkipFn(root_node->leafAt(i)));
             }
@@ -546,7 +549,8 @@ AvroDeserializer::SkipFn AvroDeserializer::createSkipFn(avro::NodePtr root_node)
         case avro::AVRO_RECORD:
         {
             std::vector<SkipFn> field_skip_fns;
-            for (size_t i = 0; i < root_node->leaves(); ++i)
+            field_skip_fns.reserve(root_node->leaves());
+            for (int i = 0; i < static_cast<int>(root_node->leaves()); ++i)
             {
                 field_skip_fns.push_back(createSkipFn(root_node->leafAt(i)));
             }
@@ -633,7 +637,7 @@ AvroDeserializer::Action AvroDeserializer::createAction(const Block & header, co
         const auto & column = header.getByPosition(target_column_idx);
         try
         {
-            AvroDeserializer::Action action(target_column_idx, createDeserializeFn(node, column.type));
+            AvroDeserializer::Action action(static_cast<int>(target_column_idx), createDeserializeFn(node, column.type));
             column_found[target_column_idx] = true;
             return action;
         }
@@ -646,7 +650,7 @@ AvroDeserializer::Action AvroDeserializer::createAction(const Block & header, co
     else if (node->type() == avro::AVRO_RECORD)
     {
         std::vector<AvroDeserializer::Action> field_actions(node->leaves());
-        for (size_t i = 0; i < node->leaves(); ++i)
+        for (int i = 0; i < static_cast<int>(node->leaves()); ++i)
         {
             const auto & field_node = node->leafAt(i);
             const auto & field_name = node->nameAt(i);
@@ -657,7 +661,7 @@ AvroDeserializer::Action AvroDeserializer::createAction(const Block & header, co
     else if (node->type() == avro::AVRO_UNION)
     {
         std::vector<AvroDeserializer::Action> branch_actions(node->leaves());
-        for (size_t i = 0; i < node->leaves(); ++i)
+        for (int i = 0; i < static_cast<int>(node->leaves()); ++i)
         {
             const auto & branch_node = node->leafAt(i);
             const auto & branch_name = nodeName(branch_node);
@@ -687,7 +691,7 @@ AvroDeserializer::Action AvroDeserializer::createAction(const Block & header, co
         /// Create nested deserializer for each nested column.
         std::vector<DeserializeFn> nested_deserializers;
         std::vector<size_t> nested_indexes;
-        for (size_t i = 0; i != nested_avro_node->leaves(); ++i)
+        for (int i = 0; i != static_cast<int>(nested_avro_node->leaves()); ++i)
         {
             const auto & name = nested_avro_node->nameAt(i);
             if (!nested_types.contains(name))
@@ -970,7 +974,7 @@ NamesAndTypesList AvroSchemaReader::readSchema()
         throw Exception("Root schema must be a record", ErrorCodes::TYPE_MISMATCH);
 
     NamesAndTypesList names_and_types;
-    for (size_t i = 0; i != root_node->leaves(); ++i)
+    for (int i = 0; i != static_cast<int>(root_node->leaves()); ++i)
         names_and_types.emplace_back(root_node->nameAt(i), avroNodeToDataType(root_node->leafAt(i)));
 
     return names_and_types;
@@ -999,14 +1003,14 @@ DataTypePtr AvroSchemaReader::avroNodeToDataType(avro::NodePtr node)
             if (node->names() < 128)
             {
                 EnumValues<Int8>::Values values;
-                for (size_t i = 0; i != node->names(); ++i)
+                for (int i = 0; i != static_cast<int>(node->names()); ++i)
                     values.emplace_back(node->nameAt(i), i);
                 return std::make_shared<DataTypeEnum8>(std::move(values));
             }
             else if (node->names() < 32768)
             {
                 EnumValues<Int16>::Values values;
-                for (size_t i = 0; i != node->names(); ++i)
+                for (int i = 0; i != static_cast<int>(node->names()); ++i)
                     values.emplace_back(node->nameAt(i), i);
                 return std::make_shared<DataTypeEnum16>(std::move(values));
             }
@@ -1022,7 +1026,7 @@ DataTypePtr AvroSchemaReader::avroNodeToDataType(avro::NodePtr node)
         case avro::Type::AVRO_UNION:
             if (node->leaves() == 2 && (node->leafAt(0)->type() == avro::Type::AVRO_NULL || node->leafAt(1)->type() == avro::Type::AVRO_NULL))
             {
-                size_t nested_leaf_index = node->leafAt(0)->type() == avro::Type::AVRO_NULL ? 1 : 0;
+                int nested_leaf_index = node->leafAt(0)->type() == avro::Type::AVRO_NULL ? 1 : 0;
                 auto nested_type = avroNodeToDataType(node->leafAt(nested_leaf_index));
                 return nested_type->canBeInsideNullable() ? makeNullable(nested_type) : nested_type;
             }
@@ -1035,7 +1039,7 @@ DataTypePtr AvroSchemaReader::avroNodeToDataType(avro::NodePtr node)
             nested_types.reserve(node->leaves());
             Names nested_names;
             nested_names.reserve(node->leaves());
-            for (size_t i = 0; i != node->leaves(); ++i)
+            for (int i = 0; i != static_cast<int>(node->leaves()); ++i)
             {
                 nested_types.push_back(avroNodeToDataType(node->leafAt(i)));
                 nested_names.push_back(node->nameAt(i));
diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
index b63b1e7b9b1..e3d570d1876 100644
--- a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
@@ -193,7 +193,7 @@ AvroSerializer::SchemaWithSerializeFn AvroSerializer::createSchemaWithSerializeF
         case TypeIndex::FixedString:
         {
             auto size = data_type->getSizeOfValueInMemory();
-            auto schema = avro::FixedSchema(size, "fixed_" + toString(type_name_increment));
+            auto schema = avro::FixedSchema(static_cast<int>(size), "fixed_" + toString(type_name_increment));
             return {schema, [](const IColumn & column, size_t row_num, avro::Encoder & encoder)
             {
                 const std::string_view & s = assert_cast<const ColumnFixedString &>(column).getDataAt(row_num).toView();
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index 9e423f8a96b..87fff16c107 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -224,7 +224,14 @@ namespace DB
         for (size_t i = 0; i != column_tuple->tupleSize(); ++i)
         {
             ColumnPtr nested_column = column_tuple->getColumnPtr(i);
-            fillArrowArray(column_name + "." + nested_names[i], nested_column, nested_types[i], null_bytemap, builder.field_builder(i), format_name, start, end, output_string_as_string, dictionary_values);
+            fillArrowArray(
+                column_name + "." + nested_names[i],
+                nested_column, nested_types[i], null_bytemap,
+                builder.field_builder(static_cast<int>(i)),
+                format_name,
+                start, end,
+                output_string_as_string,
+                dictionary_values);
         }
 
         for (size_t i = start; i != end; ++i)
@@ -370,7 +377,7 @@ namespace DB
             else
             {
                 std::string_view string_ref = internal_column.getDataAt(string_i).toView();
-                status = builder.Append(string_ref.data(), string_ref.size());
+                status = builder.Append(string_ref.data(), static_cast<int>(string_ref.size()));
             }
             checkStatus(status, write_column->getName(), format_name);
         }
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
index c6f8742455e..08d2cac743a 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
@@ -91,7 +91,7 @@ static void insertSignedInteger(IColumn & column, const DataTypePtr & column_typ
             assert_cast<ColumnInt16 &>(column).insertValue(value);
             break;
         case TypeIndex::Int32:
-            assert_cast<ColumnInt32 &>(column).insertValue(value);
+            assert_cast<ColumnInt32 &>(column).insertValue(static_cast<Int32>(value));
             break;
         case TypeIndex::Int64:
             assert_cast<ColumnInt64 &>(column).insertValue(value);
@@ -117,7 +117,7 @@ static void insertUnsignedInteger(IColumn & column, const DataTypePtr & column_t
             break;
         case TypeIndex::DateTime: [[fallthrough]];
         case TypeIndex::UInt32:
-            assert_cast<ColumnUInt32 &>(column).insertValue(value);
+            assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(value));
             break;
         case TypeIndex::UInt64:
             assert_cast<ColumnUInt64 &>(column).insertValue(value);
diff --git a/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp
index fd33abfb587..654917b6357 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp
@@ -79,7 +79,7 @@ static capnp::DynamicValue::Builder initStructFieldBuilder(const ColumnPtr & col
     if (const auto * array_column = checkAndGetColumn<ColumnArray>(*column))
     {
         size_t size = array_column->getOffsets()[row_num] - array_column->getOffsets()[row_num - 1];
-        return struct_builder.init(field, size);
+        return struct_builder.init(field, static_cast<unsigned>(size));
     }
 
     if (field.getType().isStruct())
@@ -200,7 +200,7 @@ static std::optional<capnp::DynamicValue::Reader> convertToDynamicValue(
             size_t size = offsets[row_num] - offset;
 
             const auto * nested_array_column = checkAndGetColumn<ColumnArray>(*nested_column);
-            for (size_t i = 0; i != size; ++i)
+            for (unsigned i = 0; i != static_cast<unsigned>(size); ++i)
             {
                 capnp::DynamicValue::Builder value_builder;
                 /// For nested arrays we need to initialize nested list builder.
@@ -208,7 +208,7 @@ static std::optional<capnp::DynamicValue::Reader> convertToDynamicValue(
                 {
                     const auto & nested_offset = nested_array_column->getOffsets();
                     size_t nested_array_size = nested_offset[offset + i] - nested_offset[offset + i - 1];
-                    value_builder = list_builder.init(i, nested_array_size);
+                    value_builder = list_builder.init(i, static_cast<unsigned>(nested_array_size));
                 }
                 else
                     value_builder = list_builder[i];
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index 739fa8735b2..bc363e5aa98 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -502,7 +502,7 @@ bool ConstantExpressionTemplate::parseLiteralAndAssertType(ReadBuffer & istr, co
         ParserTupleOfLiterals parser_tuple;
 
         Tokens tokens_number(istr.position(), istr.buffer().end());
-        IParser::Pos iterator(tokens_number, settings.max_parser_depth);
+        IParser::Pos iterator(tokens_number, static_cast<unsigned>(settings.max_parser_depth));
         Expected expected;
         ASTPtr ast;
         if (!parser_array.parse(iterator, ast, expected) && !parser_tuple.parse(iterator, ast, expected))
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
index 1c99a5484a2..16df132b9d8 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
@@ -67,6 +67,19 @@ CustomSeparatedRowInputFormat::CustomSeparatedRowInputFormat(
     }
 }
 
+void CustomSeparatedRowInputFormat::readPrefix()
+{
+    RowInputFormatWithNamesAndTypes::readPrefix();
+
+    /// Provide better error message for unsupported delimiters
+    for (const auto & column_index : column_mapping->column_indexes_for_input_fields)
+    {
+        if (column_index)
+            checkSupportedDelimiterAfterField(format_settings.custom.escaping_rule, format_settings.custom.field_delimiter, data_types[*column_index]);
+        else
+            checkSupportedDelimiterAfterField(format_settings.custom.escaping_rule, format_settings.custom.field_delimiter, nullptr);
+    }
+}
 
 bool CustomSeparatedRowInputFormat::allowSyncAfterError() const
 {
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
index c7e332b983f..e7e96ab87b1 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
@@ -30,6 +30,7 @@ private:
 
     bool allowSyncAfterError() const override;
     void syncAfterError() override;
+    void readPrefix() override;
 
     std::unique_ptr<PeekableReadBuffer> buf;
     bool ignore_spaces;
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
index 931a7587903..80fdda687e2 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
@@ -128,7 +128,7 @@ static void insertInteger(IColumn & column, DataTypePtr type, UInt64 value)
         case TypeIndex::DateTime: [[fallthrough]];
         case TypeIndex::UInt32:
         {
-            assert_cast<ColumnUInt32 &>(column).insertValue(value);
+            assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(value));
             break;
         }
         case TypeIndex::UInt64:
@@ -148,7 +148,7 @@ static void insertInteger(IColumn & column, DataTypePtr type, UInt64 value)
         }
         case TypeIndex::Int32:
         {
-            assert_cast<ColumnInt32 &>(column).insertValue(value);
+            assert_cast<ColumnInt32 &>(column).insertValue(static_cast<Int32>(value));
             break;
         }
         case TypeIndex::Int64:
diff --git a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
index a470e193300..da683913d4d 100644
--- a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
@@ -99,15 +99,15 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
         case TypeIndex::String:
         {
             const std::string_view & string = assert_cast<const ColumnString &>(column).getDataAt(row_num).toView();
-            packer.pack_bin(string.size());
-            packer.pack_bin_body(string.data(), string.size());
+            packer.pack_bin(static_cast<unsigned>(string.size()));
+            packer.pack_bin_body(string.data(), static_cast<unsigned>(string.size()));
             return;
         }
         case TypeIndex::FixedString:
         {
             const std::string_view & string = assert_cast<const ColumnFixedString &>(column).getDataAt(row_num).toView();
-            packer.pack_bin(string.size());
-            packer.pack_bin_body(string.data(), string.size());
+            packer.pack_bin(static_cast<unsigned>(string.size()));
+            packer.pack_bin_body(string.data(), static_cast<unsigned>(string.size()));
             return;
         }
         case TypeIndex::Array:
@@ -118,7 +118,7 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
             const ColumnArray::Offsets & offsets = column_array.getOffsets();
             size_t offset = offsets[row_num - 1];
             size_t size = offsets[row_num] - offset;
-            packer.pack_array(size);
+            packer.pack_array(static_cast<unsigned>(size));
             for (size_t i = 0; i < size; ++i)
             {
                 serializeField(nested_column, nested_type, offset + i);
@@ -152,7 +152,7 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
             const auto & offsets = nested_column.getOffsets();
             size_t offset = offsets[row_num - 1];
             size_t size = offsets[row_num] - offset;
-            packer.pack_map(size);
+            packer.pack_map(static_cast<unsigned>(size));
             for (size_t i = 0; i < size; ++i)
             {
                 serializeField(*key_column, map_type.getKeyType(), offset + i);
@@ -179,8 +179,8 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
                     WriteBufferFromOwnString buf;
                     writeBinary(uuid_column.getElement(row_num), buf);
                     std::string_view uuid_bin = buf.stringView();
-                    packer.pack_bin(uuid_bin.size());
-                    packer.pack_bin_body(uuid_bin.data(), uuid_bin.size());
+                    packer.pack_bin(static_cast<unsigned>(uuid_bin.size()));
+                    packer.pack_bin_body(uuid_bin.data(), static_cast<unsigned>(uuid_bin.size()));
                     return;
                 }
                 case FormatSettings::MsgPackUUIDRepresentation::STR:
@@ -188,8 +188,8 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
                     WriteBufferFromOwnString buf;
                     writeText(uuid_column.getElement(row_num), buf);
                     std::string_view uuid_text = buf.stringView();
-                    packer.pack_str(uuid_text.size());
-                    packer.pack_bin_body(uuid_text.data(), uuid_text.size());
+                    packer.pack_str(static_cast<unsigned>(uuid_text.size()));
+                    packer.pack_bin_body(uuid_text.data(), static_cast<unsigned>(uuid_text.size()));
                     return;
                 }
                 case FormatSettings::MsgPackUUIDRepresentation::EXT:
@@ -200,7 +200,7 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
                     writeBinaryBigEndian(value.toUnderType().items[1], buf);
                     std::string_view uuid_ext = buf.stringView();
                     packer.pack_ext(sizeof(UUID), int8_t(MsgPackExtensionTypes::UUIDType));
-                    packer.pack_ext_body(uuid_ext.data(), uuid_ext.size());
+                    packer.pack_ext_body(uuid_ext.data(), static_cast<unsigned>(uuid_ext.size()));
                     return;
                 }
             }
diff --git a/src/Processors/Formats/Impl/MySQLOutputFormat.cpp b/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
index 344c5c179db..75a03cb6d0e 100644
--- a/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
@@ -65,7 +65,7 @@ void MySQLOutputFormat::consume(Chunk chunk)
 {
     for (size_t i = 0; i < chunk.getNumRows(); ++i)
     {
-        ProtocolText::ResultSetRow row_packet(serializations, chunk.getColumns(), i);
+        ProtocolText::ResultSetRow row_packet(serializations, chunk.getColumns(), static_cast<int>(i));
         packet_endpoint->sendPacket(row_packet);
     }
 }
@@ -74,7 +74,7 @@ void MySQLOutputFormat::finalizeImpl()
 {
     size_t affected_rows = 0;
     std::string human_readable_info;
-    if (QueryStatus * process_list_elem = getContext()->getProcessListElement())
+    if (QueryStatusPtr process_list_elem = getContext()->getProcessListElement())
     {
         CurrentThread::finalizePerformanceCounters();
         QueryStatusInfo info = process_list_elem->getInfo();
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
index 36126c21bf1..d6dbd69135a 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
@@ -136,7 +136,7 @@ void ORCBlockInputFormat::prepareReader()
     if (is_stopped)
         return;
 
-    stripe_total = file_reader->NumberOfStripes();
+    stripe_total = static_cast<int>(file_reader->NumberOfStripes());
     stripe_current = 0;
 
     arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(
@@ -159,7 +159,7 @@ void ORCBlockInputFormat::prepareReader()
     {
         /// LIST type require 2 indices, STRUCT - the number of elements + 1,
         /// so we should recursively count the number of indices we need for this type.
-        int indexes_count = countIndicesForType(schema->field(i)->type());
+        int indexes_count = static_cast<int>(countIndicesForType(schema->field(i)->type()));
         const auto & name = schema->field(i)->name();
         if (getPort().getHeader().has(name, ignore_case) || nested_table_names.contains(ignore_case ? boost::to_lower_copy(name) : name))
         {
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
index 2f54cca466c..9172c79c890 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
@@ -128,8 +128,9 @@ void ParallelParsingInputFormat::onBackgroundException(size_t offset)
         background_exception = std::current_exception();
         if (ParsingException * e = exception_cast<ParsingException *>(background_exception))
         {
+            /// NOTE: it is not that safe to use line number hack here (may exceed INT_MAX)
             if (e->getLineNumber() != -1)
-                e->setLineNumber(e->getLineNumber() + offset);
+                e->setLineNumber(static_cast<int>(e->getLineNumber() + offset));
 
             auto file_name = getFileNameFromReadBuffer(getReadBuffer());
             if (!file_name.empty())
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index 427c159314b..dd2826287b2 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -161,7 +161,7 @@ void ParquetBlockInputFormat::prepareReader()
         /// STRUCT type require the number of indexes equal to the number of
         /// nested elements, so we should recursively
         /// count the number of indices we need for this type.
-        int indexes_count = countIndicesForType(schema->field(i)->type());
+        int indexes_count = static_cast<int>(countIndicesForType(schema->field(i)->type()));
         const auto & name = schema->field(i)->name();
 
         if (getPort().getHeader().has(name, ignore_case) || nested_table_names.contains(ignore_case ? boost::to_lower_copy(name) : name))
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
index c26b6b39e0d..6eacfe621e1 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
@@ -50,7 +50,11 @@ bool RegexpFieldExtractor::parseRow(PeekableReadBuffer & buf)
     if (line_size > 0 && buf.position()[line_size - 1] == '\r')
         --line_to_match;
 
-    bool match = re2_st::RE2::FullMatchN(re2_st::StringPiece(buf.position(), line_to_match), regexp, re2_arguments_ptrs.data(), re2_arguments_ptrs.size());
+    bool match = re2_st::RE2::FullMatchN(
+        re2_st::StringPiece(buf.position(), line_to_match),
+        regexp,
+        re2_arguments_ptrs.data(),
+        static_cast<int>(re2_arguments_ptrs.size()));
 
     if (!match && !skip_unmatched)
         throw Exception("Line \"" + std::string(buf.position(), line_to_match) + "\" doesn't match the regexp.", ErrorCodes::INCORRECT_DATA);
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
index 785658c0fa2..76fd0d2a907 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
@@ -53,18 +53,25 @@ TemplateRowInputFormat::TemplateRowInputFormat(const Block & header_, std::uniqu
     std::vector<UInt8> column_in_format(header_.columns(), false);
     for (size_t i = 0; i < row_format.columnsCount(); ++i)
     {
-        if (row_format.format_idx_to_column_idx[i])
+        const auto & column_index = row_format.format_idx_to_column_idx[i];
+        if (column_index)
         {
-            if (header_.columns() <= *row_format.format_idx_to_column_idx[i])
-                row_format.throwInvalidFormat("Column index " + std::to_string(*row_format.format_idx_to_column_idx[i]) +
+            if (header_.columns() <= *column_index)
+                row_format.throwInvalidFormat("Column index " + std::to_string(*column_index) +
                                               " must be less then number of columns (" + std::to_string(header_.columns()) + ")", i);
             if (row_format.escaping_rules[i] == EscapingRule::None)
                 row_format.throwInvalidFormat("Column is not skipped, but deserialization type is None", i);
 
-            size_t col_idx = *row_format.format_idx_to_column_idx[i];
+            size_t col_idx = *column_index;
             if (column_in_format[col_idx])
                 row_format.throwInvalidFormat("Duplicate column", i);
             column_in_format[col_idx] = true;
+
+            checkSupportedDelimiterAfterField(row_format.escaping_rules[i], row_format.delimiters[i + 1], data_types[*column_index]);
+        }
+        else
+        {
+            checkSupportedDelimiterAfterField(row_format.escaping_rules[i], row_format.delimiters[i + 1], nullptr);
         }
     }
 
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index aff4557a4b7..72e89ea0013 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -350,7 +350,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
 
     Expected expected;
     Tokens tokens(buf->position(), buf->buffer().end());
-    IParser::Pos token_iterator(tokens, settings.max_parser_depth);
+    IParser::Pos token_iterator(tokens, static_cast<unsigned>(settings.max_parser_depth));
     ASTPtr ast;
 
     bool parsed = parser.parse(token_iterator, ast, expected);
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
index d2dd28eb15a..9d0734f4567 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
@@ -41,6 +41,7 @@ protected:
     void resetParser() override;
     bool isGarbageAfterField(size_t index, ReadBuffer::Position pos) override;
     void setReadBuffer(ReadBuffer & in_) override;
+    void readPrefix() override;
 
     const FormatSettings format_settings;
     DataTypes data_types;
@@ -48,7 +49,6 @@ protected:
 
 private:
     bool readRow(MutableColumns & columns, RowReadExtension & ext) override;
-    void readPrefix() override;
 
     bool parseRowAndPrintDiagnosticInfo(MutableColumns & columns, WriteBuffer & out) override;
     void tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column) override;
diff --git a/src/Processors/QueryPlan/BuildQueryPipelineSettings.h b/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
index fadbd061fbd..3b5e4e06953 100644
--- a/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
+++ b/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
@@ -5,16 +5,18 @@
 
 #include <cstddef>
 
+
 namespace DB
 {
 
 struct Settings;
 class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
 
 struct BuildQueryPipelineSettings
 {
     ExpressionActionsSettings actions_settings;
-    QueryStatus * process_list_element = nullptr;
+    QueryStatusPtr process_list_element;
     ProgressCallback progress_callback = nullptr;
 
     const ExpressionActionsSettings & getActionsSettings() const { return actions_settings; }
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index b340073e73d..59f9668d3a8 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -853,7 +853,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
     ContextPtr context,
-    unsigned num_streams,
+    size_t num_streams,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
     const MergeTreeData & data,
     const Names & real_column_names,
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
index 0a013748e91..15258eb6c40 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.h
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -140,7 +140,7 @@ public:
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
         ContextPtr context,
-        unsigned num_streams,
+        size_t num_streams,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
         const MergeTreeData & data,
         const Names & real_column_names,
diff --git a/src/Processors/Sources/MySQLSource.cpp b/src/Processors/Sources/MySQLSource.cpp
index e868182f49b..ecc80bef40b 100644
--- a/src/Processors/Sources/MySQLSource.cpp
+++ b/src/Processors/Sources/MySQLSource.cpp
@@ -141,7 +141,7 @@ namespace
                 read_bytes_size += 2;
                 break;
             case ValueType::vtUInt32:
-                assert_cast<ColumnUInt32 &>(column).insertValue(value.getUInt());
+                assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(value.getUInt()));
                 read_bytes_size += 4;
                 break;
             case ValueType::vtUInt64:
@@ -171,7 +171,7 @@ namespace
                 read_bytes_size += 2;
                 break;
             case ValueType::vtInt32:
-                assert_cast<ColumnInt32 &>(column).insertValue(value.getInt());
+                assert_cast<ColumnInt32 &>(column).insertValue(static_cast<Int32>(value.getInt()));
                 read_bytes_size += 4;
                 break;
             case ValueType::vtInt64:
@@ -236,7 +236,7 @@ namespace
                 readDateTimeText(time, in, assert_cast<const DataTypeDateTime &>(data_type).getTimeZone());
                 if (time < 0)
                     time = 0;
-                assert_cast<ColumnUInt32 &>(column).insertValue(time);
+                assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(time));
                 read_bytes_size += 4;
                 break;
             }
diff --git a/src/Processors/Sources/SQLiteSource.cpp b/src/Processors/Sources/SQLiteSource.cpp
index d2c6f2ebb23..79c4be7f692 100644
--- a/src/Processors/Sources/SQLiteSource.cpp
+++ b/src/Processors/Sources/SQLiteSource.cpp
@@ -35,7 +35,11 @@ SQLiteSource::SQLiteSource(
     description.init(sample_block);
 
     sqlite3_stmt * compiled_stmt = nullptr;
-    int status = sqlite3_prepare_v2(sqlite_db.get(), query_str.c_str(), query_str.size() + 1, &compiled_stmt, nullptr);
+    int status = sqlite3_prepare_v2(
+        sqlite_db.get(),
+        query_str.c_str(),
+        static_cast<int>(query_str.size() + 1),
+        &compiled_stmt, nullptr);
 
     if (status != SQLITE_OK)
         throw Exception(ErrorCodes::SQLITE_ENGINE_ERROR,
@@ -109,7 +113,7 @@ Chunk SQLiteSource::generate()
     return Chunk(std::move(columns), num_rows);
 }
 
-void SQLiteSource::insertValue(IColumn & column, ExternalResultDescription::ValueType type, size_t idx)
+void SQLiteSource::insertValue(IColumn & column, ExternalResultDescription::ValueType type, int idx)
 {
     switch (type)
     {
@@ -120,7 +124,7 @@ void SQLiteSource::insertValue(IColumn & column, ExternalResultDescription::Valu
             assert_cast<ColumnUInt16 &>(column).insertValue(sqlite3_column_int(compiled_statement.get(), idx));
             break;
         case ValueType::vtUInt32:
-            assert_cast<ColumnUInt32 &>(column).insertValue(sqlite3_column_int64(compiled_statement.get(), idx));
+            assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(sqlite3_column_int64(compiled_statement.get(), idx)));
             break;
         case ValueType::vtUInt64:
             /// There is no uint64 in sqlite3, only int and int64
diff --git a/src/Processors/Sources/SQLiteSource.h b/src/Processors/Sources/SQLiteSource.h
index d792483c70f..c1bae4d8a67 100644
--- a/src/Processors/Sources/SQLiteSource.h
+++ b/src/Processors/Sources/SQLiteSource.h
@@ -33,7 +33,7 @@ private:
 
     Chunk generate() override;
 
-    void insertValue(IColumn & column, ExternalResultDescription::ValueType type, size_t idx);
+    void insertValue(IColumn & column, ExternalResultDescription::ValueType type, int idx);
 
     String query_str;
     UInt64 max_block_size;
diff --git a/src/Processors/Sources/ShellCommandSource.cpp b/src/Processors/Sources/ShellCommandSource.cpp
index 8598b0197fc..3f70abaea6d 100644
--- a/src/Processors/Sources/ShellCommandSource.cpp
+++ b/src/Processors/Sources/ShellCommandSource.cpp
@@ -77,7 +77,7 @@ static bool pollFd(int fd, size_t timeout_milliseconds, int events)
 
     while (true)
     {
-        res = poll(&pfd, 1, timeout_milliseconds);
+        res = poll(&pfd, 1, static_cast<int>(timeout_milliseconds));
 
         if (res < 0)
         {
@@ -527,7 +527,7 @@ Pipe ShellCommandSourceCoordinator::createPipe(
         }
         else
         {
-            auto descriptor = i + 2;
+            int descriptor = static_cast<int>(i) + 2;
             auto it = process->write_fds.find(descriptor);
             if (it == process->write_fds.end())
                 throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Process does not contain descriptor to write {}", descriptor);
diff --git a/src/Processors/TTL/ITTLAlgorithm.cpp b/src/Processors/TTL/ITTLAlgorithm.cpp
index 489941950b5..c71ad740719 100644
--- a/src/Processors/TTL/ITTLAlgorithm.cpp
+++ b/src/Processors/TTL/ITTLAlgorithm.cpp
@@ -48,13 +48,13 @@ ColumnPtr ITTLAlgorithm::executeExpressionAndGetColumn(
 UInt32 ITTLAlgorithm::getTimestampByIndex(const IColumn * column, size_t index) const
 {
     if (const ColumnUInt16 * column_date = typeid_cast<const ColumnUInt16 *>(column))
-        return date_lut.fromDayNum(DayNum(column_date->getData()[index]));
+        return static_cast<UInt32>(date_lut.fromDayNum(DayNum(column_date->getData()[index])));
     else if (const ColumnUInt32 * column_date_time = typeid_cast<const ColumnUInt32 *>(column))
         return column_date_time->getData()[index];
     else if (const ColumnConst * column_const = typeid_cast<const ColumnConst *>(column))
     {
         if (typeid_cast<const ColumnUInt16 *>(&column_const->getDataColumn()))
-            return date_lut.fromDayNum(DayNum(column_const->getValue<UInt16>()));
+            return static_cast<UInt32>(date_lut.fromDayNum(DayNum(column_const->getValue<UInt16>())));
         else if (typeid_cast<const ColumnUInt32 *>(&column_const->getDataColumn()))
             return column_const->getValue<UInt32>();
     }
diff --git a/src/Processors/Transforms/ArrayJoinTransform.cpp b/src/Processors/Transforms/ArrayJoinTransform.cpp
index 9058d7df2a0..eea1469c7a6 100644
--- a/src/Processors/Transforms/ArrayJoinTransform.cpp
+++ b/src/Processors/Transforms/ArrayJoinTransform.cpp
@@ -4,11 +4,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 Block ArrayJoinTransform::transformHeader(Block header, const ArrayJoinActionPtr & array_join)
 {
     array_join->execute(header);
diff --git a/src/Processors/Transforms/CountingTransform.h b/src/Processors/Transforms/CountingTransform.h
index bd2ec58a27f..05d8e2aeac8 100644
--- a/src/Processors/Transforms/CountingTransform.h
+++ b/src/Processors/Transforms/CountingTransform.h
@@ -9,6 +9,7 @@ namespace DB
 {
 
 class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
 class ThreadStatus;
 
 /// Proxy class which counts number of written block, rows, bytes
@@ -29,7 +30,7 @@ public:
         progress_callback = callback;
     }
 
-    void setProcessListElement(QueryStatus * elem)
+    void setProcessListElement(QueryStatusPtr elem)
     {
         process_elem = elem;
     }
@@ -50,7 +51,7 @@ public:
 protected:
     Progress progress;
     ProgressCallback progress_callback;
-    QueryStatus * process_elem = nullptr;
+    QueryStatusPtr process_elem;
     ThreadStatus * thread_status = nullptr;
 
     /// Quota is used to limit amount of written bytes.
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index 16abb72cbd4..78ae6b8771f 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -40,7 +40,9 @@ static FillColumnDescription::StepFunction getStepFunction(
     {
 #define DECLARE_CASE(NAME) \
         case IntervalKind::NAME: \
-            return [step, scale, &date_lut](Field & field) { field = Add##NAME##sImpl::execute(static_cast<T>(field.get<T>()), step, date_lut, scale); };
+            return [step, scale, &date_lut](Field & field) { \
+                field = Add##NAME##sImpl::execute(static_cast<T>(\
+                    field.get<T>()), static_cast<Int32>(step), date_lut, scale); };
 
         FOR_EACH_INTERVAL_KIND(DECLARE_CASE)
 #undef DECLARE_CASE
diff --git a/src/Processors/Transforms/MongoDBSource.cpp b/src/Processors/Transforms/MongoDBSource.cpp
index b548e8c4184..9eef17cf40d 100644
--- a/src/Processors/Transforms/MongoDBSource.cpp
+++ b/src/Processors/Transforms/MongoDBSource.cpp
@@ -184,7 +184,7 @@ namespace
                 break;
             case Poco::MongoDB::ElementTraits<Poco::Int64>::TypeId:
                 assert_cast<ColumnVector<T> &>(column).getData().push_back(
-                    static_cast<const Poco::MongoDB::ConcreteElement<Poco::Int64> &>(value).value());
+                    static_cast<T>(static_cast<const Poco::MongoDB::ConcreteElement<Poco::Int64> &>(value).value()));
                 break;
             case Poco::MongoDB::ElementTraits<Float64>::TypeId:
                 assert_cast<ColumnVector<T> &>(column).getData().push_back(static_cast<T>(
@@ -282,7 +282,7 @@ namespace
                                     ErrorCodes::TYPE_MISMATCH};
 
                 assert_cast<ColumnUInt32 &>(column).getData().push_back(
-                    static_cast<const Poco::MongoDB::ConcreteElement<Poco::Timestamp> &>(value).value().epochTime());
+                    static_cast<UInt32>(static_cast<const Poco::MongoDB::ConcreteElement<Poco::Timestamp> &>(value).value().epochTime()));
                 break;
             }
             case ValueType::vtUUID:
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 07bfb274a86..83b0b202d74 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -28,7 +28,6 @@ namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
     extern const int NOT_IMPLEMENTED;
-    extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -63,20 +62,21 @@ static int compareValuesWithOffset(const IColumn * _compared_column,
         _compared_column);
     const auto * reference_column = assert_cast<const ColumnType *>(
         _reference_column);
+
+    using ValueType = typename ColumnType::ValueType;
     // Note that the storage type of offset returned by get<> is different, so
     // we need to specify the type explicitly.
-    const typename ColumnType::ValueType offset
-            = _offset.get<typename ColumnType::ValueType>();
+    const ValueType offset = static_cast<ValueType>(_offset.get<ValueType>());
     assert(offset >= 0);
 
     const auto compared_value_data = compared_column->getDataAt(compared_row);
-    assert(compared_value_data.size == sizeof(typename ColumnType::ValueType));
-    auto compared_value = unalignedLoad<typename ColumnType::ValueType>(
+    assert(compared_value_data.size == sizeof(ValueType));
+    auto compared_value = unalignedLoad<ValueType>(
         compared_value_data.data);
 
     const auto reference_value_data = reference_column->getDataAt(reference_row);
-    assert(reference_value_data.size == sizeof(typename ColumnType::ValueType));
-    auto reference_value = unalignedLoad<typename ColumnType::ValueType>(
+    assert(reference_value_data.size == sizeof(ValueType));
+    auto reference_value = unalignedLoad<ValueType>(
         reference_value_data.data);
 
     bool is_overflow;
@@ -85,15 +85,6 @@ static int compareValuesWithOffset(const IColumn * _compared_column,
     else
         is_overflow = common::addOverflow(reference_value, offset, reference_value);
 
-//    fmt::print(stderr,
-//        "compared [{}] = {}, old ref {}, shifted ref [{}] = {}, offset {} preceding {} overflow {} to negative {}\n",
-//        compared_row, toString(compared_value),
-//        // fmt doesn't like char8_t.
-//        static_cast<Int64>(unalignedLoad<typename ColumnType::ValueType>(reference_value_data.data)),
-//        reference_row, toString(reference_value),
-//        toString(offset), offset_is_preceding,
-//        is_overflow, offset_is_preceding);
-
     if (is_overflow)
     {
         if (offset_is_preceding)
@@ -984,22 +975,9 @@ void WindowTransform::writeOutCurrentRow()
             // FIXME does it also allocate the result on the arena?
             // We'll have to pass it out with blocks then...
 
-            if (a->isState())
-            {
-                /// AggregateFunction's states should be inserted into column using specific way
-                auto * res_col_aggregate_function = typeid_cast<ColumnAggregateFunction *>(result_column);
-                if (!res_col_aggregate_function)
-                {
-                    throw Exception("State function " + a->getName() + " inserts results into non-state column ",
-                                    ErrorCodes::ILLEGAL_COLUMN);
-                }
-                res_col_aggregate_function->insertFrom(buf);
-            }
-            else
-            {
-                a->insertResultInto(buf, *result_column, arena.get());
-            }
-
+            /// We should use insertMergeResultInto to insert result into ColumnAggregateFunction
+            /// correctly if result contains AggregateFunction's states
+            a->insertMergeResultInto(buf, *result_column, arena.get());
         }
     }
 
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.cpp b/src/Processors/Transforms/buildPushingToViewsChain.cpp
index 174aaf67ec5..830f400faf2 100644
--- a/src/Processors/Transforms/buildPushingToViewsChain.cpp
+++ b/src/Processors/Transforms/buildPushingToViewsChain.cpp
@@ -620,9 +620,10 @@ void PushingToLiveViewSink::consume(Chunk chunk)
 {
     Progress local_progress(chunk.getNumRows(), chunk.bytes(), 0);
     StorageLiveView::writeIntoLiveView(live_view, getHeader().cloneWithColumns(chunk.detachColumns()), context);
-    auto * process = context->getProcessListElement();
-    if (process)
+
+    if (auto process = context->getProcessListElement())
         process->updateProgressIn(local_progress);
+
     ProfileEvents::increment(ProfileEvents::SelectedRows, local_progress.read_rows);
     ProfileEvents::increment(ProfileEvents::SelectedBytes, local_progress.read_bytes);
 }
@@ -643,9 +644,10 @@ void PushingToWindowViewSink::consume(Chunk chunk)
     Progress local_progress(chunk.getNumRows(), chunk.bytes(), 0);
     StorageWindowView::writeIntoWindowView(
         window_view, getHeader().cloneWithColumns(chunk.detachColumns()), context);
-    auto * process = context->getProcessListElement();
-    if (process)
+
+    if (auto process = context->getProcessListElement())
         process->updateProgressIn(local_progress);
+
     ProfileEvents::increment(ProfileEvents::SelectedRows, local_progress.read_rows);
     ProfileEvents::increment(ProfileEvents::SelectedBytes, local_progress.read_bytes);
 }
diff --git a/src/Processors/tests/gtest_exception_on_incorrect_pipeline.cpp b/src/Processors/tests/gtest_exception_on_incorrect_pipeline.cpp
index b137eaf0f47..40718bd968a 100644
--- a/src/Processors/tests/gtest_exception_on_incorrect_pipeline.cpp
+++ b/src/Processors/tests/gtest_exception_on_incorrect_pipeline.cpp
@@ -23,11 +23,11 @@ TEST(Processors, PortsConnected)
 
     connect(source->getPort(), sink->getPort());
 
-    Processors processors;
-    processors.emplace_back(std::move(source));
-    processors.emplace_back(std::move(sink));
+    auto processors = std::make_shared<Processors>();
+    processors->emplace_back(std::move(source));
+    processors->emplace_back(std::move(sink));
 
-    QueryStatus * element = nullptr;
+    QueryStatusPtr element;
     PipelineExecutor executor(processors, element);
     executor.execute(1);
 }
@@ -46,14 +46,14 @@ TEST(Processors, PortsNotConnected)
 
     /// connect(source->getPort(), sink->getPort());
 
-    Processors processors;
-    processors.emplace_back(std::move(source));
-    processors.emplace_back(std::move(sink));
+    auto processors = std::make_shared<Processors>();
+    processors->emplace_back(std::move(source));
+    processors->emplace_back(std::move(sink));
 
 #ifndef ABORT_ON_LOGICAL_ERROR
     try
     {
-        QueryStatus * element = nullptr;
+        QueryStatusPtr element;
         PipelineExecutor executor(processors, element);
         executor.execute(1);
         ASSERT_TRUE(false) << "Should have thrown.";
diff --git a/src/QueryPipeline/BlockIO.cpp b/src/QueryPipeline/BlockIO.cpp
index 35463ca6be9..9e42e06c722 100644
--- a/src/QueryPipeline/BlockIO.cpp
+++ b/src/QueryPipeline/BlockIO.cpp
@@ -53,9 +53,8 @@ void BlockIO::setAllDataSent() const
     /// - internal
     /// - SHOW PROCESSLIST
     if (process_list_entry)
-        (*process_list_entry)->setAllDataSent();
+        process_list_entry->getQueryStatus()->setAllDataSent();
 }
 
 
 }
-
diff --git a/src/QueryPipeline/BlockIO.h b/src/QueryPipeline/BlockIO.h
index 1f2a8f6f033..b69f86ac684 100644
--- a/src/QueryPipeline/BlockIO.h
+++ b/src/QueryPipeline/BlockIO.h
@@ -34,9 +34,8 @@ struct BlockIO
     void onFinish()
     {
         if (finish_callback)
-        {
             finish_callback(pipeline);
-        }
+
         pipeline.reset();
     }
 
diff --git a/src/QueryPipeline/Pipe.cpp b/src/QueryPipeline/Pipe.cpp
index 291739079a2..62a928d814c 100644
--- a/src/QueryPipeline/Pipe.cpp
+++ b/src/QueryPipeline/Pipe.cpp
@@ -102,7 +102,12 @@ static OutputPort * uniteTotals(const OutputPortRawPtrs & ports, const Block & h
     return totals_port;
 }
 
+Pipe::Pipe() : processors(std::make_shared<Processors>())
+{
+}
+
 Pipe::Pipe(ProcessorPtr source, OutputPort * output, OutputPort * totals, OutputPort * extremes)
+    : processors(std::make_shared<Processors>())
 {
     if (!source->getInputs().empty())
         throw Exception(
@@ -155,11 +160,12 @@ Pipe::Pipe(ProcessorPtr source, OutputPort * output, OutputPort * totals, Output
     totals_port = totals;
     extremes_port = extremes;
     output_ports.push_back(output);
-    processors.emplace_back(std::move(source));
+    processors->emplace_back(std::move(source));
     max_parallel_streams = 1;
 }
 
 Pipe::Pipe(ProcessorPtr source)
+    : processors(std::make_shared<Processors>())
 {
     checkSource(*source);
 
@@ -168,18 +174,18 @@ Pipe::Pipe(ProcessorPtr source)
 
     output_ports.push_back(&source->getOutputs().front());
     header = output_ports.front()->getHeader();
-    processors.emplace_back(std::move(source));
+    processors->emplace_back(std::move(source));
     max_parallel_streams = 1;
 }
 
-Pipe::Pipe(Processors processors_) : processors(std::move(processors_))
+Pipe::Pipe(std::shared_ptr<Processors> processors_) : processors(std::move(processors_))
 {
     /// Create hash table with processors.
     std::unordered_set<const IProcessor *> set;
-    for (const auto & processor : processors)
+    for (const auto & processor : *processors)
         set.emplace(processor.get());
 
-    for (auto & processor : processors)
+    for (auto & processor : *processors)
     {
         for (const auto & port : processor->getInputs())
         {
@@ -225,7 +231,7 @@ Pipe::Pipe(Processors processors_) : processors(std::move(processors_))
     max_parallel_streams = output_ports.size();
 
     if (collected_processors)
-        for (const auto & processor : processors)
+        for (const auto & processor : *processors)
             collected_processors->emplace_back(processor);
 }
 
@@ -311,7 +317,7 @@ Pipe Pipe::unitePipes(Pipes pipes, Processors * collected_processors, bool allow
         if (!allow_empty_header || pipe.header)
             assertCompatibleHeader(pipe.header, res.header, "Pipe::unitePipes");
 
-        res.processors.insert(res.processors.end(), pipe.processors.begin(), pipe.processors.end());
+        res.processors->insert(res.processors->end(), pipe.processors->begin(), pipe.processors->end());
         res.output_ports.insert(res.output_ports.end(), pipe.output_ports.begin(), pipe.output_ports.end());
 
         res.max_parallel_streams += pipe.max_parallel_streams;
@@ -323,15 +329,15 @@ Pipe Pipe::unitePipes(Pipes pipes, Processors * collected_processors, bool allow
             extremes.emplace_back(pipe.extremes_port);
     }
 
-    size_t num_processors = res.processors.size();
+    size_t num_processors = res.processors->size();
 
-    res.totals_port = uniteTotals(totals, res.header, res.processors);
-    res.extremes_port = uniteExtremes(extremes, res.header, res.processors);
+    res.totals_port = uniteTotals(totals, res.header, *res.processors);
+    res.extremes_port = uniteExtremes(extremes, res.header, *res.processors);
 
     if (res.collected_processors)
     {
-        for (; num_processors < res.processors.size(); ++num_processors)
-            res.collected_processors->emplace_back(res.processors[num_processors]);
+        for (; num_processors < res.processors->size(); ++num_processors)
+            res.collected_processors->emplace_back(res.processors->at(num_processors));
     }
 
     return res;
@@ -351,7 +357,7 @@ void Pipe::addSource(ProcessorPtr source)
         collected_processors->emplace_back(source);
 
     output_ports.push_back(&source->getOutputs().front());
-    processors.emplace_back(std::move(source));
+    processors->emplace_back(std::move(source));
 
     max_parallel_streams = std::max<size_t>(max_parallel_streams, output_ports.size());
 }
@@ -373,7 +379,7 @@ void Pipe::addTotalsSource(ProcessorPtr source)
         collected_processors->emplace_back(source);
 
     totals_port = &source->getOutputs().front();
-    processors.emplace_back(std::move(source));
+    processors->emplace_back(std::move(source));
 }
 
 void Pipe::addExtremesSource(ProcessorPtr source)
@@ -393,7 +399,7 @@ void Pipe::addExtremesSource(ProcessorPtr source)
         collected_processors->emplace_back(source);
 
     extremes_port = &source->getOutputs().front();
-    processors.emplace_back(std::move(source));
+    processors->emplace_back(std::move(source));
 }
 
 static void dropPort(OutputPort *& port, Processors & processors, Processors * collected_processors)
@@ -413,12 +419,12 @@ static void dropPort(OutputPort *& port, Processors & processors, Processors * c
 
 void Pipe::dropTotals()
 {
-    dropPort(totals_port, processors, collected_processors);
+    dropPort(totals_port, *processors, collected_processors);
 }
 
 void Pipe::dropExtremes()
 {
-    dropPort(extremes_port, processors, collected_processors);
+    dropPort(extremes_port, *processors, collected_processors);
 }
 
 void Pipe::addTransform(ProcessorPtr transform)
@@ -504,7 +510,7 @@ void Pipe::addTransform(ProcessorPtr transform, OutputPort * totals, OutputPort
     if (collected_processors)
         collected_processors->emplace_back(transform);
 
-    processors.emplace_back(std::move(transform));
+    processors->emplace_back(std::move(transform));
 
     max_parallel_streams = std::max<size_t>(max_parallel_streams, output_ports.size());
 }
@@ -595,7 +601,7 @@ void Pipe::addTransform(ProcessorPtr transform, InputPort * totals, InputPort *
     if (collected_processors)
         collected_processors->emplace_back(transform);
 
-    processors.emplace_back(std::move(transform));
+    processors->emplace_back(std::move(transform));
 
     max_parallel_streams = std::max<size_t>(max_parallel_streams, output_ports.size());
 }
@@ -647,7 +653,7 @@ void Pipe::addSimpleTransform(const ProcessorGetterWithStreamKind & getter)
             if (collected_processors)
                 collected_processors->emplace_back(transform);
 
-            processors.emplace_back(std::move(transform));
+            processors->emplace_back(std::move(transform));
         }
     };
 
@@ -698,7 +704,7 @@ void Pipe::addChains(std::vector<Chain> chains)
             if (collected_processors)
                 collected_processors->emplace_back(transform);
 
-            processors.emplace_back(std::move(transform));
+            processors->emplace_back(std::move(transform));
         }
     }
 
@@ -757,7 +763,7 @@ void Pipe::setSinks(const Pipe::ProcessorGetterWithStreamKind & getter)
             transform = std::make_shared<NullSink>(stream->getHeader());
 
         connect(*stream, transform->getInputs().front());
-        processors.emplace_back(std::move(transform));
+        processors->emplace_back(std::move(transform));
     };
 
     for (auto & port : output_ports)
@@ -858,7 +864,7 @@ void Pipe::transform(const Transformer & transformer, bool check_ports)
             collected_processors->emplace_back(processor);
     }
 
-    processors.insert(processors.end(), new_processors.begin(), new_processors.end());
+    processors->insert(processors->end(), new_processors.begin(), new_processors.end());
 
     max_parallel_streams = std::max<size_t>(max_parallel_streams, output_ports.size());
 }
diff --git a/src/QueryPipeline/Pipe.h b/src/QueryPipeline/Pipe.h
index 79d19a18193..7e30d9c990e 100644
--- a/src/QueryPipeline/Pipe.h
+++ b/src/QueryPipeline/Pipe.h
@@ -5,6 +5,7 @@
 #include <QueryPipeline/Chain.h>
 #include <QueryPipeline/SizeLimits.h>
 
+
 namespace DB
 {
 
@@ -27,13 +28,13 @@ class Pipe
 public:
     /// Default constructor creates empty pipe. Generally, you cannot do anything with it except to check it is empty().
     /// You cannot get empty pipe in any other way. All transforms check that result pipe is not empty.
-    Pipe() = default;
+    Pipe();
     /// Create from source. Source must have no input ports and single output.
     explicit Pipe(ProcessorPtr source);
     /// Create from source with specified totals end extremes (may be nullptr). Ports should be owned by source.
     explicit Pipe(ProcessorPtr source, OutputPort * output, OutputPort * totals, OutputPort * extremes);
     /// Create from processors. Use all not-connected output ports as output_ports. Check invariants.
-    explicit Pipe(Processors processors_);
+    explicit Pipe(std::shared_ptr<Processors> processors_);
 
     Pipe(const Pipe & other) = delete;
     Pipe(Pipe && other) = default;
@@ -41,7 +42,7 @@ public:
     Pipe & operator=(Pipe && other) = default;
 
     const Block & getHeader() const { return header; }
-    bool empty() const { return processors.empty(); }
+    bool empty() const { return processors->empty(); }
     size_t numOutputPorts() const { return output_ports.size(); }
     size_t maxParallelStreams() const { return max_parallel_streams; }
     OutputPort * getOutputPort(size_t pos) const { return output_ports[pos]; }
@@ -96,15 +97,15 @@ public:
     /// Unite several pipes together. They should have same header.
     static Pipe unitePipes(Pipes pipes);
 
-    /// Get processors from Pipe. Use it with cautious, it is easy to loss totals and extremes ports.
-    static Processors detachProcessors(Pipe pipe) { return std::move(pipe.processors); }
+    /// Get processors from Pipe. Use it with caution, it is easy to lose totals and extremes ports.
+    static Processors detachProcessors(Pipe pipe) { return *std::move(pipe.processors); }
     /// Get processors from Pipe without destroying pipe (used for EXPLAIN to keep QueryPlan).
-    const Processors & getProcessors() const { return processors; }
+    const Processors & getProcessors() const { return *processors; }
 
 private:
     /// Header is common for all output below.
     Block header;
-    Processors processors;
+    std::shared_ptr<Processors> processors;
 
     /// Output ports. Totals and extremes are allowed to be empty.
     OutputPortRawPtrs output_ports;
diff --git a/src/QueryPipeline/PipelineResourcesHolder.h b/src/QueryPipeline/PipelineResourcesHolder.h
index 46b1024f384..ed9eb68b7ba 100644
--- a/src/QueryPipeline/PipelineResourcesHolder.h
+++ b/src/QueryPipeline/PipelineResourcesHolder.h
@@ -19,8 +19,9 @@ struct QueryPlanResourceHolder
     QueryPlanResourceHolder();
     QueryPlanResourceHolder(QueryPlanResourceHolder &&) noexcept;
     ~QueryPlanResourceHolder();
+
     /// Custom move assignment does not destroy data from lhs. It appends data from rhs to lhs.
-    QueryPlanResourceHolder& operator=(QueryPlanResourceHolder &&) noexcept;
+    QueryPlanResourceHolder & operator=(QueryPlanResourceHolder &&) noexcept;
 
     /// Some processors may implicitly use Context or temporary Storage created by Interpreter.
     /// But lifetime of Streams is not nested in lifetime of Interpreters, so we have to store it here,
diff --git a/src/QueryPipeline/QueryPipeline.cpp b/src/QueryPipeline/QueryPipeline.cpp
index 31b18c7f7f0..e0da4c4f0eb 100644
--- a/src/QueryPipeline/QueryPipeline.cpp
+++ b/src/QueryPipeline/QueryPipeline.cpp
@@ -21,6 +21,7 @@
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 
+
 namespace DB
 {
 
@@ -29,7 +30,11 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-QueryPipeline::QueryPipeline() = default;
+QueryPipeline::QueryPipeline()
+    : processors(std::make_shared<Processors>())
+{
+}
+
 QueryPipeline::QueryPipeline(QueryPipeline &&) noexcept = default;
 QueryPipeline & QueryPipeline::operator=(QueryPipeline &&) noexcept = default;
 QueryPipeline::~QueryPipeline() = default;
@@ -210,16 +215,16 @@ static void initRowsBeforeLimit(IOutputFormat * output_format)
 
 QueryPipeline::QueryPipeline(
     QueryPlanResourceHolder resources_,
-    Processors processors_)
+    std::shared_ptr<Processors> processors_)
     : resources(std::move(resources_))
     , processors(std::move(processors_))
 {
-    checkCompleted(processors);
+    checkCompleted(*processors);
 }
 
 QueryPipeline::QueryPipeline(
     QueryPlanResourceHolder resources_,
-    Processors processors_,
+    std::shared_ptr<Processors> processors_,
     InputPort * input_)
     : resources(std::move(resources_))
     , processors(std::move(processors_))
@@ -231,7 +236,7 @@ QueryPipeline::QueryPipeline(
             "Cannot create pushing QueryPipeline because its input port is connected or null");
 
     bool found_input = false;
-    for (const auto & processor : processors)
+    for (const auto & processor : *processors)
     {
         for (const auto & in : processor->getInputs())
         {
@@ -255,7 +260,7 @@ QueryPipeline::QueryPipeline(std::shared_ptr<ISource> source) : QueryPipeline(Pi
 
 QueryPipeline::QueryPipeline(
     QueryPlanResourceHolder resources_,
-    Processors processors_,
+    std::shared_ptr<Processors> processors_,
     OutputPort * output_,
     OutputPort * totals_,
     OutputPort * extremes_)
@@ -265,7 +270,7 @@ QueryPipeline::QueryPipeline(
     , totals(totals_)
     , extremes(extremes_)
 {
-    checkPulling(processors, output, totals, extremes);
+    checkPulling(*processors, output, totals, extremes);
 }
 
 QueryPipeline::QueryPipeline(Pipe pipe)
@@ -278,32 +283,34 @@ QueryPipeline::QueryPipeline(Pipe pipe)
         extremes = pipe.getExtremesPort();
 
         processors = std::move(pipe.processors);
-        checkPulling(processors, output, totals, extremes);
+        checkPulling(*processors, output, totals, extremes);
     }
     else
     {
         processors = std::move(pipe.processors);
-        checkCompleted(processors);
+        checkCompleted(*processors);
     }
 }
 
 QueryPipeline::QueryPipeline(Chain chain)
     : resources(chain.detachResources())
+    , processors(std::make_shared<Processors>())
     , input(&chain.getInputPort())
     , num_threads(chain.getNumThreads())
 {
-    processors.reserve(chain.getProcessors().size() + 1);
+    processors->reserve(chain.getProcessors().size() + 1);
     for (auto processor : chain.getProcessors())
-        processors.emplace_back(std::move(processor));
+        processors->emplace_back(std::move(processor));
 
     auto sink = std::make_shared<EmptySink>(chain.getOutputPort().getHeader());
     connect(chain.getOutputPort(), sink->getPort());
-    processors.emplace_back(std::move(sink));
+    processors->emplace_back(std::move(sink));
 
     input = &chain.getInputPort();
 }
 
 QueryPipeline::QueryPipeline(std::shared_ptr<IOutputFormat> format)
+    : processors(std::make_shared<Processors>())
 {
     auto & format_main = format->getPort(IOutputFormat::PortKind::Main);
     auto & format_totals = format->getPort(IOutputFormat::PortKind::Totals);
@@ -313,14 +320,14 @@ QueryPipeline::QueryPipeline(std::shared_ptr<IOutputFormat> format)
     {
         auto source = std::make_shared<NullSource>(format_totals.getHeader());
         totals = &source->getPort();
-        processors.emplace_back(std::move(source));
+        processors->emplace_back(std::move(source));
     }
 
     if (!extremes)
     {
         auto source = std::make_shared<NullSource>(format_extremes.getHeader());
         extremes = &source->getPort();
-        processors.emplace_back(std::move(source));
+        processors->emplace_back(std::move(source));
     }
 
     connect(*totals, format_totals);
@@ -332,7 +339,7 @@ QueryPipeline::QueryPipeline(std::shared_ptr<IOutputFormat> format)
 
     output_format = format.get();
 
-    processors.emplace_back(std::move(format));
+    processors->emplace_back(std::move(format));
 }
 
 static void drop(OutputPort *& port, Processors & processors)
@@ -354,11 +361,11 @@ void QueryPipeline::complete(std::shared_ptr<ISink> sink)
     if (!pulling())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline must be pulling to be completed with sink");
 
-    drop(totals, processors);
-    drop(extremes, processors);
+    drop(totals, *processors);
+    drop(extremes, *processors);
 
     connect(*output, sink->getPort());
-    processors.emplace_back(std::move(sink));
+    processors->emplace_back(std::move(sink));
     output = nullptr;
 }
 
@@ -369,17 +376,17 @@ void QueryPipeline::complete(Chain chain)
 
     resources = chain.detachResources();
 
-    drop(totals, processors);
-    drop(extremes, processors);
+    drop(totals, *processors);
+    drop(extremes, *processors);
 
-    processors.reserve(processors.size() + chain.getProcessors().size() + 1);
+    processors->reserve(processors->size() + chain.getProcessors().size() + 1);
     for (auto processor : chain.getProcessors())
-        processors.emplace_back(std::move(processor));
+        processors->emplace_back(std::move(processor));
 
     auto sink = std::make_shared<EmptySink>(chain.getOutputPort().getHeader());
     connect(*output, chain.getInputPort());
     connect(chain.getOutputPort(), sink->getPort());
-    processors.emplace_back(std::move(sink));
+    processors->emplace_back(std::move(sink));
     output = nullptr;
 }
 
@@ -400,7 +407,7 @@ void QueryPipeline::complete(Pipe pipe)
     input = nullptr;
 
     auto pipe_processors = Pipe::detachProcessors(std::move(pipe));
-    processors.insert(processors.end(), pipe_processors.begin(), pipe_processors.end());
+    processors->insert(processors->end(), pipe_processors.begin(), pipe_processors.end());
 }
 
 static void addMaterializing(OutputPort *& output, Processors & processors)
@@ -421,9 +428,9 @@ void QueryPipeline::complete(std::shared_ptr<IOutputFormat> format)
 
     if (format->expectMaterializedColumns())
     {
-        addMaterializing(output, processors);
-        addMaterializing(totals, processors);
-        addMaterializing(extremes, processors);
+        addMaterializing(output, *processors);
+        addMaterializing(totals, *processors);
+        addMaterializing(extremes, *processors);
     }
 
     auto & format_main = format->getPort(IOutputFormat::PortKind::Main);
@@ -434,14 +441,14 @@ void QueryPipeline::complete(std::shared_ptr<IOutputFormat> format)
     {
         auto source = std::make_shared<NullSource>(format_totals.getHeader());
         totals = &source->getPort();
-        processors.emplace_back(std::move(source));
+        processors->emplace_back(std::move(source));
     }
 
     if (!extremes)
     {
         auto source = std::make_shared<NullSource>(format_extremes.getHeader());
         extremes = &source->getPort();
-        processors.emplace_back(std::move(source));
+        processors->emplace_back(std::move(source));
     }
 
     connect(*output, format_main);
@@ -455,7 +462,7 @@ void QueryPipeline::complete(std::shared_ptr<IOutputFormat> format)
     initRowsBeforeLimit(format.get());
     output_format = format.get();
 
-    processors.emplace_back(std::move(format));
+    processors->emplace_back(std::move(format));
 }
 
 Block QueryPipeline::getHeader() const
@@ -475,7 +482,7 @@ void QueryPipeline::setProgressCallback(const ProgressCallback & callback)
     progress_callback = callback;
 }
 
-void QueryPipeline::setProcessListElement(QueryStatus * elem)
+void QueryPipeline::setProcessListElement(QueryStatusPtr elem)
 {
     process_list_element = elem;
 
@@ -504,7 +511,7 @@ void QueryPipeline::setLimitsAndQuota(const StreamLocalLimits & limits, std::sha
     transform->setQuota(quota_);
     connect(*output, transform->getInputPort());
     output = &transform->getOutputPort();
-    processors.emplace_back(std::move(transform));
+    processors->emplace_back(std::move(transform));
 }
 
 
@@ -529,7 +536,7 @@ void QueryPipeline::addCompletedPipeline(QueryPipeline other)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot add not completed pipeline");
 
     resources = std::move(other.resources);
-    processors.insert(processors.end(), other.processors.begin(), other.processors.end());
+    processors->insert(processors->end(), other.processors->begin(), other.processors->end());
 }
 
 void QueryPipeline::reset()
@@ -560,9 +567,9 @@ void QueryPipeline::convertStructureTo(const ColumnsWithTypeAndName & columns)
         ActionsDAG::MatchColumnsMode::Position);
 
     auto actions = std::make_shared<ExpressionActions>(std::move(converting));
-    addExpression(output, actions, processors);
-    addExpression(totals, actions, processors);
-    addExpression(extremes, actions, processors);
+    addExpression(output, actions, *processors);
+    addExpression(totals, actions, *processors);
+    addExpression(extremes, actions, *processors);
 }
 
 std::unique_ptr<ReadProgressCallback> QueryPipeline::getReadProgressCallback() const
diff --git a/src/QueryPipeline/QueryPipeline.h b/src/QueryPipeline/QueryPipeline.h
index 1b88ede3349..63f444e6ec1 100644
--- a/src/QueryPipeline/QueryPipeline.h
+++ b/src/QueryPipeline/QueryPipeline.h
@@ -4,6 +4,7 @@
 #include <QueryPipeline/StreamLocalLimits.h>
 #include <functional>
 
+
 namespace DB
 {
 
@@ -15,6 +16,7 @@ using ProcessorPtr = std::shared_ptr<IProcessor>;
 using Processors = std::vector<ProcessorPtr>;
 
 class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
 
 struct Progress;
 using ProgressCallback = std::function<void(const Progress & progress)>;
@@ -34,6 +36,7 @@ class ReadProgressCallback;
 struct ColumnWithTypeAndName;
 using ColumnsWithTypeAndName = std::vector<ColumnWithTypeAndName>;
 
+
 class QueryPipeline
 {
 public:
@@ -58,23 +61,23 @@ public:
     /// completed
     QueryPipeline(
         QueryPlanResourceHolder resources_,
-        Processors processors_);
+        std::shared_ptr<Processors> processors_);
 
     /// pushing
     QueryPipeline(
         QueryPlanResourceHolder resources_,
-        Processors processors_,
+        std::shared_ptr<Processors> processors_,
         InputPort * input_);
 
     /// pulling
     QueryPipeline(
         QueryPlanResourceHolder resources_,
-        Processors processors_,
+        std::shared_ptr<Processors> processors_,
         OutputPort * output_,
         OutputPort * totals_ = nullptr,
         OutputPort * extremes_ = nullptr);
 
-    bool initialized() const { return !processors.empty(); }
+    bool initialized() const { return !processors->empty(); }
     /// When initialized, exactly one of the following is true.
     /// Use PullingPipelineExecutor or PullingAsyncPipelineExecutor.
     bool pulling() const { return output != nullptr; }
@@ -97,7 +100,7 @@ public:
     size_t getNumThreads() const { return num_threads; }
     void setNumThreads(size_t num_threads_) { num_threads = num_threads_; }
 
-    void setProcessListElement(QueryStatus * elem);
+    void setProcessListElement(QueryStatusPtr elem);
     void setProgressCallback(const ProgressCallback & callback);
     void setLimitsAndQuota(const StreamLocalLimits & limits, std::shared_ptr<const EnabledQuota> quota_);
     bool tryGetResultRowsAndBytes(UInt64 & result_rows, UInt64 & result_bytes) const;
@@ -119,7 +122,7 @@ public:
     /// Add processors and resources from other pipeline. Other pipeline should be completed.
     void addCompletedPipeline(QueryPipeline other);
 
-    const Processors & getProcessors() const { return processors; }
+    const Processors & getProcessors() const { return *processors; }
 
     /// For pulling pipeline, convert structure to expected.
     /// Trash, need to remove later.
@@ -134,7 +137,7 @@ private:
     std::shared_ptr<const EnabledQuota> quota;
     bool update_profile_events = true;
 
-    Processors processors;
+    std::shared_ptr<Processors> processors;
 
     InputPort * input = nullptr;
 
@@ -142,7 +145,7 @@ private:
     OutputPort * totals = nullptr;
     OutputPort * extremes = nullptr;
 
-    QueryStatus * process_list_element = nullptr;
+    QueryStatusPtr process_list_element;
 
     IOutputFormat * output_format = nullptr;
 
diff --git a/src/QueryPipeline/QueryPipelineBuilder.cpp b/src/QueryPipeline/QueryPipelineBuilder.cpp
index 440f123e876..812bd155b42 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.cpp
+++ b/src/QueryPipeline/QueryPipelineBuilder.cpp
@@ -327,9 +327,9 @@ QueryPipelineBuilderPtr QueryPipelineBuilder::mergePipelines(
         collected_processors->emplace_back(transform);
 
     left->pipe.output_ports.front() = &transform->getOutputs().front();
-    left->pipe.processors.emplace_back(transform);
+    left->pipe.processors->emplace_back(transform);
 
-    left->pipe.processors.insert(left->pipe.processors.end(), right->pipe.processors.begin(), right->pipe.processors.end());
+    left->pipe.processors->insert(left->pipe.processors->end(), right->pipe.processors->begin(), right->pipe.processors->end());
     left->pipe.header = left->pipe.output_ports.front()->getHeader();
     left->pipe.max_parallel_streams = std::max(left->pipe.max_parallel_streams, right->pipe.max_parallel_streams);
     return left;
@@ -383,7 +383,7 @@ std::unique_ptr<QueryPipelineBuilder> QueryPipelineBuilder::joinPipelinesRightLe
     /// Collect the NEW processors for the right pipeline.
     QueryPipelineProcessorsCollector collector(*right);
     /// Remember the last step of the right pipeline.
-    ExpressionStep* step = typeid_cast<ExpressionStep*>(right->pipe.processors.back()->getQueryPlanStep());
+    ExpressionStep* step = typeid_cast<ExpressionStep*>(right->pipe.processors->back()->getQueryPlanStep());
     if (!step)
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR, "The top step of the right pipeline should be ExpressionStep");
@@ -467,7 +467,7 @@ std::unique_ptr<QueryPipelineBuilder> QueryPipelineBuilder::joinPipelinesRightLe
         if (collected_processors)
             collected_processors->emplace_back(joining);
 
-        left->pipe.processors.emplace_back(std::move(joining));
+        left->pipe.processors->emplace_back(std::move(joining));
     }
 
     if (left->hasTotals())
@@ -482,14 +482,14 @@ std::unique_ptr<QueryPipelineBuilder> QueryPipelineBuilder::joinPipelinesRightLe
         if (collected_processors)
             collected_processors->emplace_back(joining);
 
-        left->pipe.processors.emplace_back(std::move(joining));
+        left->pipe.processors->emplace_back(std::move(joining));
     }
 
     /// Move the collected processors to the last step in the right pipeline.
     Processors processors = collector.detachProcessors();
     step->appendExtraProcessors(processors);
 
-    left->pipe.processors.insert(left->pipe.processors.end(), right->pipe.processors.begin(), right->pipe.processors.end());
+    left->pipe.processors->insert(left->pipe.processors->end(), right->pipe.processors->begin(), right->pipe.processors->end());
     left->resources = std::move(right->resources);
     left->pipe.header = left->pipe.output_ports.front()->getHeader();
     left->pipe.max_parallel_streams = std::max(left->pipe.max_parallel_streams, right->pipe.max_parallel_streams);
@@ -537,7 +537,7 @@ void QueryPipelineBuilder::addPipelineBefore(QueryPipelineBuilder pipeline)
     addTransform(std::move(processor));
 }
 
-void QueryPipelineBuilder::setProcessListElement(QueryStatus * elem)
+void QueryPipelineBuilder::setProcessListElement(QueryStatusPtr elem)
 {
     process_list_element = elem;
 }
diff --git a/src/QueryPipeline/QueryPipelineBuilder.h b/src/QueryPipeline/QueryPipelineBuilder.h
index 13b4d681b7d..5a0694100eb 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.h
+++ b/src/QueryPipeline/QueryPipelineBuilder.h
@@ -148,7 +148,7 @@ public:
 
     const Block & getHeader() const { return pipe.getHeader(); }
 
-    void setProcessListElement(QueryStatus * elem);
+    void setProcessListElement(QueryStatusPtr elem);
     void setProgressCallback(ProgressCallback callback);
 
     /// Recommend number of threads for pipeline execution.
@@ -189,7 +189,7 @@ private:
     /// Sometimes, more streams are created then the number of threads for more optimal execution.
     size_t max_threads = 0;
 
-    QueryStatus * process_list_element = nullptr;
+    QueryStatusPtr process_list_element;
     ProgressCallback progress_callback = nullptr;
 
     void checkInitialized();
diff --git a/src/QueryPipeline/ReadProgressCallback.cpp b/src/QueryPipeline/ReadProgressCallback.cpp
index bbdabb8e8d8..6692b0f96bd 100644
--- a/src/QueryPipeline/ReadProgressCallback.cpp
+++ b/src/QueryPipeline/ReadProgressCallback.cpp
@@ -2,6 +2,7 @@
 #include <Interpreters/ProcessList.h>
 #include <Access/EnabledQuota.h>
 
+
 namespace ProfileEvents
 {
     extern const Event SelectedRows;
@@ -17,7 +18,7 @@ namespace ErrorCodes
     extern const int TOO_MANY_BYTES;
 }
 
-void ReadProgressCallback::setProcessListElement(QueryStatus * elem)
+void ReadProgressCallback::setProcessListElement(QueryStatusPtr elem)
 {
     process_list_elem = elem;
     if (!elem)
diff --git a/src/QueryPipeline/ReadProgressCallback.h b/src/QueryPipeline/ReadProgressCallback.h
index f64123ef39d..c8f0d4cf537 100644
--- a/src/QueryPipeline/ReadProgressCallback.h
+++ b/src/QueryPipeline/ReadProgressCallback.h
@@ -4,20 +4,23 @@
 #include <IO/Progress.h>
 #include <mutex>
 
+
 namespace DB
 {
 
 class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
 class EnabledQuota;
 
 struct StorageLimits;
 using StorageLimitsList = std::list<StorageLimits>;
 
+
 class ReadProgressCallback
 {
 public:
     void setQuota(const std::shared_ptr<const EnabledQuota> & quota_) { quota = quota_; }
-    void setProcessListElement(QueryStatus * elem);
+    void setProcessListElement(QueryStatusPtr elem);
     void setProgressCallback(const ProgressCallback & callback) { progress_callback = callback; }
     void addTotalRowsApprox(size_t value) { total_rows_approx += value; }
 
@@ -30,7 +33,7 @@ public:
 private:
     std::shared_ptr<const EnabledQuota> quota;
     ProgressCallback progress_callback;
-    QueryStatus * process_list_elem = nullptr;
+    QueryStatusPtr process_list_elem;
 
     /// The approximate total number of rows to read. For progress bar.
     std::atomic_size_t total_rows_approx = 0;
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
index 43bb5fc7083..4596bbb8961 100644
--- a/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
@@ -126,12 +126,12 @@ bool RemoteQueryExecutorReadContext::checkTimeoutImpl(bool blocking)
     epoll_event events[3];
     events[0].data.fd = events[1].data.fd = events[2].data.fd = -1;
 
-    int num_events = epoll.getManyReady(3, events, blocking);
+    size_t num_events = epoll.getManyReady(3, events, blocking);
 
     bool is_socket_ready = false;
     bool is_pipe_alarmed = false;
 
-    for (int i = 0; i < num_events; ++i)
+    for (size_t i = 0; i < num_events; ++i)
     {
         if (events[i].data.fd == connection_fd)
             is_socket_ready = true;
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index a2a2db75d68..a9373555af7 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -1082,7 +1082,8 @@ namespace
                     NamesAndTypesList columns;
                     for (size_t column_idx : collections::range(external_table.columns_size()))
                     {
-                        const auto & name_and_type = external_table.columns(column_idx);
+                        /// TODO: consider changing protocol
+                        const auto & name_and_type = external_table.columns(static_cast<int>(column_idx));
                         NameAndTypePair column;
                         column.name = name_and_type.name();
                         if (column.name.empty())
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
index c8ae9c6e07c..c8015cfd185 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
@@ -136,7 +136,7 @@ void WriteBufferFromHTTPServerResponse::nextImpl()
 WriteBufferFromHTTPServerResponse::WriteBufferFromHTTPServerResponse(
     HTTPServerResponse & response_,
     bool is_http_method_head_,
-    unsigned keep_alive_timeout_,
+    size_t keep_alive_timeout_,
     bool compress_,
     CompressionMethod compression_method_)
     : BufferWithOwnMemory<WriteBuffer>(DBMS_DEFAULT_BUFFER_SIZE)
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
index 6905d5df8b5..ce677616755 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
@@ -36,7 +36,7 @@ public:
     WriteBufferFromHTTPServerResponse(
         HTTPServerResponse & response_,
         bool is_http_method_head_,
-        unsigned keep_alive_timeout_,
+        size_t keep_alive_timeout_,
         bool compress_ = false,        /// If true - set Content-Encoding header and compress the result.
         CompressionMethod compression_method_ = CompressionMethod::None);
 
@@ -105,7 +105,7 @@ private:
 
     bool is_http_method_head;
     bool add_cors_header = false;
-    unsigned keep_alive_timeout = 0;
+    size_t keep_alive_timeout = 0;
     bool compress = false;
     CompressionMethod compression_method;
     int compression_level = 1;
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index d02da92c613..2b63524fb79 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -622,8 +622,10 @@ void HTTPHandler::processQuery(
 
     /// Request body can be compressed using algorithm specified in the Content-Encoding header.
     String http_request_compression_method_str = request.get("Content-Encoding", "");
+    int zstd_window_log_max = static_cast<int>(context->getSettingsRef().zstd_window_log_max);
     auto in_post = wrapReadBufferWithCompressionMethod(
-        wrapReadBufferReference(request.getStream()), chooseCompressionMethod({}, http_request_compression_method_str), context->getSettingsRef().zstd_window_log_max);
+        wrapReadBufferReference(request.getStream()),
+        chooseCompressionMethod({}, http_request_compression_method_str), zstd_window_log_max);
 
     /// The data can also be compressed using incompatible internal algorithm. This is indicated by
     /// 'decompress' query parameter.
@@ -749,7 +751,7 @@ void HTTPHandler::processQuery(
     /// (using Accept-Encoding header) and 'enable_http_compression' setting is turned on.
     used_output.out->setCompression(client_supports_http_compression && settings.enable_http_compression);
     if (client_supports_http_compression)
-        used_output.out->setCompressionLevel(settings.http_zlib_compression_level);
+        used_output.out->setCompressionLevel(static_cast<int>(settings.http_zlib_compression_level));
 
     used_output.out->setSendProgress(settings.send_progress_in_http_headers);
     used_output.out->setSendProgressInterval(settings.http_headers_progress_interval_ms);
diff --git a/src/Server/KeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
index 94e3597f88e..38a10926036 100644
--- a/src/Server/KeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -126,7 +126,8 @@ struct SocketInterruptablePollWrapper
             do
             {
                 Poco::Timestamp start;
-                rc = epoll_wait(epollfd, evout, 2, remaining_time.totalMilliseconds());
+                /// TODO: use epoll_pwait() for more precise timers
+                rc = epoll_wait(epollfd, evout, 2, static_cast<int>(remaining_time.totalMilliseconds()));
                 if (rc < 0 && errno == EINTR)
                 {
                     Poco::Timestamp end;
@@ -156,7 +157,7 @@ struct SocketInterruptablePollWrapper
             do
             {
                 Poco::Timestamp start;
-                rc = ::poll(poll_buf, 2, remaining_time.totalMilliseconds());
+                rc = ::poll(poll_buf, 2, static_cast<int>(remaining_time.totalMilliseconds()));
                 if (rc < 0 && errno == POCO_EINTR)
                 {
                     Poco::Timestamp end;
@@ -325,6 +326,7 @@ void KeeperTCPHandler::runImpl()
     int32_t four_letter_cmd = header;
     if (!isHandShake(four_letter_cmd))
     {
+        connected.store(true, std::memory_order_relaxed);
         tryExecuteFourLetterWordCmd(four_letter_cmd);
         return;
     }
@@ -380,7 +382,7 @@ void KeeperTCPHandler::runImpl()
                 response->zxid);
 
         UInt8 single_byte = 1;
-        [[maybe_unused]] int result = write(response_fd, &single_byte, sizeof(single_byte));
+        [[maybe_unused]] ssize_t result = write(response_fd, &single_byte, sizeof(single_byte));
     };
     keeper_dispatcher->registerSession(session_id, response_callback);
 
@@ -395,6 +397,7 @@ void KeeperTCPHandler::runImpl()
     };
 
     session_stopwatch.start();
+    connected.store(true, std::memory_order_release);
     bool close_received = false;
 
     try
@@ -584,6 +587,9 @@ KeeperConnectionStats & KeeperTCPHandler::getConnectionStats()
 
 void KeeperTCPHandler::dumpStats(WriteBufferFromOwnString & buf, bool brief)
 {
+    if (!connected.load(std::memory_order_acquire))
+        return;
+
     auto & stats = getConnectionStats();
 
     writeText(' ', buf);
diff --git a/src/Server/KeeperTCPHandler.h b/src/Server/KeeperTCPHandler.h
index e9bd211628f..ffdd50b805a 100644
--- a/src/Server/KeeperTCPHandler.h
+++ b/src/Server/KeeperTCPHandler.h
@@ -81,6 +81,8 @@ private:
     std::shared_ptr<ReadBufferFromPocoSocket> in;
     std::shared_ptr<WriteBufferFromPocoSocket> out;
 
+    std::atomic<bool> connected{false};
+
     void runImpl();
 
     void sendHandshake(bool has_leader);
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index 8e701956d29..8e2d99e2909 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -63,8 +63,11 @@ static String showTableStatusReplacementQuery(const String & query);
 static String killConnectionIdReplacementQuery(const String & query);
 static String selectLimitReplacementQuery(const String & query);
 
-MySQLHandler::MySQLHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_,
-    bool ssl_enabled, size_t connection_id_)
+MySQLHandler::MySQLHandler(
+    IServer & server_,
+    TCPServer & tcp_server_,
+    const Poco::Net::StreamSocket & socket_,
+    bool ssl_enabled, uint32_t connection_id_)
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
     , tcp_server(tcp_server_)
@@ -215,7 +218,7 @@ void MySQLHandler::finishHandshake(MySQLProtocol::ConnectionPhase::HandshakeResp
     auto read_bytes = [this, &buf, &pos, &packet_size](size_t count) -> void {
         while (pos < count)
         {
-            int ret = socket().receiveBytes(buf + pos, packet_size - pos);
+            int ret = socket().receiveBytes(buf + pos, static_cast<uint32_t>(packet_size - pos));
             if (ret == 0)
             {
                 throw Exception("Cannot read all data. Bytes read: " + std::to_string(pos) + ". Bytes expected: 3", ErrorCodes::CANNOT_READ_ALL_DATA);
@@ -376,7 +379,14 @@ void MySQLHandler::finishHandshakeSSL(
 }
 
 #if USE_SSL
-MySQLHandlerSSL::MySQLHandlerSSL(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool ssl_enabled, size_t connection_id_, RSA & public_key_, RSA & private_key_)
+MySQLHandlerSSL::MySQLHandlerSSL(
+    IServer & server_,
+    TCPServer & tcp_server_,
+    const Poco::Net::StreamSocket & socket_,
+    bool ssl_enabled,
+    uint32_t connection_id_,
+    RSA & public_key_,
+    RSA & private_key_)
     : MySQLHandler(server_, tcp_server_, socket_, ssl_enabled, connection_id_)
     , public_key(public_key_)
     , private_key(private_key_)
diff --git a/src/Server/MySQLHandler.h b/src/Server/MySQLHandler.h
index 2f43d471c40..3366e8792c9 100644
--- a/src/Server/MySQLHandler.h
+++ b/src/Server/MySQLHandler.h
@@ -31,7 +31,12 @@ class TCPServer;
 class MySQLHandler : public Poco::Net::TCPServerConnection
 {
 public:
-    MySQLHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool ssl_enabled, size_t connection_id_);
+    MySQLHandler(
+        IServer & server_,
+        TCPServer & tcp_server_,
+        const Poco::Net::StreamSocket & socket_,
+        bool ssl_enabled,
+        uint32_t connection_id_);
 
     void run() final;
 
@@ -57,7 +62,7 @@ protected:
     IServer & server;
     TCPServer & tcp_server;
     Poco::Logger * log;
-    UInt64 connection_id = 0;
+    uint32_t connection_id = 0;
 
     uint32_t server_capabilities = 0;
     uint32_t client_capabilities = 0;
@@ -81,7 +86,14 @@ protected:
 class MySQLHandlerSSL : public MySQLHandler
 {
 public:
-    MySQLHandlerSSL(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool ssl_enabled, size_t connection_id_, RSA & public_key_, RSA & private_key_);
+    MySQLHandlerSSL(
+        IServer & server_,
+        TCPServer & tcp_server_,
+        const Poco::Net::StreamSocket & socket_,
+        bool ssl_enabled,
+        uint32_t connection_id_,
+        RSA & public_key_,
+        RSA & private_key_);
 
 private:
     void authPluginSSL() override;
diff --git a/src/Server/MySQLHandlerFactory.cpp b/src/Server/MySQLHandlerFactory.cpp
index c02a3015945..cbcddbb444a 100644
--- a/src/Server/MySQLHandlerFactory.cpp
+++ b/src/Server/MySQLHandlerFactory.cpp
@@ -127,7 +127,7 @@ void MySQLHandlerFactory::generateRSAKeys()
 
 Poco::Net::TCPServerConnection * MySQLHandlerFactory::createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server)
 {
-    size_t connection_id = last_connection_id++;
+    uint32_t connection_id = last_connection_id++;
     LOG_TRACE(log, "MySQL connection. Id: {}. Address: {}", connection_id, socket.peerAddress().toString());
 #if USE_SSL
     return new MySQLHandlerSSL(server, tcp_server, socket, ssl_enabled, connection_id, *public_key, *private_key);
diff --git a/src/Server/MySQLHandlerFactory.h b/src/Server/MySQLHandlerFactory.h
index 38caae922ee..fa4ce93f765 100644
--- a/src/Server/MySQLHandlerFactory.h
+++ b/src/Server/MySQLHandlerFactory.h
@@ -36,7 +36,7 @@ private:
     bool ssl_enabled = false;
 #endif
 
-    std::atomic<size_t> last_connection_id = 0;
+    std::atomic<unsigned> last_connection_id = 0;
 public:
     explicit MySQLHandlerFactory(IServer & server_);
 
diff --git a/src/Server/ProxyV1Handler.cpp b/src/Server/ProxyV1Handler.cpp
new file mode 100644
index 00000000000..838a1de1c04
--- /dev/null
+++ b/src/Server/ProxyV1Handler.cpp
@@ -0,0 +1,123 @@
+#include <Server/ProxyV1Handler.h>
+#include <Poco/Net/NetException.h>
+#include <Common/NetException.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NETWORK_ERROR;
+    extern const int SOCKET_TIMEOUT;
+    extern const int CANNOT_READ_FROM_SOCKET;
+    extern const int CANNOT_PARSE_INPUT_ASSERTION_FAILED;
+}
+
+void ProxyV1Handler::run()
+{
+    const auto & settings = server.context()->getSettingsRef();
+    socket().setReceiveTimeout(settings.receive_timeout);
+
+    std::string word;
+    bool eol;
+
+    // Read PROXYv1 protocol header
+    // http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt
+
+    // read "PROXY"
+    if (!readWord(5, word, eol) || word != "PROXY" || eol)
+        throw ParsingException("PROXY protocol violation", ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED);
+
+    // read "TCP4" or "TCP6" or "UNKNOWN"
+    if (!readWord(7, word, eol))
+        throw ParsingException("PROXY protocol violation", ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED);
+
+    if (word != "TCP4" && word != "TCP6" && word != "UNKNOWN")
+        throw ParsingException("PROXY protocol violation", ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED);
+
+    if (word == "UNKNOWN" && eol)
+        return;
+
+    if (eol)
+        throw ParsingException("PROXY protocol violation", ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED);
+
+    // read address
+    if (!readWord(39, word, eol) || eol)
+        throw ParsingException("PROXY protocol violation", ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED);
+
+    stack_data.forwarded_for = std::move(word);
+
+    // read address
+    if (!readWord(39, word, eol) || eol)
+        throw ParsingException("PROXY protocol violation", ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED);
+
+    // read port
+    if (!readWord(5, word, eol) || eol)
+        throw ParsingException("PROXY protocol violation", ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED);
+
+    // read port and "\r\n"
+    if (!readWord(5, word, eol) || !eol)
+        throw ParsingException("PROXY protocol violation", ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED);
+}
+
+bool ProxyV1Handler::readWord(int max_len, std::string & word, bool & eol)
+{
+    word.clear();
+    eol = false;
+
+    char ch = 0;
+    int n = 0;
+    bool is_cr = false;
+    try
+    {
+        for (++max_len; max_len > 0 || is_cr; --max_len)
+        {
+            n = socket().receiveBytes(&ch, 1);
+            if (n == 0)
+            {
+                socket().shutdown();
+                return false;
+            }
+            if (n < 0)
+                break;
+
+            if (is_cr)
+                return ch == 0x0A;
+
+            if (ch == 0x0D)
+            {
+                is_cr = true;
+                eol = true;
+                continue;
+            }
+
+            if (ch == ' ')
+                return true;
+
+            word.push_back(ch);
+        }
+    }
+    catch (const Poco::Net::NetException & e)
+    {
+        throw NetException(e.displayText() + ", while reading from socket (" + socket().peerAddress().toString() + ")", ErrorCodes::NETWORK_ERROR);
+    }
+    catch (const Poco::TimeoutException &)
+    {
+        throw NetException(fmt::format("Timeout exceeded while reading from socket ({}, {} ms)",
+            socket().peerAddress().toString(),
+            socket().getReceiveTimeout().totalMilliseconds()), ErrorCodes::SOCKET_TIMEOUT);
+    }
+    catch (const Poco::IOException & e)
+    {
+        throw NetException(e.displayText() + ", while reading from socket (" + socket().peerAddress().toString() + ")", ErrorCodes::NETWORK_ERROR);
+    }
+
+    if (n < 0)
+        throw NetException("Cannot read from socket (" + socket().peerAddress().toString() + ")", ErrorCodes::CANNOT_READ_FROM_SOCKET);
+
+    return false;
+}
+
+}
diff --git a/src/Server/ProxyV1Handler.h b/src/Server/ProxyV1Handler.h
new file mode 100644
index 00000000000..062cc0e291a
--- /dev/null
+++ b/src/Server/ProxyV1Handler.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Poco/Net/TCPServerConnection.h>
+#include <Server/IServer.h>
+#include <Server/TCPProtocolStackData.h>
+
+
+namespace DB
+{
+
+class ProxyV1Handler : public Poco::Net::TCPServerConnection
+{
+    using StreamSocket = Poco::Net::StreamSocket;
+public:
+    explicit ProxyV1Handler(const StreamSocket & socket, IServer & server_, const std::string & conf_name_, TCPProtocolStackData & stack_data_)
+        : Poco::Net::TCPServerConnection(socket), server(server_), conf_name(conf_name_), stack_data(stack_data_) {}
+
+    void run() override;
+
+protected:
+    bool readWord(int max_len, std::string & word, bool & eol);
+
+private:
+    IServer & server;
+    std::string conf_name;
+    TCPProtocolStackData & stack_data;
+};
+
+}
diff --git a/src/Server/ProxyV1HandlerFactory.h b/src/Server/ProxyV1HandlerFactory.h
new file mode 100644
index 00000000000..028596d745d
--- /dev/null
+++ b/src/Server/ProxyV1HandlerFactory.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <Poco/Net/NetException.h>
+#include <Poco/Net/TCPServerConnection.h>
+#include <Server/ProxyV1Handler.h>
+#include <Common/logger_useful.h>
+#include <Server/IServer.h>
+#include <Server/TCPServer.h>
+#include <Server/TCPProtocolStackData.h>
+
+
+namespace DB
+{
+
+class ProxyV1HandlerFactory : public TCPServerConnectionFactory
+{
+private:
+    IServer & server;
+    Poco::Logger * log;
+    std::string conf_name;
+
+    class DummyTCPHandler : public Poco::Net::TCPServerConnection
+    {
+    public:
+        using Poco::Net::TCPServerConnection::TCPServerConnection;
+        void run() override {}
+    };
+
+public:
+    explicit ProxyV1HandlerFactory(IServer & server_, const std::string & conf_name_)
+        : server(server_), log(&Poco::Logger::get("ProxyV1HandlerFactory")), conf_name(conf_name_)
+    {
+    }
+
+    Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server) override
+    {
+        TCPProtocolStackData stack_data;
+        return createConnection(socket, tcp_server, stack_data);
+    }
+
+    Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer &/* tcp_server*/, TCPProtocolStackData & stack_data) override
+    {
+        try
+        {
+            LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
+            return new ProxyV1Handler(socket, server, conf_name, stack_data);
+        }
+        catch (const Poco::Net::NetException &)
+        {
+            LOG_TRACE(log, "TCP Request. Client is not connected (most likely RST packet was sent).");
+            return new DummyTCPHandler(socket);
+        }
+    }
+};
+
+}
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index da9d7fb3d2c..73b91b29f31 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -109,6 +109,18 @@ TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::N
 {
 }
 
+TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, TCPProtocolStackData & stack_data, std::string server_display_name_)
+: Poco::Net::TCPServerConnection(socket_)
+    , server(server_)
+    , tcp_server(tcp_server_)
+    , log(&Poco::Logger::get("TCPHandler"))
+    , forwarded_for(stack_data.forwarded_for)
+    , certificate(stack_data.certificate)
+    , default_database(stack_data.default_database)
+    , server_display_name(std::move(server_display_name_))
+{
+}
+
 TCPHandler::~TCPHandler()
 {
     try
@@ -365,8 +377,8 @@ void TCPHandler::runImpl()
             after_send_progress.restart();
 
             if (state.io.pipeline.pushing())
-            /// FIXME: check explicitly that insert query suggests to receive data via native protocol,
             {
+                /// FIXME: check explicitly that insert query suggests to receive data via native protocol,
                 state.need_receive_data_for_insert = true;
                 processInsertQuery();
                 state.io.onFinish();
@@ -378,27 +390,30 @@ void TCPHandler::runImpl()
             }
             else if (state.io.pipeline.completed())
             {
-                CompletedPipelineExecutor executor(state.io.pipeline);
-                /// Should not check for cancel in case of input.
-                if (!state.need_receive_data_for_input)
                 {
-                    auto callback = [this]()
+                    CompletedPipelineExecutor executor(state.io.pipeline);
+
+                    /// Should not check for cancel in case of input.
+                    if (!state.need_receive_data_for_input)
                     {
-                        std::lock_guard lock(fatal_error_mutex);
+                        auto callback = [this]()
+                        {
+                            std::lock_guard lock(fatal_error_mutex);
 
-                        if (isQueryCancelled())
-                            return true;
+                            if (isQueryCancelled())
+                                return true;
 
-                        sendProgress();
-                        sendSelectProfileEvents();
-                        sendLogs();
+                            sendProgress();
+                            sendSelectProfileEvents();
+                            sendLogs();
 
-                        return false;
-                    };
+                            return false;
+                        };
 
-                    executor.setCancelCallback(callback, interactive_delay / 1000);
+                        executor.setCancelCallback(callback, interactive_delay / 1000);
+                    }
+                    executor.execute();
                 }
-                executor.execute();
 
                 state.io.onFinish();
                 /// Send final progress after calling onFinish(), since it will update the progress.
@@ -829,7 +844,7 @@ void TCPHandler::processTablesStatusRequest()
         if (auto * replicated_table = dynamic_cast<StorageReplicatedMergeTree *>(table.get()))
         {
             status.is_replicated = true;
-            status.absolute_delay = replicated_table->getAbsoluteDelay();
+            status.absolute_delay = static_cast<UInt32>(replicated_table->getAbsoluteDelay());
         }
         else
             status.is_replicated = false; //-V1048
@@ -1060,7 +1075,7 @@ std::unique_ptr<Session> TCPHandler::makeSession()
 {
     auto interface = is_interserver_mode ? ClientInfo::Interface::TCP_INTERSERVER : ClientInfo::Interface::TCP;
 
-    auto res = std::make_unique<Session>(server.context(), interface, socket().secure());
+    auto res = std::make_unique<Session>(server.context(), interface, socket().secure(), certificate);
 
     auto & client_info = res->getClientInfo();
     client_info.forwarded_for = forwarded_for;
@@ -1087,6 +1102,7 @@ void TCPHandler::receiveHello()
     UInt64 packet_type = 0;
     String user;
     String password;
+    String default_db;
 
     readVarUInt(packet_type, *in);
     if (packet_type != Protocol::Client::Hello)
@@ -1108,7 +1124,9 @@ void TCPHandler::receiveHello()
     readVarUInt(client_version_minor, *in);
     // NOTE For backward compatibility of the protocol, client cannot send its version_patch.
     readVarUInt(client_tcp_protocol_version, *in);
-    readStringBinary(default_database, *in);
+    readStringBinary(default_db, *in);
+    if (!default_db.empty())
+        default_database = default_db;
     readStringBinary(user, *in);
     readStringBinary(password, *in);
 
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index ea5fb2f9fe0..9c8d3ca60f3 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -22,6 +22,7 @@
 #include <Storages/MergeTree/ParallelReplicasReadingCoordinator.h>
 
 #include "IServer.h"
+#include "Server/TCPProtocolStackData.h"
 #include "base/types.h"
 
 
@@ -137,6 +138,7 @@ public:
       * Proxy-forwarded (original client) IP address is used for quota accounting if quota is keyed by forwarded IP.
       */
     TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_);
+    TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, TCPProtocolStackData & stack_data, std::string server_display_name_);
     ~TCPHandler() override;
 
     void run() override;
@@ -151,12 +153,13 @@ private:
     Poco::Logger * log;
 
     String forwarded_for;
+    String certificate;
 
     String client_name;
     UInt64 client_version_major = 0;
     UInt64 client_version_minor = 0;
     UInt64 client_version_patch = 0;
-    UInt64 client_tcp_protocol_version = 0;
+    UInt32 client_tcp_protocol_version = 0;
     String quota_key;
 
     /// Connection settings, which are extracted from a context.
diff --git a/src/Server/TCPHandlerFactory.h b/src/Server/TCPHandlerFactory.h
index 354c886f4c0..fde04c6e0ab 100644
--- a/src/Server/TCPHandlerFactory.h
+++ b/src/Server/TCPHandlerFactory.h
@@ -3,6 +3,7 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Common/logger_useful.h>
+#include "Server/TCPProtocolStackData.h"
 #include <Server/IServer.h>
 #include <Server/TCPHandler.h>
 #include <Server/TCPServerConnectionFactory.h>
@@ -53,6 +54,21 @@ public:
             return new DummyTCPHandler(socket);
         }
     }
+
+    Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server, TCPProtocolStackData & stack_data) override
+    {
+        try
+        {
+            LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
+
+            return new TCPHandler(server, tcp_server, socket, stack_data, server_display_name);
+        }
+        catch (const Poco::Net::NetException &)
+        {
+            LOG_TRACE(log, "TCP Request. Client is not connected (most likely RST packet was sent).");
+            return new DummyTCPHandler(socket);
+        }
+    }
 };
 
 }
diff --git a/src/Server/TCPProtocolStackData.h b/src/Server/TCPProtocolStackData.h
new file mode 100644
index 00000000000..4ad401e723f
--- /dev/null
+++ b/src/Server/TCPProtocolStackData.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <string>
+#include <Poco/Net/StreamSocket.h>
+
+namespace DB
+{
+
+// Data to communicate between protocol layers
+struct TCPProtocolStackData
+{
+    // socket implementation can be replaced by some layer - TLS as an example
+    Poco::Net::StreamSocket socket;
+    // host from PROXY layer
+    std::string forwarded_for;
+    // certificate path from TLS layer to TCP layer
+    std::string certificate;
+    // default database from endpoint configuration to TCP layer
+    std::string default_database;
+};
+
+}
diff --git a/src/Server/TCPProtocolStackFactory.h b/src/Server/TCPProtocolStackFactory.h
new file mode 100644
index 00000000000..16b57649a72
--- /dev/null
+++ b/src/Server/TCPProtocolStackFactory.h
@@ -0,0 +1,92 @@
+#pragma once
+
+#include <Server/TCPServerConnectionFactory.h>
+#include <Server/IServer.h>
+#include <Server/TCPProtocolStackHandler.h>
+#include <Poco/Logger.h>
+#include <Poco/Net/NetException.h>
+#include <Common/logger_useful.h>
+#include <Access/Common/AllowedClientHosts.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_ADDRESS_PATTERN_TYPE;
+    extern const int IP_ADDRESS_NOT_ALLOWED;
+}
+
+
+class TCPProtocolStackFactory : public TCPServerConnectionFactory
+{
+private:
+    IServer & server [[maybe_unused]];
+    Poco::Logger * log;
+    std::string conf_name;
+    std::vector<TCPServerConnectionFactory::Ptr> stack;
+    AllowedClientHosts allowed_client_hosts;
+
+    class DummyTCPHandler : public Poco::Net::TCPServerConnection
+    {
+    public:
+        using Poco::Net::TCPServerConnection::TCPServerConnection;
+        void run() override {}
+    };
+
+public:
+    template <typename... T>
+    explicit TCPProtocolStackFactory(IServer & server_, const std::string & conf_name_, T... factory)
+        : server(server_), log(&Poco::Logger::get("TCPProtocolStackFactory")), conf_name(conf_name_), stack({factory...})
+    {
+        const auto & config = server.config();
+        /// Fill list of allowed hosts.
+        const auto networks_config = conf_name + ".networks";
+        if (config.has(networks_config))
+        {
+            Poco::Util::AbstractConfiguration::Keys keys;
+            config.keys(networks_config, keys);
+            for (const String & key : keys)
+            {
+                String value = config.getString(networks_config + "." + key);
+                if (key.starts_with("ip"))
+                    allowed_client_hosts.addSubnet(value);
+                else if (key.starts_with("host_regexp"))
+                    allowed_client_hosts.addNameRegexp(value);
+                else if (key.starts_with("host"))
+                    allowed_client_hosts.addName(value);
+                else
+                    throw Exception("Unknown address pattern type: " + key, ErrorCodes::UNKNOWN_ADDRESS_PATTERN_TYPE);
+            }
+        }
+    }
+
+    Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server) override
+    {
+        if (!allowed_client_hosts.empty() && !allowed_client_hosts.contains(socket.peerAddress().host()))
+            throw Exception("Connections from " + socket.peerAddress().toString() + " are not allowed", ErrorCodes::IP_ADDRESS_NOT_ALLOWED);
+
+        try
+        {
+            LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
+            return new TCPProtocolStackHandler(server, tcp_server, socket, stack, conf_name);
+        }
+        catch (const Poco::Net::NetException &)
+        {
+            LOG_TRACE(log, "TCP Request. Client is not connected (most likely RST packet was sent).");
+            return new DummyTCPHandler(socket);
+        }
+    }
+
+    void append(TCPServerConnectionFactory::Ptr factory)
+    {
+        stack.push_back(std::move(factory));
+    }
+
+    size_t size() { return stack.size(); }
+    bool empty() { return stack.empty(); }
+};
+
+
+}
diff --git a/src/Server/TCPProtocolStackHandler.h b/src/Server/TCPProtocolStackHandler.h
new file mode 100644
index 00000000000..e16a6b6b2ca
--- /dev/null
+++ b/src/Server/TCPProtocolStackHandler.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <Server/TCPServerConnectionFactory.h>
+#include <Server/TCPServer.h>
+#include <Poco/Util/LayeredConfiguration.h>
+#include <Server/IServer.h>
+#include <Server/TCPProtocolStackData.h>
+
+
+namespace DB
+{
+
+
+class TCPProtocolStackHandler : public Poco::Net::TCPServerConnection
+{
+    using StreamSocket = Poco::Net::StreamSocket;
+    using TCPServerConnection = Poco::Net::TCPServerConnection;
+private:
+    IServer & server;
+    TCPServer & tcp_server;
+    std::vector<TCPServerConnectionFactory::Ptr> stack;
+    std::string conf_name;
+
+public:
+    TCPProtocolStackHandler(IServer & server_, TCPServer & tcp_server_, const StreamSocket & socket, const std::vector<TCPServerConnectionFactory::Ptr> & stack_, const std::string & conf_name_)
+        : TCPServerConnection(socket), server(server_), tcp_server(tcp_server_), stack(stack_), conf_name(conf_name_)
+    {}
+
+    void run() override
+    {
+        const auto & conf = server.config();
+        TCPProtocolStackData stack_data;
+        stack_data.socket = socket();
+        stack_data.default_database = conf.getString(conf_name + ".default_database", "");
+        for (auto & factory : stack)
+        {
+            std::unique_ptr<TCPServerConnection> connection(factory->createConnection(socket(), tcp_server, stack_data));
+            connection->run();
+            if (stack_data.socket != socket())
+                socket() = stack_data.socket;
+        }
+    }
+};
+
+
+}
diff --git a/src/Server/TCPServerConnectionFactory.h b/src/Server/TCPServerConnectionFactory.h
index 613f98352bd..18b30557b00 100644
--- a/src/Server/TCPServerConnectionFactory.h
+++ b/src/Server/TCPServerConnectionFactory.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Poco/SharedPtr.h>
+#include <Server/TCPProtocolStackData.h>
 
 namespace Poco
 {
@@ -23,5 +24,9 @@ public:
 
     /// Same as Poco::Net::TCPServerConnectionFactory except we can pass the TCPServer
     virtual Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server) = 0;
+    virtual Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server, TCPProtocolStackData &/* stack_data */)
+    {
+        return createConnection(socket, tcp_server);
+    }
 };
 }
diff --git a/src/Server/TLSHandler.h b/src/Server/TLSHandler.h
new file mode 100644
index 00000000000..5b7377515c1
--- /dev/null
+++ b/src/Server/TLSHandler.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <Poco/Net/TCPServerConnection.h>
+#include <Poco/SharedPtr.h>
+#include <Common/Exception.h>
+#include <Server/TCPProtocolStackData.h>
+
+#if USE_SSL
+#   include <Poco/Net/Context.h>
+#   include <Poco/Net/SecureStreamSocket.h>
+#   include <Poco/Net/SSLManager.h>
+#endif
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int SUPPORT_IS_DISABLED;
+}
+
+class TLSHandler : public Poco::Net::TCPServerConnection
+{
+#if USE_SSL
+    using SecureStreamSocket = Poco::Net::SecureStreamSocket;
+    using SSLManager = Poco::Net::SSLManager;
+    using Context = Poco::Net::Context;
+#endif
+    using StreamSocket = Poco::Net::StreamSocket;
+public:
+    explicit TLSHandler(const StreamSocket & socket, const std::string & key_, const std::string & certificate_, TCPProtocolStackData & stack_data_)
+        : Poco::Net::TCPServerConnection(socket)
+        , key(key_)
+        , certificate(certificate_)
+        , stack_data(stack_data_)
+    {}
+
+    void run() override
+    {
+#if USE_SSL
+        auto ctx = SSLManager::instance().defaultServerContext();
+        if (!key.empty() && !certificate.empty())
+            ctx = new Context(Context::Usage::SERVER_USE, key, certificate, ctx->getCAPaths().caLocation);
+        socket() = SecureStreamSocket::attach(socket(), ctx);
+        stack_data.socket = socket();
+        stack_data.certificate = certificate;
+#else
+        throw Exception{"SSL support for TCP protocol is disabled because Poco library was built without NetSSL support.",
+                        ErrorCodes::SUPPORT_IS_DISABLED};
+#endif
+    }
+private:
+    std::string key [[maybe_unused]];
+    std::string certificate [[maybe_unused]];
+    TCPProtocolStackData & stack_data [[maybe_unused]];
+};
+
+
+}
diff --git a/src/Server/TLSHandlerFactory.h b/src/Server/TLSHandlerFactory.h
new file mode 100644
index 00000000000..9e3002d2971
--- /dev/null
+++ b/src/Server/TLSHandlerFactory.h
@@ -0,0 +1,64 @@
+#pragma once
+
+#include <Poco/Logger.h>
+#include <Poco/Net/TCPServerConnection.h>
+#include <Poco/Net/NetException.h>
+#include <Poco/Util/LayeredConfiguration.h>
+#include <Server/TLSHandler.h>
+#include <Server/IServer.h>
+#include <Server/TCPServer.h>
+#include <Server/TCPProtocolStackData.h>
+#include <Common/logger_useful.h>
+
+
+namespace DB
+{
+
+
+class TLSHandlerFactory : public TCPServerConnectionFactory
+{
+private:
+    IServer & server;
+    Poco::Logger * log;
+    std::string conf_name;
+
+    class DummyTCPHandler : public Poco::Net::TCPServerConnection
+    {
+    public:
+        using Poco::Net::TCPServerConnection::TCPServerConnection;
+        void run() override {}
+    };
+
+public:
+    explicit TLSHandlerFactory(IServer & server_, const std::string & conf_name_)
+        : server(server_), log(&Poco::Logger::get("TLSHandlerFactory")), conf_name(conf_name_)
+    {
+    }
+
+    Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server) override
+    {
+        TCPProtocolStackData stack_data;
+        return createConnection(socket, tcp_server, stack_data);
+    }
+
+    Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer &/* tcp_server*/, TCPProtocolStackData & stack_data) override
+    {
+        try
+        {
+            LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
+            return new TLSHandler(
+                socket,
+                server.config().getString(conf_name + ".privateKeyFile", ""),
+                server.config().getString(conf_name + ".certificateFile", ""),
+                stack_data);
+        }
+        catch (const Poco::Net::NetException &)
+        {
+            LOG_TRACE(log, "TCP Request. Client is not connected (most likely RST packet was sent).");
+            return new DummyTCPHandler(socket);
+        }
+    }
+};
+
+
+}
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index dcd7abae68a..c1e7cefd19e 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -755,9 +755,10 @@ bool isMetadataOnlyConversion(const IDataType * from, const IDataType * to)
 
         const auto * nullable_from = typeid_cast<const DataTypeNullable *>(from);
         const auto * nullable_to = typeid_cast<const DataTypeNullable *>(to);
-        if (nullable_from && nullable_to)
+        if (nullable_to)
         {
-            from = nullable_from->getNestedType().get();
+            /// Here we allow a conversion X -> Nullable(X) to make a metadata-only conversion.
+            from = nullable_from ? nullable_from->getNestedType().get() : from;
             to = nullable_to->getNestedType().get();
             continue;
         }
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index 9dc3d773e01..4b9667aa95d 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -106,7 +106,7 @@ namespace
 
                 for (size_t replica_index = 1; replica_index <= replicas; ++replica_index)
                 {
-                    address.replica_index = replica_index;
+                    address.replica_index = static_cast<UInt32>(replica_index);
                     make_connection(address);
                 }
             }
diff --git a/src/Storages/ExternalDataSourceConfiguration.h b/src/Storages/ExternalDataSourceConfiguration.h
index 0890247eb45..5736336983a 100644
--- a/src/Storages/ExternalDataSourceConfiguration.h
+++ b/src/Storages/ExternalDataSourceConfiguration.h
@@ -117,7 +117,7 @@ struct URLBasedDataSourceConfiguration
 
 struct StorageS3Configuration : URLBasedDataSourceConfiguration
 {
-    S3Settings::AuthSettings auth_settings;
+    S3::AuthSettings auth_settings;
     S3Settings::ReadWriteSettings rw_settings;
 };
 
diff --git a/src/Storages/FileLog/DirectoryWatcherBase.cpp b/src/Storages/FileLog/DirectoryWatcherBase.cpp
index 005e1e5fd1b..efcd70d6742 100644
--- a/src/Storages/FileLog/DirectoryWatcherBase.cpp
+++ b/src/Storages/FileLog/DirectoryWatcherBase.cpp
@@ -70,10 +70,10 @@ void DirectoryWatcherBase::watchFunc()
     while (!stopped)
     {
         const auto & settings = owner.storage.getFileLogSettings();
-        if (poll(&pfd, 1, milliseconds_to_wait) > 0 && pfd.revents & POLLIN)
+        if (poll(&pfd, 1, static_cast<int>(milliseconds_to_wait)) > 0 && pfd.revents & POLLIN)
         {
             milliseconds_to_wait = settings->poll_directory_watch_events_backoff_init.totalMilliseconds();
-            int n = read(fd, buffer.data(), buffer.size());
+            ssize_t n = read(fd, buffer.data(), buffer.size());
             int i = 0;
             if (n > 0)
             {
diff --git a/src/Storages/FileLog/StorageFileLog.cpp b/src/Storages/FileLog/StorageFileLog.cpp
index 7848b75deec..722843a7ab6 100644
--- a/src/Storages/FileLog/StorageFileLog.cpp
+++ b/src/Storages/FileLog/StorageFileLog.cpp
@@ -315,7 +315,7 @@ Pipe StorageFileLog::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t /* max_block_size */,
-    unsigned /* num_streams */)
+    size_t /* num_streams */)
 {
     /// If there are MVs depended on this table, we just forbid reading
     if (!local_context->getSettingsRef().stream_like_engine_allow_direct_select)
diff --git a/src/Storages/FileLog/StorageFileLog.h b/src/Storages/FileLog/StorageFileLog.h
index 4295a8a764a..56f2d40ef5a 100644
--- a/src/Storages/FileLog/StorageFileLog.h
+++ b/src/Storages/FileLog/StorageFileLog.h
@@ -54,7 +54,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     void drop() override;
 
diff --git a/src/Storages/Freeze.cpp b/src/Storages/Freeze.cpp
index a2f0395b001..74adf3de0ae 100644
--- a/src/Storages/Freeze.cpp
+++ b/src/Storages/Freeze.cpp
@@ -194,7 +194,7 @@ bool Unfreezer::removeFreezedPart(DiskPtr disk, const String & path, const Strin
         if (meta.load(disk, path))
         {
             FreezeMetaData::clean(disk, path);
-            return StorageReplicatedMergeTree::removeSharedDetachedPart(disk, path, part_name, meta.table_shared_id, meta.zookeeper_name, meta.replica_name, "", local_context, zookeeper);
+            return StorageReplicatedMergeTree::removeSharedDetachedPart(disk, path, part_name, meta.table_shared_id, meta.replica_name, "", local_context, zookeeper);
         }
     }
 
diff --git a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
index dd77fc70358..3726d3aae96 100644
--- a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
+++ b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
@@ -52,7 +52,7 @@ private:
     std::future<IAsynchronousReader::Result> asyncReadInto(char * data, size_t size);
 
     IAsynchronousReader & reader;
-    Int32 priority;
+    size_t priority;
     std::shared_ptr<ReadBufferFromHDFS> impl;
     std::future<IAsynchronousReader::Result> prefetch_future;
     Memory<> prefetch_buffer;
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.cpp b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
index 4aebcd6f6ab..3f5c81dc01b 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
@@ -3,6 +3,7 @@
 #if USE_HDFS
 #include <Storages/HDFS/HDFSCommon.h>
 #include <Common/Throttler.h>
+#include <Common/safe_cast.h>
 #include <hdfs/hdfs.h>
 #include <mutex>
 
@@ -90,7 +91,7 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl : public BufferWithOwnMemory<S
             num_bytes_to_read = internal_buffer.size();
         }
 
-        int bytes_read = hdfsRead(fs.get(), fin, internal_buffer.begin(), num_bytes_to_read);
+        int bytes_read = hdfsRead(fs.get(), fin, internal_buffer.begin(), safe_cast<int>(num_bytes_to_read));
         if (bytes_read < 0)
             throw Exception(ErrorCodes::NETWORK_ERROR,
                 "Fail to read from HDFS: {}, file path: {}. Error: {}",
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index 2170b4142e8..bbabd523c45 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -120,8 +120,15 @@ namespace
 
     std::pair<String, String> getPathFromUriAndUriWithoutPath(const String & uri)
     {
-        const size_t begin_of_path = uri.find('/', uri.find("//") + 2);
-        return {uri.substr(begin_of_path), uri.substr(0, begin_of_path)};
+        auto pos = uri.find("//");
+        if (pos != std::string::npos && pos + 2 < uri.length())
+        {
+            pos = uri.find('/', pos + 2);
+            if (pos != std::string::npos)
+                return {uri.substr(pos), uri.substr(0, pos)};
+        }
+
+        throw Exception("Storage HDFS requires valid URL to be set", ErrorCodes::BAD_ARGUMENTS);
     }
 
     std::vector<String> getPathsList(const String & path_from_uri, const String & uri_without_path, ContextPtr context, std::unordered_map<String, time_t> * last_mod_times = nullptr)
@@ -207,8 +214,8 @@ ColumnsDescription StorageHDFS::getTableStructureFromData(
             return nullptr;
         auto compression = chooseCompressionMethod(*it, compression_method);
         auto impl = std::make_unique<ReadBufferFromHDFS>(uri_without_path, *it++, ctx->getGlobalContext()->getConfigRef(), ctx->getReadSettings());
-        const auto zstd_window_log_max = ctx->getSettingsRef().zstd_window_log_max;
-        return wrapReadBufferWithCompressionMethod(std::move(impl), compression, zstd_window_log_max);
+        const Int64 zstd_window_log_max = ctx->getSettingsRef().zstd_window_log_max;
+        return wrapReadBufferWithCompressionMethod(std::move(impl), compression, static_cast<int>(zstd_window_log_max));
     };
 
     ColumnsDescription columns;
@@ -349,8 +356,8 @@ bool HDFSSource::initialize()
     auto compression = chooseCompressionMethod(path_from_uri, storage->compression_method);
     auto impl = std::make_unique<ReadBufferFromHDFS>(
         uri_without_path, path_from_uri, getContext()->getGlobalContext()->getConfigRef(), getContext()->getReadSettings());
-    const auto zstd_window_log_max = getContext()->getSettingsRef().zstd_window_log_max;
-    read_buf = wrapReadBufferWithCompressionMethod(std::move(impl), compression, zstd_window_log_max);
+    const Int64 zstd_window_log_max = getContext()->getSettingsRef().zstd_window_log_max;
+    read_buf = wrapReadBufferWithCompressionMethod(std::move(impl), compression, static_cast<int>(zstd_window_log_max));
 
     auto input_format = getContext()->getInputFormat(storage->format_name, *read_buf, block_for_format, max_block_size);
 
@@ -543,7 +550,7 @@ Pipe StorageHDFS::read(
     ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     std::shared_ptr<HDFSSource::IteratorWrapper> iterator_wrapper{nullptr};
     if (distributed_processing)
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index 90a42d0c692..b641f5bfb43 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -40,7 +40,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override;
 
diff --git a/src/Storages/HDFS/StorageHDFSCluster.cpp b/src/Storages/HDFS/StorageHDFSCluster.cpp
index 467203c58f6..64fdf77dbc2 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.cpp
+++ b/src/Storages/HDFS/StorageHDFSCluster.cpp
@@ -72,7 +72,7 @@ Pipe StorageHDFSCluster::read(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t /*max_block_size*/,
-    unsigned /*num_streams*/)
+    size_t /*num_streams*/)
 {
     auto cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
 
diff --git a/src/Storages/HDFS/StorageHDFSCluster.h b/src/Storages/HDFS/StorageHDFSCluster.h
index 3239a1e4076..0d6f2bbe1b8 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.h
+++ b/src/Storages/HDFS/StorageHDFSCluster.h
@@ -32,7 +32,7 @@ public:
     std::string getName() const override { return "HDFSCluster"; }
 
     Pipe read(const Names &, const StorageSnapshotPtr &, SelectQueryInfo &,
-        ContextPtr, QueryProcessingStage::Enum, size_t /*max_block_size*/, unsigned /*num_streams*/) override;
+        ContextPtr, QueryProcessingStage::Enum, size_t /*max_block_size*/, size_t /*num_streams*/) override;
 
     QueryProcessingStage::Enum
     getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override;
diff --git a/src/Storages/HDFS/WriteBufferFromHDFS.cpp b/src/Storages/HDFS/WriteBufferFromHDFS.cpp
index a179f484652..1f952ec2bd9 100644
--- a/src/Storages/HDFS/WriteBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/WriteBufferFromHDFS.cpp
@@ -5,6 +5,7 @@
 #include <Storages/HDFS/WriteBufferFromHDFS.h>
 #include <Storages/HDFS/HDFSCommon.h>
 #include <Common/Throttler.h>
+#include <Common/safe_cast.h>
 #include <hdfs/hdfs.h>
 
 namespace DB
@@ -57,7 +58,7 @@ struct WriteBufferFromHDFS::WriteBufferFromHDFSImpl
 
     int write(const char * start, size_t size) const
     {
-        int bytes_written = hdfsWrite(fs.get(), fout, start, size);
+        int bytes_written = hdfsWrite(fs.get(), fout, start, safe_cast<int>(size));
         if (write_settings.remote_throttler)
             write_settings.remote_throttler->add(bytes_written);
 
diff --git a/src/Storages/Hive/HiveFile.cpp b/src/Storages/Hive/HiveFile.cpp
index fc08c046f93..8f5b1b5f5fd 100644
--- a/src/Storages/Hive/HiveFile.cpp
+++ b/src/Storages/Hive/HiveFile.cpp
@@ -210,7 +210,7 @@ std::unique_ptr<IMergeTreeDataPart::MinMaxIndex> HiveORCFile::buildMinMaxIndex(c
         {
             size_t pos = it->second;
             /// Attention: column statistics start from 1. 0 has special purpose.
-            const orc::ColumnStatistics * col_stats = statistics->getColumnStatistics(pos + 1);
+            const orc::ColumnStatistics * col_stats = statistics->getColumnStatistics(static_cast<unsigned>(pos + 1));
             idx->hyperrectangle[i] = buildRange(col_stats);
         }
         ++i;
@@ -297,7 +297,7 @@ void HiveParquetFile::loadSplitMinMaxIndexesImpl()
     const auto * schema = meta->schema();
     for (size_t pos = 0; pos < num_cols; ++pos)
     {
-        String column{schema->Column(pos)->name()};
+        String column{schema->Column(static_cast<int>(pos))->name()};
         boost::to_lower(column);
         parquet_column_positions[column] = pos;
     }
@@ -306,7 +306,7 @@ void HiveParquetFile::loadSplitMinMaxIndexesImpl()
     split_minmax_idxes.resize(num_row_groups);
     for (size_t i = 0; i < num_row_groups; ++i)
     {
-        auto row_group_meta = meta->RowGroup(i);
+        auto row_group_meta = meta->RowGroup(static_cast<int>(i));
         split_minmax_idxes[i] = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
         split_minmax_idxes[i]->hyperrectangle.resize(num_cols);
 
@@ -321,7 +321,7 @@ void HiveParquetFile::loadSplitMinMaxIndexesImpl()
                 continue;
 
             size_t pos = mit->second;
-            auto col_chunk = row_group_meta->ColumnChunk(pos);
+            auto col_chunk = row_group_meta->ColumnChunk(static_cast<int>(pos));
             if (!col_chunk->is_stats_set())
                 continue;
 
diff --git a/src/Storages/Hive/StorageHive.cpp b/src/Storages/Hive/StorageHive.cpp
index 01ee5a8c3c5..47d7382f7ca 100644
--- a/src/Storages/Hive/StorageHive.cpp
+++ b/src/Storages/Hive/StorageHive.cpp
@@ -727,7 +727,7 @@ HiveFilePtr StorageHive::getHiveFileIfNeeded(
                             hive_file->getPath(),
                             hive_file->describeMinMaxIndex(sub_minmax_idxes[i]));
 
-                        skip_splits.insert(i);
+                        skip_splits.insert(static_cast<int>(i));
                     }
                 }
                 hive_file->setSkipSplits(skip_splits);
@@ -749,7 +749,7 @@ Pipe StorageHive::read(
     ContextPtr context_,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     lazyInitialize();
 
@@ -829,7 +829,7 @@ Pipe StorageHive::read(
 }
 
 HiveFiles StorageHive::collectHiveFiles(
-    unsigned max_threads,
+    size_t max_threads,
     const SelectQueryInfo & query_info,
     const HiveTableMetadataPtr & hive_table_metadata,
     const HDFSFSPtr & fs,
@@ -937,7 +937,13 @@ StorageHive::totalRowsImpl(const Settings & settings, const SelectQueryInfo & qu
     auto hive_table_metadata = hive_metastore_client->getTableMetadata(hive_database, hive_table);
     HDFSBuilderWrapper builder = createHDFSBuilder(hdfs_namenode_url, getContext()->getGlobalContext()->getConfigRef());
     HDFSFSPtr fs = createHDFSFS(builder.get());
-    HiveFiles hive_files = collectHiveFiles(settings.max_threads, query_info, hive_table_metadata, fs, context_, prune_level);
+    HiveFiles hive_files = collectHiveFiles(
+        settings.max_threads,
+        query_info,
+        hive_table_metadata,
+        fs,
+        context_,
+        prune_level);
 
     UInt64 total_rows = 0;
     for (const auto & hive_file : hive_files)
diff --git a/src/Storages/Hive/StorageHive.h b/src/Storages/Hive/StorageHive.h
index 9c02d228f97..363042621c7 100644
--- a/src/Storages/Hive/StorageHive.h
+++ b/src/Storages/Hive/StorageHive.h
@@ -60,7 +60,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/) override;
 
@@ -98,7 +98,7 @@ private:
     void initMinMaxIndexExpression();
 
     HiveFiles collectHiveFiles(
-        unsigned max_threads,
+        size_t max_threads,
         const SelectQueryInfo & query_info,
         const HiveTableMetadataPtr & hive_table_metadata,
         const HDFSFSPtr & fs,
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 5b12b720f1c..7a704a17f4d 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -108,7 +108,7 @@ Pipe IStorage::watch(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/,
-    unsigned /*num_streams*/)
+    size_t /*num_streams*/)
 {
     throw Exception("Method watch is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
 }
@@ -120,7 +120,7 @@ Pipe IStorage::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
-    unsigned /*num_streams*/)
+    size_t /*num_streams*/)
 {
     throw Exception("Method read is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
 }
@@ -133,7 +133,7 @@ void IStorage::read(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     auto pipe = read(column_names, storage_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
     readFromPipe(query_plan, std::move(pipe), column_names, storage_snapshot, query_info, context, getName());
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 242f17d6f20..fd48d22b12b 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -323,7 +323,7 @@ public:
         ContextPtr /*context*/,
         QueryProcessingStage::Enum & /*processed_stage*/,
         size_t /*max_block_size*/,
-        unsigned /*num_streams*/);
+        size_t /*num_streams*/);
 
     /// Returns true if FINAL modifier must be added to SELECT query depending on required columns.
     /// It's needed for ReplacingMergeTree wrappers such as MaterializedMySQL and MaterializedPostrgeSQL
@@ -357,7 +357,7 @@ private:
         ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
-        unsigned /*num_streams*/);
+        size_t /*num_streams*/);
 
 public:
     /// Other version of read which adds reading step to query plan.
@@ -370,7 +370,7 @@ public:
         ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
-        unsigned /*num_streams*/);
+        size_t /*num_streams*/);
 
     /** Writes the data to a table.
       * Receives a description of the query, which can contain information about the data write method.
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index fa52850fb39..8e4dd78379e 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -212,7 +212,7 @@ StorageKafka::StorageKafka(
     , schema_name(getContext()->getMacros()->expand(kafka_settings->kafka_schema.value))
     , num_consumers(kafka_settings->kafka_num_consumers.value)
     , log(&Poco::Logger::get("StorageKafka (" + table_id_.table_name + ")"))
-    , semaphore(0, num_consumers)
+    , semaphore(0, static_cast<int>(num_consumers))
     , intermediate_commit(kafka_settings->kafka_commit_every_batch.value)
     , settings_adjustments(createSettingsAdjustments())
     , thread_per_consumer(kafka_settings->kafka_thread_per_consumer.value)
@@ -291,7 +291,7 @@ Pipe StorageKafka::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t /* max_block_size */,
-    unsigned /* num_streams */)
+    size_t /* num_streams */)
 {
     if (num_created_consumers == 0)
         return {};
diff --git a/src/Storages/Kafka/StorageKafka.h b/src/Storages/Kafka/StorageKafka.h
index 77bad6e17a9..c1c67b19c51 100644
--- a/src/Storages/Kafka/StorageKafka.h
+++ b/src/Storages/Kafka/StorageKafka.h
@@ -53,7 +53,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(
         const ASTPtr & query,
diff --git a/src/Storages/LiveView/StorageBlocks.h b/src/Storages/LiveView/StorageBlocks.h
index bc860a1fa3c..a732ada1da2 100644
--- a/src/Storages/LiveView/StorageBlocks.h
+++ b/src/Storages/LiveView/StorageBlocks.h
@@ -46,7 +46,7 @@ public:
         ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
-        unsigned /*num_streams*/) override
+        size_t /*num_streams*/) override
     {
         return Pipe::unitePipes(std::move(pipes));
     }
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index e3d19d0a433..3d27205d638 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -531,7 +531,7 @@ Pipe StorageLiveView::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     std::lock_guard lock(mutex);
 
@@ -556,7 +556,7 @@ Pipe StorageLiveView::watch(
     ContextPtr local_context,
     QueryProcessingStage::Enum & processed_stage,
     size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     ASTWatchQuery & query = typeid_cast<ASTWatchQuery &>(*query_info.query);
 
diff --git a/src/Storages/LiveView/StorageLiveView.h b/src/Storages/LiveView/StorageLiveView.h
index c6a0379e2ab..31b1c425709 100644
--- a/src/Storages/LiveView/StorageLiveView.h
+++ b/src/Storages/LiveView/StorageLiveView.h
@@ -143,7 +143,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     Pipe watch(
         const Names & column_names,
@@ -151,7 +151,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     std::shared_ptr<BlocksPtr> getBlocksPtr() { return blocks_ptr; }
     MergeableBlocksPtr getMergeableBlocks() { return mergeable_blocks; }
diff --git a/src/Storages/MeiliSearch/SourceMeiliSearch.cpp b/src/Storages/MeiliSearch/SourceMeiliSearch.cpp
index 8e37e469e96..b516ad8d0cf 100644
--- a/src/Storages/MeiliSearch/SourceMeiliSearch.cpp
+++ b/src/Storages/MeiliSearch/SourceMeiliSearch.cpp
@@ -174,7 +174,7 @@ size_t MeiliSearchSource::parseJSON(MutableColumns & columns, const JSON & jres)
         {
             ++cnt_fields;
             const auto & name = kv_pair.getName();
-            int pos = description.sample_block.getPositionByName(name);
+            size_t pos = description.sample_block.getPositionByName(name);
             MutableColumnPtr & col = columns[pos];
             DataTypePtr type_ptr = description.sample_block.getByPosition(pos).type;
             insertWithTypeId(col, kv_pair.getValue(), type_ptr);
diff --git a/src/Storages/MeiliSearch/StorageMeiliSearch.cpp b/src/Storages/MeiliSearch/StorageMeiliSearch.cpp
index c5966d9e322..30d49edbb10 100644
--- a/src/Storages/MeiliSearch/StorageMeiliSearch.cpp
+++ b/src/Storages/MeiliSearch/StorageMeiliSearch.cpp
@@ -80,7 +80,7 @@ Pipe StorageMeiliSearch::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned)
+    size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/MeiliSearch/StorageMeiliSearch.h b/src/Storages/MeiliSearch/StorageMeiliSearch.h
index d7a2697730c..5fa7ac2c0e3 100644
--- a/src/Storages/MeiliSearch/StorageMeiliSearch.h
+++ b/src/Storages/MeiliSearch/StorageMeiliSearch.h
@@ -25,7 +25,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context) override;
 
diff --git a/src/Storages/MergeTree/DataPartStorageOnDisk.cpp b/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
index e2a2f3f793f..efc7710f640 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
+++ b/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
@@ -406,14 +406,18 @@ void DataPartStorageOnDisk::clearDirectory(
     }
 }
 
-std::string DataPartStorageOnDisk::getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached) const
+std::optional<String> DataPartStorageOnDisk::getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached, bool broken) const
 {
+    assert(!broken || detached);
     String res;
 
     auto full_relative_path = fs::path(root_path);
     if (detached)
         full_relative_path /= "detached";
 
+    std::optional<String> original_checksums_content;
+    std::optional<Strings> original_files_list;
+
     for (int try_no = 0; try_no < 10; ++try_no)
     {
         res = (prefix.empty() ? "" : prefix + "_") + part_dir + (try_no ? "_try" + DB::toString(try_no) : "");
@@ -421,12 +425,69 @@ std::string DataPartStorageOnDisk::getRelativePathForPrefix(Poco::Logger * log,
         if (!volume->getDisk()->exists(full_relative_path / res))
             return res;
 
+        if (broken && looksLikeBrokenDetachedPartHasTheSameContent(res, original_checksums_content, original_files_list))
+        {
+            LOG_WARNING(log, "Directory {} (to detach to) already exists, "
+                        "but its content looks similar to content of the broken part which we are going to detach. "
+                        "Assuming it was already cloned to detached, will not do it again to avoid redundant copies of broken part.", res);
+            return {};
+        }
+
         LOG_WARNING(log, "Directory {} (to detach to) already exists. Will detach to directory with '_tryN' suffix.", res);
     }
 
     return res;
 }
 
+bool DataPartStorageOnDisk::looksLikeBrokenDetachedPartHasTheSameContent(const String & detached_part_path,
+                                                                         std::optional<String> & original_checksums_content,
+                                                                         std::optional<Strings> & original_files_list) const
+{
+    /// We cannot know for sure that content of detached part is the same,
+    /// but in most cases it's enough to compare checksums.txt and list of files.
+
+    if (!exists("checksums.txt"))
+        return false;
+
+    auto detached_full_path = fs::path(root_path) / "detached" / detached_part_path;
+    auto disk = volume->getDisk();
+    if (!disk->exists(detached_full_path / "checksums.txt"))
+        return false;
+
+    if (!original_checksums_content)
+    {
+        auto in = disk->readFile(detached_full_path / "checksums.txt", /* settings */ {}, /* read_hint */ {}, /* file_size */ {});
+        original_checksums_content.emplace();
+        readStringUntilEOF(*original_checksums_content, *in);
+    }
+
+    if (original_checksums_content->empty())
+        return false;
+
+    auto part_full_path = fs::path(root_path) / part_dir;
+    String detached_checksums_content;
+    {
+        auto in = readFile("checksums.txt", /* settings */ {}, /* read_hint */ {}, /* file_size */ {});
+        readStringUntilEOF(detached_checksums_content, *in);
+    }
+
+    if (original_checksums_content != detached_checksums_content)
+        return false;
+
+    if (!original_files_list)
+    {
+        original_files_list.emplace();
+        disk->listFiles(part_full_path, *original_files_list);
+        std::sort(original_files_list->begin(), original_files_list->end());
+    }
+
+    Strings detached_files_list;
+    disk->listFiles(detached_full_path, detached_files_list);
+    std::sort(detached_files_list.begin(), detached_files_list.end());
+
+    return original_files_list == detached_files_list;
+}
+
 void DataPartStorageBuilderOnDisk::setRelativePath(const std::string & path)
 {
     part_dir = path;
diff --git a/src/Storages/MergeTree/DataPartStorageOnDisk.h b/src/Storages/MergeTree/DataPartStorageOnDisk.h
index adf1b78cdfb..d325049f056 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDisk.h
+++ b/src/Storages/MergeTree/DataPartStorageOnDisk.h
@@ -52,7 +52,12 @@ public:
         MergeTreeDataPartState state,
         Poco::Logger * log) override;
 
-    std::string getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached) const override;
+    /// Returns path to place detached part in or nullopt if we don't need to detach part (if it already exists and has the same content)
+    std::optional<String> getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached, bool broken) const override;
+
+    /// Returns true if detached part already exists and has the same content (compares checksums.txt and the list of files)
+    bool looksLikeBrokenDetachedPartHasTheSameContent(const String & detached_part_path, std::optional<String> & original_checksums_content,
+                                                      std::optional<Strings> & original_files_list) const;
 
     void setRelativePath(const std::string & path) override;
     void onRename(const std::string & new_root_path, const std::string & new_part_dir) override;
diff --git a/src/Storages/MergeTree/IDataPartStorage.h b/src/Storages/MergeTree/IDataPartStorage.h
index 17af6dd2909..03627938348 100644
--- a/src/Storages/MergeTree/IDataPartStorage.h
+++ b/src/Storages/MergeTree/IDataPartStorage.h
@@ -129,7 +129,7 @@ public:
 
     /// Get a name like 'prefix_partdir_tryN' which does not exist in a root dir.
     /// TODO: remove it.
-    virtual std::string getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached) const = 0;
+    virtual std::optional<String> getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached, bool broken) const = 0;
 
     /// Reset part directory, used for im-memory parts.
     /// TODO: remove it.
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 46323f12305..cc9a14162f8 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -1190,12 +1190,8 @@ void IMergeTreeDataPart::loadColumns(bool require)
         auto in = metadata_manager->read("columns.txt");
         loaded_columns.readText(*in);
 
-        for (const auto & column : loaded_columns)
-        {
-            const auto * aggregate_function_data_type = typeid_cast<const DataTypeAggregateFunction *>(column.type.get());
-            if (aggregate_function_data_type && aggregate_function_data_type->isVersioned())
-                aggregate_function_data_type->setVersion(0, /* if_empty */true);
-        }
+        for (auto & column : loaded_columns)
+            setVersionToAggregateFunctions(column.type, true);
     }
 
     SerializationInfo::Settings settings =
@@ -1482,8 +1478,9 @@ void IMergeTreeDataPart::remove() const
     data_part_storage->remove(std::move(can_remove_callback), checksums, projection_checksums, is_temp, getState(), storage.log);
 }
 
-String IMergeTreeDataPart::getRelativePathForPrefix(const String & prefix, bool detached) const
+std::optional<String> IMergeTreeDataPart::getRelativePathForPrefix(const String & prefix, bool detached, bool broken) const
 {
+    assert(!broken || detached);
     String res;
 
     /** If you need to detach a part, and directory into which we want to rename it already exists,
@@ -1495,22 +1492,26 @@ String IMergeTreeDataPart::getRelativePathForPrefix(const String & prefix, bool
     if (detached && parent_part)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot detach projection");
 
-    return data_part_storage->getRelativePathForPrefix(storage.log, prefix, detached);
+    return data_part_storage->getRelativePathForPrefix(storage.log, prefix, detached, broken);
 }
 
-String IMergeTreeDataPart::getRelativePathForDetachedPart(const String & prefix) const
+std::optional<String> IMergeTreeDataPart::getRelativePathForDetachedPart(const String & prefix, bool broken) const
 {
     /// Do not allow underscores in the prefix because they are used as separators.
     assert(prefix.find_first_of('_') == String::npos);
     assert(prefix.empty() || std::find(DetachedPartInfo::DETACH_REASONS.begin(),
                                        DetachedPartInfo::DETACH_REASONS.end(),
                                        prefix) != DetachedPartInfo::DETACH_REASONS.end());
-    return "detached/" + getRelativePathForPrefix(prefix, /* detached */ true);
+    if (auto path = getRelativePathForPrefix(prefix, /* detached */ true, broken))
+        return "detached/" + *path;
+    return {};
 }
 
 void IMergeTreeDataPart::renameToDetached(const String & prefix, DataPartStorageBuilderPtr builder) const
 {
-    renameTo(getRelativePathForDetachedPart(prefix), true, builder);
+    auto path_to_detach = getRelativePathForDetachedPart(prefix, /* broken */ false);
+    assert(path_to_detach);
+    renameTo(path_to_detach.value(), true, builder);
     part_is_probably_removed_from_disk = true;
 }
 
@@ -1522,9 +1523,16 @@ void IMergeTreeDataPart::makeCloneInDetached(const String & prefix, const Storag
     /// because hardlinks tracking doesn't work for detached parts.
     bool copy_instead_of_hardlink = isStoredOnRemoteDiskWithZeroCopySupport() && storage.supportsReplication() && storage_settings->allow_remote_fs_zero_copy_replication;
 
+    /// Avoid unneeded duplicates of broken parts if we try to detach the same broken part multiple times.
+    /// Otherwise it may pollute detached/ with dirs with _tryN suffix and we will fail to remove broken part after 10 attempts.
+    bool broken = !prefix.empty();
+    auto maybe_path_in_detached = getRelativePathForDetachedPart(prefix, broken);
+    if (!maybe_path_in_detached)
+        return;
+
     data_part_storage->freeze(
         storage.relative_data_path,
-        getRelativePathForDetachedPart(prefix),
+        *maybe_path_in_detached,
         /*make_source_readonly*/ true,
         {},
         copy_instead_of_hardlink,
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 32afa2a482d..6f034574fb4 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -347,7 +347,7 @@ public:
     /// Calculate column and secondary indices sizes on disk.
     void calculateColumnsAndSecondaryIndicesSizesOnDisk();
 
-    String getRelativePathForPrefix(const String & prefix, bool detached = false) const;
+    std::optional<String> getRelativePathForPrefix(const String & prefix, bool detached = false, bool broken = false) const;
 
     bool isProjectionPart() const { return parent_part != nullptr; }
 
@@ -485,7 +485,7 @@ protected:
     /// disk using columns and checksums.
     virtual void calculateEachColumnSizes(ColumnSizeByName & each_columns_size, ColumnSize & total_size) const = 0;
 
-    String getRelativePathForDetachedPart(const String & prefix) const;
+    std::optional<String> getRelativePathForDetachedPart(const String & prefix, bool broken) const;
 
     /// Checks that part can be actually removed from disk.
     /// In ordinary scenario always returns true, but in case of
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.h b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
index c08853f8e1b..d84db36bac2 100644
--- a/src/Storages/MergeTree/MergePlainMergeTreeTask.h
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
@@ -66,7 +66,7 @@ private:
     StorageMetadataPtr metadata_snapshot;
     bool deduplicate;
     Names deduplicate_by_columns;
-    std::shared_ptr<MergeMutateSelectedEntry> merge_mutate_entry{nullptr};
+    MergeMutateSelectedEntryPtr merge_mutate_entry{nullptr};
     TableLockHolder table_lock_holder;
     FutureMergedMutatedPartPtr future_part{nullptr};
     MergeTreeData::MutableDataPartPtr new_part;
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 8957f134053..66950734d5f 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -3245,7 +3245,10 @@ void MergeTreeData::outdateBrokenPartAndCloneToDetached(const DataPartPtr & part
         LOG_INFO(log, "Cloning part {} to {}_{} and making it obsolete.", part_to_detach->data_part_storage->getPartDirectory(), prefix, part_to_detach->name);
 
     part_to_detach->makeCloneInDetached(prefix, metadata_snapshot);
-    removePartsFromWorkingSet(NO_TRANSACTION_RAW, {part_to_detach}, true);
+
+    DataPartsLock lock = lockParts();
+    if (part_to_detach->getState() == DataPartState::Active)
+        removePartsFromWorkingSet(NO_TRANSACTION_RAW, {part_to_detach}, true, &lock);
 }
 
 void MergeTreeData::forcefullyMovePartToDetachedAndRemoveFromMemory(const MergeTreeData::DataPartPtr & part_to_detach, const String & prefix, bool restore_covered)
@@ -6250,7 +6253,7 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAn
     if (auto src_part_in_memory = asInMemoryPart(src_part))
     {
         auto flushed_part_path = src_part_in_memory->getRelativePathForPrefix(tmp_part_prefix);
-        src_part_storage = src_part_in_memory->flushToDisk(flushed_part_path, metadata_snapshot);
+        src_part_storage = src_part_in_memory->flushToDisk(*flushed_part_path, metadata_snapshot);
     }
 
     String with_copy;
@@ -6434,7 +6437,7 @@ PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
         if (auto part_in_memory = asInMemoryPart(part))
         {
             auto flushed_part_path = part_in_memory->getRelativePathForPrefix("tmp_freeze");
-            data_part_storage = part_in_memory->flushToDisk(flushed_part_path, metadata_snapshot);
+            data_part_storage = part_in_memory->flushToDisk(*flushed_part_path, metadata_snapshot);
         }
 
         auto callback = [this, &part, &backup_part_path](const DiskPtr & disk)
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
index c7c831c23ec..7a3c5f11c81 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
@@ -142,7 +142,7 @@ DataPartStoragePtr MergeTreeDataPartInMemory::flushToDisk(const String & new_rel
 
 void MergeTreeDataPartInMemory::makeCloneInDetached(const String & prefix, const StorageMetadataPtr & metadata_snapshot) const
 {
-    String detached_path = getRelativePathForDetachedPart(prefix);
+    String detached_path = *getRelativePathForDetachedPart(prefix, /* broken */ false);
     flushToDisk(detached_path, metadata_snapshot);
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 91ecb3a37a0..5b3497bf926 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -140,7 +140,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     const SelectQueryInfo & query_info,
     ContextPtr context,
     const UInt64 max_block_size,
-    const unsigned num_streams,
+    const size_t num_streams,
     QueryProcessingStage::Enum processed_stage,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
     bool enable_parallel_reading) const
@@ -930,7 +930,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
         Strings forced_indices;
         {
             Tokens tokens(indices.data(), &indices[indices.size()], settings.max_query_size);
-            IParser::Pos pos(tokens, settings.max_parser_depth);
+            IParser::Pos pos(tokens, static_cast<unsigned>(settings.max_parser_depth));
             Expected expected;
             if (!parseIdentifiersOrStringLiterals(pos, expected, forced_indices))
                 throw Exception(ErrorCodes::CANNOT_PARSE_TEXT, "Cannot parse force_data_skipping_indices ('{}')", indices);
@@ -1279,7 +1279,7 @@ MergeTreeDataSelectAnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
     const SelectQueryInfo & query_info,
     const ActionDAGNodes & added_filter_nodes,
     ContextPtr context,
-    unsigned num_streams,
+    size_t num_streams,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read) const
 {
     size_t total_parts = parts.size();
@@ -1318,7 +1318,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     const SelectQueryInfo & query_info,
     ContextPtr context,
     const UInt64 max_block_size,
-    const unsigned num_streams,
+    const size_t num_streams,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
     MergeTreeDataSelectAnalysisResultPtr merge_tree_select_result_ptr,
     bool enable_parallel_reading) const
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index bb44f260eec..66dd7f7e5db 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -33,7 +33,7 @@ public:
         const SelectQueryInfo & query_info,
         ContextPtr context,
         UInt64 max_block_size,
-        unsigned num_streams,
+        size_t num_streams,
         QueryProcessingStage::Enum processed_stage,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr,
         bool enable_parallel_reading = false) const;
@@ -46,7 +46,7 @@ public:
         const SelectQueryInfo & query_info,
         ContextPtr context,
         UInt64 max_block_size,
-        unsigned num_streams,
+        size_t num_streams,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr,
         MergeTreeDataSelectAnalysisResultPtr merge_tree_select_result_ptr = nullptr,
         bool enable_parallel_reading = false) const;
@@ -62,7 +62,7 @@ public:
         const SelectQueryInfo & query_info,
         const ActionDAGNodes & added_filter_nodes,
         ContextPtr context,
-        unsigned num_streams,
+        size_t num_streams,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr) const;
 
 private:
diff --git a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
index 3b16998337e..052834358bb 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
@@ -9,6 +9,7 @@
 #include <Interpreters/castColumn.h>
 #include <Columns/ColumnArray.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
 
 
 namespace DB
@@ -64,9 +65,11 @@ uint64_t AnnoyIndex<Dist>::getNumOfDimensions() const
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
-    extern const int INCORRECT_QUERY;
+    extern const int ILLEGAL_COLUMN;
     extern const int INCORRECT_DATA;
+    extern const int INCORRECT_NUMBER_OF_COLUMNS;
+    extern const int INCORRECT_QUERY;
+    extern const int LOGICAL_ERROR;
 }
 
 MergeTreeIndexGranuleAnnoy::MergeTreeIndexGranuleAnnoy(const String & index_name_, const Block & index_sample_block_)
@@ -113,7 +116,7 @@ MergeTreeIndexAggregatorAnnoy::MergeTreeIndexAggregatorAnnoy(
 MergeTreeIndexGranulePtr MergeTreeIndexAggregatorAnnoy::getGranuleAndReset()
 {
     // NOLINTNEXTLINE(*)
-    index->build(number_of_trees, /*number_of_threads=*/1);
+    index->build(static_cast<int>(number_of_trees), /*number_of_threads=*/1);
     auto granule = std::make_shared<MergeTreeIndexGranuleAnnoy>(index_name, index_sample_block, index);
     index = nullptr;
     return granule;
@@ -132,9 +135,7 @@ void MergeTreeIndexAggregatorAnnoy::update(const Block & block, size_t * pos, si
         return;
 
     if (index_sample_block.columns() > 1)
-    {
         throw Exception("Only one column is supported", ErrorCodes::LOGICAL_ERROR);
-    }
 
     auto index_column_name = index_sample_block.getByPosition(0).name;
     const auto & column_cut = block.getByName(index_column_name).column->cut(*pos, rows_read);
@@ -144,27 +145,22 @@ void MergeTreeIndexAggregatorAnnoy::update(const Block & block, size_t * pos, si
         const auto & data = column_array->getData();
         const auto & array = typeid_cast<const ColumnFloat32&>(data).getData();
         if (array.empty())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Array have 0 rows, but {} expected", rows_read);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Array has 0 rows, {} rows expected", rows_read);
         const auto & offsets = column_array->getOffsets();
         size_t num_rows = offsets.size();
 
-        /// All sizes are the same
+        /// Check all sizes are the same
         size_t size = offsets[0];
         for (size_t i = 0; i < num_rows - 1; ++i)
-        {
             if (offsets[i + 1] - offsets[i] != size)
-            {
                 throw Exception(ErrorCodes::INCORRECT_DATA, "Arrays should have same length");
-            }
-        }
+
         index = std::make_shared<AnnoyIndex>(size);
 
         index->add_item(index->get_n_items(), array.data());
         /// add all rows from 1 to num_rows - 1 (this is the same as the beginning of the last element)
         for (size_t current_row = 1; current_row < num_rows; ++current_row)
-        {
             index->add_item(index->get_n_items(), &array[offsets[current_row - 1]]);
-        }
     }
     else
     {
@@ -181,19 +177,13 @@ void MergeTreeIndexAggregatorAnnoy::update(const Block & block, size_t * pos, si
         {
             const auto& pod_array = typeid_cast<const ColumnFloat32*>(column.get())->getData();
             for (size_t i = 0; i < pod_array.size(); ++i)
-            {
                 data[i].push_back(pod_array[i]);
-            }
         }
         assert(!data.empty());
         if (!index)
-        {
             index = std::make_shared<AnnoyIndex>(data[0].size());
-        }
         for (const auto& item : data)
-        {
             index->add_item(index->get_n_items(), item.data());
-        }
     }
 
     *pos += rows_read;
@@ -222,7 +212,7 @@ std::vector<size_t> MergeTreeIndexConditionAnnoy::getUsefulRanges(MergeTreeIndex
 {
     UInt64 limit = condition.getLimit();
     UInt64 index_granularity = condition.getIndexGranularity();
-    std::optional<float> comp_dist = condition.getQueryType() == ANN::ANNQueryInformation::Type::Where ?
+    std::optional<float> comp_dist = condition.getQueryType() == ApproximateNearestNeighbour::ANNQueryInformation::Type::Where ?
      std::optional<float>(condition.getComparisonDistanceForWhereQuery()) : std::nullopt;
 
     if (comp_dist && comp_dist.value() < 0)
@@ -232,16 +222,13 @@ std::vector<size_t> MergeTreeIndexConditionAnnoy::getUsefulRanges(MergeTreeIndex
 
     auto granule = std::dynamic_pointer_cast<MergeTreeIndexGranuleAnnoy>(idx_granule);
     if (granule == nullptr)
-    {
         throw Exception("Granule has the wrong type", ErrorCodes::LOGICAL_ERROR);
-    }
+
     auto annoy = granule->index;
 
     if (condition.getNumOfDimensions() != annoy->getNumOfDimensions())
-    {
         throw Exception("The dimension of the space in the request (" + toString(condition.getNumOfDimensions()) + ") "
             + "does not match with the dimension in the index (" + toString(annoy->getNumOfDimensions()) + ")", ErrorCodes::INCORRECT_QUERY);
-    }
 
     /// neighbors contain indexes of dots which were closest to target vector
     std::vector<UInt64> neighbors;
@@ -268,23 +255,25 @@ std::vector<size_t> MergeTreeIndexConditionAnnoy::getUsefulRanges(MergeTreeIndex
     for (size_t i = 0; i < neighbors.size(); ++i)
     {
         if (comp_dist && distances[i] > comp_dist)
-        {
             continue;
-        }
         granule_numbers.insert(neighbors[i] / index_granularity);
     }
 
     std::vector<size_t> result_vector;
     result_vector.reserve(granule_numbers.size());
     for (auto granule_number : granule_numbers)
-    {
         result_vector.push_back(granule_number);
-    }
 
     return result_vector;
 }
 
 
+MergeTreeIndexAnnoy::MergeTreeIndexAnnoy(const IndexDescription & index_, uint64_t number_of_trees_)
+    : IMergeTreeIndex(index_)
+    , number_of_trees(number_of_trees_)
+{
+}
+
 MergeTreeIndexGranulePtr MergeTreeIndexAnnoy::createIndexGranule() const
 {
     return std::make_shared<MergeTreeIndexGranuleAnnoy>(index.name, index.sample_block);
@@ -307,6 +296,40 @@ MergeTreeIndexPtr annoyIndexCreator(const IndexDescription & index)
     return std::make_shared<MergeTreeIndexAnnoy>(index, param);
 }
 
+static void assertIndexColumnsType(const Block & header)
+{
+    DataTypePtr column_data_type_ptr = header.getDataTypes()[0];
+
+    if (const auto * array_type = typeid_cast<const DataTypeArray *>(column_data_type_ptr.get()))
+    {
+        TypeIndex nested_type_index = array_type->getNestedType()->getTypeId();
+        if (!WhichDataType(nested_type_index).isFloat32())
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Unexpected type {} of Annoy index. Only Array(Float32) and Tuple(Float32) are supported.",
+                column_data_type_ptr->getName());
+    }
+    else if (const auto * tuple_type = typeid_cast<const DataTypeTuple *>(column_data_type_ptr.get()))
+    {
+        const DataTypes & nested_types = tuple_type->getElements();
+        for (const auto & type : nested_types)
+        {
+            TypeIndex nested_type_index = type->getTypeId();
+            if (!WhichDataType(nested_type_index).isFloat32())
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Unexpected type {} of Annoy index. Only Array(Float32) and Tuple(Float32) are supported.",
+                    column_data_type_ptr->getName());
+        }
+    }
+    else
+        throw Exception(
+            ErrorCodes::ILLEGAL_COLUMN,
+            "Unexpected type {} of Annoy index. Only Array(Float32) and Tuple(Float32) are supported.",
+            column_data_type_ptr->getName());
+
+}
+
 void annoyIndexValidator(const IndexDescription & index, bool /* attach */)
 {
     if (index.arguments.size() != 1)
@@ -317,6 +340,11 @@ void annoyIndexValidator(const IndexDescription & index, bool /* attach */)
     {
         throw Exception("Annoy index argument must be UInt64.", ErrorCodes::INCORRECT_QUERY);
     }
+
+    if (index.column_names.size() != 1 || index.data_types.size() != 1)
+        throw Exception("Annoy indexes must be created on a single column", ErrorCodes::INCORRECT_NUMBER_OF_COLUMNS);
+
+    assertIndexColumnsType(index.sample_block);
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexAnnoy.h b/src/Storages/MergeTree/MergeTreeIndexAnnoy.h
index 85bbb0a1bd2..6a844947bd2 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAnnoy.h
+++ b/src/Storages/MergeTree/MergeTreeIndexAnnoy.h
@@ -10,8 +10,6 @@
 namespace DB
 {
 
-namespace ANN = ApproximateNearestNeighbour;
-
 // auxiliary namespace for working with spotify-annoy library
 // mainly for serialization and deserialization of the index
 namespace ApproximateNearestNeighbour
@@ -33,7 +31,7 @@ namespace ApproximateNearestNeighbour
 
 struct MergeTreeIndexGranuleAnnoy final : public IMergeTreeIndexGranule
 {
-    using AnnoyIndex = ANN::AnnoyIndex<>;
+    using AnnoyIndex = ApproximateNearestNeighbour::AnnoyIndex<>;
     using AnnoyIndexPtr = std::shared_ptr<AnnoyIndex>;
 
     MergeTreeIndexGranuleAnnoy(const String & index_name_, const Block & index_sample_block_);
@@ -57,7 +55,7 @@ struct MergeTreeIndexGranuleAnnoy final : public IMergeTreeIndexGranule
 
 struct MergeTreeIndexAggregatorAnnoy final : IMergeTreeIndexAggregator
 {
-    using AnnoyIndex = ANN::AnnoyIndex<>;
+    using AnnoyIndex = ApproximateNearestNeighbour::AnnoyIndex<>;
     using AnnoyIndexPtr = std::shared_ptr<AnnoyIndex>;
 
     MergeTreeIndexAggregatorAnnoy(const String & index_name_, const Block & index_sample_block, uint64_t number_of_trees);
@@ -74,7 +72,7 @@ struct MergeTreeIndexAggregatorAnnoy final : IMergeTreeIndexAggregator
 };
 
 
-class MergeTreeIndexConditionAnnoy final : public ANN::IMergeTreeIndexConditionAnn
+class MergeTreeIndexConditionAnnoy final : public ApproximateNearestNeighbour::IMergeTreeIndexConditionAnn
 {
 public:
     MergeTreeIndexConditionAnnoy(
@@ -91,18 +89,14 @@ public:
     ~MergeTreeIndexConditionAnnoy() override = default;
 
 private:
-    ANN::ANNCondition condition;
+    ApproximateNearestNeighbour::ANNCondition condition;
 };
 
 
 class MergeTreeIndexAnnoy : public IMergeTreeIndex
 {
 public:
-    MergeTreeIndexAnnoy(const IndexDescription & index_, uint64_t number_of_trees_)
-        : IMergeTreeIndex(index_)
-        , number_of_trees(number_of_trees_)
-    {}
-
+    MergeTreeIndexAnnoy(const IndexDescription & index_, uint64_t number_of_trees_);
     ~MergeTreeIndexAnnoy() override = default;
 
     MergeTreeIndexGranulePtr createIndexGranule() const override;
diff --git a/src/Storages/MergeTree/MergeType.cpp b/src/Storages/MergeTree/MergeType.cpp
index 4b03f5ab57c..045114578d0 100644
--- a/src/Storages/MergeTree/MergeType.cpp
+++ b/src/Storages/MergeTree/MergeType.cpp
@@ -10,7 +10,7 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-MergeType checkAndGetMergeType(UInt64 merge_type)
+MergeType checkAndGetMergeType(UInt32 merge_type)
 {
     if (auto maybe_merge_type = magic_enum::enum_cast<MergeType>(merge_type))
         return *maybe_merge_type;
diff --git a/src/Storages/MergeTree/MergeType.h b/src/Storages/MergeTree/MergeType.h
index fad1ba33e3e..ce9a40c5931 100644
--- a/src/Storages/MergeTree/MergeType.h
+++ b/src/Storages/MergeTree/MergeType.h
@@ -22,7 +22,7 @@ enum class MergeType
 };
 
 /// Check parsed merge_type from raw int and get enum value.
-MergeType checkAndGetMergeType(UInt64 merge_type);
+MergeType checkAndGetMergeType(UInt32 merge_type);
 
 /// Check this merge assigned with TTL
 bool isTTLMergeType(MergeType merge_type);
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
index 3936ee61b70..7993840f1d9 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
@@ -419,14 +419,14 @@ void ReplicatedMergeTreeCleanupThread::getBlocksSortedByTime(zkutil::ZooKeeper &
         LOG_TRACE(log, "Checking {} blocks ({} are not cached){}", stat.numChildren, not_cached_blocks, " to clear old ones from ZooKeeper.");
     }
 
-    zkutil::AsyncResponses<Coordination::ExistsResponse> exists_futures;
+    std::vector<std::string> exists_paths;
     for (const String & block : blocks)
     {
         auto it = cached_block_stats.find(block);
         if (it == cached_block_stats.end())
         {
             /// New block. Fetch its stat asynchronously.
-            exists_futures.emplace_back(block, zookeeper.asyncExists(storage.zookeeper_path + "/blocks/" + block));
+            exists_paths.emplace_back(storage.zookeeper_path + "/blocks/" + block);
         }
         else
         {
@@ -436,14 +436,18 @@ void ReplicatedMergeTreeCleanupThread::getBlocksSortedByTime(zkutil::ZooKeeper &
         }
     }
 
+    auto exists_size = exists_paths.size();
+    auto exists_results = zookeeper.exists(exists_paths);
+
     /// Put fetched stats into the cache
-    for (auto & elem : exists_futures)
+    for (size_t i = 0; i < exists_size; ++i)
     {
-        auto status = elem.second.get();
+        auto status = exists_results[i];
         if (status.error != Coordination::Error::ZNONODE)
         {
-            cached_block_stats.emplace(elem.first, std::make_pair(status.stat.ctime, status.stat.version));
-            timed_blocks.emplace_back(elem.first, status.stat.ctime, status.stat.version);
+            auto node_name = fs::path(exists_paths[i]).filename();
+            cached_block_stats.emplace(node_name, std::make_pair(status.stat.ctime, status.stat.version));
+            timed_blocks.emplace_back(node_name, status.stat.ctime, status.stat.version);
         }
     }
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index e7882ce4952..d7e3c3b1955 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -240,7 +240,7 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
 
                 if (checkString("merge_type: ", in))
                 {
-                    UInt64 value;
+                    UInt32 value;
                     in >> value;
                     merge_type = checkAndGetMergeType(value);
                 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
index ce33ac8c467..626295d7255 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
@@ -91,8 +91,8 @@ std::optional<String> ReplicatedMergeTreeMergeStrategyPicker::pickReplicaToExecu
 void ReplicatedMergeTreeMergeStrategyPicker::refreshState()
 {
     const auto settings = storage.getSettings();
-    auto threshold = settings->execute_merges_on_single_replica_time_threshold.totalSeconds();
-    auto threshold_init = 0;
+    time_t threshold = settings->execute_merges_on_single_replica_time_threshold.totalSeconds();
+    time_t threshold_init = 0;
     if (settings->allow_remote_fs_zero_copy_replication)
         threshold_init = settings->remote_fs_execute_merges_on_single_replica_time_threshold.totalSeconds();
 
@@ -127,7 +127,7 @@ void ReplicatedMergeTreeMergeStrategyPicker::refreshState()
             active_replicas_tmp.push_back(replica);
             if (replica == storage.replica_name)
             {
-                current_replica_index_tmp = active_replicas_tmp.size() - 1;
+                current_replica_index_tmp = static_cast<int>(active_replicas_tmp.size() - 1);
             }
         }
     }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 0305ce440f9..d6d937ce66f 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -41,7 +41,7 @@ ReplicatedMergeTreeQueue::ReplicatedMergeTreeQueue(StorageReplicatedMergeTree &
 void ReplicatedMergeTreeQueue::clear()
 {
     auto locks = lockQueue();
-    assert(future_parts.empty());
+    chassert(future_parts.empty());
     current_parts.clear();
     virtual_parts.clear();
     queue.clear();
@@ -62,6 +62,7 @@ void ReplicatedMergeTreeQueue::setBrokenPartsToEnqueueFetchesOnLoading(Strings &
 
 void ReplicatedMergeTreeQueue::initialize(zkutil::ZooKeeperPtr zookeeper)
 {
+    clear();
     std::lock_guard lock(state_mutex);
 
     LOG_TRACE(log, "Initializing parts in queue");
@@ -153,17 +154,19 @@ bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
 
         ::sort(children.begin(), children.end());
 
-        zkutil::AsyncResponses<Coordination::GetResponse> futures;
-        futures.reserve(children.size());
+        auto children_num = children.size();
+        std::vector<std::string> paths;
+        paths.reserve(children_num);
 
         for (const String & child : children)
-            futures.emplace_back(child, zookeeper->asyncGet(fs::path(queue_path) / child));
+            paths.emplace_back(fs::path(queue_path) / child);
 
-        for (auto & future : futures)
+        auto results = zookeeper->get(paths);
+        for (size_t i = 0; i < children_num; ++i)
         {
-            Coordination::GetResponse res = future.second.get();
+            auto res = results[i];
             LogEntryPtr entry = LogEntry::parse(res.data, res.stat);
-            entry->znode_name = future.first;
+            entry->znode_name = children[i];
 
             std::lock_guard lock(state_mutex);
 
@@ -641,11 +644,11 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
 
             LOG_DEBUG(log, "Pulling {} entries to queue: {} - {}", (end - begin), *begin, *last);
 
-            zkutil::AsyncResponses<Coordination::GetResponse> futures;
-            futures.reserve(end - begin);
+            Strings get_paths;
+            get_paths.reserve(end - begin);
 
             for (auto it = begin; it != end; ++it)
-                futures.emplace_back(*it, zookeeper->asyncGet(fs::path(zookeeper_path) / "log" / *it));
+                get_paths.emplace_back(fs::path(zookeeper_path) / "log" / *it);
 
             /// Simultaneously add all new entries to the queue and move the pointer to the log.
 
@@ -655,9 +658,11 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
 
             std::optional<time_t> min_unprocessed_insert_time_changed;
 
-            for (auto & future : futures)
+            auto get_results = zookeeper->get(get_paths);
+            auto get_num = get_results.size();
+            for (size_t i = 0; i < get_num; ++i)
             {
-                Coordination::GetResponse res = future.second.get();
+                auto res = get_results[i];
 
                 copied_entries.emplace_back(LogEntry::parse(res.data, res.stat));
 
@@ -1804,9 +1809,9 @@ ReplicatedMergeTreeQueue::Status ReplicatedMergeTreeQueue::getStatus() const
 
     Status res;
 
-    res.future_parts = future_parts.size();
-    res.queue_size = queue.size();
-    res.last_queue_update = last_queue_update;
+    res.future_parts = static_cast<UInt32>(future_parts.size());
+    res.queue_size = static_cast<UInt32>(queue.size());
+    res.last_queue_update = static_cast<UInt32>(last_queue_update);
 
     res.inserts_in_queue = 0;
     res.merges_in_queue = 0;
@@ -1819,7 +1824,7 @@ ReplicatedMergeTreeQueue::Status ReplicatedMergeTreeQueue::getStatus() const
     for (const LogEntryPtr & entry : queue)
     {
         if (entry->create_time && (!res.queue_oldest_time || entry->create_time < res.queue_oldest_time))
-            res.queue_oldest_time = entry->create_time;
+            res.queue_oldest_time = static_cast<UInt32>(entry->create_time);
 
         if (entry->type == LogEntry::GET_PART || entry->type == LogEntry::ATTACH_PART)
         {
@@ -1827,7 +1832,7 @@ ReplicatedMergeTreeQueue::Status ReplicatedMergeTreeQueue::getStatus() const
 
             if (entry->create_time && (!res.inserts_oldest_time || entry->create_time < res.inserts_oldest_time))
             {
-                res.inserts_oldest_time = entry->create_time;
+                res.inserts_oldest_time = static_cast<UInt32>(entry->create_time);
                 res.oldest_part_to_get = entry->new_part_name;
             }
         }
@@ -1838,7 +1843,7 @@ ReplicatedMergeTreeQueue::Status ReplicatedMergeTreeQueue::getStatus() const
 
             if (entry->create_time && (!res.merges_oldest_time || entry->create_time < res.merges_oldest_time))
             {
-                res.merges_oldest_time = entry->create_time;
+                res.merges_oldest_time = static_cast<UInt32>(entry->create_time);
                 res.oldest_part_to_merge_to = entry->new_part_name;
             }
         }
@@ -1849,7 +1854,7 @@ ReplicatedMergeTreeQueue::Status ReplicatedMergeTreeQueue::getStatus() const
 
             if (entry->create_time && (!res.part_mutations_oldest_time || entry->create_time < res.part_mutations_oldest_time))
             {
-                res.part_mutations_oldest_time = entry->create_time;
+                res.part_mutations_oldest_time = static_cast<UInt32>(entry->create_time);
                 res.oldest_part_to_mutate_to = entry->new_part_name;
             }
         }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index 6d1a3efb01d..2ebdd604af2 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -425,6 +425,7 @@ public:
 
     struct Status
     {
+        /// TODO: consider using UInt64 here
         UInt32 future_parts;
         UInt32 queue_size;
         UInt32 inserts_in_queue;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index 0abea5977c3..158cbfca9fd 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -99,19 +99,22 @@ size_t ReplicatedMergeTreeSink::checkQuorumPrecondition(zkutil::ZooKeeperPtr & z
     quorum_info.status_path = storage.zookeeper_path + "/quorum/status";
 
     Strings replicas = zookeeper->getChildren(fs::path(storage.zookeeper_path) / "replicas");
-    std::vector<std::future<Coordination::ExistsResponse>> replicas_status_futures;
-    replicas_status_futures.reserve(replicas.size());
+
+    Strings exists_paths;
     for (const auto & replica : replicas)
         if (replica != storage.replica_name)
-            replicas_status_futures.emplace_back(zookeeper->asyncExists(fs::path(storage.zookeeper_path) / "replicas" / replica / "is_active"));
+            exists_paths.emplace_back(fs::path(storage.zookeeper_path) / "replicas" / replica / "is_active");
 
-    std::future<Coordination::GetResponse> is_active_future = zookeeper->asyncTryGet(storage.replica_path + "/is_active");
-    std::future<Coordination::GetResponse> host_future = zookeeper->asyncTryGet(storage.replica_path + "/host");
+    auto exists_result = zookeeper->exists(exists_paths);
+    auto get_results = zookeeper->get(Strings{storage.replica_path + "/is_active", storage.replica_path + "/host"});
 
     size_t active_replicas = 1;     /// Assume current replica is active (will check below)
-    for (auto & status : replicas_status_futures)
-        if (status.get().error == Coordination::Error::ZOK)
+    for (size_t i = 0; i < exists_paths.size(); ++i)
+    {
+        auto status = exists_result[i];
+        if (status.error == Coordination::Error::ZOK)
             ++active_replicas;
+    }
 
     size_t replicas_number = replicas.size();
     size_t quorum_size = getQuorumSize(replicas_number);
@@ -135,8 +138,8 @@ size_t ReplicatedMergeTreeSink::checkQuorumPrecondition(zkutil::ZooKeeperPtr & z
 
     /// Both checks are implicitly made also later (otherwise there would be a race condition).
 
-    auto is_active = is_active_future.get();
-    auto host = host_future.get();
+    auto is_active = get_results[0];
+    auto host = get_results[1];
 
     if (is_active.error == Coordination::Error::ZNONODE || host.error == Coordination::Error::ZNONODE)
         throw Exception("Replica is not active right now", ErrorCodes::READONLY);
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index fd313a10bc8..a3d578cf5f2 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -65,7 +65,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t max_block_size,
-        unsigned num_streams) override
+        size_t num_streams) override
     {
         query_plan = std::move(*MergeTreeDataSelectExecutor(storage)
                                               .readFromParts(
diff --git a/src/Storages/MySQL/MySQLHelpers.cpp b/src/Storages/MySQL/MySQLHelpers.cpp
index 94c07d2670f..127bdb96eaf 100644
--- a/src/Storages/MySQL/MySQLHelpers.cpp
+++ b/src/Storages/MySQL/MySQLHelpers.cpp
@@ -23,7 +23,7 @@ createMySQLPoolWithFailover(const StorageMySQLConfiguration & configuration, con
     return mysqlxx::PoolWithFailover(
         configuration.database, configuration.addresses, configuration.username, configuration.password,
         MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
-        mysql_settings.connection_pool_size,
+        static_cast<unsigned>(mysql_settings.connection_pool_size),
         mysql_settings.connection_max_tries,
         mysql_settings.connection_wait_timeout,
         mysql_settings.connect_timeout,
diff --git a/src/Storages/NATS/NATSConnection.cpp b/src/Storages/NATS/NATSConnection.cpp
index d33138419e2..70b3599aa09 100644
--- a/src/Storages/NATS/NATSConnection.cpp
+++ b/src/Storages/NATS/NATSConnection.cpp
@@ -111,7 +111,7 @@ void NATSConnectionManager::connectImpl()
         {
             servers[i] = configuration.servers[i].c_str();
         }
-        natsOptions_SetServers(options, servers, configuration.servers.size());
+        natsOptions_SetServers(options, servers, static_cast<int>(configuration.servers.size()));
     }
     natsOptions_SetMaxReconnect(options, configuration.max_reconnect);
     natsOptions_SetReconnectWait(options, configuration.reconnect_wait);
diff --git a/src/Storages/NATS/StorageNATS.cpp b/src/Storages/NATS/StorageNATS.cpp
index 4a3ba973e67..dea2553700b 100644
--- a/src/Storages/NATS/StorageNATS.cpp
+++ b/src/Storages/NATS/StorageNATS.cpp
@@ -60,7 +60,7 @@ StorageNATS::StorageNATS(
     , schema_name(getContext()->getMacros()->expand(nats_settings->nats_schema))
     , num_consumers(nats_settings->nats_num_consumers.value)
     , log(&Poco::Logger::get("StorageNATS (" + table_id_.table_name + ")"))
-    , semaphore(0, num_consumers)
+    , semaphore(0, static_cast<int>(num_consumers))
     , queue_size(std::max(QUEUE_SIZE, static_cast<uint32_t>(getMaxBlockSize())))
     , is_attach(is_attach_)
 {
@@ -289,7 +289,7 @@ void StorageNATS::read(
         ContextPtr local_context,
         QueryProcessingStage::Enum /* processed_stage */,
         size_t /* max_block_size */,
-        unsigned /* num_streams */)
+        size_t /* num_streams */)
 {
     if (!consumers_ready)
         throw Exception("NATS consumers setup not finished. Connection might be lost", ErrorCodes::CANNOT_CONNECT_NATS);
diff --git a/src/Storages/NATS/StorageNATS.h b/src/Storages/NATS/StorageNATS.h
index 185b39250c8..a5a050d566f 100644
--- a/src/Storages/NATS/StorageNATS.h
+++ b/src/Storages/NATS/StorageNATS.h
@@ -47,7 +47,7 @@ public:
         ContextPtr local_context,
         QueryProcessingStage::Enum /* processed_stage */,
         size_t /* max_block_size */,
-        unsigned /* num_streams */) override;
+        size_t /* num_streams */) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override;
 
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index cc80d567d1d..6d12960824a 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -279,7 +279,7 @@ void StorageMaterializedPostgreSQL::read(
         ContextPtr context_,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams)
+        size_t num_streams)
 {
     auto nested_table = getNested();
 
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
index d8e9e98c662..af0adb10f9f 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
@@ -98,7 +98,7 @@ public:
         ContextPtr context_,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     /// This method is called only from MateriaizePostgreSQL database engine, because it needs to maintain
     /// an invariant: a table exists only if its nested table exists. This atomic variable is set to _true_
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index 70838daec24..57f5ddd86e6 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -87,7 +87,7 @@ StorageRabbitMQ::StorageRabbitMQ(
         , 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 + ")"))
-        , semaphore(0, num_consumers)
+        , semaphore(0, static_cast<int>(num_consumers))
         , unique_strbase(getRandomName())
         , queue_size(std::max(QUEUE_SIZE, static_cast<uint32_t>(getMaxBlockSize())))
         , milliseconds_to_wait(RESCHEDULE_MS)
@@ -674,7 +674,7 @@ void StorageRabbitMQ::read(
         ContextPtr local_context,
         QueryProcessingStage::Enum /* processed_stage */,
         size_t /* max_block_size */,
-        unsigned /* num_streams */)
+        size_t /* num_streams */)
 {
     if (!rabbit_is_ready)
         throw Exception("RabbitMQ setup not finished. Connection might be lost", ErrorCodes::CANNOT_CONNECT_RABBITMQ);
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index 455b2fe8f09..a1250f50829 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -50,7 +50,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(
         const ASTPtr & query,
diff --git a/src/Storages/ReadFinalForExternalReplicaStorage.cpp b/src/Storages/ReadFinalForExternalReplicaStorage.cpp
index 3ec7a074fd4..28053c84e20 100644
--- a/src/Storages/ReadFinalForExternalReplicaStorage.cpp
+++ b/src/Storages/ReadFinalForExternalReplicaStorage.cpp
@@ -35,7 +35,7 @@ void readFinalFromNestedStorage(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned int num_streams)
+    size_t num_streams)
 {
     NameSet column_names_set = NameSet(column_names.begin(), column_names.end());
     auto lock = nested_storage->lockForShare(context->getCurrentQueryId(), context->getSettingsRef().lock_acquire_timeout);
@@ -59,7 +59,8 @@ void readFinalFromNestedStorage(
     }
 
     auto nested_snapshot = nested_storage->getStorageSnapshot(nested_metadata, context);
-    nested_storage->read(query_plan, require_columns_name, nested_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    nested_storage->read(
+        query_plan, require_columns_name, nested_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
 
     if (!query_plan.isInitialized())
     {
diff --git a/src/Storages/ReadFinalForExternalReplicaStorage.h b/src/Storages/ReadFinalForExternalReplicaStorage.h
index 178164b6643..f8d1264ccb3 100644
--- a/src/Storages/ReadFinalForExternalReplicaStorage.h
+++ b/src/Storages/ReadFinalForExternalReplicaStorage.h
@@ -21,7 +21,7 @@ void readFinalFromNestedStorage(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned int num_streams);
+    size_t num_streams);
 
 }
 
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 20b1de51a30..46ddb650eee 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -403,7 +403,7 @@ Pipe StorageEmbeddedRocksDB::read(
         ContextPtr context_,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t max_block_size,
-        unsigned num_streams)
+        size_t num_streams)
 {
     storage_snapshot->check(column_names);
 
@@ -467,7 +467,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
     String rocksdb_dir;
     bool read_only{false};
     if (!engine_args.empty())
-        ttl = checkAndGetLiteralArgument<UInt64>(engine_args[0], "ttl");
+        ttl = static_cast<Int32>(checkAndGetLiteralArgument<UInt64>(engine_args[0], "ttl"));
     if (engine_args.size() > 1)
         rocksdb_dir = checkAndGetLiteralArgument<String>(engine_args[1], "rocksdb_dir");
     if (engine_args.size() > 2)
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index 03848510e66..ca0ab7a1840 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -46,7 +46,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
     void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index 3fc00a79bbe..65b4dce3ad2 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -26,6 +26,8 @@
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/ReverseTransform.h>
+#include <Processors/Transforms/PartialSortingTransform.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Processors/ISource.h>
 #include <Processors/QueryPlan/QueryPlan.h>
@@ -226,7 +228,7 @@ void StorageBuffer::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     const auto & metadata_snapshot = storage_snapshot->metadata;
 
@@ -334,6 +336,14 @@ void StorageBuffer::read(
             pipes_from_buffers.emplace_back(std::make_shared<BufferSource>(column_names, buf, storage_snapshot));
 
         pipe_from_buffers = Pipe::unitePipes(std::move(pipes_from_buffers));
+        if (query_info.getInputOrderInfo())
+        {
+            /// Each buffer has one block, and it not guaranteed that rows in each block are sorted by order keys
+            pipe_from_buffers.addSimpleTransform([&](const Block & header)
+            {
+                return std::make_shared<PartialSortingTransform>(header, query_info.getInputOrderInfo()->sort_description_for_merging, 0);
+            });
+        }
     }
 
     if (pipe_from_buffers.empty())
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index 580742c0c84..387165171b9 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -82,7 +82,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool supportsParallelInsert() const override { return true; }
 
diff --git a/src/Storages/StorageDictionary.cpp b/src/Storages/StorageDictionary.cpp
index 2839ac03a5b..f9995cceda3 100644
--- a/src/Storages/StorageDictionary.cpp
+++ b/src/Storages/StorageDictionary.cpp
@@ -169,7 +169,7 @@ Pipe StorageDictionary::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
-    const unsigned threads)
+    const size_t threads)
 {
     auto registered_dictionary_name = location == Location::SameDatabaseAndNameAsDictionary ? getStorageID().getInternalDictionaryName() : dictionary_name;
     auto dictionary = getContext()->getExternalDictionariesLoader().getDictionary(registered_dictionary_name, local_context);
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index f81503910ca..6eadd1b2c21 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -69,7 +69,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned threads) override;
+        size_t threads) override;
 
     static NamesAndTypesList getNamesAndTypes(const DictionaryStructure & dictionary_structure);
     static String generateNamesAndTypesDescription(const NamesAndTypesList & list);
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index 4eb6697dd6e..bced552915b 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -653,7 +653,7 @@ void StorageDistributed::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     const auto * select_query = query_info.query->as<ASTSelectQuery>();
     if (select_query->final() && local_context->getSettingsRef().allow_experimental_parallel_reading_from_replicas)
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 7cb25ae46ab..334f44a90f9 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -112,7 +112,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t /*max_block_size*/,
-        unsigned /*num_streams*/) override;
+        size_t /*num_streams*/) override;
 
     bool supportsParallelInsert() const override { return true; }
     std::optional<UInt64> totalBytes(const Settings &) const override;
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index 2931e62b7ef..cd3cc4d48ac 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -111,7 +111,7 @@ void StorageExecutable::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned /*threads*/)
+    size_t /*threads*/)
 {
     auto & script_name = settings.script_name;
 
diff --git a/src/Storages/StorageExecutable.h b/src/Storages/StorageExecutable.h
index 2638474082a..2393920fa3c 100644
--- a/src/Storages/StorageExecutable.h
+++ b/src/Storages/StorageExecutable.h
@@ -41,7 +41,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned threads) override;
+        size_t threads) override;
 
 private:
     ExecutableSettings settings;
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
index dcb7a90b2f6..7d1eef1e47c 100644
--- a/src/Storages/StorageExternalDistributed.cpp
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -181,7 +181,7 @@ void StorageExternalDistributed::read(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     std::vector<std::unique_ptr<QueryPlan>> plans;
     for (const auto & shard : shards)
diff --git a/src/Storages/StorageExternalDistributed.h b/src/Storages/StorageExternalDistributed.h
index 52a2a7a4106..a1bdb41dded 100644
--- a/src/Storages/StorageExternalDistributed.h
+++ b/src/Storages/StorageExternalDistributed.h
@@ -55,7 +55,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
 private:
     using Shards = std::unordered_set<StoragePtr>;
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 29f2d0667d9..eb3ed3f8ef3 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -209,7 +209,7 @@ std::unique_ptr<ReadBuffer> createReadBuffer(
         in.setProgressCallback(context);
     }
 
-    auto zstd_window_log_max = context->getSettingsRef().zstd_window_log_max;
+    int zstd_window_log_max = static_cast<int>(context->getSettingsRef().zstd_window_log_max);
     return wrapReadBufferWithCompressionMethod(std::move(nested_buffer), method, zstd_window_log_max);
 }
 
@@ -645,7 +645,7 @@ Pipe StorageFile::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     if (use_table_fd)
     {
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index e60e5f6b371..03b3aacb67f 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -48,7 +48,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(
         const ASTPtr & query,
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index 9cac1e57297..c00e82598b2 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -494,7 +494,7 @@ Pipe StorageGenerateRandom::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/StorageGenerateRandom.h b/src/Storages/StorageGenerateRandom.h
index 8dc3e490ae7..6b050c07e52 100644
--- a/src/Storages/StorageGenerateRandom.h
+++ b/src/Storages/StorageGenerateRandom.h
@@ -28,7 +28,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool supportsTransactions() const override { return true; }
 private:
diff --git a/src/Storages/StorageInput.cpp b/src/Storages/StorageInput.cpp
index 4729d0a5bf8..18e8442c1b5 100644
--- a/src/Storages/StorageInput.cpp
+++ b/src/Storages/StorageInput.cpp
@@ -57,7 +57,7 @@ Pipe StorageInput::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
-    unsigned /*num_streams*/)
+    size_t /*num_streams*/)
 {
     Pipes pipes;
     auto query_context = context->getQueryContext();
diff --git a/src/Storages/StorageInput.h b/src/Storages/StorageInput.h
index 991a4f35b7b..da4669aaf37 100644
--- a/src/Storages/StorageInput.h
+++ b/src/Storages/StorageInput.h
@@ -25,7 +25,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
 private:
     Pipe pipe;
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index 2e3e1d443ae..e4f786cd23b 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -585,7 +585,7 @@ Pipe StorageJoin::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned /*num_streams*/)
+    size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index 390af09422c..43515f800d9 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -68,7 +68,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index e62874490f8..21be205c0f6 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -408,7 +408,7 @@ Pipe StorageKeeperMap::read(
     ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     checkTable<true>();
     storage_snapshot->check(column_names);
@@ -682,24 +682,20 @@ Chunk StorageKeeperMap::getBySerializedKeys(const std::span<const std::string> k
 
     auto client = getClient();
 
-    std::vector<std::future<Coordination::GetResponse>> values;
-    values.reserve(keys.size());
+    Strings full_key_paths;
+    full_key_paths.reserve(keys.size());
 
     for (const auto & key : keys)
     {
-        const auto full_path = fullPathForKey(key);
-        values.emplace_back(client->asyncTryGet(full_path));
+        full_key_paths.emplace_back(fullPathForKey(key));
     }
 
-    auto wait_until = std::chrono::system_clock::now() + std::chrono::milliseconds(Coordination::DEFAULT_OPERATION_TIMEOUT_MS);
+    auto values = client->tryGet(full_key_paths);
 
     for (size_t i = 0; i < keys.size(); ++i)
     {
-        auto & value = values[i];
-        if (value.wait_until(wait_until) != std::future_status::ready)
-            throw DB::Exception(ErrorCodes::KEEPER_EXCEPTION, "Failed to fetch values: timeout");
+        auto response = values[i];
 
-        auto response = value.get();
         Coordination::Error code = response.error;
 
         if (code == Coordination::Error::ZOK)
diff --git a/src/Storages/StorageKeeperMap.h b/src/Storages/StorageKeeperMap.h
index 87861362e42..45b32434f15 100644
--- a/src/Storages/StorageKeeperMap.h
+++ b/src/Storages/StorageKeeperMap.h
@@ -39,7 +39,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override;
 
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index c6bc55fd620..9909489d901 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -782,7 +782,7 @@ Pipe StorageLog::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/StorageLog.h b/src/Storages/StorageLog.h
index 2e677dd3161..a2b1356f240 100644
--- a/src/Storages/StorageLog.h
+++ b/src/Storages/StorageLog.h
@@ -53,7 +53,7 @@ public:
         ContextPtr local_context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context) override;
 
diff --git a/src/Storages/StorageMaterializedMySQL.cpp b/src/Storages/StorageMaterializedMySQL.cpp
index bb69f211a9e..0dc0b1bff0b 100644
--- a/src/Storages/StorageMaterializedMySQL.cpp
+++ b/src/Storages/StorageMaterializedMySQL.cpp
@@ -40,7 +40,7 @@ void StorageMaterializedMySQL::read(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned int num_streams)
+    size_t num_streams)
 {
     if (const auto * db = typeid_cast<const DatabaseMaterializedMySQL *>(database))
         db->rethrowExceptionIfNeeded();
diff --git a/src/Storages/StorageMaterializedMySQL.h b/src/Storages/StorageMaterializedMySQL.h
index a66b7eba804..cbb59e508e8 100644
--- a/src/Storages/StorageMaterializedMySQL.h
+++ b/src/Storages/StorageMaterializedMySQL.h
@@ -24,8 +24,13 @@ public:
     bool needRewriteQueryWithFinal(const Names & column_names) const override;
 
     void read(
-        QueryPlan & query_plan, const Names & column_names, const StorageSnapshotPtr & metadata_snapshot, SelectQueryInfo & query_info,
-        ContextPtr context, QueryProcessingStage::Enum processed_stage, size_t max_block_size, unsigned num_streams) override;
+        QueryPlan & query_plan,
+        const Names & column_names,
+        const StorageSnapshotPtr & metadata_snapshot,
+        SelectQueryInfo & query_info,
+        ContextPtr context,
+        QueryProcessingStage::Enum processed_stage,
+        size_t max_block_size, size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr &, const StorageMetadataPtr &, ContextPtr) override { throwNotAllowed(); }
 
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index b01415f9590..e256e087728 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -150,7 +150,7 @@ void StorageMaterializedView::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
-    const unsigned num_streams)
+    const size_t num_streams)
 {
     auto storage = getTargetTable();
     auto lock = storage->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
diff --git a/src/Storages/StorageMaterializedView.h b/src/Storages/StorageMaterializedView.h
index 1d8808b302e..af2dedf8164 100644
--- a/src/Storages/StorageMaterializedView.h
+++ b/src/Storages/StorageMaterializedView.h
@@ -91,7 +91,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     Strings getDataPaths() const override;
 
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index e4dbfe15095..957aae450c8 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -231,7 +231,7 @@ Pipe StorageMemory::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
-    unsigned num_streams)
+    size_t num_streams)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index 3889acb952b..c739088dbe4 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -51,7 +51,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool supportsParallelInsert() const override { return true; }
     bool supportsSubcolumns() const override { return true; }
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 9891340a0d0..c9067148739 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -249,7 +249,7 @@ void StorageMerge::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     /** Just in case, turn off optimization "transfer to PREWHERE",
       * since there is no certainty that it works when one of table is MergeTree and other is not.
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index 6bf68660803..33406321100 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -61,7 +61,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index aea853b6c39..aac5372a83e 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -220,7 +220,7 @@ void StorageMergeTree::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     /// If true, then we will ask initiator if we can read chosen ranges
     bool enable_parallel_reading = local_context->getClientInfo().collaborate_with_initiator;
@@ -798,7 +798,7 @@ void StorageMergeTree::loadMutations()
         increment.value = std::max(increment.value.load(), current_mutations_by_version.rbegin()->first);
 }
 
-std::shared_ptr<MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMerge(
+MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
     const StorageMetadataPtr & metadata_snapshot,
     bool aggressive,
     const String & partition_id,
@@ -943,7 +943,7 @@ bool StorageMergeTree::merge(
 
     SelectPartsDecision select_decision;
 
-    std::shared_ptr<MergeMutateSelectedEntry> merge_mutate_entry;
+    MergeMutateSelectedEntryPtr merge_mutate_entry;
 
     {
         std::unique_lock lock(currently_processing_in_background_mutex);
@@ -989,18 +989,10 @@ bool StorageMergeTree::partIsAssignedToBackgroundOperation(const DataPartPtr & p
     return currently_merging_mutating_parts.contains(part);
 }
 
-std::shared_ptr<MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMutate(
+MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
     const StorageMetadataPtr & metadata_snapshot, String * /* disable_reason */, TableLockHolder & /* table_lock_holder */,
     std::unique_lock<std::mutex> & /*currently_processing_in_background_mutex_lock*/)
 {
-    size_t max_ast_elements = getContext()->getSettingsRef().max_expanded_ast_elements;
-
-    auto future_part = std::make_shared<FutureMergedMutatedPart>();
-    if (storage_settings.get()->assign_part_uuids)
-        future_part->uuid = UUIDHelpers::generateV4();
-
-    CurrentlyMergingPartsTaggerPtr tagger;
-
     if (current_mutations_by_version.empty())
         return {};
 
@@ -1014,6 +1006,14 @@ std::shared_ptr<MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMutate(
         return {};
     }
 
+    size_t max_ast_elements = getContext()->getSettingsRef().max_expanded_ast_elements;
+
+    auto future_part = std::make_shared<FutureMergedMutatedPart>();
+    if (storage_settings.get()->assign_part_uuids)
+        future_part->uuid = UUIDHelpers::generateV4();
+
+    CurrentlyMergingPartsTaggerPtr tagger;
+
     auto mutations_end_it = current_mutations_by_version.end();
     for (const auto & part : getDataPartsVectorForInternalUsage())
     {
@@ -1132,7 +1132,7 @@ bool StorageMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assign
     assert(!isStaticStorage());
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
-    std::shared_ptr<MergeMutateSelectedEntry> merge_entry, mutate_entry;
+    MergeMutateSelectedEntryPtr merge_entry, mutate_entry;
 
     auto share_lock = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
 
@@ -1152,7 +1152,8 @@ bool StorageMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assign
             return false;
 
         merge_entry = selectPartsToMerge(metadata_snapshot, false, {}, false, nullptr, share_lock, lock, txn);
-        if (!merge_entry)
+
+        if (!merge_entry && !current_mutations_by_version.empty())
             mutate_entry = selectPartsToMutate(metadata_snapshot, nullptr, share_lock, lock);
 
         has_mutations = !current_mutations_by_version.empty();
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index b36850f9f4a..745546b96f6 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -66,7 +66,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override;
     std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, ContextPtr) const override;
@@ -187,7 +187,7 @@ private:
 
     friend struct CurrentlyMergingPartsTagger;
 
-    std::shared_ptr<MergeMutateSelectedEntry> selectPartsToMerge(
+    MergeMutateSelectedEntryPtr selectPartsToMerge(
         const StorageMetadataPtr & metadata_snapshot,
         bool aggressive,
         const String & partition_id,
@@ -200,7 +200,7 @@ private:
         SelectPartsDecision * select_decision_out = nullptr);
 
 
-    std::shared_ptr<MergeMutateSelectedEntry> selectPartsToMutate(
+    MergeMutateSelectedEntryPtr selectPartsToMutate(
         const StorageMetadataPtr & metadata_snapshot, String * disable_reason,
         TableLockHolder & table_lock_holder, std::unique_lock<std::mutex> & currently_processing_in_background_mutex_lock);
 
diff --git a/src/Storages/StorageMongoDB.cpp b/src/Storages/StorageMongoDB.cpp
index dce45b2431a..3ae9c974770 100644
--- a/src/Storages/StorageMongoDB.cpp
+++ b/src/Storages/StorageMongoDB.cpp
@@ -150,7 +150,7 @@ Pipe StorageMongoDB::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned)
+    size_t /*num_streams*/)
 {
     connectIfNotConnected();
 
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index 0e00b80432b..04fb759133a 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -37,7 +37,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(
         const ASTPtr & query,
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index 4ccd31ab981..20eb59c7262 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -78,7 +78,7 @@ Pipe StorageMySQL::read(
     ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
-    unsigned)
+    size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names_);
     String query = transformQueryForExternalDatabase(
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index e3c0712c179..bf9a24c9bfe 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -46,7 +46,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
diff --git a/src/Storages/StorageNull.h b/src/Storages/StorageNull.h
index 0011b5c94ad..2270731c0e3 100644
--- a/src/Storages/StorageNull.h
+++ b/src/Storages/StorageNull.h
@@ -35,8 +35,8 @@ public:
         SelectQueryInfo &,
         ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processing_stage*/,
-        size_t,
-        unsigned) override
+        size_t /*max_block_size*/,
+        size_t /*num_streams*/) override
     {
         return Pipe(
             std::make_shared<NullSource>(storage_snapshot->getSampleBlockForColumns(column_names)));
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index e0c6dbf5463..6cf4e458438 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -81,7 +81,7 @@ Pipe StoragePostgreSQL::read(
     ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size_,
-    unsigned)
+    size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names_);
 
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index 0755e33269e..97c62daa50f 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -38,7 +38,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
diff --git a/src/Storages/StorageProxy.h b/src/Storages/StorageProxy.h
index 0fabff59db4..2afd9e8a63b 100644
--- a/src/Storages/StorageProxy.h
+++ b/src/Storages/StorageProxy.h
@@ -50,7 +50,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override
+        size_t num_streams) override
     {
         return getNested()->watch(column_names, query_info, context, processed_stage, max_block_size, num_streams);
     }
@@ -63,7 +63,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override
+        size_t num_streams) override
     {
         return getNested()->read(query_plan, column_names, storage_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
     }
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index b55c59a3d6e..ef56ade2d58 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -179,6 +179,7 @@ namespace ActionLocks
 static const auto QUEUE_UPDATE_ERROR_SLEEP_MS        = 1 * 1000;
 static const auto MUTATIONS_FINALIZING_SLEEP_MS      = 1 * 1000;
 static const auto MUTATIONS_FINALIZING_IDLE_SLEEP_MS = 5 * 1000;
+const String StorageReplicatedMergeTree::default_zookeeper_name = "default";
 
 void StorageReplicatedMergeTree::setZooKeeper()
 {
@@ -285,21 +286,32 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     , replicated_fetches_throttler(std::make_shared<Throttler>(getSettings()->max_replicated_fetches_network_bandwidth, getContext()->getReplicatedFetchesThrottler()))
     , replicated_sends_throttler(std::make_shared<Throttler>(getSettings()->max_replicated_sends_network_bandwidth, getContext()->getReplicatedSendsThrottler()))
 {
+    /// We create and deactivate all tasks for consistency.
+    /// They all will be scheduled and activated by the restarting thread.
     queue_updating_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::queueUpdatingTask)", [this]{ queueUpdatingTask(); });
 
+    queue_updating_task->deactivate();
+
     mutations_updating_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mutationsUpdatingTask)", [this]{ mutationsUpdatingTask(); });
 
+    mutations_updating_task->deactivate();
+
     merge_selecting_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mergeSelectingTask)", [this] { mergeSelectingTask(); });
 
-    /// Will be activated if we win leader election.
+    /// Will be activated if we will achieve leader state.
     merge_selecting_task->deactivate();
 
     mutations_finalizing_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mutationsFinalizingTask)", [this] { mutationsFinalizingTask(); });
 
+    /// This task can be scheduled by different parts of code even when storage is readonly.
+    /// This can lead to redundant exceptions during startup.
+    /// Will be activated by restarting thread.
+    mutations_finalizing_task->deactivate();
+
     bool has_zookeeper = getContext()->hasZooKeeper() || getContext()->hasAuxiliaryZooKeeper(zookeeper_name);
     if (has_zookeeper)
     {
@@ -2408,6 +2420,7 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
     std::vector<QueueEntryInfo> source_queue;
     ActiveDataPartSet get_part_set{format_version};
     ActiveDataPartSet drop_range_set{format_version};
+    std::unordered_set<String> exact_part_names;
 
     {
         std::vector<zkutil::ZooKeeper::FutureGet> queue_get_futures;
@@ -2445,14 +2458,22 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
             info.parsed_entry->znode_name = source_queue_names[i];
 
             if (info.parsed_entry->type == LogEntry::DROP_RANGE)
+            {
                 drop_range_set.add(info.parsed_entry->new_part_name);
-
-            if (info.parsed_entry->type == LogEntry::GET_PART)
+            }
+            else if (info.parsed_entry->type == LogEntry::GET_PART)
             {
                 String maybe_covering_drop_range = drop_range_set.getContainingPart(info.parsed_entry->new_part_name);
                 if (maybe_covering_drop_range.empty())
                     get_part_set.add(info.parsed_entry->new_part_name);
             }
+            else
+            {
+                /// We should keep local parts if they present in the queue of source replica.
+                /// There's a chance that we are the only replica that has these parts.
+                Strings entry_virtual_parts = info.parsed_entry->getVirtualPartNames(format_version);
+                std::move(entry_virtual_parts.begin(), entry_virtual_parts.end(), std::inserter(exact_part_names, exact_part_names.end()));
+            }
         }
     }
 
@@ -2472,11 +2493,17 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
 
     for (const auto & part : local_parts_in_zk)
     {
-        if (get_part_set.getContainingPart(part).empty())
-        {
-            parts_to_remove_from_zk.emplace_back(part);
-            LOG_WARNING(log, "Source replica does not have part {}. Removing it from ZooKeeper.", part);
-        }
+        /// We look for exact match (and not for any covering part)
+        /// because our part might be dropped and covering part might be merged though gap.
+        /// (avoid resurrection of data that was removed a long time ago)
+        if (get_part_set.getContainingPart(part) == part)
+            continue;
+
+        if (exact_part_names.contains(part))
+            continue;
+
+        parts_to_remove_from_zk.emplace_back(part);
+        LOG_WARNING(log, "Source replica does not have part {}. Removing it from ZooKeeper.", part);
     }
 
     {
@@ -2498,11 +2525,14 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
 
     for (const auto & part : local_active_parts)
     {
-        if (get_part_set.getContainingPart(part->name).empty())
-        {
-            parts_to_remove_from_working_set.emplace_back(part);
-            LOG_WARNING(log, "Source replica does not have part {}. Removing it from working set.", part->name);
-        }
+        if (get_part_set.getContainingPart(part->name) == part->name)
+            continue;
+
+        if (exact_part_names.contains(part->name))
+            continue;
+
+        parts_to_remove_from_working_set.emplace_back(part);
+        LOG_WARNING(log, "Source replica does not have part {}. Removing it from working set.", part->name);
     }
 
     if (getSettings()->detach_old_local_parts_when_cloning_replica)
@@ -3206,16 +3236,17 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     int32_t log_version,
     MergeType merge_type)
 {
-    std::vector<std::future<Coordination::ExistsResponse>> exists_futures;
-    exists_futures.reserve(parts.size());
+    Strings exists_paths;
+    exists_paths.reserve(parts.size());
     for (const auto & part : parts)
-        exists_futures.emplace_back(zookeeper->asyncExists(fs::path(replica_path) / "parts" / part->name));
+        exists_paths.emplace_back(fs::path(replica_path) / "parts" / part->name);
 
+    auto exists_results = zookeeper->exists(exists_paths);
     bool all_in_zk = true;
     for (size_t i = 0; i < parts.size(); ++i)
     {
         /// If there is no information about part in ZK, we will not merge it.
-        if (exists_futures[i].get().error == Coordination::Error::ZNONODE)
+        if (exists_results[i].error == Coordination::Error::ZNONODE)
         {
             all_in_zk = false;
 
@@ -4339,7 +4370,7 @@ void StorageReplicatedMergeTree::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
-    const unsigned num_streams)
+    const size_t num_streams)
 {
     /// If true, then we will ask initiator if we can read chosen ranges
     const bool enable_parallel_reading = local_context->getClientInfo().collaborate_with_initiator;
@@ -5544,7 +5575,8 @@ void StorageReplicatedMergeTree::getStatus(Status & res, bool with_zk_fields)
     res.queue = queue.getStatus();
     res.absolute_delay = getAbsoluteDelay(); /// NOTE: may be slightly inconsistent with queue status.
 
-    res.parts_to_check = part_check_thread.size();
+    /// NOTE: consider convert to UInt64
+    res.parts_to_check = static_cast<UInt32>(part_check_thread.size());
 
     res.zookeeper_path = zookeeper_path;
     res.replica_name = replica_name;
@@ -6228,19 +6260,20 @@ void StorageReplicatedMergeTree::removePartsFromZooKeeperWithRetries(const Strin
 
             auto zookeeper = getZooKeeper();
 
-            std::vector<std::future<Coordination::ExistsResponse>> exists_futures;
-            exists_futures.reserve(part_names.size());
+            Strings exists_paths;
+            exists_paths.reserve(part_names.size());
             for (const String & part_name : part_names)
             {
-                String part_path = fs::path(replica_path) / "parts" / part_name;
-                exists_futures.emplace_back(zookeeper->asyncExists(part_path));
+                exists_paths.emplace_back(fs::path(replica_path) / "parts" / part_name);
             }
 
+            auto exists_results = zookeeper->exists(exists_paths);
+
             std::vector<std::future<Coordination::MultiResponse>> remove_futures;
             remove_futures.reserve(part_names.size());
             for (size_t i = 0; i < part_names.size(); ++i)
             {
-                Coordination::ExistsResponse exists_resp = exists_futures[i].get();
+                Coordination::ExistsResponse exists_resp = exists_results[i];
                 if (exists_resp.error == Coordination::Error::ZOK)
                 {
                     Coordination::Requests ops;
@@ -6286,9 +6319,9 @@ void StorageReplicatedMergeTree::removePartsFromZooKeeperWithRetries(const Strin
 void StorageReplicatedMergeTree::removePartsFromZooKeeper(
     zkutil::ZooKeeperPtr & zookeeper, const Strings & part_names, NameSet * parts_should_be_retried)
 {
-    std::vector<std::future<Coordination::ExistsResponse>> exists_futures;
+    Strings exists_paths;
     std::vector<std::future<Coordination::MultiResponse>> remove_futures;
-    exists_futures.reserve(part_names.size());
+    exists_paths.reserve(part_names.size());
     remove_futures.reserve(part_names.size());
     try
     {
@@ -6296,13 +6329,14 @@ void StorageReplicatedMergeTree::removePartsFromZooKeeper(
         /// if zk session will be dropped
         for (const String & part_name : part_names)
         {
-            String part_path = fs::path(replica_path) / "parts" / part_name;
-            exists_futures.emplace_back(zookeeper->asyncExists(part_path));
+            exists_paths.emplace_back(fs::path(replica_path) / "parts" / part_name);
         }
 
+        auto exists_results = zookeeper->exists(exists_paths);
+
         for (size_t i = 0; i < part_names.size(); ++i)
         {
-            Coordination::ExistsResponse exists_resp = exists_futures[i].get();
+            auto exists_resp = exists_results[i];
             if (exists_resp.error == Coordination::Error::ZOK)
             {
                 Coordination::Requests ops;
@@ -7673,14 +7707,14 @@ namespace
 /// But sometimes we need an opposite. When we deleting all_0_0_0_1 it can be non replicated to other replicas, so we are the only owner of this part.
 /// In this case when we will drop all_0_0_0_1 we will drop blobs for all_0_0_0. But it will lead to dataloss. For such case we need to check that other replicas
 /// still need parent part.
-NameSet getParentLockedBlobs(zkutil::ZooKeeperPtr zookeeper_ptr, const std::string & zero_copy_part_path_prefix, const std::string & part_info_str, MergeTreeDataFormatVersion format_version, Poco::Logger * log)
+std::pair<bool, NameSet> getParentLockedBlobs(zkutil::ZooKeeperPtr zookeeper_ptr, const std::string & zero_copy_part_path_prefix, const std::string & part_info_str, MergeTreeDataFormatVersion format_version, Poco::Logger * log)
 {
     NameSet files_not_to_remove;
 
     MergeTreePartInfo part_info = MergeTreePartInfo::fromPartName(part_info_str, format_version);
     /// No mutations -- no hardlinks -- no issues
     if (part_info.mutation == 0)
-        return files_not_to_remove;
+        return {false, files_not_to_remove};
 
     /// Getting all zero copy parts
     Strings parts_str;
@@ -7725,17 +7759,17 @@ NameSet getParentLockedBlobs(zkutil::ZooKeeperPtr zookeeper_ptr, const std::stri
                 LOG_TRACE(log, "Found files not to remove from parent part {}: [{}]", part_candidate_info_str, fmt::join(files_not_to_remove, ", "));
             }
 
-            break;
+            return {true, files_not_to_remove};
         }
     }
-    return files_not_to_remove;
+    return {false, files_not_to_remove};
 }
 
 }
 
 std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
         String part_id, const String & table_uuid, const String & part_name,
-        const String & replica_name_, std::string disk_type, zkutil::ZooKeeperPtr zookeeper_ptr, const MergeTreeSettings & settings,
+        const String & replica_name_, const std::string & disk_type, zkutil::ZooKeeperPtr zookeeper_ptr, const MergeTreeSettings & settings,
         Poco::Logger * logger, const String & zookeeper_path_old, MergeTreeDataFormatVersion data_format_version)
 {
     boost::replace_all(part_id, "/", "_");
@@ -7754,7 +7788,7 @@ std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
         if (!files_not_to_remove_str.empty())
             boost::split(files_not_to_remove, files_not_to_remove_str, boost::is_any_of("\n "));
 
-        auto parent_not_to_remove = getParentLockedBlobs(zookeeper_ptr, fs::path(zc_zookeeper_path).parent_path(), part_name, data_format_version, logger);
+        auto [has_parent, parent_not_to_remove] = getParentLockedBlobs(zookeeper_ptr, fs::path(zc_zookeeper_path).parent_path(), part_name, data_format_version, logger);
         files_not_to_remove.insert(parent_not_to_remove.begin(), parent_not_to_remove.end());
 
         String zookeeper_part_uniq_node = fs::path(zc_zookeeper_path) / part_id;
@@ -7764,9 +7798,23 @@ std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
 
         LOG_TRACE(logger, "Remove zookeeper lock {} for part {}", zookeeper_part_replica_node, part_name);
 
-        if (auto ec = zookeeper_ptr->tryRemove(zookeeper_part_replica_node); ec != Coordination::Error::ZOK && ec != Coordination::Error::ZNONODE)
+        if (auto ec = zookeeper_ptr->tryRemove(zookeeper_part_replica_node); ec != Coordination::Error::ZOK)
         {
-            throw zkutil::KeeperException(ec, zookeeper_part_replica_node);
+            /// Very complex case. It means that lock already doesn't exist when we tried to remove it.
+            /// So we don't know are we owner of this part or not. Maybe we just mutated it, renamed on disk and failed to lock in ZK.
+            /// But during mutation we can have hardlinks to another part. So it's not Ok to remove blobs of this part if it was mutated.
+            if (ec == Coordination::Error::ZNONODE)
+            {
+                if (has_parent)
+                {
+                    LOG_INFO(logger, "Lock on path {} for part {} doesn't exist, refuse to remove blobs", zookeeper_part_replica_node, part_name);
+                    return {false, {}};
+                }
+            }
+            else
+            {
+                throw zkutil::KeeperException(ec, zookeeper_part_replica_node);
+            }
         }
 
         /// Check, maybe we were the last replica and can remove part forever
@@ -7942,7 +7990,7 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
 
 
 Strings StorageReplicatedMergeTree::getZeroCopyPartPath(
-    const MergeTreeSettings & settings, std::string disk_type, const String & table_uuid,
+    const MergeTreeSettings & settings, const std::string & disk_type, const String & table_uuid,
     const String & part_name, const String & zookeeper_path_old)
 {
     Strings res;
@@ -7950,11 +7998,11 @@ Strings StorageReplicatedMergeTree::getZeroCopyPartPath(
     String zero_copy = fmt::format("zero_copy_{}", disk_type);
 
     String new_path = fs::path(settings.remote_fs_zero_copy_zookeeper_path.toString()) / zero_copy / table_uuid / part_name;
-    res.push_back(new_path);
+    res.push_back(std::move(new_path));
     if (settings.remote_fs_zero_copy_path_compatible_mode && !zookeeper_path_old.empty())
     { /// Compatibility mode for cluster with old and new versions
         String old_path = fs::path(zookeeper_path_old) / zero_copy / "shared" / part_name;
-        res.push_back(old_path);
+        res.push_back(std::move(old_path));
     }
 
     return res;
@@ -8347,7 +8395,7 @@ bool StorageReplicatedMergeTree::removeDetachedPart(DiskPtr disk, const String &
     if (disk->supportZeroCopyReplication())
     {
         String table_id = getTableSharedID();
-        return removeSharedDetachedPart(disk, path, part_name, table_id, zookeeper_name, replica_name, zookeeper_path, getContext(), current_zookeeper);
+        return removeSharedDetachedPart(disk, path, part_name, table_id, replica_name, zookeeper_path, getContext(), current_zookeeper);
     }
 
     disk->removeRecursive(path);
@@ -8357,7 +8405,7 @@ bool StorageReplicatedMergeTree::removeDetachedPart(DiskPtr disk, const String &
 
 
 bool StorageReplicatedMergeTree::removeSharedDetachedPart(DiskPtr disk, const String & path, const String & part_name, const String & table_uuid,
-    const String &, const String & detached_replica_name, const String & detached_zookeeper_path, ContextPtr local_context, const zkutil::ZooKeeperPtr & zookeeper)
+    const String & detached_replica_name, const String & detached_zookeeper_path, const ContextPtr & local_context, const zkutil::ZooKeeperPtr & zookeeper)
 {
     bool keep_shared = false;
 
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index e10ffcce22c..436defebe1d 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -131,7 +131,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
     std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, ContextPtr context) const override;
@@ -279,7 +279,7 @@ public:
     /// Return true if data unlocked
     /// Return false if data is still used by another node
     static std::pair<bool, NameSet> unlockSharedDataByID(String part_id, const String & table_uuid, const String & part_name, const String & replica_name_,
-        std::string disk_type, zkutil::ZooKeeperPtr zookeeper_, const MergeTreeSettings & settings, Poco::Logger * logger,
+        const std::string & disk_type, zkutil::ZooKeeperPtr zookeeper_, const MergeTreeSettings & settings, Poco::Logger * logger,
         const String & zookeeper_path_old, MergeTreeDataFormatVersion data_format_version);
 
     /// Fetch part only if some replica has it on shared storage like S3
@@ -288,7 +288,7 @@ public:
     /// Get best replica having this partition on a same type remote disk
     String getSharedDataReplica(const IMergeTreeDataPart & part, DataSourceType data_source_type) const;
 
-    inline String getReplicaName() const { return replica_name; }
+    inline const String & getReplicaName() const { return replica_name; }
 
     /// Restores table metadata if ZooKeeper lost it.
     /// Used only on restarted readonly replicas (not checked). All active (Active) parts are moved to detached/
@@ -310,9 +310,9 @@ public:
     bool createEmptyPartInsteadOfLost(zkutil::ZooKeeperPtr zookeeper, const String & lost_part_name);
 
     // Return default or custom zookeeper name for table
-    String getZooKeeperName() const { return zookeeper_name; }
+    const String & getZooKeeperName() const { return zookeeper_name; }
 
-    String getZooKeeperPath() const { return zookeeper_path; }
+    const String & getZooKeeperPath() const { return zookeeper_path; }
 
     // Return table id, common for different replicas
     String getTableSharedID() const override;
@@ -320,13 +320,13 @@ public:
     /// Returns the same as getTableSharedID(), but extracts it from a create query.
     static std::optional<String> tryGetTableSharedIDFromCreateQuery(const IAST & create_query, const ContextPtr & global_context);
 
-    static String getDefaultZooKeeperName() { return default_zookeeper_name; }
+    static const String & getDefaultZooKeeperName() { return default_zookeeper_name; }
 
     /// Check if there are new broken disks and enqueue part recovery tasks.
     void checkBrokenDisks();
 
     static bool removeSharedDetachedPart(DiskPtr disk, const String & path, const String & part_name, const String & table_uuid,
-        const String & zookeeper_name, const String & replica_name, const String & zookeeper_path, ContextPtr local_context, const zkutil::ZooKeeperPtr & zookeeper);
+        const String & replica_name, const String & zookeeper_path, const ContextPtr & local_context, const zkutil::ZooKeeperPtr & zookeeper);
 
     bool canUseZeroCopyReplication() const;
 private:
@@ -381,11 +381,11 @@ private:
     /// If false - ZooKeeper is available, but there is no table metadata. It's safe to drop table in this case.
     std::optional<bool> has_metadata_in_zookeeper;
 
-    static constexpr auto default_zookeeper_name = "default";
-    String zookeeper_name;
-    String zookeeper_path;
-    String replica_name;
-    String replica_path;
+    static const String default_zookeeper_name;
+    const String zookeeper_name;
+    const String zookeeper_path;
+    const String replica_name;
+    const String replica_path;
 
     /** /replicas/me/is_active.
       */
@@ -829,7 +829,7 @@ private:
     PartitionBlockNumbersHolder allocateBlockNumbersInAffectedPartitions(
         const MutationCommands & commands, ContextPtr query_context, const zkutil::ZooKeeperPtr & zookeeper) const;
 
-    static Strings getZeroCopyPartPath(const MergeTreeSettings & settings, std::string disk_type, const String & table_uuid,
+    static Strings getZeroCopyPartPath(const MergeTreeSettings & settings, const std::string & disk_type, const String & table_uuid,
         const String & part_name, const String & zookeeper_path_old);
 
     static void createZeroCopyLockNode(
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 675dd548088..9a4e37cde1b 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -457,8 +457,9 @@ bool StorageS3Source::initialize()
 
     file_path = fs::path(bucket) / current_key;
 
-    auto zstd_window_log_max = getContext()->getSettingsRef().zstd_window_log_max;
-    read_buf = wrapReadBufferWithCompressionMethod(createS3ReadBuffer(current_key), chooseCompressionMethod(current_key, compression_hint), zstd_window_log_max);
+    int zstd_window_log_max = static_cast<int>(getContext()->getSettingsRef().zstd_window_log_max);
+    read_buf = wrapReadBufferWithCompressionMethod(
+        createS3ReadBuffer(current_key), chooseCompressionMethod(current_key, compression_hint), zstd_window_log_max);
 
     auto input_format = getContext()->getInputFormat(format, *read_buf, sample_block, max_block_size, format_settings);
     QueryPipelineBuilder builder;
@@ -875,7 +876,7 @@ Pipe StorageS3::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     bool has_wildcards = s3_configuration.uri.bucket.find(PARTITION_ID_WILDCARD) != String::npos
         || keys.back().find(PARTITION_ID_WILDCARD) != String::npos;
@@ -1079,12 +1080,12 @@ void StorageS3::updateS3Configuration(ContextPtr ctx, StorageS3::S3Configuration
     S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
         upd.auth_settings.region,
         ctx->getRemoteHostFilter(),
-        ctx->getGlobalContext()->getSettingsRef().s3_max_redirects,
+        static_cast<unsigned>(ctx->getGlobalContext()->getSettingsRef().s3_max_redirects),
         ctx->getGlobalContext()->getSettingsRef().enable_s3_requests_logging,
         /* for_disk_s3 = */ false);
 
     client_configuration.endpointOverride = upd.uri.endpoint;
-    client_configuration.maxConnections = upd.rw_settings.max_connections;
+    client_configuration.maxConnections = static_cast<unsigned>(upd.rw_settings.max_connections);
 
     auto credentials = Aws::Auth::AWSCredentials(upd.auth_settings.access_key_id, upd.auth_settings.secret_access_key);
     auto headers = upd.auth_settings.headers;
@@ -1254,7 +1255,7 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
         }
 
         first = false;
-        const auto zstd_window_log_max = ctx->getSettingsRef().zstd_window_log_max;
+        int zstd_window_log_max = static_cast<int>(ctx->getSettingsRef().zstd_window_log_max);
         return wrapReadBufferWithCompressionMethod(
             std::make_unique<ReadBufferFromS3>(
                 s3_configuration.client, s3_configuration.uri.bucket, key, s3_configuration.uri.version_id, s3_configuration.rw_settings.max_single_read_retries, ctx->getReadSettings()),
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index a983a59d98c..8e79516ba4c 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -171,7 +171,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
@@ -197,7 +197,7 @@ public:
         const S3::URI uri;
         std::shared_ptr<const Aws::S3::S3Client> client;
 
-        S3Settings::AuthSettings auth_settings;
+        S3::AuthSettings auth_settings;
         S3Settings::ReadWriteSettings rw_settings;
 
         /// If s3 configuration was passed from ast, then it is static.
@@ -209,7 +209,7 @@ public:
 
         S3Configuration(
             const String & url_,
-            const S3Settings::AuthSettings & auth_settings_,
+            const S3::AuthSettings & auth_settings_,
             const S3Settings::ReadWriteSettings & rw_settings_,
             const HeaderCollection & headers_from_ast_)
             : uri(S3::URI(url_))
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index df927069bb0..0e4e51f7926 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -97,7 +97,7 @@ Pipe StorageS3Cluster::read(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t /*max_block_size*/,
-    unsigned /*num_streams*/)
+    size_t /*num_streams*/)
 {
     StorageS3::updateS3Configuration(context, s3_configuration);
 
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index d2cf1b917a1..194c2ed0103 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -30,7 +30,7 @@ public:
     std::string getName() const override { return "S3Cluster"; }
 
     Pipe read(const Names &, const StorageSnapshotPtr &, SelectQueryInfo &,
-        ContextPtr, QueryProcessingStage::Enum, size_t /*max_block_size*/, unsigned /*num_streams*/) override;
+        ContextPtr, QueryProcessingStage::Enum, size_t /*max_block_size*/, size_t /*num_streams*/) override;
 
     QueryProcessingStage::Enum
     getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override;
diff --git a/src/Storages/StorageS3Settings.cpp b/src/Storages/StorageS3Settings.cpp
index 4ab3375e188..65e9bb1ab8c 100644
--- a/src/Storages/StorageS3Settings.cpp
+++ b/src/Storages/StorageS3Settings.cpp
@@ -1,5 +1,7 @@
 #include <Storages/StorageS3Settings.h>
 
+#include <IO/S3Common.h>
+
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 #include <Interpreters/Context.h>
@@ -9,10 +11,6 @@
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int INVALID_CONFIG_PARAMETER;
-}
 
 void StorageS3Settings::loadFromConfig(const String & config_elem, const Poco::Util::AbstractConfiguration & config, const Settings & settings)
 {
@@ -46,41 +44,8 @@ void StorageS3Settings::loadFromConfig(const String & config_elem, const Poco::U
         if (config.has(config_elem + "." + key + ".endpoint"))
         {
             auto endpoint = get_string_for_key(key, "endpoint", false);
-            auto access_key_id = get_string_for_key(key, "access_key_id");
-            auto secret_access_key = get_string_for_key(key, "secret_access_key");
-            auto region = get_string_for_key(key, "region");
-            auto server_side_encryption_customer_key_base64 = get_string_for_key(key, "server_side_encryption_customer_key_base64");
 
-            std::optional<bool> use_environment_credentials;
-            if (config.has(config_elem + "." + key + ".use_environment_credentials"))
-                use_environment_credentials = config.getBool(config_elem + "." + key + ".use_environment_credentials");
-
-            std::optional<bool> use_insecure_imds_request;
-            if (config.has(config_elem + "." + key + ".use_insecure_imds_request"))
-                use_insecure_imds_request = config.getBool(config_elem + "." + key + ".use_insecure_imds_request");
-
-            HeaderCollection headers;
-            Poco::Util::AbstractConfiguration::Keys subconfig_keys;
-            config.keys(config_elem + "." + key, subconfig_keys);
-            for (const String & subkey : subconfig_keys)
-            {
-                if (subkey.starts_with("header"))
-                {
-                    auto header_str = config.getString(config_elem + "." + key + "." + subkey);
-                    auto delimiter = header_str.find(':');
-                    if (delimiter == String::npos)
-                        throw Exception("Malformed s3 header value", ErrorCodes::INVALID_CONFIG_PARAMETER);
-                    headers.emplace_back(HttpHeader{header_str.substr(0, delimiter), header_str.substr(delimiter + 1, String::npos)});
-                }
-            }
-
-            S3Settings::AuthSettings auth_settings{
-                    std::move(access_key_id), std::move(secret_access_key),
-                    std::move(region),
-                    std::move(server_side_encryption_customer_key_base64),
-                    std::move(headers),
-                    use_environment_credentials,
-                    use_insecure_imds_request};
+            auto auth_settings = S3::AuthSettings::loadFromConfig(config_elem + "." + key, config);
 
             S3Settings::ReadWriteSettings rw_settings;
             rw_settings.max_single_read_retries = get_uint_for_key(key, "max_single_read_retries", true, settings.s3_max_single_read_retries);
diff --git a/src/Storages/StorageS3Settings.h b/src/Storages/StorageS3Settings.h
index 80ef4f52deb..2da4a1d7590 100644
--- a/src/Storages/StorageS3Settings.h
+++ b/src/Storages/StorageS3Settings.h
@@ -9,6 +9,8 @@
 #include <Interpreters/Context_fwd.h>
 #include <Storages/HeaderCollection.h>
 
+#include <IO/S3Common.h>
+
 namespace Poco::Util
 {
 class AbstractConfiguration;
@@ -21,46 +23,6 @@ struct Settings;
 
 struct S3Settings
 {
-    struct AuthSettings
-    {
-        String access_key_id;
-        String secret_access_key;
-        String region;
-        String server_side_encryption_customer_key_base64;
-
-        HeaderCollection headers;
-
-        std::optional<bool> use_environment_credentials;
-        std::optional<bool> use_insecure_imds_request;
-
-        inline bool operator==(const AuthSettings & other) const
-        {
-            return access_key_id == other.access_key_id && secret_access_key == other.secret_access_key
-                && region == other.region
-                && server_side_encryption_customer_key_base64 == other.server_side_encryption_customer_key_base64
-                && headers == other.headers
-                && use_environment_credentials == other.use_environment_credentials
-                && use_insecure_imds_request == other.use_insecure_imds_request;
-        }
-
-        void updateFrom(const AuthSettings & from)
-        {
-            /// Update with check for emptyness only parameters which
-            /// can be passed not only from config, but via ast.
-
-            if (!from.access_key_id.empty())
-                access_key_id = from.access_key_id;
-            if (!from.secret_access_key.empty())
-                secret_access_key = from.secret_access_key;
-
-            headers = from.headers;
-            region = from.region;
-            server_side_encryption_customer_key_base64 = from.server_side_encryption_customer_key_base64;
-            use_environment_credentials = from.use_environment_credentials;
-            use_insecure_imds_request = from.use_insecure_imds_request;
-        }
-    };
-
     struct ReadWriteSettings
     {
         size_t max_single_read_retries = 0;
@@ -90,7 +52,7 @@ struct S3Settings
         void updateFromSettingsIfEmpty(const Settings & settings);
     };
 
-    AuthSettings auth_settings;
+    S3::AuthSettings auth_settings;
     ReadWriteSettings rw_settings;
 
     inline bool operator==(const S3Settings & other) const
diff --git a/src/Storages/StorageSQLite.cpp b/src/Storages/StorageSQLite.cpp
index a86ed7646b3..92f954ebb9d 100644
--- a/src/Storages/StorageSQLite.cpp
+++ b/src/Storages/StorageSQLite.cpp
@@ -57,7 +57,7 @@ Pipe StorageSQLite::read(
     ContextPtr context_,
     QueryProcessingStage::Enum,
     size_t max_block_size,
-    unsigned int)
+    size_t /*num_streams*/)
 {
     if (!sqlite_db)
         sqlite_db = openSQLiteDB(database_path, getContext(), /* throw_on_error */true);
diff --git a/src/Storages/StorageSQLite.h b/src/Storages/StorageSQLite.h
index b0f209b5bc3..a021c00f627 100644
--- a/src/Storages/StorageSQLite.h
+++ b/src/Storages/StorageSQLite.h
@@ -38,7 +38,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index 0ecbdb0db10..92d53ffc1ac 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -349,7 +349,7 @@ Pipe StorageStripeLog::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    unsigned num_streams)
+    size_t num_streams)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/StorageStripeLog.h b/src/Storages/StorageStripeLog.h
index efdf18c0f7b..3f1b4ed0ad5 100644
--- a/src/Storages/StorageStripeLog.h
+++ b/src/Storages/StorageStripeLog.h
@@ -47,7 +47,7 @@ public:
         ContextPtr local_context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context) override;
 
diff --git a/src/Storages/StorageTableFunction.h b/src/Storages/StorageTableFunction.h
index 2a4bfdf304b..b105e50a54f 100644
--- a/src/Storages/StorageTableFunction.h
+++ b/src/Storages/StorageTableFunction.h
@@ -101,7 +101,7 @@ public:
             ContextPtr context,
             QueryProcessingStage::Enum processed_stage,
             size_t max_block_size,
-            unsigned num_streams) override
+            size_t num_streams) override
     {
         String cnames;
         for (const auto & c : column_names)
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index f1c924a3448..c38b4313359 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -266,6 +266,7 @@ namespace
                 setCredentials(credentials, request_uri);
 
                 const auto settings = context->getSettings();
+                int zstd_window_log_max = static_cast<int>(settings.zstd_window_log_max);
                 try
                 {
                     if (download_threads > 1)
@@ -354,7 +355,7 @@ namespace
                                         threadPoolCallbackRunner<void>(IOThreadPool::get(), "URLParallelRead"),
                                         download_threads),
                                     compression_method,
-                                    settings.zstd_window_log_max);
+                                    zstd_window_log_max);
                             }
                         }
                         catch (const Poco::Exception & e)
@@ -386,7 +387,7 @@ namespace
                             /* use_external_buffer */ false,
                             /* skip_url_not_found_error */ skip_url_not_found_error),
                             compression_method,
-                        settings.zstd_window_log_max);
+                        zstd_window_log_max);
                 }
                 catch (...)
                 {
@@ -641,7 +642,7 @@ Pipe IStorageURLBase::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     auto params = getReadURIParams(column_names, storage_snapshot, query_info, local_context, processed_stage, max_block_size);
 
@@ -730,7 +731,7 @@ Pipe StorageURLWithFailover::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned /*num_streams*/)
+    size_t /*num_streams*/)
 {
     ColumnsDescription columns_description;
     Block block_for_format;
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 63c803f2d26..bf8858b8b66 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -35,7 +35,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
@@ -206,7 +206,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     struct Configuration
     {
diff --git a/src/Storages/StorageValues.cpp b/src/Storages/StorageValues.cpp
index 2a3e1743983..300b11b7346 100644
--- a/src/Storages/StorageValues.cpp
+++ b/src/Storages/StorageValues.cpp
@@ -27,7 +27,7 @@ Pipe StorageValues::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
-    unsigned /*num_streams*/)
+    size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/StorageValues.h b/src/Storages/StorageValues.h
index bf7bf0466e4..55222903797 100644
--- a/src/Storages/StorageValues.h
+++ b/src/Storages/StorageValues.h
@@ -23,7 +23,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     /// Why we may have virtual columns in the storage from a single block?
     /// Because it used as tmp storage for pushing blocks into views, and some
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index adaf1c4e404..a55d7ad3c09 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -111,7 +111,7 @@ void StorageView::read(
         ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         const size_t /*max_block_size*/,
-        const unsigned /*num_streams*/)
+        const size_t /*num_streams*/)
 {
     ASTPtr current_inner_query = storage_snapshot->metadata->getSelectQuery().inner_query;
 
diff --git a/src/Storages/StorageView.h b/src/Storages/StorageView.h
index 31c96addd08..593ac820ad4 100644
--- a/src/Storages/StorageView.h
+++ b/src/Storages/StorageView.h
@@ -32,7 +32,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     static void replaceWithSubquery(ASTSelectQuery & select_query, ASTPtr & view_name, const StorageMetadataPtr & metadata_snapshot)
     {
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index aacbb5fa302..5f57d37278b 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -106,7 +106,7 @@ Pipe StorageXDBC::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/StorageXDBC.h b/src/Storages/StorageXDBC.h
index a2bb9c15baf..aa313e024ca 100644
--- a/src/Storages/StorageXDBC.h
+++ b/src/Storages/StorageXDBC.h
@@ -26,7 +26,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     StorageXDBC(
         const StorageID & table_id_,
diff --git a/src/Storages/System/IStorageSystemOneBlock.h b/src/Storages/System/IStorageSystemOneBlock.h
index 2cfe2de05db..63b9a443f95 100644
--- a/src/Storages/System/IStorageSystemOneBlock.h
+++ b/src/Storages/System/IStorageSystemOneBlock.h
@@ -45,7 +45,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
-        unsigned /*num_streams*/) override
+        size_t /*num_streams*/) override
     {
         storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemBackups.cpp b/src/Storages/System/StorageSystemBackups.cpp
index e7146711c4a..52a26fe0cd6 100644
--- a/src/Storages/System/StorageSystemBackups.cpp
+++ b/src/Storages/System/StorageSystemBackups.cpp
@@ -51,8 +51,8 @@ void StorageSystemBackups::fillData(MutableColumns & res_columns, ContextPtr con
         column_uncompressed_size.insertValue(info.uncompressed_size);
         column_compressed_size.insertValue(info.compressed_size);
         column_error.insertData(info.error_message.data(), info.error_message.size());
-        column_start_time.insertValue(std::chrono::system_clock::to_time_t(info.start_time));
-        column_end_time.insertValue(std::chrono::system_clock::to_time_t(info.end_time));
+        column_start_time.insertValue(static_cast<UInt32>(std::chrono::system_clock::to_time_t(info.start_time)));
+        column_end_time.insertValue(static_cast<UInt32>(std::chrono::system_clock::to_time_t(info.end_time)));
     };
 
     for (const auto & entry : context->getBackupsWorker().getAllInfos())
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index 20cab9fdc47..18e7d269795 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -296,7 +296,7 @@ Pipe StorageSystemColumns::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemColumns.h b/src/Storages/System/StorageSystemColumns.h
index 542e4ce9661..7b4b5dd8fb3 100644
--- a/src/Storages/System/StorageSystemColumns.h
+++ b/src/Storages/System/StorageSystemColumns.h
@@ -24,7 +24,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool isSystemStorage() const override { return true; }
 };
diff --git a/src/Storages/System/StorageSystemDataSkippingIndices.cpp b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
index e725f8a03c6..be04261cc4e 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.cpp
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
@@ -171,7 +171,7 @@ Pipe StorageSystemDataSkippingIndices::read(
     ContextPtr context,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t max_block_size,
-    unsigned int /* num_streams */)
+    size_t /* num_streams */)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemDataSkippingIndices.h b/src/Storages/System/StorageSystemDataSkippingIndices.h
index 046855edd5e..8a1e8c159b4 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.h
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.h
@@ -21,7 +21,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool isSystemStorage() const override { return true; }
 };
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index 574ce4f44c2..d094fefddcb 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -36,7 +36,7 @@ Pipe StorageSystemDetachedParts::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     StoragesInfoStream stream(query_info, context);
 
diff --git a/src/Storages/System/StorageSystemDetachedParts.h b/src/Storages/System/StorageSystemDetachedParts.h
index 23f27816138..20ac69f0eea 100644
--- a/src/Storages/System/StorageSystemDetachedParts.h
+++ b/src/Storages/System/StorageSystemDetachedParts.h
@@ -27,7 +27,7 @@ protected:
             ContextPtr context,
             QueryProcessingStage::Enum /*processed_stage*/,
             size_t /*max_block_size*/,
-            unsigned /*num_streams*/) override;
+            size_t /*num_streams*/) override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDisks.cpp b/src/Storages/System/StorageSystemDisks.cpp
index 6b50b00dc30..86b5eafdf72 100644
--- a/src/Storages/System/StorageSystemDisks.cpp
+++ b/src/Storages/System/StorageSystemDisks.cpp
@@ -37,7 +37,7 @@ Pipe StorageSystemDisks::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemDisks.h b/src/Storages/System/StorageSystemDisks.h
index cd1dc1a8bbf..06cc7e8d4e2 100644
--- a/src/Storages/System/StorageSystemDisks.h
+++ b/src/Storages/System/StorageSystemDisks.h
@@ -27,7 +27,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool isSystemStorage() const override { return true; }
 };
diff --git a/src/Storages/System/StorageSystemErrors.cpp b/src/Storages/System/StorageSystemErrors.cpp
index 4c8c8e60d69..bbe67bc0d21 100644
--- a/src/Storages/System/StorageSystemErrors.cpp
+++ b/src/Storages/System/StorageSystemErrors.cpp
@@ -51,7 +51,7 @@ void StorageSystemErrors::fillData(MutableColumns & res_columns, ContextPtr cont
     for (size_t i = 0, end = ErrorCodes::end(); i < end; ++i)
     {
         const auto & error = ErrorCodes::values[i].get();
-        std::string_view name = ErrorCodes::getName(i);
+        std::string_view name = ErrorCodes::getName(static_cast<ErrorCodes::ErrorCode>(i));
 
         if (name.empty())
             continue;
diff --git a/src/Storages/System/StorageSystemNumbers.cpp b/src/Storages/System/StorageSystemNumbers.cpp
index 523ec25b89c..a4823d7e5e1 100644
--- a/src/Storages/System/StorageSystemNumbers.cpp
+++ b/src/Storages/System/StorageSystemNumbers.cpp
@@ -129,7 +129,7 @@ Pipe StorageSystemNumbers::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemNumbers.h b/src/Storages/System/StorageSystemNumbers.h
index 6bb89c0525e..acddac681ef 100644
--- a/src/Storages/System/StorageSystemNumbers.h
+++ b/src/Storages/System/StorageSystemNumbers.h
@@ -38,7 +38,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool hasEvenlyDistributedRead() const override { return true; }
     bool isSystemStorage() const override { return true; }
diff --git a/src/Storages/System/StorageSystemOne.cpp b/src/Storages/System/StorageSystemOne.cpp
index f262c981b83..3091ffdb51a 100644
--- a/src/Storages/System/StorageSystemOne.cpp
+++ b/src/Storages/System/StorageSystemOne.cpp
@@ -27,7 +27,7 @@ Pipe StorageSystemOne::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemOne.h b/src/Storages/System/StorageSystemOne.h
index 35dba59a99e..d8a26f1def4 100644
--- a/src/Storages/System/StorageSystemOne.h
+++ b/src/Storages/System/StorageSystemOne.h
@@ -28,7 +28,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool isSystemStorage() const override { return true; }
 
diff --git a/src/Storages/System/StorageSystemPartsBase.cpp b/src/Storages/System/StorageSystemPartsBase.cpp
index bcfd670ece9..a0c022f5540 100644
--- a/src/Storages/System/StorageSystemPartsBase.cpp
+++ b/src/Storages/System/StorageSystemPartsBase.cpp
@@ -247,7 +247,7 @@ Pipe StorageSystemPartsBase::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     bool has_state_column = hasStateColumn(column_names, storage_snapshot);
 
diff --git a/src/Storages/System/StorageSystemPartsBase.h b/src/Storages/System/StorageSystemPartsBase.h
index 8db96700e1a..cb6265d82df 100644
--- a/src/Storages/System/StorageSystemPartsBase.h
+++ b/src/Storages/System/StorageSystemPartsBase.h
@@ -63,7 +63,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     NamesAndTypesList getVirtuals() const override;
 
diff --git a/src/Storages/System/StorageSystemQuotaLimits.cpp b/src/Storages/System/StorageSystemQuotaLimits.cpp
index 0261d3d2cd9..6cc269130a0 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.cpp
+++ b/src/Storages/System/StorageSystemQuotaLimits.cpp
@@ -90,7 +90,7 @@ void StorageSystemQuotaLimits::fillData(MutableColumns & res_columns, ContextPtr
     auto add_row = [&](const String & quota_name, const Quota::Limits & limits)
     {
         column_quota_name.insertData(quota_name.data(), quota_name.length());
-        column_duration.push_back(limits.duration.count());
+        column_duration.push_back(static_cast<UInt32>(limits.duration.count()));
         column_is_randomized_interval.push_back(limits.randomize_interval);
 
         for (auto quota_type : collections::range(QuotaType::MAX))
diff --git a/src/Storages/System/StorageSystemQuotaUsage.cpp b/src/Storages/System/StorageSystemQuotaUsage.cpp
index 6ba47a86dbf..5d047dc0359 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotaUsage.cpp
@@ -162,8 +162,8 @@ void StorageSystemQuotaUsage::fillDataImpl(
         time_t end_time = std::chrono::system_clock::to_time_t(interval->end_of_interval);
         UInt32 duration = static_cast<UInt32>(std::chrono::duration_cast<std::chrono::seconds>(interval->duration).count());
         time_t start_time = end_time - duration;
-        column_start_time.getData().push_back(start_time);
-        column_end_time.getData().push_back(end_time);
+        column_start_time.getData().push_back(static_cast<UInt32>(start_time));
+        column_end_time.getData().push_back(static_cast<UInt32>(end_time));
         column_duration.getData().push_back(duration);
         column_start_time_null_map.push_back(false);
         column_end_time_null_map.push_back(false);
diff --git a/src/Storages/System/StorageSystemQuotas.cpp b/src/Storages/System/StorageSystemQuotas.cpp
index 17863fa7326..439883e038a 100644
--- a/src/Storages/System/StorageSystemQuotas.cpp
+++ b/src/Storages/System/StorageSystemQuotas.cpp
@@ -96,7 +96,10 @@ void StorageSystemQuotas::fillData(MutableColumns & res_columns, ContextPtr cont
         column_key_types_offsets.push_back(column_key_types.size());
 
         for (const auto & limits : all_limits)
-            column_durations.push_back(std::chrono::duration_cast<std::chrono::seconds>(limits.duration).count());
+        {
+            column_durations.push_back(
+                static_cast<UInt32>(std::chrono::duration_cast<std::chrono::seconds>(limits.duration).count()));
+        }
         column_durations_offsets.push_back(column_durations.size());
 
         auto apply_to_ast = apply_to.toASTWithNames(access_control);
diff --git a/src/Storages/System/StorageSystemRemoteDataPaths.cpp b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
index de7e1911e44..20076603522 100644
--- a/src/Storages/System/StorageSystemRemoteDataPaths.cpp
+++ b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
@@ -38,7 +38,7 @@ Pipe StorageSystemRemoteDataPaths::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemRemoteDataPaths.h b/src/Storages/System/StorageSystemRemoteDataPaths.h
index f868ae60795..7e883d144ef 100644
--- a/src/Storages/System/StorageSystemRemoteDataPaths.h
+++ b/src/Storages/System/StorageSystemRemoteDataPaths.h
@@ -21,7 +21,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemReplicas.cpp b/src/Storages/System/StorageSystemReplicas.cpp
index e018ccc0733..0f7877a6e41 100644
--- a/src/Storages/System/StorageSystemReplicas.cpp
+++ b/src/Storages/System/StorageSystemReplicas.cpp
@@ -66,7 +66,7 @@ Pipe StorageSystemReplicas::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemReplicas.h b/src/Storages/System/StorageSystemReplicas.h
index fc7f8f15861..e9c29dec0fd 100644
--- a/src/Storages/System/StorageSystemReplicas.h
+++ b/src/Storages/System/StorageSystemReplicas.h
@@ -25,7 +25,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool isSystemStorage() const override { return true; }
 };
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index 549ce193137..df3d8b74e6e 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -258,7 +258,7 @@ Pipe StorageSystemStackTrace::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
@@ -324,7 +324,7 @@ Pipe StorageSystemStackTrace::read(
             sigval sig_value{};
 
             sig_value.sival_int = sequence_num.load(std::memory_order_acquire);
-            if (0 != ::sigqueue(tid, sig, sig_value))
+            if (0 != ::sigqueue(static_cast<int>(tid), sig, sig_value))
             {
                 /// The thread may has been already finished.
                 if (ESRCH == errno)
diff --git a/src/Storages/System/StorageSystemStackTrace.h b/src/Storages/System/StorageSystemStackTrace.h
index dd613882e49..9133a86aa55 100644
--- a/src/Storages/System/StorageSystemStackTrace.h
+++ b/src/Storages/System/StorageSystemStackTrace.h
@@ -33,7 +33,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool isSystemStorage() const override { return true; }
 
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index 832c430e2be..b42bd7859dd 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -44,7 +44,7 @@ Pipe StorageSystemStoragePolicies::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemStoragePolicies.h b/src/Storages/System/StorageSystemStoragePolicies.h
index 3340a4b5e62..afc729c8368 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.h
+++ b/src/Storages/System/StorageSystemStoragePolicies.h
@@ -27,7 +27,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool isSystemStorage() const override { return true; }
 };
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index e36b22a979e..83f922850a3 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -574,7 +574,7 @@ Pipe StorageSystemTables::read(
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemTables.h b/src/Storages/System/StorageSystemTables.h
index 11ac75aab08..60b6144f122 100644
--- a/src/Storages/System/StorageSystemTables.h
+++ b/src/Storages/System/StorageSystemTables.h
@@ -25,7 +25,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool isSystemStorage() const override { return true; }
 };
diff --git a/src/Storages/System/StorageSystemZeros.cpp b/src/Storages/System/StorageSystemZeros.cpp
index 9e5836fa358..6c2ddd8d3dd 100644
--- a/src/Storages/System/StorageSystemZeros.cpp
+++ b/src/Storages/System/StorageSystemZeros.cpp
@@ -97,7 +97,7 @@ Pipe StorageSystemZeros::read(
     ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    unsigned num_streams)
+    size_t num_streams)
 {
     storage_snapshot->check(column_names);
 
diff --git a/src/Storages/System/StorageSystemZeros.h b/src/Storages/System/StorageSystemZeros.h
index 5461feacb6b..64443a3cfd6 100644
--- a/src/Storages/System/StorageSystemZeros.h
+++ b/src/Storages/System/StorageSystemZeros.h
@@ -29,7 +29,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     bool hasEvenlyDistributedRead() const override { return true; }
     bool isSystemStorage() const override { return true; }
diff --git a/src/Storages/WindowView/StorageWindowView.cpp b/src/Storages/WindowView/StorageWindowView.cpp
index d34066de769..c0bc5ad8da9 100644
--- a/src/Storages/WindowView/StorageWindowView.cpp
+++ b/src/Storages/WindowView/StorageWindowView.cpp
@@ -1018,7 +1018,8 @@ void StorageWindowView::threadFuncFireProc()
         return;
 
     std::lock_guard lock(fire_signal_mutex);
-    UInt32 timestamp_now = std::time(nullptr);
+    /// TODO: consider using time_t instead (for every timestamp in this class)
+    UInt32 timestamp_now = static_cast<UInt32>(std::time(nullptr));
 
     while (next_fire_signal <= timestamp_now)
     {
@@ -1078,7 +1079,7 @@ void StorageWindowView::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
-    const unsigned num_streams)
+    const size_t num_streams)
 {
     if (target_table_id.empty())
         return;
@@ -1118,7 +1119,7 @@ Pipe StorageWindowView::watch(
     ContextPtr local_context,
     QueryProcessingStage::Enum & processed_stage,
     size_t /*max_block_size*/,
-    const unsigned /*num_streams*/)
+    const size_t /*num_streams*/)
 {
     ASTWatchQuery & query = typeid_cast<ASTWatchQuery &>(*query_info.query);
 
@@ -1189,7 +1190,7 @@ StorageWindowView::StorageWindowView(
     target_table_id = has_inner_target_table ? StorageID(table_id_.database_name, generateTargetTableName(table_id_)) : query.to_table_id;
 
     if (is_proctime)
-        next_fire_signal = getWindowUpperBound(std::time(nullptr));
+        next_fire_signal = getWindowUpperBound(static_cast<UInt32>(std::time(nullptr)));
 
     std::exchange(has_inner_table, true);
     if (!attach_)
diff --git a/src/Storages/WindowView/StorageWindowView.h b/src/Storages/WindowView/StorageWindowView.h
index 96c034b9590..6da34389e4d 100644
--- a/src/Storages/WindowView/StorageWindowView.h
+++ b/src/Storages/WindowView/StorageWindowView.h
@@ -150,7 +150,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     Pipe watch(
         const Names & column_names,
@@ -158,7 +158,7 @@ public:
         ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size,
-        unsigned num_streams) override;
+        size_t num_streams) override;
 
     std::pair<BlocksPtr, Block> getNewBlocks(UInt32 watermark);
 
diff --git a/src/Storages/examples/merge_selector.cpp b/src/Storages/examples/merge_selector.cpp
index 9433e38c648..a3b0d8a29ef 100644
--- a/src/Storages/examples/merge_selector.cpp
+++ b/src/Storages/examples/merge_selector.cpp
@@ -66,7 +66,7 @@ int main(int, char **)
 
         size_t sum_merged_size = 0;
         size_t start_index = 0;
-        size_t max_level = 0;
+        unsigned max_level = 0;
         bool in_range = false;
 
         for (size_t i = 0, size = parts.size(); i < size; ++i)
diff --git a/src/Storages/examples/merge_selector2.cpp b/src/Storages/examples/merge_selector2.cpp
index d9d08a84bcf..029da26fad6 100644
--- a/src/Storages/examples/merge_selector2.cpp
+++ b/src/Storages/examples/merge_selector2.cpp
@@ -72,7 +72,7 @@ int main(int, char **)
 
         size_t sum_merged_size = 0;
         size_t start_index = 0;
-        size_t max_level = 0;
+        unsigned max_level = 0;
         bool in_range = false;
 
         for (size_t i = 0, size = parts.size(); i < size; ++i)
diff --git a/src/Storages/getStructureOfRemoteTable.cpp b/src/Storages/getStructureOfRemoteTable.cpp
index 3d104ada0b6..a93a480adb0 100644
--- a/src/Storages/getStructureOfRemoteTable.cpp
+++ b/src/Storages/getStructureOfRemoteTable.cpp
@@ -58,7 +58,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
     }
 
     ColumnsDescription res;
-    auto new_context = ClusterProxy::updateSettingsForCluster(cluster, context, context->getSettingsRef());
+    auto new_context = ClusterProxy::updateSettingsForCluster(cluster, context, context->getSettingsRef(), table_id);
 
     /// Expect only needed columns from the result of DESC TABLE. NOTE 'comment' column is ignored for compatibility reasons.
     Block sample_block
@@ -169,7 +169,7 @@ ColumnsDescriptionByShardNum getExtendedObjectsOfRemoteTables(
     const auto & shards_info = cluster.getShardsInfo();
     auto query = "DESC TABLE " + remote_table_id.getFullTableName();
 
-    auto new_context = ClusterProxy::updateSettingsForCluster(cluster, context, context->getSettingsRef());
+    auto new_context = ClusterProxy::updateSettingsForCluster(cluster, context, context->getSettingsRef(), remote_table_id);
     new_context->setSetting("describe_extend_object_types", true);
 
     /// Expect only needed columns from the result of DESC TABLE.
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index fd474f037b3..4ecf29a05bd 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -43,7 +43,8 @@ void TableFunctionFile::parseFirstArguments(const ASTPtr & arg, const ContextPtr
     }
     else if (type == Field::Types::Int64 || type == Field::Types::UInt64)
     {
-        fd = (type == Field::Types::Int64) ? literal->value.get<Int64>() : literal->value.get<UInt64>();
+        fd = static_cast<int>(
+            (type == Field::Types::Int64) ? literal->value.get<Int64>() : literal->value.get<UInt64>());
         if (fd < 0)
             throw Exception("File descriptor must be non-negative", ErrorCodes::BAD_ARGUMENTS);
     }
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 12f85a5adbf..20e63412d91 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -987,7 +987,7 @@ class TestCase:
                 and (proc.stderr is None)
                 and (proc.stdout is None or "Exception" not in proc.stdout)
             )
-            need_drop_database = not maybe_passed
+            need_drop_database = maybe_passed
 
         debug_log = ""
         if os.path.exists(self.testcase_args.debug_log_file):
@@ -2055,7 +2055,7 @@ if __name__ == "__main__":
     parser.add_argument(
         "--no-drop-if-fail",
         action="store_true",
-        help="Do not drop database for test if test has failed",
+        help="Do not drop database for test if test has failed (does not work if reference file mismatch)",
     )
     parser.add_argument(
         "--hide-db-name",
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index a2a7f5cc750..8226d801cef 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -93,6 +93,15 @@
                 <max_size>22548578304</max_size>
                 <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
             </s3_cache_5>
+            <s3_cache_6>
+                <type>cache</type>
+                <disk>s3_disk_6</disk>
+                <path>s3_cache_6/</path>
+                <max_size>22548578304</max_size>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+                <enable_bypass_cache_with_threashold>1</enable_bypass_cache_with_threashold>
+				<bypass_cache_threashold>100</bypass_cache_threashold>
+            </s3_cache_6>
             <s3_cache_small>
                 <type>cache</type>
                 <disk>s3_disk_6</disk>
@@ -183,6 +192,13 @@
                     </main>
                 </volumes>
             </s3_cache_4>
+            <s3_cache_6>
+                <volumes>
+                    <main>
+                        <disk>s3_cache_6</disk>
+                    </main>
+                </volumes>
+            </s3_cache_6>
             <s3_cache_multi>
                 <volumes>
                     <main>
diff --git a/tests/integration/helpers/client.py b/tests/integration/helpers/client.py
index a4407d5b442..ab1cc65e9a9 100644
--- a/tests/integration/helpers/client.py
+++ b/tests/integration/helpers/client.py
@@ -8,7 +8,14 @@ DEFAULT_QUERY_TIMEOUT = 600
 
 
 class Client:
-    def __init__(self, host, port=9000, command="/usr/bin/clickhouse-client"):
+    def __init__(
+        self,
+        host,
+        port=9000,
+        command="/usr/bin/clickhouse-client",
+        secure=False,
+        config=None,
+    ):
         self.host = host
         self.port = port
         self.command = [command]
@@ -16,6 +23,11 @@ class Client:
         if os.path.basename(command) == "clickhouse":
             self.command.append("client")
 
+        if secure:
+            self.command.append("--secure")
+        if config is not None:
+            self.command += ["--config-file", config]
+
         self.command += ["--host", self.host, "--port", str(self.port), "--stacktrace"]
 
     def stacktraces_on_timeout_decorator(func):
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index c987ca292c1..666833013c8 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -2678,7 +2678,9 @@ class ClickHouseCluster:
             # Check server logs for Fatal messages and sanitizer failures.
             # NOTE: we cannot do this via docker since in case of Fatal message container may already die.
             for name, instance in self.instances.items():
-                if instance.contains_in_log(SANITIZER_SIGN, from_host=True):
+                if instance.contains_in_log(
+                    SANITIZER_SIGN, from_host=True, filename="stderr.log"
+                ):
                     sanitizer_assert_instance = instance.grep_in_log(
                         SANITIZER_SIGN, from_host=True, filename="stderr.log"
                     )
diff --git a/tests/integration/test_backup_restore_s3/__init__.py b/tests/integration/test_backup_restore_s3/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_backup_restore_s3/configs/disk_s3.xml b/tests/integration/test_backup_restore_s3/configs/disk_s3.xml
new file mode 100644
index 00000000000..c1fd059bc67
--- /dev/null
+++ b/tests/integration/test_backup_restore_s3/configs/disk_s3.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk_s3>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/data/disks/disk_s3/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+            </disk_s3>
+            <disk_s3_other_bucket>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root2/data/disks/disk_s3/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+            </disk_s3_other_bucket>
+            <disk_s3_plain>
+                <type>s3_plain</type>
+                <endpoint>http://minio1:9001/root/data/disks/disk_s3_plain/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>
+            </disk_s3_plain>
+        </disks>
+        <policies>
+            <policy_s3>
+                <volumes>
+                    <main>
+                        <disk>disk_s3</disk>
+                    </main>
+                </volumes>
+            </policy_s3>
+            <policy_s3_other_bucket>
+                <volumes>
+                    <main>
+                        <disk>disk_s3_other_bucket</disk>
+                    </main>
+                </volumes>
+            </policy_s3_other_bucket>
+        </policies>
+    </storage_configuration>
+    <backups>
+        <allowed_disk>default</allowed_disk>
+        <allowed_disk>disk_s3</allowed_disk>
+        <allowed_disk>disk_s3_plain</allowed_disk>
+    </backups>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_s3/configs/named_collection_s3_backups.xml b/tests/integration/test_backup_restore_s3/configs/named_collection_s3_backups.xml
new file mode 100644
index 00000000000..7a9d5effede
--- /dev/null
+++ b/tests/integration/test_backup_restore_s3/configs/named_collection_s3_backups.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <named_collections>
+        <named_collection_s3_backups>
+            <url>http://minio1:9001/root/data/backups</url>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+        </named_collection_s3_backups>
+    </named_collections>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_backup_restore_s3/test.py b/tests/integration/test_backup_restore_s3/test.py
new file mode 100644
index 00000000000..617c14d6736
--- /dev/null
+++ b/tests/integration/test_backup_restore_s3/test.py
@@ -0,0 +1,118 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/disk_s3.xml", "configs/named_collection_s3_backups.xml"],
+    with_minio=True,
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield
+    finally:
+        cluster.shutdown()
+
+
+backup_id_counter = 0
+
+
+def new_backup_name():
+    global backup_id_counter
+    backup_id_counter += 1
+    return f"backup{backup_id_counter}"
+
+
+def check_backup_and_restore(storage_policy, backup_destination):
+    node.query(
+        f"""
+    DROP TABLE IF EXISTS data NO DELAY;
+    CREATE TABLE data (key Int, value String, array Array(String)) Engine=MergeTree() ORDER BY tuple() SETTINGS storage_policy='{storage_policy}';
+    INSERT INTO data SELECT * FROM generateRandom('key Int, value String, array Array(String)') LIMIT 1000;
+    BACKUP TABLE data TO {backup_destination};
+    RESTORE TABLE data AS data_restored FROM {backup_destination};
+    SELECT throwIf(
+        (SELECT groupArray(tuple(*)) FROM data) !=
+        (SELECT groupArray(tuple(*)) FROM data_restored),
+        'Data does not matched after BACKUP/RESTORE'
+    );
+    DROP TABLE data NO DELAY;
+    DROP TABLE data_restored NO DELAY;
+    """
+    )
+
+
+@pytest.mark.parametrize(
+    "storage_policy, to_disk",
+    [
+        pytest.param(
+            "default",
+            "default",
+            id="from_local_to_local",
+        ),
+        pytest.param(
+            "policy_s3",
+            "default",
+            id="from_s3_to_local",
+        ),
+        pytest.param(
+            "default",
+            "disk_s3",
+            id="from_local_to_s3",
+        ),
+        pytest.param(
+            "policy_s3",
+            "disk_s3_plain",
+            id="from_s3_to_s3_plain",
+        ),
+        pytest.param(
+            "default",
+            "disk_s3_plain",
+            id="from_local_to_s3_plain",
+        ),
+    ],
+)
+def test_backup_to_disk(storage_policy, to_disk):
+    backup_name = new_backup_name()
+    backup_destination = f"Disk('{to_disk}', '{backup_name}')"
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_s3():
+    storage_policy = "default"
+    backup_name = new_backup_name()
+    backup_destination = (
+        f"S3('http://minio1:9001/root/data/backups/{backup_name}', 'minio', 'minio123')"
+    )
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_s3_named_collection():
+    storage_policy = "default"
+    backup_name = new_backup_name()
+    backup_destination = f"S3(named_collection_s3_backups, '{backup_name}')"
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_s3_native_copy():
+    storage_policy = "policy_s3"
+    backup_name = new_backup_name()
+    backup_destination = (
+        f"S3('http://minio1:9001/root/data/backups/{backup_name}', 'minio', 'minio123')"
+    )
+    check_backup_and_restore(storage_policy, backup_destination)
+    assert node.contains_in_log("using native copy")
+
+
+def test_backup_to_s3_other_bucket_native_copy():
+    storage_policy = "policy_s3_other_bucket"
+    backup_name = new_backup_name()
+    backup_destination = (
+        f"S3('http://minio1:9001/root/data/backups/{backup_name}', 'minio', 'minio123')"
+    )
+    check_backup_and_restore(storage_policy, backup_destination)
+    assert node.contains_in_log("using native copy")
diff --git a/tests/integration/test_backward_compatibility/test_functions.py b/tests/integration/test_backward_compatibility/test_functions.py
new file mode 100644
index 00000000000..fe1c0ea7108
--- /dev/null
+++ b/tests/integration/test_backward_compatibility/test_functions.py
@@ -0,0 +1,224 @@
+# pylint: disable=unused-argument
+# pylint: disable=line-too-long
+# pylint: disable=call-var-from-loop
+# pylint: disable=redefined-outer-name
+
+import logging
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
+
+cluster = ClickHouseCluster(__file__)
+upstream = cluster.add_instance("upstream")
+backward = cluster.add_instance(
+    "backward",
+    image="clickhouse/clickhouse-server",
+    tag="22.9",
+    with_installed_binary=True,
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_aggregate_states(start_cluster):
+    """
+    This test goes though all aggregate functions that:
+    - has only one argument
+    - support string as an argument
+
+    And do a simple check by creating the aggregate state with one string.
+
+    Yes this is not covers everything (does not cover functions with
+    different number of arguments, types, different states in case of
+    multiple values - uniqCombined, but as for uniqCombined it will be
+    checked via uniqHLL12), but at least something.
+
+    And about type, String had been selected, since it more likely that
+    there will be used some hash function internally.
+    """
+
+    aggregate_functions = backward.query(
+        """
+        SELECT if(NOT empty(alias_to), alias_to, name)
+        FROM system.functions
+        WHERE is_aggregate = 1
+    """
+    )
+    aggregate_functions = aggregate_functions.strip().split("\n")
+    aggregate_functions = map(lambda x: x.strip(), aggregate_functions)
+
+    aggregate_functions = list(aggregate_functions)
+    logging.info("Got %s aggregate functions", len(aggregate_functions))
+
+    skipped = 0
+    failed = 0
+    passed = 0
+
+    def get_aggregate_state_hex(node, function_name):
+        return node.query(
+            f"select hex(initializeAggregation('{function_name}State', 'foo'))"
+        ).strip()
+
+    for aggregate_function in aggregate_functions:
+        logging.info("Checking %s", aggregate_function)
+
+        try:
+            backward_state = get_aggregate_state_hex(backward, aggregate_function)
+        except QueryRuntimeException as e:
+            error_message = str(e)
+            allowed_errors = [
+                "NUMBER_OF_ARGUMENTS_DOESNT_MATCH",
+                "ILLEGAL_TYPE_OF_ARGUMENT",
+                # sequenceNextNode() and friends
+                "UNKNOWN_AGGREGATE_FUNCTION",
+                # Function X takes exactly one parameter:
+                # The function 'X' can only be used as a window function
+                "BAD_ARGUMENTS",
+                # aggThrow
+                "AGGREGATE_FUNCTION_THROW",
+            ]
+            if any(map(lambda x: x in error_message, allowed_errors)):
+                logging.info("Skipping %s", aggregate_function)
+                skipped += 1
+                continue
+            logging.exception("Failed %s", function)
+            failed += 1
+            continue
+
+        upstream_state = get_aggregate_state_hex(upstream, aggregate_function)
+        if upstream_state != backward_state:
+            logging.info(
+                "Failed %s, %s (backward) != %s (upstream)",
+                aggregate_function,
+                backward_state,
+                upstream_state,
+            )
+            failed += 1
+        else:
+            logging.info("OK %s", aggregate_function)
+            passed += 1
+
+    logging.info(
+        "Aggregate functions: %s, Failed: %s, skipped: %s, passed: %s",
+        len(aggregate_functions),
+        failed,
+        skipped,
+        passed,
+    )
+    assert failed == 0
+    assert passed > 0
+    assert failed + passed + skipped == len(aggregate_functions)
+
+
+def test_string_functions(start_cluster):
+    functions = backward.query(
+        """
+        SELECT if(NOT empty(alias_to), alias_to, name)
+        FROM system.functions
+        WHERE is_aggregate = 0
+    """
+    )
+    functions = functions.strip().split("\n")
+    functions = map(lambda x: x.strip(), functions)
+
+    excludes = [
+        "rand",
+        "rand64",
+        "randConstant",
+        "generateUUIDv4",
+        # Syntax error otherwise
+        "position",
+        "substring",
+        "CAST",
+        # NOTE: no need to ignore now()/now64() since they will fail because they don't accept any argument
+    ]
+    functions = filter(lambda x: x not in excludes, functions)
+
+    functions = list(functions)
+    logging.info("Got %s functions", len(functions))
+
+    skipped = 0
+    failed = 0
+    passed = 0
+
+    def get_function_value(node, function_name, value="foo"):
+        return node.query(f"select {function_name}('{value}')").strip()
+
+    for function in functions:
+        logging.info("Checking %s", function)
+
+        try:
+            backward_value = get_function_value(backward, function)
+        except QueryRuntimeException as e:
+            error_message = str(e)
+            allowed_errors = [
+                # Messages
+                "Cannot load time zone ",
+                "No macro ",
+                "Should start with ",  # POINT/POLYGON/...
+                "Cannot read input: expected a digit but got something else:",
+                # ErrorCodes
+                "NUMBER_OF_ARGUMENTS_DOESNT_MATCH",
+                "ILLEGAL_TYPE_OF_ARGUMENT",
+                "TOO_FEW_ARGUMENTS_FOR_FUNCTION",
+                "DICTIONARIES_WAS_NOT_LOADED",
+                "CANNOT_PARSE_UUID",
+                "CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING",
+                "ILLEGAL_COLUMN",
+                "TYPE_MISMATCH",
+                "SUPPORT_IS_DISABLED",
+                "CANNOT_PARSE_DATE",
+                "UNKNOWN_SETTING",
+                "CANNOT_PARSE_BOOL",
+                "FILE_DOESNT_EXIST",
+                "NOT_IMPLEMENTED",
+                "BAD_GET",
+                "UNKNOWN_TYPE",
+                # addressToSymbol
+                "FUNCTION_NOT_ALLOWED",
+                # Date functions
+                "CANNOT_PARSE_TEXT",
+                "CANNOT_PARSE_DATETIME",
+                # Function X takes exactly one parameter:
+                # The function 'X' can only be used as a window function
+                "BAD_ARGUMENTS",
+            ]
+            if any(map(lambda x: x in error_message, allowed_errors)):
+                logging.info("Skipping %s", function)
+                skipped += 1
+                continue
+            logging.exception("Failed %s", function)
+            failed += 1
+            continue
+
+        upstream_value = get_function_value(upstream, function)
+        if upstream_value != backward_value:
+            logging.info(
+                "Failed %s, %s (backward) != %s (upstream)",
+                function,
+                backward_value,
+                upstream_value,
+            )
+            failed += 1
+        else:
+            logging.info("OK %s", function)
+            passed += 1
+
+    logging.info(
+        "Functions: %s, failed: %s, skipped: %s, passed: %s",
+        len(functions),
+        failed,
+        skipped,
+        passed,
+    )
+    assert failed == 0
+    assert passed > 0
+    assert failed + passed + skipped == len(functions)
diff --git a/tests/integration/test_composable_protocols/__init__.py b/tests/integration/test_composable_protocols/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_composable_protocols/configs/client.xml b/tests/integration/test_composable_protocols/configs/client.xml
new file mode 100644
index 00000000000..15d83a7b1ab
--- /dev/null
+++ b/tests/integration/test_composable_protocols/configs/client.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <openSSL>
+        <client>
+            <verificationMode>none</verificationMode>
+            <invalidCertificateHandler>
+                <name>AcceptCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+</clickhouse>
diff --git a/tests/integration/test_composable_protocols/configs/config.xml b/tests/integration/test_composable_protocols/configs/config.xml
new file mode 100644
index 00000000000..35673c3e7e5
--- /dev/null
+++ b/tests/integration/test_composable_protocols/configs/config.xml
@@ -0,0 +1,63 @@
+<clickhouse>
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <server> <!-- Used for https server AND secure tcp port -->
+            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+    </openSSL>
+
+    <listen_host>0.0.0.0</listen_host>
+
+    <protocols>
+        <tcp>
+            <type>tcp</type>
+            <host>0.0.0.0</host>
+            <port>9000</port>
+            <description>native protocol (tcp)</description>
+        </tcp>
+        <tcp_secure>
+            <type>tls</type>
+            <impl>tcp</impl>
+            <port>9440</port>
+            <description>secure native protocol (tcp_secure)</description>
+        </tcp_secure>
+        <tcp_endpoint>
+            <impl>tcp</impl>
+            <host>0.0.0.0</host>
+            <port>9001</port>
+            <description>native protocol endpoint (tcp)</description>
+        </tcp_endpoint>
+        <tcp_proxy>
+            <type>proxy1</type>
+            <impl>tcp</impl>
+            <port>9100</port>
+            <description>native protocol with PROXYv1 (tcp_proxy)</description>
+        </tcp_proxy>
+        <http>
+            <type>http</type>
+            <port>8123</port>
+            <description>http protocol</description>
+        </http>
+        <https>
+            <type>tls</type>
+            <impl>http</impl>
+            <host>0.0.0.0</host>
+            <port>8443</port>
+            <description>https protocol</description>
+        </https>
+        <https_endpoint>
+            <impl>https</impl>
+            <port>8444</port>
+            <description>https protocol endpoint</description>
+        </https_endpoint>
+    </protocols>
+
+    <!--tcp_port>9010</tcp_port--> 
+</clickhouse>
diff --git a/tests/integration/test_composable_protocols/configs/server.crt b/tests/integration/test_composable_protocols/configs/server.crt
new file mode 100644
index 00000000000..6f4deca038f
--- /dev/null
+++ b/tests/integration/test_composable_protocols/configs/server.crt
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgIJAIhI9ozZJ+TWMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAeFw0xOTA0MjIwNDMyNTJaFw0yMDA0MjEwNDMyNTJaMBQx
+EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAK+wVUEdqF2uXvN0MJBgnAHyXi6JTi4p/F6igsrCjSNjJWzHH0vQmK8ujfcF
+CkifW88i+W5eHctuEtQqNHK+t9x9YiZtXrj6m/XkOXs20mYgENSmbbbHbriTPnZB
+zZrq6UqMlwIHNNAa+I3NMORQxVRaI0ybXnGVO5elr70xHpk03xL0JWKHpEqYp4db
+2aBQgF6y3Ww4khxjIYqpUYXWXGFnVIRU7FKVEAM1xyKqvQzXjQ5sVM/wyHknveEF
+3b/X4ggN+KNl5KOc0cWDh1/XaatJAPaUUPqZcq76tynLbP64Xm3dxHcj+gtRkO67
+ef6MSg6l63m3XQP6Qb+MIkd06OsCAwEAAaNQME4wHQYDVR0OBBYEFDmODTO8QLDN
+ykR3x0LIOnjNhrKhMB8GA1UdIwQYMBaAFDmODTO8QLDNykR3x0LIOnjNhrKhMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAwaiJc7uqEpnH3aukbftDwX
+m8GfEnj1HVdgg+9GGNq+9rvUYBF6gdPmjRCX9dO0cclLFx8jc2org0rTSq9WoOhX
+E6qL4Eqrmc5SE3Y9jZM0h6GRD4oXK014FmtZ3T6ddZU3dQLj3BS2r1XrvmubTvGN
+ZuTJNY8nx8Hh6H5XINmsEjUF9E5hog+PwCE03xt2adIdYL+gsbxASeNYyeUFpZv5
+zcXR3VoakBWnAaOVgCHq2qh96QAnL7ZKzFkGf/MdwV10KU3dmb+ICbQUUdf9Gc17
+aaDCIRws312F433FdXBkGs2UkB7ZZme9dfn6O1QbeTNvex2VLMqYx/CTkfFbOQA=
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_composable_protocols/configs/server.key b/tests/integration/test_composable_protocols/configs/server.key
new file mode 100644
index 00000000000..6eddb3295db
--- /dev/null
+++ b/tests/integration/test_composable_protocols/configs/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvsFVBHahdrl7z
+dDCQYJwB8l4uiU4uKfxeooLKwo0jYyVsxx9L0JivLo33BQpIn1vPIvluXh3LbhLU
+KjRyvrfcfWImbV64+pv15Dl7NtJmIBDUpm22x264kz52Qc2a6ulKjJcCBzTQGviN
+zTDkUMVUWiNMm15xlTuXpa+9MR6ZNN8S9CVih6RKmKeHW9mgUIBest1sOJIcYyGK
+qVGF1lxhZ1SEVOxSlRADNcciqr0M140ObFTP8Mh5J73hBd2/1+IIDfijZeSjnNHF
+g4df12mrSQD2lFD6mXKu+rcpy2z+uF5t3cR3I/oLUZDuu3n+jEoOpet5t10D+kG/
+jCJHdOjrAgMBAAECggEARF66zrxb6RkSmmt8+rKeA6PuQu3sHsr4C1vyyjUr97l9
+tvdGlpp20LWtSZQMjHZ3pARYTTsTHTeY3DgQcRcHNicVKx8k3ZepWeeW9vw+pL+V
+zSt3RsoVrH6gsCSrfr4sS3aqzX9AbjwQvh48CJ3mLQ1m70kHV+xbZIh1+4pB/hyP
+1wKyUE18ZkOptXvO/TtoHzLQCecpkXtWzmry1Eh2isvXA+NMrAtLibGsyM1mtm7i
+5ozevzHabvvCDBEe+KgZdONgVhhhvm2eOd+/s4w3rw4ETud4fI/ZAJyWXhiIKFnA
+VJbElWruSAoVBW7p2bsF5PbmVzvo8vXL+VylxYD+AQKBgQDhLoRKTVhNkn/QjKxq
+sdOh+QZra0LzjVpAmkQzu7wZMSHEz9qePQciDQQrYKrmRF1vNcIRCVUTqWYheJ/1
+lKRrCGa0ab6k96zkWMqLHD5u+UeJV7r1dJIx08ME9kNJ+x/XtB8klRIji16NiQUS
+qc6p8z0M2AnbJzsRfWZRH8FeYwKBgQDHu8dzdtVGI7MtxfPOE/bfajiopDg8BdTC
+pdug2T8XofRHRq7Q+0vYjTAZFT/slib91Pk6VvvPdo9VBZiL4omv4dAq6mOOdX/c
+U14mJe1X5GCrr8ExZ8BfNJ3t/6sV1fcxyJwAw7iBguqxA2JqdM/wFk10K8XqvzVn
+CD6O9yGt2QKBgFX1BMi8N538809vs41S7l9hCQNOQZNo/O+2M5yv6ECRkbtoQKKw
+1x03bMUGNJaLuELweXE5Z8GGo5bZTe5X3F+DKHlr+DtO1C+ieUaa9HY2MAmMdLCn
+2/qrREGLo+oEs4YKmuzC/taUp/ZNPKOAMISNdluFyFVg51pozPrgrVbTAoGBAKkE
+LBl3O67o0t0vH8sJdeVFG8EJhlS0koBMnfgVHqC++dm+5HwPyvTrNQJkyv1HaqNt
+r6FArkG3ED9gRuBIyT6+lctbIPgSUip9mbQqcBfqOCvQxGksZMur2ODncz09HLtS
+CUFUXjOqNzOnq4ZuZu/Bz7U4vXiSaXxQq6+LTUKxAoGAFZU/qrI06XxnrE9A1X0W
+l7DSkpZaDcu11NrZ473yONih/xOZNh4SSBpX8a7F6Pmh9BdtGqphML8NFPvQKcfP
+b9H2iid2tc292uyrUEb5uTMmv61zoTwtitqLzO0+tS6PT3fXobX+eyeEWKzPBljL
+HFtxG5CCXpkdnWRmaJnhTzA=
+-----END PRIVATE KEY-----
diff --git a/tests/integration/test_composable_protocols/configs/users.xml b/tests/integration/test_composable_protocols/configs/users.xml
new file mode 100644
index 00000000000..da8425b3695
--- /dev/null
+++ b/tests/integration/test_composable_protocols/configs/users.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <profiles>
+        <default>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_composable_protocols/test.py b/tests/integration/test_composable_protocols/test.py
new file mode 100644
index 00000000000..d861af929c3
--- /dev/null
+++ b/tests/integration/test_composable_protocols/test.py
@@ -0,0 +1,94 @@
+import ssl
+import pytest
+import os.path as p
+import os
+from helpers.cluster import ClickHouseCluster
+from helpers.client import Client
+import urllib.request, urllib.parse
+import subprocess
+import socket
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+cluster = ClickHouseCluster(__file__)
+server = cluster.add_instance(
+    "server",
+    base_config_dir="configs",
+    main_configs=["configs/server.crt", "configs/server.key"],
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def setup_nodes():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def execute_query_https(host, port, query):
+    url = f"https://{host}:{port}/?query={urllib.parse.quote(query)}"
+
+    ctx = ssl.create_default_context()
+    ctx.check_hostname = False
+    ctx.verify_mode = ssl.CERT_NONE
+
+    request = urllib.request.Request(url)
+    response = urllib.request.urlopen(request, context=ctx).read()
+    return response.decode("utf-8")
+
+
+def execute_query_http(host, port, query):
+    url = f"http://{host}:{port}/?query={urllib.parse.quote(query)}"
+
+    request = urllib.request.Request(url)
+    response = urllib.request.urlopen(request).read()
+    return response.decode("utf-8")
+
+
+def netcat(hostname, port, content):
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.connect((hostname, port))
+    s.sendall(content)
+    s.shutdown(socket.SHUT_WR)
+    data = []
+    while 1:
+        d = s.recv(1024)
+        if len(d) == 0:
+            break
+        data.append(d)
+    s.close()
+    return b"".join(data)
+
+
+def test_connections():
+
+    client = Client(server.ip_address, 9000, command=cluster.client_bin_path)
+    assert client.query("SELECT 1") == "1\n"
+
+    client = Client(
+        server.ip_address,
+        9440,
+        command=cluster.client_bin_path,
+        secure=True,
+        config=f"{SCRIPT_DIR}/configs/client.xml",
+    )
+    assert client.query("SELECT 1") == "1\n"
+
+    client = Client(server.ip_address, 9001, command=cluster.client_bin_path)
+    assert client.query("SELECT 1") == "1\n"
+
+    assert execute_query_http(server.ip_address, 8123, "SELECT 1") == "1\n"
+
+    assert execute_query_https(server.ip_address, 8443, "SELECT 1") == "1\n"
+
+    assert execute_query_https(server.ip_address, 8444, "SELECT 1") == "1\n"
+
+    data = "PROXY TCP4 255.255.255.255 255.255.255.255 65535 65535\r\n\0\021ClickHouse client\024\r\253\251\003\0\007default\0\004\001\0\001\0\0\t0.0.0.0:0\001\tmilovidov\021milovidov-desktop\vClickHouse \024\r\253\251\003\0\001\0\0\0\002\001\025SELECT 'Hello, world'\002\0\247\203\254l\325\\z|\265\254F\275\333\206\342\024\202\024\0\0\0\n\0\0\0\240\01\0\02\377\377\377\377\0\0\0"
+    assert (
+        netcat(server.ip_address, 9100, bytearray(data, "latin-1")).find(
+            bytearray("Hello, world", "latin-1")
+        )
+        >= 0
+    )
diff --git a/tests/integration/test_disks_app_func/test.py b/tests/integration/test_disks_app_func/test.py
index d87f387e122..de9b23abd5e 100644
--- a/tests/integration/test_disks_app_func/test.py
+++ b/tests/integration/test_disks_app_func/test.py
@@ -37,7 +37,7 @@ def test_disks_app_func_ld(started_cluster):
     source = cluster.instances["disks_app_test"]
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "list-disks"]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "list-disks"]
     )
 
     disks = out.split("\n")
@@ -51,7 +51,7 @@ def test_disks_app_func_ls(started_cluster):
     init_data(source)
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "--disk", "test1", "list", "."]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "--disk", "test1", "list", "."]
     )
 
     files = out.split("\n")
@@ -62,7 +62,7 @@ def test_disks_app_func_ls(started_cluster):
         [
             "/usr/bin/clickhouse",
             "disks",
-            "--send-logs",
+            "--save-logs",
             "--disk",
             "test1",
             "list",
@@ -89,7 +89,7 @@ def test_disks_app_func_cp(started_cluster):
                 [
                     "/usr/bin/clickhouse",
                     "disks",
-                    "--send-logs",
+                    "--save-logs",
                     "--disk",
                     "test1",
                     "write",
@@ -114,7 +114,7 @@ def test_disks_app_func_cp(started_cluster):
     )
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "--disk", "test2", "list", "."]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "--disk", "test2", "list", "."]
     )
 
     assert "path1" in out
@@ -123,7 +123,7 @@ def test_disks_app_func_cp(started_cluster):
         [
             "/usr/bin/clickhouse",
             "disks",
-            "--send-logs",
+            "--save-logs",
             "--disk",
             "test2",
             "remove",
@@ -135,7 +135,7 @@ def test_disks_app_func_cp(started_cluster):
         [
             "/usr/bin/clickhouse",
             "disks",
-            "--send-logs",
+            "--save-logs",
             "--disk",
             "test1",
             "remove",
@@ -146,13 +146,13 @@ def test_disks_app_func_cp(started_cluster):
     # alesapin: Why we need list one more time?
     # kssenii: it is an assertion that the file is indeed deleted
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "--disk", "test2", "list", "."]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "--disk", "test2", "list", "."]
     )
 
     assert "path1" not in out
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "--disk", "test1", "list", "."]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "--disk", "test1", "list", "."]
     )
 
     assert "path1" not in out
@@ -174,7 +174,7 @@ def test_disks_app_func_ln(started_cluster):
     )
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "list", "data/default/"]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "list", "data/default/"]
     )
 
     files = out.split("\n")
@@ -196,7 +196,7 @@ def test_disks_app_func_rm(started_cluster):
                 [
                     "/usr/bin/clickhouse",
                     "disks",
-                    "--send-logs",
+                    "--save-logs",
                     "--disk",
                     "test2",
                     "write",
@@ -207,7 +207,7 @@ def test_disks_app_func_rm(started_cluster):
     )
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "--disk", "test2", "list", "."]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "--disk", "test2", "list", "."]
     )
 
     assert "path3" in out
@@ -216,7 +216,7 @@ def test_disks_app_func_rm(started_cluster):
         [
             "/usr/bin/clickhouse",
             "disks",
-            "--send-logs",
+            "--save-logs",
             "--disk",
             "test2",
             "remove",
@@ -225,7 +225,7 @@ def test_disks_app_func_rm(started_cluster):
     )
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "--disk", "test2", "list", "."]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "--disk", "test2", "list", "."]
     )
 
     assert "path3" not in out
@@ -237,7 +237,7 @@ def test_disks_app_func_mv(started_cluster):
     init_data(source)
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "--disk", "test1", "list", "."]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "--disk", "test1", "list", "."]
     )
 
     files = out.split("\n")
@@ -257,7 +257,7 @@ def test_disks_app_func_mv(started_cluster):
     )
 
     out = source.exec_in_container(
-        ["/usr/bin/clickhouse", "disks", "--send-logs", "--disk", "test1", "list", "."]
+        ["/usr/bin/clickhouse", "disks", "--save-logs", "--disk", "test1", "list", "."]
     )
 
     files = out.split("\n")
@@ -277,7 +277,7 @@ def test_disks_app_func_read_write(started_cluster):
                 [
                     "/usr/bin/clickhouse",
                     "disks",
-                    "--send-logs",
+                    "--save-logs",
                     "--disk",
                     "test1",
                     "write",
@@ -291,7 +291,7 @@ def test_disks_app_func_read_write(started_cluster):
         [
             "/usr/bin/clickhouse",
             "disks",
-            "--send-logs",
+            "--save-logs",
             "--disk",
             "test1",
             "read",
diff --git a/tests/integration/test_keeper_s3_snapshot/__init__.py b/tests/integration/test_keeper_s3_snapshot/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_s3_snapshot/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_s3_snapshot/configs/keeper_config1.xml b/tests/integration/test_keeper_s3_snapshot/configs/keeper_config1.xml
new file mode 100644
index 00000000000..8459ea3e068
--- /dev/null
+++ b/tests/integration/test_keeper_s3_snapshot/configs/keeper_config1.xml
@@ -0,0 +1,42 @@
+<clickhouse>
+    <keeper_server>
+        <s3_snapshot>
+            <endpoint>http://minio1:9001/snapshots/</endpoint>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+        </s3_snapshot>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+        <four_letter_word_white_list>*</four_letter_word_white_list>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <min_session_timeout_ms>5000</min_session_timeout_ms>
+            <snapshot_distance>50</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_s3_snapshot/configs/keeper_config2.xml b/tests/integration/test_keeper_s3_snapshot/configs/keeper_config2.xml
new file mode 100644
index 00000000000..dfe73628f66
--- /dev/null
+++ b/tests/integration/test_keeper_s3_snapshot/configs/keeper_config2.xml
@@ -0,0 +1,42 @@
+<clickhouse>
+    <keeper_server>
+        <s3_snapshot>
+            <endpoint>http://minio1:9001/snapshots/</endpoint>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+        </s3_snapshot>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+        <four_letter_word_white_list>*</four_letter_word_white_list>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <min_session_timeout_ms>5000</min_session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_s3_snapshot/configs/keeper_config3.xml b/tests/integration/test_keeper_s3_snapshot/configs/keeper_config3.xml
new file mode 100644
index 00000000000..948d9527718
--- /dev/null
+++ b/tests/integration/test_keeper_s3_snapshot/configs/keeper_config3.xml
@@ -0,0 +1,42 @@
+<clickhouse>
+    <keeper_server>
+        <s3_snapshot>
+            <endpoint>http://minio1:9001/snapshots/</endpoint>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+        </s3_snapshot>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+        <four_letter_word_white_list>*</four_letter_word_white_list>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <min_session_timeout_ms>5000</min_session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_s3_snapshot/test.py b/tests/integration/test_keeper_s3_snapshot/test.py
new file mode 100644
index 00000000000..3e19bc4822c
--- /dev/null
+++ b/tests/integration/test_keeper_s3_snapshot/test.py
@@ -0,0 +1,120 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from time import sleep
+
+from kazoo.client import KazooClient
+
+# from kazoo.protocol.serialization import Connect, read_buffer, write_buffer
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=["configs/keeper_config1.xml"],
+    stay_alive=True,
+    with_minio=True,
+)
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=["configs/keeper_config2.xml"],
+    stay_alive=True,
+    with_minio=True,
+)
+node3 = cluster.add_instance(
+    "node3",
+    main_configs=["configs/keeper_config3.xml"],
+    stay_alive=True,
+    with_minio=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        cluster.minio_client.make_bucket("snapshots")
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def get_fake_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(
+        hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout
+    )
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+
+def destroy_zk_client(zk):
+    try:
+        if zk:
+            zk.stop()
+            zk.close()
+    except:
+        pass
+
+
+def wait_node(node):
+    for _ in range(100):
+        zk = None
+        try:
+            zk = get_fake_zk(node.name, timeout=30.0)
+            zk.sync("/")
+            print("node", node.name, "ready")
+            break
+        except Exception as ex:
+            sleep(0.2)
+            print("Waiting until", node.name, "will be ready, exception", ex)
+        finally:
+            destroy_zk_client(zk)
+    else:
+        raise Exception("Can't wait node", node.name, "to become ready")
+
+
+def test_s3_upload(started_cluster):
+    node1_zk = get_fake_zk(node1.name)
+
+    # we defined in configs snapshot_distance as 50
+    # so after 50 requests we should generate a snapshot
+    for _ in range(210):
+        node1_zk.create("/test", sequence=True)
+
+    def get_saved_snapshots():
+        return [
+            obj.object_name
+            for obj in list(cluster.minio_client.list_objects("snapshots"))
+        ]
+
+    saved_snapshots = get_saved_snapshots()
+    assert set(saved_snapshots) == set(
+        [
+            "snapshot_50.bin.zstd",
+            "snapshot_100.bin.zstd",
+            "snapshot_150.bin.zstd",
+            "snapshot_200.bin.zstd",
+        ]
+    )
+
+    destroy_zk_client(node1_zk)
+    node1.stop_clickhouse(kill=True)
+
+    # wait for new leader to be picked and that it continues
+    # uploading snapshots
+    wait_node(node2)
+    node2_zk = get_fake_zk(node2.name)
+    for _ in range(200):
+        node2_zk.create("/test", sequence=True)
+
+    saved_snapshots = get_saved_snapshots()
+
+    assert len(saved_snapshots) > 4
+
+    success_upload_message = "Successfully uploaded"
+    assert node2.contains_in_log(success_upload_message) or node3.contains_in_log(
+        success_upload_message
+    )
+
+    destroy_zk_client(node2_zk)
diff --git a/tests/integration/test_partition/configs/testkeeper.xml b/tests/integration/test_partition/configs/testkeeper.xml
new file mode 100644
index 00000000000..5200b789a9b
--- /dev/null
+++ b/tests/integration/test_partition/configs/testkeeper.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <zookeeper>
+        <!-- Don't need real [Zoo]Keeper for this test -->
+        <implementation>testkeeper</implementation>
+    </zookeeper>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_partition/test.py b/tests/integration/test_partition/test.py
index f3df66631a5..320209b5d7e 100644
--- a/tests/integration/test_partition/test.py
+++ b/tests/integration/test_partition/test.py
@@ -2,9 +2,15 @@ import pytest
 import logging
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
+from helpers.test_tools import assert_eq_with_retry
 
 cluster = ClickHouseCluster(__file__)
-instance = cluster.add_instance("instance")
+instance = cluster.add_instance(
+    "instance",
+    main_configs=[
+        "configs/testkeeper.xml",
+    ],
+)
 q = instance.query
 path_to_data = "/var/lib/clickhouse/"
 
@@ -478,3 +484,86 @@ def test_detached_part_dir_exists(started_cluster):
         == "all_1_1_0\nall_1_1_0_try1\nall_2_2_0\nall_2_2_0_try1\n"
     )
     q("drop table detached_part_dir_exists")
+
+
+def test_make_clone_in_detached(started_cluster):
+    q(
+        "create table clone_in_detached (n int, m String) engine=ReplicatedMergeTree('/clone_in_detached', '1') order by n"
+    )
+
+    path = path_to_data + "data/default/clone_in_detached/"
+
+    # broken part already detached
+    q("insert into clone_in_detached values (42, '¯\_(ツ)_/¯')")
+    instance.exec_in_container(["rm", path + "all_0_0_0/data.bin"])
+    instance.exec_in_container(
+        ["cp", "-r", path + "all_0_0_0", path + "detached/broken_all_0_0_0"]
+    )
+    assert_eq_with_retry(instance, "select * from clone_in_detached", "\n")
+    assert ["broken_all_0_0_0",] == sorted(
+        instance.exec_in_container(["ls", path + "detached/"]).strip().split("\n")
+    )
+
+    # there's a directory with the same name, but different content
+    q("insert into clone_in_detached values (43, '¯\_(ツ)_/¯')")
+    instance.exec_in_container(["rm", path + "all_1_1_0/data.bin"])
+    instance.exec_in_container(
+        ["cp", "-r", path + "all_1_1_0", path + "detached/broken_all_1_1_0"]
+    )
+    instance.exec_in_container(["rm", path + "detached/broken_all_1_1_0/primary.idx"])
+    instance.exec_in_container(
+        ["cp", "-r", path + "all_1_1_0", path + "detached/broken_all_1_1_0_try0"]
+    )
+    instance.exec_in_container(
+        [
+            "bash",
+            "-c",
+            "echo 'broken' > {}".format(
+                path + "detached/broken_all_1_1_0_try0/checksums.txt"
+            ),
+        ]
+    )
+    assert_eq_with_retry(instance, "select * from clone_in_detached", "\n")
+    assert [
+        "broken_all_0_0_0",
+        "broken_all_1_1_0",
+        "broken_all_1_1_0_try0",
+        "broken_all_1_1_0_try1",
+    ] == sorted(
+        instance.exec_in_container(["ls", path + "detached/"]).strip().split("\n")
+    )
+
+    # there are directories with the same name, but different content, and part already detached
+    q("insert into clone_in_detached values (44, '¯\_(ツ)_/¯')")
+    instance.exec_in_container(["rm", path + "all_2_2_0/data.bin"])
+    instance.exec_in_container(
+        ["cp", "-r", path + "all_2_2_0", path + "detached/broken_all_2_2_0"]
+    )
+    instance.exec_in_container(["rm", path + "detached/broken_all_2_2_0/primary.idx"])
+    instance.exec_in_container(
+        ["cp", "-r", path + "all_2_2_0", path + "detached/broken_all_2_2_0_try0"]
+    )
+    instance.exec_in_container(
+        [
+            "bash",
+            "-c",
+            "echo 'broken' > {}".format(
+                path + "detached/broken_all_2_2_0_try0/checksums.txt"
+            ),
+        ]
+    )
+    instance.exec_in_container(
+        ["cp", "-r", path + "all_2_2_0", path + "detached/broken_all_2_2_0_try1"]
+    )
+    assert_eq_with_retry(instance, "select * from clone_in_detached", "\n")
+    assert [
+        "broken_all_0_0_0",
+        "broken_all_1_1_0",
+        "broken_all_1_1_0_try0",
+        "broken_all_1_1_0_try1",
+        "broken_all_2_2_0",
+        "broken_all_2_2_0_try0",
+        "broken_all_2_2_0_try1",
+    ] == sorted(
+        instance.exec_in_container(["ls", path + "detached/"]).strip().split("\n")
+    )
diff --git a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
index 7d65bed3901..1f81421f93c 100644
--- a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
+++ b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
@@ -1,8 +1,14 @@
+import pytest
+
+# FIXME This test is too flaky
+# https://github.com/ClickHouse/ClickHouse/issues/42561
+
+pytestmark = pytest.mark.skip
+
 import logging
 from string import Template
 import time
 
-import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import assert_eq_with_retry
 
diff --git a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
index c46e6840153..cf76d47157a 100644
--- a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
+++ b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
@@ -11,11 +11,13 @@ node1 = cluster.add_instance(
     "node1",
     main_configs=["configs/zookeeper_config.xml", "configs/remote_servers.xml"],
     with_zookeeper=True,
+    use_keeper=False,
 )
 node2 = cluster.add_instance(
     "node2",
     main_configs=["configs/zookeeper_config.xml", "configs/remote_servers.xml"],
     with_zookeeper=True,
+    use_keeper=False,
 )
 
 
diff --git a/tests/integration/test_storage_nats/test.py b/tests/integration/test_storage_nats/test.py
index 63dde8922a6..77db3008524 100644
--- a/tests/integration/test_storage_nats/test.py
+++ b/tests/integration/test_storage_nats/test.py
@@ -1,3 +1,10 @@
+import pytest
+
+# FIXME This test is too flaky
+# https://github.com/ClickHouse/ClickHouse/issues/39185
+
+pytestmark = pytest.mark.skip
+
 import json
 import os.path as p
 import random
@@ -9,7 +16,6 @@ from random import randrange
 import math
 
 import asyncio
-import pytest
 from google.protobuf.internal.encoder import _VarintBytes
 from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster, check_nats_is_available, nats_connect_ssl
diff --git a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.reference b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.reference
index 53cdf1e9393..a14d334a483 100644
--- a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.reference
+++ b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.reference
@@ -1 +1,28 @@
-PASSED
+Using non-existent session with the 'session_check' flag will throw exception:
+1
+Using non-existent session without the 'session_check' flag will create a new session:
+1
+1
+The 'session_timeout' parameter is checked for validity and for the maximum value:
+1
+1
+1
+Valid cases are accepted:
+1
+1
+1
+Sessions are local per user:
+1
+Hello
+World
+And cannot be accessed for a non-existent user:
+1
+The temporary tables created in a session are not accessible without entering this session:
+1
+A session successfully expire after a timeout:
+111
+A session successfully expire after a timeout and the session's temporary table shadows the permanent table:
+HelloWorld
+A session cannot be used by concurrent connections:
+1
+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 e9f486fbb73..89da84a5bdd 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,113 +1,87 @@
 #!/usr/bin/env bash
 # Tags: long, no-parallel
+# shellcheck disable=SC2015
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-request() {
-    local url="$1"
-    local select="$2"
-    ${CLICKHOUSE_CURL} --silent "$url" --data "$select"
-}
 
+echo "Using non-existent session with the 'session_check' flag will throw exception:"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=nonexistent&session_check=1" --data-binary "SELECT 1" | grep -c -F 'Session not found'
 
-create_temporary_table() {
-    local url="$1"
-    request "$url" "CREATE TEMPORARY TABLE temp (x String)"
-    request "$url" "INSERT INTO temp VALUES ('Hello'), ('World')"
-}
+echo "Using non-existent session without the 'session_check' flag will create a new session:"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_1" --data-binary "SELECT 1"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_1&session_check=0" --data-binary "SELECT 1"
 
+echo "The 'session_timeout' parameter is checked for validity and for the maximum value:"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_2&session_timeout=string" --data-binary "SELECT 1" | grep -c -F 'Invalid session timeout'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_2&session_timeout=3601" --data-binary "SELECT 1" | grep -c -F 'Maximum session timeout'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_2&session_timeout=-1" --data-binary "SELECT 1" | grep -c -F 'Invalid session timeout'
 
-check() {
-    local url="$1"
-    local select="$2"
-    local output="$3"
-    local expected_result="$4"
-    local message="$5"
-    result=$(request "$url" "$select" | grep --count "$output")
-    if [ "$result" -ne "$expected_result" ]; then
-        echo "FAILED: $message"
-        exit 1
-    fi
-}
+echo "Valid cases are accepted:"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_3&session_timeout=0" --data-binary "SELECT 1"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_4&session_timeout=3600" --data-binary "SELECT 1"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_5&session_timeout=60" --data-binary "SELECT 1"
 
+echo "Sessions are local per user:"
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP USER IF EXISTS test_00463; CREATE USER test_00463; GRANT ALL ON *.* TO test_00463;"
 
-address=${CLICKHOUSE_HOST}
-port=${CLICKHOUSE_PORT_HTTP}
-url="${CLICKHOUSE_PORT_HTTP_PROTO}://$address:$port/"
-session="?session_id=test_$$"  # use PID for session ID
-select="SELECT * FROM system.settings WHERE name = 'max_rows_to_read'"
-select_from_temporary_table="SELECT * FROM temp ORDER BY x"
-select_from_non_existent_table="SELECT * FROM no_such_table ORDER BY x"
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6&session_timeout=600" --data-binary "CREATE TEMPORARY TABLE t (s String)"
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "INSERT INTO t VALUES ('Hello')"
 
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6&session_check=1" --data-binary "SELECT 1" | grep -c -F 'Session not found'
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6&session_timeout=600" --data-binary "CREATE TEMPORARY TABLE t (s String)"
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "INSERT INTO t VALUES ('World')"
 
-check "$url?session_id=no_such_session_$$&session_check=1" "$select" "Exception.*Session not found" 1 "session_check=1 does not work."
-check "$url$session&session_check=0" "$select" "Exception" 0 "session_check=0 does not work."
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t"
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t"
 
-request "$url""$session" "SET max_rows_to_read=7777777"
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP USER test_00463";
 
-check "$url$session&session_timeout=string" "$select" "Exception.*Invalid session timeout" 1 "Non-numeric value accepted as a timeout."
-check "$url$session&session_timeout=3601" "$select" "Exception.*Maximum session timeout*" 1 "More then 3600 seconds accepted as a timeout."
-check "$url$session&session_timeout=-1" "$select" "Exception.*Invalid session timeout" 1 "Negative timeout accepted."
-check "$url$session&session_timeout=0" "$select" "Exception" 0 "Zero timeout not accepted."
-check "$url$session&session_timeout=3600" "$select" "Exception" 0 "3600 second timeout not accepted."
-check "$url$session&session_timeout=60" "$select" "Exception" 0 "60 second timeout not accepted."
+echo "And cannot be accessed for a non-existent user:"
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=test_00463&session_id=${CLICKHOUSE_DATABASE}_6" --data-binary "SELECT * FROM t" | grep -c -F 'Exception'
 
-check "$url""$session" "$select" "7777777" 1 "Failed to reuse session."
-# Workaround here
-# TODO: move the test to integration test or add readonly user to test environment
-if [[ -z $(request "$url?user=readonly" "SELECT ''") ]]; then
-    # We have readonly user
-    check "$url$session&user=readonly&session_check=1" "$select" "Exception.*Session not found" 1 "Session is accessable for another user."
-else
-    check "$url$session&user=readonly&session_check=1" "$select" "Exception.*Unknown user*" 1 "Session is accessable for unknown user."
-fi
+echo "The temporary tables created in a session are not accessible without entering this session:"
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}" --data-binary "SELECT * FROM t" | grep -c -F 'Exception'
 
-create_temporary_table "$url""$session"
-check "$url""$session" "$select_from_temporary_table" "Hello" 1 "Failed to reuse a temporary table for session."
-
-check "$url?session_id=another_session_$$" "$select_from_temporary_table" "Exception.*Table .* doesn't exist." 1 "Temporary table is visible for another table."
-
-
-( (
-cat <<EOF
-POST /$session HTTP/1.1
-Host: $address:$port
-Accept: */*
-Content-Length: 62
-Content-Type: application/x-www-form-urlencoded
-
-EOF
-sleep 4
-) | telnet "$address" "$port" >/dev/null 2>/dev/null) &
-sleep 1
-check "$url""$session" "$select" "Exception.*Session is locked" 1 "Double access to the same session."
-
-
-session="?session_id=test_timeout_$$"
-
-create_temporary_table "$url$session&session_timeout=1"
-check "$url$session&session_timeout=1" "$select_from_temporary_table" "Hello" 1 "Failed to reuse a temporary table for session."
-sleep 3
-check "$url$session&session_check=1" "$select" "Exception.*Session not found" 1 "Session did not expire on time."
-
-create_temporary_table "$url$session&session_timeout=2"
-for _ in $(seq 1 3); do
-    check "$url$session&session_timeout=2" "$select_from_temporary_table" "Hello" 1 "Session expired too early."
-    sleep 1
+echo "A session successfully expire after a timeout:"
+# An infinite loop is required to make the test reliable. We will check that the timeout corresponds to the observed time at least once
+while true
+do
+    (
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_7&session_timeout=1" --data-binary "SELECT 1"
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_7&session_check=1" --data-binary "SELECT 1"
+        sleep 3
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_7&session_check=1" --data-binary "SELECT 1" | grep -c -F 'Session not found'
+    ) | tr -d '\n' | grep -F '111' && break || sleep 1
 done
-sleep 3
-check "$url$session&session_check=1" "$select" "Exception.*Session not found" 1 "Session did not expire on time."
 
-create_temporary_table "$url$session&session_timeout=2"
-for _ in $(seq 1 5); do
-    check "$url$session&session_timeout=2" "$select_from_non_existent_table" "Exception.*Table .* doesn't exist." 1 "Session expired too early."
-    sleep 1
+echo "A session successfully expire after a timeout and the session's temporary table shadows the permanent table:"
+# An infinite loop is required to make the test reliable. We will check that the timeout corresponds to the observed time at least once
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (s String) ENGINE = Memory; INSERT INTO t VALUES ('World');"
+while true
+do
+    (
+        ${CLICKHOUSE_CURL} -X POST -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_8&session_timeout=1" --data-binary "CREATE TEMPORARY TABLE t (s String)"
+        ${CLICKHOUSE_CURL} -X POST -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_8" --data-binary "INSERT INTO t VALUES ('Hello')"
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_8" --data-binary "SELECT * FROM t"
+        sleep 3
+        ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_8" --data-binary "SELECT * FROM t"
+    ) | tr -d '\n' | grep -F 'HelloWorld' && break || sleep 1
 done
-check "$url$session&session_timeout=2" "$select_from_temporary_table" "Hello" 1 "Session expired too early. Failed to update timeout in case of exceptions."
-sleep 4
-check "$url$session&session_check=1" "$select" "Exception.*Session not found" 1 "Session did not expire on time."
+${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE t"
 
+echo "A session cannot be used by concurrent connections:"
 
-echo "PASSED"
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_9&query_id=${CLICKHOUSE_DATABASE}_9" --data-binary "SELECT count() FROM system.numbers" >/dev/null &
+
+# An infinite loop is required to make the test reliable. We will ensure that at least once the query on the line above has started before this check
+while true
+do
+    ${CLICKHOUSE_CLIENT} --query "SELECT count() > 0 FROM system.processes WHERE query_id = '${CLICKHOUSE_DATABASE}_9'" | grep -F '1' && break || sleep 1
+done
+
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=${CLICKHOUSE_DATABASE}_9" --data-binary "SELECT 1" | grep -c -F 'Session is locked'
+${CLICKHOUSE_CLIENT} --multiquery --query "KILL QUERY WHERE query_id = '${CLICKHOUSE_DATABASE}_9' SYNC FORMAT Null";
+wait
diff --git a/tests/queries/0_stateless/00653_running_difference.reference b/tests/queries/0_stateless/00653_running_difference.reference
index 7511beb2418..e2833e0bb3e 100644
--- a/tests/queries/0_stateless/00653_running_difference.reference
+++ b/tests/queries/0_stateless/00653_running_difference.reference
@@ -19,3 +19,27 @@
 \N
 \N
 2
+--Date Difference--
+\N
+\N
+0
+364
+\N
+\N
+14466
+-
+\N
+\N
+0
+11101
+22017
+\N
+105432
+-
+\N
+\N
+0
+3149094509
+\N
+\N
+1130059331
diff --git a/tests/queries/0_stateless/00653_running_difference.sql b/tests/queries/0_stateless/00653_running_difference.sql
index fd4dfb219fd..f2b4a7300b2 100644
--- a/tests/queries/0_stateless/00653_running_difference.sql
+++ b/tests/queries/0_stateless/00653_running_difference.sql
@@ -5,4 +5,9 @@ select '-';
 select runningDifference(x) from (select arrayJoin([Null, 1]) as x);
 select '-';
 select runningDifference(x) from (select arrayJoin([Null, Null, 1, 3, Null, Null, 5]) as x);
-
+select '--Date Difference--';
+select runningDifference(x) from (select arrayJoin([Null, Null, toDate('1970-1-1'), toDate('1970-12-31'), Null, Null,  toDate('2010-8-9')]) as x);
+select '-';
+select runningDifference(x) from (select arrayJoin([Null, Null, toDate32('1900-1-1'), toDate32('1930-5-25'), toDate('1990-9-4'), Null,  toDate32('2279-5-4')]) as x);
+select '-';
+select runningDifference(x) from (select arrayJoin([Null, Null, toDateTime('1970-06-28 23:48:12', 'Asia/Istanbul'), toDateTime('2070-04-12 21:16:41', 'Asia/Istanbul'), Null, Null, toDateTime('2106-02-03 06:38:52', 'Asia/Istanbul')]) as x);
diff --git a/tests/queries/0_stateless/00705_drop_create_merge_tree.reference b/tests/queries/0_stateless/00705_drop_create_merge_tree.reference
index 8b137891791..e69de29bb2d 100644
--- a/tests/queries/0_stateless/00705_drop_create_merge_tree.reference
+++ b/tests/queries/0_stateless/00705_drop_create_merge_tree.reference
@@ -1 +0,0 @@
-
diff --git a/tests/queries/0_stateless/00705_drop_create_merge_tree.sh b/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
index 146d6e54c0b..d7754091290 100755
--- a/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
+++ b/tests/queries/0_stateless/00705_drop_create_merge_tree.sh
@@ -1,39 +1,12 @@
 #!/usr/bin/env bash
 # Tags: no-fasttest
 
-set -e
-
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-function stress()
-{
-    # We set up a signal handler to make sure to wait for all queries to be finished before ending
-    CONTINUE=true
-    handle_interruption()
-    {
-        CONTINUE=false
-    }
-    trap handle_interruption INT
-
-    while $CONTINUE; do
-        ${CLICKHOUSE_CLIENT} --query "CREATE TABLE IF NOT EXISTS table (x UInt8) ENGINE = MergeTree ORDER BY tuple()" 2>/dev/null
-        ${CLICKHOUSE_CLIENT} --query "DROP TABLE table" 2>/dev/null
-    done
-
-    trap - INT
-}
-
-# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
-export -f stress
-
-for _ in {1..5}; do
-    # Ten seconds are just barely enough to reproduce the issue in most of runs.
-    timeout -s INT 10 bash -c stress &
-done
-
+yes 'CREATE TABLE IF NOT EXISTS table (x UInt8) ENGINE = MergeTree ORDER BY tuple();' | head -n 1000 | $CLICKHOUSE_CLIENT --ignore-error -nm 2>/dev/null &
+yes 'DROP TABLE table;' | head -n 1000 | $CLICKHOUSE_CLIENT --ignore-error -nm 2>/dev/null &
 wait
-echo
 
-${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table";
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table"
diff --git a/tests/queries/0_stateless/00900_long_parquet.reference b/tests/queries/0_stateless/00900_long_parquet.reference
index 4dfc726145e..bbdad7243bd 100644
--- a/tests/queries/0_stateless/00900_long_parquet.reference
+++ b/tests/queries/0_stateless/00900_long_parquet.reference
@@ -44,12 +44,12 @@ converted:
 diff:
 dest:
 79	81	82	83	84	85	86	87	88	89	str01\0\0\0\0\0\0\0\0\0\0	fstr1\0\0\0\0\0\0\0\0\0\0	2003-03-04	2004-05-06 00:00:00	2004-05-06 07:08:09.012000000
-80	81	82	83	84	85	86	87	88	89	str02	fstr2\0\0\0\0\0\0\0\0\0\0	2149-06-06	2006-08-09 10:11:12	2006-08-09 10:11:12.345000000
+80	81	82	83	84	85	86	87	88	89	str02	fstr2\0\0\0\0\0\0\0\0\0\0	2005-03-04	2006-08-09 10:11:12	2006-08-09 10:11:12.345000000
 min:
--128	0	0	0	0	0	0	0	-1	-1	string-1\0\0\0\0\0\0\0	fixedstring-1\0\0	2003-04-05	2149-06-06	2003-02-03 04:05:06.789000000
--108	108	8	92	-8	108	-40	-116	-1	-1	string-0\0\0\0\0\0\0\0	fixedstring\0\0\0\0	2001-02-03	2149-06-06	2002-02-03 04:05:06.789000000
+-128	0	0	0	0	0	0	0	-1	-1	string-1\0\0\0\0\0\0\0	fixedstring-1\0\0	2003-04-05	2003-02-03	2003-02-03 04:05:06.789000000
+-108	108	8	92	-8	108	-40	-116	-1	-1	string-0\0\0\0\0\0\0\0	fixedstring\0\0\0\0	2001-02-03	2002-02-03	2002-02-03 04:05:06.789000000
 79	81	82	83	84	85	86	87	88	89	str01\0\0\0\0\0\0\0\0\0\0	fstr1\0\0\0\0\0\0\0\0\0\0	2003-03-04	2004-05-06	2004-05-06 07:08:09.012000000
-127	-1	-1	-1	-1	-1	-1	-1	-1	-1	string-2\0\0\0\0\0\0\0	fixedstring-2\0\0	2004-06-07	2149-06-06	2004-02-03 04:05:06.789000000
+127	-1	-1	-1	-1	-1	-1	-1	-1	-1	string-2\0\0\0\0\0\0\0	fixedstring-2\0\0	2004-06-07	2004-02-03	2004-02-03 04:05:06.789000000
 max:
 -128	0	-32768	0	-2147483648	0	-9223372036854775808	0	-1	-1	string-1	fixedstring-1\0\0	2003-04-05 00:00:00	2003-02-03 04:05:06	2003-02-03 04:05:06.789000000
 -108	108	-1016	1116	-1032	1132	-1064	1164	-1	-1	string-0	fixedstring\0\0\0\0	2001-02-03 00:00:00	2002-02-03 04:05:06	2002-02-03 04:05:06.789000000
diff --git a/tests/queries/0_stateless/00938_template_input_format.reference b/tests/queries/0_stateless/00938_template_input_format.reference
index e1f77d9a581..ec8cd7a21f0 100644
--- a/tests/queries/0_stateless/00938_template_input_format.reference
+++ b/tests/queries/0_stateless/00938_template_input_format.reference
@@ -31,3 +31,5 @@ cv	bn m","qwe,rty",456,"2016-01-02"
 "zx\cv\bn m","qwe,rty","as""df'gh","",789,"2016-01-04"
 "","zx
 cv	bn m","qwe,rty","as""df'gh",9876543210,"2016-01-03"
+1
+1
diff --git a/tests/queries/0_stateless/00938_template_input_format.sh b/tests/queries/0_stateless/00938_template_input_format.sh
index e99f59614da..be75edcdb61 100755
--- a/tests/queries/0_stateless/00938_template_input_format.sh
+++ b/tests/queries/0_stateless/00938_template_input_format.sh
@@ -83,3 +83,13 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE template1";
 $CLICKHOUSE_CLIENT --query="DROP TABLE template2";
 rm "$CURDIR"/00938_template_input_format_resultset.tmp "$CURDIR"/00938_template_input_format_row.tmp
 
+echo -ne '\${a:Escaped},\${b:Escaped}\n' > "$CURDIR"/00938_template_input_format_row.tmp
+echo -ne "a,b\nc,d\n" | $CLICKHOUSE_LOCAL --structure "a String, b String"  --input-format Template \
+    --format_template_row "$CURDIR"/00938_template_input_format_row.tmp --format_template_rows_between_delimiter '' \
+    -q 'select * from table' 2>&1| grep -Fac "'Escaped' serialization requires delimiter"
+echo -ne '\${a:Escaped},\${:Escaped}\n' > "$CURDIR"/00938_template_input_format_row.tmp
+echo -ne "a,b\nc,d\n" | $CLICKHOUSE_LOCAL --structure "a String"  --input-format Template \
+    --format_template_row "$CURDIR"/00938_template_input_format_row.tmp --format_template_rows_between_delimiter '' \
+    -q 'select * from table' 2>&1| grep -Fac "'Escaped' serialization requires delimiter"
+rm "$CURDIR"/00938_template_input_format_row.tmp
+
diff --git a/tests/queries/0_stateless/00941_to_custom_week.sql b/tests/queries/0_stateless/00941_to_custom_week.sql
index 04ff08d4117..4dd5d209306 100644
--- a/tests/queries/0_stateless/00941_to_custom_week.sql
+++ b/tests/queries/0_stateless/00941_to_custom_week.sql
@@ -49,3 +49,4 @@ SELECT
     toStartOfWeek(x, 3) AS w3,
     toStartOfWeek(x_t, 3) AS wt3
 FROM numbers(10);
+
diff --git a/tests/queries/0_stateless/01014_format_custom_separated.reference b/tests/queries/0_stateless/01014_format_custom_separated.reference
index d46a6fdf5b1..626d6ed66b8 100644
--- a/tests/queries/0_stateless/01014_format_custom_separated.reference
+++ b/tests/queries/0_stateless/01014_format_custom_separated.reference
@@ -8,3 +8,4 @@
 1,"2019-09-25","world"
 2,"2019-09-26","custom"
 3,"2019-09-27","separated"
+1
diff --git a/tests/queries/0_stateless/01014_format_custom_separated.sh b/tests/queries/0_stateless/01014_format_custom_separated.sh
index 4e88419d125..655607c8c9b 100755
--- a/tests/queries/0_stateless/01014_format_custom_separated.sh
+++ b/tests/queries/0_stateless/01014_format_custom_separated.sh
@@ -34,3 +34,8 @@ FORMAT CustomSeparated"
 $CLICKHOUSE_CLIENT --query="SELECT * FROM custom_separated ORDER BY n FORMAT CSV"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE custom_separated"
+
+echo -ne "a,b\nc,d\n" | $CLICKHOUSE_LOCAL --structure "a String, b String"  \
+  --input-format CustomSeparated --format_custom_escaping_rule=Escaped \
+  --format_custom_field_delimiter=',' --format_custom_row_after_delimiter=$'\n' -q 'select * from table' \
+  2>&1| grep -Fac "'Escaped' serialization requires delimiter"
diff --git a/tests/queries/0_stateless/01440_to_date_monotonicity.reference b/tests/queries/0_stateless/01440_to_date_monotonicity.reference
index dd8545b721d..2dbec540fbb 100644
--- a/tests/queries/0_stateless/01440_to_date_monotonicity.reference
+++ b/tests/queries/0_stateless/01440_to_date_monotonicity.reference
@@ -1,4 +1,4 @@
 0
-1970-01-01	2120-07-26	1970-04-11	1970-01-01	2149-06-06
+1970-01-01	2106-02-07	1970-04-11	1970-01-01	2149-06-06
 1970-01-01 02:00:00	2106-02-07 09:28:15	1970-01-01 02:16:40
 2000-01-01 13:12:12
diff --git a/tests/queries/0_stateless/01811_datename.reference b/tests/queries/0_stateless/01811_datename.reference
index 2968fde301a..29bf05750e7 100644
--- a/tests/queries/0_stateless/01811_datename.reference
+++ b/tests/queries/0_stateless/01811_datename.reference
@@ -1,10 +1,10 @@
-2021	2021	2021
-2	2	2
-April	April	April
-104	104	104
-14	14	14
-15	15	15
-Wednesday	Wednesday	Wednesday
+2021	2021	2021	2021
+2	2	2	2
+April	April	April	April
+104	104	104	104
+14	14	14	14
+15	15	15	15
+Wednesday	Wednesday	Wednesday	Wednesday
 11	11
 22	22
 33	33
diff --git a/tests/queries/0_stateless/01811_datename.sql b/tests/queries/0_stateless/01811_datename.sql
index b757d9ae018..fe9f5d20238 100644
--- a/tests/queries/0_stateless/01811_datename.sql
+++ b/tests/queries/0_stateless/01811_datename.sql
@@ -1,44 +1,51 @@
 WITH
     toDate('2021-04-14') AS date_value,
+    toDate32('2021-04-14') AS date_32_value,
     toDateTime('2021-04-14 11:22:33') AS date_time_value,
     toDateTime64('2021-04-14 11:22:33', 3) AS date_time_64_value
-SELECT dateName('year', date_value), dateName('year', date_time_value), dateName('year', date_time_64_value);
+SELECT dateName('year', date_value), dateName('year', date_32_value), dateName('year', date_time_value), dateName('year', date_time_64_value);
 
 WITH
     toDate('2021-04-14') AS date_value,
+    toDate32('2021-04-14') AS date_32_value,
     toDateTime('2021-04-14 11:22:33') AS date_time_value,
     toDateTime64('2021-04-14 11:22:33', 3) AS date_time_64_value
-SELECT dateName('quarter', date_value), dateName('quarter', date_time_value), dateName('quarter', date_time_64_value);
+SELECT dateName('quarter', date_value), dateName('quarter', date_32_value), dateName('quarter', date_time_value), dateName('quarter', date_time_64_value);
 
 WITH
     toDate('2021-04-14') AS date_value,
+    toDate32('2021-04-14') AS date_32_value,
     toDateTime('2021-04-14 11:22:33') AS date_time_value,
     toDateTime64('2021-04-14 11:22:33', 3) AS date_time_64_value
-SELECT dateName('month', date_value), dateName('month', date_time_value), dateName('month', date_time_64_value);
+SELECT dateName('month', date_value), dateName('month', date_32_value), dateName('month', date_time_value), dateName('month', date_time_64_value);
 
 WITH
     toDate('2021-04-14') AS date_value,
+    toDate32('2021-04-14') AS date_32_value,
     toDateTime('2021-04-14 11:22:33') AS date_time_value,
     toDateTime64('2021-04-14 11:22:33', 3) AS date_time_64_value
-SELECT dateName('dayofyear', date_value), dateName('dayofyear', date_time_value), dateName('dayofyear', date_time_64_value);
+SELECT dateName('dayofyear', date_value), dateName('dayofyear', date_32_value), dateName('dayofyear', date_time_value), dateName('dayofyear', date_time_64_value);
 
 WITH
     toDate('2021-04-14') AS date_value,
+    toDate32('2021-04-14') AS date_32_value,
     toDateTime('2021-04-14 11:22:33') AS date_time_value,
     toDateTime64('2021-04-14 11:22:33', 3) AS date_time_64_value
-SELECT dateName('day', date_value), dateName('day', date_time_value), dateName('day', date_time_64_value);
+SELECT dateName('day', date_value), dateName('day', date_32_value), dateName('day', date_time_value), dateName('day', date_time_64_value);
 
 WITH
     toDate('2021-04-14') AS date_value,
+    toDate32('2021-04-14') AS date_32_value,
     toDateTime('2021-04-14 11:22:33') AS date_time_value,
     toDateTime64('2021-04-14 11:22:33', 3) AS date_time_64_value
-SELECT dateName('week', date_value), dateName('week', date_time_value), dateName('week', date_time_64_value);
+SELECT dateName('week', date_value), dateName('week', date_32_value), dateName('week', date_time_value), dateName('week', date_time_64_value);
 
 WITH
     toDate('2021-04-14') AS date_value,
+    toDate32('2021-04-14') AS date_32_value,
     toDateTime('2021-04-14 11:22:33') AS date_time_value,
     toDateTime64('2021-04-14 11:22:33', 3) AS date_time_64_value
-SELECT dateName('weekday', date_value), dateName('weekday', date_time_value), dateName('weekday', date_time_64_value);
+SELECT dateName('weekday', date_value), dateName('weekday', date_32_value), dateName('weekday', date_time_value), dateName('weekday', date_time_64_value);
 
 WITH
     toDateTime('2021-04-14 11:22:33') AS date_time_value,
diff --git a/tests/queries/0_stateless/01921_datatype_date32.reference b/tests/queries/0_stateless/01921_datatype_date32.reference
index dcfc193e119..14079b906cb 100644
--- a/tests/queries/0_stateless/01921_datatype_date32.reference
+++ b/tests/queries/0_stateless/01921_datatype_date32.reference
@@ -43,16 +43,16 @@
 -------toMinute---------
 -------toSecond---------
 -------toStartOfDay---------
-1970-01-01 02:00:00
-1970-01-01 02:00:00
-2106-02-07 00:00:00
-2106-02-07 00:00:00
+2036-02-07 07:31:20
+2036-02-07 07:31:20
+2027-10-01 11:03:28
+2027-10-17 11:03:28
 2021-06-22 00:00:00
 -------toMonday---------
-1970-01-01
-1970-01-01
-2149-06-02
-2149-06-02
+2079-06-07
+2079-06-07
+2120-07-06
+2120-07-20
 2021-06-21
 -------toISOWeek---------
 1
@@ -79,28 +79,28 @@
 229953
 202125
 -------toStartOfWeek---------
-1970-01-01
-1970-01-01
-2149-06-01
-2149-06-01
+2079-06-06
+2079-06-06
+2120-07-05
+2120-07-26
 2021-06-20
 -------toStartOfMonth---------
-1970-01-01
-1970-01-01
-2149-06-01
-2149-06-01
+2079-06-07
+2079-06-07
+2120-06-26
+2120-06-26
 2021-06-01
 -------toStartOfQuarter---------
-1970-01-01
-1970-01-01
-2149-04-01
-2149-04-01
+2079-06-07
+2079-06-07
+2120-04-26
+2120-04-26
 2021-04-01
 -------toStartOfYear---------
-1970-01-01
-1970-01-01
-2149-01-01
-2149-01-01
+2079-06-07
+2079-06-07
+2119-07-28
+2119-07-28
 2021-01-01
 -------toStartOfSecond---------
 -------toStartOfMinute---------
diff --git a/tests/queries/0_stateless/02240_filesystem_cache_bypass_cache_threshold.reference b/tests/queries/0_stateless/02240_filesystem_cache_bypass_cache_threshold.reference
new file mode 100644
index 00000000000..de9ac10f641
--- /dev/null
+++ b/tests/queries/0_stateless/02240_filesystem_cache_bypass_cache_threshold.reference
@@ -0,0 +1,16 @@
+-- { echo }
+
+SYSTEM DROP FILESYSTEM CACHE;
+SET enable_filesystem_cache_on_write_operations=0;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_6', min_bytes_for_wide_part = 10485760;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+0	79	80
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SELECT * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
diff --git a/tests/queries/0_stateless/02240_filesystem_cache_bypass_cache_threshold.sql b/tests/queries/0_stateless/02240_filesystem_cache_bypass_cache_threshold.sql
new file mode 100644
index 00000000000..d3b3d3d7f4c
--- /dev/null
+++ b/tests/queries/0_stateless/02240_filesystem_cache_bypass_cache_threshold.sql
@@ -0,0 +1,19 @@
+-- Tags: no-parallel, no-fasttest, no-s3-storage, no-random-settings
+
+-- { echo }
+
+SYSTEM DROP FILESYSTEM CACHE;
+SET enable_filesystem_cache_on_write_operations=0;
+
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_6', min_bytes_for_wide_part = 10485760;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SELECT * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_query_cache.reference b/tests/queries/0_stateless/02240_filesystem_query_cache.reference
similarity index 100%
rename from tests/queries/0_stateless/02240_system_remote_filesystem_query_cache.reference
rename to tests/queries/0_stateless/02240_filesystem_query_cache.reference
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_query_cache.sql b/tests/queries/0_stateless/02240_filesystem_query_cache.sql
similarity index 100%
rename from tests/queries/0_stateless/02240_system_remote_filesystem_query_cache.sql
rename to tests/queries/0_stateless/02240_filesystem_query_cache.sql
diff --git a/tests/queries/0_stateless/02267_file_globs_schema_inference.reference b/tests/queries/0_stateless/02267_file_globs_schema_inference.reference
index 98da2074df6..ad94d5181ef 100644
--- a/tests/queries/0_stateless/02267_file_globs_schema_inference.reference
+++ b/tests/queries/0_stateless/02267_file_globs_schema_inference.reference
@@ -1,2 +1,3 @@
 1
 \N
+OK
diff --git a/tests/queries/0_stateless/02267_file_globs_schema_inference.sh b/tests/queries/0_stateless/02267_file_globs_schema_inference.sh
new file mode 100755
index 00000000000..701e18a0259
--- /dev/null
+++ b/tests/queries/0_stateless/02267_file_globs_schema_inference.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "insert into function file('${CLICKHOUSE_TEST_UNIQUE_NAME}_data2.jsonl') select NULL as x SETTINGS engine_file_truncate_on_insert = 1";
+$CLICKHOUSE_CLIENT -q "insert into function file('${CLICKHOUSE_TEST_UNIQUE_NAME}_data3.jsonl') select * from numbers(0) SETTINGS engine_file_truncate_on_insert = 1";
+$CLICKHOUSE_CLIENT -q "insert into function file('${CLICKHOUSE_TEST_UNIQUE_NAME}_data4.jsonl') select 1 as x SETTINGS engine_file_truncate_on_insert = 1";
+
+$CLICKHOUSE_CLIENT -q "select * from file('${CLICKHOUSE_TEST_UNIQUE_NAME}_data*.jsonl') order by x";
+
+$CLICKHOUSE_CLIENT -q "insert into function file('${CLICKHOUSE_TEST_UNIQUE_NAME}_data4.jsonl', 'TSV') select 1 as x";
+$CLICKHOUSE_CLIENT -q "insert into function file('${CLICKHOUSE_TEST_UNIQUE_NAME}_data1.jsonl', 'TSV') select [1,2,3] as x SETTINGS engine_file_truncate_on_insert = 1";
+
+$CLICKHOUSE_CLIENT -q "select * from file('${CLICKHOUSE_TEST_UNIQUE_NAME}_data*.jsonl') settings schema_inference_use_cache_for_file=0" 2>&1 | grep -F -q "INCORRECT_DATA" && echo "OK" || echo "FAIL";
+
diff --git a/tests/queries/0_stateless/02267_file_globs_schema_inference.sql b/tests/queries/0_stateless/02267_file_globs_schema_inference.sql
deleted file mode 100644
index 6862d6f0602..00000000000
--- a/tests/queries/0_stateless/02267_file_globs_schema_inference.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Tags: no-fasttest, no-parallel
-
-insert into function file('02267_data2.jsonl') select NULL as x;
-insert into function file('02267_data3.jsonl') select * from numbers(0);
-insert into function file('02267_data4.jsonl') select 1 as x;
-select * from file('02267_data*.jsonl') order by x;
-
-insert into function file('02267_data1.jsonl', 'TSV') select 1 as x;
-insert into function file('02267_data1.jsonl', 'TSV') select [1,2,3] as x;
-
-select * from file('02267_data*.jsonl') settings schema_inference_use_cache_for_file=0; --{serverError INCORRECT_DATA}
diff --git a/tests/queries/0_stateless/02294_anova_cmp.python b/tests/queries/0_stateless/02294_anova_cmp.python
new file mode 100644
index 00000000000..7597b3712d1
--- /dev/null
+++ b/tests/queries/0_stateless/02294_anova_cmp.python
@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+import os
+import sys
+from statistics import variance
+from scipy import stats
+import pandas as pd
+import numpy as np
+
+CURDIR = os.path.dirname(os.path.realpath(__file__))
+sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
+
+from pure_http_client import ClickHouseClient
+
+
+# unpooled variance z-test for means of two samples
+def scipy_anova(rvs):
+    return stats.f_oneway(*rvs)
+
+
+def test_and_check(rvs, n_groups, f_stat, p_value, precision=1e-2):
+    client = ClickHouseClient()
+    client.query("DROP TABLE IF EXISTS anova;")
+    client.query("CREATE TABLE anova (left Float64, right UInt64) ENGINE = Memory;")
+    for group in range(n_groups):
+        client.query(f'''INSERT INTO anova VALUES {", ".join([f'({i},{group})' for i in rvs[group]])};''')
+
+    real = client.query_return_df(
+        '''SELECT roundBankers(a.1, 16) as f_stat, roundBankers(a.2, 16) as p_value FROM (SELECT anova(left, right) as a FROM anova) FORMAT TabSeparatedWithNames;''')
+
+    real_f_stat = real['f_stat'][0]
+    real_p_value = real['p_value'][0]
+    assert(abs(real_f_stat - np.float64(f_stat)) < precision), f"clickhouse_f_stat {real_f_stat}, py_f_stat {f_stat}"
+    assert(abs(real_p_value - np.float64(p_value)) < precision), f"clickhouse_p_value {real_p_value}, py_p_value {p_value}"
+    client.query("DROP TABLE IF EXISTS anova;")
+
+
+def test_anova():
+    n_groups = 3
+    rvs = []
+    loc = 0
+    scale = 5
+    size = 500
+    for _ in range(n_groups):
+        rvs.append(np.round(stats.norm.rvs(loc=loc, scale=scale, size=size), 2))
+        loc += 5
+    f_stat, p_value = scipy_anova(rvs)
+    test_and_check(rvs, n_groups, f_stat, p_value)
+
+    n_groups = 6
+    rvs = []
+    loc = 0
+    scale = 5
+    size = 500
+    for _ in range(n_groups):
+        rvs.append(np.round(stats.norm.rvs(loc=loc, scale=scale, size=size), 2))
+    f_stat, p_value = scipy_anova(rvs)
+    test_and_check(rvs, n_groups, f_stat, p_value)
+
+    n_groups = 10
+    rvs = []
+    loc = 1
+    scale = 2
+    size = 100
+    for _ in range(n_groups):
+        rvs.append(np.round(stats.norm.rvs(loc=loc, scale=scale, size=size), 2))
+        loc += 1
+        scale += 2
+        size += 100
+    f_stat, p_value = scipy_anova(rvs)
+    test_and_check(rvs, n_groups, f_stat, p_value)
+
+    n_groups = 20
+    rvs = []
+    loc = 0
+    scale = 10
+    size = 1100
+    for _ in range(n_groups):
+        rvs.append(np.round(stats.norm.rvs(loc=loc, scale=scale, size=size), 2))
+        size -= 50
+    f_stat, p_value = scipy_anova(rvs)
+    test_and_check(rvs, n_groups, f_stat, p_value)
+
+
+if __name__ == "__main__":
+    test_anova()
+    print("Ok.")
diff --git a/tests/queries/0_stateless/02294_anova_cmp.reference b/tests/queries/0_stateless/02294_anova_cmp.reference
new file mode 100644
index 00000000000..587579af915
--- /dev/null
+++ b/tests/queries/0_stateless/02294_anova_cmp.reference
@@ -0,0 +1 @@
+Ok.
diff --git a/tests/queries/0_stateless/02294_anova_cmp.sh b/tests/queries/0_stateless/02294_anova_cmp.sh
new file mode 100755
index 00000000000..3dc9ef09b99
--- /dev/null
+++ b/tests/queries/0_stateless/02294_anova_cmp.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
+
+# We should have correct env vars from shell_config.sh to run this test
+
+python3 "$CURDIR"/02294_anova_cmp.python
diff --git a/tests/queries/0_stateless/02344_show_caches.reference b/tests/queries/0_stateless/02344_show_caches.reference
index 0c5957edb82..68882f63e1f 100644
--- a/tests/queries/0_stateless/02344_show_caches.reference
+++ b/tests/queries/0_stateless/02344_show_caches.reference
@@ -1,12 +1,13 @@
 cached_azure
 s3_cache_2
+s3_cache
+s3_cache_3
+s3_cache_multi
 s3_cache_4
 s3_cache_5
 local_cache
+s3_cache_6
 s3_cache_small
 local_cache_2
 local_cache_3
-s3_cache_multi
-s3_cache_3
-s3_cache
 s3_cache_multi_2
diff --git a/tests/queries/0_stateless/02346_additional_filters.reference b/tests/queries/0_stateless/02346_additional_filters.reference
index 22d53173e71..0a08995223d 100644
--- a/tests/queries/0_stateless/02346_additional_filters.reference
+++ b/tests/queries/0_stateless/02346_additional_filters.reference
@@ -60,6 +60,14 @@ select * from remote('127.0.0.{1,2}', system.one) settings additional_table_filt
 0
 0
 select * from remote('127.0.0.{1,2}', system.one) settings additional_table_filters={'system.one' : 'dummy != 0'};
+select * from distr_table settings additional_table_filters={'distr_table' : 'x = 2'};
+2	bb
+2	bb
+select * from distr_table settings additional_table_filters={'distr_table' : 'x != 2 and x != 3'};
+1	a
+4	dddd
+1	a
+4	dddd
 select * from system.numbers limit 5;
 0
 1
diff --git a/tests/queries/0_stateless/02346_additional_filters.sql b/tests/queries/0_stateless/02346_additional_filters.sql
index 9e0bee4549b..f6b665713ec 100644
--- a/tests/queries/0_stateless/02346_additional_filters.sql
+++ b/tests/queries/0_stateless/02346_additional_filters.sql
@@ -1,3 +1,4 @@
+-- Tags: distributed
 drop table if exists table_1;
 drop table if exists table_2;
 drop table if exists v_numbers;
@@ -6,6 +7,8 @@ drop table if exists mv_table;
 create table table_1 (x UInt32, y String) engine = MergeTree order by x;
 insert into table_1 values (1, 'a'), (2, 'bb'), (3, 'ccc'), (4, 'dddd');
 
+CREATE TABLE distr_table (x UInt32, y String) ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), 'table_1');
+
 -- { echoOn }
 
 select * from table_1;
@@ -29,6 +32,9 @@ select x from table_1 prewhere x != 2 where x != 2 settings additional_table_fil
 select * from remote('127.0.0.{1,2}', system.one) settings additional_table_filters={'system.one' : 'dummy = 0'};
 select * from remote('127.0.0.{1,2}', system.one) settings additional_table_filters={'system.one' : 'dummy != 0'};
 
+select * from distr_table settings additional_table_filters={'distr_table' : 'x = 2'};
+select * from distr_table settings additional_table_filters={'distr_table' : 'x != 2 and x != 3'};
+
 select * from system.numbers limit 5;
 select * from system.numbers as t limit 5 settings additional_table_filters={'t' : 'number % 2 != 0'};
 select * from system.numbers limit 5 settings additional_table_filters={'system.numbers' : 'number != 3'};
diff --git a/tests/queries/0_stateless/02346_additional_filters_distr.reference b/tests/queries/0_stateless/02346_additional_filters_distr.reference
new file mode 100644
index 00000000000..81814b5e7bb
--- /dev/null
+++ b/tests/queries/0_stateless/02346_additional_filters_distr.reference
@@ -0,0 +1,3 @@
+4	dddd
+5	a
+6	bb
diff --git a/tests/queries/0_stateless/02346_additional_filters_distr.sql b/tests/queries/0_stateless/02346_additional_filters_distr.sql
new file mode 100644
index 00000000000..bc9c1715c72
--- /dev/null
+++ b/tests/queries/0_stateless/02346_additional_filters_distr.sql
@@ -0,0 +1,20 @@
+-- Tags: no-parallel, distributed
+
+create database if not exists shard_0;
+create database if not exists shard_1;
+
+drop table if exists dist_02346;
+drop table if exists shard_0.data_02346;
+drop table if exists shard_1.data_02346;
+
+create table shard_0.data_02346 (x UInt32, y String) engine = MergeTree order by x settings index_granularity = 2;
+insert into shard_0.data_02346 values (1, 'a'), (2, 'bb'), (3, 'ccc'), (4, 'dddd');
+
+create table shard_1.data_02346 (x UInt32, y String) engine = MergeTree order by x settings index_granularity = 2;
+insert into shard_1.data_02346 values (5, 'a'), (6, 'bb'), (7, 'ccc'), (8, 'dddd');
+
+create table dist_02346 (x UInt32, y String) engine=Distributed('test_cluster_two_shards_different_databases', /* default_database= */ '', data_02346);
+
+set max_rows_to_read=4;
+
+select * from dist_02346 order by x settings additional_table_filters={'dist_02346' : 'x > 3 and x < 7'};
diff --git a/tests/queries/0_stateless/02346_additional_filters_index.reference b/tests/queries/0_stateless/02346_additional_filters_index.reference
new file mode 100644
index 00000000000..d4b9509cb3c
--- /dev/null
+++ b/tests/queries/0_stateless/02346_additional_filters_index.reference
@@ -0,0 +1,30 @@
+-- { echoOn }
+set max_rows_to_read = 2;
+select * from table_1 order by x settings additional_table_filters={'table_1' : 'x > 3'};
+4	dddd
+select * from table_1 order by x settings additional_table_filters={'table_1' : 'x < 3'};
+1	a
+2	bb
+select * from table_1 order by x settings additional_table_filters={'table_1' : 'length(y) >= 3'};
+3	ccc
+4	dddd
+select * from table_1 order by x settings additional_table_filters={'table_1' : 'length(y) < 3'};
+1	a
+2	bb
+set max_rows_to_read = 4;
+select * from distr_table order by x settings additional_table_filters={'distr_table' : 'x > 3'};
+4	dddd
+4	dddd
+select * from distr_table order by x settings additional_table_filters={'distr_table' : 'x < 3'};
+1	a
+1	a
+2	bb
+2	bb
+select * from distr_table order by x settings additional_table_filters={'distr_table' : 'length(y) > 3'};
+4	dddd
+4	dddd
+select * from distr_table order by x settings additional_table_filters={'distr_table' : 'length(y) < 3'};
+1	a
+1	a
+2	bb
+2	bb
diff --git a/tests/queries/0_stateless/02346_additional_filters_index.sql b/tests/queries/0_stateless/02346_additional_filters_index.sql
new file mode 100644
index 00000000000..0d40cc1f898
--- /dev/null
+++ b/tests/queries/0_stateless/02346_additional_filters_index.sql
@@ -0,0 +1,24 @@
+-- Tags: distributed
+
+create table table_1 (x UInt32, y String, INDEX a (length(y)) TYPE minmax GRANULARITY 1) engine = MergeTree order by x settings index_granularity = 2;
+insert into table_1 values (1, 'a'), (2, 'bb'), (3, 'ccc'), (4, 'dddd');
+
+CREATE TABLE distr_table (x UInt32, y String) ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), 'table_1');
+
+-- { echoOn }
+set max_rows_to_read = 2;
+
+select * from table_1 order by x settings additional_table_filters={'table_1' : 'x > 3'};
+select * from table_1 order by x settings additional_table_filters={'table_1' : 'x < 3'};
+
+select * from table_1 order by x settings additional_table_filters={'table_1' : 'length(y) >= 3'};
+select * from table_1 order by x settings additional_table_filters={'table_1' : 'length(y) < 3'};
+
+set max_rows_to_read = 4;
+
+select * from distr_table order by x settings additional_table_filters={'distr_table' : 'x > 3'};
+select * from distr_table order by x settings additional_table_filters={'distr_table' : 'x < 3'};
+
+select * from distr_table order by x settings additional_table_filters={'distr_table' : 'length(y) > 3'};
+select * from distr_table order by x settings additional_table_filters={'distr_table' : 'length(y) < 3'};
+
diff --git a/tests/queries/0_stateless/02354_annoy.sql b/tests/queries/0_stateless/02354_annoy.sql
index 8a8d023a104..654a4b545ea 100644
--- a/tests/queries/0_stateless/02354_annoy.sql
+++ b/tests/queries/0_stateless/02354_annoy.sql
@@ -44,3 +44,71 @@ ORDER BY L2Distance(embedding, [0.0, 0.0])
 LIMIT 3; -- { serverError 80 }
 
 DROP TABLE IF EXISTS 02354_annoy;
+
+-- ------------------------------------
+-- Check that weird base columns are rejected
+
+-- Index spans >1 column
+
+CREATE TABLE 02354_annoy
+(
+    id Int32,
+    embedding Array(Float32),
+    INDEX annoy_index (embedding, id) TYPE annoy(100) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity=5; -- {serverError 7 }
+
+-- Index must be created on Array(Float32) or Tuple(Float32)
+
+CREATE TABLE 02354_annoy
+(
+    id Int32,
+    embedding Float32,
+    INDEX annoy_index embedding TYPE annoy(100) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity=5; -- {serverError 44 }
+
+
+CREATE TABLE 02354_annoy
+(
+    id Int32,
+    embedding Array(Float64),
+    INDEX annoy_index embedding TYPE annoy(100) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity=5; -- {serverError 44 }
+
+CREATE TABLE 02354_annoy
+(
+    id Int32,
+    embedding Tuple(Float32, Float64),
+    INDEX annoy_index embedding TYPE annoy(100) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity=5; -- {serverError 44 }
+
+CREATE TABLE 02354_annoy
+(
+    id Int32,
+    embedding Array(LowCardinality(Float32)),
+    INDEX annoy_index embedding TYPE annoy(100) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity=5; -- {serverError 44 }
+
+CREATE TABLE 02354_annoy
+(
+    id Int32,
+    embedding Array(Nullable(Float32)),
+    INDEX annoy_index embedding TYPE annoy(100) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity=5; -- {serverError 44 }
diff --git a/tests/queries/0_stateless/02403_date_time_narrowing.reference b/tests/queries/0_stateless/02403_date_time_narrowing.reference
deleted file mode 100644
index 7d6e91c61b8..00000000000
--- a/tests/queries/0_stateless/02403_date_time_narrowing.reference
+++ /dev/null
@@ -1,20 +0,0 @@
-1970-01-01	2149-06-06	1970-01-01	2149-06-06	1900-01-01	1970-01-02	1970-01-01 00:00:00	2106-02-07 06:28:15
-1970-01-01	2149-06-06
-1970-01-01	2149-06-06
-1970-01-01 00:00:00	2106-02-07 06:28:15
-1970-01-01 00:00:00	2106-02-07 06:28:15
-2106-02-07 06:28:15
-toStartOfDay
-2106-02-07 00:00:00	1970-01-01 00:00:00	2106-02-07 00:00:00	1970-01-01 00:00:00	2106-02-07 00:00:00
-toStartOfWeek
-1970-01-01	1970-01-01	1970-01-01	1970-01-01	1970-01-01	2149-06-01	1970-01-01	2149-06-02
-toMonday
-1970-01-01	1970-01-01	2149-06-02	1970-01-01	2149-06-02
-toStartOfMonth
-1970-01-01	2149-06-01	1970-01-01	2149-06-01
-toLastDayOfMonth
-2149-05-31	1970-01-01	2149-05-31	1970-01-01	2149-05-31
-toStartOfQuarter
-1970-01-01	2149-04-01	1970-01-01	2149-04-01
-toStartOfYear
-1970-01-01	2149-01-01	1970-01-01	2149-01-01
diff --git a/tests/queries/0_stateless/02403_date_time_narrowing.sql b/tests/queries/0_stateless/02403_date_time_narrowing.sql
deleted file mode 100644
index 07cbba6f31c..00000000000
--- a/tests/queries/0_stateless/02403_date_time_narrowing.sql
+++ /dev/null
@@ -1,74 +0,0 @@
--- check conversion of numbers to date/time --
-SELECT toDate(toInt32(toDate32('1930-01-01', 'UTC')), 'UTC'),
-       toDate(toInt32(toDate32('2151-01-01', 'UTC')), 'UTC'),
-       toDate(toInt64(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC')), 'UTC'),
-       toDate(toInt64(toDateTime64('2151-01-01 12:12:12.123', 3, 'UTC')), 'UTC'),
-       toDate32(toInt32(toDate32('1900-01-01', 'UTC')) - 1, 'UTC'),
-       toDate32(toInt32(toDate32('2299-12-31', 'UTC')) + 1, 'UTC'),
-       toDateTime(toInt64(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC')), 'UTC'),
-       toDateTime(toInt64(toDateTime64('2151-01-01 12:12:12.123', 3, 'UTC')), 'UTC');
-
--- check conversion of extended range type to normal range type --
-SELECT toDate(toDate32('1930-01-01', 'UTC'), 'UTC'),
-       toDate(toDate32('2151-01-01', 'UTC'), 'UTC');
-
-SELECT toDate(toDateTime64('1930-01-01 12:12:12.12', 3, 'UTC'), 'UTC'),
-       toDate(toDateTime64('2151-01-01 12:12:12.12', 3, 'UTC'), 'UTC');
-
-SELECT toDateTime(toDateTime64('1930-01-01 12:12:12.12', 3, 'UTC'), 'UTC'),
-       toDateTime(toDateTime64('2151-01-01 12:12:12.12', 3, 'UTC'), 'UTC');
-
-SELECT toDateTime(toDate32('1930-01-01', 'UTC'), 'UTC'),
-       toDateTime(toDate32('2151-01-01', 'UTC'), 'UTC');
-
-SELECT toDateTime(toDate('2141-01-01', 'UTC'), 'UTC');
-
--- test DateTimeTransforms --
-SELECT 'toStartOfDay';
-SELECT toStartOfDay(toDate('2141-01-01', 'UTC'), 'UTC'),
-       toStartOfDay(toDate32('1930-01-01', 'UTC'), 'UTC'),
-       toStartOfDay(toDate32('2141-01-01', 'UTC'), 'UTC'),
-       toStartOfDay(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC'), 'UTC'),
-       toStartOfDay(toDateTime64('2141-01-01 12:12:12.123', 3, 'UTC'), 'UTC');
-
-SELECT 'toStartOfWeek';
-SELECT toStartOfWeek(toDate('1970-01-01', 'UTC')),
-       toStartOfWeek(toDate32('1970-01-01', 'UTC')),
-       toStartOfWeek(toDateTime('1970-01-01 10:10:10', 'UTC'), 0, 'UTC'),
-       toStartOfWeek(toDateTime64('1970-01-01 10:10:10.123', 3, 'UTC'), 1, 'UTC'),
-       toStartOfWeek(toDate32('1930-01-01', 'UTC')),
-       toStartOfWeek(toDate32('2151-01-01', 'UTC')),
-       toStartOfWeek(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC'), 2, 'UTC'),
-       toStartOfWeek(toDateTime64('2151-01-01 12:12:12.123', 3, 'UTC'), 3, 'UTC');
-
-SELECT 'toMonday';
-SELECT toMonday(toDate('1970-01-02', 'UTC')),
-       toMonday(toDate32('1930-01-01', 'UTC')),
-       toMonday(toDate32('2151-01-01', 'UTC')),
-       toMonday(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC'), 'UTC'),
-       toMonday(toDateTime64('2151-01-01 12:12:12.123', 3, 'UTC'), 'UTC');
-
-SELECT 'toStartOfMonth';
-SELECT toStartOfMonth(toDate32('1930-01-01', 'UTC')),
-       toStartOfMonth(toDate32('2151-01-01', 'UTC')),
-       toStartOfMonth(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC'), 'UTC'),
-       toStartOfMonth(toDateTime64('2151-01-01 12:12:12.123', 3, 'UTC'), 'UTC');
-
-SELECT 'toLastDayOfMonth';
-SELECT toLastDayOfMonth(toDate('2149-06-03', 'UTC')),
-       toLastDayOfMonth(toDate32('1930-01-01', 'UTC')),
-       toLastDayOfMonth(toDate32('2151-01-01', 'UTC')),
-       toLastDayOfMonth(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC'), 'UTC'),
-       toLastDayOfMonth(toDateTime64('2151-01-01 12:12:12.123', 3, 'UTC'), 'UTC');
-
-SELECT 'toStartOfQuarter';
-SELECT toStartOfQuarter(toDate32('1930-01-01', 'UTC')),
-       toStartOfQuarter(toDate32('2151-01-01', 'UTC')),
-       toStartOfQuarter(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC'), 'UTC'),
-       toStartOfQuarter(toDateTime64('2151-01-01 12:12:12.123', 3, 'UTC'), 'UTC');
-
-SELECT 'toStartOfYear';
-SELECT toStartOfYear(toDate32('1930-01-01', 'UTC')),
-       toStartOfYear(toDate32('2151-01-01', 'UTC')),
-       toStartOfYear(toDateTime64('1930-01-01 12:12:12.123', 3, 'UTC'), 'UTC'),
-       toStartOfYear(toDateTime64('2151-01-01 12:12:12.123', 3, 'UTC'), 'UTC');
diff --git a/tests/queries/0_stateless/02403_enable_extended_results_for_datetime_functions.reference b/tests/queries/0_stateless/02403_enable_extended_results_for_datetime_functions.reference
index 5773810bf64..025191c234a 100644
--- a/tests/queries/0_stateless/02403_enable_extended_results_for_datetime_functions.reference
+++ b/tests/queries/0_stateless/02403_enable_extended_results_for_datetime_functions.reference
@@ -42,39 +42,39 @@ timeSlot;toDateTime64;true	1920-02-02 10:00:00.000
 type;timeSlot;toDateTime64;true	DateTime64(3, \'UTC\')
 toStartOfDay;toDate32;true	1920-02-02 00:00:00.000
 type;toStartOfDay;toDate32;true	DateTime64(3, \'UTC\')
-toStartOfYear;toDate32;false	1970-01-01
+toStartOfYear;toDate32;false	2099-06-06
 type;toStartOfYear;toDate32;false	Date
-toStartOfYear;toDateTime64;false	1970-01-01
+toStartOfYear;toDateTime64;false	2099-06-06
 type;toStartOfYear;toDateTime64;false	Date
 toStartOfISOYear;toDate32;false	1970-01-01
 type;toStartOfISOYear;toDate32;false	Date
 toStartOfISOYear;toDateTime64;false	1970-01-01
 type;toStartOfISOYear;toDateTime64;false	Date
-toStartOfQuarter;toDate32;false	1970-01-01
+toStartOfQuarter;toDate32;false	2099-06-06
 type;toStartOfQuarter;toDate32;false	Date
-toStartOfQuarter;toDateTime64;false	1970-01-01
+toStartOfQuarter;toDateTime64;false	2099-06-06
 type;toStartOfQuarter;toDateTime64;false	Date
-toStartOfMonth;toDate32;false	1970-01-01
+toStartOfMonth;toDate32;false	2099-07-07
 type;toStartOfMonth;toDate32;false	Date
-toStartOfMonth;toDateTime64;false	1970-01-01
+toStartOfMonth;toDateTime64;false	2099-07-07
 type;toStartOfMonth;toDateTime64;false	Date
-toStartOfWeek;toDate32;false	1970-01-01
+toStartOfWeek;toDate32;false	2099-07-07
 type;toStartOfWeek;toDate32;false	Date
-toStartOfWeek;toDateTime64;false	1970-01-01
+toStartOfWeek;toDateTime64;false	2099-07-07
 type;toStartOfWeek;toDateTime64;false	Date
-toMonday;toDate32;false	1970-01-01
+toMonday;toDate32;false	2099-07-08
 type;toMonday;toDate32;false	Date
-toMonday;toDateTime64;false	1970-01-01
+toMonday;toDateTime64;false	2099-07-08
 type;toMonday;toDateTime64;false	Date
-toLastDayOfMonth;toDate32;false	1970-01-01
+toLastDayOfMonth;toDate32;false	2099-08-04
 type;toLastDayOfMonth;toDate32;false	Date
-toLastDayOfMonth;toDateTime64;false	1970-01-01
+toLastDayOfMonth;toDateTime64;false	2099-08-04
 type;toLastDayOfMonth;toDateTime64;false	Date
-toStartOfDay;toDateTime64;false	1970-01-01 00:00:00
+toStartOfDay;toDateTime64;false	2056-03-09 06:28:16
 type;toStartOfDay;toDateTime64;false	DateTime(\'UTC\')
-toStartOfHour;toDateTime64;false	1970-01-01 00:00:00
+toStartOfHour;toDateTime64;false	2056-03-09 16:28:16
 type;toStartOfHour;toDateTime64;false	DateTime(\'UTC\')
-toStartOfMinute;toDateTime64;false	1970-01-01 00:00:00
+toStartOfMinute;toDateTime64;false	2056-03-09 16:51:16
 type;toStartOfMinute;toDateTime64;false	DateTime(\'UTC\')
 toStartOfFiveMinutes;toDateTime64;false	2056-03-09 16:48:16
 type;toStartOfFiveMinutes;toDateTime64;false	DateTime(\'UTC\')
@@ -84,5 +84,5 @@ toStartOfFifteenMinutes;toDateTime64;false	2056-03-09 16:43:16
 type;toStartOfFifteenMinutes;toDateTime64;false	DateTime(\'UTC\')
 timeSlot;toDateTime64;false	2056-03-09 16:58:16
 type;timeSlot;toDateTime64;false	DateTime(\'UTC\')
-toStartOfDay;toDate32;false	1970-01-01 00:00:00
+toStartOfDay;toDate32;false	2056-03-09 06:28:16
 type;toStartOfDay;toDate32;false	DateTime(\'UTC\')
diff --git a/tests/queries/0_stateless/02428_combinators_with_over_statement.reference b/tests/queries/0_stateless/02428_combinators_with_over_statement.reference
new file mode 100644
index 00000000000..55be3f35cb1
--- /dev/null
+++ b/tests/queries/0_stateless/02428_combinators_with_over_statement.reference
@@ -0,0 +1,50 @@
+{1:'\0
�wR�'}
+{1:'\0
D�@='}
+{1:'\0
7���'}
+{1:'\0
��޲'}
+{1:'\0
"Q�'}
+{1:'\0
V\'��'}
+{1:'\0
��\0�'}
+{1:'\0
�_�'}
+{1:'\0
q�4h'}
+{1:'\0
g�7'}
+['\0
�wR�']
+['\0
D�@=']
+['\0
7���']
+['\0
��޲']
+['\0
"Q�']
+['\0
V\'��']
+['\0
��\0�']
+['\0
�_�']
+['\0
q�4h']
+['\0
g�7']
+['\0
�Z�','\0\0']
+['\0
�4n�','\0\0']
+['\0
�ޓ','\0\0']
+['\0
���1','\0\0']
+['\0
�_<V','\0\0']
+['\0
�J�','\0\0']
+['\0
D�\03','\0\0']
+['\0
�6%','\0\0']
+['\0
@�','\0\0']
+['\0
g��','\0\0']
+[{1:['\0
�wR�']}]
+[{1:['\0
D�@=']}]
+[{1:['\0
7���']}]
+[{1:['\0
��޲']}]
+[{1:['\0
"Q�']}]
+[{1:['\0
V\'��']}]
+[{1:['\0
��\0�']}]
+[{1:['\0
�_�']}]
+[{1:['\0
q�4h']}]
+[{1:['\0
g�7']}]
+{1:'\0
�wR�'}
+{1:'\0
D�@='}
+{1:'\0
7���'}
+{1:'\0
��޲'}
+{1:'\0
"Q�'}
+{1:'\0
V\'��'}
+{1:'\0
��\0�'}
+{1:'\0
�_�'}
+{1:'\0
q�4h'}
+{1:'\0
g�7'}
diff --git a/tests/queries/0_stateless/02428_combinators_with_over_statement.sql b/tests/queries/0_stateless/02428_combinators_with_over_statement.sql
new file mode 100644
index 00000000000..b42066cdf52
--- /dev/null
+++ b/tests/queries/0_stateless/02428_combinators_with_over_statement.sql
@@ -0,0 +1,10 @@
+drop table if exists test;
+create table test (x AggregateFunction(uniq, UInt64), y Int64) engine=Memory;
+insert into test select uniqState(number) as x, number as y from numbers(10) group by number;
+select uniqStateMap(map(1, x)) OVER (PARTITION BY y) from test;
+select uniqStateForEach([x]) OVER (PARTITION BY y) from test;
+select uniqStateResample(30, 75, 30)([x], 30) OVER (PARTITION BY y) from test;
+select uniqStateForEachMapForEach([map(1, [x])]) OVER (PARTITION BY y) from test;
+select uniqStateDistinctMap(map(1, x)) OVER (PARTITION BY y) from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/02429_combinators_in_array_reduce.reference b/tests/queries/0_stateless/02429_combinators_in_array_reduce.reference
new file mode 100644
index 00000000000..a0707aa4c01
--- /dev/null
+++ b/tests/queries/0_stateless/02429_combinators_in_array_reduce.reference
@@ -0,0 +1,6 @@
+{1:'\0
�e'}
+['\0,��4�e']
+[{1:['\0
�e']}]
+[{1:'\0�\f�������'},{1:'\0�\f����#�q'},{1:'\0�\f*<��#�q'}]
+[['\0�\f�������'],['\0�\f����#�q'],['\0�\f*<��#�q']]
+[[{1:['\0�\f�������']}],[{1:['\0�\f����#�q']}],[{1:['\0�\f*<��#�q']}]]
diff --git a/tests/queries/0_stateless/02429_combinators_in_array_reduce.sql b/tests/queries/0_stateless/02429_combinators_in_array_reduce.sql
new file mode 100644
index 00000000000..a961ae3a198
--- /dev/null
+++ b/tests/queries/0_stateless/02429_combinators_in_array_reduce.sql
@@ -0,0 +1,6 @@
+select arrayReduce('uniqStateMap', [map(1, 2)]);
+select arrayReduce('uniqStateForEach', [[1], [2]]);
+select arrayReduce('uniqStateForEachMapForEach', [[map(1, [2])]]);
+select arrayReduceInRanges('uniqStateMap', [(1, 3), (2, 3), (3, 3)], [map(1, 'a'), map(1, 'b'), map(1, 'c'), map(1, 'd'), map(1, 'e')]);
+select arrayReduceInRanges('uniqStateForEach', [(1, 3), (2, 3), (3, 3)], [['a'], ['b'], ['c'],['d'], ['e']]);
+select arrayReduceInRanges('uniqStateForEachMapForEach', [(1, 3), (2, 3), (3, 3)], [[map(1, ['a'])], [map(1, ['b'])], [map(1, ['c'])], [map(1, ['d'])], [map(1, ['e'])]]);
diff --git a/tests/queries/0_stateless/02430_initialize_aggregation_with_combinators.reference b/tests/queries/0_stateless/02430_initialize_aggregation_with_combinators.reference
new file mode 100644
index 00000000000..2b7ba31b818
--- /dev/null
+++ b/tests/queries/0_stateless/02430_initialize_aggregation_with_combinators.reference
@@ -0,0 +1,3 @@
+{1:'\0
�e'}
+['\0
,��4','\0
�e']
+[{1:['\0
�e']}]
diff --git a/tests/queries/0_stateless/02430_initialize_aggregation_with_combinators.sql b/tests/queries/0_stateless/02430_initialize_aggregation_with_combinators.sql
new file mode 100644
index 00000000000..b50b4ee0194
--- /dev/null
+++ b/tests/queries/0_stateless/02430_initialize_aggregation_with_combinators.sql
@@ -0,0 +1,4 @@
+select initializeAggregation('uniqStateMap', map(1, 2));
+select initializeAggregation('uniqStateForEach', [1, 2]);
+select initializeAggregation('uniqStateForEachMapForEach', [map(1, [2])]);
+
diff --git a/tests/queries/0_stateless/02448_clone_replica_lost_part.reference b/tests/queries/0_stateless/02448_clone_replica_lost_part.reference
new file mode 100644
index 00000000000..26c6cbf438b
--- /dev/null
+++ b/tests/queries/0_stateless/02448_clone_replica_lost_part.reference
@@ -0,0 +1,11 @@
+1	[2,3,4,5]
+2	[1,2,3,4,5]
+3	[1,2,3,4,5]
+4	[3,4,5]
+5	[1,2,3,4,5]
+6	[1,2,3,4,5]
+7	[1,2,3,4,5,20,30,40,50]
+8	[1,2,3,4,5,10,20,30,40,50]
+9	[1,2,3,4,5,10,20,30,40,50]
+11	[1,2,3,4,5,10,20,30,40,50,100,300,400,500,600]
+12	[1,2,3,4,5,10,20,30,40,50,100,300,400,500,600]
diff --git a/tests/queries/0_stateless/02448_clone_replica_lost_part.sql b/tests/queries/0_stateless/02448_clone_replica_lost_part.sql
new file mode 100644
index 00000000000..371f7389837
--- /dev/null
+++ b/tests/queries/0_stateless/02448_clone_replica_lost_part.sql
@@ -0,0 +1,147 @@
+-- Tags: long
+
+drop table if exists rmt1;
+drop table if exists rmt2;
+create table rmt1 (n int) engine=ReplicatedMergeTree('/test/02448/{database}/rmt', '1') order by tuple()
+    settings min_replicated_logs_to_keep=1, max_replicated_logs_to_keep=2, cleanup_delay_period=0, cleanup_delay_period_random_add=1, old_parts_lifetime=0, max_parts_to_merge_at_once=5;
+create table rmt2 (n int) engine=ReplicatedMergeTree('/test/02448/{database}/rmt', '2') order by tuple()
+    settings min_replicated_logs_to_keep=1, max_replicated_logs_to_keep=2, cleanup_delay_period=0, cleanup_delay_period_random_add=1, old_parts_lifetime=0, max_parts_to_merge_at_once=5;
+
+-- insert part only on one replica
+system stop replicated sends rmt1;
+insert into rmt1 values (1);
+detach table rmt1;      -- make replica inactive
+system start replicated sends rmt1;
+
+-- trigger log rotation, rmt1 will be lost
+insert into rmt2 values (2);
+insert into rmt2 values (3);
+insert into rmt2 values (4);
+insert into rmt2 values (5);
+-- check that entry was not removed from the queue (part is not lost)
+set receive_timeout=5;
+system sync replica rmt2; -- {serverError TIMEOUT_EXCEEDED}
+set receive_timeout=300;
+
+select 1, arraySort(groupArray(n)) from rmt2;
+
+-- rmt1 will mimic rmt2
+attach table rmt1;
+system sync replica rmt1;
+system sync replica rmt2;
+
+-- check that no parts are lost
+select 2, arraySort(groupArray(n)) from rmt1;
+select 3, arraySort(groupArray(n)) from rmt2;
+
+
+truncate table rmt1;
+truncate table rmt2;
+
+
+-- insert parts only on one replica and merge them
+system stop replicated sends rmt2;
+insert into rmt2 values (1);
+insert into rmt2 values (2);
+system sync replica rmt2;
+optimize table rmt2 final;
+system sync replica rmt2;
+-- give it a chance to remove source parts
+select sleep(2) format Null; -- increases probability of reproducing the issue
+detach table rmt2;
+system start replicated sends rmt2;
+
+
+-- trigger log rotation, rmt2 will be lost
+insert into rmt1 values (3);
+insert into rmt1 values (4);
+insert into rmt1 values (5);
+set receive_timeout=5;
+-- check that entry was not removed from the queue (part is not lost)
+system sync replica rmt1; -- {serverError TIMEOUT_EXCEEDED}
+set receive_timeout=300;
+
+select 4, arraySort(groupArray(n)) from rmt1;
+
+-- rmt1 will mimic rmt2
+system stop fetches rmt1;
+attach table rmt2;
+system sync replica rmt2;
+-- give rmt2 a chance to remove merged part (but it should not do it)
+select sleep(2) format Null; -- increases probability of reproducing the issue
+system start fetches rmt1;
+system sync replica rmt1;
+
+-- check that no parts are lost
+select 5, arraySort(groupArray(n)) from rmt1;
+select 6, arraySort(groupArray(n)) from rmt2;
+
+
+-- insert part only on one replica
+system stop replicated sends rmt1;
+insert into rmt1 values (123);
+alter table rmt1 update n=10 where n=123 settings mutations_sync=1;
+-- give it a chance to remove source part
+select sleep(2) format Null; -- increases probability of reproducing the issue
+detach table rmt1;      -- make replica inactive
+system start replicated sends rmt1;
+
+-- trigger log rotation, rmt1 will be lost
+insert into rmt2 values (20);
+insert into rmt2 values (30);
+insert into rmt2 values (40);
+insert into rmt2 values (50);
+-- check that entry was not removed from the queue (part is not lost)
+set receive_timeout=5;
+system sync replica rmt2; -- {serverError TIMEOUT_EXCEEDED}
+set receive_timeout=300;
+
+select 7, arraySort(groupArray(n)) from rmt2;
+
+-- rmt1 will mimic rmt2
+system stop fetches rmt2;
+attach table rmt1;
+system sync replica rmt1;
+-- give rmt1 a chance to remove mutated part (but it should not do it)
+select sleep(2) format Null; -- increases probability of reproducing the issue
+system start fetches rmt2;
+system sync replica rmt2;
+
+-- check that no parts are lost
+select 8, arraySort(groupArray(n)) from rmt1;
+select 9, arraySort(groupArray(n)) from rmt2;
+
+-- avoid arbitrary merges after inserting
+optimize table rmt2 final;
+-- insert parts (all_18_18_0, all_19_19_0) on both replicas (will be deduplicated, but it does not matter)
+insert into rmt1 values (100);
+insert into rmt2 values (100);
+insert into rmt1 values (200);
+insert into rmt2 values (200);
+detach table rmt1;
+
+-- create a gap in block numbers buy dropping part
+insert into rmt2 values (300);
+alter table rmt2 drop part 'all_19_19_0';   -- remove 200
+insert into rmt2 values (400);
+insert into rmt2 values (500);
+insert into rmt2 values (600);
+system sync replica rmt2;
+-- merge through gap
+optimize table rmt2;
+-- give it a chance to cleanup log
+select sleep(2) format Null; -- increases probability of reproducing the issue
+
+-- rmt1 will mimic rmt2, but will not be able to fetch parts for a while
+system stop replicated sends rmt2;
+attach table rmt1;
+-- rmt1 should not show the value (200) from dropped part
+select throwIf(n = 200) from rmt1 format Null;
+select 11, arraySort(groupArray(n)) from rmt2;
+
+system start replicated sends rmt2;
+system sync replica rmt1;
+select 12, arraySort(groupArray(n)) from rmt1;
+
+drop table rmt1;
+drop table rmt2;
diff --git a/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.reference b/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.sql b/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.sql
new file mode 100644
index 00000000000..626a4d7034e
--- /dev/null
+++ b/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.sql
@@ -0,0 +1,7 @@
+-- Tags: no-fasttest
+
+desc format(JSONEachRow, '{"x" : 1, "x" : 2}'); -- {serverError INCORRECT_DATA}
+desc format(JSONEachRow, '{"x" : 1, "y" : 2}\n{"x" : 2, "x" : 3}'); -- {serverError INCORRECT_DATA}
+desc format(CSVWithNames, 'a,b,a\n1,2,3'); -- {serverError INCORRECT_DATA}
+desc format(CSV, '1,2,3') settings column_names_for_schema_inference='a, b, a'; -- {serverError INCORRECT_DATA}
+
diff --git a/tests/queries/0_stateless/02456_aggregate_state_conversion.reference b/tests/queries/0_stateless/02456_aggregate_state_conversion.reference
new file mode 100644
index 00000000000..abf55dde8a7
--- /dev/null
+++ b/tests/queries/0_stateless/02456_aggregate_state_conversion.reference
@@ -0,0 +1 @@
+1027000000000000000000000000000000000000000000000000000000000000
diff --git a/tests/queries/0_stateless/02456_aggregate_state_conversion.sql b/tests/queries/0_stateless/02456_aggregate_state_conversion.sql
new file mode 100644
index 00000000000..3c05c59de59
--- /dev/null
+++ b/tests/queries/0_stateless/02456_aggregate_state_conversion.sql
@@ -0,0 +1 @@
+SELECT hex(CAST(x, 'AggregateFunction(sum, Decimal(50, 10))')) FROM (SELECT arrayReduce('sumState', [toDecimal256('0.0000010.000001', 10)]) AS x) GROUP BY x;
diff --git a/tests/queries/0_stateless/02456_datetime_schema_inference.reference b/tests/queries/0_stateless/02456_datetime_schema_inference.reference
new file mode 100644
index 00000000000..2b88f2783dc
--- /dev/null
+++ b/tests/queries/0_stateless/02456_datetime_schema_inference.reference
@@ -0,0 +1,11 @@
+222222222222222
+22222222222.2222
+2022-04-22 03:45:06.381000000
+2022-04-22T03:45:06.381Z
+01/12/1925
+2022-04-22 03:45:06.381000000
+2022-04-22 03:45:06.381000000
+1925-12-01 00:00:00.000000000
+2022-04-22 03:45:06.381000000
+2022-04-22 03:45:06.381000000
+1925-01-12 00:00:00.000000000
diff --git a/tests/queries/0_stateless/02456_datetime_schema_inference.sql b/tests/queries/0_stateless/02456_datetime_schema_inference.sql
new file mode 100644
index 00000000000..34749dbd412
--- /dev/null
+++ b/tests/queries/0_stateless/02456_datetime_schema_inference.sql
@@ -0,0 +1,15 @@
+select * from format('TSV', '222222222222222');
+select * from format('TSV', '22222222222.2222');
+set date_time_input_format = 'basic';
+select * from format('TSV', '2022-04-22T03:45:06.381');
+select * from format('TSV', '2022-04-22T03:45:06.381Z');
+select * from format('TSV', '01/12/1925');
+set date_time_input_format = 'best_effort';
+select * from format('TSV', '2022-04-22T03:45:06.381');
+select toTimeZone(c1, 'UTC') from format('TSV', '2022-04-22T03:45:06.381Z');
+select * from format('TSV', '01/12/1925');
+set date_time_input_format = 'best_effort_us';
+select * from format('TSV', '2022-04-22T03:45:06.381');
+select toTimeZone(c1, 'UTC') from format('TSV', '2022-04-22T03:45:06.381Z');
+select * from format('TSV', '01/12/1925');
+
diff --git a/tests/queries/0_stateless/02457_csv_parse_date_out_of_range.reference b/tests/queries/0_stateless/02457_csv_parse_date_out_of_range.reference
new file mode 100644
index 00000000000..544e8100fa4
--- /dev/null
+++ b/tests/queries/0_stateless/02457_csv_parse_date_out_of_range.reference
@@ -0,0 +1,2 @@
+above	2149-06-06
+below	1970-01-01
diff --git a/tests/queries/0_stateless/02457_csv_parse_date_out_of_range.sh b/tests/queries/0_stateless/02457_csv_parse_date_out_of_range.sh
new file mode 100755
index 00000000000..297f7e31bab
--- /dev/null
+++ b/tests/queries/0_stateless/02457_csv_parse_date_out_of_range.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS test_date_out_of_range sync";
+$CLICKHOUSE_CLIENT --query="CREATE TABLE test_date_out_of_range (f String, t Date) engine=Memory()";
+
+printf '"above", 2200-12-31
+"below", 1900-01-01
+' | $CLICKHOUSE_CLIENT --input_format_defaults_for_omitted_fields=1 --input_format_csv_empty_as_default=1 --query="INSERT INTO test_date_out_of_range FORMAT CSV";
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM test_date_out_of_range";
+$CLICKHOUSE_CLIENT --query="DROP TABLE test_date_out_of_range";
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02457_datediff_via_unix_epoch.reference b/tests/queries/0_stateless/02457_datediff_via_unix_epoch.reference
new file mode 100644
index 00000000000..ba12c868037
--- /dev/null
+++ b/tests/queries/0_stateless/02457_datediff_via_unix_epoch.reference
@@ -0,0 +1,16 @@
+year	1
+year	1
+quarter	1
+quarter	1
+month	1
+month	1
+week	1
+week	1
+day	11
+day	11
+hour	264
+hour	264
+minute	1440
+minute	20
+second	86400
+second	1200
diff --git a/tests/queries/0_stateless/02457_datediff_via_unix_epoch.sql b/tests/queries/0_stateless/02457_datediff_via_unix_epoch.sql
new file mode 100644
index 00000000000..796b4cc6e8f
--- /dev/null
+++ b/tests/queries/0_stateless/02457_datediff_via_unix_epoch.sql
@@ -0,0 +1,23 @@
+select 'year', date_diff('year', toDate32('1969-12-25'), toDate32('1970-01-05'));
+select 'year', date_diff('year', toDateTime64('1969-12-25 10:00:00.000', 3), toDateTime64('1970-01-05 10:00:00.000', 3));
+
+select 'quarter', date_diff('quarter', toDate32('1969-12-25'), toDate32('1970-01-05'));
+select 'quarter', date_diff('quarter', toDateTime64('1969-12-25 10:00:00.000', 3), toDateTime64('1970-01-05 10:00:00.000', 3));
+
+select 'month', date_diff('month', toDate32('1969-12-25'), toDate32('1970-01-05'));
+select 'month', date_diff('month', toDateTime64('1969-12-25 10:00:00.000', 3), toDateTime64('1970-01-05 10:00:00.000', 3));
+
+select 'week', date_diff('week', toDate32('1969-12-25'), toDate32('1970-01-05'));
+select 'week', date_diff('week', toDateTime64('1969-12-25 10:00:00.000', 3), toDateTime64('1970-01-05 10:00:00.000', 3));
+
+select 'day', date_diff('day', toDate32('1969-12-25'), toDate32('1970-01-05'));
+select 'day', date_diff('day', toDateTime64('1969-12-25 10:00:00.000', 3), toDateTime64('1970-01-05 10:00:00.000', 3));
+
+select 'hour', date_diff('hour', toDate32('1969-12-25'), toDate32('1970-01-05'));
+select 'hour', date_diff('hour', toDateTime64('1969-12-25 10:00:00.000', 3), toDateTime64('1970-01-05 10:00:00.000', 3));
+
+select 'minute', date_diff('minute', toDate32('1969-12-31'), toDate32('1970-01-01'));
+select 'minute', date_diff('minute', toDateTime64('1969-12-31 23:50:00.000', 3), toDateTime64('1970-01-01 00:10:00.000', 3));
+
+select 'second', date_diff('second', toDate32('1969-12-31'), toDate32('1970-01-01'));
+select 'second', date_diff('second', toDateTime64('1969-12-31 23:50:00.000', 3), toDateTime64('1970-01-01 00:10:00.000', 3));
diff --git a/tests/queries/0_stateless/02458_datediff_date32.reference b/tests/queries/0_stateless/02458_datediff_date32.reference
new file mode 100644
index 00000000000..67bfa895199
--- /dev/null
+++ b/tests/queries/0_stateless/02458_datediff_date32.reference
@@ -0,0 +1,169 @@
+-- { echo }
+
+-- Date32 vs Date32
+SELECT dateDiff('second', toDate32('1900-01-01'), toDate32('1900-01-02'));
+86400
+SELECT dateDiff('minute', toDate32('1900-01-01'), toDate32('1900-01-02'));
+1440
+SELECT dateDiff('hour', toDate32('1900-01-01'), toDate32('1900-01-02'));
+24
+SELECT dateDiff('day', toDate32('1900-01-01'), toDate32('1900-01-02'));
+1
+SELECT dateDiff('week', toDate32('1900-01-01'), toDate32('1900-01-08'));
+1
+SELECT dateDiff('month', toDate32('1900-01-01'), toDate32('1900-02-01'));
+1
+SELECT dateDiff('quarter', toDate32('1900-01-01'), toDate32('1900-04-01'));
+1
+SELECT dateDiff('year', toDate32('1900-01-01'), toDate32('1901-01-01'));
+1
+-- With DateTime64
+-- Date32 vs DateTime64
+SELECT dateDiff('second', toDate32('1900-01-01'), toDateTime64('1900-01-02 00:00:00', 3));
+86400
+SELECT dateDiff('minute', toDate32('1900-01-01'), toDateTime64('1900-01-02 00:00:00', 3));
+1440
+SELECT dateDiff('hour', toDate32('1900-01-01'), toDateTime64('1900-01-02 00:00:00', 3));
+24
+SELECT dateDiff('day', toDate32('1900-01-01'), toDateTime64('1900-01-02 00:00:00', 3));
+1
+SELECT dateDiff('week', toDate32('1900-01-01'), toDateTime64('1900-01-08 00:00:00', 3));
+1
+SELECT dateDiff('month', toDate32('1900-01-01'), toDateTime64('1900-02-01 00:00:00', 3));
+1
+SELECT dateDiff('quarter', toDate32('1900-01-01'), toDateTime64('1900-04-01 00:00:00', 3));
+1
+SELECT dateDiff('year', toDate32('1900-01-01'), toDateTime64('1901-01-01 00:00:00', 3));
+1
+-- DateTime64 vs Date32
+SELECT dateDiff('second', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-02'));
+86400
+SELECT dateDiff('minute', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-02'));
+1440
+SELECT dateDiff('hour', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-02'));
+24
+SELECT dateDiff('day', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-02'));
+1
+SELECT dateDiff('week', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-08'));
+1
+SELECT dateDiff('month', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-02-01'));
+1
+SELECT dateDiff('quarter', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-04-01'));
+1
+SELECT dateDiff('year', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1901-01-01'));
+1
+-- With DateTime
+-- Date32 vs DateTime
+SELECT dateDiff('second', toDate32('2015-08-18'), toDateTime('2015-08-19 00:00:00'));
+86400
+SELECT dateDiff('minute', toDate32('2015-08-18'), toDateTime('2015-08-19 00:00:00'));
+1440
+SELECT dateDiff('hour', toDate32('2015-08-18'), toDateTime('2015-08-19 00:00:00'));
+24
+SELECT dateDiff('day', toDate32('2015-08-18'), toDateTime('2015-08-19 00:00:00'));
+1
+SELECT dateDiff('week', toDate32('2015-08-18'), toDateTime('2015-08-25 00:00:00'));
+1
+SELECT dateDiff('month', toDate32('2015-08-18'), toDateTime('2015-09-18 00:00:00'));
+1
+SELECT dateDiff('quarter', toDate32('2015-08-18'), toDateTime('2015-11-18 00:00:00'));
+1
+SELECT dateDiff('year', toDate32('2015-08-18'), toDateTime('2016-08-18 00:00:00'));
+1
+-- DateTime vs Date32
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-19'));
+86400
+SELECT dateDiff('minute', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-19'));
+1440
+SELECT dateDiff('hour', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-19'));
+24
+SELECT dateDiff('day', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-19'));
+1
+SELECT dateDiff('week', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-25'));
+1
+SELECT dateDiff('month', toDateTime('2015-08-18 00:00:00'), toDate32('2015-09-18'));
+1
+SELECT dateDiff('quarter', toDateTime('2015-08-18 00:00:00'), toDate32('2015-11-18'));
+1
+SELECT dateDiff('year', toDateTime('2015-08-18 00:00:00'), toDate32('2016-08-18'));
+1
+-- With Date
+-- Date32 vs Date
+SELECT dateDiff('second', toDate32('2015-08-18'), toDate('2015-08-19'));
+86400
+SELECT dateDiff('minute', toDate32('2015-08-18'), toDate('2015-08-19'));
+1440
+SELECT dateDiff('hour', toDate32('2015-08-18'), toDate('2015-08-19'));
+24
+SELECT dateDiff('day', toDate32('2015-08-18'), toDate('2015-08-19'));
+1
+SELECT dateDiff('week', toDate32('2015-08-18'), toDate('2015-08-25'));
+1
+SELECT dateDiff('month', toDate32('2015-08-18'), toDate('2015-09-18'));
+1
+SELECT dateDiff('quarter', toDate32('2015-08-18'), toDate('2015-11-18'));
+1
+SELECT dateDiff('year', toDate32('2015-08-18'), toDate('2016-08-18'));
+1
+-- Date vs Date32
+SELECT dateDiff('second', toDate('2015-08-18'), toDate32('2015-08-19'));
+86400
+SELECT dateDiff('minute', toDate('2015-08-18'), toDate32('2015-08-19'));
+1440
+SELECT dateDiff('hour', toDate('2015-08-18'), toDate32('2015-08-19'));
+24
+SELECT dateDiff('day', toDate('2015-08-18'), toDate32('2015-08-19'));
+1
+SELECT dateDiff('week', toDate('2015-08-18'), toDate32('2015-08-25'));
+1
+SELECT dateDiff('month', toDate('2015-08-18'), toDate32('2015-09-18'));
+1
+SELECT dateDiff('quarter', toDate('2015-08-18'), toDate32('2015-11-18'));
+1
+SELECT dateDiff('year', toDate('2015-08-18'), toDate32('2016-08-18'));
+1
+-- Const vs non-const columns
+SELECT dateDiff('day', toDate32('1900-01-01'), materialize(toDate32('1900-01-02')));
+1
+SELECT dateDiff('day', toDate32('1900-01-01'), materialize(toDateTime64('1900-01-02 00:00:00', 3)));
+1
+SELECT dateDiff('day', toDateTime64('1900-01-01 00:00:00', 3), materialize(toDate32('1900-01-02')));
+1
+SELECT dateDiff('day', toDate32('2015-08-18'), materialize(toDateTime('2015-08-19 00:00:00')));
+1
+SELECT dateDiff('day', toDateTime('2015-08-18 00:00:00'), materialize(toDate32('2015-08-19')));
+1
+SELECT dateDiff('day', toDate32('2015-08-18'), materialize(toDate('2015-08-19')));
+1
+SELECT dateDiff('day', toDate('2015-08-18'), materialize(toDate32('2015-08-19')));
+1
+-- Non-const vs const columns
+SELECT dateDiff('day', materialize(toDate32('1900-01-01')), toDate32('1900-01-02'));
+1
+SELECT dateDiff('day', materialize(toDate32('1900-01-01')), toDateTime64('1900-01-02 00:00:00', 3));
+1
+SELECT dateDiff('day', materialize(toDateTime64('1900-01-01 00:00:00', 3)), toDate32('1900-01-02'));
+1
+SELECT dateDiff('day', materialize(toDate32('2015-08-18')), toDateTime('2015-08-19 00:00:00'));
+1
+SELECT dateDiff('day', materialize(toDateTime('2015-08-18 00:00:00')), toDate32('2015-08-19'));
+1
+SELECT dateDiff('day', materialize(toDate32('2015-08-18')), toDate('2015-08-19'));
+1
+SELECT dateDiff('day', materialize(toDate('2015-08-18')), toDate32('2015-08-19'));
+1
+-- Non-const vs non-const columns
+SELECT dateDiff('day', materialize(toDate32('1900-01-01')), materialize(toDate32('1900-01-02')));
+1
+SELECT dateDiff('day', materialize(toDate32('1900-01-01')), materialize(toDateTime64('1900-01-02 00:00:00', 3)));
+1
+SELECT dateDiff('day', materialize(toDateTime64('1900-01-01 00:00:00', 3)), materialize(toDate32('1900-01-02')));
+1
+SELECT dateDiff('day', materialize(toDate32('2015-08-18')), materialize(toDateTime('2015-08-19 00:00:00')));
+1
+SELECT dateDiff('day', materialize(toDateTime('2015-08-18 00:00:00')), materialize(toDate32('2015-08-19')));
+1
+SELECT dateDiff('day', materialize(toDate32('2015-08-18')), materialize(toDate('2015-08-19')));
+1
+SELECT dateDiff('day', materialize(toDate('2015-08-18')), materialize(toDate32('2015-08-19')));
+1
diff --git a/tests/queries/0_stateless/02458_datediff_date32.sql b/tests/queries/0_stateless/02458_datediff_date32.sql
new file mode 100644
index 00000000000..4c26e04ac27
--- /dev/null
+++ b/tests/queries/0_stateless/02458_datediff_date32.sql
@@ -0,0 +1,101 @@
+-- { echo }
+
+-- Date32 vs Date32
+SELECT dateDiff('second', toDate32('1900-01-01'), toDate32('1900-01-02'));
+SELECT dateDiff('minute', toDate32('1900-01-01'), toDate32('1900-01-02'));
+SELECT dateDiff('hour', toDate32('1900-01-01'), toDate32('1900-01-02'));
+SELECT dateDiff('day', toDate32('1900-01-01'), toDate32('1900-01-02'));
+SELECT dateDiff('week', toDate32('1900-01-01'), toDate32('1900-01-08'));
+SELECT dateDiff('month', toDate32('1900-01-01'), toDate32('1900-02-01'));
+SELECT dateDiff('quarter', toDate32('1900-01-01'), toDate32('1900-04-01'));
+SELECT dateDiff('year', toDate32('1900-01-01'), toDate32('1901-01-01'));
+
+-- With DateTime64
+-- Date32 vs DateTime64
+SELECT dateDiff('second', toDate32('1900-01-01'), toDateTime64('1900-01-02 00:00:00', 3));
+SELECT dateDiff('minute', toDate32('1900-01-01'), toDateTime64('1900-01-02 00:00:00', 3));
+SELECT dateDiff('hour', toDate32('1900-01-01'), toDateTime64('1900-01-02 00:00:00', 3));
+SELECT dateDiff('day', toDate32('1900-01-01'), toDateTime64('1900-01-02 00:00:00', 3));
+SELECT dateDiff('week', toDate32('1900-01-01'), toDateTime64('1900-01-08 00:00:00', 3));
+SELECT dateDiff('month', toDate32('1900-01-01'), toDateTime64('1900-02-01 00:00:00', 3));
+SELECT dateDiff('quarter', toDate32('1900-01-01'), toDateTime64('1900-04-01 00:00:00', 3));
+SELECT dateDiff('year', toDate32('1900-01-01'), toDateTime64('1901-01-01 00:00:00', 3));
+
+-- DateTime64 vs Date32
+SELECT dateDiff('second', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-02'));
+SELECT dateDiff('minute', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-02'));
+SELECT dateDiff('hour', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-02'));
+SELECT dateDiff('day', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-02'));
+SELECT dateDiff('week', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-01-08'));
+SELECT dateDiff('month', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-02-01'));
+SELECT dateDiff('quarter', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1900-04-01'));
+SELECT dateDiff('year', toDateTime64('1900-01-01 00:00:00', 3), toDate32('1901-01-01'));
+
+-- With DateTime
+-- Date32 vs DateTime
+SELECT dateDiff('second', toDate32('2015-08-18'), toDateTime('2015-08-19 00:00:00'));
+SELECT dateDiff('minute', toDate32('2015-08-18'), toDateTime('2015-08-19 00:00:00'));
+SELECT dateDiff('hour', toDate32('2015-08-18'), toDateTime('2015-08-19 00:00:00'));
+SELECT dateDiff('day', toDate32('2015-08-18'), toDateTime('2015-08-19 00:00:00'));
+SELECT dateDiff('week', toDate32('2015-08-18'), toDateTime('2015-08-25 00:00:00'));
+SELECT dateDiff('month', toDate32('2015-08-18'), toDateTime('2015-09-18 00:00:00'));
+SELECT dateDiff('quarter', toDate32('2015-08-18'), toDateTime('2015-11-18 00:00:00'));
+SELECT dateDiff('year', toDate32('2015-08-18'), toDateTime('2016-08-18 00:00:00'));
+
+-- DateTime vs Date32
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-19'));
+SELECT dateDiff('minute', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-19'));
+SELECT dateDiff('hour', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-19'));
+SELECT dateDiff('day', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-19'));
+SELECT dateDiff('week', toDateTime('2015-08-18 00:00:00'), toDate32('2015-08-25'));
+SELECT dateDiff('month', toDateTime('2015-08-18 00:00:00'), toDate32('2015-09-18'));
+SELECT dateDiff('quarter', toDateTime('2015-08-18 00:00:00'), toDate32('2015-11-18'));
+SELECT dateDiff('year', toDateTime('2015-08-18 00:00:00'), toDate32('2016-08-18'));
+
+-- With Date
+-- Date32 vs Date
+SELECT dateDiff('second', toDate32('2015-08-18'), toDate('2015-08-19'));
+SELECT dateDiff('minute', toDate32('2015-08-18'), toDate('2015-08-19'));
+SELECT dateDiff('hour', toDate32('2015-08-18'), toDate('2015-08-19'));
+SELECT dateDiff('day', toDate32('2015-08-18'), toDate('2015-08-19'));
+SELECT dateDiff('week', toDate32('2015-08-18'), toDate('2015-08-25'));
+SELECT dateDiff('month', toDate32('2015-08-18'), toDate('2015-09-18'));
+SELECT dateDiff('quarter', toDate32('2015-08-18'), toDate('2015-11-18'));
+SELECT dateDiff('year', toDate32('2015-08-18'), toDate('2016-08-18'));
+
+-- Date vs Date32
+SELECT dateDiff('second', toDate('2015-08-18'), toDate32('2015-08-19'));
+SELECT dateDiff('minute', toDate('2015-08-18'), toDate32('2015-08-19'));
+SELECT dateDiff('hour', toDate('2015-08-18'), toDate32('2015-08-19'));
+SELECT dateDiff('day', toDate('2015-08-18'), toDate32('2015-08-19'));
+SELECT dateDiff('week', toDate('2015-08-18'), toDate32('2015-08-25'));
+SELECT dateDiff('month', toDate('2015-08-18'), toDate32('2015-09-18'));
+SELECT dateDiff('quarter', toDate('2015-08-18'), toDate32('2015-11-18'));
+SELECT dateDiff('year', toDate('2015-08-18'), toDate32('2016-08-18'));
+
+-- Const vs non-const columns
+SELECT dateDiff('day', toDate32('1900-01-01'), materialize(toDate32('1900-01-02')));
+SELECT dateDiff('day', toDate32('1900-01-01'), materialize(toDateTime64('1900-01-02 00:00:00', 3)));
+SELECT dateDiff('day', toDateTime64('1900-01-01 00:00:00', 3), materialize(toDate32('1900-01-02')));
+SELECT dateDiff('day', toDate32('2015-08-18'), materialize(toDateTime('2015-08-19 00:00:00')));
+SELECT dateDiff('day', toDateTime('2015-08-18 00:00:00'), materialize(toDate32('2015-08-19')));
+SELECT dateDiff('day', toDate32('2015-08-18'), materialize(toDate('2015-08-19')));
+SELECT dateDiff('day', toDate('2015-08-18'), materialize(toDate32('2015-08-19')));
+
+-- Non-const vs const columns
+SELECT dateDiff('day', materialize(toDate32('1900-01-01')), toDate32('1900-01-02'));
+SELECT dateDiff('day', materialize(toDate32('1900-01-01')), toDateTime64('1900-01-02 00:00:00', 3));
+SELECT dateDiff('day', materialize(toDateTime64('1900-01-01 00:00:00', 3)), toDate32('1900-01-02'));
+SELECT dateDiff('day', materialize(toDate32('2015-08-18')), toDateTime('2015-08-19 00:00:00'));
+SELECT dateDiff('day', materialize(toDateTime('2015-08-18 00:00:00')), toDate32('2015-08-19'));
+SELECT dateDiff('day', materialize(toDate32('2015-08-18')), toDate('2015-08-19'));
+SELECT dateDiff('day', materialize(toDate('2015-08-18')), toDate32('2015-08-19'));
+
+-- Non-const vs non-const columns
+SELECT dateDiff('day', materialize(toDate32('1900-01-01')), materialize(toDate32('1900-01-02')));
+SELECT dateDiff('day', materialize(toDate32('1900-01-01')), materialize(toDateTime64('1900-01-02 00:00:00', 3)));
+SELECT dateDiff('day', materialize(toDateTime64('1900-01-01 00:00:00', 3)), materialize(toDate32('1900-01-02')));
+SELECT dateDiff('day', materialize(toDate32('2015-08-18')), materialize(toDateTime('2015-08-19 00:00:00')));
+SELECT dateDiff('day', materialize(toDateTime('2015-08-18 00:00:00')), materialize(toDate32('2015-08-19')));
+SELECT dateDiff('day', materialize(toDate32('2015-08-18')), materialize(toDate('2015-08-19')));
+SELECT dateDiff('day', materialize(toDate('2015-08-18')), materialize(toDate32('2015-08-19')));
diff --git a/tests/queries/0_stateless/02458_empty_hdfs_url.reference b/tests/queries/0_stateless/02458_empty_hdfs_url.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02458_empty_hdfs_url.sql b/tests/queries/0_stateless/02458_empty_hdfs_url.sql
new file mode 100644
index 00000000000..ccc554fc628
--- /dev/null
+++ b/tests/queries/0_stateless/02458_empty_hdfs_url.sql
@@ -0,0 +1,5 @@
+-- Tags: no-fasttest, no-cpu-aarch64
+SELECT * FROM hdfsCluster('test_shard_localhost', '', 'TSV'); -- { serverError BAD_ARGUMENTS }
+SELECT * FROM hdfsCluster('test_shard_localhost', ' ', 'TSV'); -- { serverError BAD_ARGUMENTS }
+SELECT * FROM hdfsCluster('test_shard_localhost', '/', 'TSV'); -- { serverError BAD_ARGUMENTS }
+SELECT * FROM hdfsCluster('test_shard_localhost', 'http/', 'TSV'); -- { serverError BAD_ARGUMENTS }
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02459_low_cardinality_uint128_aggregator.reference b/tests/queries/0_stateless/02459_low_cardinality_uint128_aggregator.reference
new file mode 100644
index 00000000000..2a3af430e48
--- /dev/null
+++ b/tests/queries/0_stateless/02459_low_cardinality_uint128_aggregator.reference
@@ -0,0 +1,20 @@
+0	4950
+1	14950
+2	24950
+3	34950
+4	44950
+5	54950
+6	64950
+7	74950
+8	84950
+9	94950
+0	4950
+1	14950
+2	24950
+3	34950
+4	44950
+5	54950
+6	64950
+7	74950
+8	84950
+9	94950
diff --git a/tests/queries/0_stateless/02459_low_cardinality_uint128_aggregator.sql b/tests/queries/0_stateless/02459_low_cardinality_uint128_aggregator.sql
new file mode 100644
index 00000000000..893e5514ba5
--- /dev/null
+++ b/tests/queries/0_stateless/02459_low_cardinality_uint128_aggregator.sql
@@ -0,0 +1,9 @@
+SET allow_suspicious_low_cardinality_types = 1;
+-- LC UInt128
+CREATE TABLE group_by_pk_lc_uint128 (`k` LowCardinality(UInt128), `v` UInt32) ENGINE = MergeTree ORDER BY k PARTITION BY v%50;
+INSERT INTO group_by_pk_lc_uint128 SELECT number / 100, number FROM numbers(1000);
+SELECT k, sum(v) AS s FROM group_by_pk_lc_uint128 GROUP BY k ORDER BY k ASC LIMIT 1024 SETTINGS optimize_aggregation_in_order = 1;
+-- LC UInt256
+CREATE TABLE group_by_pk_lc_uint256 (`k` LowCardinality(UInt256), `v` UInt32) ENGINE = MergeTree ORDER BY k PARTITION BY v%50;
+INSERT INTO group_by_pk_lc_uint256 SELECT number / 100, number FROM numbers(1000);
+SELECT k, sum(v) AS s FROM group_by_pk_lc_uint256 GROUP BY k ORDER BY k ASC LIMIT 1024 SETTINGS optimize_aggregation_in_order = 1;
diff --git a/tests/queries/0_stateless/02459_read_in_order_bufer.reference b/tests/queries/0_stateless/02459_read_in_order_bufer.reference
new file mode 100644
index 00000000000..b040bdf6167
--- /dev/null
+++ b/tests/queries/0_stateless/02459_read_in_order_bufer.reference
@@ -0,0 +1,5 @@
+9
+8
+7
+6
+5
diff --git a/tests/queries/0_stateless/02459_read_in_order_bufer.sql b/tests/queries/0_stateless/02459_read_in_order_bufer.sql
new file mode 100644
index 00000000000..5a6e0a3dbc6
--- /dev/null
+++ b/tests/queries/0_stateless/02459_read_in_order_bufer.sql
@@ -0,0 +1,13 @@
+CREATE TABLE mytable_stored (`a` UInt8) ENGINE = MergeTree ORDER BY a;
+CREATE TABLE mytable (`a` UInt8) ENGINE = Buffer(currentDatabase(), 'mytable_stored', 4, 600, 3600, 10, 100, 10000, 10000000);
+INSERT INTO mytable VALUES (0);
+INSERT INTO mytable VALUES (1);
+INSERT INTO mytable VALUES (2);
+INSERT INTO mytable VALUES (3);
+INSERT INTO mytable VALUES (4);
+INSERT INTO mytable VALUES (5);
+INSERT INTO mytable VALUES (6);
+INSERT INTO mytable VALUES (7);
+INSERT INTO mytable VALUES (8);
+INSERT INTO mytable VALUES (9);
+SELECT a FROM mytable ORDER BY a DESC LIMIT 5;
diff --git a/tests/queries/0_stateless/02461_cancel_finish_race.reference b/tests/queries/0_stateless/02461_cancel_finish_race.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02461_cancel_finish_race.sh b/tests/queries/0_stateless/02461_cancel_finish_race.sh
new file mode 100755
index 00000000000..7e775437da1
--- /dev/null
+++ b/tests/queries/0_stateless/02461_cancel_finish_race.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function thread_query()
+{
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT count() FROM numbers_mt(10000) WHERE rand() = 0 FORMAT Null";
+    done
+}
+
+function thread_cancel()
+{
+    while true; do
+        $CLICKHOUSE_CLIENT --query "KILL QUERY WHERE current_database = '$CLICKHOUSE_DATABASE' SYNC FORMAT Null";
+    done
+}
+
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread_query;
+export -f thread_cancel;
+
+TIMEOUT=30
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+timeout $TIMEOUT bash -c thread_query 2> /dev/null &
+timeout $TIMEOUT bash -c thread_cancel 2> /dev/null &
+
+wait
diff --git a/tests/queries/0_stateless/02461_join_lc_issue_42380.reference b/tests/queries/0_stateless/02461_join_lc_issue_42380.reference
new file mode 100644
index 00000000000..b0d5371e4f7
--- /dev/null
+++ b/tests/queries/0_stateless/02461_join_lc_issue_42380.reference
@@ -0,0 +1,2 @@
+1	0
+\N	1
diff --git a/tests/queries/0_stateless/02461_join_lc_issue_42380.sql b/tests/queries/0_stateless/02461_join_lc_issue_42380.sql
new file mode 100644
index 00000000000..f0ecbf64e58
--- /dev/null
+++ b/tests/queries/0_stateless/02461_join_lc_issue_42380.sql
@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS t1__fuzz_13;
+DROP TABLE IF EXISTS t2__fuzz_47;
+
+SET allow_suspicious_low_cardinality_types = 1;
+
+CREATE TABLE t1__fuzz_13 (id Nullable(Int16)) ENGINE = MergeTree() ORDER BY id SETTINGS allow_nullable_key = 1;
+CREATE TABLE t2__fuzz_47 (id LowCardinality(Int16)) ENGINE = MergeTree() ORDER BY id;
+
+INSERT INTO t1__fuzz_13 VALUES (1);
+INSERT INTO t2__fuzz_47 VALUES (1);
+
+SELECT * FROM t1__fuzz_13 FULL OUTER JOIN t2__fuzz_47 ON 1 = 2;
diff --git a/tests/queries/0_stateless/02461_welch_t_test_fuzz.reference b/tests/queries/0_stateless/02461_welch_t_test_fuzz.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02461_welch_t_test_fuzz.sql b/tests/queries/0_stateless/02461_welch_t_test_fuzz.sql
new file mode 100644
index 00000000000..b22dc49dec3
--- /dev/null
+++ b/tests/queries/0_stateless/02461_welch_t_test_fuzz.sql
@@ -0,0 +1,8 @@
+
+DROP TABLE IF EXISTS welch_ttest__fuzz_7;
+CREATE TABLE welch_ttest__fuzz_7 (left UInt128, right UInt128) ENGINE = Memory;
+
+INSERT INTO welch_ttest__fuzz_7 VALUES (0.010268, 0), (0.000167, 0), (0.000167, 0), (0.159258, 1), (0.136278, 1), (0.122389, 1);
+
+SELECT roundBankers(welchTTest(left, right).2, 6) from welch_ttest__fuzz_7;  -- { serverError 36 }
+SELECT roundBankers(studentTTest(left, right).2, 6) from welch_ttest__fuzz_7;  -- { serverError 36 }
diff --git a/tests/queries/0_stateless/02462_distributions.reference b/tests/queries/0_stateless/02462_distributions.reference
new file mode 100644
index 00000000000..56b04bcb856
--- /dev/null
+++ b/tests/queries/0_stateless/02462_distributions.reference
@@ -0,0 +1,12 @@
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+0
+1
+Ok
+Ok
+Ok
diff --git a/tests/queries/0_stateless/02462_distributions.sql b/tests/queries/0_stateless/02462_distributions.sql
new file mode 100644
index 00000000000..b45dc897f2a
--- /dev/null
+++ b/tests/queries/0_stateless/02462_distributions.sql
@@ -0,0 +1,24 @@
+# Values should be between 0 and 1
+SELECT DISTINCT if (a >= toFloat64(0) AND a <= toFloat64(1), 'Ok', 'Fail') FROM (SELECT randUniform(0, 1) AS a FROM numbers(100000));
+# Mean should be around 0
+SELECT DISTINCT if (m >= toFloat64(-0.2) AND m <= toFloat64(0.2), 'Ok', 'Fail') FROM (SELECT avg(a) as m FROM (SELECT randNormal(0, 5) AS a FROM numbers(100000)));
+# Values should be >= 0
+SELECT DISTINCT if (a >= toFloat64(0), 'Ok', 'Fail') FROM (SELECT randLogNormal(0, 5) AS a FROM numbers(100000));
+# Values should be >= 0
+SELECT DISTINCT if (a >= toFloat64(0), 'Ok', 'Fail') FROM (SELECT randExponential(15) AS a FROM numbers(100000));
+# Values should be >= 0
+SELECT DISTINCT if (a >= toFloat64(0), 'Ok', 'Fail') FROM (SELECT randChiSquared(3) AS a FROM numbers(100000));
+# Mean should be around 0
+SELECT DISTINCT if (m > toFloat64(-0.2) AND m < toFloat64(0.2), 'Ok', 'Fail') FROM (SELECT avg(a) as m FROM (SELECT randStudentT(5) AS a FROM numbers(100000)));
+# Values should be >= 0
+SELECT DISTINCT if (a >= toFloat64(0), 'Ok', 'Fail') FROM (SELECT randFisherF(3, 4) AS a FROM numbers(100000));
+# There should be only 0s and 1s
+SELECT a FROM (SELECT DISTINCT randBernoulli(0.5) AS a FROM numbers(100000)) ORDER BY a;
+# Values should be >= 0
+SELECT DISTINCT if (a >= toFloat64(0), 'Ok', 'Fail') FROM (SELECT randBinomial(3, 0.5) AS a FROM numbers(100000));
+# Values should be >= 0
+SELECT DISTINCT if (a >= toFloat64(0), 'Ok', 'Fail') FROM (SELECT randNegativeBinomial(3, 0.5) AS a FROM numbers(100000));
+# Values should be >= 0
+SELECT DISTINCT if (a >= toFloat64(0), 'Ok', 'Fail') FROM (SELECT randPoisson(44) AS a FROM numbers(100000));
+# No errors
+SELECT randUniform(1, 2, 1), randNormal(0, 1, 'abacaba'), randLogNormal(0, 10, 'b'), randChiSquared(1, 1), randStudentT(7, '8'), randFisherF(23, 42, 100), randBernoulli(0.5, 2), randBinomial(3, 0.5, 1), randNegativeBinomial(3, 0.5, 2), randPoisson(44, 44) FORMAT Null;
diff --git a/tests/queries/0_stateless/02462_int_to_date.reference b/tests/queries/0_stateless/02462_int_to_date.reference
new file mode 100644
index 00000000000..f31441cf3b8
--- /dev/null
+++ b/tests/queries/0_stateless/02462_int_to_date.reference
@@ -0,0 +1,4 @@
+20221011	2022-10-11	1665519765
+20221011	2022-10-11	1665519765
+20221011	2022-10-11	1665519765	Int32
+20221011	2022-10-11	1665519765	UInt32
diff --git a/tests/queries/0_stateless/02462_int_to_date.sql b/tests/queries/0_stateless/02462_int_to_date.sql
new file mode 100644
index 00000000000..cd470ca12f6
--- /dev/null
+++ b/tests/queries/0_stateless/02462_int_to_date.sql
@@ -0,0 +1,4 @@
+select toYYYYMMDD(toDate(recordTimestamp, 'Europe/Amsterdam')), toDate(recordTimestamp, 'Europe/Amsterdam'), toInt64(1665519765) as recordTimestamp;
+select toYYYYMMDD(toDate(recordTimestamp, 'Europe/Amsterdam')), toDate(recordTimestamp, 'Europe/Amsterdam'), toUInt64(1665519765) as recordTimestamp;
+select toYYYYMMDD(toDate(recordTimestamp, 'Europe/Amsterdam')), toDate(recordTimestamp, 'Europe/Amsterdam'), toInt32(1665519765) as recordTimestamp, toTypeName(recordTimestamp);
+select toYYYYMMDD(toDate(recordTimestamp, 'Europe/Amsterdam')), toDate(recordTimestamp, 'Europe/Amsterdam'), toUInt32(1665519765) as recordTimestamp, toTypeName(recordTimestamp);
diff --git a/tests/queries/0_stateless/02463_julian_day_ubsan.reference b/tests/queries/0_stateless/02463_julian_day_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02463_julian_day_ubsan.sql b/tests/queries/0_stateless/02463_julian_day_ubsan.sql
new file mode 100644
index 00000000000..a8583d7b0a8
--- /dev/null
+++ b/tests/queries/0_stateless/02463_julian_day_ubsan.sql
@@ -0,0 +1 @@
+SELECT fromModifiedJulianDay(9223372036854775807 :: Int64); -- { serverError 490 }
diff --git a/tests/queries/0_stateless/02464_decimal_scale_buffer_overflow.reference b/tests/queries/0_stateless/02464_decimal_scale_buffer_overflow.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02464_decimal_scale_buffer_overflow.sql b/tests/queries/0_stateless/02464_decimal_scale_buffer_overflow.sql
new file mode 100644
index 00000000000..355d9012f1f
--- /dev/null
+++ b/tests/queries/0_stateless/02464_decimal_scale_buffer_overflow.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS series__fuzz_35;
+CREATE TABLE series__fuzz_35 (`i` UInt8, `x_value` Decimal(18, 14), `y_value` DateTime) ENGINE = Memory;
+INSERT INTO series__fuzz_35(i, x_value, y_value) VALUES (1, 5.6,-4.4),(2, -9.6,3),(3, -1.3,-4),(4, 5.3,9.7),(5, 4.4,0.037),(6, -8.6,-7.8),(7, 5.1,9.3),(8, 7.9,-3.6),(9, -8.2,0.62),(10, -3,7.3);
+SELECT skewSamp(x_value) FROM (SELECT x_value as x_value FROM series__fuzz_35 LIMIT 2) FORMAT Null;
+DROP TABLE series__fuzz_35;
diff --git a/tests/queries/0_stateless/02466_distributed_query_profiler.reference b/tests/queries/0_stateless/02466_distributed_query_profiler.reference
new file mode 100644
index 00000000000..4521d575ff3
--- /dev/null
+++ b/tests/queries/0_stateless/02466_distributed_query_profiler.reference
@@ -0,0 +1,10 @@
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
diff --git a/tests/queries/0_stateless/02466_distributed_query_profiler.sql b/tests/queries/0_stateless/02466_distributed_query_profiler.sql
new file mode 100644
index 00000000000..9fc2fe7b4bd
--- /dev/null
+++ b/tests/queries/0_stateless/02466_distributed_query_profiler.sql
@@ -0,0 +1,21 @@
+-- This is a regression test for EINTR handling in MultiplexedConnections::getReplicaForReading()
+
+select * from remote('127.{2,4}', view(
+    -- This is the emulation of the slow query, the server will return a line each 0.1 second
+    select sleep(0.1) from numbers(20) settings max_block_size=1)
+)
+-- LIMIT is to activate query cancellation in case of enough rows already read.
+limit 10
+settings
+    -- This is to avoid draining in background and got the exception during query execution
+    drain_timeout=-1,
+    -- This is to activate as much signals as possible to trigger EINTR
+    query_profiler_real_time_period_ns=1,
+    -- This is to use MultiplexedConnections
+    use_hedged_requests=0,
+    -- This is to make the initiator waiting for cancel packet in MultiplexedConnections::getReplicaForReading()
+    --
+    -- NOTE: that even smaller sleep will be enough to trigger this problem
+    -- with 100% probability, however just to make it more reliable, increase
+    -- it to 2 seconds.
+    sleep_in_receive_cancel_ms=2000;
diff --git a/tests/queries/0_stateless/02467_cross_join_three_table_functions.reference b/tests/queries/0_stateless/02467_cross_join_three_table_functions.reference
new file mode 100644
index 00000000000..0718dd8e65f
--- /dev/null
+++ b/tests/queries/0_stateless/02467_cross_join_three_table_functions.reference
@@ -0,0 +1 @@
+1320
diff --git a/tests/queries/0_stateless/02467_cross_join_three_table_functions.sql b/tests/queries/0_stateless/02467_cross_join_three_table_functions.sql
new file mode 100644
index 00000000000..5c7da815bbe
--- /dev/null
+++ b/tests/queries/0_stateless/02467_cross_join_three_table_functions.sql
@@ -0,0 +1 @@
+SELECT count(*) FROM numbers(10) AS a, numbers(11) AS b, numbers(12) AS c;
diff --git a/tests/queries/0_stateless/02468_has_any_tuple.reference b/tests/queries/0_stateless/02468_has_any_tuple.reference
new file mode 100644
index 00000000000..252a9293563
--- /dev/null
+++ b/tests/queries/0_stateless/02468_has_any_tuple.reference
@@ -0,0 +1,4 @@
+1
+1
+[(3,3)]
+1
diff --git a/tests/queries/0_stateless/02468_has_any_tuple.sql b/tests/queries/0_stateless/02468_has_any_tuple.sql
new file mode 100644
index 00000000000..12c7222d593
--- /dev/null
+++ b/tests/queries/0_stateless/02468_has_any_tuple.sql
@@ -0,0 +1,4 @@
+select [(toUInt8(3), toUInt8(3))] = [(toInt16(3), toInt16(3))];
+select hasAny([(toInt16(3), toInt16(3))],[(toInt16(3), toInt16(3))]);
+select arrayFilter(x -> x = (toInt16(3), toInt16(3)), arrayZip([toUInt8(3)], [toUInt8(3)]));
+select hasAny([(toUInt8(3), toUInt8(3))],[(toInt16(3), toInt16(3))]);
diff --git a/tests/queries/0_stateless/02469_interval_msan.reference b/tests/queries/0_stateless/02469_interval_msan.reference
new file mode 100644
index 00000000000..c18b4e9b082
--- /dev/null
+++ b/tests/queries/0_stateless/02469_interval_msan.reference
@@ -0,0 +1,8 @@
+1
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02469_interval_msan.sql b/tests/queries/0_stateless/02469_interval_msan.sql
new file mode 100644
index 00000000000..4b4a9f746ea
--- /dev/null
+++ b/tests/queries/0_stateless/02469_interval_msan.sql
@@ -0,0 +1,19 @@
+SELECT now() + 1::Int128; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT now() + 1::Int256; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT now() + 1::UInt128; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT now() + 1::UInt256; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT now() - 1::Int128; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT now() - 1::Int256; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT now() - 1::UInt128; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT now() - 1::UInt256; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT now() + INTERVAL 1::Int128 SECOND - now();
+SELECT now() + INTERVAL 1::Int256 SECOND - now();
+SELECT now() + INTERVAL 1::UInt128 SECOND - now();
+SELECT now() + INTERVAL 1::UInt256 SECOND - now();
+
+SELECT today() + INTERVAL 1::Int128 DAY - today();
+SELECT today() + INTERVAL 1::Int256 DAY - today();
+SELECT today() + INTERVAL 1::UInt128 DAY - today();
+SELECT today() + INTERVAL 1::UInt256 DAY - today();
diff --git a/tests/queries/0_stateless/02470_suspicious_low_cardinality_msan.reference b/tests/queries/0_stateless/02470_suspicious_low_cardinality_msan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02470_suspicious_low_cardinality_msan.sql b/tests/queries/0_stateless/02470_suspicious_low_cardinality_msan.sql
new file mode 100644
index 00000000000..6969be1ca64
--- /dev/null
+++ b/tests/queries/0_stateless/02470_suspicious_low_cardinality_msan.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS alias_2__fuzz_25;
+SET allow_suspicious_low_cardinality_types = 1;
+CREATE TABLE alias_2__fuzz_25 (`dt` LowCardinality(Date), `col` DateTime, `col2` Nullable(Int256), `colAlias0` Nullable(DateTime64(3)) ALIAS col, `colAlias3` Nullable(Int32) ALIAS col3 + colAlias0, `colAlias1` LowCardinality(UInt16) ALIAS colAlias0 + col2, `colAlias2` LowCardinality(Int32) ALIAS colAlias0 + colAlias1, `col3` Nullable(UInt8)) ENGINE = MergeTree ORDER BY dt;
+insert into alias_2__fuzz_25 (dt, col, col2, col3) values ('2020-02-01', 1, 2, 3);
+SELECT colAlias0, colAlias2, colAlias3 FROM alias_2__fuzz_25; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+DROP TABLE alias_2__fuzz_25;
diff --git a/tests/queries/0_stateless/02471_wrong_date_monotonicity.reference b/tests/queries/0_stateless/02471_wrong_date_monotonicity.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02471_wrong_date_monotonicity.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02471_wrong_date_monotonicity.sql b/tests/queries/0_stateless/02471_wrong_date_monotonicity.sql
new file mode 100644
index 00000000000..40d64e53309
--- /dev/null
+++ b/tests/queries/0_stateless/02471_wrong_date_monotonicity.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS tdm__fuzz_23;
+CREATE TABLE tdm__fuzz_23 (`x` UInt256) ENGINE = MergeTree ORDER BY x SETTINGS write_final_mark = 0;
+INSERT INTO tdm__fuzz_23 FORMAT Values (1);
+SELECT count(x) FROM tdm__fuzz_23 WHERE toDate(x) < toDate(now(), 'Asia/Istanbul') SETTINGS max_rows_to_read = 1;
+DROP TABLE tdm__fuzz_23;
diff --git a/tests/queries/0_stateless/02472_segfault_expression_parser.reference b/tests/queries/0_stateless/02472_segfault_expression_parser.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02472_segfault_expression_parser.sql b/tests/queries/0_stateless/02472_segfault_expression_parser.sql
new file mode 100644
index 00000000000..285de80a64a
--- /dev/null
+++ b/tests/queries/0_stateless/02472_segfault_expression_parser.sql
@@ -0,0 +1 @@
+SELECT TIMESTAMP_SUB (SELECT ILIKE INTO OUTFILE , accurateCast ) FROM TIMESTAMP_SUB ( MINUTE , ) GROUP BY accurateCast; -- { clientError 62 }
diff --git a/tests/queries/1_stateful/00096_obfuscator_save_load.sh b/tests/queries/1_stateful/00096_obfuscator_save_load.sh
index c90eee1d0f9..a88dfcdb9b9 100755
--- a/tests/queries/1_stateful/00096_obfuscator_save_load.sh
+++ b/tests/queries/1_stateful/00096_obfuscator_save_load.sh
@@ -4,12 +4,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+model=$(mktemp "$CLICKHOUSE_TMP/obfuscator-model-XXXXXX.bin")
+
 $CLICKHOUSE_CLIENT --max_threads 1 --query="SELECT URL, Title, SearchPhrase FROM test.hits LIMIT 1000" > "${CLICKHOUSE_TMP}"/data.tsv
 
-$CLICKHOUSE_OBFUSCATOR --structure "URL String, Title String, SearchPhrase String" --input-format TSV --output-format TSV --seed hello --limit 0 --save "${CLICKHOUSE_TMP}"/model.bin < "${CLICKHOUSE_TMP}"/data.tsv 2>/dev/null
-wc -c < "${CLICKHOUSE_TMP}"/model.bin
-$CLICKHOUSE_OBFUSCATOR --structure "URL String, Title String, SearchPhrase String" --input-format TSV --output-format TSV --seed hello --limit 2500 --load "${CLICKHOUSE_TMP}"/model.bin < "${CLICKHOUSE_TMP}"/data.tsv > "${CLICKHOUSE_TMP}"/data2500.tsv 2>/dev/null
-rm "${CLICKHOUSE_TMP}"/model.bin
+$CLICKHOUSE_OBFUSCATOR --structure "URL String, Title String, SearchPhrase String" --input-format TSV --output-format TSV --seed hello --limit 0 --save "$model" < "${CLICKHOUSE_TMP}"/data.tsv 2>/dev/null
+wc -c < "$model"
+$CLICKHOUSE_OBFUSCATOR --structure "URL String, Title String, SearchPhrase String" --input-format TSV --output-format TSV --seed hello --limit 2500 --load "$model" < "${CLICKHOUSE_TMP}"/data.tsv > "${CLICKHOUSE_TMP}"/data2500.tsv 2>/dev/null
+rm "$model"
 
 $CLICKHOUSE_LOCAL --structure "URL String, Title String, SearchPhrase String" --input-format TSV --output-format TSV --query "SELECT count(), uniq(URL), uniq(Title), uniq(SearchPhrase) FROM table" < "${CLICKHOUSE_TMP}"/data.tsv
 $CLICKHOUSE_LOCAL --structure "URL String, Title String, SearchPhrase String" --input-format TSV --output-format TSV --query "SELECT count(), uniq(URL), uniq(Title), uniq(SearchPhrase) FROM table" < "${CLICKHOUSE_TMP}"/data2500.tsv
diff --git a/tests/queries/1_stateful/00097_constexpr_in_index.reference b/tests/queries/1_stateful/00097_constexpr_in_index.reference
new file mode 100644
index 00000000000..5080d6d4cd8
--- /dev/null
+++ b/tests/queries/1_stateful/00097_constexpr_in_index.reference
@@ -0,0 +1 @@
+1803
diff --git a/tests/queries/1_stateful/00097_constexpr_in_index.sql b/tests/queries/1_stateful/00097_constexpr_in_index.sql
new file mode 100644
index 00000000000..b5cac75c767
--- /dev/null
+++ b/tests/queries/1_stateful/00097_constexpr_in_index.sql
@@ -0,0 +1,3 @@
+-- Even in presense of OR, we evaluate the "0 IN (1, 2, 3)" as a constant expression therefore it does not prevent the index analysis.
+
+SELECT count() FROM test.hits WHERE CounterID IN (14917930, 33034174) OR 0 IN (1, 2, 3) SETTINGS max_rows_to_read = 1000000, force_primary_key = 1;
diff --git a/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.reference b/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.reference
deleted file mode 100644
index 2675904dea0..00000000000
--- a/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.reference
+++ /dev/null
@@ -1,110 +0,0 @@
-Testing 00001_count_hits.sql ----> Ok! ✅
-Testing 00002_count_visits.sql ----> Ok! ✅
-Testing 00004_top_counters.sql ----> Ok! ✅
-Testing 00005_filtering.sql ----> Ok! ✅
-Testing 00006_agregates.sql ----> Ok! ✅
-Testing 00007_uniq.sql ----> Ok! ✅
-Testing 00008_uniq.sql ----> Ok! ✅
-Testing 00009_uniq_distributed.sql ----> Ok! ✅
-Testing 00010_quantiles_segfault.sql ----> Ok! ✅
-Testing 00011_sorting.sql ----> Ok! ✅
-Testing 00012_sorting_distributed.sql ----> Ok! ✅
-Skipping 00013_sorting_of_nested.sql 
-Testing 00014_filtering_arrays.sql ----> Ok! ✅
-Testing 00015_totals_and_no_aggregate_functions.sql ----> Ok! ✅
-Testing 00016_any_if_distributed_cond_always_false.sql ----> Ok! ✅
-Testing 00017_aggregation_uninitialized_memory.sql ----> Ok! ✅
-Testing 00020_distinct_order_by_distributed.sql ----> Ok! ✅
-Testing 00021_1_select_with_in.sql ----> Ok! ✅
-Testing 00021_2_select_with_in.sql ----> Ok! ✅
-Testing 00021_3_select_with_in.sql ----> Ok! ✅
-Testing 00022_merge_prewhere.sql ----> Ok! ✅
-Testing 00023_totals_limit.sql ----> Ok! ✅
-Testing 00024_random_counters.sql ----> Ok! ✅
-Testing 00030_array_enumerate_uniq.sql ----> Ok! ✅
-Testing 00031_array_enumerate_uniq.sql ----> Ok! ✅
-Testing 00032_aggregate_key64.sql ----> Ok! ✅
-Testing 00033_aggregate_key_string.sql ----> Ok! ✅
-Testing 00034_aggregate_key_fixed_string.sql ----> Ok! ✅
-Testing 00035_aggregate_keys128.sql ----> Ok! ✅
-Testing 00036_aggregate_hashed.sql ----> Ok! ✅
-Testing 00037_uniq_state_merge1.sql ----> Ok! ✅
-Testing 00038_uniq_state_merge2.sql ----> Ok! ✅
-Testing 00039_primary_key.sql ----> Ok! ✅
-Testing 00040_aggregating_materialized_view.sql ----> Ok! ✅
-Testing 00041_aggregating_materialized_view.sql ----> Ok! ✅
-Testing 00042_any_left_join.sql ----> Ok! ✅
-Testing 00043_any_left_join.sql ----> Ok! ✅
-Testing 00044_any_left_join_string.sql ----> Ok! ✅
-Testing 00045_uniq_upto.sql ----> Ok! ✅
-Testing 00046_uniq_upto_distributed.sql ----> Ok! ✅
-Testing 00047_bar.sql ----> Ok! ✅
-Testing 00048_min_max.sql ----> Ok! ✅
-Testing 00049_max_string_if.sql ----> Ok! ✅
-Testing 00050_min_max.sql ----> Ok! ✅
-Testing 00051_min_max_array.sql ----> Ok! ✅
-Testing 00052_group_by_in.sql ----> Ok! ✅
-Testing 00053_replicate_segfault.sql ----> Ok! ✅
-Testing 00054_merge_tree_partitions.sql ----> Ok! ✅
-Testing 00055_index_and_not.sql ----> Ok! ✅
-Testing 00056_view.sql ----> Ok! ✅
-Testing 00059_merge_sorting_empty_array_joined.sql ----> Ok! ✅
-Testing 00060_move_to_prewhere_and_sets.sql ----> Ok! ✅
-Skipping 00061_storage_buffer.sql 
-Testing 00062_loyalty.sql ----> Ok! ✅
-Testing 00063_loyalty_joins.sql ----> Ok! ✅
-Testing 00065_loyalty_with_storage_join.sql ----> Ok! ✅
-Testing 00066_sorting_distributed_many_replicas.sql ----> Ok! ✅
-Testing 00067_union_all.sql ----> Ok! ✅
-Testing 00068_subquery_in_prewhere.sql ----> Ok! ✅
-Testing 00069_duplicate_aggregation_keys.sql ----> Ok! ✅
-Testing 00071_merge_tree_optimize_aio.sql ----> Ok! ✅
-Testing 00072_compare_date_and_string_index.sql ----> Ok! ✅
-Testing 00073_uniq_array.sql ----> Ok! ✅
-Testing 00074_full_join.sql ----> Ok! ✅
-Testing 00075_left_array_join.sql ----> Ok! ✅
-Testing 00076_system_columns_bytes.sql ----> Ok! ✅
-Testing 00077_log_tinylog_stripelog.sql ----> Ok! ✅
-Testing 00078_group_by_arrays.sql ----> Ok! ✅
-Testing 00079_array_join_not_used_joined_column.sql ----> Ok! ✅
-Testing 00080_array_join_and_union.sql ----> Ok! ✅
-Testing 00081_group_by_without_key_and_totals.sql ----> Ok! ✅
-Testing 00082_quantiles.sql ----> Ok! ✅
-Testing 00083_array_filter.sql ----> Ok! ✅
-Testing 00084_external_aggregation.sql ----> Ok! ✅
-Testing 00085_monotonic_evaluation_segfault.sql ----> Ok! ✅
-Testing 00086_array_reduce.sql ----> Ok! ✅
-Testing 00087_where_0.sql ----> Ok! ✅
-Testing 00088_global_in_one_shard_and_rows_before_limit.sql ----> Ok! ✅
-Testing 00089_position_functions_with_non_constant_arg.sql ----> Ok! ✅
-Testing 00091_prewhere_two_conditions.sql ----> Ok! ✅
-Testing 00093_prewhere_array_join.sql ----> Ok! ✅
-Testing 00094_order_by_array_join_limit.sql ----> Ok! ✅
-Skipping 00095_hyperscan_profiler.sql 
-Testing 00139_like.sql ----> Ok! ✅
-Skipping 00140_rename.sql 
-Testing 00141_transform.sql ----> Ok! ✅
-Testing 00142_system_columns.sql ----> Ok! ✅
-Testing 00143_transform_non_const_default.sql ----> Ok! ✅
-Testing 00144_functions_of_aggregation_states.sql ----> Ok! ✅
-Testing 00145_aggregate_functions_statistics.sql ----> Ok! ✅
-Testing 00146_aggregate_function_uniq.sql ----> Ok! ✅
-Testing 00147_global_in_aggregate_function.sql ----> Ok! ✅
-Testing 00148_monotonic_functions_and_index.sql ----> Ok! ✅
-Testing 00149_quantiles_timing_distributed.sql ----> Ok! ✅
-Testing 00150_quantiles_timing_precision.sql ----> Ok! ✅
-Testing 00151_order_by_read_in_order.sql ----> Ok! ✅
-Skipping 00151_replace_partition_with_different_granularity.sql 
-Skipping 00152_insert_different_granularity.sql 
-Testing 00153_aggregate_arena_race.sql ----> Ok! ✅
-Skipping 00154_avro.sql 
-Testing 00156_max_execution_speed_sample_merge.sql ----> Ok! ✅
-Skipping 00157_cache_dictionary.sql 
-Skipping 00158_cache_dictionary_has.sql 
-Testing 00160_decode_xml_component.sql ----> Ok! ✅
-Testing 00162_mmap_compression_none.sql ----> Ok! ✅
-Testing 00164_quantileBfloat16.sql ----> Ok! ✅
-Testing 00165_jit_aggregate_functions.sql ----> Ok! ✅
-Skipping 00166_explain_estimate.sql 
-Testing 00167_read_bytes_from_fs.sql ----> Ok! ✅
-Total failed tests: 
diff --git a/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.sh b/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.sh
deleted file mode 100755
index ecd0d281b53..00000000000
--- a/tests/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-tsan, no-random-settings
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# set -e
-
-# All replicas are localhost, disable `prefer_localhost_replica` option to test network interface
-# Currently this feature could not work with hedged requests
-# Enabling `enable_sample_offset_parallel_processing` feature could lead to intersecting marks, so some of them would be thrown away and it will lead to incorrect result of SELECT query
-SETTINGS="--max_parallel_replicas=3 --use_hedged_requests=false --allow_experimental_parallel_reading_from_replicas=true"
-
-# Prepare tables
-$CLICKHOUSE_CLIENT $SETTINGS -nm -q '''
-    drop table if exists test.dist_hits SYNC;
-    drop table if exists test.dist_visits SYNC;
-
-    create table test.dist_hits as test.hits engine = Distributed("test_cluster_one_shard_three_replicas_localhost", test, hits, rand());
-    create table test.dist_visits as test.visits engine = Distributed("test_cluster_one_shard_three_replicas_localhost", test, visits, rand());
-''';
-
-FAILED=()
-
-# PreviouslyFailed=(
-# )
-
-SkipList=(
-    "00013_sorting_of_nested.sql" # It contains FINAL, which is not allowed together with parallel reading
-
-    "00061_storage_buffer.sql"
-    "00095_hyperscan_profiler.sql" # too long in debug (there is a --no-debug tag inside a test)
-
-    "00140_rename.sql" # Multiple renames are not allowed with DatabaseReplicated and tags are not forwarded through this test
-
-    "00154_avro.sql" # Plain select * with limit with Distributed table is not deterministic
-    "00151_replace_partition_with_different_granularity.sql" # Replace partition from Distributed is not allowed
-    "00152_insert_different_granularity.sql" # The same as above
-
-    "00157_cache_dictionary.sql" # Too long in debug mode, but result is correct
-    "00158_cache_dictionary_has.sql" # The same as above
-
-    "00166_explain_estimate.sql" # Distributed table returns nothing
-)
-
-# for TESTPATH in "${PreviouslyFailed[@]}"
-for TESTPATH in "$CURDIR"/*.sql;
-do
-    TESTNAME=$(basename $TESTPATH)
-    NUM=$(echo "${TESTNAME}" | grep -o -P '^\d+' | sed 's/^0*//')
-    if [[ "${NUM}" -ge 168 ]]; then
-        continue
-    fi
-
-    if [[ " ${SkipList[*]} " =~ ${TESTNAME} ]]; then
-        echo  "Skipping $TESTNAME "
-        continue
-    fi
-
-    echo -n "Testing $TESTNAME ----> "
-
-    # prepare test
-    NEW_TESTNAME="/tmp/dist_$TESTNAME"
-    # Added g to sed command to replace all tables, not the first
-    cat $TESTPATH | sed -e 's/test.hits/test.dist_hits/g'  | sed -e 's/test.visits/test.dist_visits/g' > $NEW_TESTNAME
-
-    TESTNAME_RESULT="/tmp/result_$TESTNAME"
-    NEW_TESTNAME_RESULT="/tmp/result_dist_$TESTNAME"
-
-    $CLICKHOUSE_CLIENT $SETTINGS -nm < $TESTPATH > $TESTNAME_RESULT
-    $CLICKHOUSE_CLIENT $SETTINGS -nm < $NEW_TESTNAME > $NEW_TESTNAME_RESULT
-
-    expected=$(cat $TESTNAME_RESULT | md5sum)
-    actual=$(cat $NEW_TESTNAME_RESULT | md5sum)
-
-    if [[ "$expected" != "$actual" ]]; then
-        FAILED+=("$TESTNAME")
-        echo "Failed! ❌"
-        echo "Plain:"
-        cat $TESTNAME_RESULT
-        echo "Distributed:"
-        cat $NEW_TESTNAME_RESULT
-    else
-        echo "Ok! ✅"
-    fi
-done
-
-
-echo "Total failed tests: "
-# Iterate the loop to read and print each array element
-for value in "${FAILED[@]}"
-do
-    echo "🔺  $value"
-done
-
-# Drop tables
-
-$CLICKHOUSE_CLIENT $SETTINGS -nm -q '''
-    drop table if exists test.dist_hits SYNC;
-    drop table if exists test.dist_visits SYNC;
-''';
diff --git a/tests/queries/1_stateful/00175_obfuscator_schema_inference.sh b/tests/queries/1_stateful/00175_obfuscator_schema_inference.sh
index 8ff0d2fa648..771c7ab5436 100755
--- a/tests/queries/1_stateful/00175_obfuscator_schema_inference.sh
+++ b/tests/queries/1_stateful/00175_obfuscator_schema_inference.sh
@@ -4,6 +4,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+model=$(mktemp "$CLICKHOUSE_TMP/obfuscator-model-XXXXXX.bin")
+
 # Compared to explicitly specifying the structure of the input,
 #  schema inference adds Nullable(T) to all types, so the model and the results
 #  are a bit different from test '00175_obfuscator_schema_inference.sh'
@@ -14,10 +16,10 @@ $CLICKHOUSE_CLIENT --max_threads 1 --query="SELECT URL, Title, SearchPhrase FROM
 $CLICKHOUSE_OBFUSCATOR --input-format TSV --output-format TSV --seed hello --limit 2500 < "${CLICKHOUSE_TMP}"/data.tsv > "${CLICKHOUSE_TMP}"/data2500.tsv 2>/dev/null
 
 # Test obfuscator with saving the model
-$CLICKHOUSE_OBFUSCATOR --input-format TSV --output-format TSV --seed hello --limit 0 --save "${CLICKHOUSE_TMP}"/model.bin < "${CLICKHOUSE_TMP}"/data.tsv 2>/dev/null
-wc -c < "${CLICKHOUSE_TMP}"/model.bin
-$CLICKHOUSE_OBFUSCATOR --input-format TSV --output-format TSV --seed hello --limit 2500 --load "${CLICKHOUSE_TMP}"/model.bin < "${CLICKHOUSE_TMP}"/data.tsv > "${CLICKHOUSE_TMP}"/data2500_load_from_model.tsv 2>/dev/null
-rm "${CLICKHOUSE_TMP}"/model.bin
+$CLICKHOUSE_OBFUSCATOR --input-format TSV --output-format TSV --seed hello --limit 0 --save "$model" < "${CLICKHOUSE_TMP}"/data.tsv 2>/dev/null
+wc -c < "$model"
+$CLICKHOUSE_OBFUSCATOR --input-format TSV --output-format TSV --seed hello --limit 2500 --load "$model" < "${CLICKHOUSE_TMP}"/data.tsv > "${CLICKHOUSE_TMP}"/data2500_load_from_model.tsv 2>/dev/null
+rm "$model"
 
 $CLICKHOUSE_LOCAL --structure "URL String, Title String, SearchPhrase String" --input-format TSV --output-format TSV --query "SELECT count(), uniq(URL), uniq(Title), uniq(SearchPhrase) FROM table" < "${CLICKHOUSE_TMP}"/data.tsv
 $CLICKHOUSE_LOCAL --structure "URL String, Title String, SearchPhrase String" --input-format TSV --output-format TSV --query "SELECT count(), uniq(URL), uniq(Title), uniq(SearchPhrase) FROM table" < "${CLICKHOUSE_TMP}"/data2500.tsv
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 772f48ad088..a0556d971e8 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -59,10 +59,7 @@ declare -A EXTERN_TYPES
 EXTERN_TYPES[ErrorCodes]=int
 EXTERN_TYPES[ProfileEvents]=Event
 EXTERN_TYPES[CurrentMetrics]=Metric
-declare -A EXTERN_ALLOWED_CHARS
-EXTERN_ALLOWED_CHARS[ErrorCodes]='_A-Z'
-EXTERN_ALLOWED_CHARS[ProfileEvents]='_A-Za-z'
-EXTERN_ALLOWED_CHARS[CurrentMetrics]='_A-Za-z'
+
 EXTERN_TYPES_EXCLUDES=(
     ProfileEvents::global_counters
     ProfileEvents::Event
@@ -87,18 +84,30 @@ EXTERN_TYPES_EXCLUDES=(
     CurrentMetrics::Metric
     CurrentMetrics::values
     CurrentMetrics::Value
+
+    ErrorCodes::ErrorCode
+    ErrorCodes::getName
+    ErrorCodes::increment
+    ErrorCodes::end
+    ErrorCodes::values
+    ErrorCodes::values[i]
+    ErrorCodes::getErrorCodeByName
 )
 for extern_type in ${!EXTERN_TYPES[@]}; do
     type_of_extern=${EXTERN_TYPES[$extern_type]}
-    allowed_chars=${EXTERN_ALLOWED_CHARS[$extern_type]}
+    allowed_chars='[_A-Za-z]+'
 
     # Unused
     # NOTE: to fix automatically, replace echo with:
     # sed -i "/extern const $type_of_extern $val/d" $file
     find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' | {
-        grep -vP $EXCLUDE_DIRS | xargs grep -l -P "extern const $type_of_extern [$allowed_chars]+"
+        # NOTE: the check is pretty dumb and distinguish only by the type_of_extern,
+        # and this matches with zkutil::CreateMode
+        grep -v 'src/Common/ZooKeeper/Types.h'
+    } | {
+        grep -vP $EXCLUDE_DIRS | xargs grep -l -P "extern const $type_of_extern $allowed_chars"
     } | while read file; do
-        grep -P "extern const $type_of_extern [$allowed_chars]+;" $file | sed -r -e "s/^.*?extern const $type_of_extern ([$allowed_chars]+);.*?$/\1/" | while read val; do
+        grep -P "extern const $type_of_extern $allowed_chars;" $file | sed -r -e "s/^.*?extern const $type_of_extern ($allowed_chars);.*?$/\1/" | while read val; do
             if ! grep -q "$extern_type::$val" $file; then
                 # Excludes for SOFTWARE_EVENT/HARDWARE_EVENT/CACHE_EVENT in ThreadProfileEvents.cpp
                 if [[ ! $extern_type::$val =~ ProfileEvents::Perf.* ]]; then
@@ -110,11 +119,13 @@ for extern_type in ${!EXTERN_TYPES[@]}; do
 
     # Undefined
     # NOTE: to fix automatically, replace echo with:
-    # ( grep -q -F 'namespace $extern_type' $file && sed -i -r "0,/(\s*)extern const $type_of_extern [$allowed_chars]+/s//\1extern const $type_of_extern $val;\n&/" $file || awk '{ print; if (ns == 1) { ns = 2 }; if (ns == 2) { ns = 0; print "namespace $extern_type\n{\n    extern const $type_of_extern '$val';\n}" } }; /namespace DB/ { ns = 1; };' < $file > ${file}.tmp && mv ${file}.tmp $file )
+    # ( grep -q -F 'namespace $extern_type' $file && \
+    #   sed -i -r "0,/(\s*)extern const $type_of_extern [$allowed_chars]+/s//\1extern const $type_of_extern $val;\n&/" $file || \
+    #     awk '{ print; if (ns == 1) { ns = 2 }; if (ns == 2) { ns = 0; print "namespace $extern_type\n{\n    extern const $type_of_extern '$val';\n}" } }; /namespace DB/ { ns = 1; };' < $file > ${file}.tmp && mv ${file}.tmp $file )
     find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' | {
-        grep -vP $EXCLUDE_DIRS | xargs grep -l -P "$extern_type::[$allowed_chars]+"
+        grep -vP $EXCLUDE_DIRS | xargs grep -l -P "$extern_type::$allowed_chars"
     } | while read file; do
-        grep -P "$extern_type::[$allowed_chars]+" $file | sed -r -e "s/^.*?$extern_type::([$allowed_chars]+).*?$/\1/" | while read val; do
+        grep -P "$extern_type::$allowed_chars" $file | grep -P -v '^\s*//' | sed -r -e "s/^.*?$extern_type::($allowed_chars).*?$/\1/" | while read val; do
             if ! grep -q "extern const $type_of_extern $val" $file; then
                 if ! in_array "$extern_type::$val" "${EXTERN_TYPES_EXCLUDES[@]}"; then
                     echo "$extern_type::$val is used in file $file but not defined"
@@ -125,9 +136,9 @@ for extern_type in ${!EXTERN_TYPES[@]}; do
 
     # Duplicates
     find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' | {
-        grep -vP $EXCLUDE_DIRS | xargs grep -l -P "$extern_type::[$allowed_chars]+"
+        grep -vP $EXCLUDE_DIRS | xargs grep -l -P "$extern_type::$allowed_chars"
     } | while read file; do
-        grep -P "extern const $type_of_extern [$allowed_chars]+;" $file | sort | uniq -c | grep -v -P ' +1 ' && echo "Duplicate $extern_type in file $file"
+        grep -P "extern const $type_of_extern $allowed_chars;" $file | sort | uniq -c | grep -v -P ' +1 ' && echo "Duplicate $extern_type in file $file"
     done
 done
 
diff --git a/utils/compressor/decompress_perf.cpp b/utils/compressor/decompress_perf.cpp
index e3210164d79..891a6d3d1dd 100644
--- a/utils/compressor/decompress_perf.cpp
+++ b/utils/compressor/decompress_perf.cpp
@@ -107,8 +107,12 @@ protected:
 
             if (variant == LZ4_REFERENCE)
             {
-                if (LZ4_decompress_fast(compressed_buffer + COMPRESSED_BLOCK_HEADER_SIZE, to, size_decompressed) < 0)
+                if (LZ4_decompress_fast(
+                    compressed_buffer + COMPRESSED_BLOCK_HEADER_SIZE, to,
+                    static_cast<int>(size_decompressed)) < 0)
+                {
                     throw Exception("Cannot LZ4_decompress_fast", ErrorCodes::CANNOT_DECOMPRESS);
+                }
             }
             else
                 LZ4::decompress(compressed_buffer + COMPRESSED_BLOCK_HEADER_SIZE, to, size_compressed_without_checksum, size_decompressed, perf_stat);
diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
index 0762c740ac1..dd3c3a4e2ad 100644
--- a/utils/keeper-data-dumper/main.cpp
+++ b/utils/keeper-data-dumper/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     SnapshotsQueue snapshots_queue{1};
     CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
     KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>();
-    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, argv[1], settings, keeper_context);
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, argv[1], settings, keeper_context, nullptr);
     state_machine->init();
     size_t last_commited_index = state_machine->last_commit_index();
 
diff --git a/utils/self-extracting-executable/compressor.cpp b/utils/self-extracting-executable/compressor.cpp
index d8b4fdbb038..0c0c85838da 100644
--- a/utils/self-extracting-executable/compressor.cpp
+++ b/utils/self-extracting-executable/compressor.cpp
@@ -356,7 +356,7 @@ int compressFiles(const char* out_name, const char* exec, char* filenames[], int
     return 0;
 }
 
-int copy_decompressor(int input_fd, int decompressor_size, int output_fd)
+int copy_decompressor(int input_fd, ssize_t decompressor_size, int output_fd)
 {
     const ssize_t buf_size = 1ul<<19;
     auto buf_memory = std::make_unique<char[]>(buf_size);
@@ -411,7 +411,7 @@ int copy_decompressor_self(const char *self, int output_fd)
     }
 
     char * end = nullptr;
-    int decompressor_size = strtol(size_str, &end, 10);
+    ssize_t decompressor_size = strtol(size_str, &end, 10);
     if (*end != 0)
     {
         std::cerr << "Error: unable to extract decompressor" << std::endl;
@@ -519,7 +519,7 @@ int main(int argc, char* argv[])
         if (p[0] != 0)
         {
             char * end = nullptr;
-            level = strtol(p, &end, 10);
+            level = static_cast<int>(strtol(p, &end, 10));
             if (*end != 0)
             {
                 std::cerr << "Error: level [" << p << "] is not valid" << std::endl;
diff --git a/utils/self-extracting-executable/decompressor.cpp b/utils/self-extracting-executable/decompressor.cpp
index c997526d38d..be25d315d68 100644
--- a/utils/self-extracting-executable/decompressor.cpp
+++ b/utils/self-extracting-executable/decompressor.cpp
@@ -329,7 +329,7 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
 
     int read_exe_path(char *exe, size_t buf_sz)
     {
-        uint32_t size = buf_sz;
+        uint32_t size = static_cast<uint32_t>(buf_sz);
         char apple[size];
         if (_NSGetExecutablePath(apple, &size) != 0)
             return 1;
@@ -514,7 +514,7 @@ int main(int/* argc*/, char* argv[])
             return 1;
         }
 
-        if (chmod(self, decompressed_umask))
+        if (chmod(self, static_cast<uint32_t>(decompressed_umask)))
         {
             perror("chmod");
             return 1;