diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d5ce1996f3..e3eff050015 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,8 @@ if (COMPILER_CLANG)
             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
         endif()
     endif()
+
+    no_warning(enum-constexpr-conversion) # breaks Protobuf in clang-16
 endif ()
 
 # If compiler has support for -Wreserved-identifier. It is difficult to detect by clang version,
@@ -606,4 +608,3 @@ if (NATIVE_BUILD_TARGETS
         COMMAND ${CMAKE_COMMAND} --build "${NATIVE_BUILD_DIR}" --target ${NATIVE_BUILD_TARGETS}
         COMMAND_ECHO STDOUT)
 endif ()
-
diff --git a/README.md b/README.md
index 20340883853..b173add94e3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![ClickHouse — open source distributed column-oriented DBMS](https://github.com/ClickHouse/ClickHouse/raw/master/website/images/logo-400x240.png)](https://clickhouse.com)
+[![ClickHouse — open source distributed column-oriented DBMS](https://github.com/ClickHouse/clickhouse-presentations/raw/master/images/logo-400x240.png)](https://clickhouse.com)
 
 ClickHouse® is an open-source column-oriented database management system that allows generating analytical data reports in real-time.
 
diff --git a/cmake/limit_jobs.cmake b/cmake/limit_jobs.cmake
index 96c6b75bc43..a8f105b8987 100644
--- a/cmake/limit_jobs.cmake
+++ b/cmake/limit_jobs.cmake
@@ -3,7 +3,7 @@
 # set (MAX_LINKER_MEMORY 3500 CACHE INTERNAL "")
 # include (cmake/limit_jobs.cmake)
 
-cmake_host_system_information(RESULT AVAILABLE_PHYSICAL_MEMORY QUERY AVAILABLE_PHYSICAL_MEMORY) # Not available under freebsd
+cmake_host_system_information(RESULT TOTAL_PHYSICAL_MEMORY QUERY TOTAL_PHYSICAL_MEMORY) # Not available under freebsd
 cmake_host_system_information(RESULT NUMBER_OF_LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES)
 
 # 1 if not set
@@ -12,8 +12,8 @@ option(PARALLEL_COMPILE_JOBS "Maximum number of concurrent compilation jobs" "")
 # 1 if not set
 option(PARALLEL_LINK_JOBS "Maximum number of concurrent link jobs" "")
 
-if (NOT PARALLEL_COMPILE_JOBS AND AVAILABLE_PHYSICAL_MEMORY AND MAX_COMPILER_MEMORY)
-    math(EXPR PARALLEL_COMPILE_JOBS ${AVAILABLE_PHYSICAL_MEMORY}/${MAX_COMPILER_MEMORY})
+if (NOT PARALLEL_COMPILE_JOBS AND TOTAL_PHYSICAL_MEMORY AND MAX_COMPILER_MEMORY)
+    math(EXPR PARALLEL_COMPILE_JOBS ${TOTAL_PHYSICAL_MEMORY}/${MAX_COMPILER_MEMORY})
 
     if (NOT PARALLEL_COMPILE_JOBS)
         set (PARALLEL_COMPILE_JOBS 1)
@@ -27,8 +27,8 @@ if (PARALLEL_COMPILE_JOBS AND (NOT NUMBER_OF_LOGICAL_CORES OR PARALLEL_COMPILE_J
 endif ()
 
 
-if (NOT PARALLEL_LINK_JOBS AND AVAILABLE_PHYSICAL_MEMORY AND MAX_LINKER_MEMORY)
-    math(EXPR PARALLEL_LINK_JOBS ${AVAILABLE_PHYSICAL_MEMORY}/${MAX_LINKER_MEMORY})
+if (NOT PARALLEL_LINK_JOBS AND TOTAL_PHYSICAL_MEMORY AND MAX_LINKER_MEMORY)
+    math(EXPR PARALLEL_LINK_JOBS ${TOTAL_PHYSICAL_MEMORY}/${MAX_LINKER_MEMORY})
 
     if (NOT PARALLEL_LINK_JOBS)
         set (PARALLEL_LINK_JOBS 1)
@@ -54,6 +54,6 @@ endif ()
 
 if (PARALLEL_COMPILE_JOBS OR PARALLEL_LINK_JOBS)
     message(STATUS
-        "${CMAKE_CURRENT_SOURCE_DIR}: Have ${AVAILABLE_PHYSICAL_MEMORY} megabytes of memory.
+        "${CMAKE_CURRENT_SOURCE_DIR}: Have ${TOTAL_PHYSICAL_MEMORY} megabytes of memory.
         Limiting concurrent linkers jobs to ${PARALLEL_LINK_JOBS} and compiler jobs to ${PARALLEL_COMPILE_JOBS} (system has ${NUMBER_OF_LOGICAL_CORES} logical cores)")
 endif ()
diff --git a/cmake/linux/toolchain-riscv64.cmake b/cmake/linux/toolchain-riscv64.cmake
index cb0a9482a72..02c3d0c97fc 100644
--- a/cmake/linux/toolchain-riscv64.cmake
+++ b/cmake/linux/toolchain-riscv64.cmake
@@ -21,6 +21,11 @@ set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=bfd")
 set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=bfd")
 
+# Currently, lld does not work with the error:
+# ld.lld: error: section size decrease is too large
+# But GNU BinUtils work.
+set (LINKER_NAME "riscv64-linux-gnu-ld.bfd" CACHE STRING "Linker name" FORCE)
+
 set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
 set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
 
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index 994f14c6149..042935a835f 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -23,6 +23,7 @@ if (COMPILER_CLANG)
     no_warning(zero-length-array)
     no_warning(c++98-compat-pedantic)
     no_warning(c++98-compat)
+    no_warning(c++20-compat) # Use constinit in C++20 without warnings
     no_warning(conversion)
     no_warning(ctad-maybe-unsupported) # clang 9+, linux-only
     no_warning(disabled-macro-expansion)
@@ -41,6 +42,7 @@ if (COMPILER_CLANG)
     no_warning(weak-template-vtables)
     no_warning(weak-vtables)
     no_warning(thread-safety-negative) # experimental flag, too many false positives
+    no_warning(enum-constexpr-conversion) # breaks magic-enum library in clang-16
     # TODO Enable conversion, sign-conversion, double-promotion warnings.
 elseif (COMPILER_GCC)
     # Add compiler options only to c++ compiler
diff --git a/contrib/arrow b/contrib/arrow
index efdcd015cfd..450a5638704 160000
--- a/contrib/arrow
+++ b/contrib/arrow
@@ -1 +1 @@
-Subproject commit efdcd015cfdee1b6aa349c9ca227ca12c3d697f5
+Subproject commit 450a5638704386356f8e520080468fc9bc8bcaf8
diff --git a/contrib/boost b/contrib/boost
index c0807e83f28..03d9ec9cd15 160000
--- a/contrib/boost
+++ b/contrib/boost
@@ -1 +1 @@
-Subproject commit c0807e83f2824e8dd67a15b355496a9b784cdcd5
+Subproject commit 03d9ec9cd159d14bd0b17c05138098451a1ea606
diff --git a/contrib/librdkafka b/contrib/librdkafka
index 6062e711a91..ff32b4e9eea 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit 6062e711a919fb3b669b243b7dceabd045d0e4a2
+Subproject commit ff32b4e9eeafd0b276f010ee969179e4e9e6d0b2
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 8809d469b46..74919bb2100 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -41,6 +41,9 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
     && apt-get install gcc-11 g++-11 --yes \
     && apt-get clean
 
+# A cross-linker for RISC-V 64 (we need it, because LLVM's LLD does not work):
+RUN apt-get install binutils-riscv64-linux-gnu
+
 # Architecture of the image when BuildKit/buildx is used
 ARG TARGETARCH
 ARG NFPM_VERSION=2.16.0
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index d74f99cf54b..7f7a8008d4e 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -16,7 +16,8 @@ RUN apt-get update \
         python3-requests \
         python3-termcolor \
         unixodbc \
-       --yes --no-install-recommends
+        pv \
+    --yes --no-install-recommends
 
 RUN pip3 install numpy scipy pandas Jinja2
 
diff --git a/docker/test/performance-comparison/compare.sh b/docker/test/performance-comparison/compare.sh
index c5f68f166b5..3b0b7a4d95a 100755
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@@ -1338,8 +1338,6 @@ EOF
     set -x
 }
 
-# clickhouse may be compressed - run once to decompress
-/workspace/right/clickhouse ||:
 # Check that local and client are in PATH
 clickhouse-local --version > /dev/null
 clickhouse-client --version > /dev/null
diff --git a/docker/test/performance-comparison/report.py b/docker/test/performance-comparison/report.py
index 4c1b6e1dd57..960f23be95c 100755
--- a/docker/test/performance-comparison/report.py
+++ b/docker/test/performance-comparison/report.py
@@ -41,24 +41,9 @@ color_good = "#b0d050"
 header_template = """
 <!DOCTYPE html>
 <html lang="en">
-<link rel="preload" as="font" href="https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2" type="font/woff2" crossorigin="anonymous"/>
 <style>
-@font-face {{
-    font-family:'Yandex Sans Display Web';
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot);
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot?#iefix) format('embedded-opentype'),
-            url(https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2) format('woff2'),
-            url(https://yastatic.net/adv-www/_/v2Sve_obH3rKm6rKrtSQpf-eB7U.woff) format('woff'),
-            url(https://yastatic.net/adv-www/_/PzD8hWLMunow5i3RfJ6WQJAL7aI.ttf) format('truetype'),
-            url(https://yastatic.net/adv-www/_/lF_KG5g4tpQNlYIgA0e77fBSZ5s.svg#YandexSansDisplayWeb-Regular) format('svg');
-    font-weight:400;
-    font-style:normal;
-    font-stretch:normal;
-    font-display: swap;
-}}
-
 body {{
-    font-family: "Yandex Sans Display Web", Arial, sans-serif;
+    font-family: "DejaVu Sans", "Noto Sans", Arial, sans-serif;
     background: #EEE;
 }}
 
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index 9141e89d744..c5d1ec4f12d 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -35,6 +35,7 @@ RUN apt-get update -y \
             wget \
             zstd \
             file \
+            pv \
     && apt-get clean
 
 
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index 075f588cae3..9b0c02dc471 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -58,6 +58,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
     --mysql_port 19004 --postgresql_port 19005 \
     --keeper_server.tcp_port 19181 --keeper_server.server_id 2 \
+    --prometheus.port 19988 \
     --macros.replica r2   # It doesn't work :(
 
     mkdir -p /var/run/clickhouse-server2
@@ -69,6 +70,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     --tcp_port 29000 --tcp_port_secure 29440 --http_port 28123 --https_port 28443 --interserver_http_port 29009 --tcp_with_proxy_port 29010 \
     --mysql_port 29004 --postgresql_port 29005 \
     --keeper_server.tcp_port 29181 --keeper_server.server_id 3 \
+    --prometheus.port 29988 \
     --macros.shard s2   # It doesn't work :(
 
     MAX_RUN_TIME=$((MAX_RUN_TIME < 9000 ? MAX_RUN_TIME : 9000))  # min(MAX_RUN_TIME, 2.5 hours)
@@ -84,13 +86,9 @@ function run_tests()
     # more idiologically correct.
     read -ra ADDITIONAL_OPTIONS <<< "${ADDITIONAL_OPTIONS:-}"
 
-    # Skip these tests, because they fail when we rerun them multiple times
+    # Use random order in flaky check
     if [ "$NUM_TRIES" -gt "1" ]; then
         ADDITIONAL_OPTIONS+=('--order=random')
-        ADDITIONAL_OPTIONS+=('--skip')
-        ADDITIONAL_OPTIONS+=('00000_no_tests_to_skip')
-        # Note that flaky check must be ran in parallel, but for now we run
-        # everything in parallel except DatabaseReplicated. See below.
     fi
 
     if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TREE" -eq 1 ]]; then
@@ -129,6 +127,13 @@ function run_tests()
 
 export -f run_tests
 
+if [ "$NUM_TRIES" -gt "1" ]; then
+    # We don't run tests with Ordinary database in PRs, only in master.
+    # So run new/changed tests with Ordinary at least once in flaky check.
+    timeout "$MAX_RUN_TIME" bash -c 'NUM_TRIES=1; USE_DATABASE_ORDINARY=1; run_tests' \
+      | sed 's/All tests have finished//' | sed 's/No tests were run//' ||:
+fi
+
 timeout "$MAX_RUN_TIME" bash -c run_tests ||:
 
 echo "Files in current directory"
diff --git a/docker/test/stateless_pytest/Dockerfile b/docker/test/stateless_pytest/Dockerfile
deleted file mode 100644
index 789ee0e9b30..00000000000
--- a/docker/test/stateless_pytest/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-# rebuild in #33610
-# docker build -t clickhouse/stateless-pytest .
-ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
-
-RUN apt-get update -y && \
-    apt-get install -y --no-install-recommends \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
-        brotli \
-        netcat-openbsd \
-        postgresql-client \
-        zstd
-
-RUN python3 -m pip install \
-    wheel \
-    pytest \
-    pytest-html \
-    pytest-json \
-    pytest-randomly \
-    pytest-rerunfailures \
-    pytest-timeout \
-    pytest-xdist \
-    pandas \
-    numpy \
-    scipy
-
-CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
-    dpkg -i package_folder/clickhouse-common-static-dbg_*.deb; \
-    dpkg -i package_folder/clickhouse-server_*.deb;  \
-    dpkg -i package_folder/clickhouse-client_*.deb; \
-    python3 -m pytest /usr/share/clickhouse-test/queries -n $(nproc) --reruns=1 --timeout=600 --json=test_output/report.json --html=test_output/report.html --self-contained-html
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 6c32e9a73ea..98a29f89e05 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -314,6 +314,8 @@ else
 
     # Avoid "Setting allow_deprecated_database_ordinary is neither a builtin setting..."
     rm -f /etc/clickhouse-server/users.d/database_ordinary.xml ||:
+    # Disable aggressive cleanup of tmp dirs (it worked incorrectly before 22.8)
+    rm -f /etc/clickhouse-server/config.d/merge_tree_old_dirs_cleanup.xml ||:
 
     start
 
@@ -391,6 +393,7 @@ else
                -e "Missing columns: 'v3' while processing query: 'v3, k, v1, v2, p'" \
                -e "This engine is deprecated and is not supported in transactions" \
                -e "[Queue = DB::MergeMutateRuntimeQueue]: Code: 235. DB::Exception: Part" \
+               -e "The set of parts restored in place of" \
         /var/log/clickhouse-server/clickhouse-server.backward.clean.log | zgrep -Fa "<Error>" > /test_output/bc_check_error_messages.txt \
         && echo -e 'Backward compatibility check: Error message in clickhouse-server.log (see bc_check_error_messages.txt)\tFAIL' >> /test_output/test_results.tsv \
         || echo -e 'Backward compatibility check: No Error messages in clickhouse-server.log\tOK' >> /test_output/test_results.tsv
diff --git a/docker/test/util/process_functional_tests_result.py b/docker/test/util/process_functional_tests_result.py
index 647989e8421..28f3e211157 100755
--- a/docker/test/util/process_functional_tests_result.py
+++ b/docker/test/util/process_functional_tests_result.py
@@ -86,7 +86,7 @@ def process_test_log(log_path):
                 test_end = True
 
     test_results = [
-        (test[0], test[1], test[2], "".join(test[3]))[:4096] for test in test_results
+        (test[0], test[1], test[2], "".join(test[3])[:4096]) for test in test_results
     ]
 
     return (
diff --git a/docs/_description_templates/template-data-type.md b/docs/_description_templates/template-data-type.md
deleted file mode 100644
index 239edb2808b..00000000000
--- a/docs/_description_templates/template-data-type.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-toc_priority:
-toc_title:
----
-
-# data_type_name {#data_type-name}
-
-Description.
-
-**Parameters** (Optional)
-
--   `x` — Description. [Type name](relative/path/to/type/dscr.md#type).
--   `y` — Description. [Type name](relative/path/to/type/dscr.md#type).
-
-**Examples**
-
-```sql
-
-```
-
-## Additional Info {#additional-info} (Optional)
-
-The name of an additional section can be any, for example, **Usage**.
-
-**See Also** (Optional)
-
--   [link](#)
-
-[Original article](https://clickhouse.com/docs/en/data-types/<data-type-name>/) <!--hide-->
diff --git a/docs/_description_templates/template-engine.md b/docs/_description_templates/template-engine.md
deleted file mode 100644
index 392bc59ed33..00000000000
--- a/docs/_description_templates/template-engine.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# EngineName {#enginename}
-
--   What the Database/Table engine does.
--   Relations with other engines if they exist.
-
-## Creating a Database {#creating-a-database}
-``` sql
-    CREATE DATABASE ...
-```
-or
-
-## Creating a Table {#creating-a-table}
-``` sql
-    CREATE TABLE ...
-```
-
-**Engine Parameters**
-
-**Query Clauses** (for Table engines only)
-
-## Virtual columns {#virtual-columns} (for Table engines only)
-
-List and virtual columns with description, if they exist.
-
-## Data Types Support {#data_types-support} (for Database engines only)
-
-|  EngineName           | ClickHouse                         |
-|-----------------------|------------------------------------|
-| NativeDataTypeName    | [ClickHouseDataTypeName](link#)    |
-
-
-## Specifics and recommendations {#specifics-and-recommendations}
-
-Algorithms
-Specifics of read and write processes
-Examples of tasks
-Recommendations for usage
-Specifics of data storage
-
-## Usage Example {#usage-example}
-
-The example must show usage and use cases. The following text contains the recommended parts of this section.
-
-Input table:
-
-``` text
-```
-
-Query:
-
-``` sql
-```
-
-Result:
-
-``` text
-```
-
-Follow up with any text to clarify the example.
-
-**See Also**
-
--   [link](#)
diff --git a/docs/_description_templates/template-function.md b/docs/_description_templates/template-function.md
deleted file mode 100644
index 6bdc764c449..00000000000
--- a/docs/_description_templates/template-function.md
+++ /dev/null
@@ -1,51 +0,0 @@
-## functionName {#functionname-in-lower-case}
-
-Short description.
-
-**Syntax** (without SELECT)
-
-``` sql
-<function syntax>
-```
-
-Alias: `<alias name>`. (Optional)
-
-More text (Optional).
-
-**Arguments** (Optional)
-
--   `x` — Description. Optional (only for optional arguments). Possible values: <values list>. Default value: <value>. [Type name](relative/path/to/type/dscr.md#type).
--   `y` — Description. Optional (only for optional arguments). Possible values: <values list>.Default value: <value>. [Type name](relative/path/to/type/dscr.md#type).
-
-**Parameters** (Optional, only for parametric aggregate functions)
-
--   `z` — Description. Optional (only for optional parameters). Possible values: <values list>. Default value: <value>. [Type name](relative/path/to/type/dscr.md#type).
-
-**Returned value(s)**
-
--   Returned values list.
-
-Type: [Type name](relative/path/to/type/dscr.md#type).
-
-**Example**
-
-The example must show usage and/or a use cases. The following text contains recommended parts of an example.
-
-Input table (Optional):
-
-``` text
-```
-
-Query:
-
-``` sql
-```
-
-Result:
-
-``` text
-```
-
-**See Also** (Optional)
-
--   [link](#)
diff --git a/docs/_description_templates/template-server-setting.md b/docs/_description_templates/template-server-setting.md
deleted file mode 100644
index 0b37d46cf41..00000000000
--- a/docs/_description_templates/template-server-setting.md
+++ /dev/null
@@ -1,33 +0,0 @@
-## server_setting_name {#server_setting_name}
-
-Description.
-
-Describe what is configured in this section of settings.
-
-Possible value: ...
-
-Default value: ...
-
-**Settings** (Optional)
-
-If the section contains several settings, list them here. Specify possible values and default values:
-
--   setting_1 — Description.
--   setting_2 — Description.
-
-**Example**
-
-```xml
-<server_setting_name>
-    <setting_1> ... </setting_1>
-    <setting_2> ... </setting_2>
-</server_setting_name>
-```
-
-**Additional Info** (Optional)
-
-The name of an additional section can be any, for example, **Usage**.
-
-**See Also** (Optional)
-
--   [link](#)
diff --git a/docs/_description_templates/template-setting.md b/docs/_description_templates/template-setting.md
deleted file mode 100644
index fc912aba3e1..00000000000
--- a/docs/_description_templates/template-setting.md
+++ /dev/null
@@ -1,27 +0,0 @@
-## setting_name {#setting_name}
-
-Description.
-
-For the switch setting, use the typical phrase: “Enables or disables something …”.
-
-Possible values:
-
-*For switcher setting:*
-
--   0 — Disabled.
--   1 — Enabled.
-
-*For another setting (typical phrases):*
-
--   Positive integer.
--   0 — Disabled or unlimited or something else.
-
-Default value: `value`.
-
-**Additional Info** (Optional)
-
-The name of an additional section can be any, for example, **Usage**.
-
-**See Also** (Optional)
-
--   [link](#)
diff --git a/docs/_description_templates/template-statement.md b/docs/_description_templates/template-statement.md
deleted file mode 100644
index 238570c2217..00000000000
--- a/docs/_description_templates/template-statement.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Statement name (for example, SHOW USER) {#statement-name-in-lower-case}
-
-Brief description of what the statement does.
-
-**Syntax**
-
-```sql
-Syntax of the statement.
-```
-
-## Other necessary sections of the description (Optional) {#anchor}
-
-Examples of descriptions with a complicated structure:
-
-- https://clickhouse.com/docs/en/sql-reference/statements/grant/
-- https://clickhouse.com/docs/en/sql-reference/statements/revoke/
-- https://clickhouse.com/docs/en/sql-reference/statements/select/join/
-
-
-**See Also** (Optional)
-
-Links to related topics as a list.
-
--   [link](#)
diff --git a/docs/_description_templates/template-system-table.md b/docs/_description_templates/template-system-table.md
deleted file mode 100644
index f2decc4bb6d..00000000000
--- a/docs/_description_templates/template-system-table.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# system.table_name {#system-tables_table-name}
-
-Description.
-
-Columns:
-
--   `column_name` ([data_type_name](path/to/data_type.md)) — Description.
-
-**Example**
-
-Query:
-
-``` sql
-SELECT * FROM system.table_name
-```
-
-Result:
-
-``` text
-Some output. It shouldn't be too long.
-```
-
-**See Also**
-
--   [Article name](path/to/article_name.md) — Some words about referenced information.
diff --git a/docs/changelogs/v22.3.1.1262-prestable.md b/docs/changelogs/v22.3.1.1262-prestable.md
index 0058396d634..6c16a92ed26 100644
--- a/docs/changelogs/v22.3.1.1262-prestable.md
+++ b/docs/changelogs/v22.3.1.1262-prestable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.1.1262-prestable FIXME as compared to v22.2.1.2139-prestable
+### ClickHouse release v22.3.1.1262-prestable (92ab33f560e) FIXME as compared to v22.2.1.2139-prestable (75366fc95e5)
 
 #### Backward Incompatible Change
 * Improvement the toDatetime function overflows. When the date string is very large, it will be converted to 1970. [#32898](https://github.com/ClickHouse/ClickHouse/pull/32898) ([HaiBo Li](https://github.com/marising)).
diff --git a/docs/changelogs/v22.3.10.22-lts.md b/docs/changelogs/v22.3.10.22-lts.md
new file mode 100644
index 00000000000..48009cb4f67
--- /dev/null
+++ b/docs/changelogs/v22.3.10.22-lts.md
@@ -0,0 +1,30 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.3.10.22-lts (25886f517d4) FIXME as compared to v22.3.9.19-lts (7976930b82e)
+
+#### Bug Fix
+* Backported in [#39761](https://github.com/ClickHouse/ClickHouse/issues/39761): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39206](https://github.com/ClickHouse/ClickHouse/issues/39206): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39381](https://github.com/ClickHouse/ClickHouse/issues/39381): Fixed error `Not found column Type in block` in selects with `PREWHERE` and read-in-order optimizations. [#39157](https://github.com/ClickHouse/ClickHouse/pull/39157) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#39588](https://github.com/ClickHouse/ClickHouse/issues/39588): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#39610](https://github.com/ClickHouse/ClickHouse/issues/39610): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* Backported in [#39834](https://github.com/ClickHouse/ClickHouse/issues/39834): Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#39238](https://github.com/ClickHouse/ClickHouse/issues/39238): Fix performance regression of scalar query optimization. [#35986](https://github.com/ClickHouse/ClickHouse/pull/35986) ([Amos Bird](https://github.com/amosbird)).
+* Backported in [#39531](https://github.com/ClickHouse/ClickHouse/issues/39531): Fix some issues with async reads from remote filesystem which happened when reading low cardinality. [#36763](https://github.com/ClickHouse/ClickHouse/pull/36763) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Replace MemoryTrackerBlockerInThread to LockMemoryExceptionInThread [#39619](https://github.com/ClickHouse/ClickHouse/pull/39619) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Change mysql-odbc url [#39702](https://github.com/ClickHouse/ClickHouse/pull/39702) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.3.11.12-lts.md b/docs/changelogs/v22.3.11.12-lts.md
new file mode 100644
index 00000000000..b10de69e234
--- /dev/null
+++ b/docs/changelogs/v22.3.11.12-lts.md
@@ -0,0 +1,20 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.3.11.12-lts (137c5f72657) FIXME as compared to v22.3.10.22-lts (25886f517d4)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#39881](https://github.com/ClickHouse/ClickHouse/issues/39881): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39336](https://github.com/ClickHouse/ClickHouse/issues/39336): Fix `parallel_view_processing=1` with `optimize_trivial_insert_select=1`. Fix `max_insert_threads` while pushing to views. [#38731](https://github.com/ClickHouse/ClickHouse/pull/38731) ([Azat Khuzhin](https://github.com/azat)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Backport [#39687](https://github.com/ClickHouse/ClickHouse/issues/39687) to 22.3: Fix seeking while reading from encrypted disk"'. [#40052](https://github.com/ClickHouse/ClickHouse/pull/40052) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
diff --git a/docs/changelogs/v22.3.2.2-lts.md b/docs/changelogs/v22.3.2.2-lts.md
index b755db300c8..b873926e068 100644
--- a/docs/changelogs/v22.3.2.2-lts.md
+++ b/docs/changelogs/v22.3.2.2-lts.md
@@ -5,5 +5,5 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.2.2-lts FIXME as compared to v22.3.1.1262-prestable
+### ClickHouse release v22.3.2.2-lts (89a621679c6) FIXME as compared to v22.3.1.1262-prestable (92ab33f560e)
 
diff --git a/docs/changelogs/v22.3.3.44-lts.md b/docs/changelogs/v22.3.3.44-lts.md
index 4cd48eefa5a..d0da3397d1d 100644
--- a/docs/changelogs/v22.3.3.44-lts.md
+++ b/docs/changelogs/v22.3.3.44-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.3.44-lts FIXME as compared to v22.3.2.2-lts
+### ClickHouse release v22.3.3.44-lts (abb756d3ca2) FIXME as compared to v22.3.2.2-lts (89a621679c6)
 
 #### Bug Fix
 * Backported in [#35928](https://github.com/ClickHouse/ClickHouse/issues/35928): Added settings `input_format_ipv4_default_on_conversion_error`, `input_format_ipv6_default_on_conversion_error` to allow insert of invalid ip address values as default into tables. Closes [#35726](https://github.com/ClickHouse/ClickHouse/issues/35726). [#35733](https://github.com/ClickHouse/ClickHouse/pull/35733) ([Maksim Kita](https://github.com/kitaisreal)).
diff --git a/docs/changelogs/v22.3.4.20-lts.md b/docs/changelogs/v22.3.4.20-lts.md
index d820adbdbec..34a8cd8c25a 100644
--- a/docs/changelogs/v22.3.4.20-lts.md
+++ b/docs/changelogs/v22.3.4.20-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.4.20-lts FIXME as compared to v22.3.3.44-lts
+### ClickHouse release v22.3.4.20-lts (ecbaf001f49) FIXME as compared to v22.3.3.44-lts (abb756d3ca2)
 
 #### Build/Testing/Packaging Improvement
 * - Add `_le_` method for ClickHouseVersion - Fix auto_version for existing tag - docker_server now support getting version from tags - Add python unit tests to backport workflow. [#36028](https://github.com/ClickHouse/ClickHouse/pull/36028) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v22.3.5.5-lts.md b/docs/changelogs/v22.3.5.5-lts.md
index 7deff1be416..fc1332b68c6 100644
--- a/docs/changelogs/v22.3.5.5-lts.md
+++ b/docs/changelogs/v22.3.5.5-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.5.5-lts FIXME as compared to v22.3.4.20-lts
+### ClickHouse release v22.3.5.5-lts (438b4a81f77) FIXME as compared to v22.3.4.20-lts (ecbaf001f49)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.3.6.5-lts.md b/docs/changelogs/v22.3.6.5-lts.md
index 4b4772c611a..535fa0e7ad3 100644
--- a/docs/changelogs/v22.3.6.5-lts.md
+++ b/docs/changelogs/v22.3.6.5-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.6.5-lts FIXME as compared to v22.3.5.5-lts
+### ClickHouse release v22.3.6.5-lts (3e44e824cff) FIXME as compared to v22.3.5.5-lts (438b4a81f77)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.3.7.28-lts.md b/docs/changelogs/v22.3.7.28-lts.md
index 14cb8628f09..5a6900e7fa4 100644
--- a/docs/changelogs/v22.3.7.28-lts.md
+++ b/docs/changelogs/v22.3.7.28-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.7.28-lts FIXME as compared to v22.3.6.5-lts
+### ClickHouse release v22.3.7.28-lts (420bdfa2751) FIXME as compared to v22.3.6.5-lts (3e44e824cff)
 
 #### Bug Fix (user-visible misbehavior in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.3.8.39-lts.md b/docs/changelogs/v22.3.8.39-lts.md
new file mode 100644
index 00000000000..893e8762e9c
--- /dev/null
+++ b/docs/changelogs/v22.3.8.39-lts.md
@@ -0,0 +1,32 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.3.8.39-lts (6bcf982f58b) FIXME as compared to v22.3.7.28-lts (420bdfa2751)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#38826](https://github.com/ClickHouse/ClickHouse/issues/38826): - 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)
+
+* Backported in [#38453](https://github.com/ClickHouse/ClickHouse/issues/38453): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#38710](https://github.com/ClickHouse/ClickHouse/issues/38710): Fix incorrect result of distributed queries with `DISTINCT` and `LIMIT`. Fixes [#38282](https://github.com/ClickHouse/ClickHouse/issues/38282). [#38371](https://github.com/ClickHouse/ClickHouse/pull/38371) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#38689](https://github.com/ClickHouse/ClickHouse/issues/38689): Now it's possible to start a clickhouse-server and attach/detach tables even for tables with the incorrect values of IPv4/IPv6 representation. Proper fix for issue [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#38590](https://github.com/ClickHouse/ClickHouse/pull/38590) ([alesapin](https://github.com/alesapin)).
+* Backported in [#38776](https://github.com/ClickHouse/ClickHouse/issues/38776): `rankCorr` function will work correctly if some arguments are NaNs. This closes [#38396](https://github.com/ClickHouse/ClickHouse/issues/38396). [#38722](https://github.com/ClickHouse/ClickHouse/pull/38722) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#38780](https://github.com/ClickHouse/ClickHouse/issues/38780): Fix use-after-free for Map combinator that leads to incorrect result. [#38748](https://github.com/ClickHouse/ClickHouse/pull/38748) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#36818](https://github.com/ClickHouse/ClickHouse/issues/36818): Fix projection analysis which might lead to wrong query result when IN subquery is used. This fixes [#35336](https://github.com/ClickHouse/ClickHouse/issues/35336). [#35631](https://github.com/ClickHouse/ClickHouse/pull/35631) ([Amos Bird](https://github.com/amosbird)).
+* Backported in [#38467](https://github.com/ClickHouse/ClickHouse/issues/38467): - Fix potential error with literals in `WHERE` for join queries. Close [#36279](https://github.com/ClickHouse/ClickHouse/issues/36279). [#36542](https://github.com/ClickHouse/ClickHouse/pull/36542) ([Vladimir C](https://github.com/vdimir)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Try to fix some trash [#37303](https://github.com/ClickHouse/ClickHouse/pull/37303) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update docker-compose to try get rid of v1 errors [#38394](https://github.com/ClickHouse/ClickHouse/pull/38394) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Trying backport useful features for CI [#38510](https://github.com/ClickHouse/ClickHouse/pull/38510) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix backports diff [#38703](https://github.com/ClickHouse/ClickHouse/pull/38703) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.3.9.19-lts.md b/docs/changelogs/v22.3.9.19-lts.md
new file mode 100644
index 00000000000..c00b9bfc8eb
--- /dev/null
+++ b/docs/changelogs/v22.3.9.19-lts.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.3.9.19-lts (7976930b82e) FIXME as compared to v22.3.8.39-lts (6bcf982f58b)
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39097](https://github.com/ClickHouse/ClickHouse/issues/39097): Any allocations inside OvercommitTracker may lead to deadlock. Logging was not very informative so it's easier just to remove logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794). [#39030](https://github.com/ClickHouse/ClickHouse/pull/39030) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#39080](https://github.com/ClickHouse/ClickHouse/issues/39080): Fix bug in filesystem cache that could happen in some corner case which coincided with cache capacity hitting the limit. Closes [#39066](https://github.com/ClickHouse/ClickHouse/issues/39066). [#39070](https://github.com/ClickHouse/ClickHouse/pull/39070) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Backported in [#39149](https://github.com/ClickHouse/ClickHouse/issues/39149): Fix error `Block structure mismatch` which could happen for INSERT into table with attached MATERIALIZED VIEW and enabled setting `extremes = 1`. Closes [#29759](https://github.com/ClickHouse/ClickHouse/issues/29759) and [#38729](https://github.com/ClickHouse/ClickHouse/issues/38729). [#39125](https://github.com/ClickHouse/ClickHouse/pull/39125) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#39372](https://github.com/ClickHouse/ClickHouse/issues/39372): 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)).
+* Backported in [#39379](https://github.com/ClickHouse/ClickHouse/issues/39379): Fix segmentation fault in MaterializedPostgreSQL database engine, which could happen if some exception occurred at replication initialisation. Closes [#36939](https://github.com/ClickHouse/ClickHouse/issues/36939). [#39272](https://github.com/ClickHouse/ClickHouse/pull/39272) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Backported in [#39351](https://github.com/ClickHouse/ClickHouse/issues/39351): Fix incorrect fetch postgresql tables query fro PostgreSQL database engine. Closes [#33502](https://github.com/ClickHouse/ClickHouse/issues/33502). [#39283](https://github.com/ClickHouse/ClickHouse/pull/39283) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Reproduce and a little bit better fix for LC dict right offset. [#36856](https://github.com/ClickHouse/ClickHouse/pull/36856) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Retry docker buildx commands with progressive sleep in between [#38898](https://github.com/ClickHouse/ClickHouse/pull/38898) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add docker_server.py running to backport and release CIs [#39011](https://github.com/ClickHouse/ClickHouse/pull/39011) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.4.1.2305-prestable.md b/docs/changelogs/v22.4.1.2305-prestable.md
index c202b0b9331..da1ba4a42bd 100644
--- a/docs/changelogs/v22.4.1.2305-prestable.md
+++ b/docs/changelogs/v22.4.1.2305-prestable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.1.2305-prestable FIXME as compared to v22.3.1.1262-prestable
+### ClickHouse release v22.4.1.2305-prestable (77a82cc090d) FIXME as compared to v22.3.1.1262-prestable (92ab33f560e)
 
 #### Backward Incompatible Change
 * Function `yandexConsistentHash` (consistent hashing algorithm by Konstantin "kostik" Oblakov) is renamed to `kostikConsistentHash`. The old name is left as an alias for compatibility. Although this change is backward compatible, we may remove the alias in subsequent releases, that's why it's recommended to update the usages of this function in your apps. [#35553](https://github.com/ClickHouse/ClickHouse/pull/35553) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -68,7 +68,7 @@ sidebar_label: 2022
 * For lts releases packages will be pushed to both lts and stable repos. [#35382](https://github.com/ClickHouse/ClickHouse/pull/35382) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Support uuid for postgres engines. Closes [#35384](https://github.com/ClickHouse/ClickHouse/issues/35384). [#35403](https://github.com/ClickHouse/ClickHouse/pull/35403) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Add arguments `--user`, `--password`, `--host`, `--port` for clickhouse-diagnostics. [#35422](https://github.com/ClickHouse/ClickHouse/pull/35422) ([李扬](https://github.com/taiyang-li)).
-* fix INSERT INTO table FROM INFILE does not display progress bar. [#35429](https://github.com/ClickHouse/ClickHouse/pull/35429) ([xiedeyantu](https://github.com/xiedeyantu)).
+* fix INSERT INTO table FROM INFILE does not display progress bar. [#35429](https://github.com/ClickHouse/ClickHouse/pull/35429) ([chen](https://github.com/xiedeyantu)).
 * Allow server to bind to low-numbered ports (e.g. 443). ClickHouse installation script will set `cap_net_bind_service` to the binary file. [#35451](https://github.com/ClickHouse/ClickHouse/pull/35451) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Add settings `input_format_orc_case_insensitive_column_matching`, `input_format_arrow_case_insensitive_column_matching`, and `input_format_parquet_case_insensitive_column_matching` which allows ClickHouse to use case insensitive matching of columns while reading data from ORC, Arrow or Parquet files. [#35459](https://github.com/ClickHouse/ClickHouse/pull/35459) ([Antonio Andelic](https://github.com/antonio2368)).
 * - Add explicit table info to the scan node of query plan and pipeline. [#35460](https://github.com/ClickHouse/ClickHouse/pull/35460) ([何李夫](https://github.com/helifu)).
@@ -106,7 +106,7 @@ sidebar_label: 2022
 * ASTPartition::formatImpl should output ALL while executing ALTER TABLE t DETACH PARTITION ALL. [#35987](https://github.com/ClickHouse/ClickHouse/pull/35987) ([awakeljw](https://github.com/awakeljw)).
 * `clickhouse-keeper` starts answering 4-letter commands before getting the quorum. [#35992](https://github.com/ClickHouse/ClickHouse/pull/35992) ([Antonio Andelic](https://github.com/antonio2368)).
 * Fix wrong assertion in replxx which happens when navigating back the history when the first line of input is a newline. Mark as improvement because it only affects debug build. This fixes [#34511](https://github.com/ClickHouse/ClickHouse/issues/34511). [#36007](https://github.com/ClickHouse/ClickHouse/pull/36007) ([Amos Bird](https://github.com/amosbird)).
-* If someone writes DEFAULT NULL in table definition, make data type Nullable. [#35887](https://github.com/ClickHouse/ClickHouse/issues/35887). [#36058](https://github.com/ClickHouse/ClickHouse/pull/36058) ([xiedeyantu](https://github.com/xiedeyantu)).
+* If someone writes DEFAULT NULL in table definition, make data type Nullable. [#35887](https://github.com/ClickHouse/ClickHouse/issues/35887). [#36058](https://github.com/ClickHouse/ClickHouse/pull/36058) ([chen](https://github.com/xiedeyantu)).
 * Added `thread_id` and `query_id` columns to `system.zookeeper_log` table. [#36074](https://github.com/ClickHouse/ClickHouse/pull/36074) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Auto assign numbers for Enum elements. [#36101](https://github.com/ClickHouse/ClickHouse/pull/36101) ([awakeljw](https://github.com/awakeljw)).
 * Reset thread name in `ThreadPool` to `ThreadPoolIdle` after job is done. This is to avoid displaying the old thread name for idle threads. This closes [#36114](https://github.com/ClickHouse/ClickHouse/issues/36114). [#36115](https://github.com/ClickHouse/ClickHouse/pull/36115) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -331,7 +331,7 @@ sidebar_label: 2022
 * ci: replace directory system log tables artifacts with tsv [#35773](https://github.com/ClickHouse/ClickHouse/pull/35773) ([Azat Khuzhin](https://github.com/azat)).
 * One more try to resurrect build hash [#35774](https://github.com/ClickHouse/ClickHouse/pull/35774) ([alesapin](https://github.com/alesapin)).
 * Refactoring QueryPipeline [#35789](https://github.com/ClickHouse/ClickHouse/pull/35789) ([Amos Bird](https://github.com/amosbird)).
-* Delete duplicate code [#35798](https://github.com/ClickHouse/ClickHouse/pull/35798) ([xiedeyantu](https://github.com/xiedeyantu)).
+* Delete duplicate code [#35798](https://github.com/ClickHouse/ClickHouse/pull/35798) ([chen](https://github.com/xiedeyantu)).
 * remove unused variable [#35800](https://github.com/ClickHouse/ClickHouse/pull/35800) ([flynn](https://github.com/ucasfl)).
 * Make `SortDescription::column_name` always non-empty [#35805](https://github.com/ClickHouse/ClickHouse/pull/35805) ([Nikita Taranov](https://github.com/nickitat)).
 * Fix latest_error referenced before assignment [#35807](https://github.com/ClickHouse/ClickHouse/pull/35807) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
@@ -417,7 +417,7 @@ sidebar_label: 2022
 * Revert reverting "Fix crash in ParallelReadBuffer" [#36212](https://github.com/ClickHouse/ClickHouse/pull/36212) ([Kruglov Pavel](https://github.com/Avogar)).
 * Make stateless tests with s3 always green [#36214](https://github.com/ClickHouse/ClickHouse/pull/36214) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Add Tyler Hannan to contributors [#36216](https://github.com/ClickHouse/ClickHouse/pull/36216) ([Tyler Hannan](https://github.com/tylerhannan)).
-* Fix the repeated call of func to get the table when drop table [#36248](https://github.com/ClickHouse/ClickHouse/pull/36248) ([xiedeyantu](https://github.com/xiedeyantu)).
+* Fix the repeated call of func to get the table when drop table [#36248](https://github.com/ClickHouse/ClickHouse/pull/36248) ([chen](https://github.com/xiedeyantu)).
 * Split test 01675_data_type_coroutine into 2 tests to prevent possible timeouts [#36250](https://github.com/ClickHouse/ClickHouse/pull/36250) ([Kruglov Pavel](https://github.com/Avogar)).
 * Merge TRUSTED_CONTRIBUTORS in lambda and import in check [#36252](https://github.com/ClickHouse/ClickHouse/pull/36252) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix exception "File segment can be completed only by downloader" in tests [#36253](https://github.com/ClickHouse/ClickHouse/pull/36253) ([Kseniia Sumarokova](https://github.com/kssenii)).
diff --git a/docs/changelogs/v22.4.2.1-stable.md b/docs/changelogs/v22.4.2.1-stable.md
index fb77d3fee9b..2bd245e00e7 100644
--- a/docs/changelogs/v22.4.2.1-stable.md
+++ b/docs/changelogs/v22.4.2.1-stable.md
@@ -5,5 +5,5 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.2.1-stable FIXME as compared to v22.4.1.2305-prestable
+### ClickHouse release v22.4.2.1-stable (b34ebdc36ae) FIXME as compared to v22.4.1.2305-prestable (77a82cc090d)
 
diff --git a/docs/changelogs/v22.4.3.3-stable.md b/docs/changelogs/v22.4.3.3-stable.md
index 4baa63672ab..3b0f1e11cd5 100644
--- a/docs/changelogs/v22.4.3.3-stable.md
+++ b/docs/changelogs/v22.4.3.3-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.3.3-stable FIXME as compared to v22.4.2.1-stable
+### ClickHouse release v22.4.3.3-stable (def956d6299) FIXME as compared to v22.4.2.1-stable (b34ebdc36ae)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.4.4.7-stable.md b/docs/changelogs/v22.4.4.7-stable.md
index 71e077ac071..a0bc92db3e8 100644
--- a/docs/changelogs/v22.4.4.7-stable.md
+++ b/docs/changelogs/v22.4.4.7-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.4.7-stable FIXME as compared to v22.4.3.3-stable
+### ClickHouse release v22.4.4.7-stable (ba44414f9b3) FIXME as compared to v22.4.3.3-stable (def956d6299)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.4.5.9-stable.md b/docs/changelogs/v22.4.5.9-stable.md
index 636ad2ed3ac..a80dfd01a2b 100644
--- a/docs/changelogs/v22.4.5.9-stable.md
+++ b/docs/changelogs/v22.4.5.9-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.5.9-stable FIXME as compared to v22.4.4.7-stable
+### ClickHouse release v22.4.5.9-stable (059ef6cadcd) FIXME as compared to v22.4.4.7-stable (ba44414f9b3)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.4.6.53-stable.md b/docs/changelogs/v22.4.6.53-stable.md
new file mode 100644
index 00000000000..cdd4c885574
--- /dev/null
+++ b/docs/changelogs/v22.4.6.53-stable.md
@@ -0,0 +1,44 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.4.6.53-stable (0625731c940) FIXME as compared to v22.4.5.9-stable (059ef6cadcd)
+
+#### New Feature
+* Backported in [#38714](https://github.com/ClickHouse/ClickHouse/issues/38714): SALT is allowed for CREATE USER <user> IDENTIFIED WITH sha256_hash. [#37377](https://github.com/ClickHouse/ClickHouse/pull/37377) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#38828](https://github.com/ClickHouse/ClickHouse/issues/38828): - 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)
+
+* Backported in [#37717](https://github.com/ClickHouse/ClickHouse/issues/37717): Fix unexpected errors with a clash of constant strings in aggregate function, prewhere and join. Close [#36891](https://github.com/ClickHouse/ClickHouse/issues/36891). [#37336](https://github.com/ClickHouse/ClickHouse/pull/37336) ([Vladimir C](https://github.com/vdimir)).
+* Backported in [#37512](https://github.com/ClickHouse/ClickHouse/issues/37512): Fix logical error in normalizeUTF8 functions. Closes [#37298](https://github.com/ClickHouse/ClickHouse/issues/37298). [#37443](https://github.com/ClickHouse/ClickHouse/pull/37443) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#37941](https://github.com/ClickHouse/ClickHouse/issues/37941): Fix setting cast_ipv4_ipv6_default_on_conversion_error for internal cast function. Closes [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#37761](https://github.com/ClickHouse/ClickHouse/pull/37761) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#38452](https://github.com/ClickHouse/ClickHouse/issues/38452): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#38711](https://github.com/ClickHouse/ClickHouse/issues/38711): Fix incorrect result of distributed queries with `DISTINCT` and `LIMIT`. Fixes [#38282](https://github.com/ClickHouse/ClickHouse/issues/38282). [#38371](https://github.com/ClickHouse/ClickHouse/pull/38371) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#38593](https://github.com/ClickHouse/ClickHouse/issues/38593): Fix parts removal (will be left forever if they had not been removed on server shutdown) after incorrect server shutdown. [#38486](https://github.com/ClickHouse/ClickHouse/pull/38486) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#38596](https://github.com/ClickHouse/ClickHouse/issues/38596): Fix table creation to avoid replication issues with pre-22.4 replicas. [#38541](https://github.com/ClickHouse/ClickHouse/pull/38541) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#38686](https://github.com/ClickHouse/ClickHouse/issues/38686): Now it's possible to start a clickhouse-server and attach/detach tables even for tables with the incorrect values of IPv4/IPv6 representation. Proper fix for issue [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#38590](https://github.com/ClickHouse/ClickHouse/pull/38590) ([alesapin](https://github.com/alesapin)).
+* Backported in [#38663](https://github.com/ClickHouse/ClickHouse/issues/38663): Adapt some more nodes to avoid issues with pre-22.4 replicas. [#38627](https://github.com/ClickHouse/ClickHouse/pull/38627) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#38777](https://github.com/ClickHouse/ClickHouse/issues/38777): `rankCorr` function will work correctly if some arguments are NaNs. This closes [#38396](https://github.com/ClickHouse/ClickHouse/issues/38396). [#38722](https://github.com/ClickHouse/ClickHouse/pull/38722) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#38781](https://github.com/ClickHouse/ClickHouse/issues/38781): Fix use-after-free for Map combinator that leads to incorrect result. [#38748](https://github.com/ClickHouse/ClickHouse/pull/38748) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#37456](https://github.com/ClickHouse/ClickHouse/issues/37456): Server might fail to start if it cannot resolve hostname of external ClickHouse dictionary. It's fixed. Fixes [#36451](https://github.com/ClickHouse/ClickHouse/issues/36451). [#36463](https://github.com/ClickHouse/ClickHouse/pull/36463) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#38468](https://github.com/ClickHouse/ClickHouse/issues/38468): - Fix potential error with literals in `WHERE` for join queries. Close [#36279](https://github.com/ClickHouse/ClickHouse/issues/36279). [#36542](https://github.com/ClickHouse/ClickHouse/pull/36542) ([Vladimir C](https://github.com/vdimir)).
+* Backported in [#37363](https://github.com/ClickHouse/ClickHouse/issues/37363): Fixed problem with infs in `quantileTDigest`. Fixes [#32107](https://github.com/ClickHouse/ClickHouse/issues/32107). [#37021](https://github.com/ClickHouse/ClickHouse/pull/37021) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Integration tests [#36866](https://github.com/ClickHouse/ClickHouse/pull/36866) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Try to fix some trash [#37303](https://github.com/ClickHouse/ClickHouse/pull/37303) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update protobuf files for kafka and rabbitmq [fix integration tests] [#37884](https://github.com/ClickHouse/ClickHouse/pull/37884) ([Nikita Taranov](https://github.com/nickitat)).
+* Try fix `test_grpc_protocol/test.py::test_progress` [#37908](https://github.com/ClickHouse/ClickHouse/pull/37908) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update docker-compose to try get rid of v1 errors [#38394](https://github.com/ClickHouse/ClickHouse/pull/38394) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix backports diff [#38703](https://github.com/ClickHouse/ClickHouse/pull/38703) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.5.1.2079-stable.md b/docs/changelogs/v22.5.1.2079-stable.md
index dfdcad64561..f6ca6fcc478 100644
--- a/docs/changelogs/v22.5.1.2079-stable.md
+++ b/docs/changelogs/v22.5.1.2079-stable.md
@@ -5,10 +5,10 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.5.1.2079-stable FIXME as compared to v22.4.1.2305-prestable
+### ClickHouse release v22.5.1.2079-stable (df0cb062098) FIXME as compared to v22.4.1.2305-prestable (77a82cc090d)
 
 #### Backward Incompatible Change
-* Updated the BoringSSL module to the official FIPS compliant version. This makes ClickHouse FIPS compliant. [#35914](https://github.com/ClickHouse/ClickHouse/pull/35914) ([Meena-Renganathan](https://github.com/Meena-Renganathan)).
+* Updated the BoringSSL module to the official FIPS compliant version. This makes ClickHouse FIPS compliant. [#35914](https://github.com/ClickHouse/ClickHouse/pull/35914) ([Deleted user](https://github.com/ghost)).
 * Now, background merges, mutations and `OPTIMIZE` will not increment `SelectedRows` and `SelectedBytes` metrics. They (still) will increment `MergedRows` and `MergedUncompressedBytes` as it was before. [#37040](https://github.com/ClickHouse/ClickHouse/pull/37040) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
 #### New Feature
@@ -20,7 +20,7 @@ sidebar_label: 2022
 * Parse collations in CREATE TABLE, throw exception or ignore. closes [#35892](https://github.com/ClickHouse/ClickHouse/issues/35892). [#36271](https://github.com/ClickHouse/ClickHouse/pull/36271) ([yuuch](https://github.com/yuuch)).
 * Add aliases JSONLines and NDJSON for JSONEachRow. Closes [#36303](https://github.com/ClickHouse/ClickHouse/issues/36303). [#36327](https://github.com/ClickHouse/ClickHouse/pull/36327) ([flynn](https://github.com/ucasfl)).
 * Set parts_to_delay_insert and parts_to_throw_insert as query-level settings. If they are defined, they can override table-level settings. [#36371](https://github.com/ClickHouse/ClickHouse/pull/36371) ([Memo](https://github.com/Joeywzr)).
-* temporary table can show total rows and total bytes. [#36401](https://github.com/ClickHouse/ClickHouse/issues/36401). [#36439](https://github.com/ClickHouse/ClickHouse/pull/36439) ([xiedeyantu](https://github.com/xiedeyantu)).
+* temporary table can show total rows and total bytes. [#36401](https://github.com/ClickHouse/ClickHouse/issues/36401). [#36439](https://github.com/ClickHouse/ClickHouse/pull/36439) ([chen](https://github.com/xiedeyantu)).
 * Added new hash function - wyHash64. [#36467](https://github.com/ClickHouse/ClickHouse/pull/36467) ([olevino](https://github.com/olevino)).
 * Window function nth_value was added. [#36601](https://github.com/ClickHouse/ClickHouse/pull/36601) ([Nikolay](https://github.com/ndchikin)).
 * Add MySQLDump input format. It reads all data from INSERT queries belonging to one table in dump. If there are more than one table, by default it reads data from the first one. [#36667](https://github.com/ClickHouse/ClickHouse/pull/36667) ([Kruglov Pavel](https://github.com/Avogar)).
@@ -212,7 +212,7 @@ sidebar_label: 2022
 * Update version after release [#36502](https://github.com/ClickHouse/ClickHouse/pull/36502) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Followup on [#36172](https://github.com/ClickHouse/ClickHouse/issues/36172) password hash salt feature [#36510](https://github.com/ClickHouse/ClickHouse/pull/36510) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Update version_date.tsv after v22.4.2.1-stable [#36533](https://github.com/ClickHouse/ClickHouse/pull/36533) ([github-actions[bot]](https://github.com/apps/github-actions)).
-* fix log should print 'from' path [#36535](https://github.com/ClickHouse/ClickHouse/pull/36535) ([xiedeyantu](https://github.com/xiedeyantu)).
+* fix log should print 'from' path [#36535](https://github.com/ClickHouse/ClickHouse/pull/36535) ([chen](https://github.com/xiedeyantu)).
 * Add function bin tests for Int/UInt128/UInt256 [#36537](https://github.com/ClickHouse/ClickHouse/pull/36537) ([Memo](https://github.com/Joeywzr)).
 * Fix 01161_all_system_tables [#36539](https://github.com/ClickHouse/ClickHouse/pull/36539) ([Antonio Andelic](https://github.com/antonio2368)).
 * Update PULL_REQUEST_TEMPLATE.md [#36543](https://github.com/ClickHouse/ClickHouse/pull/36543) ([Ivan Blinkov](https://github.com/blinkov)).
diff --git a/docs/changelogs/v22.5.2.53-stable.md b/docs/changelogs/v22.5.2.53-stable.md
new file mode 100644
index 00000000000..10b64632680
--- /dev/null
+++ b/docs/changelogs/v22.5.2.53-stable.md
@@ -0,0 +1,40 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.5.2.53-stable (5fd600fda9e) FIXME as compared to v22.5.1.2079-stable (df0cb062098)
+
+#### New Feature
+* Backported in [#38713](https://github.com/ClickHouse/ClickHouse/issues/38713): SALT is allowed for CREATE USER <user> IDENTIFIED WITH sha256_hash. [#37377](https://github.com/ClickHouse/ClickHouse/pull/37377) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#38827](https://github.com/ClickHouse/ClickHouse/issues/38827): - 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)
+
+* Backported in [#37716](https://github.com/ClickHouse/ClickHouse/issues/37716): Fix unexpected errors with a clash of constant strings in aggregate function, prewhere and join. Close [#36891](https://github.com/ClickHouse/ClickHouse/issues/36891). [#37336](https://github.com/ClickHouse/ClickHouse/pull/37336) ([Vladimir C](https://github.com/vdimir)).
+* Backported in [#37408](https://github.com/ClickHouse/ClickHouse/issues/37408): Throw an exception when GROUPING SETS used with ROLLUP or CUBE. [#37367](https://github.com/ClickHouse/ClickHouse/pull/37367) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#37513](https://github.com/ClickHouse/ClickHouse/issues/37513): Fix logical error in normalizeUTF8 functions. Closes [#37298](https://github.com/ClickHouse/ClickHouse/issues/37298). [#37443](https://github.com/ClickHouse/ClickHouse/pull/37443) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#37942](https://github.com/ClickHouse/ClickHouse/issues/37942): Fix setting cast_ipv4_ipv6_default_on_conversion_error for internal cast function. Closes [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#37761](https://github.com/ClickHouse/ClickHouse/pull/37761) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#38451](https://github.com/ClickHouse/ClickHouse/issues/38451): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#38544](https://github.com/ClickHouse/ClickHouse/issues/38544): Do not allow recursive usage of OvercommitTracker during logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794) cc @tavplubix @davenger. [#38246](https://github.com/ClickHouse/ClickHouse/pull/38246) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#38708](https://github.com/ClickHouse/ClickHouse/issues/38708): Fix incorrect result of distributed queries with `DISTINCT` and `LIMIT`. Fixes [#38282](https://github.com/ClickHouse/ClickHouse/issues/38282). [#38371](https://github.com/ClickHouse/ClickHouse/pull/38371) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#38595](https://github.com/ClickHouse/ClickHouse/issues/38595): Fix parts removal (will be left forever if they had not been removed on server shutdown) after incorrect server shutdown. [#38486](https://github.com/ClickHouse/ClickHouse/pull/38486) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#38598](https://github.com/ClickHouse/ClickHouse/issues/38598): Fix table creation to avoid replication issues with pre-22.4 replicas. [#38541](https://github.com/ClickHouse/ClickHouse/pull/38541) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#38688](https://github.com/ClickHouse/ClickHouse/issues/38688): Now it's possible to start a clickhouse-server and attach/detach tables even for tables with the incorrect values of IPv4/IPv6 representation. Proper fix for issue [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#38590](https://github.com/ClickHouse/ClickHouse/pull/38590) ([alesapin](https://github.com/alesapin)).
+* Backported in [#38664](https://github.com/ClickHouse/ClickHouse/issues/38664): Adapt some more nodes to avoid issues with pre-22.4 replicas. [#38627](https://github.com/ClickHouse/ClickHouse/pull/38627) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#38779](https://github.com/ClickHouse/ClickHouse/issues/38779): `rankCorr` function will work correctly if some arguments are NaNs. This closes [#38396](https://github.com/ClickHouse/ClickHouse/issues/38396). [#38722](https://github.com/ClickHouse/ClickHouse/pull/38722) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#38783](https://github.com/ClickHouse/ClickHouse/issues/38783): Fix use-after-free for Map combinator that leads to incorrect result. [#38748](https://github.com/ClickHouse/ClickHouse/pull/38748) ([Azat Khuzhin](https://github.com/azat)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Try to fix some trash [#37303](https://github.com/ClickHouse/ClickHouse/pull/37303) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update protobuf files for kafka and rabbitmq [fix integration tests] [#37884](https://github.com/ClickHouse/ClickHouse/pull/37884) ([Nikita Taranov](https://github.com/nickitat)).
+* Try fix `test_grpc_protocol/test.py::test_progress` [#37908](https://github.com/ClickHouse/ClickHouse/pull/37908) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Try to fix BC check [#38178](https://github.com/ClickHouse/ClickHouse/pull/38178) ([Kruglov Pavel](https://github.com/Avogar)).
+* Update docker-compose to try get rid of v1 errors [#38394](https://github.com/ClickHouse/ClickHouse/pull/38394) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix backports diff [#38703](https://github.com/ClickHouse/ClickHouse/pull/38703) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.5.3.21-stable.md b/docs/changelogs/v22.5.3.21-stable.md
new file mode 100644
index 00000000000..7c4717575d8
--- /dev/null
+++ b/docs/changelogs/v22.5.3.21-stable.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.5.3.21-stable (e03724efec5) FIXME as compared to v22.5.2.53-stable (5fd600fda9e)
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#38241](https://github.com/ClickHouse/ClickHouse/issues/38241): Fix possible crash in `Distributed` async insert in case of removing a replica from config. [#38029](https://github.com/ClickHouse/ClickHouse/pull/38029) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#39098](https://github.com/ClickHouse/ClickHouse/issues/39098): Any allocations inside OvercommitTracker may lead to deadlock. Logging was not very informative so it's easier just to remove logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794). [#39030](https://github.com/ClickHouse/ClickHouse/pull/39030) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#39078](https://github.com/ClickHouse/ClickHouse/issues/39078): Fix bug in filesystem cache that could happen in some corner case which coincided with cache capacity hitting the limit. Closes [#39066](https://github.com/ClickHouse/ClickHouse/issues/39066). [#39070](https://github.com/ClickHouse/ClickHouse/pull/39070) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Backported in [#39152](https://github.com/ClickHouse/ClickHouse/issues/39152): Fix error `Block structure mismatch` which could happen for INSERT into table with attached MATERIALIZED VIEW and enabled setting `extremes = 1`. Closes [#29759](https://github.com/ClickHouse/ClickHouse/issues/29759) and [#38729](https://github.com/ClickHouse/ClickHouse/issues/38729). [#39125](https://github.com/ClickHouse/ClickHouse/pull/39125) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#39274](https://github.com/ClickHouse/ClickHouse/issues/39274): Fixed error `Not found column Type in block` in selects with `PREWHERE` and read-in-order optimizations. [#39157](https://github.com/ClickHouse/ClickHouse/pull/39157) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#39369](https://github.com/ClickHouse/ClickHouse/issues/39369): 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)).
+* Backported in [#39350](https://github.com/ClickHouse/ClickHouse/issues/39350): Fix incorrect fetch postgresql tables query fro PostgreSQL database engine. Closes [#33502](https://github.com/ClickHouse/ClickHouse/issues/33502). [#39283](https://github.com/ClickHouse/ClickHouse/pull/39283) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Retry docker buildx commands with progressive sleep in between [#38898](https://github.com/ClickHouse/ClickHouse/pull/38898) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add docker_server.py running to backport and release CIs [#39011](https://github.com/ClickHouse/ClickHouse/pull/39011) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.5.4.19-stable.md b/docs/changelogs/v22.5.4.19-stable.md
new file mode 100644
index 00000000000..05296a178eb
--- /dev/null
+++ b/docs/changelogs/v22.5.4.19-stable.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.5.4.19-stable (c893bba830e) FIXME as compared to v22.5.3.21-stable (e03724efec5)
+
+#### Bug Fix
+* Backported in [#39748](https://github.com/ClickHouse/ClickHouse/issues/39748): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#39882](https://github.com/ClickHouse/ClickHouse/issues/39882): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39209](https://github.com/ClickHouse/ClickHouse/issues/39209): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39589](https://github.com/ClickHouse/ClickHouse/issues/39589): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#39611](https://github.com/ClickHouse/ClickHouse/issues/39611): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* Backported in [#39790](https://github.com/ClickHouse/ClickHouse/issues/39790): Fix wrong index analysis with tuples and operator `IN`, which could lead to wrong query result. [#39752](https://github.com/ClickHouse/ClickHouse/pull/39752) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39835](https://github.com/ClickHouse/ClickHouse/issues/39835): Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix reading from s3 in some corner cases [#38239](https://github.com/ClickHouse/ClickHouse/pull/38239) ([Anton Popov](https://github.com/CurtizJ)).
+* Replace MemoryTrackerBlockerInThread to LockMemoryExceptionInThread [#39619](https://github.com/ClickHouse/ClickHouse/pull/39619) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Change mysql-odbc url [#39702](https://github.com/ClickHouse/ClickHouse/pull/39702) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.6.1.1985-stable.md b/docs/changelogs/v22.6.1.1985-stable.md
index eeb4078eb04..9d930b8a0bb 100644
--- a/docs/changelogs/v22.6.1.1985-stable.md
+++ b/docs/changelogs/v22.6.1.1985-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.6.1.1985-stable FIXME as compared to v22.5.1.2079-stable
+### ClickHouse release v22.6.1.1985-stable (7000c4e0033) FIXME as compared to v22.5.1.2079-stable (df0cb062098)
 
 #### Backward Incompatible Change
 * 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)).
@@ -78,7 +78,7 @@ sidebar_label: 2022
 * Allow to use String type instead of Binary in Arrow/Parquet/ORC formats. This PR introduces 3 new settings for it: `output_format_arrow_string_as_string`, `output_format_parquet_string_as_string`, `output_format_orc_string_as_string`. Default value for all settings is `false`. [#37327](https://github.com/ClickHouse/ClickHouse/pull/37327) ([Kruglov Pavel](https://github.com/Avogar)).
 * Apply setting `input_format_max_rows_to_read_for_schema_inference` for all read rows in total from all files in globs. Previously setting `input_format_max_rows_to_read_for_schema_inference` was applied for each file in glob separately and in case of huge number of nulls we could read first `input_format_max_rows_to_read_for_schema_inference` rows from each file and get nothing. Also increase default value for this setting to 25000. [#37332](https://github.com/ClickHouse/ClickHouse/pull/37332) ([Kruglov Pavel](https://github.com/Avogar)).
 * allows providing `NULL`/`NOT NULL` right after type in column declaration. [#37337](https://github.com/ClickHouse/ClickHouse/pull/37337) ([Igor Nikonov](https://github.com/devcrafter)).
-* optimize file segment PARTIALLY_DOWNLOADED get read buffer. [#37338](https://github.com/ClickHouse/ClickHouse/pull/37338) ([xiedeyantu](https://github.com/xiedeyantu)).
+* optimize file segment PARTIALLY_DOWNLOADED get read buffer. [#37338](https://github.com/ClickHouse/ClickHouse/pull/37338) ([chen](https://github.com/xiedeyantu)).
 * Allow to prune the list of files via virtual columns such as `_file` and `_path` when reading from S3. This is for [#37174](https://github.com/ClickHouse/ClickHouse/issues/37174) , [#23494](https://github.com/ClickHouse/ClickHouse/issues/23494). [#37356](https://github.com/ClickHouse/ClickHouse/pull/37356) ([Amos Bird](https://github.com/amosbird)).
 * Try to improve short circuit functions processing to fix problems with stress tests. [#37384](https://github.com/ClickHouse/ClickHouse/pull/37384) ([Kruglov Pavel](https://github.com/Avogar)).
 * Closes [#37395](https://github.com/ClickHouse/ClickHouse/issues/37395). [#37415](https://github.com/ClickHouse/ClickHouse/pull/37415) ([Memo](https://github.com/Joeywzr)).
@@ -117,7 +117,7 @@ sidebar_label: 2022
 * Remove recursive submodules, because we don't need them and they can be confusing. Add style check to prevent recursive submodules. This closes [#32821](https://github.com/ClickHouse/ClickHouse/issues/32821). [#37616](https://github.com/ClickHouse/ClickHouse/pull/37616) ([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)).
 * Fix overly aggressive stripping which removed the embedded hash required for checking the consistency of the executable. [#37993](https://github.com/ClickHouse/ClickHouse/pull/37993) ([Robert Schulze](https://github.com/rschu1ze)).
-* fix MacOS build compressor faild. [#38007](https://github.com/ClickHouse/ClickHouse/pull/38007) ([xiedeyantu](https://github.com/xiedeyantu)).
+* fix MacOS build compressor faild. [#38007](https://github.com/ClickHouse/ClickHouse/pull/38007) ([chen](https://github.com/xiedeyantu)).
 
 #### Bug Fix (user-visible misbehavior in official stable or prestable release)
 
@@ -166,7 +166,7 @@ sidebar_label: 2022
 * Fix possible incorrect result of `SELECT ... WITH FILL` in the case when `ORDER BY` should be applied after `WITH FILL` result (e.g. for outer query). Incorrect result was caused by optimization for `ORDER BY` expressions ([#35623](https://github.com/ClickHouse/ClickHouse/issues/35623)). Closes [#37904](https://github.com/ClickHouse/ClickHouse/issues/37904). [#37959](https://github.com/ClickHouse/ClickHouse/pull/37959) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Add missing default columns when pushing to the target table in WindowView, fix [#37815](https://github.com/ClickHouse/ClickHouse/issues/37815). [#37965](https://github.com/ClickHouse/ClickHouse/pull/37965) ([vxider](https://github.com/Vxider)).
 * Fixed a stack overflow issue that would cause compilation to fail. [#37996](https://github.com/ClickHouse/ClickHouse/pull/37996) ([Han Shukai](https://github.com/KinderRiven)).
-* when open enable_filesystem_query_cache_limit, throw Reserved cache size exceeds the remaining cache size. [#38004](https://github.com/ClickHouse/ClickHouse/pull/38004) ([xiedeyantu](https://github.com/xiedeyantu)).
+* when open enable_filesystem_query_cache_limit, throw Reserved cache size exceeds the remaining cache size. [#38004](https://github.com/ClickHouse/ClickHouse/pull/38004) ([chen](https://github.com/xiedeyantu)).
 * Query, containing ORDER BY ... WITH FILL, can generate extra rows when multiple WITH FILL columns are present. [#38074](https://github.com/ClickHouse/ClickHouse/pull/38074) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
diff --git a/docs/changelogs/v22.6.2.12-stable.md b/docs/changelogs/v22.6.2.12-stable.md
index 224367b994a..a97492ffe27 100644
--- a/docs/changelogs/v22.6.2.12-stable.md
+++ b/docs/changelogs/v22.6.2.12-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.6.2.12-stable FIXME as compared to v22.6.1.1985-stable
+### ClickHouse release v22.6.2.12-stable (1fc97f10cbf) FIXME as compared to v22.6.1.1985-stable (7000c4e0033)
 
 #### Improvement
 * Backported in [#38484](https://github.com/ClickHouse/ClickHouse/issues/38484): Improve the stability for hive storage integration test. Move the data prepare step into test.py. [#38260](https://github.com/ClickHouse/ClickHouse/pull/38260) ([lgbo](https://github.com/lgbo-ustc)).
diff --git a/docs/changelogs/v22.6.3.35-stable.md b/docs/changelogs/v22.6.3.35-stable.md
index 584aeafc48e..e3eee326915 100644
--- a/docs/changelogs/v22.6.3.35-stable.md
+++ b/docs/changelogs/v22.6.3.35-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.6.3.35-stable FIXME as compared to v22.6.2.12-stable
+### ClickHouse release v22.6.3.35-stable (d5566f2f2dd) FIXME as compared to v22.6.2.12-stable (1fc97f10cbf)
 
 #### Bug Fix
 * Backported in [#38812](https://github.com/ClickHouse/ClickHouse/issues/38812): 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)).
diff --git a/docs/changelogs/v22.6.4.35-stable.md b/docs/changelogs/v22.6.4.35-stable.md
index d70d20d6134..b6c63d94eab 100644
--- a/docs/changelogs/v22.6.4.35-stable.md
+++ b/docs/changelogs/v22.6.4.35-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.6.4.35-stable FIXME as compared to v22.6.3.35-stable
+### ClickHouse release v22.6.4.35-stable (b9202cae6f4) FIXME as compared to v22.6.3.35-stable (d5566f2f2dd)
 
 #### Build/Testing/Packaging Improvement
 * Backported in [#38822](https://github.com/ClickHouse/ClickHouse/issues/38822): - 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)).
diff --git a/docs/changelogs/v22.6.5.22-stable.md b/docs/changelogs/v22.6.5.22-stable.md
new file mode 100644
index 00000000000..9120463858e
--- /dev/null
+++ b/docs/changelogs/v22.6.5.22-stable.md
@@ -0,0 +1,30 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.6.5.22-stable (47ca5f14a34) FIXME as compared to v22.6.4.35-stable (b9202cae6f4)
+
+#### Bug Fix
+* Backported in [#39749](https://github.com/ClickHouse/ClickHouse/issues/39749): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#39883](https://github.com/ClickHouse/ClickHouse/issues/39883): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39207](https://github.com/ClickHouse/ClickHouse/issues/39207): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#38932](https://github.com/ClickHouse/ClickHouse/issues/38932): Fix `parallel_view_processing=1` with `optimize_trivial_insert_select=1`. Fix `max_insert_threads` while pushing to views. [#38731](https://github.com/ClickHouse/ClickHouse/pull/38731) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#39590](https://github.com/ClickHouse/ClickHouse/issues/39590): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#39612](https://github.com/ClickHouse/ClickHouse/issues/39612): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* Backported in [#39791](https://github.com/ClickHouse/ClickHouse/issues/39791): Fix wrong index analysis with tuples and operator `IN`, which could lead to wrong query result. [#39752](https://github.com/ClickHouse/ClickHouse/pull/39752) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39836](https://github.com/ClickHouse/ClickHouse/issues/39836): Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix reading from s3 in some corner cases [#38239](https://github.com/ClickHouse/ClickHouse/pull/38239) ([Anton Popov](https://github.com/CurtizJ)).
+* Replace MemoryTrackerBlockerInThread to LockMemoryExceptionInThread [#39619](https://github.com/ClickHouse/ClickHouse/pull/39619) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Change mysql-odbc url [#39702](https://github.com/ClickHouse/ClickHouse/pull/39702) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.7.3.5-stable.md b/docs/changelogs/v22.7.3.5-stable.md
new file mode 100644
index 00000000000..92fe37e4821
--- /dev/null
+++ b/docs/changelogs/v22.7.3.5-stable.md
@@ -0,0 +1,18 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.7.3.5-stable (e140b8b5f3a) FIXME as compared to v22.7.2.15-stable (f843089624e)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#39884](https://github.com/ClickHouse/ClickHouse/issues/39884): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#39884](https://github.com/ClickHouse/ClickHouse/issues/39884): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#40045](https://github.com/ClickHouse/ClickHouse/issues/40045): Fix big memory usage during fetches. Fixes [#39915](https://github.com/ClickHouse/ClickHouse/issues/39915). [#39990](https://github.com/ClickHouse/ClickHouse/pull/39990) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#40045](https://github.com/ClickHouse/ClickHouse/issues/40045): Fix big memory usage during fetches. Fixes [#39915](https://github.com/ClickHouse/ClickHouse/issues/39915). [#39990](https://github.com/ClickHouse/ClickHouse/pull/39990) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
diff --git a/docs/en/development/build-cross-riscv.md b/docs/en/development/build-cross-riscv.md
index a17063e7d8d..a0b31ff131a 100644
--- a/docs/en/development/build-cross-riscv.md
+++ b/docs/en/development/build-cross-riscv.md
@@ -23,7 +23,7 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 ``` bash
 cd ClickHouse
 mkdir build-riscv64
-CC=clang-14 CXX=clang++-14 cmake . -Bbuild-riscv64 -G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-riscv64.cmake -DGLIBC_COMPATIBILITY=OFF -DENABLE_LDAP=OFF  -DOPENSSL_NO_ASM=ON -DENABLE_JEMALLOC=ON -DENABLE_PARQUET=OFF -DENABLE_ORC=OFF -DUSE_UNWIND=OFF -DENABLE_GRPC=OFF -DENABLE_HDFS=OFF -DENABLE_MYSQL=OFF
+CC=clang-14 CXX=clang++-14 cmake . -Bbuild-riscv64 -G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-riscv64.cmake -DGLIBC_COMPATIBILITY=OFF -DENABLE_LDAP=OFF  -DOPENSSL_NO_ASM=ON -DENABLE_JEMALLOC=ON -DENABLE_PARQUET=OFF -DUSE_UNWIND=OFF -DENABLE_GRPC=OFF -DENABLE_HDFS=OFF -DENABLE_MYSQL=OFF
 ninja -C build-riscv64
 ```
 
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index e12884b61c4..cea6354094b 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -135,28 +135,6 @@ export PATH=/home/milovidov/work/cmake-3.22.2-linux-x86_64/bin/:${PATH}
 hash cmake
 ```
 
-## How to Build ClickHouse Debian Package {#how-to-build-clickhouse-debian-package}
-
-### Install Git {#install-git}
-
-``` bash
-sudo apt-get update
-sudo apt-get install git python debhelper lsb-release fakeroot sudo debian-archive-keyring debian-keyring
-```
-
-### Checkout ClickHouse Sources {#checkout-clickhouse-sources-1}
-
-``` bash
-git clone --recursive --branch master https://github.com/ClickHouse/ClickHouse.git
-cd ClickHouse
-```
-
-### Run Release Script {#run-release-script}
-
-``` bash
-./release
-```
-
 ## You Don’t Have to Build ClickHouse {#you-dont-have-to-build-clickhouse}
 
 ClickHouse is available in pre-built binaries and packages. Binaries are portable and can be run on any Linux flavour.
diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md
index 7f8bf801a27..945d5a2f62f 100644
--- a/docs/en/development/developer-instruction.md
+++ b/docs/en/development/developer-instruction.md
@@ -285,4 +285,9 @@ If you are not interested in functionality provided by third-party libraries, yo
 -DENABLE_LIBRARIES=0 -DENABLE_EMBEDDED_COMPILER=0
 ```
 
+Compressing the binary at the end of the build may take a while, disable the self-extraction feature via
+```
+-DENABLE_CLICKHOUSE_SELF_EXTRACTING=0
+```
+
 In case of problems with any of the development options, you are on your own!
diff --git a/docs/en/engines/database-engines/replicated.md b/docs/en/engines/database-engines/replicated.md
index 8ddff32bb2c..110b799c6be 100644
--- a/docs/en/engines/database-engines/replicated.md
+++ b/docs/en/engines/database-engines/replicated.md
@@ -81,7 +81,7 @@ Creating a distributed table and inserting the data:
 
 ``` sql
 node2 :) CREATE TABLE r.d (n UInt64) ENGINE=Distributed('r','r','rmt', n % 2);
-node3 :) INSERT INTO r SELECT * FROM numbers(10);
+node3 :) INSERT INTO r.d SELECT * FROM numbers(10);
 node1 :) SELECT materialize(hostName()) AS host, groupArray(n) FROM r.d GROUP BY host;
 ```
 
@@ -120,4 +120,4 @@ node2 :) SELECT materialize(hostName()) AS host, groupArray(n) FROM r.d GROUP BY
 │ node2 │  [1,3,5,7,9]  │
 │ node4 │  [0,2,4,6,8]  │
 └───────┴───────────────┘
-```
\ No newline at end of file
+```
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 9339ec2454f..42378d2ad07 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -482,9 +482,11 @@ For example:
 
 ## Projections {#projections}
 Projections are like [materialized views](../../../sql-reference/statements/create/view.md#materialized) but defined in part-level. It provides consistency guarantees along with automatic usage in queries.
-::: note
+
+:::note
 When you are implementing projections you should also consider the [force_optimize_projection](../../../operations/settings/settings.md#force-optimize-projection) setting.
 :::
+
 Projections are not supported in the `SELECT` statements with the [FINAL](../../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
 ### Projection Query {#projection-query}
diff --git a/docs/en/interfaces/cli.md b/docs/en/interfaces/cli.md
index e0882d1f9e1..b113d180a36 100644
--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@@ -22,7 +22,9 @@ Connected to ClickHouse server version 20.13.1 revision 54442.
 
 Different client and server versions are compatible with one another, but some features may not be available in older clients. We recommend using the same version of the client as the server app. When you try to use a client of the older version, then the server, `clickhouse-client` displays the message:
 
-      ClickHouse client version is older than ClickHouse server. It may lack support for new features.
+```response
+ClickHouse client version is older than ClickHouse server. It may lack support for new features.
+```
 
 ## Usage {#cli_usage}
 
@@ -116,6 +118,7 @@ You can pass parameters to `clickhouse-client` (all parameters have a default va
 -   `--port` – The port to connect to. Default value: 9000. Note that the HTTP interface and the native interface use different ports.
 -   `--user, -u` – The username. Default value: default.
 -   `--password` – The password. Default value: empty string.
+-   `--ask-password` - Prompt the user to enter a password.
 -   `--query, -q` – The query to process when using non-interactive mode. You must specify either `query` or `queries-file` option.
 -   `--queries-file` – file path with queries to execute. You must specify either `query` or `queries-file` option.
 -   `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ by default).
@@ -182,6 +185,6 @@ This feature can be used to generate URLs to facilitate profiling of queries.
 
 If the configuration above is applied, the ID of a query is shown in the following format:
 
-``` text
+```response
 speedscope:http://speedscope-host/#profileURL=qp%3Fid%3Dc8ecc783-e753-4b38-97f1-42cddfb98b7d
 ```
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index 6678af9036b..10a311d3aec 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -49,10 +49,17 @@ The supported formats are:
 | [JSONCompactStringsEachRowWithNamesAndTypes](#jsoncompactstringseachrowwithnamesandtypes) | ✔    | ✔      |
 | [TSKV](#tskv)                                                                             | ✔    | ✔      |
 | [Pretty](#pretty)                                                                         | ✗    | ✔      |
-| [PrettyCompact](#prettycompact)                                                           | ✗    | ✔      |
-| [PrettyCompactMonoBlock](#prettycompactmonoblock)                                         | ✗    | ✔      |
 | [PrettyNoEscapes](#prettynoescapes)                                                       | ✗    | ✔      |
+| [PrettyMonoBlock](#prettymonoblock)                                                       | ✗    | ✔      |
+| [PrettyNoEscapesMonoBlock](#prettynoescapesmonoblock)                                     | ✗    | ✔      |
+| [PrettyCompact](#prettycompact)                                                           | ✗    | ✔      |
+| [PrettyCompactNoEscapes](#prettycompactnoescapes)                                         | ✗    | ✔      |
+| [PrettyCompactMonoBlock](#prettycompactmonoblock)                                         | ✗    | ✔      |
+| [PrettyCompactNoEscapesMonoBlock](#prettycompactnoescapesmonoblock)                       | ✗    | ✔      |
 | [PrettySpace](#prettyspace)                                                               | ✗    | ✔      |
+| [PrettySpaceNoEscapes](#prettyspacenoescapes)                                             | ✗    | ✔      |
+| [PrettySpaceMonoBlock](#prettyspacemonoblock)                                             | ✗    | ✔      |
+| [PrettySpaceNoEscapesMonoBlock](#prettyspacenoescapesmonoblock)                           | ✗    | ✔      |
 | [Prometheus](#prometheus)                                                                 | ✗    | ✔      |
 | [Protobuf](#protobuf)                                                                     | ✔    | ✔      |
 | [ProtobufSingle](#protobufsingle)                                                         | ✔    | ✔      |
@@ -1198,18 +1205,9 @@ Extremes:
 └────────────┴─────────┘
 ```
 
-## PrettyCompact {#prettycompact}
-
-Differs from [Pretty](#pretty) in that the grid is drawn between rows and the result is more compact.
-This format is used by default in the command-line client in interactive mode.
-
-## PrettyCompactMonoBlock {#prettycompactmonoblock}
-
-Differs from [PrettyCompact](#prettycompact) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
-
 ## PrettyNoEscapes {#prettynoescapes}
 
-Differs from Pretty in that ANSI-escape sequences aren’t used. This is necessary for displaying this format in a browser, as well as for using the ‘watch’ command-line utility.
+Differs from [Pretty](#pretty) in that ANSI-escape sequences aren’t used. This is necessary for displaying this format in a browser, as well as for using the ‘watch’ command-line utility.
 
 Example:
 
@@ -1219,19 +1217,49 @@ $ watch -n1 "clickhouse-client --query='SELECT event, value FROM system.events F
 
 You can use the HTTP interface for displaying in the browser.
 
-### PrettyCompactNoEscapes {#prettycompactnoescapes}
+## PrettyMonoBlock {#prettymonoblock}
 
-The same as the previous setting.
+Differs from [Pretty](#pretty) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
 
-### PrettySpaceNoEscapes {#prettyspacenoescapes}
+## PrettyNoEscapesMonoBlock {#prettynoescapesmonoblock}
 
-The same as the previous setting.
+Differs from [PrettyNoEscapes](#prettynoescapes) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
+
+
+## PrettyCompact {#prettycompact}
+
+Differs from [Pretty](#pretty) in that the grid is drawn between rows and the result is more compact.
+This format is used by default in the command-line client in interactive mode.
+
+## PrettyCompactNoEscapes {#prettynoescapes}
+
+Differs from [PrettyCompact](#prettycompact) in that ANSI-escape sequences aren’t used. This is necessary for displaying this format in a browser, as well as for using the ‘watch’ command-line utility.
+
+## PrettyCompactMonoBlock {#prettycompactmonoblock}
+
+Differs from [PrettyCompact](#prettycompact) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
+
+## PrettyCompactNoEscapesMonoBlock {#prettycompactnoescapesmonoblock}
+
+Differs from [PrettyCompactNoEscapes](#prettycompactnoescapes) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
 
 ## PrettySpace {#prettyspace}
 
 Differs from [PrettyCompact](#prettycompact) in that whitespace (space characters) is used instead of the grid.
 
-### Pretty formats settings {#pretty-formats-settings}
+## PrettySpaceNoEscapes {#prettyspacenoescapes}
+
+Differs from [PrettySpace](#prettyspace) in that ANSI-escape sequences aren’t used. This is necessary for displaying this format in a browser, as well as for using the ‘watch’ command-line utility.
+
+## PrettySpaceMonoBlock {#prettyspacemonoblock}
+
+Differs from [PrettySpace](#prettyspace) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
+
+## PrettySpaceNoEscapesMonoBlock {#prettyspacenoescapesmonoblock}
+
+Differs from [PrettySpaceNoEscapes](#prettyspacenoescapes) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
+
+## Pretty formats settings {#pretty-formats-settings}
 
 - [output_format_pretty_max_rows](../operations/settings/settings.md#output_format_pretty_max_rows) - rows limit for Pretty formats. Default value - `10000`.
 - [output_format_pretty_max_column_pad_width](../operations/settings/settings.md#output_format_pretty_max_column_pad_width) - maximum width to pad all values in a column in Pretty formats. Default value - `250`.
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index aefd763b21e..7bcc8832da2 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -73,6 +73,18 @@ Features:
 
 ClickHouse datasource plugin provides a support for ClickHouse as a backend database.
 
+### qryn (#qryn)
+
+[qryn](https://metrico.in) is a polyglot, high-performance observability stack for ClickHouse _(formerly cLoki)_ with native Grafana integrations allowing users to ingest and analyze logs, metrics and telemetry traces from any agent supporting Loki/LogQL, Prometheus/PromQL, OTLP/Tempo, Elastic, InfluxDB and many more.
+
+Features:
+
+- Built in Explore UI and LogQL CLI for querying, extracting and visualizing data
+- Native Grafana APIs support for querying, processing, ingesting, tracing and alerting without plugins
+- Powerful pipeline to dynamically search, filter and extract data from logs, events, traces and beyond
+- Ingestion and PUSH APIs transparently compatible with LogQL, PromQL, InfluxDB, Elastic and many more
+- Ready to use with Agents such as Promtail, Grafana-Agent, Vector, Logstash, Telegraf and many others
+
 ### DBeaver {#dbeaver}
 
 [DBeaver](https://dbeaver.io/) - universal desktop database client with ClickHouse support.
@@ -169,6 +181,22 @@ Features:
 - Supports alarm configuration
 - Support permission granularity to library and table permission configuration
 
+### ClickHouse-Mate {#clickmate}
+
+[ClickHouse-Mate](https://github.com/metrico/clickhouse-mate) is an angular web client + user interface to search and explore data in ClickHouse.
+
+Features:
+
+- ClickHouse SQL Query autocompletion
+- Fast Database and Table tree navigation
+- Advanced result Filtering and Sorting
+- Inline ClickHouse SQL documentation
+- Query Presets and History
+- 100% browser based, no server/backend
+
+The client is available for instant usage through github pages: https://metrico.github.io/clickhouse-mate/
+
+
 ## Commercial {#commercial}
 
 ### DataGrip {#datagrip}
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 73ad5984b2d..78db3720ac1 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -1289,14 +1289,14 @@ ENGINE = MergeTree
 ORDER BY A
 SETTINGS non_replicated_deduplication_window = 100;
 
-INSERT INTO test_table Values SETTINGS insert_deduplication_token = 'test' (1);
+INSERT INTO test_table SETTINGS insert_deduplication_token = 'test' VALUES (1);
 
 -- the next insert won't be deduplicated because insert_deduplication_token is different
-INSERT INTO test_table Values SETTINGS insert_deduplication_token = 'test1' (1);
+INSERT INTO test_table SETTINGS insert_deduplication_token = 'test1' VALUES (1);
 
 -- the next insert will be deduplicated because insert_deduplication_token
 -- is the same as one of the previous
-INSERT INTO test_table Values SETTINGS insert_deduplication_token = 'test' (2);
+INSERT INTO test_table SETTINGS insert_deduplication_token = 'test' VALUES (2);
 
 SELECT * FROM test_table
 
@@ -3102,7 +3102,7 @@ Possible values:
 -   0 — Positional arguments aren't supported.
 -   1 — Positional arguments are supported: column numbers can use instead of column names.
 
-Default value: `0`.
+Default value: `1`.
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/anylast.md b/docs/en/sql-reference/aggregate-functions/reference/anylast.md
index 06d7603853f..44697359405 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/anylast.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/anylast.md
@@ -2,7 +2,7 @@
 sidebar_position: 104
 ---
 
-## anyLast
+# anyLast
 
 Selects the last value encountered.
 The result is just as indeterminate as for the [any](../../../sql-reference/aggregate-functions/reference/any.md) function.
diff --git a/docs/en/sql-reference/data-types/date32.md b/docs/en/sql-reference/data-types/date32.md
index e1d6e2363e8..b5a82128e69 100644
--- a/docs/en/sql-reference/data-types/date32.md
+++ b/docs/en/sql-reference/data-types/date32.md
@@ -5,7 +5,7 @@ sidebar_label: Date32
 
 # Date32
 
-A date. Supports the date range same with [Datetime64](../../sql-reference/data-types/datetime64.md). Stored in four bytes as the number of days since 1925-01-01. Allows storing values till 2283-11-11. 
+A date. Supports the date range same with [Datetime64](../../sql-reference/data-types/datetime64.md). Stored in four bytes as the number of days since 1900-01-01. Allows storing values till 2299-12-31.
 
 **Examples**
 
@@ -36,5 +36,5 @@ SELECT * FROM new;
 
 -   [toDate32](../../sql-reference/functions/type-conversion-functions.md#todate32)
 -   [toDate32OrZero](../../sql-reference/functions/type-conversion-functions.md#todate32-or-zero)
--   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null) 
+-   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null)
 
diff --git a/docs/en/sql-reference/data-types/datetime64.md b/docs/en/sql-reference/data-types/datetime64.md
index ddc71e75e44..a5a520a978e 100644
--- a/docs/en/sql-reference/data-types/datetime64.md
+++ b/docs/en/sql-reference/data-types/datetime64.md
@@ -18,7 +18,7 @@ DateTime64(precision, [timezone])
 
 Internally, stores data as a number of ‘ticks’ since epoch start (1970-01-01 00:00:00 UTC) as Int64. The tick resolution is determined by the precision parameter. Additionally, the `DateTime64` type can store time zone that is the same for the entire column, that affects how the values of the `DateTime64` type values are displayed in text format and how the values specified as strings are parsed (‘2020-01-01 05:00:01.000’). The time zone is not stored in the rows of the table (or in resultset), but is stored in the column metadata. See details in [DateTime](../../sql-reference/data-types/datetime.md).
 
-Supported range of values: \[1925-01-01 00:00:00, 2283-11-11 23:59:59.99999999\] (Note: The precision of the maximum value is 8).
+Supported range of values: \[1900-01-01 00:00:00, 2299-12-31 23:59:59.99999999\] (Note: The precision of the maximum value is 8).
 
 ## Examples
 
diff --git a/docs/en/sql-reference/functions/arithmetic-functions.md b/docs/en/sql-reference/functions/arithmetic-functions.md
index b8d2f171bc8..45df5f7f227 100644
--- a/docs/en/sql-reference/functions/arithmetic-functions.md
+++ b/docs/en/sql-reference/functions/arithmetic-functions.md
@@ -55,9 +55,9 @@ Differs from ‘intDiv’ in that it returns zero when dividing by zero or when
 
 ## modulo(a, b), a % b operator
 
-Calculates the remainder after division.
-If arguments are floating-point numbers, they are pre-converted to integers by dropping the decimal portion.
-The remainder is taken in the same sense as in C++. Truncated division is used for negative numbers.
+Calculates the remainder when dividing `a` by `b`.
+The result type is an integer if both inputs are integers. If one of the inputs is a floating-point number, the result is a floating-point number.
+The remainder is computed like in C++. Truncated division is used for negative numbers.
 An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
 
 ## moduloOrZero(a, b)
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index 50a394e45fd..e76317b9e47 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -162,6 +162,10 @@ Creates an array from the function arguments.
 The arguments must be constants and have types that have the smallest common type. At least one argument must be passed, because otherwise it isn’t clear which type of array to create. That is, you can’t use this function to create an empty array (to do that, use the ‘emptyArray\*’ function described above).
 Returns an ‘Array(T)’ type result, where ‘T’ is the smallest common type out of the passed arguments.
 
+## arrayWithConstant(length, elem)
+
+Creates an array of length `length` filled with the constant `elem`.
+
 ## arrayConcat
 
 Combines arrays passed as arguments.
diff --git a/docs/en/sql-reference/functions/array-join.md b/docs/en/sql-reference/functions/array-join.md
index ed1199a45d8..0eb1d1b431e 100644
--- a/docs/en/sql-reference/functions/array-join.md
+++ b/docs/en/sql-reference/functions/array-join.md
@@ -9,15 +9,11 @@ This is a very unusual function.
 
 Normal functions do not change a set of rows, but just change the values in each row (map).
 Aggregate functions compress a set of rows (fold or reduce).
-The ‘arrayJoin’ function takes each row and generates a set of rows (unfold).
+The `arrayJoin` function takes each row and generates a set of rows (unfold).
 
 This function takes an array as an argument, and propagates the source row to multiple rows for the number of elements in the array.
 All the values in columns are simply copied, except the values in the column where this function is applied; it is replaced with the corresponding array value.
 
-A query can use multiple `arrayJoin` functions. In this case, the transformation is performed multiple times.
-
-Note the ARRAY JOIN syntax in the SELECT query, which provides broader possibilities.
-
 Example:
 
 ``` sql
@@ -32,3 +28,112 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
 └─────┴───────────┴─────────┘
 ```
 
+The `arrayJoin` function affects all sections of the query, including the `WHERE` section. Notice the result 2, even though the subquery returned 1 row.
+
+Example:
+
+```sql
+SELECT sum(1) AS impressions
+FROM
+(
+    SELECT ['Istanbul', 'Berlin', 'Bobruisk'] AS cities
+)
+WHERE arrayJoin(cities) IN ['Istanbul', 'Berlin'];
+```
+
+``` text
+┌─impressions─┐
+│           2 │
+└─────────────┘
+```
+
+A query can use multiple `arrayJoin` functions. In this case, the transformation is performed multiple times and the rows are multiplied.
+
+Example:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    arrayJoin(cities) AS city,
+    arrayJoin(browsers) AS browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           2 │ Istanbul │ Chrome  │
+│           1 │ Istanbul │ Firefox │
+│           2 │ Berlin   │ Chrome  │
+│           1 │ Berlin   │ Firefox │
+│           2 │ Bobruisk │ Chrome  │
+│           1 │ Bobruisk │ Firefox │
+└─────────────┴──────────┴─────────┘
+```
+
+Note the [ARRAY JOIN](../statements/select/array-join.md) syntax in the SELECT query, which provides broader possibilities.
+`ARRAY JOIN` allows you to convert multiple arrays with the same number of elements at a time.
+
+Example:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    city,
+    browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+ARRAY JOIN
+    cities AS city,
+    browsers AS browser
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           1 │ Istanbul │ Firefox │
+│           1 │ Berlin   │ Chrome  │
+│           1 │ Bobruisk │ Chrome  │
+└─────────────┴──────────┴─────────┘
+```
+
+Or you can use [Tuple](../data-types/tuple.md)
+
+Example:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    (arrayJoin(arrayZip(cities, browsers)) AS t).1 AS city,
+    t.2 AS browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           1 │ Istanbul │ Firefox │
+│           1 │ Berlin   │ Chrome  │
+│           1 │ Bobruisk │ Chrome  │
+└─────────────┴──────────┴─────────┘
+```
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index 7d0584b9bdf..7e2412340e7 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -266,8 +266,8 @@ Result:
 └────────────────┘
 ```
 
-:::note    
-The return type `toStartOf*` functions described below is `Date` or `DateTime`. Though these functions can take `DateTime64` as an argument, passing them a `DateTime64` that is out of the normal range (years 1925 - 2283) will give an incorrect result.
+:::note
+The return type `toStartOf*` functions described below is `Date` or `DateTime`. Though these functions can take `DateTime64` as an argument, passing them a `DateTime64` that is out of the normal range (years 1900 - 2299) will give an incorrect result.
 :::
 
 ## toStartOfYear
@@ -291,7 +291,7 @@ Returns the date.
 Rounds down a date or date with time to the first day of the month.
 Returns the date.
 
-:::note    
+:::note
 The behavior of parsing incorrect dates is implementation specific. ClickHouse may return zero date, throw an exception or do “natural” overflow.
 :::
 
diff --git a/docs/en/sql-reference/functions/type-conversion-functions.md b/docs/en/sql-reference/functions/type-conversion-functions.md
index c51445675f5..ecdf34bf7ee 100644
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@@ -218,23 +218,23 @@ SELECT toDate32('1955-01-01') AS value, toTypeName(value);
 2. The value is outside the range:
 
 ``` sql
-SELECT toDate32('1924-01-01') AS value, toTypeName(value);
+SELECT toDate32('1899-01-01') AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
-│ 1925-01-01 │ Date32                             │
+┌──────value─┬─toTypeName(toDate32('1899-01-01'))─┐
+│ 1900-01-01 │ Date32                             │
 └────────────┴────────────────────────────────────┘
 ```
 
 3. With `Date`-type argument:
 
 ``` sql
-SELECT toDate32(toDate('1924-01-01')) AS value, toTypeName(value);
+SELECT toDate32(toDate('1899-01-01')) AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32(toDate('1924-01-01')))─┐
+┌──────value─┬─toTypeName(toDate32(toDate('1899-01-01')))─┐
 │ 1970-01-01 │ Date32                                     │
 └────────────┴────────────────────────────────────────────┘
 ```
@@ -248,14 +248,14 @@ The same as [toDate32](#todate32) but returns the min value of [Date32](../../sq
 Query:
 
 ``` sql
-SELECT toDate32OrZero('1924-01-01'), toDate32OrZero('');
+SELECT toDate32OrZero('1899-01-01'), toDate32OrZero('');
 ```
 
 Result:
 
 ``` text
-┌─toDate32OrZero('1924-01-01')─┬─toDate32OrZero('')─┐
-│                   1925-01-01 │         1925-01-01 │
+┌─toDate32OrZero('1899-01-01')─┬─toDate32OrZero('')─┐
+│                   1900-01-01 │         1900-01-01 │
 └──────────────────────────────┴────────────────────┘
 ```
 
@@ -1072,7 +1072,7 @@ For all of the formats with separator the function parses months names expressed
 Query:
 
 ``` sql
-SELECT parseDateTimeBestEffort('12/12/2020 12:12:57')
+SELECT parseDateTimeBestEffort('23/10/2020 12:12:57')
 AS parseDateTimeBestEffort;
 ```
 
@@ -1080,7 +1080,7 @@ Result:
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2020-12-12 12:12:57 │
+│     2020-10-23 12:12:57 │
 └─────────────────────────┘
 ```
 
@@ -1117,7 +1117,7 @@ Result:
 Query:
 
 ``` sql
-SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
+SELECT parseDateTimeBestEffort('2018-10-23 10:12:12')
 AS parseDateTimeBestEffort;
 ```
 
@@ -1125,7 +1125,7 @@ Result:
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2018-12-12 10:12:12 │
+│     2018-10-23 10:12:12 │
 └─────────────────────────┘
 ```
 
@@ -1152,77 +1152,7 @@ Result:
 
 ## parseDateTimeBestEffortUS
 
-This function is similar to [parseDateTimeBestEffort](#parsedatetimebesteffort), the only difference is that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity.
-
-**Syntax**
-
-``` sql
-parseDateTimeBestEffortUS(time_string [, time_zone])
-```
-
-**Arguments**
-
--   `time_string` — String containing a date and time to convert. [String](../../sql-reference/data-types/string.md).
--   `time_zone` — Time zone. The function parses `time_string` according to the time zone. [String](../../sql-reference/data-types/string.md).
-
-**Supported non-standard formats**
-
--   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   A string with a date and a time component: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` etc.
--   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case, `YYYY-MM` are substituted as `2000-01`.
--   A string that includes the date and time along with time zone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
-
-**Returned value**
-
--   `time_string` converted to the `DateTime` data type.
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09/12/2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09-12-2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09.12.2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
+This function behaves like [parseDateTimeBestEffort](#parsedatetimebesteffort) for ISO date formats, e.g. `YYYY-MM-DD hh:mm:ss`, and other date formats where the month and date components can be unambiguously extracted, e.g. `YYYYMMDDhhmmss`, `YYYY-MM`, `DD hh`, or `YYYY-MM-DD hh:mm:ss ±h:mm`. If the month and the date components cannot be unambiguously extracted, e.g. `MM/DD/YYYY`, `MM-DD-YYYY`, or `MM-DD-YY`, it prefers the US date format instead of `DD/MM/YYYY`, `DD-MM-YYYY`, or `DD-MM-YY`. As an exception from the latter, if the month is bigger than 12 and smaller or equal than 31, this function falls back to the behavior of [parseDateTimeBestEffort](#parsedatetimebesteffort), e.g. `15/08/2020` is parsed as `2020-08-15`.
 
 ## parseDateTimeBestEffortOrNull
 ## parseDateTime32BestEffortOrNull
@@ -1238,174 +1168,10 @@ Same as for [parseDateTimeBestEffort](#parsedatetimebesteffort) except that it r
 
 Same as [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS) function except that it returns `NULL` when it encounters a date format that cannot be processed.
 
-**Syntax**
-
-``` sql
-parseDateTimeBestEffortUSOrNull(time_string[, time_zone])
-```
-
-**Parameters**
-
--   `time_string` — String containing a date or date with time to convert. The date must be in the US date format (`MM/DD/YYYY`, etc). [String](../../sql-reference/data-types/string.md).
--   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
-
-**Supported non-standard formats**
-
--   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   A string with a date and a time components: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY`, etc.
--   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case, `YYYY-MM` are substituted with `2000-01`.
--   A string that includes date and time along with timezone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
-
-**Returned values**
-
--   `time_string` converted to the [DateTime](../../sql-reference/data-types/datetime.md) data type.
--   `NULL` if the input string cannot be converted to the `DateTime` data type.
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-10 21:12:57 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02-10-2021 21:12:57 GMT', 'Asia/Istanbul') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-11 00:12:57 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02.10.2021') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-10 00:00:00 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('10.2021') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│                            ᴺᵁᴸᴸ │
-└─────────────────────────────────┘
-```
-
 ## parseDateTimeBestEffortUSOrZero
 
 Same as [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS) function except that it returns zero date (`1970-01-01`) or zero date with time (`1970-01-01 00:00:00`) when it encounters a date format that cannot be processed.
 
-**Syntax**
-
-``` sql
-parseDateTimeBestEffortUSOrZero(time_string[, time_zone])
-```
-
-**Parameters**
-
--   `time_string` — String containing a date or date with time to convert. The date must be in the US date format (`MM/DD/YYYY`, etc). [String](../../sql-reference/data-types/string.md).
--   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
-
-**Supported non-standard formats**
-
--   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   A string with a date and a time components: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY`, etc.
--   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case, `YYYY-MM` are substituted with `2000-01`.
--   A string that includes date and time along with timezone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
-
-**Returned values**
-
--   `time_string` converted to the [DateTime](../../sql-reference/data-types/datetime.md) data type.
--   Zero date or zero date with time if the input string cannot be converted to the `DateTime` data type.
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-10 21:12:57 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02-10-2021 21:12:57 GMT', 'Asia/Istanbul') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-11 00:12:57 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02.10.2021') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-10 00:00:00 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02.2021') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             1970-01-01 00:00:00 │
-└─────────────────────────────────┘
-```
-
 ## parseDateTime64BestEffort
 
 Same as [parseDateTimeBestEffort](#parsedatetimebesteffort) function but also parse milliseconds and microseconds and returns [DateTime](../../sql-reference/functions/type-conversion-functions.md#data_type-datetime) data type.
@@ -1452,18 +1218,30 @@ Result:
 └────────────────────────────┴────────────────────────────────┘
 ```
 
+## parseDateTime64BestEffortUS
+
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort), except that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity.
+
 ## parseDateTime64BestEffortOrNull
 
 Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort) except that it returns `NULL` when it encounters a date format that cannot be processed.
 
 ## parseDateTime64BestEffortOrZero
 
-Same as for [parseDateTime64BestEffort](#parsedatetimebesteffort) except that it returns zero date or zero date time when it encounters a date format that cannot be processed.
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort) except that it returns zero date or zero date time when it encounters a date format that cannot be processed.
+
+## parseDateTime64BestEffortUSOrNull
+
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort), except that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity and returns `NULL` when it encounters a date format that cannot be processed.
+
+## parseDateTime64BestEffortUSOrZero
+
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort), except that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity and returns zero date or zero date time when it encounters a date format that cannot be processed.
 
 
 ## toLowCardinality
 
-Converts input parameter to the [LowCardianlity](../../sql-reference/data-types/lowcardinality.md) version of same data type.
+Converts input parameter to the [LowCardinality](../../sql-reference/data-types/lowcardinality.md) version of same data type.
 
 To convert data from the `LowCardinality` data type use the [CAST](#type_conversion_function-cast) function. For example, `CAST(x as String)`.
 
diff --git a/docs/en/sql-reference/statements/create/user.md b/docs/en/sql-reference/statements/create/user.md
index feda8459104..3837c60deb1 100644
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/sql-reference/statements/create/user.md
@@ -1,6 +1,9 @@
 ---
 sidebar_position: 39
 sidebar_label: USER
+tags:
+  - create user
+  - add user
 ---
 
 # CREATE USER
diff --git a/docs/en/sql-reference/table-functions/index.md b/docs/en/sql-reference/table-functions/index.md
index a51312324f0..95c0d2f8494 100644
--- a/docs/en/sql-reference/table-functions/index.md
+++ b/docs/en/sql-reference/table-functions/index.md
@@ -9,13 +9,13 @@ Table functions are methods for constructing tables.
 
 You can use table functions in:
 
--   [FROM](../../sql-reference/statements/select/from.md) clause of the `SELECT` query.
+-  [FROM](../../sql-reference/statements/select/from.md) clause of the `SELECT` query.
 
-        The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
+   The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
 
 -   [CREATE TABLE AS table_function()](../../sql-reference/statements/create/table.md) query.
 
-        It's one of the methods of creating a table.
+   It's one of the methods of creating a table.
 
 -   [INSERT INTO TABLE FUNCTION](../../sql-reference/statements/insert-into.md#inserting-into-table-function) query.
 
@@ -38,4 +38,3 @@ You can’t use table functions if the [allow_ddl](../../operations/settings/per
 | [s3](../../sql-reference/table-functions/s3.md)                  | Creates a [S3](../../engines/table-engines/integrations/s3.md)-engine table.                                                           |
 | [sqlite](../../sql-reference/table-functions/sqlite.md)          | Creates a [sqlite](../../engines/table-engines/integrations/sqlite.md)-engine table.                                                       |
 
-[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/) <!--hide-->
diff --git a/docs/ru/development/build-osx.md b/docs/ru/development/build-osx.md
index cc6927bebb8..205edce2b78 100644
--- a/docs/ru/development/build-osx.md
+++ b/docs/ru/development/build-osx.md
@@ -8,6 +8,7 @@ sidebar_label: Сборка на Mac OS X
 :::info "Вам не нужно собирать ClickHouse самостоятельно"
      Вы можете установить предварительно собранный ClickHouse, как описано в [Быстром старте](https://clickhouse.com/#quick-start).
      Следуйте инструкциям по установке для `macOS (Intel)` или `macOS (Apple Silicon)`.
+:::
 
 Сборка должна запускаться с x86_64 (Intel) на macOS версии 10.15 (Catalina) и выше в последней версии компилятора Xcode's native AppleClang, Homebrew's vanilla Clang или в GCC-компиляторах.
 
@@ -90,6 +91,7 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
 
 :::info "Note"
     Вам понадобится команда `sudo`.
+:::
 
 1. Создайте файл `/Library/LaunchDaemons/limit.maxfiles.plist` и поместите в него следующее:
 
diff --git a/docs/ru/engines/table-engines/integrations/postgresql.md b/docs/ru/engines/table-engines/integrations/postgresql.md
index f9702930a30..28debaf9c23 100644
--- a/docs/ru/engines/table-engines/integrations/postgresql.md
+++ b/docs/ru/engines/table-engines/integrations/postgresql.md
@@ -49,6 +49,7 @@ PostgreSQL массивы конвертируются в массивы ClickHo
 
 :::info "Внимание"
     Будьте внимательны, в PostgreSQL массивы, созданные как `type_name[]`, являются многомерными и могут содержать в себе разное количество измерений в разных строках одной таблицы. Внутри ClickHouse допустимы только многомерные массивы с одинаковым кол-вом измерений во всех строках таблицы.
+:::
 
 Поддерживает несколько реплик, которые должны быть перечислены через `|`. Например:
 
diff --git a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 6b5d2e862bf..e30e771c4df 100644
--- a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -40,6 +40,7 @@ ORDER BY (CounterID, StartDate, intHash32(UserID));
 
 :::info "Info"
     Не рекомендуется делать слишком гранулированное партиционирование – то есть задавать партиции по столбцу, в котором будет слишком большой разброс значений (речь идет о порядке более тысячи партиций). Это приведет к скоплению большого числа файлов и файловых дескрипторов в системе, что может значительно снизить производительность запросов `SELECT`.
+:::
 
 Чтобы получить набор кусков и партиций таблицы, можно воспользоваться системной таблицей [system.parts](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md#system_tables-parts). В качестве примера рассмотрим таблицу `visits`, в которой задано партиционирование по месяцам. Выполним `SELECT` для таблицы `system.parts`:
 
@@ -80,6 +81,7 @@ WHERE table = 'visits'
 
 :::info "Info"
     Названия кусков для таблиц старого типа образуются следующим образом: `20190117_20190123_2_2_0` (минимальная дата _ максимальная дата _ номер минимального блока _ номер максимального блока _ уровень).
+:::
 
 Как видно из примера выше, таблица содержит несколько отдельных кусков для одной и той же партиции (например, куски `201901_1_3_1` и `201901_1_9_2` принадлежат партиции `201901`). Это означает, что эти куски еще не были объединены – в файловой системе они хранятся отдельно. После того как будет выполнено автоматическое слияние данных (выполняется примерно спустя 10 минут после вставки данных), исходные куски будут объединены в один более крупный кусок и помечены как неактивные.
 
diff --git a/docs/ru/faq/general/dbms-naming.md b/docs/ru/faq/general/dbms-naming.md
index 9bc036cc2e4..dd58d89924e 100644
--- a/docs/ru/faq/general/dbms-naming.md
+++ b/docs/ru/faq/general/dbms-naming.md
@@ -14,3 +14,4 @@ sidebar_position: 10
 
 :::info "Забавный факт"
     Спустя годы после того, как ClickHouse получил свое название, принцип комбинирования двух слов, каждое из которых имеет подходящий смысл, был признан лучшим способом назвать базу данных в [исследовании Andy Pavlo](https://www.cs.cmu.edu/~pavlo/blog/2020/03/on-naming-a-database-management-system.html), Associate Professor of Databases в Carnegie Mellon University. ClickHouse разделил награду "за лучшее название СУБД" с Postgres.
+:::
\ No newline at end of file
diff --git a/docs/ru/faq/general/index.md b/docs/ru/faq/general/index.md
index 81715a64acd..7d34cc643f2 100644
--- a/docs/ru/faq/general/index.md
+++ b/docs/ru/faq/general/index.md
@@ -20,5 +20,6 @@ sidebar_label: Общие вопросы
 
 :::info "Если вы не нашли то, что искали:"
     Загляните в другие категории F.A.Q. или поищите в остальных разделах документации, ориентируясь по оглавлению слева.
+:::
 
 [Original article](https://clickhouse.com/docs/ru/faq/general/) <!--hide-->
diff --git a/docs/ru/faq/general/why-clickhouse-is-so-fast.md b/docs/ru/faq/general/why-clickhouse-is-so-fast.md
index 0c74cb2cfa2..43b3c818249 100644
--- a/docs/ru/faq/general/why-clickhouse-is-so-fast.md
+++ b/docs/ru/faq/general/why-clickhouse-is-so-fast.md
@@ -60,3 +60,4 @@ sidebar_position: 8
     -   Ориентируйтесь на показатели, собранные при работе с реальными данными.
     -   Проверяйте производительность в процессе CI.
     -   Измеряйте и анализируйте всё, что только возможно.
+:::
diff --git a/docs/ru/faq/integration/index.md b/docs/ru/faq/integration/index.md
index cc917718000..ee01688af6e 100644
--- a/docs/ru/faq/integration/index.md
+++ b/docs/ru/faq/integration/index.md
@@ -15,5 +15,6 @@ sidebar_label: Интеграция
 
 :::info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
+:::
 
 [Original article](https://clickhouse.com/docs/ru/faq/integration/)
diff --git a/docs/ru/faq/operations/index.md b/docs/ru/faq/operations/index.md
index bd5ba13e182..aab31ec3305 100644
--- a/docs/ru/faq/operations/index.md
+++ b/docs/ru/faq/operations/index.md
@@ -14,5 +14,6 @@ sidebar_label: Операции
 
 :::info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
+:::
 
 [Original article](https://clickhouse.com/docs/en/faq/operations/)
diff --git a/docs/ru/getting-started/example-datasets/nyc-taxi.md b/docs/ru/getting-started/example-datasets/nyc-taxi.md
index 991d7dafe05..9d9caa43b5e 100644
--- a/docs/ru/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/ru/getting-started/example-datasets/nyc-taxi.md
@@ -293,6 +293,7 @@ $ clickhouse-client --query "SELECT COUNT(*) FROM datasets.trips_mergetree"
 :::info "Info"
     Если вы собираетесь выполнять запросы, приведенные ниже, то к имени таблицы
 нужно добавить имя базы, `datasets.trips_mergetree`.
+:::
 
 ## Результаты на одном сервере {#rezultaty-na-odnom-servere}
 
diff --git a/docs/ru/getting-started/example-datasets/ontime.md b/docs/ru/getting-started/example-datasets/ontime.md
index b7c4a2f952c..8dab19c7bae 100644
--- a/docs/ru/getting-started/example-datasets/ontime.md
+++ b/docs/ru/getting-started/example-datasets/ontime.md
@@ -157,6 +157,7 @@ $ clickhouse-client --query "SELECT COUNT(*) FROM datasets.ontime"
 :::info "Info"
     Если вы собираетесь выполнять запросы, приведенные ниже, то к имени таблицы
 нужно добавить имя базы, `datasets.ontime`.
+:::
 
 ## Запросы: {#zaprosy}
 
diff --git a/docs/ru/operations/external-authenticators/kerberos.md b/docs/ru/operations/external-authenticators/kerberos.md
index 9575d935836..197bf5a6047 100644
--- a/docs/ru/operations/external-authenticators/kerberos.md
+++ b/docs/ru/operations/external-authenticators/kerberos.md
@@ -99,6 +99,7 @@ ClickHouse предоставляет возможность аутентифи
 
 :::info ""
     Ещё раз отметим, что кроме `users.xml`, необходимо также включить Kerberos в `config.xml`.
+:::
 
 ### Настройка Kerberos через SQL {#enabling-kerberos-using-sql}
 
diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md
index 222c6bccfaf..f1d7280892e 100644
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@@ -174,6 +174,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 :::info "Примечание"
     Жесткое ограничение настраивается с помощью системных инструментов.
+:::
 
 **Пример**
 
@@ -706,6 +707,7 @@ ClickHouse поддерживает динамическое изменение
 
 :::info "Примечание"
 	Параметры этих настроек могут быть изменены во время выполнения запросов и вступят в силу немедленно. Запросы, которые уже запущены, выполнятся без изменений.
+:::
 
 Возможные значения:
 
@@ -726,6 +728,7 @@ ClickHouse поддерживает динамическое изменение
 
 :::info "Примечание"
 	Параметры этих настроек могут быть изменены во время выполнения запросов и вступят в силу немедленно. Запросы, которые уже запущены, выполнятся без изменений.
+:::
 
 Возможные значения:
 
@@ -746,6 +749,7 @@ ClickHouse поддерживает динамическое изменение
 
 :::info "Примечание"
 	Параметры этих настроек могут быть изменены во время выполнения запросов и вступят в силу немедленно. Запросы, которые уже запущены, выполнятся без изменений.
+:::
 
 Возможные значения:
 
diff --git a/docs/ru/operations/system-tables/mutations.md b/docs/ru/operations/system-tables/mutations.md
index f2047745c0c..f3810e29698 100644
--- a/docs/ru/operations/system-tables/mutations.md
+++ b/docs/ru/operations/system-tables/mutations.md
@@ -30,6 +30,7 @@
 
 :::info "Замечание"
     Даже если `parts_to_do = 0`, для реплицированной таблицы возможна ситуация, когда мутация ещё не завершена из-за долго выполняющейся операции `INSERT`, которая добавляет данные, которые нужно будет мутировать.
+:::
 
 Если во время мутации какого-либо куска возникли проблемы, заполняются следующие столбцы:
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md b/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
index f46d7ca6111..49edc3932e0 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
@@ -8,6 +8,7 @@ sidebar_position: 141
 
 :::info "Примечание"
     Чтобы эта функция работала должным образом, исходные данные должны быть отсортированы. В [материализованном представлении](../../../sql-reference/statements/create/view.md#materialized) вместо нее рекомендуется использовать [deltaSumTimestamp](../../../sql-reference/aggregate-functions/reference/deltasumtimestamp.md#agg_functions-deltasumtimestamp).
+:::
 
 **Синтаксис**
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/intervalLengthSum.md b/docs/ru/sql-reference/aggregate-functions/reference/intervalLengthSum.md
index 46dac961639..45b41bd13a3 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/intervalLengthSum.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/intervalLengthSum.md
@@ -20,6 +20,7 @@ intervalLengthSum(start, end)
 
 :::info "Примечание"
     Аргументы должны быть одного типа. В противном случае ClickHouse сгенерирует исключение.
+:::
 
 **Возвращаемое значение**
 
diff --git a/docs/ru/sql-reference/data-types/date32.md b/docs/ru/sql-reference/data-types/date32.md
index 31b2258b70b..1fc5ff6e5e2 100644
--- a/docs/ru/sql-reference/data-types/date32.md
+++ b/docs/ru/sql-reference/data-types/date32.md
@@ -5,7 +5,7 @@ sidebar_label: Date32
 
 # Date32 {#data_type-datetime32}
 
-Дата. Поддерживается такой же диапазон дат, как для типа [Datetime64](../../sql-reference/data-types/datetime64.md). Значение хранится в четырех байтах и соответствует числу дней с 1925-01-01 по 2283-11-11. 
+Дата. Поддерживается такой же диапазон дат, как для типа [Datetime64](../../sql-reference/data-types/datetime64.md). Значение хранится в четырех байтах и соответствует числу дней с 1900-01-01 по 2299-12-31.
 
 **Пример**
 
@@ -36,5 +36,5 @@ SELECT * FROM new;
 
 -   [toDate32](../../sql-reference/functions/type-conversion-functions.md#todate32)
 -   [toDate32OrZero](../../sql-reference/functions/type-conversion-functions.md#todate32-or-zero)
--   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null) 
+-   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null)
 
diff --git a/docs/ru/sql-reference/data-types/datetime64.md b/docs/ru/sql-reference/data-types/datetime64.md
index 8428c5b7309..0473d8256e9 100644
--- a/docs/ru/sql-reference/data-types/datetime64.md
+++ b/docs/ru/sql-reference/data-types/datetime64.md
@@ -18,7 +18,7 @@ DateTime64(precision, [timezone])
 
 Данные хранятся в виде количества ‘тиков’, прошедших с момента начала эпохи (1970-01-01 00:00:00 UTC), в Int64. Размер тика определяется параметром precision. Дополнительно, тип `DateTime64` позволяет хранить часовой пояс, единый для всей колонки, который влияет на то, как будут отображаться значения типа `DateTime64` в текстовом виде и как будут парситься значения заданные в виде строк (‘2020-01-01 05:00:01.000’). Часовой пояс не хранится в строках таблицы (выборки), а хранится в метаданных колонки. Подробнее см. [DateTime](datetime.md).
 
-Диапазон значений: \[1925-01-01 00:00:00, 2283-11-11 23:59:59.99999999\] (Примечание: Точность максимального значения составляет 8).
+Диапазон значений: \[1900-01-01 00:00:00, 2299-12-31 23:59:59.99999999\] (Примечание: Точность максимального значения составляет 8).
 
 ## Примеры {#examples}
 
diff --git a/docs/ru/sql-reference/data-types/nullable.md b/docs/ru/sql-reference/data-types/nullable.md
index f018409772d..31a3674af6b 100644
--- a/docs/ru/sql-reference/data-types/nullable.md
+++ b/docs/ru/sql-reference/data-types/nullable.md
@@ -26,6 +26,7 @@ sidebar_label: Nullable
 
 :::info "Info"
     Почти всегда использование `Nullable` снижает производительность, учитывайте это при проектировании своих баз.
+:::
 
 ## Поиск NULL {#finding-null}
 
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index ac03dd39047..a80fedfbb24 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -464,6 +464,7 @@ SOURCE(ODBC(
 
 :::info "Примечание"
     Поля `table` и `query` не могут быть использованы вместе. Также обязательно должен быть один из источников данных: `table` или `query`.
+:::
 
 ClickHouse получает от ODBC-драйвера информацию о квотировании и квотирует настройки в запросах к драйверу, поэтому имя таблицы нужно указывать в соответствии с регистром имени таблицы в базе данных.
 
@@ -543,6 +544,7 @@ SOURCE(MYSQL(
 :::info "Примечание"
     Поля `table` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `table` или `query`.
     Явный параметр `secure` отсутствует. Автоматически поддержана работа в обоих случаях: когда установка SSL-соединения необходима и когда нет.
+:::
 
 MySQL можно подключить на локальном хосте через сокеты, для этого необходимо задать `host` и `socket`.
 
@@ -633,6 +635,7 @@ SOURCE(CLICKHOUSE(
 
 :::info "Примечание"
     Поля `table` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `table` или `query`.
+:::
 
 ### MongoDB {#dicts-external_dicts_dict_sources-mongodb}
 
@@ -748,6 +751,7 @@ SOURCE(REDIS(
 
 :::info "Примечание"
     Поля `column_family` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `column_family` или `query`.
+:::
 
 ### PostgreSQL {#dicts-external_dicts_dict_sources-postgresql}
 
@@ -804,3 +808,4 @@ SOURCE(POSTGRESQL(
 
 :::info "Примечание"
     Поля `table` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `table` или `query`.
+:::
diff --git a/docs/ru/sql-reference/functions/arithmetic-functions.md b/docs/ru/sql-reference/functions/arithmetic-functions.md
index c8f2e31cb0b..ba4340093b4 100644
--- a/docs/ru/sql-reference/functions/arithmetic-functions.md
+++ b/docs/ru/sql-reference/functions/arithmetic-functions.md
@@ -56,7 +56,7 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 ## modulo(a, b), оператор a % b {#modulo}
 
 Вычисляет остаток от деления.
-Если аргументы - числа с плавающей запятой, то они предварительно преобразуются в целые числа, путём отбрасывания дробной части.
+Тип результата - целое число, если оба аргумента - целые числа. Если один из аргументов является числом с плавающей точкой, результатом будет число с плавающей точкой.
 Берётся остаток в том же смысле, как это делается в C++. По факту, для отрицательных чисел, используется truncated division.
 При делении на ноль или при делении минимального отрицательного числа на минус единицу, кидается исключение.
 
diff --git a/docs/ru/sql-reference/functions/array-join.md b/docs/ru/sql-reference/functions/array-join.md
index c35821b7f48..330a22f6553 100644
--- a/docs/ru/sql-reference/functions/array-join.md
+++ b/docs/ru/sql-reference/functions/array-join.md
@@ -9,15 +9,11 @@ sidebar_label: "Функция ArrayJoin"
 
 Обычные функции не изменяют множество строк, а лишь изменяют значения в каждой строке (map).
 Агрегатные функции выполняют свёртку множества строк (fold, reduce).
-Функция arrayJoin выполняет размножение каждой строки в множество строк (unfold).
+Функция `arrayJoin` выполняет размножение каждой строки в множество строк (unfold).
 
 Функция принимает в качестве аргумента массив, и размножает исходную строку в несколько строк - по числу элементов массива.
 Все значения в столбцах просто копируются, кроме значения в столбце с применением этой функции - он заменяется на соответствующее значение массива.
 
-В запросе может быть использовано несколько функций `arrayJoin`. В этом случае, соответствующее преобразование делается несколько раз.
-
-Обратите внимание на синтаксис ARRAY JOIN в запросе SELECT, который предоставляет более широкие возможности.
-
 Пример:
 
 ``` sql
@@ -32,3 +28,112 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
 └─────┴───────────┴─────────┘
 ```
 
+Функция `arrayJoin` влияет на все секции запроса, включая секцию `WHERE`. Обратите внимание на результат 2, хотя подзапрос вернул 1 строку.
+
+Пример:
+
+```sql
+SELECT sum(1) AS impressions
+FROM
+(
+    SELECT ['Istanbul', 'Berlin', 'Bobruisk'] AS cities
+)
+WHERE arrayJoin(cities) IN ['Istanbul', 'Berlin'];
+```
+
+``` text
+┌─impressions─┐
+│           2 │
+└─────────────┘
+```
+
+В запросе может быть использовано несколько функций `arrayJoin`. В этом случае, соответствующее преобразование делается несколько раз и строки перемножаются.
+
+Пример:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    arrayJoin(cities) AS city,
+    arrayJoin(browsers) AS browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           2 │ Istanbul │ Chrome  │
+│           1 │ Istanbul │ Firefox │
+│           2 │ Berlin   │ Chrome  │
+│           1 │ Berlin   │ Firefox │
+│           2 │ Bobruisk │ Chrome  │
+│           1 │ Bobruisk │ Firefox │
+└─────────────┴──────────┴─────────┘
+```
+
+Обратите внимание на синтаксис [ARRAY JOIN](../statements/select/array-join.md) в запросе SELECT, который предоставляет более широкие возможности.
+`ARRAY JOIN` позволяет преобразовать несколько массивов с одинаковым количеством элементов за раз.
+
+Пример:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    city,
+    browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+ARRAY JOIN
+    cities AS city,
+    browsers AS browser
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           1 │ Istanbul │ Firefox │
+│           1 │ Berlin   │ Chrome  │
+│           1 │ Bobruisk │ Chrome  │
+└─────────────┴──────────┴─────────┘
+```
+
+Или можно использовать [Tuple](../data-types/tuple.md)
+
+Пример:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    (arrayJoin(arrayZip(cities, browsers)) AS t).1 AS city,
+    t.2 AS browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           1 │ Istanbul │ Firefox │
+│           1 │ Berlin   │ Chrome  │
+│           1 │ Bobruisk │ Chrome  │
+└─────────────┴──────────┴─────────┘
+```
diff --git a/docs/ru/sql-reference/functions/date-time-functions.md b/docs/ru/sql-reference/functions/date-time-functions.md
index 5a214fe2664..c9371e361bc 100644
--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@@ -57,7 +57,7 @@ toTimezone(value, timezone)
 **Аргументы**
 
 -   `value` — время или дата с временем. [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `timezone` — часовой пояс для возвращаемого значения. [String](../../sql-reference/data-types/string.md). Этот аргумент является константой, потому что `toTimezone` изменяет часовой пояс столбца (часовой пояс является атрибутом типов `DateTime*`). 
+-   `timezone` — часовой пояс для возвращаемого значения. [String](../../sql-reference/data-types/string.md). Этот аргумент является константой, потому что `toTimezone` изменяет часовой пояс столбца (часовой пояс является атрибутом типов `DateTime*`).
 
 **Возвращаемое значение**
 
@@ -267,7 +267,7 @@ SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp;
 ```
 
     :::note "Attention"
-    `Date` или `DateTime` это возвращаемый тип функций `toStartOf*`, который описан ниже. Несмотря на то, что эти функции могут принимать `DateTime64` в качестве аргумента, если переданное значение типа `DateTime64` выходит за пределы нормального диапазона (с 1925 по 2283 год), то это даст неверный результат.
+    `Date` или `DateTime` это возвращаемый тип функций `toStartOf*`, который описан ниже. Несмотря на то, что эти функции могут принимать `DateTime64` в качестве аргумента, если переданное значение типа `DateTime64` выходит за пределы нормального диапазона (с 1900 по 2299 год), то это даст неверный результат.
     :::
 ## toStartOfYear {#tostartofyear}
 
diff --git a/docs/ru/sql-reference/functions/geo/geohash.md b/docs/ru/sql-reference/functions/geo/geohash.md
index fe853cef267..933775dcfbe 100644
--- a/docs/ru/sql-reference/functions/geo/geohash.md
+++ b/docs/ru/sql-reference/functions/geo/geohash.md
@@ -86,6 +86,7 @@ geohashesInBox(longitude_min, latitude_min, longitude_max, latitude_max, precisi
 
 :::info "Замечание"
     Все передаваемые координаты должны быть одного и того же типа: либо `Float32`, либо `Float64`.
+:::
 
 **Возвращаемые значения**
 
@@ -96,6 +97,7 @@ geohashesInBox(longitude_min, latitude_min, longitude_max, latitude_max, precisi
 
 :::info "Замечание"
     Если возвращаемый массив содержит свыше 10 000 000 элементов, функция сгенерирует исключение.
+:::
 
 **Пример**
 
diff --git a/docs/ru/sql-reference/functions/type-conversion-functions.md b/docs/ru/sql-reference/functions/type-conversion-functions.md
index 946abddf3d0..7635bda78e6 100644
--- a/docs/ru/sql-reference/functions/type-conversion-functions.md
+++ b/docs/ru/sql-reference/functions/type-conversion-functions.md
@@ -209,7 +209,7 @@ SELECT toDate32('1955-01-01') AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
+┌──────value─┬─toTypeName(toDate32('1955-01-01'))─┐
 │ 1955-01-01 │ Date32                             │
 └────────────┴────────────────────────────────────┘
 ```
@@ -217,23 +217,23 @@ SELECT toDate32('1955-01-01') AS value, toTypeName(value);
 2. Значение выходит за границы диапазона:
 
 ``` sql
-SELECT toDate32('1924-01-01') AS value, toTypeName(value);
+SELECT toDate32('1899-01-01') AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
-│ 1925-01-01 │ Date32                             │
+┌──────value─┬─toTypeName(toDate32('1899-01-01'))─┐
+│ 1900-01-01 │ Date32                             │
 └────────────┴────────────────────────────────────┘
 ```
 
 3. С аргументом типа `Date`:
 
 ``` sql
-SELECT toDate32(toDate('1924-01-01')) AS value, toTypeName(value);
+SELECT toDate32(toDate('1899-01-01')) AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32(toDate('1924-01-01')))─┐
+┌──────value─┬─toTypeName(toDate32(toDate('1899-01-01')))─┐
 │ 1970-01-01 │ Date32                                     │
 └────────────┴────────────────────────────────────────────┘
 ```
@@ -247,14 +247,14 @@ SELECT toDate32(toDate('1924-01-01')) AS value, toTypeName(value);
 Запрос:
 
 ``` sql
-SELECT toDate32OrZero('1924-01-01'), toDate32OrZero('');
+SELECT toDate32OrZero('1899-01-01'), toDate32OrZero('');
 ```
 
 Результат:
 
 ``` text
-┌─toDate32OrZero('1924-01-01')─┬─toDate32OrZero('')─┐
-│                   1925-01-01 │         1925-01-01 │
+┌─toDate32OrZero('1899-01-01')─┬─toDate32OrZero('')─┐
+│                   1900-01-01 │         1900-01-01 │
 └──────────────────────────────┴────────────────────┘
 ```
 
@@ -994,7 +994,7 @@ parseDateTimeBestEffort(time_string[, time_zone])
 Запрос:
 
 ``` sql
-SELECT parseDateTimeBestEffort('12/12/2020 12:12:57')
+SELECT parseDateTimeBestEffort('23/10/2020 12:12:57')
 AS parseDateTimeBestEffort;
 ```
 
@@ -1002,7 +1002,7 @@ AS parseDateTimeBestEffort;
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2020-12-12 12:12:57 │
+│     2020-10-23 12:12:57 │
 └─────────────────────────┘
 ```
 
@@ -1039,7 +1039,7 @@ AS parseDateTimeBestEffort;
 Запрос:
 
 ``` sql
-SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
+SELECT parseDateTimeBestEffort('2018-10-23 10:12:12')
 AS parseDateTimeBestEffort;
 ```
 
@@ -1047,7 +1047,7 @@ AS parseDateTimeBestEffort;
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2018-12-12 10:12:12 │
+│     2018-10-23 10:12:12 │
 └─────────────────────────┘
 ```
 
@@ -1074,77 +1074,7 @@ SELECT parseDateTimeBestEffort('10 20:19');
 
 ## parseDateTimeBestEffortUS {#parsedatetimebesteffortUS}
 
-Эта функция похожа на [‘parseDateTimeBestEffort’](#parsedatetimebesteffort), но разница состоит в том, что в она предполагает американский формат даты (`MM/DD/YYYY` etc.) в случае неоднозначности.
-
-**Синтаксис**
-
-``` sql
-parseDateTimeBestEffortUS(time_string [, time_zone])
-```
-
-**Аргументы**
-
--   `time_string` — строка, содержащая дату и время для преобразования. [String](../../sql-reference/data-types/string.md).
--   `time_zone` — часовой пояс. Функция анализирует `time_string` в соответствии с часовым поясом. [String](../../sql-reference/data-types/string.md).
-
-**Поддерживаемые нестандартные форматы**
-
--   Строка, содержащая 9-10 цифр [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   Строка, содержащая дату и время: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   Строка с датой, но без времени: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` etc.
--   Строка, содержащая день и время: `DD`, `DD hh`, `DD hh:mm`. В этом случае `YYYY-MM` заменяется на `2000-01`.
--   Строка, содержащая дату и время, а также информацию о часовом поясе: `YYYY-MM-DD hh:mm:ss ±h:mm` и т.д. Например, `2020-12-12 17:36:00 -5:00`.
-
-**Возвращаемое значение**
-
--   `time_string` преобразован в тип данных `DateTime`.
-
-**Примеры**
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09/12/2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09-12-2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09.12.2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
+Эта функция ведет себя как [parseDateTimeBestEffort](#parsedatetimebesteffort) для форматов даты ISO, например, `YYYY-MM-DD hh:mm:ss`, и других форматов даты, где компоненты месяца и дня могут быть однозначно выделены, например, `YYYYMMDDhhmmss`, `YYYY-MM`, `DD hh`, или `YYYY-MM-DD hh:mm:ss ±h:mm`. Если месяц и день не могут быть однозначно выделены, например, `MM/DD/YYY`, `MM-DD-YYYY` или `MM-DD-YY`, то вместо `DD/MM/YYY`, `DD-MM-YYYY` или `DD-MM-YY` предпочитается формат даты США. Впрочем, если номер месяца был бы больше 12 и меньше или равен 31, эта функция возвращается к поведению [parseDateTimeBestEffort](#parsedatetimebesteffort), т.е. `15/08/2020` будет разобрано как `2020-08-15`.
 
 ## parseDateTimeBestEffortOrNull {#parsedatetimebesteffortornull}
 ## parseDateTime32BestEffortOrNull {#parsedatetime32besteffortornull}
@@ -1160,174 +1090,10 @@ AS parseDateTimeBestEffortUS;
 
 Работает аналогично функции [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS), но в отличие от нее возвращает `NULL`, если входная строка не может быть преобразована в тип данных [DateTime](../../sql-reference/data-types/datetime.md).
 
-**Синтаксис**
-
-``` sql
-parseDateTimeBestEffortUSOrNull(time_string[, time_zone])
-```
-
-**Аргументы**
-
--   `time_string` — строка, содержащая дату или дату со временем для преобразования. Дата должна быть в американском формате (`MM/DD/YYYY` и т.д.). [String](../../sql-reference/data-types/string.md).
--   `time_zone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Функция анализирует `time_string` в соответствии с заданным часовым поясом. Опциональный параметр. [String](../../sql-reference/data-types/string.md).
-
-**Поддерживаемые нестандартные форматы**
-
--   Строка в формате [unix timestamp](https://en.wikipedia.org/wiki/Unix_time), содержащая 9-10 цифр.
--   Строка, содержащая дату и время: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss` и т.д.
--   Строка, содержащая дату без времени: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` и т.д.
--   Строка, содержащая день и время: `DD`, `DD hh`, `DD hh:mm`. В этом случае `YYYY-MM` заменяется на `2000-01`.
--   Строка, содержащая дату и время, а также информацию о часовом поясе: `YYYY-MM-DD hh:mm:ss ±h:mm` и т.д. Например, `2020-12-12 17:36:00 -5:00`.
-
-**Возвращаемые значения**
-
--   `time_string`, преобразованная в тип данных `DateTime`.
--   `NULL`, если входная строка не может быть преобразована в тип данных `DateTime`.
-
-**Примеры**
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-10 21:12:57 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02-10-2021 21:12:57 GMT', 'Europe/Moscow') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-11 00:12:57 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02.10.2021') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-10 00:00:00 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('10.2021') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│                            ᴺᵁᴸᴸ │
-└─────────────────────────────────┘
-```
-
 ## parseDateTimeBestEffortUSOrZero {#parsedatetimebesteffortusorzero}
 
 Работает аналогично функции [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS), но в отличие от нее возвращает нулевую дату (`1970-01-01`) или нулевую дату со временем (`1970-01-01 00:00:00`), если входная строка не может быть преобразована в тип данных [DateTime](../../sql-reference/data-types/datetime.md).
 
-**Синтаксис**
-
-``` sql
-parseDateTimeBestEffortUSOrZero(time_string[, time_zone])
-```
-
-**Аргументы**
-
--   `time_string` — строка, содержащая дату или дату со временем для преобразования. Дата должна быть в американском формате (`MM/DD/YYYY` и т.д.). [String](../../sql-reference/data-types/string.md).
--   `time_zone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Функция анализирует `time_string` в соответствии с заданным часовым поясом. Опциональный параметр. [String](../../sql-reference/data-types/string.md).
-
-**Поддерживаемые нестандартные форматы**
-
--   Строка в формате [unix timestamp](https://en.wikipedia.org/wiki/Unix_time), содержащая 9-10 цифр.
--   Строка, содержащая дату и время: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss` и т.д.
--   Строка, содержащая дату без времени: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` и т.д.
--   Строка, содержащая день и время: `DD`, `DD hh`, `DD hh:mm`. В этом случае `YYYY-MM` заменяется на `2000-01`.
--   Строка, содержащая дату и время, а также информацию о часовом поясе: `YYYY-MM-DD hh:mm:ss ±h:mm` и т.д. Например, `2020-12-12 17:36:00 -5:00`.
-
-**Возвращаемые значения**
-
--   `time_string`, преобразованная в тип данных `DateTime`.
--   Нулевая дата или нулевая дата со временем, если входная строка не может быть преобразована в тип данных `DateTime`.
-
-**Примеры**
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-10 21:12:57 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02-10-2021 21:12:57 GMT', 'Europe/Moscow') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-11 00:12:57 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02.10.2021') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-10 00:00:00 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02.2021') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             1970-01-01 00:00:00 │
-└─────────────────────────────────┘
-```
-
 ## parseDateTime64BestEffort {#parsedatetime64besteffort}
 
 Работает аналогично функции [parseDateTimeBestEffort](#parsedatetimebesteffort), но также принимает миллисекунды и микросекунды. Возвращает тип данных [DateTime](../../sql-reference/functions/type-conversion-functions.md#data_type-datetime).
@@ -1374,17 +1140,29 @@ FORMAT PrettyCompactMonoBlock;
 └────────────────────────────┴────────────────────────────────┘
 ```
 
-## parseDateTime64BestEffortOrNull {#parsedatetime32besteffortornull}
+## parseDateTime64BestEffortUS {#parsedatetime64besteffortus}
+
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но разница состоит в том, что в она предполагает американский формат даты (`MM/DD/YYYY` etc.) в случае неоднозначности.
+
+## parseDateTime64BestEffortOrNull {#parsedatetime64besteffortornull}
 
 Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но возвращает `NULL`, если формат даты не может быть обработан.
 
 ## parseDateTime64BestEffortOrZero {#parsedatetime64besteffortorzero}
 
-Работает аналогично функции [parseDateTime64BestEffort](#parsedatetimebesteffort), но возвращает нулевую дату и время, если формат даты не может быть обработан.
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но возвращает нулевую дату и время, если формат даты не может быть обработан.
+
+## parseDateTime64BestEffortUSOrNull {#parsedatetime64besteffortusornull}
+
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но разница состоит в том, что в она предполагает американский формат даты (`MM/DD/YYYY` etc.) в случае неоднозначности и возвращает `NULL`, если формат даты не может быть обработан.
+
+## parseDateTime64BestEffortUSOrZero {#parsedatetime64besteffortusorzero}
+
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но разница состоит в том, что в она предполагает американский формат даты (`MM/DD/YYYY` etc.) в случае неоднозначности и возвращает нулевую дату и время, если формат даты не может быть обработан.
 
 ## toLowCardinality {#tolowcardinality}
 
-Преобразует входные данные в версию [LowCardianlity](../data-types/lowcardinality.md) того же типа данных.
+Преобразует входные данные в версию [LowCardinality](../data-types/lowcardinality.md) того же типа данных.
 
 Чтобы преобразовать данные из типа `LowCardinality`, используйте функцию [CAST](#type_conversion_function-cast). Например, `CAST(x as String)`.
 
@@ -1431,6 +1209,7 @@ SELECT toLowCardinality('1');
 
 :::info "Примечание"
     Возвращаемое значение — это временная метка в UTC, а не в часовом поясе `DateTime64`.
+:::
 
 **Синтаксис**
 
diff --git a/docs/ru/sql-reference/statements/alter/index.md b/docs/ru/sql-reference/statements/alter/index.md
index fd3f6c8adf6..0191c794e9c 100644
--- a/docs/ru/sql-reference/statements/alter/index.md
+++ b/docs/ru/sql-reference/statements/alter/index.md
@@ -25,7 +25,7 @@ ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN
 -   [CONSTRAINT](../../../sql-reference/statements/alter/constraint.md)
 -   [TTL](../../../sql-reference/statements/alter/ttl.md)
 
-    :::note 
+    :::note
     Запрос `ALTER TABLE` поддерживается только для таблиц типа `*MergeTree`, а также `Merge` и `Distributed`. Запрос имеет несколько вариантов.
     :::
 Следующие запросы `ALTER` управляют представлениями:
@@ -77,5 +77,6 @@ ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 
 :::info "Примечание"
     Для всех запросов `ALTER` при `replication_alter_partitions_sync = 2` и неактивности некоторых реплик больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, генерируется исключение `UNFINISHED`.
+:::
 
 Для запросов `ALTER TABLE ... UPDATE|DELETE` синхронность выполнения определяется настройкой [mutations_sync](../../../operations/settings/settings.md#mutations_sync).
diff --git a/docs/ru/sql-reference/statements/create/user.md b/docs/ru/sql-reference/statements/create/user.md
index d7da1748821..683e56a61b3 100644
--- a/docs/ru/sql-reference/statements/create/user.md
+++ b/docs/ru/sql-reference/statements/create/user.md
@@ -56,6 +56,7 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1]
 
 :::info "Внимание"
     ClickHouse трактует конструкцию `user_name@'address'` как имя пользователя целиком. То есть технически вы можете создать несколько пользователей с одинаковыми `user_name`, но разными частями конструкции после `@`, но лучше так не делать.
+:::
 
 ## Секция GRANTEES {#grantees}
 
diff --git a/docs/ru/sql-reference/statements/create/view.md b/docs/ru/sql-reference/statements/create/view.md
index 9a2db0ac2de..a0193cea21c 100644
--- a/docs/ru/sql-reference/statements/create/view.md
+++ b/docs/ru/sql-reference/statements/create/view.md
@@ -88,6 +88,7 @@ LIVE-представления работают по тому же принци
     - `LIVE VIEW` не обновляется, если в исходном запросе используются несколько таблиц.
 
     В случаях, когда `LIVE VIEW` не обновляется автоматически, чтобы обновлять его принудительно с заданной периодичностью, используйте [WITH REFRESH](#live-view-with-refresh).
+:::
 
 ### Отслеживание изменений LIVE-представлений {#live-view-monitoring}
 
diff --git a/docs/ru/sql-reference/statements/optimize.md b/docs/ru/sql-reference/statements/optimize.md
index b0b71ae412c..61480a0c1ab 100644
--- a/docs/ru/sql-reference/statements/optimize.md
+++ b/docs/ru/sql-reference/statements/optimize.md
@@ -30,6 +30,7 @@ ClickHouse не оповещает клиента. Чтобы включить 
 
 :::info "Примечание"
     Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
+:::
 
 ## Выражение BY {#by-expression}
 
diff --git a/docs/ru/sql-reference/statements/show.md b/docs/ru/sql-reference/statements/show.md
index 0926cc0863e..3e7560b0882 100644
--- a/docs/ru/sql-reference/statements/show.md
+++ b/docs/ru/sql-reference/statements/show.md
@@ -368,6 +368,7 @@ SHOW ACCESS
 
 :::info "Note"
     По запросу `SHOW CLUSTER name` вы получите содержимое таблицы system.clusters для этого кластера.
+:::
 
 ### Синтаксис {#show-cluster-syntax}
 
diff --git a/docs/ru/sql-reference/statements/truncate.md b/docs/ru/sql-reference/statements/truncate.md
index 63cf6271d72..cac6c261f21 100644
--- a/docs/ru/sql-reference/statements/truncate.md
+++ b/docs/ru/sql-reference/statements/truncate.md
@@ -19,3 +19,4 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 
 :::info "Примечание"
     Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
+:::
diff --git a/docs/ru/sql-reference/statements/watch.md b/docs/ru/sql-reference/statements/watch.md
index 227a6e26c02..f925e25b0d5 100644
--- a/docs/ru/sql-reference/statements/watch.md
+++ b/docs/ru/sql-reference/statements/watch.md
@@ -104,3 +104,4 @@ WATCH lv EVENTS LIMIT 1;
 
 :::info "Примечание"
     При отслеживании [LIVE VIEW](./create/view.md#live-view) через интерфейс HTTP следует использовать формат [JSONEachRowWithProgress](../../interfaces/formats.md#jsoneachrowwithprogress). Постоянные сообщения об изменениях будут добавлены в поток вывода для поддержания активности долговременного HTTP-соединения до тех пор, пока результат запроса изменяется. Проомежуток времени между сообщениями об изменениях управляется настройкой[live_view_heartbeat_interval](./create/view.md#live-view-settings).
+:::
\ No newline at end of file
diff --git a/docs/ru/sql-reference/table-functions/postgresql.md b/docs/ru/sql-reference/table-functions/postgresql.md
index 3408951c690..2e1e5314f91 100644
--- a/docs/ru/sql-reference/table-functions/postgresql.md
+++ b/docs/ru/sql-reference/table-functions/postgresql.md
@@ -28,6 +28,7 @@ postgresql('host:port', 'database', 'table', 'user', 'password'[, `schema`])
 
 :::info "Примечание"
     В запросах `INSERT` для того чтобы отличить табличную функцию `postgresql(...)` от таблицы со списком имен столбцов вы должны указывать ключевые слова `FUNCTION` или `TABLE FUNCTION`. См. примеры ниже.
+:::
 
 ## Особенности реализации {#implementation-details}
 
@@ -43,6 +44,7 @@ PostgreSQL массивы конвертируются в массивы ClickHo
 
 :::info "Примечание"
     Будьте внимательны, в PostgreSQL массивы, созданные как `type_name[]`, являются многомерными и могут содержать в себе разное количество измерений в разных строках одной таблицы. Внутри ClickHouse допустипы только многомерные массивы с одинаковым кол-вом измерений во всех строках таблицы.
+:::
 
 Поддерживает несколько реплик, которые должны быть перечислены через `|`. Например:
 
diff --git a/docs/zh/sql-reference/data-types/datetime64.md b/docs/zh/sql-reference/data-types/datetime64.md
index 571bcffd66e..da637929180 100644
--- a/docs/zh/sql-reference/data-types/datetime64.md
+++ b/docs/zh/sql-reference/data-types/datetime64.md
@@ -19,7 +19,7 @@ DateTime64(precision, [timezone])
 
 在内部，此类型以Int64类型将数据存储为自Linux纪元开始(1970-01-01 00:00:00UTC)的时间刻度数（ticks）。时间刻度的分辨率由precision参数确定。此外，`DateTime64` 类型可以像存储其他数据列一样存储时区信息，时区会影响 `DateTime64` 类型的值如何以文本格式显示，以及如何解析以字符串形式指定的时间数据 (‘2020-01-01 05:00:01.000’)。时区不存储在表的行中（也不在resultset中），而是存储在列的元数据中。详细信息请参考 [DateTime](datetime.md) 数据类型.
 
-值的范围: \[1925-01-01 00:00:00, 2283-11-11 23:59:59.99999999\] (注意: 最大值的精度是8)。
+值的范围: \[1900-01-01 00:00:00, 2299-12-31 23:59:59.99999999\] (注意: 最大值的精度是8)。
 
 ## 示例 {#examples}
 
diff --git a/docs/zh/sql-reference/functions/arithmetic-functions.md b/docs/zh/sql-reference/functions/arithmetic-functions.md
index 15bec0d2107..acba761b619 100644
--- a/docs/zh/sql-reference/functions/arithmetic-functions.md
+++ b/docs/zh/sql-reference/functions/arithmetic-functions.md
@@ -54,7 +54,7 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 ## modulo(a, b), a % b operator {#modulo}
 
 计算除法后的余数。
-如果参数是浮点数，则通过删除小数部分将它们预转换为整数。
+如果两个输入都是整数，结果类型是整数。如果其中一个输入是浮点数，则结果是浮点数。
 其余部分与C++中的含义相同。截断除法用于负数。
 除以零或将最小负数除以-1时抛出异常。
 
diff --git a/docs/zh/sql-reference/functions/date-time-functions.md b/docs/zh/sql-reference/functions/date-time-functions.md
index f268e9584ce..b9fdc4e21f2 100644
--- a/docs/zh/sql-reference/functions/date-time-functions.md
+++ b/docs/zh/sql-reference/functions/date-time-functions.md
@@ -263,8 +263,8 @@ SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp
 └────────────────┘
 ```
 
-:::注意    
-下面描述的返回类型 `toStartOf` 函数是 `Date` 或 `DateTime`。尽管这些函数可以将 `DateTime64` 作为参数，但将超出正常范围（1925年-2283年）的 `DateTime64` 传递给它们会给出不正确的结果。
+:::注意
+下面描述的返回类型 `toStartOf` 函数是 `Date` 或 `DateTime`。尽管这些函数可以将 `DateTime64` 作为参数，但将超出正常范围（1900年-2299年）的 `DateTime64` 传递给它们会给出不正确的结果。
 :::
 
 ## toStartOfYear {#tostartofyear}
@@ -1221,4 +1221,4 @@ SELECT fromModifiedJulianDayOrNull(58849);
 └────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.com/docs/en/query_language/functions/date_time_functions/) <!--hide-->
\ No newline at end of file
+[Original article](https://clickhouse.com/docs/en/query_language/functions/date_time_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/type-conversion-functions.md b/docs/zh/sql-reference/functions/type-conversion-functions.md
index 70d63d6231d..d2330df6cb1 100644
--- a/docs/zh/sql-reference/functions/type-conversion-functions.md
+++ b/docs/zh/sql-reference/functions/type-conversion-functions.md
@@ -424,7 +424,7 @@ parseDateTimeBestEffort(time_string [, time_zone]);
 查询:
 
 ``` sql
-SELECT parseDateTimeBestEffort('12/12/2020 12:12:57')
+SELECT parseDateTimeBestEffort('23/10/2020 12:12:57')
 AS parseDateTimeBestEffort;
 ```
 
@@ -432,7 +432,7 @@ AS parseDateTimeBestEffort;
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2020-12-12 12:12:57 │
+│     2020-10-23 12:12:57 │
 └─────────────────────────┘
 ```
 
@@ -469,7 +469,7 @@ AS parseDateTimeBestEffort
 查询:
 
 ``` sql
-SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
+SELECT parseDateTimeBestEffort('2018-10-23 10:12:12')
 AS parseDateTimeBestEffort
 ```
 
@@ -477,7 +477,7 @@ AS parseDateTimeBestEffort
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2018-12-12 10:12:12 │
+│     2018-10-23 10:12:12 │
 └─────────────────────────┘
 ```
 
@@ -512,7 +512,7 @@ SELECT parseDateTimeBestEffort('10 20:19')
 
 ## toLowCardinality {#tolowcardinality}
 
-把输入值转换为[LowCardianlity](../data-types/lowcardinality.md)的相同类型的数据。
+把输入值转换为[LowCardinality](../data-types/lowcardinality.md)的相同类型的数据。
 
 如果要把`LowCardinality`类型的数据转换为其他类型，使用[CAST](#type_conversion_function-cast)函数。比如：`CAST(x as String)`。
 
diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index 5b77883c7b0..fcfce7bc2a3 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -61,16 +61,17 @@ public:
     Benchmark(unsigned concurrency_, double delay_,
             Strings && hosts_, Ports && ports_, bool round_robin_,
             bool cumulative_, bool secure_, const String & default_database_,
-            const String & user_, const String & password_, const String & stage,
+            const String & user_, const String & password_, const String & quota_key_, const String & stage,
             bool randomize_, size_t max_iterations_, double max_time_,
             const String & json_path_, size_t confidence_,
             const String & query_id_, const String & query_to_execute_, bool continue_on_errors_,
-            bool reconnect_, bool print_stacktrace_, const Settings & settings_)
+            bool reconnect_, bool display_client_side_time_, bool print_stacktrace_, const Settings & settings_)
         :
         round_robin(round_robin_), concurrency(concurrency_), delay(delay_), queue(concurrency), randomize(randomize_),
         cumulative(cumulative_), max_iterations(max_iterations_), max_time(max_time_),
         json_path(json_path_), confidence(confidence_), query_id(query_id_),
         query_to_execute(query_to_execute_), continue_on_errors(continue_on_errors_), reconnect(reconnect_),
+        display_client_side_time(display_client_side_time_),
         print_stacktrace(print_stacktrace_), settings(settings_),
         shared_context(Context::createShared()), global_context(Context::createGlobal(shared_context.get())),
         pool(concurrency)
@@ -90,7 +91,7 @@ public:
             connections.emplace_back(std::make_unique<ConnectionPool>(
                 concurrency,
                 cur_host, cur_port,
-                default_database_, user_, password_,
+                default_database_, user_, password_, quota_key_,
                 /* cluster_= */ "",
                 /* cluster_secret_= */ "",
                 /* client_name_= */ "benchmark",
@@ -166,6 +167,7 @@ private:
     String query_to_execute;
     bool continue_on_errors;
     bool reconnect;
+    bool display_client_side_time;
     bool print_stacktrace;
     const Settings & settings;
     SharedContextHolder shared_context;
@@ -408,8 +410,8 @@ private:
                         true /*check embedded stack trace*/) << std::endl;
 
                     size_t info_index = round_robin ? 0 : connection_index;
-                    comparison_info_per_interval[info_index]->errors++;
-                    comparison_info_total[info_index]->errors++;
+                    ++comparison_info_per_interval[info_index]->errors;
+                    ++comparison_info_total[info_index]->errors;
                 }
             }
             // Count failed queries toward executed, so that we'd reach
@@ -443,7 +445,9 @@ private:
 
         executor.finish();
 
-        double seconds = watch.elapsedSeconds();
+        double seconds = (display_client_side_time || progress.elapsed_ns == 0)
+            ? watch.elapsedSeconds()
+            : progress.elapsed_ns / 1e9;
 
         std::lock_guard lock(mutex);
 
@@ -607,6 +611,7 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
         /// So we copy the results to std::string.
         std::optional<std::string> env_user_str;
         std::optional<std::string> env_password_str;
+        std::optional<std::string> env_quota_key_str;
 
         const char * env_user = getenv("CLICKHOUSE_USER");
         if (env_user != nullptr)
@@ -616,6 +621,10 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
         if (env_password != nullptr)
             env_password_str.emplace(std::string(env_password));
 
+        const char * env_quota_key = getenv("CLICKHOUSE_QUOTA_KEY");
+        if (env_quota_key != nullptr)
+            env_quota_key_str.emplace(std::string(env_quota_key));
+
         boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
         desc.add_options()
             ("help",                                                            "produce help message")
@@ -625,21 +634,23 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
             ("stage",         value<std::string>()->default_value("complete"),  "request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
             ("iterations,i",  value<size_t>()->default_value(0),                "amount of queries to be executed")
             ("timelimit,t",   value<double>()->default_value(0.),               "stop launch of queries after specified time limit")
-            ("randomize,r",   value<bool>()->default_value(false),              "randomize order of execution")
+            ("randomize,r",                                                     "randomize order of execution")
             ("json",          value<std::string>()->default_value(""),          "write final report to specified file in JSON format")
             ("host,h",        value<Strings>()->multitoken(),                   "list of hosts")
             ("port",          value<Ports>()->multitoken(),                     "list of ports")
-            ("roundrobin",                                                      "Instead of comparing queries for different --host/--port just pick one random --host/--port for every query and send query to it.")
-            ("cumulative",                                                      "prints cumulative data instead of data per interval")
-            ("secure,s",                                                        "Use TLS connection")
+            ("roundrobin",    "Instead of comparing queries for different --host/--port just pick one random --host/--port for every query and send query to it.")
+            ("cumulative",    "prints cumulative data instead of data per interval")
+            ("secure,s",      "Use TLS connection")
             ("user,u",        value<std::string>()->default_value(env_user_str.value_or("default")), "")
             ("password",      value<std::string>()->default_value(env_password_str.value_or("")), "")
-            ("database",      value<std::string>()->default_value("default"),   "")
-            ("stacktrace",                                                      "print stack traces of exceptions")
-            ("confidence",    value<size_t>()->default_value(5), "set the level of confidence for T-test [0=80%, 1=90%, 2=95%, 3=98%, 4=99%, 5=99.5%(default)")
-            ("query_id",      value<std::string>()->default_value(""),         "")
+            ("quota_key",     value<std::string>()->default_value(env_quota_key_str.value_or("")), "")
+            ("database", value<std::string>()->default_value("default"), "")
+            ("stacktrace", "print stack traces of exceptions")
+            ("confidence", value<size_t>()->default_value(5), "set the level of confidence for T-test [0=80%, 1=90%, 2=95%, 3=98%, 4=99%, 5=99.5%(default)")
+            ("query_id", value<std::string>()->default_value(""), "")
             ("continue_on_errors", "continue testing even if a query fails")
             ("reconnect", "establish new connection for every query")
+            ("client-side-time", "display the time including network communication instead of server-side time; note that for server versions before 22.8 we always display client-side time")
         ;
 
         Settings settings;
@@ -682,8 +693,9 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
             options["database"].as<std::string>(),
             options["user"].as<std::string>(),
             options["password"].as<std::string>(),
+            options["quota_key"].as<std::string>(),
             options["stage"].as<std::string>(),
-            options["randomize"].as<bool>(),
+            options.count("randomize"),
             options["iterations"].as<size_t>(),
             options["timelimit"].as<double>(),
             options["json"].as<std::string>(),
@@ -692,6 +704,7 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
             options["query"].as<std::string>(),
             options.count("continue_on_errors"),
             options.count("reconnect"),
+            options.count("client-side-time"),
             print_stacktrace,
             settings);
         return benchmark.run();
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 584806951cf..9b1dbbe221a 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -133,6 +133,7 @@ std::vector<String> Client::loadWarningMessages()
     std::vector<String> messages;
     connection->sendQuery(connection_parameters.timeouts,
                           "SELECT * FROM viewIfPermitted(SELECT message FROM system.warnings ELSE null('message String'))",
+                          {} /* query_parameters */,
                           "" /* query_id */,
                           QueryProcessingStage::Complete,
                           &global_context->getSettingsRef(),
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
index f3609902fcb..2e7d81617fa 100644
--- a/programs/copier/ClusterCopier.cpp
+++ b/programs/copier/ClusterCopier.cpp
@@ -2010,7 +2010,7 @@ UInt64 ClusterCopier::executeQueryOnCluster(
             {
                 connections.emplace_back(std::make_shared<Connection>(
                     node.host_name, node.port, node.default_database,
-                    node.user, node.password, node.cluster, node.cluster_secret,
+                    node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
                     "ClusterCopier", node.compression, node.secure
                 ));
 
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index da133096baf..45c7c9a912e 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -1,6 +1,7 @@
 #include <iostream>
 #include <filesystem>
 #include <boost/program_options.hpp>
+#include <Common/filesystemHelpers.h>
 
 #include <sys/stat.h>
 #include <pwd.h>
@@ -378,10 +379,10 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
             if (fs::exists(symlink_path))
             {
-                bool is_symlink = fs::is_symlink(symlink_path);
+                bool is_symlink = FS::isSymlink(symlink_path);
                 fs::path points_to;
                 if (is_symlink)
-                    points_to = fs::weakly_canonical(fs::read_symlink(symlink_path));
+                    points_to = fs::weakly_canonical(FS::readSymlink(symlink_path));
 
                 if (is_symlink && points_to == main_bin_path)
                 {
diff --git a/programs/library-bridge/LibraryBridgeHandlerFactory.cpp b/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
index 1285be6a07d..f8f6a23e1be 100644
--- a/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
@@ -26,13 +26,13 @@ std::unique_ptr<HTTPRequestHandler> LibraryBridgeHandlerFactory::createRequestHa
     if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
     {
         if (uri.getPath() == "/extdict_ping")
-            return std::make_unique<LibraryBridgeExistsHandler>(keep_alive_timeout, getContext());
+            return std::make_unique<ExternalDictionaryLibraryBridgeExistsHandler>(keep_alive_timeout, getContext());
     }
 
     if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
     {
         if (uri.getPath() == "/extdict_request")
-            return std::make_unique<LibraryBridgeRequestHandler>(keep_alive_timeout, getContext());
+            return std::make_unique<ExternalDictionaryLibraryBridgeRequestHandler>(keep_alive_timeout, getContext());
     }
 
     return nullptr;
diff --git a/programs/library-bridge/LibraryBridgeHandlers.cpp b/programs/library-bridge/LibraryBridgeHandlers.cpp
index 9537251954c..a28148bd1f7 100644
--- a/programs/library-bridge/LibraryBridgeHandlers.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlers.cpp
@@ -5,6 +5,7 @@
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/Net/HTMLForm.h>
@@ -78,18 +79,39 @@ static void writeData(Block data, OutputFormatPtr format)
     executor.execute();
 }
 
-LibraryBridgeRequestHandler::LibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_)
+ExternalDictionaryLibraryBridgeRequestHandler::ExternalDictionaryLibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_)
     : WithContext(context_)
-    , log(&Poco::Logger::get("LibraryBridgeRequestHandler"))
+    , log(&Poco::Logger::get("ExternalDictionaryLibraryBridgeRequestHandler"))
     , keep_alive_timeout(keep_alive_timeout_)
 {
 }
 
-void LibraryBridgeRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
+void ExternalDictionaryLibraryBridgeRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     LOG_TRACE(log, "Request URI: {}", request.getURI());
     HTMLForm params(getContext()->getSettingsRef(), request);
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            processError(response, "Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != LIBRARY_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        processError(response, "Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
     if (!params.has("method"))
     {
         processError(response, "No 'method' in request URL");
@@ -340,14 +362,14 @@ void LibraryBridgeRequestHandler::handleRequest(HTTPServerRequest & request, HTT
     }
 }
 
-LibraryBridgeExistsHandler::LibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_)
+ExternalDictionaryLibraryBridgeExistsHandler::ExternalDictionaryLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_)
     : WithContext(context_)
     , keep_alive_timeout(keep_alive_timeout_)
-    , log(&Poco::Logger::get("LibraryBridgeExistsHandler"))
+    , log(&Poco::Logger::get("ExternalDictionaryLibraryBridgeExistsHandler"))
 {
 }
 
-void LibraryBridgeExistsHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
+void ExternalDictionaryLibraryBridgeExistsHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     try
     {
@@ -361,6 +383,7 @@ void LibraryBridgeExistsHandler::handleRequest(HTTPServerRequest & request, HTTP
         }
 
         std::string dictionary_id = params.get("dictionary_id");
+
         auto library_handler = ExternalDictionaryLibraryHandlerFactory::instance().get(dictionary_id);
 
         String res = library_handler ? "1" : "0";
diff --git a/programs/library-bridge/LibraryBridgeHandlers.h b/programs/library-bridge/LibraryBridgeHandlers.h
index 454bcc46acc..b20f40616ce 100644
--- a/programs/library-bridge/LibraryBridgeHandlers.h
+++ b/programs/library-bridge/LibraryBridgeHandlers.h
@@ -9,7 +9,6 @@
 namespace DB
 {
 
-
 /// Handler for requests to Library Dictionary Source, returns response in RowBinary format.
 /// When a library dictionary source is created, it sends 'extDict_libNew' request to library bridge (which is started on first
 /// request to it, if it was not yet started). On this request a new sharedLibrayHandler is added to a
@@ -17,10 +16,10 @@ namespace DB
 /// names of dictionary attributes, sample block to parse block of null values, block of null values. Everything is
 /// passed in binary format and is urlencoded. When dictionary is cloned, a new handler is created.
 /// Each handler is unique to dictionary.
-class LibraryBridgeRequestHandler : public HTTPRequestHandler, WithContext
+class ExternalDictionaryLibraryBridgeRequestHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    LibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_);
+    ExternalDictionaryLibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_);
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
 
@@ -32,10 +31,10 @@ private:
 };
 
 
-class LibraryBridgeExistsHandler : public HTTPRequestHandler, WithContext
+class ExternalDictionaryLibraryBridgeExistsHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    LibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_);
+    ExternalDictionaryLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_);
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
 
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index aa96551d37c..ce31600642a 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -558,14 +558,16 @@ void LocalServer::processConfig()
     global_context->getProcessList().setMaxSize(0);
 
     /// Size of cache for uncompressed blocks. Zero means disabled.
+    String uncompressed_cache_policy = config().getString("uncompressed_cache_policy", "");
     size_t uncompressed_cache_size = config().getUInt64("uncompressed_cache_size", 0);
     if (uncompressed_cache_size)
-        global_context->setUncompressedCache(uncompressed_cache_size);
+        global_context->setUncompressedCache(uncompressed_cache_size, uncompressed_cache_policy);
 
     /// Size of cache for marks (index of MergeTree family of tables).
+    String mark_cache_policy = config().getString("mark_cache_policy", "");
     size_t mark_cache_size = config().getUInt64("mark_cache_size", 5368709120);
     if (mark_cache_size)
-        global_context->setMarkCache(mark_cache_size);
+        global_context->setMarkCache(mark_cache_size, mark_cache_policy);
 
     /// Size of cache for uncompressed blocks of MergeTree indices. Zero means disabled.
     size_t index_uncompressed_cache_size = config().getUInt64("index_uncompressed_cache_size", 0);
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index f043c832aa4..0ea2495af78 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -5,6 +5,7 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ParserQueryWithOutput.h>
 #include <Parsers/parseQuery.h>
@@ -14,6 +15,7 @@
 #include <Poco/NumberParser.h>
 #include <Common/logger_useful.h>
 #include <base/scope_guard.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/quoteString.h>
 #include "getIdentifierQuote.h"
 #include "validateODBCConnectionString.h"
@@ -80,6 +82,27 @@ void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServ
         LOG_WARNING(log, fmt::runtime(message));
     };
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            process_error("Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != XDBC_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        process_error("Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
     if (!params.has("table"))
     {
         process_error("No 'table' param in request URL");
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index c3a88804a51..8157e3b6159 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -5,11 +5,13 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ParserQueryWithOutput.h>
 #include <Parsers/parseQuery.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/logger_useful.h>
 #include <base/scope_guard.h>
 #include "getIdentifierQuote.h"
@@ -32,6 +34,27 @@ void IdentifierQuoteHandler::handleRequest(HTTPServerRequest & request, HTTPServ
         LOG_WARNING(log, fmt::runtime(message));
     };
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            process_error("Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != XDBC_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        process_error("Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
     if (!params.has("connection_string"))
     {
         process_error("No 'connection_string' in request URL");
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index bb1cf53205d..fe22d8facfd 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -17,6 +17,7 @@
 #include <QueryPipeline/QueryPipeline.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Formats/IInputFormat.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/logger_useful.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Common/config.h>
@@ -55,6 +56,28 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
     HTMLForm params(getContext()->getSettingsRef(), request);
     LOG_TRACE(log, "Request URI: {}", request.getURI());
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            processError(response, "Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != XDBC_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        processError(response, "Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
+
     if (mode == "read")
         params.read(request.getStream());
 
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.cpp b/programs/odbc-bridge/SchemaAllowedHandler.cpp
index 54dfa20f808..4d20c8bc3b7 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.cpp
+++ b/programs/odbc-bridge/SchemaAllowedHandler.cpp
@@ -4,9 +4,11 @@
 
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/logger_useful.h>
 #include "validateODBCConnectionString.h"
 #include "ODBCPooledConnectionFactory.h"
@@ -40,6 +42,28 @@ void SchemaAllowedHandler::handleRequest(HTTPServerRequest & request, HTTPServer
         LOG_WARNING(log, fmt::runtime(message));
     };
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            process_error("Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != XDBC_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        process_error("Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
+
     if (!params.has("connection_string"))
     {
         process_error("No 'connection_string' in request URL");
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index b86ce4a841c..39d7b1d0e5b 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -613,10 +613,22 @@ static void sanityChecks(Server & server)
     {
         if (getAvailableMemoryAmount() < (2l << 30))
             server.context()->addWarningMessage("Available memory at server startup is too low (2GiB).");
+    }
+    catch (...)
+    {
+    }
 
+    try
+    {
         if (!enoughSpaceInDirectory(data_path, 1ull << 30))
             server.context()->addWarningMessage("Available disk space for data at server startup is too low (1GiB): " + String(data_path));
+    }
+    catch (...)
+    {
+    }
 
+    try
+    {
         if (!logs_path.empty())
         {
             auto logs_parent = fs::path(logs_path).parent_path();
@@ -627,6 +639,13 @@ static void sanityChecks(Server & server)
     catch (...)
     {
     }
+
+    if (server.context()->getMergeTreeSettings().allow_remote_fs_zero_copy_replication)
+    {
+        server.context()->addWarningMessage("The setting 'allow_remote_fs_zero_copy_replication' is enabled for MergeTree tables."
+            " But the feature of 'zero-copy replication' is under development and is not ready for production."
+            " The usage of this feature can lead to data corruption and loss. The setting should be disabled in production.");
+    }
 }
 
 int Server::main(const std::vector<std::string> & /*args*/)
@@ -1362,6 +1381,8 @@ int Server::main(const std::vector<std::string> & /*args*/)
     size_t max_cache_size = memory_amount * cache_size_to_ram_max_ratio;
 
     /// Size of cache for uncompressed blocks. Zero means disabled.
+    String uncompressed_cache_policy = config().getString("uncompressed_cache_policy", "");
+    LOG_INFO(log, "Uncompressed cache policy name {}", uncompressed_cache_policy);
     size_t uncompressed_cache_size = config().getUInt64("uncompressed_cache_size", 0);
     if (uncompressed_cache_size > max_cache_size)
     {
@@ -1369,7 +1390,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         LOG_INFO(log, "Uncompressed cache size was lowered to {} because the system has low amount of memory",
             formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
-    global_context->setUncompressedCache(uncompressed_cache_size);
+    global_context->setUncompressedCache(uncompressed_cache_size, uncompressed_cache_policy);
 
     /// Load global settings from default_profile and system_profile.
     global_context->setDefaultProfiles(config());
@@ -1388,6 +1409,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
     /// Size of cache for marks (index of MergeTree family of tables).
     size_t mark_cache_size = config().getUInt64("mark_cache_size", 5368709120);
+    String mark_cache_policy = config().getString("mark_cache_policy", "");
     if (!mark_cache_size)
         LOG_ERROR(log, "Too low mark cache size will lead to severe performance degradation.");
     if (mark_cache_size > max_cache_size)
@@ -1396,7 +1418,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         LOG_INFO(log, "Mark cache size was lowered to {} because the system has low amount of memory",
             formatReadableSizeWithBinarySuffix(mark_cache_size));
     }
-    global_context->setMarkCache(mark_cache_size);
+    global_context->setMarkCache(mark_cache_size, mark_cache_policy);
 
     /// Size of cache for uncompressed blocks of MergeTree indices. Zero means disabled.
     size_t index_uncompressed_cache_size = config().getUInt64("index_uncompressed_cache_size", 0);
@@ -1519,7 +1541,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         /// We load temporary database first, because projections need it.
         database_catalog.initializeAndLoadTemporaryDatabase();
         loadMetadataSystem(global_context);
-        maybeConvertOrdinaryDatabaseToAtomic(global_context, DatabaseCatalog::instance().getSystemDatabase());
+        maybeConvertSystemDatabase(global_context);
         /// After attaching system databases we can initialize system log.
         global_context->initializeSystemLogs();
         global_context->setSystemZooKeeperLogAfterInitializationIfNeeded();
@@ -1533,6 +1555,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         database_catalog.loadMarkedAsDroppedTables();
         /// Then, load remaining databases
         loadMetadata(global_context, default_database);
+        convertDatabasesEnginesIfNeed(global_context);
         startupSystemTables();
         database_catalog.loadDatabases();
         /// After loading validate that default database exists
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 2121df501a8..ad82b6b9c6f 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -60,6 +60,14 @@
           </logger>
         </levels>
         -->
+        <!-- Structured log formatting:
+        You can specify log format(for now, JSON only). In that case, the console log will be printed
+        in specified format like JSON.
+        For example, as below:
+        {"date_time":"1650918987.180175","thread_name":"#1","thread_id":"254545","level":"Trace","query_id":"","logger_name":"BaseDaemon","message":"Received signal 2","source_file":"../base/daemon/BaseDaemon.cpp; virtual void SignalListener::run()","source_line":"192"}
+        To enable JSON logging support, just uncomment <formatting> tag below.
+        -->
+        <!-- <formatting>json</formatting> -->
     </logger>
 
     <!-- Add headers to response in options request. OPTIONS method is used in CORS preflight requests. -->
diff --git a/programs/server/play.html b/programs/server/play.html
index 6a412fa5c60..c511d13cf91 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -78,6 +78,7 @@
             /* For iPad */
             margin: 0;
             border-radius: 0;
+            tab-size: 4;
         }
 
         html, body
@@ -609,11 +610,13 @@
         }
     }
 
+    let query_area = document.getElementById('query');
+
     window.onpopstate = function(event) {
         if (!event.state) {
             return;
         }
-        document.getElementById('query').value = event.state.query;
+        query_area.value = event.state.query;
         if (!event.state.response) {
             clear();
             return;
@@ -622,13 +625,13 @@
     };
 
     if (window.location.hash) {
-        document.getElementById('query').value = window.atob(window.location.hash.substr(1));
+        query_area.value = window.atob(window.location.hash.substr(1));
     }
 
     function post()
     {
         ++request_num;
-        let query = document.getElementById('query').value;
+        let query = query_area.value;
         postImpl(request_num, query);
     }
 
@@ -645,6 +648,32 @@
         }
     }
 
+    /// Pressing Tab in textarea will increase indentation.
+    /// But for accessibility reasons, we will fall back to tab navigation if the user already used Tab for that.
+
+    let user_prefers_tab_navigation = false;
+
+    [...document.querySelectorAll('input')].map(elem => {
+        elem.onkeydown = (e) => {
+            if (e.key == 'Tab') { user_prefers_tab_navigation = true; }
+        };
+    });
+
+    query_area.onkeydown = (e) => {
+        if (e.key == 'Tab' && !event.shiftKey && !user_prefers_tab_navigation) {
+            let elem = e.target;
+            let selection_start = elem.selectionStart;
+            let selection_end = elem.selectionEnd;
+
+            elem.value = elem.value.substring(0, elem.selectionStart) + '    ' + elem.value.substring(elem.selectionEnd);
+            elem.selectionStart = selection_start + 4;
+            elem.selectionEnd = selection_start + 4;
+
+            e.preventDefault();
+            return false;
+        }
+    };
+
     function clearElement(id)
     {
         let elem = document.getElementById(id);
@@ -701,7 +730,7 @@
         stats.innerText = `Elapsed: ${seconds} sec, read ${formatted_rows} rows, ${formatted_bytes}.`;
 
         /// We can also render graphs if user performed EXPLAIN PIPELINE graph=1 or EXPLAIN AST graph = 1
-        if (response.data.length > 3 && document.getElementById('query').value.match(/^\s*EXPLAIN/i) && typeof(response.data[0][0]) === "string" && response.data[0][0].startsWith("digraph")) {
+        if (response.data.length > 3 && query_area.value.match(/^\s*EXPLAIN/i) && typeof(response.data[0][0]) === "string" && response.data[0][0].startsWith("digraph")) {
             renderGraph(response);
         } else {
             renderTable(response);
diff --git a/src/Access/MultipleAccessStorage.h b/src/Access/MultipleAccessStorage.h
index 58cf09fd0ff..bc9a4705785 100644
--- a/src/Access/MultipleAccessStorage.h
+++ b/src/Access/MultipleAccessStorage.h
@@ -2,7 +2,7 @@
 
 #include <Access/IAccessStorage.h>
 #include <base/defines.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <mutex>
 
 
@@ -63,7 +63,7 @@ private:
     std::shared_ptr<const Storages> getStoragesInternal() const;
 
     std::shared_ptr<const Storages> nested_storages TSA_GUARDED_BY(mutex);
-    mutable LRUCache<UUID, Storage> ids_cache TSA_GUARDED_BY(mutex);
+    mutable CacheBase<UUID, Storage> ids_cache TSA_GUARDED_BY(mutex);
     mutable std::mutex mutex;
 };
 
diff --git a/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp
index c4df7e74e7a..4f943e47fa9 100644
--- a/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp
+++ b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp
@@ -31,16 +31,10 @@ ExternalDictionaryLibraryBridgeHelper::ExternalDictionaryLibraryBridgeHelper(
         const Block & sample_block_,
         const Field & dictionary_id_,
         const LibraryInitData & library_data_)
-    : IBridgeHelper(context_->getGlobalContext())
-    , log(&Poco::Logger::get("ExternalDictionaryLibraryBridgeHelper"))
+    : LibraryBridgeHelper(context_->getGlobalContext())
     , sample_block(sample_block_)
-    , config(context_->getConfigRef())
-    , http_timeout(context_->getGlobalContext()->getSettingsRef().http_receive_timeout.value)
     , library_data(library_data_)
     , dictionary_id(dictionary_id_)
-    , bridge_host(config.getString("library_bridge.host", DEFAULT_HOST))
-    , bridge_port(config.getUInt("library_bridge.port", DEFAULT_PORT))
-    , http_timeouts(ConnectionTimeouts::getHTTPTimeouts(context_))
 {
 }
 
@@ -65,28 +59,13 @@ Poco::URI ExternalDictionaryLibraryBridgeHelper::getMainURI() const
 Poco::URI ExternalDictionaryLibraryBridgeHelper::createRequestURI(const String & method) const
 {
     auto uri = getMainURI();
+    uri.addQueryParameter("version", std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION));
     uri.addQueryParameter("dictionary_id", toString(dictionary_id));
     uri.addQueryParameter("method", method);
     return uri;
 }
 
 
-Poco::URI ExternalDictionaryLibraryBridgeHelper::createBaseURI() const
-{
-    Poco::URI uri;
-    uri.setHost(bridge_host);
-    uri.setPort(bridge_port);
-    uri.setScheme("http");
-    return uri;
-}
-
-
-void ExternalDictionaryLibraryBridgeHelper::startBridge(std::unique_ptr<ShellCommand> cmd) const
-{
-    getContext()->addBridgeCommand(std::move(cmd));
-}
-
-
 bool ExternalDictionaryLibraryBridgeHelper::bridgeHandShake()
 {
     String result;
@@ -225,6 +204,14 @@ QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadAll()
 }
 
 
+static String getDictIdsString(const std::vector<UInt64> & ids)
+{
+    WriteBufferFromOwnString out;
+    writeVectorBinary(ids, out);
+    return out.str();
+}
+
+
 QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadIds(const std::vector<uint64_t> & ids)
 {
     startBridgeSync();
@@ -283,13 +270,4 @@ QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadBase(const Poco::URI &
     return QueryPipeline(std::move(source));
 }
 
-
-String ExternalDictionaryLibraryBridgeHelper::getDictIdsString(const std::vector<UInt64> & ids)
-{
-    WriteBufferFromOwnString out;
-    writeVectorBinary(ids, out);
-    return out.str();
-}
-
-
 }
diff --git a/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.h b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.h
index d7504bbcf0e..feebf997387 100644
--- a/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.h
+++ b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.h
@@ -2,10 +2,9 @@
 
 #include <Interpreters/Context.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
-#include <Poco/Logger.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/URI.h>
-#include <BridgeHelper/IBridgeHelper.h>
+#include <BridgeHelper/LibraryBridgeHelper.h>
 #include <QueryPipeline/QueryPipeline.h>
 
 
@@ -14,7 +13,8 @@ namespace DB
 
 class Pipe;
 
-class ExternalDictionaryLibraryBridgeHelper : public IBridgeHelper
+// Class to access the external dictionary part of the clickhouse-library-bridge.
+class ExternalDictionaryLibraryBridgeHelper : public LibraryBridgeHelper
 {
 
 public:
@@ -25,7 +25,6 @@ public:
         String dict_attributes;
     };
 
-    static constexpr inline size_t DEFAULT_PORT = 9012;
     static constexpr inline auto PING_HANDLER = "/extdict_ping";
     static constexpr inline auto MAIN_HANDLER = "/extdict_request";
 
@@ -56,26 +55,6 @@ protected:
 
     bool bridgeHandShake() override;
 
-    void startBridge(std::unique_ptr<ShellCommand> cmd) const override;
-
-    String serviceAlias() const override { return "clickhouse-library-bridge"; }
-
-    String serviceFileName() const override { return serviceAlias(); }
-
-    size_t getDefaultPort() const override { return DEFAULT_PORT; }
-
-    bool startBridgeManually() const override { return false; }
-
-    String configPrefix() const override { return "library_bridge"; }
-
-    const Poco::Util::AbstractConfiguration & getConfig() const override { return config; }
-
-    Poco::Logger * getLog() const override { return log; }
-
-    Poco::Timespan getHTTPTimeout() const override { return http_timeout; }
-
-    Poco::URI createBaseURI() const override;
-
     QueryPipeline loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
 
     bool executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {}) const;
@@ -94,20 +73,10 @@ private:
 
     Poco::URI createRequestURI(const String & method) const;
 
-    static String getDictIdsString(const std::vector<UInt64> & ids);
-
-    Poco::Logger * log;
     const Block sample_block;
-    const Poco::Util::AbstractConfiguration & config;
-    const Poco::Timespan http_timeout;
-
     LibraryInitData library_data;
     Field dictionary_id;
-    std::string bridge_host;
-    size_t bridge_port;
     bool library_initialized = false;
-    ConnectionTimeouts http_timeouts;
-    Poco::Net::HTTPBasicCredentials credentials{};
 };
 
 }
diff --git a/src/BridgeHelper/LibraryBridgeHelper.cpp b/src/BridgeHelper/LibraryBridgeHelper.cpp
new file mode 100644
index 00000000000..d83e62a0fd3
--- /dev/null
+++ b/src/BridgeHelper/LibraryBridgeHelper.cpp
@@ -0,0 +1,34 @@
+#include "LibraryBridgeHelper.h"
+
+namespace DB
+{
+
+LibraryBridgeHelper::LibraryBridgeHelper(ContextPtr context_)
+    : IBridgeHelper(context_)
+    , config(context_->getConfigRef())
+    , log(&Poco::Logger::get("LibraryBridgeHelper"))
+    , http_timeout(context_->getGlobalContext()->getSettingsRef().http_receive_timeout.value)
+    , bridge_host(config.getString("library_bridge.host", DEFAULT_HOST))
+    , bridge_port(config.getUInt("library_bridge.port", DEFAULT_PORT))
+    , http_timeouts(ConnectionTimeouts::getHTTPTimeouts(context_))
+{
+}
+
+
+void LibraryBridgeHelper::startBridge(std::unique_ptr<ShellCommand> cmd) const
+{
+    getContext()->addBridgeCommand(std::move(cmd));
+}
+
+
+Poco::URI LibraryBridgeHelper::createBaseURI() const
+{
+    Poco::URI uri;
+    uri.setHost(bridge_host);
+    uri.setPort(bridge_port);
+    uri.setScheme("http");
+    return uri;
+}
+
+
+}
diff --git a/src/BridgeHelper/LibraryBridgeHelper.h b/src/BridgeHelper/LibraryBridgeHelper.h
new file mode 100644
index 00000000000..447a4c713f4
--- /dev/null
+++ b/src/BridgeHelper/LibraryBridgeHelper.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <Poco/Logger.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/URI.h>
+#include <BridgeHelper/IBridgeHelper.h>
+#include <Common/BridgeProtocolVersion.h>
+
+namespace DB
+{
+
+// Common base class to access the clickhouse-library-bridge.
+class LibraryBridgeHelper : public IBridgeHelper
+{
+protected:
+    explicit LibraryBridgeHelper(ContextPtr context_);
+
+    void startBridge(std::unique_ptr<ShellCommand> cmd) const override;
+
+    String serviceAlias() const override { return "clickhouse-library-bridge"; }
+
+    String serviceFileName() const override { return serviceAlias(); }
+
+    size_t getDefaultPort() const override { return DEFAULT_PORT; }
+
+    bool startBridgeManually() const override { return false; }
+
+    String configPrefix() const override { return "library_bridge"; }
+
+    const Poco::Util::AbstractConfiguration & getConfig() const override { return config; }
+
+    Poco::Logger * getLog() const override { return log; }
+
+    Poco::Timespan getHTTPTimeout() const override { return http_timeout; }
+
+    Poco::URI createBaseURI() const override;
+
+    static constexpr inline size_t DEFAULT_PORT = 9012;
+
+    const Poco::Util::AbstractConfiguration & config;
+    Poco::Logger * log;
+    const Poco::Timespan http_timeout;
+    std::string bridge_host;
+    size_t bridge_port;
+    ConnectionTimeouts http_timeouts;
+    Poco::Net::HTTPBasicCredentials credentials{};
+};
+
+}
diff --git a/src/BridgeHelper/XDBCBridgeHelper.h b/src/BridgeHelper/XDBCBridgeHelper.h
index 84aa73ef8e5..f2cd76d5d81 100644
--- a/src/BridgeHelper/XDBCBridgeHelper.h
+++ b/src/BridgeHelper/XDBCBridgeHelper.h
@@ -9,6 +9,7 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/URI.h>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/ShellCommand.h>
 #include <Common/logger_useful.h>
 #include <IO/ConnectionTimeoutsContext.h>
@@ -86,6 +87,7 @@ protected:
     {
         auto uri = createBaseURI();
         uri.setPath(MAIN_HANDLER);
+        uri.addQueryParameter("version", std::to_string(XDBC_BRIDGE_PROTOCOL_VERSION));
         return uri;
     }
 
@@ -163,6 +165,7 @@ protected:
     {
         auto uri = createBaseURI();
         uri.setPath(COL_INFO_HANDLER);
+        uri.addQueryParameter("version", std::to_string(XDBC_BRIDGE_PROTOCOL_VERSION));
         return uri;
     }
 
@@ -184,6 +187,7 @@ protected:
 
             auto uri = createBaseURI();
             uri.setPath(SCHEMA_ALLOWED_HANDLER);
+            uri.addQueryParameter("version", std::to_string(XDBC_BRIDGE_PROTOCOL_VERSION));
             uri.addQueryParameter("connection_string", getConnectionString());
 
             ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()), credentials);
@@ -204,6 +208,7 @@ protected:
 
             auto uri = createBaseURI();
             uri.setPath(IDENTIFIER_QUOTE_HANDLER);
+            uri.addQueryParameter("version", std::to_string(XDBC_BRIDGE_PROTOCOL_VERSION));
             uri.addQueryParameter("connection_string", getConnectionString());
 
             ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()), credentials);
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 977d2bca01f..c399f01c565 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -740,8 +740,10 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
     /// Rewrite query only when we have query parameters.
     /// Note that if query is rewritten, comments in query are lost.
     /// But the user often wants to see comments in server logs, query log, processlist, etc.
+    /// For recent versions of the server query parameters will be transferred by network and applied on the server side.
     auto query = query_to_execute;
-    if (!query_parameters.empty())
+    if (!query_parameters.empty()
+        && connection->getServerRevision(connection_parameters.timeouts) < DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
     {
         /// Replace ASTQueryParameter with ASTLiteral for prepared statements.
         ReplaceQueryParameterVisitor visitor(query_parameters);
@@ -762,6 +764,7 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
             connection->sendQuery(
                 connection_parameters.timeouts,
                 query,
+                query_parameters,
                 global_context->getCurrentQueryId(),
                 query_processing_stage,
                 &global_context->getSettingsRef(),
@@ -1087,7 +1090,8 @@ bool ClientBase::receiveSampleBlock(Block & out, ColumnsDescription & columns_de
 void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr parsed_query)
 {
     auto query = query_to_execute;
-    if (!query_parameters.empty())
+    if (!query_parameters.empty()
+        && connection->getServerRevision(connection_parameters.timeouts) < DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
     {
         /// Replace ASTQueryParameter with ASTLiteral for prepared statements.
         ReplaceQueryParameterVisitor visitor(query_parameters);
@@ -1114,6 +1118,7 @@ void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr pars
     connection->sendQuery(
         connection_parameters.timeouts,
         query,
+        query_parameters,
         global_context->getCurrentQueryId(),
         query_processing_stage,
         &global_context->getSettingsRef(),
@@ -1486,7 +1491,7 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
         if (with_output && with_output->settings_ast)
             apply_query_settings(*with_output->settings_ast);
 
-        if (!connection->checkConnected())
+        if (!connection->checkConnected(connection_parameters.timeouts))
             connect();
 
         ASTPtr input_function;
@@ -1830,7 +1835,7 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
 
                     have_error = false;
 
-                    if (!connection->checkConnected())
+                    if (!connection->checkConnected(connection_parameters.timeouts))
                         connect();
                 }
 
@@ -2047,7 +2052,7 @@ void ClientBase::runInteractive()
             /// Client-side exception during query execution can result in the loss of
             /// sync in the connection protocol.
             /// So we reconnect and allow to enter the next query.
-            if (!connection->checkConnected())
+            if (!connection->checkConnected(connection_parameters.timeouts))
                 connect();
         }
     }
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index df37d1c98a4..5047f958a10 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -64,20 +64,19 @@ Connection::~Connection() = default;
 Connection::Connection(const String & host_, UInt16 port_,
     const String & default_database_,
     const String & user_, const String & password_,
+    const String & quota_key_,
     const String & cluster_,
     const String & cluster_secret_,
     const String & client_name_,
     Protocol::Compression compression_,
-    Protocol::Secure secure_,
-    Poco::Timespan sync_request_timeout_)
+    Protocol::Secure secure_)
     : host(host_), port(port_), default_database(default_database_)
-    , user(user_), password(password_)
+    , user(user_), password(password_), quota_key(quota_key_)
     , cluster(cluster_)
     , cluster_secret(cluster_secret_)
     , client_name(client_name_)
     , compression(compression_)
     , secure(secure_)
-    , sync_request_timeout(sync_request_timeout_)
     , log_wrapper(*this)
 {
     /// Don't connect immediately, only on first need.
@@ -169,6 +168,8 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
 
         sendHello();
         receiveHello();
+        if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM)
+            sendAddendum();
 
         LOG_TRACE(log_wrapper.get(), "Connected to {} server version {}.{}.{}.",
             server_name, server_version_major, server_version_minor, server_version_patch);
@@ -266,6 +267,14 @@ void Connection::sendHello()
 }
 
 
+void Connection::sendAddendum()
+{
+    if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_QUOTA_KEY)
+        writeStringBinary(quota_key, *out);
+    out->next();
+}
+
+
 void Connection::receiveHello()
 {
     /// Receive hello packet.
@@ -375,7 +384,7 @@ void Connection::forceConnected(const ConnectionTimeouts & timeouts)
     {
         connect(timeouts);
     }
-    else if (!ping())
+    else if (!ping(timeouts))
     {
         LOG_TRACE(log_wrapper.get(), "Connection was closed, will reconnect.");
         connect(timeouts);
@@ -395,11 +404,11 @@ void Connection::sendClusterNameAndSalt()
 }
 #endif
 
-bool Connection::ping()
+bool Connection::ping(const ConnectionTimeouts & timeouts)
 {
     try
     {
-        TimeoutSetter timeout_setter(*socket, sync_request_timeout, true);
+        TimeoutSetter timeout_setter(*socket, timeouts.sync_request_timeout, true);
 
         UInt64 pong = 0;
         writeVarUInt(Protocol::Client::Ping, *out);
@@ -443,7 +452,7 @@ TablesStatusResponse Connection::getTablesStatus(const ConnectionTimeouts & time
     if (!connected)
         connect(timeouts);
 
-    TimeoutSetter timeout_setter(*socket, sync_request_timeout, true);
+    TimeoutSetter timeout_setter(*socket, timeouts.sync_request_timeout, true);
 
     writeVarUInt(Protocol::Client::TablesStatusRequest, *out);
     request.write(*out, server_revision);
@@ -466,6 +475,7 @@ TablesStatusResponse Connection::getTablesStatus(const ConnectionTimeouts & time
 void Connection::sendQuery(
     const ConnectionTimeouts & timeouts,
     const String & query,
+    const NameToNameMap & query_parameters,
     const String & query_id_,
     UInt64 stage,
     const Settings * settings,
@@ -558,6 +568,14 @@ void Connection::sendQuery(
 
     writeStringBinary(query, *out);
 
+    if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
+    {
+        Settings params;
+        for (const auto & [name, value] : query_parameters)
+            params.set(name, value);
+        params.write(*out, SettingsWriteFormat::STRINGS_WITH_FLAGS);
+    }
+
     maybe_compressed_in.reset();
     maybe_compressed_out.reset();
     block_in.reset();
@@ -1083,6 +1101,7 @@ ServerConnectionPtr Connection::createConnection(const ConnectionParameters & pa
         parameters.default_database,
         parameters.user,
         parameters.password,
+        parameters.quota_key,
         "", /* cluster */
         "", /* cluster_secret */
         "client",
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index d00a5760a8d..a92f78fad46 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -51,12 +51,12 @@ public:
     Connection(const String & host_, UInt16 port_,
         const String & default_database_,
         const String & user_, const String & password_,
+        const String & quota_key_,
         const String & cluster_,
         const String & cluster_secret_,
         const String & client_name_,
         Protocol::Compression compression_,
-        Protocol::Secure secure_,
-        Poco::Timespan sync_request_timeout_ = Poco::Timespan(DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC, 0));
+        Protocol::Secure secure_);
 
     ~Connection() override;
 
@@ -96,6 +96,7 @@ public:
     void sendQuery(
         const ConnectionTimeouts & timeouts,
         const String & query,
+        const NameToNameMap& query_parameters,
         const String & query_id_/* = "" */,
         UInt64 stage/* = QueryProcessingStage::Complete */,
         const Settings * settings/* = nullptr */,
@@ -123,7 +124,7 @@ public:
 
     bool isConnected() const override { return connected; }
 
-    bool checkConnected() override { return connected && ping(); }
+    bool checkConnected(const ConnectionTimeouts & timeouts) override { return connected && ping(timeouts); }
 
     void disconnect() override;
 
@@ -159,6 +160,7 @@ private:
     String default_database;
     String user;
     String password;
+    String quota_key;
 
     /// For inter-server authorization
     String cluster;
@@ -205,8 +207,6 @@ private:
       */
     ThrottlerPtr throttler;
 
-    Poco::Timespan sync_request_timeout;
-
     /// From where to read query execution result.
     std::shared_ptr<ReadBuffer> maybe_compressed_in;
     std::unique_ptr<NativeReader> block_in;
@@ -245,12 +245,13 @@ private:
 
     void connect(const ConnectionTimeouts & timeouts);
     void sendHello();
+    void sendAddendum();
     void receiveHello();
 
 #if USE_SSL
     void sendClusterNameAndSalt();
 #endif
-    bool ping();
+    bool ping(const ConnectionTimeouts & timeouts);
 
     Block receiveData();
     Block receiveLogData();
diff --git a/src/Client/ConnectionParameters.cpp b/src/Client/ConnectionParameters.cpp
index 3101176101b..6d538fee307 100644
--- a/src/Client/ConnectionParameters.cpp
+++ b/src/Client/ConnectionParameters.cpp
@@ -58,6 +58,7 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
         if (auto * result = readpassphrase(prompt.c_str(), buf, sizeof(buf), 0))
             password = result;
     }
+    quota_key = config.getString("quota_key", "");
 
     /// By default compression is disabled if address looks like localhost.
     compression = config.getBool("compression", !isLocalAddress(DNSResolver::instance().resolveHost(host)))
@@ -68,6 +69,8 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
             Poco::Timespan(config.getInt("send_timeout", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0),
             Poco::Timespan(config.getInt("receive_timeout", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC), 0),
             Poco::Timespan(config.getInt("tcp_keep_alive_timeout", 0), 0));
+
+    timeouts.sync_request_timeout = Poco::Timespan(config.getInt("sync_request_timeout", DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC), 0);
 }
 
 ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfiguration & config)
diff --git a/src/Client/ConnectionParameters.h b/src/Client/ConnectionParameters.h
index ae204296fbf..0ccd6b92290 100644
--- a/src/Client/ConnectionParameters.h
+++ b/src/Client/ConnectionParameters.h
@@ -18,6 +18,7 @@ struct ConnectionParameters
     std::string default_database;
     std::string user;
     std::string password;
+    std::string quota_key;
     Protocol::Secure security = Protocol::Secure::Disable;
     Protocol::Compression compression = Protocol::Compression::Enable;
     ConnectionTimeouts timeouts;
diff --git a/src/Client/ConnectionPool.cpp b/src/Client/ConnectionPool.cpp
index 4ec87127318..8433b0833fa 100644
--- a/src/Client/ConnectionPool.cpp
+++ b/src/Client/ConnectionPool.cpp
@@ -12,6 +12,7 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
     String default_database,
     String user,
     String password,
+    String quota_key,
     String cluster,
     String cluster_secret,
     String client_name,
@@ -20,7 +21,7 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
     Int64 priority)
 {
     Key key{
-        max_connections, host, port, default_database, user, password, cluster, cluster_secret, client_name, compression, secure, priority};
+        max_connections, host, port, default_database, user, password, quota_key, cluster, cluster_secret, client_name, compression, secure, priority};
 
     std::lock_guard lock(mutex);
     auto [it, inserted] = pools.emplace(key, ConnectionPoolPtr{});
@@ -37,6 +38,7 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
             default_database,
             user,
             password,
+            quota_key,
             cluster,
             cluster_secret,
             client_name,
diff --git a/src/Client/ConnectionPool.h b/src/Client/ConnectionPool.h
index d1ee844358b..c3d0955019e 100644
--- a/src/Client/ConnectionPool.h
+++ b/src/Client/ConnectionPool.h
@@ -54,6 +54,7 @@ public:
             const String & default_database_,
             const String & user_,
             const String & password_,
+            const String & quota_key_,
             const String & cluster_,
             const String & cluster_secret_,
             const String & client_name_,
@@ -67,6 +68,7 @@ public:
         default_database(default_database_),
         user(user_),
         password(password_),
+        quota_key(quota_key_),
         cluster(cluster_),
         cluster_secret(cluster_secret_),
         client_name(client_name_),
@@ -112,7 +114,7 @@ protected:
     {
         return std::make_shared<Connection>(
             host, port,
-            default_database, user, password,
+            default_database, user, password, quota_key,
             cluster, cluster_secret,
             client_name, compression, secure);
     }
@@ -123,6 +125,7 @@ private:
     String default_database;
     String user;
     String password;
+    String quota_key;
 
     /// For inter-server authorization
     String cluster;
@@ -149,6 +152,7 @@ public:
         String default_database;
         String user;
         String password;
+        String quota_key;
         String cluster;
         String cluster_secret;
         String client_name;
@@ -171,6 +175,7 @@ public:
         String default_database,
         String user,
         String password,
+        String quota_key,
         String cluster,
         String cluster_secret,
         String client_name,
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
index 9f0ead79981..f1802467b57 100644
--- a/src/Client/HedgedConnections.cpp
+++ b/src/Client/HedgedConnections.cpp
@@ -183,7 +183,7 @@ void HedgedConnections::sendQuery(
             modified_settings.parallel_replica_offset = fd_to_replica_location[replica.packet_receiver->getFileDescriptor()].offset;
         }
 
-        replica.connection->sendQuery(timeouts, query, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
+        replica.connection->sendQuery(timeouts, query, /* query_parameters */ {}, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
         replica.change_replica_timeout.setRelative(timeouts.receive_data_timeout);
         replica.packet_receiver->setReceiveTimeout(hedged_connections_factory.getConnectionTimeouts().receive_timeout);
     };
diff --git a/src/Client/IServerConnection.h b/src/Client/IServerConnection.h
index 542aecb9849..5a09f23a70c 100644
--- a/src/Client/IServerConnection.h
+++ b/src/Client/IServerConnection.h
@@ -86,6 +86,7 @@ public:
     virtual void sendQuery(
         const ConnectionTimeouts & timeouts,
         const String & query,
+        const NameToNameMap & query_parameters,
         const String & query_id_,
         UInt64 stage,
         const Settings * settings,
@@ -121,7 +122,7 @@ public:
     virtual bool isConnected() const = 0;
 
     /// Check if connection is still active with ping request.
-    virtual bool checkConnected() = 0;
+    virtual bool checkConnected(const ConnectionTimeouts & /*timeouts*/) = 0;
 
     /** Disconnect.
       * This may be used, if connection is left in unsynchronised state
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
index 425e54fb392..b10e24f1ae4 100644
--- a/src/Client/LocalConnection.cpp
+++ b/src/Client/LocalConnection.cpp
@@ -75,6 +75,7 @@ void LocalConnection::sendProfileEvents()
 void LocalConnection::sendQuery(
     const ConnectionTimeouts &,
     const String & query,
+    const NameToNameMap & query_parameters,
     const String & query_id,
     UInt64 stage,
     const Settings *,
@@ -82,6 +83,9 @@ void LocalConnection::sendQuery(
     bool,
     std::function<void(const Progress &)> process_progress_callback)
 {
+    if (!query_parameters.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "clickhouse local does not support query parameters");
+
     /// Suggestion comes without client_info.
     if (client_info)
         query_context = session.makeQueryContext(*client_info);
diff --git a/src/Client/LocalConnection.h b/src/Client/LocalConnection.h
index 1ebe4a1d901..7967874d11f 100644
--- a/src/Client/LocalConnection.h
+++ b/src/Client/LocalConnection.h
@@ -94,6 +94,7 @@ public:
     void sendQuery(
         const ConnectionTimeouts & timeouts,
         const String & query,
+        const NameToNameMap & query_parameters,
         const String & query_id/* = "" */,
         UInt64 stage/* = QueryProcessingStage::Complete */,
         const Settings * settings/* = nullptr */,
@@ -121,7 +122,7 @@ public:
 
     bool isConnected() const override { return true; }
 
-    bool checkConnected() override { return true; }
+    bool checkConnected(const ConnectionTimeouts & /*timeouts*/) override { return true; }
 
     void disconnect() override {}
 
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index b14ff9f2c8d..72cd4c46477 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -160,15 +160,15 @@ void MultiplexedConnections::sendQuery(
             if (enable_sample_offset_parallel_processing)
                 modified_settings.parallel_replica_offset = i;
 
-            replica_states[i].connection->sendQuery(timeouts, query, query_id,
-                                                    stage, &modified_settings, &client_info, with_pending_data, {});
+            replica_states[i].connection->sendQuery(
+                timeouts, query, /* query_parameters */ {}, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
         }
     }
     else
     {
         /// Use single replica.
-        replica_states[0].connection->sendQuery(timeouts, query, query_id,
-                                                stage, &modified_settings, &client_info, with_pending_data, {});
+        replica_states[0].connection->sendQuery(
+            timeouts, query, /* query_parameters */ {}, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
     }
 
     sent_query = true;
diff --git a/src/Client/Suggest.cpp b/src/Client/Suggest.cpp
index 1074adb2bd4..f8d41853566 100644
--- a/src/Client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -138,7 +138,8 @@ void Suggest::load(ContextPtr context, const ConnectionParameters & connection_p
 
 void Suggest::fetch(IServerConnection & connection, const ConnectionTimeouts & timeouts, const std::string & query)
 {
-    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete, nullptr, nullptr, false, {});
+    connection.sendQuery(
+        timeouts, query, {} /* query_parameters */, "" /* query_id */, QueryProcessingStage::Complete, nullptr, nullptr, false, {});
 
     while (true)
     {
diff --git a/src/Columns/Collator.h b/src/Columns/Collator.h
index 37dbe0d4347..dd61b66a2ca 100644
--- a/src/Columns/Collator.h
+++ b/src/Columns/Collator.h
@@ -46,8 +46,10 @@ public:
     int compare(const char * str1, size_t length1, const char * str2, size_t length2) const;
 
     const std::string & getLocale() const;
-private:
 
+    bool operator==(const Collator & other) const { return this->getLocale() == other.getLocale(); }
+
+private:
     std::string locale;
     UCollator * collator;
 };
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index 24da9644335..93bcc3eb611 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -56,7 +56,9 @@ ColumnArray::ColumnArray(MutableColumnPtr && nested_column, MutableColumnPtr &&
 
         /// This will also prevent possible overflow in offset.
         if (data->size() != last_offset)
-            throw Exception("offsets_column has data inconsistent with nested_column", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "offsets_column has data inconsistent with nested_column. Data size: {}, last offset: {}",
+                data->size(), last_offset);
     }
 
     /** NOTE
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index 9084e47c2f5..d89917fc6c2 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -12,12 +12,14 @@
 #include <Common/RadixSort.h>
 #include <Common/SipHash.h>
 #include <Common/WeakHash.h>
+#include <Common/TargetSpecific.h>
 #include <Common/assert_cast.h>
 #include <base/sort.h>
 #include <base/unaligned.h>
 #include <base/bit_cast.h>
 #include <base/scope_guard.h>
 
+#include <bit>
 #include <cmath>
 #include <cstring>
 
@@ -25,6 +27,10 @@
 #    include <emmintrin.h>
 #endif
 
+#if USE_MULTITARGET_CODE
+#    include <immintrin.h>
+#endif
+
 #if USE_EMBEDDED_COMPILER
 #include <DataTypes/Native.h>
 #include <llvm/IR/IRBuilder.h>
@@ -471,6 +477,128 @@ void ColumnVector<T>::insertRangeFrom(const IColumn & src, size_t start, size_t
     memcpy(data.data() + old_size, &src_vec.data[start], length * sizeof(data[0]));
 }
 
+static inline UInt64 blsr(UInt64 mask)
+{
+#ifdef __BMI__
+    return _blsr_u64(mask);
+#else
+    return mask & (mask-1);
+#endif
+}
+
+DECLARE_DEFAULT_CODE(
+template <typename T, typename Container, size_t SIMD_BYTES>
+inline void doFilterAligned(const UInt8 *& filt_pos, const UInt8 *& filt_end_aligned, const T *& data_pos, Container & res_data)
+{
+    while (filt_pos < filt_end_aligned)
+    {
+        UInt64 mask = bytes64MaskToBits64Mask(filt_pos);
+
+        if (0xffffffffffffffff == mask)
+        {
+            res_data.insert(data_pos, data_pos + SIMD_BYTES);
+        }
+        else
+        {
+            while (mask)
+            {
+                size_t index = std::countr_zero(mask);
+                res_data.push_back(data_pos[index]);
+                mask = blsr(mask);
+            }
+        }
+
+        filt_pos += SIMD_BYTES;
+        data_pos += SIMD_BYTES;
+    }
+}
+)
+
+namespace
+{
+template <typename T, typename Container>
+void resize(Container & res_data, size_t reserve_size)
+{
+#if defined(MEMORY_SANITIZER)
+    res_data.resize_fill(reserve_size, static_cast<T>(0)); // MSan doesn't recognize that all allocated memory is written by AVX-512 intrinsics.
+#else
+    res_data.resize(reserve_size);
+#endif
+}
+}
+
+DECLARE_AVX512VBMI2_SPECIFIC_CODE(
+template <size_t ELEMENT_WIDTH>
+inline void compressStoreAVX512(const void *src, void *dst, const UInt64 mask)
+{
+    __m512i vsrc = _mm512_loadu_si512(src);
+    if constexpr (ELEMENT_WIDTH == 1)
+        _mm512_mask_compressstoreu_epi8(dst, static_cast<__mmask64>(mask), vsrc);
+    else if constexpr (ELEMENT_WIDTH == 2)
+        _mm512_mask_compressstoreu_epi16(dst, static_cast<__mmask32>(mask), vsrc);
+    else if constexpr (ELEMENT_WIDTH == 4)
+        _mm512_mask_compressstoreu_epi32(dst, static_cast<__mmask16>(mask), vsrc);
+    else if constexpr (ELEMENT_WIDTH == 8)
+        _mm512_mask_compressstoreu_epi64(dst, static_cast<__mmask8>(mask), vsrc);
+}
+
+template <typename T, typename Container, size_t SIMD_BYTES>
+inline void doFilterAligned(const UInt8 *& filt_pos, const UInt8 *& filt_end_aligned, const T *& data_pos, Container & res_data)
+{
+    static constexpr size_t VEC_LEN = 64;   /// AVX512 vector length - 64 bytes
+    static constexpr size_t ELEMENT_WIDTH = sizeof(T);
+    static constexpr size_t ELEMENTS_PER_VEC = VEC_LEN / ELEMENT_WIDTH;
+    static constexpr UInt64 KMASK = 0xffffffffffffffff >> (64 - ELEMENTS_PER_VEC);
+
+    size_t current_offset = res_data.size();
+    size_t reserve_size = res_data.size();
+    size_t alloc_size = SIMD_BYTES * 2;
+
+    while (filt_pos < filt_end_aligned)
+    {
+        /// to avoid calling resize too frequently, resize to reserve buffer.
+        if (reserve_size - current_offset < SIMD_BYTES)
+        {
+            reserve_size += alloc_size;
+            resize<T>(res_data, reserve_size);
+            alloc_size *= 2;
+        }
+
+        UInt64 mask = bytes64MaskToBits64Mask(filt_pos);
+
+        if (0xffffffffffffffff == mask)
+        {
+            for (size_t i = 0; i < SIMD_BYTES; i += ELEMENTS_PER_VEC)
+                _mm512_storeu_si512(reinterpret_cast<void *>(&res_data[current_offset + i]),
+                        _mm512_loadu_si512(reinterpret_cast<const void *>(data_pos + i)));
+            current_offset += SIMD_BYTES;
+        }
+        else
+        {
+            if (mask)
+            {
+                for (size_t i = 0; i < SIMD_BYTES; i += ELEMENTS_PER_VEC)
+                {
+                    compressStoreAVX512<ELEMENT_WIDTH>(reinterpret_cast<const void *>(data_pos + i),
+                            reinterpret_cast<void *>(&res_data[current_offset]), mask & KMASK);
+                    current_offset += std::popcount(mask & KMASK);
+                    /// prepare mask for next iter, if ELEMENTS_PER_VEC = 64, no next iter
+                    if (ELEMENTS_PER_VEC < 64)
+                    {
+                        mask >>= ELEMENTS_PER_VEC;
+                    }
+                }
+            }
+        }
+
+        filt_pos += SIMD_BYTES;
+        data_pos += SIMD_BYTES;
+    }
+    /// resize to the real size.
+    res_data.resize(current_offset);
+}
+)
+
 template <typename T>
 ColumnPtr ColumnVector<T>::filter(const IColumn::Filter & filt, ssize_t result_size_hint) const
 {
@@ -496,31 +624,13 @@ ColumnPtr ColumnVector<T>::filter(const IColumn::Filter & filt, ssize_t result_s
     static constexpr size_t SIMD_BYTES = 64;
     const UInt8 * filt_end_aligned = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
 
-    while (filt_pos < filt_end_aligned)
-    {
-        UInt64 mask = bytes64MaskToBits64Mask(filt_pos);
-
-        if (0xffffffffffffffff == mask)
-        {
-            res_data.insert(data_pos, data_pos + SIMD_BYTES);
-        }
-        else
-        {
-            while (mask)
-            {
-                size_t index = std::countr_zero(mask);
-                res_data.push_back(data_pos[index]);
-            #ifdef __BMI__
-                mask = _blsr_u64(mask);
-            #else
-                mask = mask & (mask-1);
-            #endif
-            }
-        }
-
-        filt_pos += SIMD_BYTES;
-        data_pos += SIMD_BYTES;
-    }
+#if USE_MULTITARGET_CODE
+    static constexpr bool VBMI2_CAPABLE = sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8;
+    if (VBMI2_CAPABLE && isArchSupported(TargetArch::AVX512VBMI2))
+        TargetSpecific::AVX512VBMI2::doFilterAligned<T, Container, SIMD_BYTES>(filt_pos, filt_end_aligned, data_pos, res_data);
+    else
+#endif
+        TargetSpecific::Default::doFilterAligned<T, Container, SIMD_BYTES>(filt_pos, filt_end_aligned, data_pos, res_data);
 
     while (filt_pos < filt_end)
     {
diff --git a/src/Columns/tests/gtest_column_vector.cpp b/src/Columns/tests/gtest_column_vector.cpp
new file mode 100644
index 00000000000..5a8fd1fad60
--- /dev/null
+++ b/src/Columns/tests/gtest_column_vector.cpp
@@ -0,0 +1,91 @@
+#include <typeinfo>
+#include <vector>
+#include <Columns/ColumnsNumber.h>
+#include <Common/randomSeed.h>
+#include <gtest/gtest.h>
+
+
+using namespace DB;
+
+static pcg64 rng(randomSeed());
+static constexpr int error_code = 12345;
+static constexpr size_t TEST_RUNS = 500;
+static constexpr size_t MAX_ROWS = 10000;
+static const std::vector<size_t> filter_ratios = {1, 2, 5, 11, 32, 64, 100, 1000};
+static const size_t K = filter_ratios.size();
+
+template <typename T>
+static MutableColumnPtr createColumn(size_t n)
+{
+    auto column = ColumnVector<T>::create();
+    auto & values = column->getData();
+
+    for (size_t i = 0; i < n; ++i)
+    {
+        values.push_back(i);
+    }
+
+    return column;
+}
+
+bool checkFilter(const PaddedPODArray<UInt8> &flit, const IColumn & src, const IColumn & dst)
+{
+    size_t n = flit.size();
+    size_t dst_size = dst.size();
+    size_t j = 0;   /// index of dest
+    for (size_t i = 0; i < n; ++i)
+    {
+        if (flit[i] != 0)
+        {
+            if ((dst_size <= j) || (src.compareAt(i, j, dst, 0) != 0))
+                return false;
+            j++;
+        }
+    }
+    return dst_size == j;   /// filtered size check
+}
+
+template <typename T>
+static void testFilter()
+{
+    auto test_case = [&](size_t rows, size_t filter_ratio)
+    {
+        auto vector_column = createColumn<T>(rows);
+        PaddedPODArray<UInt8> flit(rows);
+        for (size_t i = 0; i < rows; ++i)
+            flit[i] = rng() % filter_ratio == 0;
+        auto res_column = vector_column->filter(flit, -1);
+
+        if (!checkFilter(flit, *vector_column, *res_column))
+            throw Exception(error_code, "VectorColumn filter failure, type: {}", typeid(T).name());
+    };
+
+    try
+    {
+        for (size_t i = 0; i < TEST_RUNS; ++i)
+        {
+            size_t rows = rng() % MAX_ROWS + 1;
+            size_t filter_ratio = filter_ratios[rng() % K];
+
+            test_case(rows, filter_ratio);
+        }
+    }
+    catch (const Exception & e)
+    {
+        FAIL() << e.displayText();
+    }
+}
+
+
+TEST(ColumnVector, Filter)
+{
+    testFilter<UInt8>();
+    testFilter<Int16>();
+    testFilter<UInt32>();
+    testFilter<Int64>();
+    testFilter<UInt128>();
+    testFilter<Int256>();
+    testFilter<Float32>();
+    testFilter<Float64>();
+    testFilter<UUID>();
+}
diff --git a/src/Common/BridgeProtocolVersion.h b/src/Common/BridgeProtocolVersion.h
new file mode 100644
index 00000000000..77d094fce3f
--- /dev/null
+++ b/src/Common/BridgeProtocolVersion.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <cstddef>
+
+namespace DB
+{
+
+// Version of protocol between clickhouse-server and clickhouse-library-bridge. Increment if you change it in a non-compatible way.
+static constexpr size_t LIBRARY_BRIDGE_PROTOCOL_VERSION = 1;
+
+// Version of protocol between clickhouse-server and clickhouse-xdbc-bridge. Increment if you change it in a non-compatible way.
+static constexpr size_t XDBC_BRIDGE_PROTOCOL_VERSION = 1;
+
+}
diff --git a/src/Common/LRUCache.h b/src/Common/CacheBase.h
similarity index 58%
rename from src/Common/LRUCache.h
rename to src/Common/CacheBase.h
index c149ee184ab..af6cd8cef65 100644
--- a/src/Common/LRUCache.h
+++ b/src/Common/CacheBase.h
@@ -1,11 +1,16 @@
 #pragma once
 
-#include <unordered_map>
-#include <list>
-#include <memory>
-#include <chrono>
-#include <mutex>
+#include <Common/Exception.h>
+#include <Common/ICachePolicy.h>
+#include <Common/LRUCachePolicy.h>
+#include <Common/SLRUCachePolicy.h>
+
 #include <atomic>
+#include <cassert>
+#include <chrono>
+#include <memory>
+#include <mutex>
+#include <unordered_map>
 
 #include <Common/logger_useful.h>
 #include <base/defines.h>
@@ -13,43 +18,54 @@
 
 namespace DB
 {
-
-template <typename T>
-struct TrivialWeightFunction
+namespace ErrorCodes
 {
-    size_t operator()(const T &) const
-    {
-        return 1;
-    }
-};
+    extern const int BAD_ARGUMENTS;
+}
 
-
-/// Thread-safe cache that evicts entries which are not used for a long time.
+/// Thread-safe cache that evicts entries using special cache policy
+/// (default policy evicts entries which are not used for a long time).
 /// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
 /// of that value.
 /// Cache starts to evict entries when their total weight exceeds max_size.
 /// Value weight should not change after insertion.
 template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
-class LRUCache
+class CacheBase
 {
 public:
     using Key = TKey;
     using Mapped = TMapped;
     using MappedPtr = std::shared_ptr<Mapped>;
 
-    /** Initialize LRUCache with max_size and max_elements_size.
-      * max_elements_size == 0 means no elements size restrictions.
-      */
-    explicit LRUCache(size_t max_size_, size_t max_elements_size_ = 0)
-        : max_size(std::max(static_cast<size_t>(1), max_size_))
-        , max_elements_size(max_elements_size_)
-        {}
+    CacheBase(size_t max_size, size_t max_elements_size = 0, String cache_policy_name = "", double size_ratio = 0.5)
+    {
+        auto on_weight_loss_function = [&](size_t weight_loss) { onRemoveOverflowWeightLoss(weight_loss); };
+
+        if (cache_policy_name.empty())
+        {
+            cache_policy_name = default_cache_policy_name;
+        }
+
+        if (cache_policy_name == "LRU")
+        {
+            using LRUPolicy = LRUCachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+            cache_policy = std::make_unique<LRUPolicy>(max_size, max_elements_size, on_weight_loss_function);
+        }
+        else if (cache_policy_name == "SLRU")
+        {
+            using SLRUPolicy = SLRUCachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+            cache_policy = std::make_unique<SLRUPolicy>(max_size, max_elements_size, size_ratio, on_weight_loss_function);
+        }
+        else
+        {
+            throw Exception("Undeclared cache policy name: " + cache_policy_name, ErrorCodes::BAD_ARGUMENTS);
+        }
+    }
 
     MappedPtr get(const Key & key)
     {
         std::lock_guard lock(mutex);
-
-        auto res = getImpl(key);
+        auto res = cache_policy->get(key, lock);
         if (res)
             ++hits;
         else
@@ -61,20 +77,7 @@ public:
     void set(const Key & key, const MappedPtr & mapped)
     {
         std::lock_guard lock(mutex);
-
-        setImpl(key, mapped);
-    }
-
-    void remove(const Key & key)
-    {
-        std::lock_guard lock(mutex);
-        auto it = cells.find(key);
-        if (it == cells.end())
-            return;
-        auto & cell = it->second;
-        current_size -= cell.size;
-        queue.erase(cell.queue_iterator);
-        cells.erase(it);
+        cache_policy->set(key, mapped, lock);
     }
 
     /// If the value for the key is in the cache, returns it. If it is not, calls load_func() to
@@ -91,8 +94,7 @@ public:
         InsertTokenHolder token_holder;
         {
             std::lock_guard cache_lock(mutex);
-
-            auto val = getImpl(key);
+            auto val = cache_policy->get(key, cache_lock);
             if (val)
             {
                 ++hits;
@@ -130,7 +132,7 @@ public:
         auto token_it = insert_tokens.find(key);
         if (token_it != insert_tokens.end() && token_it->second.get() == token)
         {
-            setImpl(key, token->value);
+            cache_policy->set(key, token->value, cache_lock);
             result = true;
         }
 
@@ -147,64 +149,64 @@ public:
         out_misses = misses;
     }
 
+    void reset()
+    {
+        std::lock_guard lock(mutex);
+        insert_tokens.clear();
+        hits = 0;
+        misses = 0;
+        cache_policy->reset(lock);
+    }
+
+    void remove(const Key & key)
+    {
+        std::lock_guard lock(mutex);
+        cache_policy->remove(key, lock);
+    }
+
     size_t weight() const
     {
         std::lock_guard lock(mutex);
-        return current_size;
+        return cache_policy->weight(lock);
     }
 
     size_t count() const
     {
         std::lock_guard lock(mutex);
-        return cells.size();
+        return cache_policy->count(lock);
     }
 
     size_t maxSize() const
+        TSA_NO_THREAD_SAFETY_ANALYSIS // disabled because max_size of cache_policy is a constant parameter
     {
-        return max_size;
+        return cache_policy->maxSize();
     }
 
-    void reset()
-    {
-        std::lock_guard lock(mutex);
-        queue.clear();
-        cells.clear();
-        insert_tokens.clear();
-        current_size = 0;
-        hits = 0;
-        misses = 0;
-    }
-
-    virtual ~LRUCache() = default;
+    virtual ~CacheBase() = default;
 
 protected:
-    using LRUQueue = std::list<Key>;
-    using LRUQueueIterator = typename LRUQueue::iterator;
-
-    struct Cell
-    {
-        MappedPtr value;
-        size_t size;
-        LRUQueueIterator queue_iterator;
-    };
-
-    using Cells = std::unordered_map<Key, Cell, HashFunction>;
-
-    Cells cells TSA_GUARDED_BY(mutex);
-
     mutable std::mutex mutex;
+
 private:
+    using CachePolicy = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+
+    std::unique_ptr<CachePolicy> cache_policy TSA_GUARDED_BY(mutex);
+
+    inline static const String default_cache_policy_name = "SLRU";
+
+    std::atomic<size_t> hits{0};
+    std::atomic<size_t> misses{0};
 
     /// Represents pending insertion attempt.
     struct InsertToken
     {
-        explicit InsertToken(LRUCache & cache_) : cache(cache_) {}
+        explicit InsertToken(CacheBase & cache_) : cache(cache_) {}
 
         std::mutex mutex;
         bool cleaned_up TSA_GUARDED_BY(mutex) = false;
         MappedPtr value TSA_GUARDED_BY(mutex);
 
-        LRUCache & cache;
+        CacheBase & cache;
         size_t refcount = 0; /// Protected by the cache mutex
     };
 
@@ -221,7 +223,7 @@ private:
 
         InsertTokenHolder() = default;
 
-        void acquire(const Key * key_, const std::shared_ptr<InsertToken> & token_, [[maybe_unused]] std::lock_guard<std::mutex> & cache_lock)
+        void acquire(const Key * key_, const std::shared_ptr<InsertToken> & token_, std::lock_guard<std::mutex> & /* cache_lock */)
             TSA_NO_THREAD_SAFETY_ANALYSIS // disabled only because we can't reference the parent-level cache mutex from here
         {
             key = key_;
@@ -229,7 +231,7 @@ private:
             ++token->refcount;
         }
 
-        void cleanup([[maybe_unused]] std::lock_guard<std::mutex> & token_lock, [[maybe_unused]] std::lock_guard<std::mutex> & cache_lock)
+        void cleanup(std::lock_guard<std::mutex> & /* token_lock */, std::lock_guard<std::mutex> & /* cache_lock */)
             TSA_NO_THREAD_SAFETY_ANALYSIS // disabled only because we can't reference the parent-level cache mutex from here
         {
             token->cache.insert_tokens.erase(*key);
@@ -260,105 +262,8 @@ private:
 
     friend struct InsertTokenHolder;
 
-
     InsertTokenById insert_tokens TSA_GUARDED_BY(mutex);
 
-    LRUQueue queue TSA_GUARDED_BY(mutex);
-
-    /// Total weight of values.
-    size_t current_size TSA_GUARDED_BY(mutex) = 0;
-    const size_t max_size;
-    const size_t max_elements_size;
-
-    std::atomic<size_t> hits {0};
-    std::atomic<size_t> misses {0};
-
-    const WeightFunction weight_function;
-
-    MappedPtr getImpl(const Key & key) TSA_REQUIRES(mutex)
-    {
-        auto it = cells.find(key);
-        if (it == cells.end())
-        {
-            return MappedPtr();
-        }
-
-        Cell & cell = it->second;
-
-        /// Move the key to the end of the queue. The iterator remains valid.
-        queue.splice(queue.end(), queue, cell.queue_iterator);
-
-        return cell.value;
-    }
-
-    void setImpl(const Key & key, const MappedPtr & mapped) TSA_REQUIRES(mutex)
-    {
-        auto [it, inserted] = cells.emplace(std::piecewise_construct,
-            std::forward_as_tuple(key),
-            std::forward_as_tuple());
-
-        Cell & cell = it->second;
-
-        if (inserted)
-        {
-            try
-            {
-                cell.queue_iterator = queue.insert(queue.end(), key);
-            }
-            catch (...)
-            {
-                cells.erase(it);
-                throw;
-            }
-        }
-        else
-        {
-            current_size -= cell.size;
-            queue.splice(queue.end(), queue, cell.queue_iterator);
-        }
-
-        cell.value = mapped;
-        cell.size = cell.value ? weight_function(*cell.value) : 0;
-        current_size += cell.size;
-
-        removeOverflow();
-    }
-
-    void removeOverflow() TSA_REQUIRES(mutex)
-    {
-        size_t current_weight_lost = 0;
-        size_t queue_size = cells.size();
-
-        while ((current_size > max_size || (max_elements_size != 0 && queue_size > max_elements_size)) && (queue_size > 1))
-        {
-            const Key & key = queue.front();
-
-            auto it = cells.find(key);
-            if (it == cells.end())
-            {
-                LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
-                abort();
-            }
-
-            const auto & cell = it->second;
-
-            current_size -= cell.size;
-            current_weight_lost += cell.size;
-
-            cells.erase(it);
-            queue.pop_front();
-            --queue_size;
-        }
-
-        onRemoveOverflowWeightLoss(current_weight_lost);
-
-        if (current_size > (1ull << 63))
-        {
-            LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
-            abort();
-        }
-    }
-
     /// Override this method if you want to track how much weight was lost in removeOverflow method.
     virtual void onRemoveOverflowWeightLoss(size_t /*weight_loss*/) {}
 };
diff --git a/src/Common/CaresPTRResolver.cpp b/src/Common/CaresPTRResolver.cpp
index f6228e97c02..376d3665f7e 100644
--- a/src/Common/CaresPTRResolver.cpp
+++ b/src/Common/CaresPTRResolver.cpp
@@ -35,8 +35,13 @@ namespace DB
          * See https://github.com/grpc/grpc/blob/master/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc#L1187
          * That means it's safe to init it here, but we should be cautious when introducing new code that depends on c-ares and even updates
          * to grpc. As discussed in https://github.com/ClickHouse/ClickHouse/pull/37827#discussion_r919189085, c-ares should be adapted to be atomic
+         *
+         * Since C++ 11 static objects are initialized in a thread safe manner. The static qualifier also makes sure
+         * it'll be called/ initialized only once.
          * */
-        if (ares_library_init(ARES_LIB_INIT_ALL) != ARES_SUCCESS || ares_init(&channel) != ARES_SUCCESS)
+        static const auto library_init_result = ares_library_init(ARES_LIB_INIT_ALL);
+
+        if (library_init_result != ARES_SUCCESS || ares_init(&channel) != ARES_SUCCESS)
         {
             throw DB::Exception("Failed to initialize c-ares", DB::ErrorCodes::DNS_ERROR);
         }
@@ -45,7 +50,12 @@ namespace DB
     CaresPTRResolver::~CaresPTRResolver()
     {
         ares_destroy(channel);
-        ares_library_cleanup();
+        /*
+         * Library initialization is currently done only once in the constructor. Multiple instances of CaresPTRResolver
+         * will be used in the lifetime of ClickHouse, thus it's problematic to have de-init here.
+         * In a practical view, it makes little to no sense to de-init a DNS library since DNS requests will happen
+         * until the end of the program. Hence, ares_library_cleanup() will not be called.
+         * */
     }
 
     std::vector<std::string> CaresPTRResolver::resolve(const std::string & ip)
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index e921f4fbf9a..0e4617345fa 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -4,13 +4,11 @@
 #include <Common/HashTable/HashTableKeyHolder.h>
 #include <Common/ColumnsHashingImpl.h>
 #include <Common/Arena.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/assert_cast.h>
-#include "Columns/IColumn.h"
 #include <base/unaligned.h>
 
 #include <Columns/ColumnString.h>
-#include <Columns/ColumnConst.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnLowCardinality.h>
 
@@ -85,11 +83,8 @@ struct HashMethodString
 
     HashMethodString(const ColumnRawPtrs & key_columns, const Sizes & /*key_sizes*/, const HashMethodContextPtr &)
     {
-        const IColumn * column = key_columns[0];
-        if (isColumnConst(*column))
-            column = &assert_cast<const ColumnConst &>(*column).getDataColumn();
-
-        const ColumnString & column_string = assert_cast<const ColumnString &>(*column);
+        const IColumn & column = *key_columns[0];
+        const ColumnString & column_string = assert_cast<const ColumnString &>(column);
         offsets = column_string.getOffsets().data();
         chars = column_string.getChars().data();
     }
@@ -193,7 +188,7 @@ public:
     void set(const DictionaryKey & key, const CachedValuesPtr & mapped) { cache.set(key, mapped); }
 
 private:
-    using Cache = LRUCache<DictionaryKey, CachedValues, DictionaryKeyHash>;
+    using Cache = CacheBase<DictionaryKey, CachedValues, DictionaryKeyHash>;
     Cache cache;
 };
 
diff --git a/src/Common/CpuId.h b/src/Common/CpuId.h
index 167fa22faf6..1e54ccf62b3 100644
--- a/src/Common/CpuId.h
+++ b/src/Common/CpuId.h
@@ -82,6 +82,7 @@ inline bool cpuid(UInt32 op, UInt32 * res) noexcept /// NOLINT
     OP(AVX512BW)             \
     OP(AVX512VL)             \
     OP(AVX512VBMI)           \
+    OP(AVX512VBMI2)          \
     OP(PREFETCHWT1)          \
     OP(SHA)                  \
     OP(ADX)                  \
@@ -302,6 +303,11 @@ bool haveAVX512VBMI() noexcept
     return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ecx >> 1) & 1u);
 }
 
+bool haveAVX512VBMI2() noexcept
+{
+    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ecx >> 6) & 1u);
+}
+
 bool haveRDRAND() noexcept
 {
     return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x1).registers.ecx >> 30) & 1u);
diff --git a/src/Common/CurrentMemoryTracker.cpp b/src/Common/CurrentMemoryTracker.cpp
index e41cb258f08..921c244da21 100644
--- a/src/Common/CurrentMemoryTracker.cpp
+++ b/src/Common/CurrentMemoryTracker.cpp
@@ -51,15 +51,23 @@ void CurrentMemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
     {
         if (current_thread)
         {
-            current_thread->untracked_memory += size;
+            Int64 will_be = current_thread->untracked_memory + size;
+            Int64 limit = current_thread->untracked_memory_limit + current_thread->untracked_memory_limit_increase;
 
-            if (current_thread->untracked_memory > current_thread->untracked_memory_limit)
+            if (will_be > limit)
             {
-                /// Zero untracked before track. If tracker throws out-of-limit we would be able to alloc up to untracked_memory_limit bytes
+                /// Increase limit before track. If tracker throws out-of-limit we would be able to alloc up to untracked_memory_limit bytes
                 /// more. It could be useful to enlarge Exception message in rethrow logic.
-                Int64 tmp = current_thread->untracked_memory;
+                current_thread->untracked_memory_limit_increase = current_thread->untracked_memory_limit;
+                memory_tracker->allocImpl(will_be, throw_if_memory_exceeded);
+                current_thread->untracked_memory_limit_increase = 0;
                 current_thread->untracked_memory = 0;
-                memory_tracker->allocImpl(tmp, throw_if_memory_exceeded);
+            }
+            else
+            {
+                /// Update after successful allocations,
+                /// since failed allocations should not be take into account.
+                current_thread->untracked_memory = will_be;
             }
         }
         /// total_memory_tracker only, ignore untracked_memory
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index f479e4cc140..c46342f6ade 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -92,6 +92,8 @@
     M(FilesystemCacheReadBuffers, "Number of active cache buffers") \
     M(CacheFileSegments, "Number of existing cache file segments") \
     M(CacheDetachedFileSegments, "Number of existing detached cache file segments") \
+    M(FilesystemCacheSize, "Filesystem cache size in bytes") \
+    M(FilesystemCacheElements, "Filesystem cache elements (file segments)") \
     M(S3Requests, "S3 requests") \
     M(KeeperAliveConnections, "Number of alive connections") \
     M(KeeperOutstandingRequets, "Number of outstanding requests") \
diff --git a/src/Common/CurrentThread.cpp b/src/Common/CurrentThread.cpp
index e3f6b63b28a..a2cdf9c8361 100644
--- a/src/Common/CurrentThread.cpp
+++ b/src/Common/CurrentThread.cpp
@@ -43,13 +43,6 @@ ProfileEvents::Counters & CurrentThread::getProfileEvents()
     return current_thread ? current_thread->performance_counters : ProfileEvents::global_counters;
 }
 
-MemoryTracker * CurrentThread::getMemoryTracker()
-{
-    if (unlikely(!current_thread))
-        return nullptr;
-    return &current_thread->memory_tracker;
-}
-
 void CurrentThread::updateProgressIn(const Progress & value)
 {
     if (unlikely(!current_thread))
diff --git a/src/Common/CurrentThread.h b/src/Common/CurrentThread.h
index fa52fafa9e2..cbe60365798 100644
--- a/src/Common/CurrentThread.h
+++ b/src/Common/CurrentThread.h
@@ -54,7 +54,12 @@ public:
     static void updatePerformanceCounters();
 
     static ProfileEvents::Counters & getProfileEvents();
-    static MemoryTracker * getMemoryTracker();
+    inline ALWAYS_INLINE static MemoryTracker * getMemoryTracker()
+    {
+        if (unlikely(!current_thread))
+            return nullptr;
+        return &current_thread->memory_tracker;
+    }
 
     /// Update read and write rows (bytes) statistics (used in system.query_thread_log)
     static void updateProgressIn(const Progress & value);
diff --git a/src/Common/DNSPTRResolverProvider.cpp b/src/Common/DNSPTRResolverProvider.cpp
index 41c73f4f36f..97d601a3a78 100644
--- a/src/Common/DNSPTRResolverProvider.cpp
+++ b/src/Common/DNSPTRResolverProvider.cpp
@@ -5,9 +5,8 @@ namespace DB
 {
     std::shared_ptr<DNSPTRResolver> DNSPTRResolverProvider::get()
     {
-        static auto cares_resolver = std::make_shared<CaresPTRResolver>(
+        return std::make_shared<CaresPTRResolver>(
             CaresPTRResolver::provider_token {}
         );
-        return cares_resolver;
     }
 }
diff --git a/src/Common/DateLUT.cpp b/src/Common/DateLUT.cpp
index d14b63cd70a..1206015b764 100644
--- a/src/Common/DateLUT.cpp
+++ b/src/Common/DateLUT.cpp
@@ -3,6 +3,7 @@
 #include <Poco/DigestStream.h>
 #include <Poco/Exception.h>
 #include <Poco/SHA1Engine.h>
+#include <Common/filesystemHelpers.h>
 
 #include <filesystem>
 #include <fstream>
@@ -64,9 +65,9 @@ std::string determineDefaultTimeZone()
         ///  /etc/localtime -> /usr/share/zoneinfo//UTC
         ///  /usr/share/zoneinfo//UTC -> UCT
         /// But the preferred time zone name is pointed by the first link (UTC), and the second link is just an internal detail.
-        if (fs::is_symlink(tz_file_path))
+        if (FS::isSymlink(tz_file_path))
         {
-            tz_file_path = fs::read_symlink(tz_file_path);
+            tz_file_path = FS::readSymlink(tz_file_path);
             /// If it's relative - make it absolute.
             if (tz_file_path.is_relative())
                 tz_file_path = (fs::path("/etc/") / tz_file_path).lexically_normal();
diff --git a/src/Common/DateLUTImpl.h b/src/Common/DateLUTImpl.h
index 4bc9614abcb..f9361e809a9 100644
--- a/src/Common/DateLUTImpl.h
+++ b/src/Common/DateLUTImpl.h
@@ -10,20 +10,23 @@
 #include <type_traits>
 
 
-#define DATE_LUT_MIN_YEAR 1925 /// 1925 since wast majority of timezones changed to 15-minute aligned offsets somewhere in 1924 or earlier.
-#define DATE_LUT_MAX_YEAR 2283 /// Last supported year (complete)
+#define DATE_LUT_MIN_YEAR 1900 /// 1900 since majority of financial organizations consider 1900 as an initial year.
+#define DATE_LUT_MAX_YEAR 2299 /// Last supported year (complete)
 #define DATE_LUT_YEARS (1 + DATE_LUT_MAX_YEAR - DATE_LUT_MIN_YEAR) /// Number of years in lookup table
 
-#define DATE_LUT_SIZE 0x20000
+#define DATE_LUT_SIZE 0x23AB1
 
 #define DATE_LUT_MAX (0xFFFFFFFFU - 86400)
 #define DATE_LUT_MAX_DAY_NUM 0xFFFF
+
+#define DAYNUM_OFFSET_EPOCH 25567
+
 /// Max int value of Date32, DATE LUT cache size minus daynum_offset_epoch
-#define DATE_LUT_MAX_EXTEND_DAY_NUM (DATE_LUT_SIZE - 16436)
+#define DATE_LUT_MAX_EXTEND_DAY_NUM (DATE_LUT_SIZE - DAYNUM_OFFSET_EPOCH)
 
 /// A constant to add to time_t so every supported time point becomes non-negative and still has the same remainder of division by 3600.
 /// If we treat "remainder of division" operation in the sense of modular arithmetic (not like in C++).
-#define DATE_LUT_ADD ((1970 - DATE_LUT_MIN_YEAR) * 366 * 86400)
+#define DATE_LUT_ADD ((1970 - DATE_LUT_MIN_YEAR) * 366L * 86400)
 
 
 #if defined(__PPC__)
@@ -64,62 +67,78 @@ private:
     // Same as above but select different function overloads for zero saturation.
     STRONG_TYPEDEF(UInt32, LUTIndexWithSaturation)
 
+    static inline LUTIndex normalizeLUTIndex(UInt32 index)
+    {
+        if (index >= DATE_LUT_SIZE)
+            return LUTIndex(DATE_LUT_SIZE - 1);
+        return LUTIndex{index};
+    }
+
+    static inline LUTIndex normalizeLUTIndex(Int64 index)
+    {
+        if (unlikely(index < 0))
+            return LUTIndex(0);
+        if (index >= DATE_LUT_SIZE)
+            return LUTIndex(DATE_LUT_SIZE - 1);
+        return LUTIndex{index};
+    }
+
     template <typename T>
     friend inline LUTIndex operator+(const LUTIndex & index, const T v)
     {
-        return LUTIndex{(index.toUnderType() + UInt32(v)) & date_lut_mask};
+        return normalizeLUTIndex(index.toUnderType() + UInt32(v));
     }
 
     template <typename T>
     friend inline LUTIndex operator+(const T v, const LUTIndex & index)
     {
-        return LUTIndex{(v + index.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<Int64>(v + index.toUnderType()));
     }
 
     friend inline LUTIndex operator+(const LUTIndex & index, const LUTIndex & v)
     {
-        return LUTIndex{(index.toUnderType() + v.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<UInt32>(index.toUnderType() + v.toUnderType()));
     }
 
     template <typename T>
     friend inline LUTIndex operator-(const LUTIndex & index, const T v)
     {
-        return LUTIndex{(index.toUnderType() - UInt32(v)) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<Int64>(index.toUnderType() - UInt32(v)));
     }
 
     template <typename T>
     friend inline LUTIndex operator-(const T v, const LUTIndex & index)
     {
-        return LUTIndex{(v - index.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<Int64>(v - index.toUnderType()));
     }
 
     friend inline LUTIndex operator-(const LUTIndex & index, const LUTIndex & v)
     {
-        return LUTIndex{(index.toUnderType() - v.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<Int64>(index.toUnderType() - v.toUnderType()));
     }
 
     template <typename T>
     friend inline LUTIndex operator*(const LUTIndex & index, const T v)
     {
-        return LUTIndex{(index.toUnderType() * UInt32(v)) & date_lut_mask};
+        return normalizeLUTIndex(index.toUnderType() * UInt32(v));
     }
 
     template <typename T>
     friend inline LUTIndex operator*(const T v, const LUTIndex & index)
     {
-        return LUTIndex{(v * index.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(v * index.toUnderType());
     }
 
     template <typename T>
     friend inline LUTIndex operator/(const LUTIndex & index, const T v)
     {
-        return LUTIndex{(index.toUnderType() / UInt32(v)) & date_lut_mask};
+        return normalizeLUTIndex(index.toUnderType() / UInt32(v));
     }
 
     template <typename T>
     friend inline LUTIndex operator/(const T v, const LUTIndex & index)
     {
-        return LUTIndex{(UInt32(v) / index.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(UInt32(v) / index.toUnderType());
     }
 
 public:
@@ -168,14 +187,9 @@ public:
     static_assert(sizeof(Values) == 16);
 
 private:
-
-    /// Mask is all-ones to allow efficient protection against overflow.
-    static constexpr UInt32 date_lut_mask = 0x1ffff;
-    static_assert(date_lut_mask == DATE_LUT_SIZE - 1);
-
     /// Offset to epoch in days (ExtendedDayNum) of the first day in LUT.
     /// "epoch" is the Unix Epoch (starts at unix timestamp zero)
-    static constexpr UInt32 daynum_offset_epoch = 16436;
+    static constexpr UInt32 daynum_offset_epoch = 25567;
     static_assert(daynum_offset_epoch == (1970 - DATE_LUT_MIN_YEAR) * 365 + (1970 - DATE_LUT_MIN_YEAR / 4 * 4) / 4);
 
     /// Lookup table is indexed by LUTIndex.
@@ -232,12 +246,12 @@ private:
 
     static inline LUTIndex toLUTIndex(DayNum d)
     {
-        return LUTIndex{(d + daynum_offset_epoch) & date_lut_mask};
+        return normalizeLUTIndex(d + daynum_offset_epoch);
     }
 
     static inline LUTIndex toLUTIndex(ExtendedDayNum d)
     {
-        return LUTIndex{static_cast<UInt32>(d + daynum_offset_epoch) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<UInt32>(d + daynum_offset_epoch));
     }
 
     inline LUTIndex toLUTIndex(Time t) const
@@ -1062,7 +1076,7 @@ public:
 
         auto year_lut_index = (year - DATE_LUT_MIN_YEAR) * 12 + month - 1;
         UInt32 index = years_months_lut[year_lut_index].toUnderType() + day_of_month - 1;
-        /// When date is out of range, default value is DATE_LUT_SIZE - 1 (2283-11-11)
+        /// When date is out of range, default value is DATE_LUT_SIZE - 1 (2299-12-31)
         return LUTIndex{std::min(index, static_cast<UInt32>(DATE_LUT_SIZE - 1))};
     }
 
diff --git a/src/Common/LRUFileCache.cpp b/src/Common/FileCache.cpp
similarity index 72%
rename from src/Common/LRUFileCache.cpp
rename to src/Common/FileCache.cpp
index 6306b6de059..5a59bb6182a 100644
--- a/src/Common/LRUFileCache.cpp
+++ b/src/Common/FileCache.cpp
@@ -1,8 +1,7 @@
-#include "LRUFileCache.h"
+#include "FileCache.h"
 
 #include <Common/randomSeed.h>
 #include <Common/SipHash.h>
-#include <Common/hex.h>
 #include <Common/FileCacheSettings.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
@@ -11,6 +10,7 @@
 #include <IO/Operators.h>
 #include <pcg-random/pcg_random.hpp>
 #include <filesystem>
+#include <Common/LRUFileCachePriority.h>
 
 namespace fs = std::filesystem;
 
@@ -22,16 +22,188 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-LRUFileCache::LRUFileCache(const String & cache_base_path_, const FileCacheSettings & cache_settings_)
-    : IFileCache(cache_base_path_, cache_settings_)
+FileCache::FileCache(
+    const String & cache_base_path_,
+    const FileCacheSettings & cache_settings_)
+    : cache_base_path(cache_base_path_)
+    , max_size(cache_settings_.max_size)
+    , max_element_size(cache_settings_.max_elements)
+    , max_file_segment_size(cache_settings_.max_file_segment_size)
+    , enable_filesystem_query_cache_limit(cache_settings_.enable_filesystem_query_cache_limit)
+    , main_priority(std::make_unique<LRUFileCachePriority>())
+    , stash_priority(std::make_unique<LRUFileCachePriority>())
     , max_stash_element_size(cache_settings_.max_elements)
     , enable_cache_hits_threshold(cache_settings_.enable_cache_hits_threshold)
-    , log(&Poco::Logger::get("LRUFileCache"))
+    , log(&Poco::Logger::get("FileCache"))
     , allow_to_remove_persistent_segments_from_cache_by_default(cache_settings_.allow_to_remove_persistent_segments_from_cache_by_default)
 {
 }
 
-void LRUFileCache::initialize()
+FileCache::Key FileCache::hash(const String & path)
+{
+    return Key(sipHash128(path.data(), path.size()));
+}
+
+String FileCache::getPathInLocalCache(const Key & key, size_t offset, bool is_persistent) const
+{
+    auto key_str = key.toString();
+    return fs::path(cache_base_path)
+        / key_str.substr(0, 3)
+        / key_str
+        / (std::to_string(offset) + (is_persistent ? "_persistent" : ""));
+}
+
+String FileCache::getPathInLocalCache(const Key & key) const
+{
+    auto key_str = key.toString();
+    return fs::path(cache_base_path) / key_str.substr(0, 3) / key_str;
+}
+
+static bool isQueryInitialized()
+{
+    return CurrentThread::isInitialized()
+        && CurrentThread::get().getQueryContext()
+        && !CurrentThread::getQueryId().empty();
+}
+
+bool FileCache::isReadOnly()
+{
+    return !isQueryInitialized();
+}
+
+void FileCache::assertInitialized() const
+{
+    if (!is_initialized)
+        throw Exception(ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR, "Cache not initialized");
+}
+
+FileCache::QueryContextPtr FileCache::getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock)
+{
+    if (!isQueryInitialized())
+        return nullptr;
+
+    return getQueryContext(std::string(CurrentThread::getQueryId()), cache_lock);
+}
+
+FileCache::QueryContextPtr FileCache::getQueryContext(const String & query_id, std::lock_guard<std::mutex> & /* cache_lock */)
+{
+    auto query_iter = query_map.find(query_id);
+    return (query_iter == query_map.end()) ? nullptr : query_iter->second;
+}
+
+void FileCache::removeQueryContext(const String & query_id)
+{
+    std::lock_guard cache_lock(mutex);
+    auto query_iter = query_map.find(query_id);
+
+    if (query_iter == query_map.end())
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Attempt to release query context that does not exist (query_id: {})",
+            query_id);
+    }
+
+    query_map.erase(query_iter);
+}
+
+FileCache::QueryContextPtr FileCache::getOrSetQueryContext(
+    const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> & cache_lock)
+{
+    if (query_id.empty())
+        return nullptr;
+
+    auto context = getQueryContext(query_id, cache_lock);
+    if (context)
+        return context;
+
+    auto query_context = std::make_shared<QueryContext>(settings.max_query_cache_size, settings.skip_download_if_exceeds_query_cache);
+    auto query_iter = query_map.emplace(query_id, query_context).first;
+    return query_iter->second;
+}
+
+FileCache::QueryContextHolder FileCache::getQueryContextHolder(const String & query_id, const ReadSettings & settings)
+{
+    std::lock_guard cache_lock(mutex);
+
+    if (!enable_filesystem_query_cache_limit || settings.max_query_cache_size == 0)
+        return {};
+
+    /// if enable_filesystem_query_cache_limit is true, and max_query_cache_size large than zero,
+    /// we create context query for current query.
+    auto context = getOrSetQueryContext(query_id, settings, cache_lock);
+    return QueryContextHolder(query_id, this, context);
+}
+
+void FileCache::QueryContext::remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
+{
+    if (cache_size < size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Deleted cache size exceeds existing cache size");
+
+    if (!skip_download_if_exceeds_query_cache)
+    {
+        auto record = records.find({key, offset});
+        if (record != records.end())
+        {
+            record->second->removeAndGetNext(cache_lock);
+            records.erase({key, offset});
+        }
+    }
+    cache_size -= size;
+}
+
+void FileCache::QueryContext::reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
+{
+    if (cache_size + size > max_cache_size)
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Reserved cache size exceeds the remaining cache size (key: {}, offset: {})",
+            key.toString(), offset);
+    }
+
+    if (!skip_download_if_exceeds_query_cache)
+    {
+        auto record = records.find({key, offset});
+        if (record == records.end())
+        {
+            auto queue_iter = priority->add(key, offset, 0, cache_lock);
+            record = records.insert({{key, offset}, queue_iter}).first;
+        }
+        record->second->incrementSize(size, cache_lock);
+    }
+    cache_size += size;
+}
+
+void FileCache::QueryContext::use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock)
+{
+    if (skip_download_if_exceeds_query_cache)
+        return;
+
+    auto record = records.find({key, offset});
+    if (record != records.end())
+        record->second->use(cache_lock);
+}
+
+FileCache::QueryContextHolder::QueryContextHolder(
+    const String & query_id_,
+    FileCache * cache_,
+    FileCache::QueryContextPtr context_)
+    : query_id(query_id_)
+    , cache(cache_)
+    , context(context_)
+{
+}
+
+FileCache::QueryContextHolder::~QueryContextHolder()
+{
+    /// If only the query_map and the current holder hold the context_query,
+    /// the query has been completed and the query_context is released.
+    if (context && context.use_count() == 2)
+        cache->removeQueryContext(query_id);
+}
+
+void FileCache::initialize()
 {
     std::lock_guard cache_lock(mutex);
     if (!is_initialized)
@@ -55,8 +227,8 @@ void LRUFileCache::initialize()
     }
 }
 
-void LRUFileCache::useCell(
-    const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock)
+void FileCache::useCell(
+    const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock) const
 {
     auto file_segment = cell.file_segment;
 
@@ -75,11 +247,11 @@ void LRUFileCache::useCell(
     if (cell.queue_iterator)
     {
         /// Move to the end of the queue. The iterator remains valid.
-        queue.moveToEnd(*cell.queue_iterator, cache_lock);
+        cell.queue_iterator->use(cache_lock);
     }
 }
 
-LRUFileCache::FileSegmentCell * LRUFileCache::getCell(
+FileCache::FileSegmentCell * FileCache::getCell(
     const Key & key, size_t offset, std::lock_guard<std::mutex> & /* cache_lock */)
 {
     auto it = files.find(key);
@@ -94,7 +266,7 @@ LRUFileCache::FileSegmentCell * LRUFileCache::getCell(
     return &cell_it->second;
 }
 
-FileSegments LRUFileCache::getImpl(
+FileSegments FileCache::getImpl(
     const Key & key, const FileSegment::Range & range, std::lock_guard<std::mutex> & cache_lock)
 {
     /// Given range = [left, right] and non-overlapping ordered set of file segments,
@@ -112,7 +284,7 @@ FileSegments LRUFileCache::getImpl(
         files.erase(key);
 
         /// Note: it is guaranteed that there is no concurrency with files deletion,
-        /// because cache files are deleted only inside IFileCache and under cache lock.
+        /// because cache files are deleted only inside FileCache and under cache lock.
         if (fs::exists(key_path))
             fs::remove_all(key_path);
 
@@ -150,7 +322,6 @@ FileSegments LRUFileCache::getImpl(
                 ///       [___________
                 ///       ^
                 ///       range.left
-
                 useCell(prev_cell, result, cache_lock);
             }
         }
@@ -175,7 +346,7 @@ FileSegments LRUFileCache::getImpl(
     return result;
 }
 
-FileSegments LRUFileCache::splitRangeIntoCells(
+FileSegments FileCache::splitRangeIntoCells(
     const Key & key, size_t offset, size_t size, FileSegment::State state, bool is_persistent, std::lock_guard<std::mutex> & cache_lock)
 {
     assert(size > 0);
@@ -204,7 +375,7 @@ FileSegments LRUFileCache::splitRangeIntoCells(
     return file_segments;
 }
 
-void LRUFileCache::fillHolesWithEmptyFileSegments(
+void FileCache::fillHolesWithEmptyFileSegments(
     FileSegments & file_segments,
     const Key & key,
     const FileSegment::Range & range,
@@ -298,7 +469,7 @@ void LRUFileCache::fillHolesWithEmptyFileSegments(
     }
 }
 
-FileSegmentsHolder LRUFileCache::getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent)
+FileSegmentsHolder FileCache::getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent)
 {
     assertInitialized();
 
@@ -326,7 +497,7 @@ FileSegmentsHolder LRUFileCache::getOrSet(const Key & key, size_t offset, size_t
     return FileSegmentsHolder(std::move(file_segments));
 }
 
-FileSegmentsHolder LRUFileCache::get(const Key & key, size_t offset, size_t size)
+FileSegmentsHolder FileCache::get(const Key & key, size_t offset, size_t size)
 {
     assertInitialized();
 
@@ -358,7 +529,7 @@ FileSegmentsHolder LRUFileCache::get(const Key & key, size_t offset, size_t size
     return FileSegmentsHolder(std::move(file_segments));
 }
 
-LRUFileCache::FileSegmentCell * LRUFileCache::addCell(
+FileCache::FileSegmentCell * FileCache::addCell(
     const Key & key, size_t offset, size_t size,
     FileSegment::State state, bool is_persistent,
     std::lock_guard<std::mutex> & cache_lock)
@@ -379,30 +550,27 @@ LRUFileCache::FileSegmentCell * LRUFileCache::addCell(
         FileSegment::State result_state = state;
         if (state == FileSegment::State::EMPTY && enable_cache_hits_threshold)
         {
-            auto record = records.find({key, offset});
+            auto record = stash_records.find({key, offset});
 
-            if (record == records.end())
+            if (record == stash_records.end())
             {
-                auto queue_iter = stash_queue.add(key, offset, 0, cache_lock);
-                records.insert({{key, offset}, queue_iter});
+                auto priority_iter = stash_priority->add(key, offset, 0, cache_lock);
+                stash_records.insert({{key, offset}, priority_iter});
 
-                if (stash_queue.getElementsNum(cache_lock) > max_stash_element_size)
+                if (stash_priority->getElementsNum(cache_lock) > max_stash_element_size)
                 {
-                    auto remove_queue_iter = stash_queue.begin();
-                    records.erase({remove_queue_iter->key, remove_queue_iter->offset});
-                    stash_queue.remove(remove_queue_iter, cache_lock);
+                    auto remove_priority_iter = stash_priority->getLowestPriorityWriteIterator(cache_lock);
+                    stash_records.erase({remove_priority_iter->key(), remove_priority_iter->offset()});
+                    remove_priority_iter->removeAndGetNext(cache_lock);
                 }
-
                 /// For segments that do not reach the download threshold, we do not download them, but directly read them
                 result_state = FileSegment::State::SKIP_CACHE;
             }
             else
             {
-                auto queue_iter = record->second;
-                queue_iter->hits++;
-                stash_queue.moveToEnd(queue_iter, cache_lock);
-
-                result_state = queue_iter->hits >= enable_cache_hits_threshold ? FileSegment::State::EMPTY : FileSegment::State::SKIP_CACHE;
+                auto priority_iter = record->second;
+                priority_iter->use(cache_lock);
+                result_state = priority_iter->hits() >= enable_cache_hits_threshold ? FileSegment::State::EMPTY : FileSegment::State::SKIP_CACHE;
             }
         }
 
@@ -429,7 +597,7 @@ LRUFileCache::FileSegmentCell * LRUFileCache::addCell(
     return &(it->second);
 }
 
-FileSegmentsHolder LRUFileCache::setDownloading(
+FileSegmentsHolder FileCache::setDownloading(
     const Key & key,
     size_t offset,
     size_t size,
@@ -452,7 +620,7 @@ FileSegmentsHolder LRUFileCache::setDownloading(
     return FileSegmentsHolder(std::move(file_segments));
 }
 
-bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
+bool FileCache::tryReserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
 {
     auto query_context = enable_filesystem_query_cache_limit ? getCurrentQueryContext(cache_lock) : nullptr;
     if (!query_context)
@@ -473,40 +641,52 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
     else
     {
         size_t removed_size = 0;
-        size_t queue_size = queue.getElementsNum(cache_lock);
+        size_t queue_size = main_priority->getElementsNum(cache_lock);
 
         auto * cell_for_reserve = getCell(key, offset, cache_lock);
 
-        std::vector<IFileCache::LRUQueue::Iterator> ghost;
+        struct Segment
+        {
+            Key key;
+            size_t offset;
+            size_t size;
+
+            Segment(Key key_, size_t offset_, size_t size_)
+                : key(key_), offset(offset_), size(size_) {}
+        };
+
+        std::vector<Segment> ghost;
         std::vector<FileSegmentCell *> trash;
         std::vector<FileSegmentCell *> to_evict;
 
         auto is_overflow = [&]
         {
-            return (max_size != 0 && queue.getTotalCacheSize(cache_lock) + size - removed_size > max_size)
+            return (max_size != 0 && main_priority->getCacheSize(cache_lock) + size - removed_size > max_size)
             || (max_element_size != 0 && queue_size > max_element_size)
             || (query_context->getCacheSize() + size - removed_size > query_context->getMaxCacheSize());
         };
 
         /// Select the cache from the LRU queue held by query for expulsion.
-        for (auto iter = query_context->queue().begin(); iter != query_context->queue().end(); iter++)
+        for (auto iter = query_context->getPriority()->getLowestPriorityWriteIterator(cache_lock); iter->valid();)
         {
             if (!is_overflow())
                 break;
 
-            auto * cell = getCell(iter->key, iter->offset, cache_lock);
+            auto * cell = getCell(iter->key(), iter->offset(), cache_lock);
 
             if (!cell)
             {
                 /// The cache corresponding to this record may be swapped out by
                 /// other queries, so it has become invalid.
-                ghost.push_back(iter);
-                removed_size += iter->size;
+                removed_size += iter->size();
+                ghost.push_back(Segment(iter->key(), iter->offset(), iter->size()));
+                /// next()
+                iter->removeAndGetNext(cache_lock);
             }
             else
             {
                 size_t cell_size = cell->size();
-                assert(iter->size == cell_size);
+                assert(iter->size() == cell_size);
 
                 if (cell->releasable())
                 {
@@ -529,6 +709,8 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
                     removed_size += cell_size;
                     --queue_size;
                 }
+
+                iter->next();
             }
         }
 
@@ -547,8 +729,8 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
                 remove_file_segment(file_segment, cell->size());
         }
 
-        for (auto & iter : ghost)
-            query_context->remove(iter->key, iter->offset, iter->size, cache_lock);
+        for (auto & entry : ghost)
+            query_context->remove(entry.key, entry.offset, entry.size, cache_lock);
 
         if (is_overflow())
             return false;
@@ -557,9 +739,9 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
         {
             auto queue_iterator = cell_for_reserve->queue_iterator;
             if (queue_iterator)
-                queue.incrementSize(*queue_iterator, size, cache_lock);
+                queue_iterator->incrementSize(size, cache_lock);
             else
-                cell_for_reserve->queue_iterator = queue.add(key, offset, size, cache_lock);
+                cell_for_reserve->queue_iterator = main_priority->add(key, offset, size, cache_lock);
         }
 
         for (auto & cell : to_evict)
@@ -573,11 +755,11 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
     }
 }
 
-bool LRUFileCache::tryReserveForMainList(
+bool FileCache::tryReserveForMainList(
     const Key & key, size_t offset, size_t size, QueryContextPtr query_context, std::lock_guard<std::mutex> & cache_lock)
 {
     auto removed_size = 0;
-    size_t queue_size = queue.getElementsNum(cache_lock);
+    size_t queue_size = main_priority->getElementsNum(cache_lock);
     assert(queue_size <= max_element_size);
 
     /// Since space reservation is incremental, cache cell already exists if it's state is EMPTY.
@@ -592,15 +774,18 @@ bool LRUFileCache::tryReserveForMainList(
     auto is_overflow = [&]
     {
         /// max_size == 0 means unlimited cache size, max_element_size means unlimited number of cache elements.
-        return (max_size != 0 && queue.getTotalCacheSize(cache_lock) + size - removed_size > max_size)
+        return (max_size != 0 && main_priority->getCacheSize(cache_lock) + size - removed_size > max_size)
             || (max_element_size != 0 && queue_size > max_element_size);
     };
 
     std::vector<FileSegmentCell *> to_evict;
     std::vector<FileSegmentCell *> trash;
 
-    for (const auto & [entry_key, entry_offset, entry_size, _] : queue)
+    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
     {
+        const auto & entry_key = it->key();
+        auto entry_offset = it->offset();
+
         if (!is_overflow())
             break;
 
@@ -612,7 +797,7 @@ bool LRUFileCache::tryReserveForMainList(
                 key.toString(), offset);
 
         size_t cell_size = cell->size();
-        assert(entry_size == cell_size);
+        assert(it->size() == cell_size);
 
         /// It is guaranteed that cell is not removed from cache as long as
         /// pointer to corresponding file segment is hold by any other thread.
@@ -671,9 +856,9 @@ bool LRUFileCache::tryReserveForMainList(
         /// If queue iterator already exists, we need to update the size after each space reservation.
         auto queue_iterator = cell_for_reserve->queue_iterator;
         if (queue_iterator)
-            queue.incrementSize(*queue_iterator, size, cache_lock);
+            queue_iterator->incrementSize(size, cache_lock);
         else
-            cell_for_reserve->queue_iterator = queue.add(key, offset, size, cache_lock);
+            cell_for_reserve->queue_iterator = main_priority->add(key, offset, size, cache_lock);
     }
 
     for (auto & cell : to_evict)
@@ -682,7 +867,7 @@ bool LRUFileCache::tryReserveForMainList(
             remove_file_segment(file_segment);
     }
 
-    if (queue.getTotalCacheSize(cache_lock) > (1ull << 63))
+    if (main_priority->getCacheSize(cache_lock) > (1ull << 63))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache became inconsistent. There must be a bug");
 
     if (query_context)
@@ -691,7 +876,7 @@ bool LRUFileCache::tryReserveForMainList(
     return true;
 }
 
-void LRUFileCache::removeIfExists(const Key & key)
+void FileCache::removeIfExists(const Key & key)
 {
     assertInitialized();
 
@@ -742,7 +927,7 @@ void LRUFileCache::removeIfExists(const Key & key)
     }
 }
 
-void LRUFileCache::removeIfReleasable(bool remove_persistent_files)
+void FileCache::removeIfReleasable(bool remove_persistent_files)
 {
     /// Try remove all cached files by cache_base_path.
     /// Only releasable file segments are evicted.
@@ -751,10 +936,12 @@ void LRUFileCache::removeIfReleasable(bool remove_persistent_files)
 
     std::lock_guard cache_lock(mutex);
 
-    std::vector<FileSegment *> to_remove;
-    for (auto it = queue.begin(); it != queue.end();)
+    std::vector<FileSegmentPtr> to_remove;
+    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
     {
-        const auto & [key, offset, size, _] = *it++;
+        const auto & key = it->key();
+        auto offset = it->offset();
+
         auto * cell = getCell(key, offset, cache_lock);
         if (!cell)
             throw Exception(
@@ -769,23 +956,28 @@ void LRUFileCache::removeIfReleasable(bool remove_persistent_files)
                     || remove_persistent_files
                     || allow_to_remove_persistent_segments_from_cache_by_default))
             {
-                std::lock_guard segment_lock(file_segment->mutex);
-                file_segment->detach(cache_lock, segment_lock);
-                remove(file_segment->key(), file_segment->offset(), cache_lock, segment_lock);
+                to_remove.emplace_back(file_segment);
             }
         }
     }
 
+    for (auto & file_segment : to_remove)
+    {
+        std::lock_guard segment_lock(file_segment->mutex);
+        file_segment->detach(cache_lock, segment_lock);
+        remove(file_segment->key(), file_segment->offset(), cache_lock, segment_lock);
+    }
+
     /// Remove all access information.
-    records.clear();
-    stash_queue.removeAll(cache_lock);
+    stash_records.clear();
+    stash_priority->removeAll(cache_lock);
 
 #ifndef NDEBUG
     assertCacheCorrectness(cache_lock);
 #endif
 }
 
-void LRUFileCache::remove(
+void FileCache::remove(
     Key key, size_t offset,
     std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */)
 {
@@ -799,7 +991,7 @@ void LRUFileCache::remove(
 
     if (cell->queue_iterator)
     {
-        queue.remove(*cell->queue_iterator, cache_lock);
+        cell->queue_iterator->removeAndGetNext(cache_lock);
     }
 
     auto & offsets = files[key];
@@ -831,15 +1023,14 @@ void LRUFileCache::remove(
     }
 }
 
-void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock)
+void FileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock)
 {
     Key key;
     UInt64 offset = 0;
     size_t size = 0;
-    std::vector<std::pair<LRUQueue::Iterator, std::weak_ptr<FileSegment>>> queue_entries;
+    std::vector<std::pair<IFileCachePriority::WriteIterator, std::weak_ptr<FileSegment>>> queue_entries;
 
     /// cache_base_path / key_prefix / key / offset
-
     if (!files.empty())
         throw Exception(
             ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR,
@@ -853,8 +1044,13 @@ void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_l
         fs::directory_iterator key_it{key_prefix_it->path()};
         for (; key_it != fs::directory_iterator(); ++key_it)
         {
-            key = Key(unhexUInt<UInt128>(key_it->path().filename().string().data()));
+            if (!key_it->is_directory())
+            {
+                LOG_WARNING(log, "Unexpected file: {}. Expected a directory", key_it->path().string());
+                continue;
+            }
 
+            key = Key(unhexUInt<UInt128>(key_it->path().filename().string().data()));
             fs::directory_iterator offset_it{key_it->path()};
             for (; offset_it != fs::directory_iterator(); ++offset_it)
             {
@@ -873,7 +1069,7 @@ void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_l
 
                 if (!parsed)
                 {
-                    LOG_WARNING(log, "Unexpected file: ", offset_it->path().string());
+                    LOG_WARNING(log, "Unexpected file: {}", offset_it->path().string());
                     continue; /// Or just remove? Some unexpected file.
                 }
 
@@ -888,7 +1084,7 @@ void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_l
                 {
                     auto * cell = addCell(key, offset, size, FileSegment::State::DOWNLOADED, is_persistent, cache_lock);
                     if (cell)
-                        queue_entries.emplace_back(*cell->queue_iterator, cell->file_segment);
+                        queue_entries.emplace_back(cell->queue_iterator, cell->file_segment);
                 }
                 else
                 {
@@ -912,14 +1108,14 @@ void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_l
         if (file_segment.expired())
             continue;
 
-        queue.moveToEnd(it, cache_lock);
+        it->use(cache_lock);
     }
 #ifndef NDEBUG
     assertCacheCorrectness(cache_lock);
 #endif
 }
 
-void LRUFileCache::reduceSizeToDownloaded(
+void FileCache::reduceSizeToDownloaded(
     const Key & key, size_t offset,
     std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */)
 {
@@ -952,7 +1148,7 @@ void LRUFileCache::reduceSizeToDownloaded(
     cell->file_segment = std::make_shared<FileSegment>(offset, downloaded_size, key, this, FileSegment::State::DOWNLOADED);
 }
 
-bool LRUFileCache::isLastFileSegmentHolder(
+bool FileCache::isLastFileSegmentHolder(
     const Key & key, size_t offset,
     std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */)
 {
@@ -965,7 +1161,7 @@ bool LRUFileCache::isLastFileSegmentHolder(
     return cell->file_segment.use_count() == 2;
 }
 
-FileSegments LRUFileCache::getSnapshot() const
+FileSegments FileCache::getSnapshot() const
 {
     std::lock_guard cache_lock(mutex);
 
@@ -979,7 +1175,7 @@ FileSegments LRUFileCache::getSnapshot() const
     return file_segments;
 }
 
-std::vector<String> LRUFileCache::tryGetCachePaths(const Key & key)
+std::vector<String> FileCache::tryGetCachePaths(const Key & key)
 {
     std::lock_guard cache_lock(mutex);
 
@@ -996,42 +1192,42 @@ std::vector<String> LRUFileCache::tryGetCachePaths(const Key & key)
     return cache_paths;
 }
 
-size_t LRUFileCache::getUsedCacheSize() const
+size_t FileCache::getUsedCacheSize() const
 {
     std::lock_guard cache_lock(mutex);
     return getUsedCacheSizeUnlocked(cache_lock);
 }
 
-size_t LRUFileCache::getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
+size_t FileCache::getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
 {
-    return queue.getTotalCacheSize(cache_lock);
+    return main_priority->getCacheSize(cache_lock);
 }
 
-size_t LRUFileCache::getAvailableCacheSize() const
+size_t FileCache::getAvailableCacheSize() const
 {
     std::lock_guard cache_lock(mutex);
     return getAvailableCacheSizeUnlocked(cache_lock);
 }
 
-size_t LRUFileCache::getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
+size_t FileCache::getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
 {
     return max_size - getUsedCacheSizeUnlocked(cache_lock);
 }
 
-size_t LRUFileCache::getFileSegmentsNum() const
+size_t FileCache::getFileSegmentsNum() const
 {
     std::lock_guard cache_lock(mutex);
     return getFileSegmentsNumUnlocked(cache_lock);
 }
 
-size_t LRUFileCache::getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const
+size_t FileCache::getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const
 {
-    return queue.getElementsNum(cache_lock);
+    return main_priority->getElementsNum(cache_lock);
 }
 
-LRUFileCache::FileSegmentCell::FileSegmentCell(
+FileCache::FileSegmentCell::FileSegmentCell(
     FileSegmentPtr file_segment_,
-    LRUFileCache * cache,
+    FileCache * cache,
     std::lock_guard<std::mutex> & cache_lock)
     : file_segment(file_segment_)
 {
@@ -1045,7 +1241,7 @@ LRUFileCache::FileSegmentCell::FileSegmentCell(
     {
         case FileSegment::State::DOWNLOADED:
         {
-            queue_iterator = cache->queue.add(file_segment->key(), file_segment->offset(), file_segment->range().size(), cache_lock);
+            queue_iterator = cache->main_priority->add(file_segment->key(), file_segment->offset(), file_segment->range().size(), cache_lock);
             break;
         }
         case FileSegment::State::SKIP_CACHE:
@@ -1061,79 +1257,13 @@ LRUFileCache::FileSegmentCell::FileSegmentCell(
     }
 }
 
-IFileCache::LRUQueue::Iterator IFileCache::LRUQueue::add(
-    const IFileCache::Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-#ifndef NDEBUG
-    for (const auto & [entry_key, entry_offset, entry_size, entry_hits] : queue)
-    {
-        if (entry_key == key && entry_offset == offset)
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Attempt to add duplicate queue entry to queue. (Key: {}, offset: {}, size: {})",
-                key.toString(), offset, size);
-    }
-#endif
-
-    cache_size += size;
-    return queue.insert(queue.end(), FileKeyAndOffset(key, offset, size));
-}
-
-void IFileCache::LRUQueue::remove(Iterator queue_it, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    cache_size -= queue_it->size;
-    queue.erase(queue_it);
-}
-
-void IFileCache::LRUQueue::removeAll(std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    queue.clear();
-    cache_size = 0;
-}
-
-void IFileCache::LRUQueue::moveToEnd(Iterator queue_it, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    queue.splice(queue.end(), queue, queue_it);
-}
-
-void IFileCache::LRUQueue::incrementSize(Iterator queue_it, size_t size_increment, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    cache_size += size_increment;
-    queue_it->size += size_increment;
-}
-
-bool IFileCache::LRUQueue::contains(
-    const IFileCache::Key & key, size_t offset, std::lock_guard<std::mutex> & /* cache_lock */) const
-{
-    /// This method is used for assertions in debug mode.
-    /// So we do not care about complexity here.
-    for (const auto & [entry_key, entry_offset, size, _] : queue)
-    {
-        if (key == entry_key && offset == entry_offset)
-            return true;
-    }
-    return false;
-}
-
-String IFileCache::LRUQueue::toString(std::lock_guard<std::mutex> & /* cache_lock */) const
-{
-    String result;
-    for (const auto & [key, offset, size, _] : queue)
-    {
-        if (!result.empty())
-            result += ", ";
-        result += fmt::format("{}: [{}, {}]", key.toString(), offset, offset + size - 1);
-    }
-    return result;
-}
-
-String LRUFileCache::dumpStructure(const Key & key)
+String FileCache::dumpStructure(const Key & key)
 {
     std::lock_guard cache_lock(mutex);
     return dumpStructureUnlocked(key, cache_lock);
 }
 
-String LRUFileCache::dumpStructureUnlocked(const Key & key, std::lock_guard<std::mutex> & cache_lock)
+String FileCache::dumpStructureUnlocked(const Key & key, std::lock_guard<std::mutex> &)
 {
     WriteBufferFromOwnString result;
     const auto & cells_by_offset = files[key];
@@ -1141,11 +1271,10 @@ String LRUFileCache::dumpStructureUnlocked(const Key & key, std::lock_guard<std:
     for (const auto & [offset, cell] : cells_by_offset)
         result << cell.file_segment->getInfoForLog() << "\n";
 
-    result << "\n\nQueue: " << queue.toString(cache_lock);
     return result.str();
 }
 
-void LRUFileCache::assertCacheCellsCorrectness(
+void FileCache::assertCacheCellsCorrectness(
     const FileSegmentsByOffset & cells_by_offset, [[maybe_unused]] std::lock_guard<std::mutex> & cache_lock)
 {
     for (const auto & [_, cell] : cells_by_offset)
@@ -1156,30 +1285,32 @@ void LRUFileCache::assertCacheCellsCorrectness(
         if (file_segment->reserved_size != 0)
         {
             assert(cell.queue_iterator);
-            assert(queue.contains(file_segment->key(), file_segment->offset(), cache_lock));
+            assert(main_priority->contains(file_segment->key(), file_segment->offset(), cache_lock));
         }
     }
 }
 
-void LRUFileCache::assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock)
+void FileCache::assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock)
 {
     assertCacheCellsCorrectness(files[key], cache_lock);
-    assertQueueCorrectness(cache_lock);
+    assertPriorityCorrectness(cache_lock);
 }
 
-void LRUFileCache::assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock)
+void FileCache::assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock)
 {
     for (const auto & [key, cells_by_offset] : files)
         assertCacheCellsCorrectness(files[key], cache_lock);
-    assertQueueCorrectness(cache_lock);
+    assertPriorityCorrectness(cache_lock);
 }
 
-void LRUFileCache::assertQueueCorrectness(std::lock_guard<std::mutex> & cache_lock)
+void FileCache::assertPriorityCorrectness(std::lock_guard<std::mutex> & cache_lock)
 {
     [[maybe_unused]] size_t total_size = 0;
-    for (auto it = queue.begin(); it != queue.end();)
+    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
     {
-        auto & [key, offset, size, _] = *it++;
+        const auto & key = it->key();
+        auto offset = it->offset();
+        auto size = it->size();
 
         auto * cell = getCell(key, offset, cache_lock);
         if (!cell)
@@ -1188,14 +1319,12 @@ void LRUFileCache::assertQueueCorrectness(std::lock_guard<std::mutex> & cache_lo
                 ErrorCodes::LOGICAL_ERROR,
                 "Cache is in inconsistent state: LRU queue contains entries with no cache cell (assertCorrectness())");
         }
-
         assert(cell->size() == size);
         total_size += size;
     }
-
-    assert(total_size == queue.getTotalCacheSize(cache_lock));
-    assert(queue.getTotalCacheSize(cache_lock) <= max_size);
-    assert(queue.getElementsNum(cache_lock) <= max_element_size);
+    assert(total_size == main_priority->getCacheSize(cache_lock));
+    assert(main_priority->getCacheSize(cache_lock) <= max_size);
+    assert(main_priority->getElementsNum(cache_lock) <= max_element_size);
 }
 
 }
diff --git a/src/Common/FileCache.h b/src/Common/FileCache.h
new file mode 100644
index 00000000000..7a25632be68
--- /dev/null
+++ b/src/Common/FileCache.h
@@ -0,0 +1,289 @@
+#pragma once
+
+#include <atomic>
+#include <chrono>
+#include <list>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <unordered_map>
+#include <unordered_set>
+#include <boost/functional/hash.hpp>
+#include <boost/noncopyable.hpp>
+
+#include <Core/Types.h>
+#include <IO/ReadSettings.h>
+#include <Common/FileCache_fwd.h>
+#include <Common/FileSegment.h>
+#include <Common/IFileCachePriority.h>
+#include <Common/logger_useful.h>
+#include <Common/FileCacheType.h>
+
+namespace DB
+{
+
+/// Local cache for remote filesystem files, represented as a set of non-overlapping non-empty file segments.
+/// Different caching algorithms are implemented based on IFileCachePriority.
+class FileCache : private boost::noncopyable
+{
+    friend class FileSegment;
+    friend class IFileCachePriority;
+    friend struct FileSegmentsHolder;
+    friend class FileSegmentRangeWriter;
+
+public:
+    using Key = DB::FileCacheKey;
+
+    FileCache(const String & cache_base_path_, const FileCacheSettings & cache_settings_);
+
+    ~FileCache() = default;
+
+    /// Restore cache from local filesystem.
+    void initialize();
+
+    void removeIfExists(const Key & key);
+
+    void removeIfReleasable(bool remove_persistent_files);
+
+    static bool isReadOnly();
+
+    /// Cache capacity in bytes.
+    size_t capacity() const { return max_size; }
+
+    static Key hash(const String & path);
+
+    String getPathInLocalCache(const Key & key, size_t offset, bool is_persistent) const;
+
+    String getPathInLocalCache(const Key & key) const;
+
+    const String & getBasePath() const { return cache_base_path; }
+
+    std::vector<String> tryGetCachePaths(const Key & key);
+
+    /**
+     * Given an `offset` and `size` representing [offset, offset + size) bytes interval,
+     * return list of cached non-overlapping non-empty
+     * file segments `[segment1, ..., segmentN]` which intersect with given interval.
+     *
+     * Segments in returned list are ordered in ascending order and represent a full contiguous
+     * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
+     *
+     * As long as pointers to returned file segments are hold
+     * it is guaranteed that these file segments are not removed from cache.
+     */
+    FileSegmentsHolder getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent);
+
+    /**
+     * Segments in returned list are ordered in ascending order and represent a full contiguous
+     * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
+     *
+     * If file segment has state EMPTY, then it is also marked as "detached". E.g. it is "detached"
+     * from cache (not owned by cache), and as a result will never change it's state and will be destructed
+     * with the destruction of the holder, while in getOrSet() EMPTY file segments can eventually change
+     * it's state (and become DOWNLOADED).
+     */
+    FileSegmentsHolder get(const Key & key, size_t offset, size_t size);
+
+    FileSegmentsHolder setDownloading(const Key & key, size_t offset, size_t size, bool is_persistent);
+
+    FileSegments getSnapshot() const;
+
+    /// For debug.
+    String dumpStructure(const Key & key);
+
+    size_t getUsedCacheSize() const;
+
+    size_t getFileSegmentsNum() const;
+
+private:
+    String cache_base_path;
+    size_t max_size;
+    size_t max_element_size;
+    size_t max_file_segment_size;
+
+    bool is_initialized = false;
+
+    mutable std::mutex mutex;
+
+    bool tryReserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
+
+    void remove(Key key, size_t offset, std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & segment_lock);
+
+    bool isLastFileSegmentHolder(
+        const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & segment_lock);
+
+    void reduceSizeToDownloaded(
+        const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */);
+
+    void assertInitialized() const;
+
+    using AccessKeyAndOffset = std::pair<Key, size_t>;
+    struct KeyAndOffsetHash
+    {
+        std::size_t operator()(const AccessKeyAndOffset & key) const
+        {
+            return std::hash<UInt128>()(key.first.key) ^ std::hash<UInt64>()(key.second);
+        }
+    };
+
+    using FileCacheRecords = std::unordered_map<AccessKeyAndOffset, IFileCachePriority::WriteIterator, KeyAndOffsetHash>;
+
+    /// Used to track and control the cache access of each query.
+    /// Through it, we can realize the processing of different queries by the cache layer.
+    struct QueryContext
+    {
+        FileCacheRecords records;
+        FileCachePriorityPtr priority;
+
+        size_t cache_size = 0;
+        size_t max_cache_size;
+
+        bool skip_download_if_exceeds_query_cache;
+
+        QueryContext(size_t max_cache_size_, bool skip_download_if_exceeds_query_cache_)
+            : max_cache_size(max_cache_size_), skip_download_if_exceeds_query_cache(skip_download_if_exceeds_query_cache_)
+        {
+        }
+
+        void remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
+
+        void reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
+
+        void use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
+
+        size_t getMaxCacheSize() const { return max_cache_size; }
+
+        size_t getCacheSize() const { return cache_size; }
+
+        FileCachePriorityPtr getPriority() { return priority; }
+
+        bool isSkipDownloadIfExceed() const { return skip_download_if_exceeds_query_cache; }
+    };
+
+    using QueryContextPtr = std::shared_ptr<QueryContext>;
+    using QueryContextMap = std::unordered_map<String, QueryContextPtr>;
+
+    QueryContextMap query_map;
+
+    bool enable_filesystem_query_cache_limit;
+
+    QueryContextPtr getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock);
+
+    QueryContextPtr getQueryContext(const String & query_id, std::lock_guard<std::mutex> & cache_lock);
+
+    void removeQueryContext(const String & query_id);
+
+    QueryContextPtr getOrSetQueryContext(const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> &);
+
+public:
+    /// Save a query context information, and adopt different cache policies
+    /// for different queries through the context cache layer.
+    struct QueryContextHolder : private boost::noncopyable
+    {
+        QueryContextHolder(const String & query_id_, FileCache * cache_, QueryContextPtr context_);
+
+        QueryContextHolder() = default;
+
+        ~QueryContextHolder();
+
+        String query_id;
+        FileCache * cache = nullptr;
+        QueryContextPtr context;
+    };
+
+    QueryContextHolder getQueryContextHolder(const String & query_id, const ReadSettings & settings);
+
+private:
+    struct FileSegmentCell : private boost::noncopyable
+    {
+        FileSegmentPtr file_segment;
+
+        /// Iterator is put here on first reservation attempt, if successful.
+        IFileCachePriority::WriteIterator queue_iterator;
+
+        /// Pointer to file segment is always hold by the cache itself.
+        /// Apart from pointer in cache, it can be hold by cache users, when they call
+        /// getorSet(), but cache users always hold it via FileSegmentsHolder.
+        bool releasable() const { return file_segment.unique(); }
+
+        size_t size() const { return file_segment->reserved_size; }
+
+        FileSegmentCell(FileSegmentPtr file_segment_, FileCache * cache, std::lock_guard<std::mutex> & cache_lock);
+
+        FileSegmentCell(FileSegmentCell && other) noexcept
+            : file_segment(std::move(other.file_segment)), queue_iterator(other.queue_iterator)
+        {
+        }
+    };
+
+    using FileSegmentsByOffset = std::map<size_t, FileSegmentCell>;
+    using CachedFiles = std::unordered_map<Key, FileSegmentsByOffset>;
+
+    CachedFiles files;
+    std::unique_ptr<IFileCachePriority> main_priority;
+
+    FileCacheRecords stash_records;
+    std::unique_ptr<IFileCachePriority> stash_priority;
+
+    size_t max_stash_element_size;
+    size_t enable_cache_hits_threshold;
+
+    Poco::Logger * log;
+    bool allow_to_remove_persistent_segments_from_cache_by_default;
+
+    FileSegments getImpl(const Key & key, const FileSegment::Range & range, std::lock_guard<std::mutex> & cache_lock);
+
+    FileSegmentCell * getCell(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
+
+    FileSegmentCell * addCell(
+        const Key & key,
+        size_t offset,
+        size_t size,
+        FileSegment::State state,
+        bool is_persistent,
+        std::lock_guard<std::mutex> & cache_lock);
+
+    void useCell(const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock) const;
+
+    bool tryReserveForMainList(
+        const Key & key, size_t offset, size_t size, QueryContextPtr query_context, std::lock_guard<std::mutex> & cache_lock);
+
+    size_t getAvailableCacheSize() const;
+
+    void loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock);
+
+    FileSegments splitRangeIntoCells(
+        const Key & key,
+        size_t offset,
+        size_t size,
+        FileSegment::State state,
+        bool is_persistent,
+        std::lock_guard<std::mutex> & cache_lock);
+
+    String dumpStructureUnlocked(const Key & key_, std::lock_guard<std::mutex> & cache_lock);
+
+    void fillHolesWithEmptyFileSegments(
+        FileSegments & file_segments,
+        const Key & key,
+        const FileSegment::Range & range,
+        bool fill_with_detached_file_segments,
+        bool is_persistent,
+        std::lock_guard<std::mutex> & cache_lock);
+
+    size_t getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
+
+    size_t getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
+
+    size_t getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
+
+    void assertCacheCellsCorrectness(const FileSegmentsByOffset & cells_by_offset, std::lock_guard<std::mutex> & cache_lock);
+
+public:
+    void assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock);
+
+    void assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock);
+
+    void assertPriorityCorrectness(std::lock_guard<std::mutex> & cache_lock);
+};
+
+}
diff --git a/src/Common/FileCacheFactory.cpp b/src/Common/FileCacheFactory.cpp
index 259c1d3f48e..b276760c0dd 100644
--- a/src/Common/FileCacheFactory.cpp
+++ b/src/Common/FileCacheFactory.cpp
@@ -1,5 +1,5 @@
 #include "FileCacheFactory.h"
-#include "LRUFileCache.h"
+#include "FileCache.h"
 
 namespace DB
 {
@@ -53,7 +53,7 @@ FileCachePtr FileCacheFactory::getOrCreate(
         return it->second->cache;
     }
 
-    auto cache = std::make_shared<LRUFileCache>(cache_base_path, file_cache_settings);
+    auto cache = std::make_shared<FileCache>(cache_base_path, file_cache_settings);
     FileCacheData result{cache, file_cache_settings};
 
     auto cache_it = caches.insert(caches.end(), std::move(result));
diff --git a/src/Common/FileCacheType.h b/src/Common/FileCacheType.h
new file mode 100644
index 00000000000..cf4ab5d20c5
--- /dev/null
+++ b/src/Common/FileCacheType.h
@@ -0,0 +1,31 @@
+#pragma once
+#include <Core/Types.h>
+#include <Common/hex.h>
+
+namespace DB
+{
+
+struct FileCacheKey
+{
+    UInt128 key;
+
+    String toString() const { return getHexUIntLowercase(key); }
+
+    FileCacheKey() = default;
+
+    explicit FileCacheKey(const UInt128 & key_) : key(key_) { }
+
+    bool operator==(const FileCacheKey & other) const { return key == other.key; }
+};
+
+}
+
+namespace std
+{
+template <>
+struct hash<DB::FileCacheKey>
+{
+    std::size_t operator()(const DB::FileCacheKey & k) const { return hash<UInt128>()(k.key); }
+};
+
+}
diff --git a/src/Common/FileCache_fwd.h b/src/Common/FileCache_fwd.h
index 8a7c2eeb458..9f6b2a740fc 100644
--- a/src/Common/FileCache_fwd.h
+++ b/src/Common/FileCache_fwd.h
@@ -9,8 +9,8 @@ static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE = 100
 static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS = 1024 * 1024;
 static constexpr int REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD = 0;
 
-class IFileCache;
-using FileCachePtr = std::shared_ptr<IFileCache>;
+class FileCache;
+using FileCachePtr = std::shared_ptr<FileCache>;
 
 struct FileCacheSettings;
 
diff --git a/src/Common/FileSegment.cpp b/src/Common/FileSegment.cpp
index c16d4658ae5..2aba93bbdb0 100644
--- a/src/Common/FileSegment.cpp
+++ b/src/Common/FileSegment.cpp
@@ -5,7 +5,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <filesystem>
-
+#include <Common/FileCache.h>
 
 namespace CurrentMetrics
 {
@@ -25,7 +25,7 @@ FileSegment::FileSegment(
         size_t offset_,
         size_t size_,
         const Key & key_,
-        IFileCache * cache_,
+        FileCache * cache_,
         State download_state_,
         bool is_persistent_)
     : segment_range(offset_, offset_ + size_ - 1)
@@ -787,7 +787,7 @@ FileSegmentsHolder::~FileSegmentsHolder()
     /// FileSegmentsHolder right after calling file_segment->complete(), so on destruction here
     /// remain only uncompleted file segments.
 
-    IFileCache * cache = nullptr;
+    FileCache * cache = nullptr;
 
     for (auto file_segment_it = file_segments.begin(); file_segment_it != file_segments.end();)
     {
diff --git a/src/Common/FileSegment.h b/src/Common/FileSegment.h
index 93cbf269a8e..b129b851d7c 100644
--- a/src/Common/FileSegment.h
+++ b/src/Common/FileSegment.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <boost/noncopyable.hpp>
-#include <Common/IFileCache.h>
 #include <Core/Types.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <list>
+#include <Common/FileCacheType.h>
 
 namespace Poco { class Logger; }
 
@@ -17,7 +17,7 @@ extern const Metric CacheFileSegments;
 namespace DB
 {
 
-class IFileCache;
+class FileCache;
 
 class FileSegment;
 using FileSegmentPtr = std::shared_ptr<FileSegment>;
@@ -27,12 +27,12 @@ using FileSegments = std::list<FileSegmentPtr>;
 class FileSegment : boost::noncopyable
 {
 
-friend class LRUFileCache;
+friend class FileCache;
 friend struct FileSegmentsHolder;
 friend class FileSegmentRangeWriter;
 
 public:
-    using Key = IFileCache::Key;
+    using Key = FileCacheKey;
     using RemoteFileReaderPtr = std::shared_ptr<ReadBufferFromFileBase>;
     using LocalCacheWriterPtr = std::unique_ptr<WriteBufferFromFile>;
 
@@ -74,7 +74,7 @@ public:
         size_t offset_,
         size_t size_,
         const Key & key_,
-        IFileCache * cache_,
+        FileCache * cache_,
         State download_state_,
         bool is_persistent_ = false);
 
@@ -234,7 +234,7 @@ private:
     mutable std::mutex download_mutex;
 
     Key file_key;
-    IFileCache * cache;
+    FileCache * cache;
 
     Poco::Logger * log;
 
diff --git a/src/Common/ICachePolicy.h b/src/Common/ICachePolicy.h
new file mode 100644
index 00000000000..4e5916f125e
--- /dev/null
+++ b/src/Common/ICachePolicy.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <mutex>
+
+namespace DB
+{
+template <typename T>
+struct TrivialWeightFunction
+{
+    size_t operator()(const T &) const
+    {
+        return 1;
+    }
+};
+
+template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
+class ICachePolicy
+{
+public:
+    using Key = TKey;
+    using Mapped = TMapped;
+    using MappedPtr = std::shared_ptr<Mapped>;
+    using OnWeightLossFunction = std::function<void(size_t)>;
+
+    virtual size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const = 0;
+    virtual size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const = 0;
+    virtual size_t maxSize() const = 0;
+
+    virtual void reset(std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+    virtual void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+    virtual MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+    virtual void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+
+    virtual ~ICachePolicy() = default;
+
+protected:
+    OnWeightLossFunction on_weight_loss_function = [](size_t) {};
+};
+
+}
diff --git a/src/Common/IFileCache.cpp b/src/Common/IFileCache.cpp
deleted file mode 100644
index 8fe434dd740..00000000000
--- a/src/Common/IFileCache.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-#include "IFileCache.h"
-
-#include <Common/hex.h>
-#include <Common/CurrentThread.h>
-#include <Common/SipHash.h>
-#include <Common/FileCacheSettings.h>
-#include <IO/ReadSettings.h>
-#include <filesystem>
-
-namespace fs = std::filesystem;
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int REMOTE_FS_OBJECT_CACHE_ERROR;
-    extern const int LOGICAL_ERROR;
-}
-
-IFileCache::IFileCache(
-    const String & cache_base_path_,
-    const FileCacheSettings & cache_settings_)
-    : cache_base_path(cache_base_path_)
-    , max_size(cache_settings_.max_size)
-    , max_element_size(cache_settings_.max_elements)
-    , max_file_segment_size(cache_settings_.max_file_segment_size)
-    , enable_filesystem_query_cache_limit(cache_settings_.enable_filesystem_query_cache_limit)
-{
-}
-
-String IFileCache::Key::toString() const
-{
-    return getHexUIntLowercase(key);
-}
-
-IFileCache::Key IFileCache::hash(const String & path)
-{
-    return Key(sipHash128(path.data(), path.size()));
-}
-
-String IFileCache::getPathInLocalCache(const Key & key, size_t offset, bool is_persistent) const
-{
-    auto key_str = key.toString();
-    return fs::path(cache_base_path)
-        / key_str.substr(0, 3)
-        / key_str
-        / (std::to_string(offset) + (is_persistent ? "_persistent" : ""));
-}
-
-String IFileCache::getPathInLocalCache(const Key & key) const
-{
-    auto key_str = key.toString();
-    return fs::path(cache_base_path) / key_str.substr(0, 3) / key_str;
-}
-
-static bool isQueryInitialized()
-{
-    return CurrentThread::isInitialized()
-        && CurrentThread::get().getQueryContext()
-        && !CurrentThread::getQueryId().empty();
-}
-
-bool IFileCache::isReadOnly()
-{
-    return !isQueryInitialized();
-}
-
-void IFileCache::assertInitialized() const
-{
-    if (!is_initialized)
-        throw Exception(ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR, "Cache not initialized");
-}
-
-IFileCache::QueryContextPtr IFileCache::getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock)
-{
-    if (!isQueryInitialized())
-        return nullptr;
-
-    return getQueryContext(std::string(CurrentThread::getQueryId()), cache_lock);
-}
-
-IFileCache::QueryContextPtr IFileCache::getQueryContext(const String & query_id, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    auto query_iter = query_map.find(query_id);
-    return (query_iter == query_map.end()) ? nullptr : query_iter->second;
-}
-
-void IFileCache::removeQueryContext(const String & query_id)
-{
-    std::lock_guard cache_lock(mutex);
-    auto query_iter = query_map.find(query_id);
-
-    if (query_iter == query_map.end())
-    {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Attempt to release query context that does not exist (query_id: {})",
-            query_id);
-    }
-
-    query_map.erase(query_iter);
-}
-
-IFileCache::QueryContextPtr IFileCache::getOrSetQueryContext(
-    const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (query_id.empty())
-        return nullptr;
-
-    auto context = getQueryContext(query_id, cache_lock);
-    if (context)
-        return context;
-
-    auto query_context = std::make_shared<QueryContext>(settings.max_query_cache_size, settings.skip_download_if_exceeds_query_cache);
-    auto query_iter = query_map.emplace(query_id, query_context).first;
-    return query_iter->second;
-}
-
-IFileCache::QueryContextHolder IFileCache::getQueryContextHolder(const String & query_id, const ReadSettings & settings)
-{
-    std::lock_guard cache_lock(mutex);
-
-    if (!enable_filesystem_query_cache_limit || settings.max_query_cache_size == 0)
-        return {};
-
-    /// if enable_filesystem_query_cache_limit is true, and max_query_cache_size large than zero,
-    /// we create context query for current query.
-    auto context = getOrSetQueryContext(query_id, settings, cache_lock);
-    return QueryContextHolder(query_id, this, context);
-}
-
-void IFileCache::QueryContext::remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (cache_size < size)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Deleted cache size exceeds existing cache size");
-
-    if (!skip_download_if_exceeds_query_cache)
-    {
-        auto record = records.find({key, offset});
-        if (record != records.end())
-        {
-            lru_queue.remove(record->second, cache_lock);
-            records.erase({key, offset});
-        }
-    }
-    cache_size -= size;
-}
-
-void IFileCache::QueryContext::reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (cache_size + size > max_cache_size)
-    {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Reserved cache size exceeds the remaining cache size (key: {}, offset: {})",
-            key.toString(), offset);
-    }
-
-    if (!skip_download_if_exceeds_query_cache)
-    {
-        auto record = records.find({key, offset});
-        if (record == records.end())
-        {
-            auto queue_iter = lru_queue.add(key, offset, 0, cache_lock);
-            record = records.insert({{key, offset}, queue_iter}).first;
-        }
-        record->second->size += size;
-    }
-    cache_size += size;
-}
-
-void IFileCache::QueryContext::use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (skip_download_if_exceeds_query_cache)
-        return;
-
-    auto record = records.find({key, offset});
-    if (record != records.end())
-        lru_queue.moveToEnd(record->second, cache_lock);
-}
-
-IFileCache::QueryContextHolder::QueryContextHolder(
-    const String & query_id_,
-    IFileCache * cache_,
-    IFileCache::QueryContextPtr context_)
-    : query_id(query_id_)
-    , cache(cache_)
-    , context(context_)
-{
-}
-
-IFileCache::QueryContextHolder::~QueryContextHolder()
-{
-    /// If only the query_map and the current holder hold the context_query,
-    /// the query has been completed and the query_context is released.
-    if (context && context.use_count() == 2)
-        cache->removeQueryContext(query_id);
-}
-
-}
diff --git a/src/Common/IFileCache.h b/src/Common/IFileCache.h
deleted file mode 100644
index c820d18cb95..00000000000
--- a/src/Common/IFileCache.h
+++ /dev/null
@@ -1,267 +0,0 @@
-#pragma once
-
-#include <Core/Types.h>
-#include <Common/FileCache_fwd.h>
-
-#include <boost/noncopyable.hpp>
-#include <list>
-#include <unordered_map>
-#include <functional>
-
-
-namespace DB
-{
-
-class FileSegment;
-using FileSegmentPtr = std::shared_ptr<FileSegment>;
-using FileSegments = std::list<FileSegmentPtr>;
-struct FileSegmentsHolder;
-struct ReadSettings;
-
-/**
- * Local cache for remote filesystem files, represented as a set of non-overlapping non-empty file segments.
- */
-class IFileCache : private boost::noncopyable
-{
-friend class FileSegment;
-friend struct FileSegmentsHolder;
-friend class FileSegmentRangeWriter;
-
-public:
-    struct Key
-    {
-        UInt128 key;
-        String toString() const;
-
-        Key() = default;
-        explicit Key(const UInt128 & key_) : key(key_) {}
-
-        bool operator==(const Key & other) const { return key == other.key; }
-    };
-
-    IFileCache(
-        const String & cache_base_path_,
-        const FileCacheSettings & cache_settings_);
-
-    virtual ~IFileCache() = default;
-
-    /// Restore cache from local filesystem.
-    virtual void initialize() = 0;
-
-    virtual void removeIfExists(const Key & key) = 0;
-
-    virtual void removeIfReleasable(bool remove_persistent_files) = 0;
-
-    static bool isReadOnly();
-
-    /// Cache capacity in bytes.
-    size_t capacity() const { return max_size; }
-
-    static Key hash(const String & path);
-
-    String getPathInLocalCache(const Key & key, size_t offset, bool is_persistent) const;
-
-    String getPathInLocalCache(const Key & key) const;
-
-    const String & getBasePath() const { return cache_base_path; }
-
-    virtual std::vector<String> tryGetCachePaths(const Key & key) = 0;
-
-    /**
-     * Given an `offset` and `size` representing [offset, offset + size) bytes interval,
-     * return list of cached non-overlapping non-empty
-     * file segments `[segment1, ..., segmentN]` which intersect with given interval.
-     *
-     * Segments in returned list are ordered in ascending order and represent a full contiguous
-     * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
-     *
-     * As long as pointers to returned file segments are hold
-     * it is guaranteed that these file segments are not removed from cache.
-     */
-    virtual FileSegmentsHolder getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent) = 0;
-
-    /**
-     * Segments in returned list are ordered in ascending order and represent a full contiguous
-     * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
-     *
-     * If file segment has state EMPTY, then it is also marked as "detached". E.g. it is "detached"
-     * from cache (not owned by cache), and as a result will never change it's state and will be destructed
-     * with the destruction of the holder, while in getOrSet() EMPTY file segments can eventually change
-     * it's state (and become DOWNLOADED).
-     */
-    virtual FileSegmentsHolder get(const Key & key, size_t offset, size_t size) = 0;
-
-    virtual FileSegmentsHolder setDownloading(const Key & key, size_t offset, size_t size, bool is_persistent) = 0;
-
-    virtual FileSegments getSnapshot() const = 0;
-
-    /// For debug.
-    virtual String dumpStructure(const Key & key) = 0;
-
-    virtual size_t getUsedCacheSize() const = 0;
-
-    virtual size_t getFileSegmentsNum() const = 0;
-
-protected:
-    String cache_base_path;
-    size_t max_size;
-    size_t max_element_size;
-    size_t max_file_segment_size;
-
-    bool is_initialized = false;
-
-    mutable std::mutex mutex;
-
-    virtual bool tryReserve(
-        const Key & key, size_t offset, size_t size,
-        std::lock_guard<std::mutex> & cache_lock) = 0;
-
-    virtual void remove(
-        Key key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & segment_lock) = 0;
-
-    virtual bool isLastFileSegmentHolder(
-        const Key & key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & segment_lock) = 0;
-
-    virtual void reduceSizeToDownloaded(
-        const Key & key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & /* segment_lock */) = 0;
-
-    void assertInitialized() const;
-
-    class LRUQueue
-    {
-    public:
-        struct FileKeyAndOffset
-        {
-            Key key;
-            size_t offset;
-            size_t size;
-            size_t hits = 0;
-
-            FileKeyAndOffset(const Key & key_, size_t offset_, size_t size_) : key(key_), offset(offset_), size(size_) {}
-        };
-
-        using Iterator = typename std::list<FileKeyAndOffset>::iterator;
-
-        size_t getTotalCacheSize(std::lock_guard<std::mutex> & /* cache_lock */) const { return cache_size; }
-
-        size_t getElementsNum(std::lock_guard<std::mutex> & /* cache_lock */) const { return queue.size(); }
-
-        Iterator add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
-
-        void remove(Iterator queue_it, std::lock_guard<std::mutex> & cache_lock);
-
-        void moveToEnd(Iterator queue_it, std::lock_guard<std::mutex> & cache_lock);
-
-        /// Space reservation for a file segment is incremental, so we need to be able to increment size of the queue entry.
-        void incrementSize(Iterator queue_it, size_t size_increment, std::lock_guard<std::mutex> & cache_lock);
-
-        String toString(std::lock_guard<std::mutex> & cache_lock) const;
-
-        bool contains(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock) const;
-
-        Iterator begin() { return queue.begin(); }
-
-        Iterator end() { return queue.end(); }
-
-        void removeAll(std::lock_guard<std::mutex> & cache_lock);
-
-    private:
-        std::list<FileKeyAndOffset> queue;
-        size_t cache_size = 0;
-    };
-
-    using AccessKeyAndOffset = std::pair<Key, size_t>;
-    struct KeyAndOffsetHash
-    {
-        std::size_t operator()(const AccessKeyAndOffset & key) const
-        {
-            return std::hash<UInt128>()(key.first.key) ^ std::hash<UInt64>()(key.second);
-        }
-    };
-
-    using AccessRecord = std::unordered_map<AccessKeyAndOffset, LRUQueue::Iterator, KeyAndOffsetHash>;
-
-    /// Used to track and control the cache access of each query.
-    /// Through it, we can realize the processing of different queries by the cache layer.
-    struct QueryContext
-    {
-        LRUQueue lru_queue;
-        AccessRecord records;
-
-        size_t cache_size = 0;
-        size_t max_cache_size;
-
-        bool skip_download_if_exceeds_query_cache;
-
-        QueryContext(size_t max_cache_size_, bool skip_download_if_exceeds_query_cache_)
-            : max_cache_size(max_cache_size_)
-            , skip_download_if_exceeds_query_cache(skip_download_if_exceeds_query_cache_) {}
-
-        void remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
-
-        void reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
-
-        void use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
-
-        size_t getMaxCacheSize() const { return max_cache_size; }
-
-        size_t getCacheSize() const { return cache_size; }
-
-        LRUQueue & queue() { return lru_queue; }
-
-        bool isSkipDownloadIfExceed() const { return skip_download_if_exceeds_query_cache; }
-    };
-
-    using QueryContextPtr = std::shared_ptr<QueryContext>;
-    using QueryContextMap = std::unordered_map<String, QueryContextPtr>;
-
-    QueryContextMap query_map;
-
-    bool enable_filesystem_query_cache_limit;
-
-    QueryContextPtr getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock);
-
-    QueryContextPtr getQueryContext(const String & query_id, std::lock_guard<std::mutex> & cache_lock);
-
-    void removeQueryContext(const String & query_id);
-
-    QueryContextPtr getOrSetQueryContext(const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> &);
-
-public:
-    /// Save a query context information, and adopt different cache policies
-    /// for different queries through the context cache layer.
-    struct QueryContextHolder : private boost::noncopyable
-    {
-        QueryContextHolder(const String & query_id_, IFileCache * cache_, QueryContextPtr context_);
-
-        QueryContextHolder() = default;
-
-        ~QueryContextHolder();
-
-        String query_id;
-        IFileCache * cache = nullptr;
-        QueryContextPtr context;
-    };
-
-    QueryContextHolder getQueryContextHolder(const String & query_id, const ReadSettings & settings);
-
-};
-
-using FileCachePtr = std::shared_ptr<IFileCache>;
-
-}
-
-namespace std
-{
-template <> struct hash<DB::IFileCache::Key>
-{
-    std::size_t operator()(const DB::IFileCache::Key & k) const { return hash<UInt128>()(k.key); }
-};
-
-}
diff --git a/src/Common/IFileCachePriority.h b/src/Common/IFileCachePriority.h
new file mode 100644
index 00000000000..f80266f9eea
--- /dev/null
+++ b/src/Common/IFileCachePriority.h
@@ -0,0 +1,95 @@
+#pragma once
+
+#include <memory>
+#include <mutex>
+#include <Core/Types.h>
+#include <Common/Exception.h>
+#include <Common/FileCacheType.h>
+
+namespace DB
+{
+
+class IFileCachePriority;
+using FileCachePriorityPtr = std::shared_ptr<IFileCachePriority>;
+
+/// IFileCachePriority is used to maintain the priority of cached data.
+class IFileCachePriority
+{
+public:
+    class IIterator;
+    using Key = FileCacheKey;
+    using ReadIterator = std::unique_ptr<const IIterator>;
+    using WriteIterator = std::shared_ptr<IIterator>;
+
+    struct FileCacheRecord
+    {
+        Key key;
+        size_t offset;
+        size_t size;
+        size_t hits = 0;
+
+        FileCacheRecord(const Key & key_, size_t offset_, size_t size_) : key(key_), offset(offset_), size(size_) { }
+    };
+
+    /// It provides an iterator to traverse the cache priority. Under normal circumstances,
+    /// the iterator can only return the records that have been directly swapped out.
+    /// For example, in the LRU algorithm, it can traverse all records, but in the LRU-K, it
+    /// can only traverse the records in the low priority queue.
+    class IIterator
+    {
+    public:
+        virtual ~IIterator() = default;
+
+        virtual const Key & key() const = 0;
+
+        virtual size_t offset() const = 0;
+
+        virtual size_t size() const = 0;
+
+        virtual size_t hits() const = 0;
+
+        /// Point the iterator to the next higher priority cache record.
+        virtual void next() const = 0;
+
+        virtual bool valid() const = 0;
+
+        /// Mark a cache record as recently used, it will update the priority
+        /// of the cache record according to different cache algorithms.
+        virtual void use(std::lock_guard<std::mutex> &) = 0;
+
+        /// Deletes an existing cached record. And to avoid pointer suspension
+        /// the iterator should automatically point to the next record.
+        virtual void removeAndGetNext(std::lock_guard<std::mutex> &) = 0;
+
+        virtual void incrementSize(size_t, std::lock_guard<std::mutex> &) = 0;
+    };
+
+public:
+    virtual ~IFileCachePriority() = default;
+
+    /// Add a cache record that did not exist before, and throw a
+    /// logical exception if the cache block already exists.
+    virtual WriteIterator add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    /// This method is used for assertions in debug mode. So we do not care about complexity here.
+    /// Query whether a cache record exists. If it exists, return true. If not, return false.
+    virtual bool contains(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    virtual void removeAll(std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    /// Returns an iterator pointing to the lowest priority cached record.
+    /// We can traverse all cached records through the iterator's next().
+    virtual ReadIterator getLowestPriorityReadIterator(std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    /// The same as getLowestPriorityReadIterator(), but it is writeable.
+    virtual WriteIterator getLowestPriorityWriteIterator(std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    virtual size_t getElementsNum(std::lock_guard<std::mutex> & cache_lock) const = 0;
+
+    size_t getCacheSize(std::lock_guard<std::mutex> &) const { return cache_size; }
+
+protected:
+    size_t max_cache_size = 0;
+    size_t cache_size = 0;
+};
+};
diff --git a/src/Common/LRUCachePolicy.h b/src/Common/LRUCachePolicy.h
new file mode 100644
index 00000000000..3c069eb276b
--- /dev/null
+++ b/src/Common/LRUCachePolicy.h
@@ -0,0 +1,181 @@
+#pragma once
+
+#include <Common/ICachePolicy.h>
+
+#include <list>
+#include <unordered_map>
+
+#include <Common/logger_useful.h>
+
+namespace DB
+{
+/// Cache policy LRU evicts entries which are not used for a long time.
+/// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
+/// of that value.
+/// Cache starts to evict entries when their total weight exceeds max_size.
+/// Value weight should not change after insertion.
+/// To work with the thread-safe implementation of this class use a class "CacheBase" with first parameter "LRU"
+/// and next parameters in the same order as in the constructor of the current class.
+template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
+class LRUCachePolicy : public ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>
+{
+public:
+    using Key = TKey;
+    using Mapped = TMapped;
+    using MappedPtr = std::shared_ptr<Mapped>;
+
+    using Base = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+    using typename Base::OnWeightLossFunction;
+
+    /** Initialize LRUCachePolicy with max_size and max_elements_size.
+      * max_elements_size == 0 means no elements size restrictions.
+      */
+    explicit LRUCachePolicy(size_t max_size_, size_t max_elements_size_ = 0, OnWeightLossFunction on_weight_loss_function_ = {})
+        : max_size(std::max(static_cast<size_t>(1), max_size_)), max_elements_size(max_elements_size_)
+    {
+        Base::on_weight_loss_function = on_weight_loss_function_;
+    }
+
+    size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return current_size;
+    }
+
+    size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return cells.size();
+    }
+
+    size_t maxSize() const override
+    {
+        return max_size;
+    }
+
+    void reset(std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        queue.clear();
+        cells.clear();
+        current_size = 0;
+    }
+
+    void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+            return;
+        auto & cell = it->second;
+        current_size -= cell.size;
+        queue.erase(cell.queue_iterator);
+        cells.erase(it);
+    }
+
+    MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+        {
+            return MappedPtr();
+        }
+
+        Cell & cell = it->second;
+
+        /// Move the key to the end of the queue. The iterator remains valid.
+        queue.splice(queue.end(), queue, cell.queue_iterator);
+
+        return cell.value;
+    }
+
+    void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto [it, inserted] = cells.emplace(std::piecewise_construct,
+            std::forward_as_tuple(key),
+            std::forward_as_tuple());
+
+        Cell & cell = it->second;
+
+        if (inserted)
+        {
+            try
+            {
+                cell.queue_iterator = queue.insert(queue.end(), key);
+            }
+            catch (...)
+            {
+                cells.erase(it);
+                throw;
+            }
+        }
+        else
+        {
+            current_size -= cell.size;
+            queue.splice(queue.end(), queue, cell.queue_iterator);
+        }
+
+        cell.value = mapped;
+        cell.size = cell.value ? weight_function(*cell.value) : 0;
+        current_size += cell.size;
+
+        removeOverflow();
+    }
+
+protected:
+    using LRUQueue = std::list<Key>;
+    using LRUQueueIterator = typename LRUQueue::iterator;
+
+    LRUQueue queue;
+
+    struct Cell
+    {
+        MappedPtr value;
+        size_t size;
+        LRUQueueIterator queue_iterator;
+    };
+
+    using Cells = std::unordered_map<Key, Cell, HashFunction>;
+
+    Cells cells;
+
+    /// Total weight of values.
+    size_t current_size = 0;
+    const size_t max_size;
+    const size_t max_elements_size;
+
+    WeightFunction weight_function;
+
+    void removeOverflow()
+    {
+        size_t current_weight_lost = 0;
+        size_t queue_size = cells.size();
+
+        while ((current_size > max_size || (max_elements_size != 0 && queue_size > max_elements_size)) && (queue_size > 0))
+        {
+            const Key & key = queue.front();
+
+            auto it = cells.find(key);
+            if (it == cells.end())
+            {
+                LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
+                abort();
+            }
+
+            const auto & cell = it->second;
+
+            current_size -= cell.size;
+            current_weight_lost += cell.size;
+
+            cells.erase(it);
+            queue.pop_front();
+            --queue_size;
+        }
+
+        Base::on_weight_loss_function(current_weight_lost);
+
+        if (current_size > (1ull << 63))
+        {
+            LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
+            abort();
+        }
+    }
+};
+
+}
diff --git a/src/Common/LRUFileCache.h b/src/Common/LRUFileCache.h
deleted file mode 100644
index 059fc0c22c9..00000000000
--- a/src/Common/LRUFileCache.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <unordered_map>
-#include <unordered_set>
-#include <boost/functional/hash.hpp>
-#include <boost/noncopyable.hpp>
-#include <map>
-
-#include <Common/logger_useful.h>
-#include <Common/FileSegment.h>
-#include <Common/IFileCache.h>
-
-
-namespace DB
-{
-
-/**
- * Local cache for remote filesystem files, represented as a set of non-overlapping non-empty file segments.
- * Implements LRU eviction policy.
- */
-class LRUFileCache final : public IFileCache
-{
-public:
-    LRUFileCache(
-        const String & cache_base_path_,
-        const FileCacheSettings & cache_settings_);
-
-    FileSegmentsHolder getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent) override;
-
-    FileSegmentsHolder get(const Key & key, size_t offset, size_t size) override;
-
-    FileSegments getSnapshot() const override;
-
-    void initialize() override;
-
-    void removeIfExists(const Key & key) override;
-
-    void removeIfReleasable(bool remove_persistent_files) override;
-
-    std::vector<String> tryGetCachePaths(const Key & key) override;
-
-    size_t getUsedCacheSize() const override;
-
-    size_t getFileSegmentsNum() const override;
-
-private:
-    struct FileSegmentCell : private boost::noncopyable
-    {
-        FileSegmentPtr file_segment;
-
-        /// Iterator is put here on first reservation attempt, if successful.
-        std::optional<LRUQueue::Iterator> queue_iterator;
-
-        /// Pointer to file segment is always hold by the cache itself.
-        /// Apart from pointer in cache, it can be hold by cache users, when they call
-        /// getorSet(), but cache users always hold it via FileSegmentsHolder.
-        bool releasable() const {return file_segment.unique(); }
-
-        size_t size() const { return file_segment->reserved_size; }
-
-        FileSegmentCell(FileSegmentPtr file_segment_, LRUFileCache * cache, std::lock_guard<std::mutex> & cache_lock);
-
-        FileSegmentCell(FileSegmentCell && other) noexcept
-            : file_segment(std::move(other.file_segment))
-            , queue_iterator(other.queue_iterator) {}
-    };
-
-    using FileSegmentsByOffset = std::map<size_t, FileSegmentCell>;
-    using CachedFiles = std::unordered_map<Key, FileSegmentsByOffset>;
-
-    CachedFiles files;
-    LRUQueue queue;
-
-    LRUQueue stash_queue;
-    AccessRecord records;
-
-    size_t max_stash_element_size;
-    size_t enable_cache_hits_threshold;
-
-    Poco::Logger * log;
-    bool allow_to_remove_persistent_segments_from_cache_by_default;
-
-    FileSegments getImpl(
-        const Key & key, const FileSegment::Range & range,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegmentCell * getCell(
-        const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegmentCell * addCell(
-        const Key & key, size_t offset, size_t size,
-        FileSegment::State state, bool is_persistent,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    void useCell(const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock);
-
-    bool tryReserve(
-        const Key & key, size_t offset, size_t size,
-        std::lock_guard<std::mutex> & cache_lock) override;
-
-    bool tryReserveForMainList(
-        const Key & key, size_t offset, size_t size,
-        QueryContextPtr query_context,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    void remove(
-        Key key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & segment_lock) override;
-
-    bool isLastFileSegmentHolder(
-        const Key & key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & segment_lock) override;
-
-    size_t getAvailableCacheSize() const;
-
-    void loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegments splitRangeIntoCells(
-        const Key & key, size_t offset, size_t size, FileSegment::State state, bool is_persistent, std::lock_guard<std::mutex> & cache_lock);
-
-    String dumpStructureUnlocked(const Key & key_, std::lock_guard<std::mutex> & cache_lock);
-
-    void fillHolesWithEmptyFileSegments(
-        FileSegments & file_segments, const Key & key, const FileSegment::Range & range, bool fill_with_detached_file_segments, bool is_persistent, std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegmentsHolder setDownloading(const Key & key, size_t offset, size_t size, bool is_persistent) override;
-
-    size_t getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
-
-    size_t getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
-
-    size_t getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
-
-    void assertCacheCellsCorrectness(const FileSegmentsByOffset & cells_by_offset, std::lock_guard<std::mutex> & cache_lock);
-
-    void reduceSizeToDownloaded(
-        const Key & key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */) override;
-
-public:
-    String dumpStructure(const Key & key_) override;
-
-    void assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock);
-
-    void assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock);
-
-    void assertQueueCorrectness(std::lock_guard<std::mutex> & cache_lock);
-};
-
-}
diff --git a/src/Common/LRUFileCachePriority.cpp b/src/Common/LRUFileCachePriority.cpp
new file mode 100644
index 00000000000..91addc92501
--- /dev/null
+++ b/src/Common/LRUFileCachePriority.cpp
@@ -0,0 +1,105 @@
+#include <Common/LRUFileCachePriority.h>
+#include <Common/CurrentMetrics.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric FilesystemCacheSize;
+    extern const Metric FilesystemCacheElements;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+IFileCachePriority::WriteIterator LRUFileCachePriority::add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> &)
+{
+#ifndef NDEBUG
+    for (const auto & entry : queue)
+    {
+        if (entry.key == key && entry.offset == offset)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Attempt to add duplicate queue entry to queue. (Key: {}, offset: {}, size: {})",
+                entry.key.toString(),
+                entry.offset,
+                entry.size);
+    }
+#endif
+
+    auto iter = queue.insert(queue.end(), FileCacheRecord(key, offset, size));
+    cache_size += size;
+
+    CurrentMetrics::add(CurrentMetrics::FilesystemCacheSize, size);
+    CurrentMetrics::add(CurrentMetrics::FilesystemCacheElements);
+
+    return std::make_shared<LRUFileCacheIterator>(this, iter);
+}
+
+bool LRUFileCachePriority::contains(const Key & key, size_t offset, std::lock_guard<std::mutex> &)
+{
+    for (const auto & record : queue)
+    {
+        if (key == record.key && offset == record.offset)
+            return true;
+    }
+    return false;
+}
+
+void LRUFileCachePriority::removeAll(std::lock_guard<std::mutex> &)
+{
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheSize, cache_size);
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheElements, queue.size());
+
+    queue.clear();
+    cache_size = 0;
+}
+
+LRUFileCachePriority::LRUFileCacheIterator::LRUFileCacheIterator(
+    LRUFileCachePriority * cache_priority_, LRUFileCachePriority::LRUQueueIterator queue_iter_)
+    : cache_priority(cache_priority_), queue_iter(queue_iter_)
+{
+}
+
+IFileCachePriority::ReadIterator LRUFileCachePriority::getLowestPriorityReadIterator(std::lock_guard<std::mutex> &)
+{
+    return std::make_unique<const LRUFileCacheIterator>(this, queue.begin());
+}
+
+IFileCachePriority::WriteIterator LRUFileCachePriority::getLowestPriorityWriteIterator(std::lock_guard<std::mutex> &)
+{
+    return std::make_shared<LRUFileCacheIterator>(this, queue.begin());
+}
+
+size_t LRUFileCachePriority::getElementsNum(std::lock_guard<std::mutex> &) const
+{
+    return queue.size();
+}
+
+void LRUFileCachePriority::LRUFileCacheIterator::removeAndGetNext(std::lock_guard<std::mutex> &)
+{
+    cache_priority->cache_size -= queue_iter->size;
+
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheSize, queue_iter->size);
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheElements);
+
+    queue_iter = cache_priority->queue.erase(queue_iter);
+}
+
+void LRUFileCachePriority::LRUFileCacheIterator::incrementSize(size_t size_increment, std::lock_guard<std::mutex> &)
+{
+    cache_priority->cache_size += size_increment;
+    CurrentMetrics::add(CurrentMetrics::FilesystemCacheSize, size_increment);
+    queue_iter->size += size_increment;
+}
+
+void LRUFileCachePriority::LRUFileCacheIterator::use(std::lock_guard<std::mutex> &)
+{
+    queue_iter->hits++;
+    cache_priority->queue.splice(cache_priority->queue.end(), cache_priority->queue, queue_iter);
+}
+
+};
diff --git a/src/Common/LRUFileCachePriority.h b/src/Common/LRUFileCachePriority.h
new file mode 100644
index 00000000000..7ea35e9a5eb
--- /dev/null
+++ b/src/Common/LRUFileCachePriority.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <list>
+#include <Common/IFileCachePriority.h>
+
+namespace DB
+{
+
+/// Based on the LRU algorithm implementation, the record with the lowest priority is stored at
+/// the head of the queue, and the record with the highest priority is stored at the tail.
+class LRUFileCachePriority : public IFileCachePriority
+{
+private:
+    class LRUFileCacheIterator;
+    using LRUQueue = std::list<FileCacheRecord>;
+    using LRUQueueIterator = typename LRUQueue::iterator;
+
+public:
+    LRUFileCachePriority() = default;
+
+    WriteIterator add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> &) override;
+
+    bool contains(const Key & key, size_t offset, std::lock_guard<std::mutex> &) override;
+
+    void removeAll(std::lock_guard<std::mutex> &) override;
+
+    ReadIterator getLowestPriorityReadIterator(std::lock_guard<std::mutex> &) override;
+
+    WriteIterator getLowestPriorityWriteIterator(std::lock_guard<std::mutex> &) override;
+
+    size_t getElementsNum(std::lock_guard<std::mutex> &) const override;
+
+private:
+    LRUQueue queue;
+};
+
+class LRUFileCachePriority::LRUFileCacheIterator : public IFileCachePriority::IIterator
+{
+public:
+    LRUFileCacheIterator(LRUFileCachePriority * cache_priority_, LRUFileCachePriority::LRUQueueIterator queue_iter_);
+
+    void next() const override { queue_iter++; }
+
+    bool valid() const override { return queue_iter != cache_priority->queue.end(); }
+
+    const Key & key() const override { return queue_iter->key; }
+
+    size_t offset() const override { return queue_iter->offset; }
+
+    size_t size() const override { return queue_iter->size; }
+
+    size_t hits() const override { return queue_iter->hits; }
+
+    void removeAndGetNext(std::lock_guard<std::mutex> &) override;
+
+    void incrementSize(size_t size_increment, std::lock_guard<std::mutex> &) override;
+
+    void use(std::lock_guard<std::mutex> &) override;
+
+private:
+    LRUFileCachePriority * cache_priority;
+    mutable LRUFileCachePriority::LRUQueueIterator queue_iter;
+};
+
+};
diff --git a/src/Common/LRUResourceCache.h b/src/Common/LRUResourceCache.h
index 904c69b25ae..1fe3075a2a3 100644
--- a/src/Common/LRUResourceCache.h
+++ b/src/Common/LRUResourceCache.h
@@ -24,7 +24,7 @@ struct TrivialLRUResourceCacheReleaseFunction
 };
 
 /**
- * Similar to implementation in LRUCache.h, but with the difference that keys can
+ * Similar to implementation in LRUCachePolicy.h, but with the difference that keys can
  * only be evicted when they are releasable. Release state is controlled by this implementation.
  * get() and getOrSet() methods return a Holder to actual value, which does release() in destructor.
  *
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index f467fccc514..da3ce3cc3d2 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -169,12 +169,14 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded, MemoryT
     std::bernoulli_distribution fault(fault_probability);
     if (unlikely(fault_probability && fault(thread_local_rng)) && memoryTrackerCanThrow(level, true) && throw_if_memory_exceeded)
     {
+        /// Revert
+        amount.fetch_sub(size, std::memory_order_relaxed);
+
         /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
         MemoryTrackerBlockerInThread untrack_lock(VariableContext::Global);
 
         ProfileEvents::increment(ProfileEvents::QueryMemoryLimitExceeded);
         const auto * description = description_ptr.load(std::memory_order_relaxed);
-        amount.fetch_sub(size, std::memory_order_relaxed);
         throw DB::Exception(
             DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED,
             "Memory tracker{}{}: fault injected. Would use {} (attempt to allocate chunk of {} bytes), maximum: {}",
@@ -211,6 +213,9 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded, MemoryT
 
         if (overcommit_result != OvercommitResult::MEMORY_FREED)
         {
+            /// Revert
+            amount.fetch_sub(size, std::memory_order_relaxed);
+
             /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
             MemoryTrackerBlockerInThread untrack_lock(VariableContext::Global);
             ProfileEvents::increment(ProfileEvents::QueryMemoryLimitExceeded);
diff --git a/src/Common/PODArray.h b/src/Common/PODArray.h
index 44be28eab75..d3232d833ee 100644
--- a/src/Common/PODArray.h
+++ b/src/Common/PODArray.h
@@ -703,10 +703,9 @@ public:
 
         size_t bytes_to_copy = this->byte_size(required_capacity);
         if (bytes_to_copy)
-        {
             memcpy(this->c_start, reinterpret_cast<const void *>(&*from_begin), bytes_to_copy);
-            this->c_end = this->c_start + bytes_to_copy;
-        }
+
+        this->c_end = this->c_start + bytes_to_copy;
     }
 
     // ISO C++ has strict ambiguity rules, thus we cannot apply TAllocatorParams here.
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 453ed9ec37c..00ccaca00d4 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -1,7 +1,6 @@
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentThread.h>
-#include <Common/typeid_cast.h>
-#include <Columns/ColumnArray.h>
+
 
 /// Available events. Add something here as you wish.
 #define APPLY_FOR_EVENTS(M) \
@@ -361,7 +360,10 @@
     M(KeeperSnapshotApplysFailed, "Number of failed snapshot applying")\
     M(KeeperReadSnapshot, "Number of snapshot read(serialization)")\
     M(KeeperSaveSnapshot, "Number of snapshot save")\
-
+    \
+    M(OverflowBreak, "Number of times, data processing was cancelled by query complexity limitation with setting '*_overflow_mode' = 'break' and the result is incomplete.") \
+    M(OverflowThrow, "Number of times, data processing was cancelled by query complexity limitation with setting '*_overflow_mode' = 'throw' and exception was thrown.") \
+    M(OverflowAny, "Number of times approximate GROUP BY was in effect: when aggregation was performed only on top of first 'max_rows_to_group_by' unique keys and other keys were ignored due to 'group_by_overflow_mode' = 'any'.") \
 
 namespace ProfileEvents
 {
@@ -450,7 +452,7 @@ void increment(Event event, Count amount)
 CountersIncrement::CountersIncrement(Counters::Snapshot const & snapshot)
 {
     init();
-    std::memcpy(increment_holder.get(), snapshot.counters_holder.get(), Counters::num_counters * sizeof(Increment));
+    memcpy(increment_holder.get(), snapshot.counters_holder.get(), Counters::num_counters * sizeof(Increment));
 }
 
 CountersIncrement::CountersIncrement(Counters::Snapshot const & after, Counters::Snapshot const & before)
diff --git a/src/Common/ProgressIndication.cpp b/src/Common/ProgressIndication.cpp
index 8ca1612e916..ab4ecf5c25f 100644
--- a/src/Common/ProgressIndication.cpp
+++ b/src/Common/ProgressIndication.cpp
@@ -8,7 +8,6 @@
 #include "Common/formatReadable.h"
 #include <Common/TerminalSize.h>
 #include <Common/UnicodeBar.h>
-#include <Common/Stopwatch.h>
 #include "IO/WriteBufferFromString.h"
 #include <Databases/DatabaseMemory.h>
 
@@ -33,6 +32,13 @@ namespace
 namespace DB
 {
 
+UInt64 ProgressIndication::getElapsedNanoseconds() const
+{
+    /// New server versions send server-side elapsed time, which is preferred for calculations.
+    UInt64 server_elapsed_ns = progress.elapsed_ns.load(std::memory_order_relaxed);
+    return server_elapsed_ns ? server_elapsed_ns : watch.elapsed();
+}
+
 bool ProgressIndication::updateProgress(const Progress & value)
 {
     return progress.incrementPiecewiseAtomically(value);
@@ -56,7 +62,7 @@ void ProgressIndication::resetProgress()
     write_progress_on_update = false;
     {
         std::lock_guard lock(profile_events_mutex);
-        cpu_usage_meter.reset(static_cast<double>(clock_gettime_ns()));
+        cpu_usage_meter.reset(getElapsedNanoseconds());
         thread_data.clear();
     }
 }
@@ -93,7 +99,7 @@ void ProgressIndication::updateThreadEventData(HostToThreadTimesMap & new_thread
         total_cpu_ns += aggregateCPUUsageNs(new_host_map.second);
         thread_data[new_host_map.first] = std::move(new_host_map.second);
     }
-    cpu_usage_meter.add(static_cast<double>(clock_gettime_ns()), total_cpu_ns);
+    cpu_usage_meter.add(getElapsedNanoseconds(), total_cpu_ns);
 }
 
 size_t ProgressIndication::getUsedThreadsCount() const
@@ -110,7 +116,7 @@ size_t ProgressIndication::getUsedThreadsCount() const
 double ProgressIndication::getCPUUsage()
 {
     std::lock_guard lock(profile_events_mutex);
-    return cpu_usage_meter.rate(clock_gettime_ns());
+    return cpu_usage_meter.rate(getElapsedNanoseconds());
 }
 
 ProgressIndication::MemoryUsage ProgressIndication::getMemoryUsage() const
@@ -139,7 +145,7 @@ void ProgressIndication::writeFinalProgress()
     std::cout << "Processed " << formatReadableQuantity(progress.read_rows) << " rows, "
                 << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
 
-    size_t elapsed_ns = watch.elapsed();
+    UInt64 elapsed_ns = getElapsedNanoseconds();
     if (elapsed_ns)
         std::cout << " (" << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
                     << formatReadableSizeWithDecimalSuffix(progress.read_bytes * 1000000000.0 / elapsed_ns) << "/s.)";
@@ -185,7 +191,7 @@ void ProgressIndication::writeProgress()
         << formatReadableQuantity(progress.read_rows) << " rows, "
         << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
 
-    auto elapsed_ns = watch.elapsed();
+    UInt64 elapsed_ns = getElapsedNanoseconds();
     if (elapsed_ns)
         message << " ("
                 << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
diff --git a/src/Common/ProgressIndication.h b/src/Common/ProgressIndication.h
index 588a31beca7..4f05f41b9d0 100644
--- a/src/Common/ProgressIndication.h
+++ b/src/Common/ProgressIndication.h
@@ -55,7 +55,7 @@ public:
     void setFileProgressCallback(ContextMutablePtr context, bool write_progress_on_update = false);
 
     /// How much seconds passed since query execution start.
-    double elapsedSeconds() const { return watch.elapsedSeconds(); }
+    double elapsedSeconds() const { return getElapsedNanoseconds() / 1e9; }
 
     void addThreadIdToList(String const & host, UInt64 thread_id);
 
@@ -74,6 +74,8 @@ private:
 
     MemoryUsage getMemoryUsage() const;
 
+    UInt64 getElapsedNanoseconds() const;
+
     /// This flag controls whether to show the progress bar. We start showing it after
     /// the query has been executing for 0.5 seconds, and is still less than half complete.
     bool show_progress_bar = false;
@@ -86,7 +88,7 @@ private:
     /// This information is stored here.
     Progress progress;
 
-    /// Track query execution time.
+    /// Track query execution time on client.
     Stopwatch watch;
 
     bool write_progress_on_update = false;
diff --git a/src/Common/SLRUCachePolicy.h b/src/Common/SLRUCachePolicy.h
new file mode 100644
index 00000000000..10b043ebaca
--- /dev/null
+++ b/src/Common/SLRUCachePolicy.h
@@ -0,0 +1,251 @@
+#pragma once
+
+#include <Common/ICachePolicy.h>
+
+#include <list>
+#include <unordered_map>
+
+#include <Common/logger_useful.h>
+
+namespace DB
+{
+
+/// Cache policy SLRU evicts entries which were used only once and are not used for a long time,
+/// this policy protects entries which were used more then once from a sequential scan.
+/// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
+/// of that value.
+/// Cache starts to evict entries when their total weight exceeds max_size.
+/// Value weight should not change after insertion.
+/// To work with the thread-safe implementation of this class use a class "CacheBase" with first parameter "SLRU"
+/// and next parameters in the same order as in the constructor of the current class.
+template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
+class SLRUCachePolicy : public ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>
+{
+public:
+    using Key = TKey;
+    using Mapped = TMapped;
+    using MappedPtr = std::shared_ptr<Mapped>;
+
+    using Base = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+    using typename Base::OnWeightLossFunction;
+
+    /** Initialize SLRUCachePolicy with max_size and max_protected_size.
+      * max_protected_size shows how many of the most frequently used entries will not be evicted after a sequential scan.
+      * max_protected_size == 0 means that the default protected size is equal to half of the total max size.
+      */
+    /// TODO: construct from special struct with cache policy parametrs (also with max_protected_size).
+    SLRUCachePolicy(size_t max_size_, size_t max_elements_size_ = 0, double size_ratio = 0.5, OnWeightLossFunction on_weight_loss_function_ = {})
+        : max_protected_size(max_size_ * std::min(1.0, size_ratio))
+        , max_size(max_size_)
+        , max_elements_size(max_elements_size_)
+        {
+            Base::on_weight_loss_function = on_weight_loss_function_;
+        }
+
+    size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return current_size;
+    }
+
+    size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return cells.size();
+    }
+
+    size_t maxSize() const override
+    {
+        return max_size;
+    }
+
+    void reset(std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        cells.clear();
+        probationary_queue.clear();
+        protected_queue.clear();
+        current_size = 0;
+        current_protected_size = 0;
+    }
+
+    void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+            return;
+        auto & cell = it->second;
+        current_size -= cell.size;
+        if (cell.is_protected)
+        {
+            current_protected_size -= cell.size;
+        }
+        auto & queue = cell.is_protected ? protected_queue : probationary_queue;
+        queue.erase(cell.queue_iterator);
+        cells.erase(it);
+    }
+
+    MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+        {
+            return MappedPtr();
+        }
+
+        Cell & cell = it->second;
+
+        if (cell.is_protected)
+        {
+            protected_queue.splice(protected_queue.end(), protected_queue, cell.queue_iterator);
+        }
+        else
+        {
+            cell.is_protected = true;
+            current_protected_size += cell.size;
+            protected_queue.splice(protected_queue.end(), probationary_queue, cell.queue_iterator);
+            removeOverflow(protected_queue, max_protected_size, current_protected_size, /*is_protected=*/true);
+        }
+
+        return cell.value;
+    }
+
+    void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto [it, inserted] = cells.emplace(std::piecewise_construct,
+            std::forward_as_tuple(key),
+            std::forward_as_tuple());
+
+        Cell & cell = it->second;
+
+        if (inserted)
+        {
+            try
+            {
+                cell.queue_iterator = probationary_queue.insert(probationary_queue.end(), key);
+            }
+            catch (...)
+            {
+                cells.erase(it);
+                throw;
+            }
+        }
+        else
+        {
+            current_size -= cell.size;
+            if (cell.is_protected)
+            {
+                current_protected_size -= cell.size;
+                protected_queue.splice(protected_queue.end(), protected_queue, cell.queue_iterator);
+            }
+            else
+            {
+                cell.is_protected = true;
+                protected_queue.splice(protected_queue.end(), probationary_queue, cell.queue_iterator);
+            }
+        }
+
+        cell.value = mapped;
+        cell.size = cell.value ? weight_function(*cell.value) : 0;
+        current_size += cell.size;
+        current_protected_size += cell.is_protected ? cell.size : 0;
+
+        removeOverflow(protected_queue, max_protected_size, current_protected_size, /*is_protected=*/true);
+        removeOverflow(probationary_queue, max_size, current_size, /*is_protected=*/false);
+    }
+
+protected:
+    using SLRUQueue = std::list<Key>;
+    using SLRUQueueIterator = typename SLRUQueue::iterator;
+
+    SLRUQueue probationary_queue;
+    SLRUQueue protected_queue;
+
+    struct Cell
+    {
+        bool is_protected = false;
+        MappedPtr value;
+        size_t size;
+        SLRUQueueIterator queue_iterator;
+    };
+
+    using Cells = std::unordered_map<Key, Cell, HashFunction>;
+
+    Cells cells;
+
+    size_t current_protected_size = 0;
+    size_t current_size = 0;
+    const size_t max_protected_size;
+    const size_t max_size;
+    const size_t max_elements_size;
+
+    WeightFunction weight_function;
+
+    void removeOverflow(SLRUQueue & queue, const size_t max_weight_size, size_t & current_weight_size, bool is_protected)
+    {
+        size_t current_weight_lost = 0;
+        size_t queue_size = queue.size();
+
+        std::function<bool()> need_remove;
+        if (is_protected)
+        {
+            /// Check if after remove all elements from probationary part there will be no more than max elements
+            /// in protected queue and weight of all protected elements will be less then max protected weight.
+            /// It's not possible to check only cells.size() > max_elements_size
+            /// because protected elements move to probationary part and still remain in cache.
+            need_remove = [&]()
+            {
+                return ((max_elements_size != 0 && cells.size() - probationary_queue.size() > max_elements_size)
+                || (current_weight_size > max_weight_size)) && (queue_size > 0);
+            };
+        }
+        else
+        {
+            need_remove = [&]()
+            {
+                return ((max_elements_size != 0 && cells.size() > max_elements_size)
+                || (current_weight_size > max_weight_size)) && (queue_size > 0);
+            };
+        }
+
+        while (need_remove())
+        {
+            const Key & key = queue.front();
+
+            auto it = cells.find(key);
+            if (it == cells.end())
+            {
+                LOG_ERROR(&Poco::Logger::get("SLRUCache"), "SLRUCache became inconsistent. There must be a bug in it.");
+                abort();
+            }
+
+            auto & cell = it->second;
+
+            current_weight_size -= cell.size;
+
+            if (cell.is_protected)
+            {
+                cell.is_protected = false;
+                probationary_queue.splice(probationary_queue.end(), queue, cell.queue_iterator);
+            }
+            else
+            {
+                current_weight_lost += cell.size;
+                cells.erase(it);
+                queue.pop_front();
+            }
+
+            --queue_size;
+        }
+
+        if (!is_protected)
+        {
+            Base::on_weight_loss_function(current_weight_lost);
+        }
+
+        if (current_size > (1ull << 63))
+        {
+            LOG_ERROR(&Poco::Logger::get("SLRUCache"), "SLRUCache became inconsistent. There must be a bug in it.");
+            abort();
+        }
+    }
+};
+
+}
diff --git a/src/Common/TargetSpecific.cpp b/src/Common/TargetSpecific.cpp
index 70b03833775..a5fbe7de078 100644
--- a/src/Common/TargetSpecific.cpp
+++ b/src/Common/TargetSpecific.cpp
@@ -20,6 +20,8 @@ UInt32 getSupportedArchs()
         result |= static_cast<UInt32>(TargetArch::AVX512BW);
     if (Cpu::CpuFlagsCache::have_AVX512VBMI)
         result |= static_cast<UInt32>(TargetArch::AVX512VBMI);
+    if (Cpu::CpuFlagsCache::have_AVX512VBMI2)
+        result |= static_cast<UInt32>(TargetArch::AVX512VBMI2);
     return result;
 }
 
@@ -38,8 +40,9 @@ String toString(TargetArch arch)
         case TargetArch::AVX:     return "avx";
         case TargetArch::AVX2:    return "avx2";
         case TargetArch::AVX512F: return "avx512f";
-        case TargetArch::AVX512BW: return "avx512bw";
-        case TargetArch::AVX512VBMI: return "avx512vbmi";
+        case TargetArch::AVX512BW:    return "avx512bw";
+        case TargetArch::AVX512VBMI:  return "avx512vbmi";
+        case TargetArch::AVX512VBMI2: return "avx512vbmi";
     }
 
     __builtin_unreachable();
diff --git a/src/Common/TargetSpecific.h b/src/Common/TargetSpecific.h
index f078c0e3ffc..250642f6ee4 100644
--- a/src/Common/TargetSpecific.h
+++ b/src/Common/TargetSpecific.h
@@ -31,7 +31,7 @@
  * int funcImpl() {
  *     return 2;
  * }
- * ) // DECLARE_DEFAULT_CODE
+ * ) // DECLARE_AVX2_SPECIFIC_CODE
  *
  * int func() {
  * #if USE_MULTITARGET_CODE
@@ -80,8 +80,9 @@ enum class TargetArch : UInt32
     AVX      = (1 << 1),
     AVX2     = (1 << 2),
     AVX512F  = (1 << 3),
-    AVX512BW  = (1 << 4),
-    AVX512VBMI = (1 << 5),
+    AVX512BW    = (1 << 4),
+    AVX512VBMI  = (1 << 5),
+    AVX512VBMI2 = (1 << 6),
 };
 
 /// Runtime detection.
@@ -100,6 +101,7 @@ String toString(TargetArch arch);
 
 #if defined(__clang__)
 
+#define AVX512VBMI2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2")))
 #define AVX512VBMI_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi")))
 #define AVX512BW_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw")))
 #define AVX512_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f")))
@@ -108,6 +110,8 @@ String toString(TargetArch arch);
 #define SSE42_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt")))
 #define DEFAULT_FUNCTION_SPECIFIC_ATTRIBUTE
 
+#   define BEGIN_AVX512VBMI2_SPECIFIC_CODE \
+        _Pragma("clang attribute push(__attribute__((target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2\"))),apply_to=function)")
 #   define BEGIN_AVX512VBMI_SPECIFIC_CODE \
         _Pragma("clang attribute push(__attribute__((target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi\"))),apply_to=function)")
 #   define BEGIN_AVX512BW_SPECIFIC_CODE \
@@ -129,6 +133,7 @@ String toString(TargetArch arch);
 #   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void _dummy_function_definition();
 #else
 
+#define AVX512VBMI2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2,tune=native")))
 #define AVX512VBMI_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,tune=native")))
 #define AVX512BW_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,tune=native")))
 #define AVX512_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,tune=native")))
@@ -137,6 +142,9 @@ String toString(TargetArch arch);
 #define SSE42_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt",tune=native)))
 #define DEFAULT_FUNCTION_SPECIFIC_ATTRIBUTE
 
+#   define BEGIN_AVX512VBMI2_SPECIFIC_CODE \
+        _Pragma("GCC push_options") \
+        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2,tune=native\")")
 #   define BEGIN_AVX512VBMI_SPECIFIC_CODE \
         _Pragma("GCC push_options") \
         _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,tune=native\")")
@@ -217,6 +225,16 @@ namespace TargetSpecific::AVX512VBMI { \
 } \
 END_TARGET_SPECIFIC_CODE
 
+#define DECLARE_AVX512VBMI2_SPECIFIC_CODE(...) \
+BEGIN_AVX512VBMI2_SPECIFIC_CODE \
+namespace TargetSpecific::AVX512VBMI2 { \
+    DUMMY_FUNCTION_DEFINITION \
+    using namespace DB::TargetSpecific::AVX512VBMI2; \
+    __VA_ARGS__ \
+} \
+END_TARGET_SPECIFIC_CODE
+
+
 #else
 
 #define USE_MULTITARGET_CODE 0
@@ -229,6 +247,7 @@ END_TARGET_SPECIFIC_CODE
 #define DECLARE_AVX512F_SPECIFIC_CODE(...)
 #define DECLARE_AVX512BW_SPECIFIC_CODE(...)
 #define DECLARE_AVX512VBMI_SPECIFIC_CODE(...)
+#define DECLARE_AVX512VBMI2_SPECIFIC_CODE(...)
 
 #endif
 
@@ -245,8 +264,9 @@ DECLARE_SSE42_SPECIFIC_CODE  (__VA_ARGS__) \
 DECLARE_AVX_SPECIFIC_CODE    (__VA_ARGS__) \
 DECLARE_AVX2_SPECIFIC_CODE   (__VA_ARGS__) \
 DECLARE_AVX512F_SPECIFIC_CODE(__VA_ARGS__) \
-DECLARE_AVX512BW_SPECIFIC_CODE(__VA_ARGS__) \
-DECLARE_AVX512VBMI_SPECIFIC_CODE(__VA_ARGS__)
+DECLARE_AVX512BW_SPECIFIC_CODE    (__VA_ARGS__) \
+DECLARE_AVX512VBMI_SPECIFIC_CODE  (__VA_ARGS__) \
+DECLARE_AVX512VBMI2_SPECIFIC_CODE (__VA_ARGS__)
 
 DECLARE_DEFAULT_CODE(
     constexpr auto BuildArch = TargetArch::Default; /// NOLINT
@@ -276,6 +296,9 @@ DECLARE_AVX512VBMI_SPECIFIC_CODE(
     constexpr auto BuildArch = TargetArch::AVX512VBMI; /// NOLINT
 ) // DECLARE_AVX512VBMI_SPECIFIC_CODE
 
+DECLARE_AVX512VBMI2_SPECIFIC_CODE(
+    constexpr auto BuildArch = TargetArch::AVX512VBMI2; /// NOLINT
+) // DECLARE_AVX512VBMI2_SPECIFIC_CODE
 
 /** Runtime Dispatch helpers for class members.
   *
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 4dd32f7ff10..423a44c97d6 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -24,9 +24,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-
-thread_local ThreadStatus * current_thread = nullptr;
-thread_local ThreadStatus * main_thread = nullptr;
+thread_local ThreadStatus constinit * current_thread = nullptr;
 
 #if !defined(SANITIZER)
 namespace
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index 7c22d3b8335..2a4ffd229f2 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -102,8 +102,16 @@ public:
 
 using ThreadGroupStatusPtr = std::shared_ptr<ThreadGroupStatus>;
 
-
-extern thread_local ThreadStatus * current_thread;
+/**
+ * We use **constinit** here to tell the compiler the current_thread variable is initialized.
+ * If we didn't help the compiler, then it would most likely add a check before every use of the variable to initialize it if needed.
+ * Instead it will trust that we are doing the right thing (and we do initialize it to nullptr) and emit more optimal code.
+ * This is noticeable in functions like CurrentMemoryTracker::free and CurrentMemoryTracker::allocImpl
+ * See also:
+ * - https://en.cppreference.com/w/cpp/language/constinit
+ * - https://github.com/ClickHouse/ClickHouse/pull/40078
+ */
+extern thread_local constinit ThreadStatus * current_thread;
 
 /** Encapsulates all per-thread info (ProfileEvents, MemoryTracker, query_id, query context, etc.).
   * The object must be created in thread function and destroyed in the same thread before the exit.
@@ -127,6 +135,8 @@ public:
     Int64 untracked_memory = 0;
     /// Each thread could new/delete memory in range of (-untracked_memory_limit, untracked_memory_limit) without access to common counters.
     Int64 untracked_memory_limit = 4 * 1024 * 1024;
+    /// Increase limit in case of exception.
+    Int64 untracked_memory_limit_increase = 0;
 
     /// Statistics of read and write rows/bytes
     Progress progress_in;
diff --git a/src/Common/filesystemHelpers.cpp b/src/Common/filesystemHelpers.cpp
index 1e8e53bf1ea..610608cd312 100644
--- a/src/Common/filesystemHelpers.cpp
+++ b/src/Common/filesystemHelpers.cpp
@@ -351,4 +351,24 @@ void setModificationTime(const std::string & path, time_t time)
     if (utime(path.c_str(), &tb) != 0)
         DB::throwFromErrnoWithPath("Cannot set modification time for file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
 }
+
+bool isSymlink(const fs::path & path)
+{
+    /// Remove trailing slash before checking if file is symlink.
+    /// Let /path/to/link is a symlink to /path/to/target/dir/ directory.
+    /// In this case is_symlink("/path/to/link") is true,
+    /// but is_symlink("/path/to/link/") is false (it's a directory)
+    if (path.filename().empty())
+        return fs::is_symlink(path.parent_path());      /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+    return fs::is_symlink(path);        /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+}
+
+fs::path readSymlink(const fs::path & path)
+{
+    /// See the comment for isSymlink
+    if (path.filename().empty())
+        return fs::read_symlink(path.parent_path());        /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+    return fs::read_symlink(path);      /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+}
+
 }
diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h
index 2be3ea748fa..f96fe269eab 100644
--- a/src/Common/filesystemHelpers.h
+++ b/src/Common/filesystemHelpers.h
@@ -9,6 +9,7 @@
 #include <sys/statvfs.h>
 #include <Poco/TemporaryFile.h>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -89,4 +90,8 @@ Poco::Timestamp getModificationTimestamp(const std::string & path);
 void setModificationTime(const std::string & path, time_t time);
 /// st_ctime
 time_t getChangeTime(const std::string & path);
+
+bool isSymlink(const fs::path & path);
+fs::path readSymlink(const fs::path & path);
+
 }
diff --git a/src/Common/tests/gtest_DateLUTImpl.cpp b/src/Common/tests/gtest_DateLUTImpl.cpp
index d522448d337..49013625ed3 100644
--- a/src/Common/tests/gtest_DateLUTImpl.cpp
+++ b/src/Common/tests/gtest_DateLUTImpl.cpp
@@ -79,12 +79,13 @@ FailuresCount countFailures(const ::testing::TestResult & test_result)
 TEST(DateLUTTest, makeDayNumTest)
 {
     const DateLUTImpl & lut = DateLUT::instance("UTC");
-    EXPECT_EQ(0, lut.makeDayNum(1924, 12, 31));
-    EXPECT_EQ(-1, lut.makeDayNum(1924, 12, 31, -1));
+    EXPECT_EQ(0, lut.makeDayNum(1899, 12, 31));
+    EXPECT_EQ(-1, lut.makeDayNum(1899, 12, 31, -1));
+    EXPECT_EQ(-25567, lut.makeDayNum(1900, 1, 1));
     EXPECT_EQ(-16436, lut.makeDayNum(1925, 1, 1));
     EXPECT_EQ(0, lut.makeDayNum(1970, 1, 1));
-    EXPECT_EQ(114635, lut.makeDayNum(2283, 11, 11));
-    EXPECT_EQ(114635, lut.makeDayNum(2500, 12, 25));
+    EXPECT_EQ(120529, lut.makeDayNum(2300, 12, 31));
+    EXPECT_EQ(120529, lut.makeDayNum(2500, 12, 25));
 }
 
 
diff --git a/src/Common/tests/gtest_lru_cache.cpp b/src/Common/tests/gtest_lru_cache.cpp
index 7694a76ea72..f74d1eb9464 100644
--- a/src/Common/tests/gtest_lru_cache.cpp
+++ b/src/Common/tests/gtest_lru_cache.cpp
@@ -1,12 +1,12 @@
 #include <iomanip>
 #include <iostream>
 #include <gtest/gtest.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 
 TEST(LRUCache, set)
 {
-    using SimpleLRUCache = DB::LRUCache<int, int>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(2, std::make_shared<int>(3));
 
@@ -18,8 +18,8 @@ TEST(LRUCache, set)
 
 TEST(LRUCache, update)
 {
-    using SimpleLRUCache = DB::LRUCache<int, int>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(1, std::make_shared<int>(3));
     auto val = lru_cache.get(1);
@@ -29,11 +29,11 @@ TEST(LRUCache, update)
 
 TEST(LRUCache, get)
 {
-    using SimpleLRUCache = DB::LRUCache<int, int>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(2, std::make_shared<int>(3));
-    SimpleLRUCache::MappedPtr value = lru_cache.get(1);
+    SimpleCacheBase::MappedPtr value = lru_cache.get(1);
     ASSERT_TRUE(value != nullptr);
     ASSERT_EQ(*value, 2);
 
@@ -49,8 +49,8 @@ struct ValueWeight
 
 TEST(LRUCache, evictOnSize)
 {
-    using SimpleLRUCache = DB::LRUCache<int, size_t>;
-    auto lru_cache = SimpleLRUCache(20, 3);
+    using SimpleCacheBase = DB::CacheBase<int, size_t>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 20, /*max_elements_size*/ 3, "LRU");
     lru_cache.set(1, std::make_shared<size_t>(2));
     lru_cache.set(2, std::make_shared<size_t>(3));
     lru_cache.set(3, std::make_shared<size_t>(4));
@@ -65,8 +65,8 @@ TEST(LRUCache, evictOnSize)
 
 TEST(LRUCache, evictOnWeight)
 {
-    using SimpleLRUCache = DB::LRUCache<int, size_t, std::hash<int>, ValueWeight>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     lru_cache.set(1, std::make_shared<size_t>(2));
     lru_cache.set(2, std::make_shared<size_t>(3));
     lru_cache.set(3, std::make_shared<size_t>(4));
@@ -86,8 +86,8 @@ TEST(LRUCache, evictOnWeight)
 
 TEST(LRUCache, getOrSet)
 {
-    using SimpleLRUCache = DB::LRUCache<int, size_t, std::hash<int>, ValueWeight>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     size_t x = 10;
     auto load_func = [&] { return std::make_shared<size_t>(x); };
     auto [value, loaded] = lru_cache.getOrSet(1, load_func);
diff --git a/src/Common/tests/gtest_lru_file_cache.cpp b/src/Common/tests/gtest_lru_file_cache.cpp
index 2f268e217df..3f481ee25ca 100644
--- a/src/Common/tests/gtest_lru_file_cache.cpp
+++ b/src/Common/tests/gtest_lru_file_cache.cpp
@@ -1,7 +1,7 @@
 #include <iomanip>
 #include <iostream>
 #include <gtest/gtest.h>
-#include <Common/LRUFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileSegment.h>
 #include <Common/CurrentThread.h>
 #include <Common/filesystemHelpers.h>
@@ -47,7 +47,7 @@ std::vector<DB::FileSegmentPtr> fromHolder(const DB::FileSegmentsHolder & holder
     return std::vector<DB::FileSegmentPtr>(holder.file_segments.begin(), holder.file_segments.end());
 }
 
-String getFileSegmentPath(const String & base_path, const DB::IFileCache::Key & key, size_t offset)
+String getFileSegmentPath(const String & base_path, const DB::FileCache::Key & key, size_t offset)
 {
     auto key_str = key.toString();
     return fs::path(base_path) / key_str.substr(0, 3) / key_str / DB::toString(offset);
@@ -85,7 +85,7 @@ void complete(const DB::FileSegmentsHolder & holder)
 }
 
 
-TEST(LRUFileCache, get)
+TEST(FileCache, get)
 {
     if (fs::exists(cache_base_path))
         fs::remove_all(cache_base_path);
@@ -103,7 +103,7 @@ TEST(LRUFileCache, get)
     DB::FileCacheSettings settings;
     settings.max_size = 30;
     settings.max_elements = 5;
-    auto cache = DB::LRUFileCache(cache_base_path, settings);
+    auto cache = DB::FileCache(cache_base_path, settings);
     cache.initialize();
     auto key = cache.hash("key1");
 
@@ -479,7 +479,7 @@ TEST(LRUFileCache, get)
     {
         /// Test LRUCache::restore().
 
-        auto cache2 = DB::LRUFileCache(cache_base_path, settings);
+        auto cache2 = DB::FileCache(cache_base_path, settings);
         cache2.initialize();
 
         auto holder1 = cache2.getOrSet(key, 2, 28, false); /// Get [2, 29]
@@ -499,7 +499,7 @@ TEST(LRUFileCache, get)
 
         auto settings2 = settings;
         settings2.max_file_segment_size = 10;
-        auto cache2 = DB::LRUFileCache(caches_dir / "cache2", settings2);
+        auto cache2 = DB::FileCache(caches_dir / "cache2", settings2);
         cache2.initialize();
 
         auto holder1 = cache2.getOrSet(key, 0, 25, false); /// Get [0, 24]
diff --git a/src/Common/tests/gtest_pod_array.cpp b/src/Common/tests/gtest_pod_array.cpp
index b5ec45c3e5d..82a6f7589b8 100644
--- a/src/Common/tests/gtest_pod_array.cpp
+++ b/src/Common/tests/gtest_pod_array.cpp
@@ -484,6 +484,35 @@ TEST(Common, PODArrayInsertFromItself)
     }
 }
 
+TEST(Common, PODArrayAssign)
+{
+    {
+        PaddedPODArray<UInt64> array;
+        array.push_back(1);
+        array.push_back(2);
+
+        array.assign({1, 2, 3});
+
+        ASSERT_EQ(array.size(), 3);
+        ASSERT_EQ(array, PaddedPODArray<UInt64>({1, 2, 3}));
+    }
+    {
+        PaddedPODArray<UInt64> array;
+        array.push_back(1);
+        array.push_back(2);
+
+        array.assign({});
+
+        ASSERT_TRUE(array.empty());
+    }
+    {
+        PaddedPODArray<UInt64> array;
+        array.assign({});
+
+        ASSERT_TRUE(array.empty());
+    }
+}
+
 TEST(Common, PODNoOverallocation)
 {
     /// Check that PaddedPODArray allocates for smaller number of elements than the power of two due to padding.
diff --git a/src/Common/tests/gtest_slru_cahce.cpp b/src/Common/tests/gtest_slru_cahce.cpp
new file mode 100644
index 00000000000..66df0dbec77
--- /dev/null
+++ b/src/Common/tests/gtest_slru_cahce.cpp
@@ -0,0 +1,210 @@
+#include <iomanip>
+#include <iostream>
+#include <gtest/gtest.h>
+#include <Common/CacheBase.h>
+
+TEST(SLRUCache, set)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(2, std::make_shared<int>(3));
+
+    auto w = slru_cache.weight();
+    auto n = slru_cache.count();
+    ASSERT_EQ(w, 2);
+    ASSERT_EQ(n, 2);
+}
+
+TEST(SLRUCache, update)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(1, std::make_shared<int>(3));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_TRUE(*value == 3);
+}
+
+TEST(SLRUCache, get)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(2, std::make_shared<int>(3));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 2);
+
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 3);
+}
+
+TEST(SLRUCache, remove)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(2, std::make_shared<int>(3));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 2);
+
+    slru_cache.remove(2);
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value == nullptr);
+}
+
+TEST(SLRUCache, removeFromProtected)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/2, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(1, std::make_shared<int>(3));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 3);
+
+    slru_cache.remove(1);
+    value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+
+    slru_cache.set(1, std::make_shared<int>(4));
+    slru_cache.set(1, std::make_shared<int>(5));
+
+    slru_cache.set(2, std::make_shared<int>(6));
+    slru_cache.set(3, std::make_shared<int>(7));
+
+    value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 5);
+
+    value = slru_cache.get(3);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 7);
+
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value == nullptr);
+}
+
+TEST(SLRUCache, reset)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(2, std::make_shared<int>(3));
+
+    slru_cache.set(2, std::make_shared<int>(4)); /// add to protected_queue
+
+    slru_cache.reset();
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value == nullptr);
+}
+
+struct ValueWeight
+{
+    size_t operator()(const size_t & x) const { return x; }
+};
+
+TEST(SLRUCache, evictOnElements)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/1, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<size_t>(2));
+    slru_cache.set(2, std::make_shared<size_t>(3));
+
+    auto n = slru_cache.count();
+    ASSERT_EQ(n, 1);
+
+    auto w = slru_cache.weight();
+    ASSERT_EQ(w, 3);
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_TRUE(*value == 3);
+}
+
+
+TEST(SLRUCache, evictOnWeight)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<size_t>(2));
+    slru_cache.set(2, std::make_shared<size_t>(3));
+    slru_cache.set(3, std::make_shared<size_t>(4));
+    slru_cache.set(4, std::make_shared<size_t>(5));
+
+    auto n = slru_cache.count();
+    ASSERT_EQ(n, 2);
+
+    auto w = slru_cache.weight();
+    ASSERT_EQ(w, 9);
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value == nullptr);
+}
+
+TEST(SLRUCache, evictFromProtectedPart)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<size_t>(2));
+    slru_cache.set(1, std::make_shared<size_t>(2));
+
+    slru_cache.set(2, std::make_shared<size_t>(5));
+    slru_cache.set(2, std::make_shared<size_t>(5));
+
+    slru_cache.set(3, std::make_shared<size_t>(5));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+}
+
+TEST(SLRUCache, evictStreamProtected)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<size_t>(2));
+    slru_cache.set(1, std::make_shared<size_t>(2));
+
+    slru_cache.set(2, std::make_shared<size_t>(3));
+    slru_cache.set(2, std::make_shared<size_t>(3));
+
+    for (int key = 3; key < 10; ++key)
+    {
+        slru_cache.set(key, std::make_shared<size_t>(1 + key % 5));
+    }
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 2);
+
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 3);
+}
+
+TEST(SLRUCache, getOrSet)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    size_t x = 5;
+    auto load_func = [&] { return std::make_shared<size_t>(x); };
+    auto [value, loaded] = slru_cache.getOrSet(1, load_func);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_TRUE(*value == 5);
+}
diff --git a/src/Common/waitForPid.cpp b/src/Common/waitForPid.cpp
index fc0df5d7211..dd431e15062 100644
--- a/src/Common/waitForPid.cpp
+++ b/src/Common/waitForPid.cpp
@@ -17,6 +17,17 @@
     eintr_wrapper_result; \
 })
 
+namespace DB
+{
+
+enum PollPidResult
+{
+    RESTART,
+    FAILED
+};
+
+}
+
 #if defined(OS_LINUX)
 
 #include <poll.h>
@@ -43,16 +54,9 @@ namespace DB
 
 static int syscall_pidfd_open(pid_t pid)
 {
-    // pidfd_open cannot be interrupted, no EINTR handling
     return syscall(SYS_pidfd_open, pid, 0);
 }
 
-static int dir_pidfd_open(pid_t pid)
-{
-    std::string path = "/proc/" + std::to_string(pid);
-    return HANDLE_EINTR(open(path.c_str(), O_DIRECTORY));
-}
-
 static bool supportsPidFdOpen()
 {
     VersionNumber pidfd_open_minimal_version(5, 3, 0);
@@ -60,36 +64,52 @@ static bool supportsPidFdOpen()
     return linux_version >= pidfd_open_minimal_version;
 }
 
-static int pidFdOpen(pid_t pid)
+static PollPidResult pollPid(pid_t pid, int timeout_in_ms)
 {
-    // use pidfd_open or just plain old /proc/[pid] open for Linux
+    int pid_fd = 0;
+
     if (supportsPidFdOpen())
     {
-        return syscall_pidfd_open(pid);
+        // pidfd_open cannot be interrupted, no EINTR handling
+
+        pid_fd = syscall_pidfd_open(pid);
+
+        if (pid_fd < 0)
+        {
+            if (errno == ESRCH)
+                return PollPidResult::RESTART;
+
+            return PollPidResult::FAILED;
+        }
     }
     else
     {
-        return dir_pidfd_open(pid);
-    }
-}
+        std::string path = "/proc/" + std::to_string(pid);
+        pid_fd = HANDLE_EINTR(open(path.c_str(), O_DIRECTORY));
+
+        if (pid_fd < 0)
+        {
+            if (errno == ENOENT)
+                return PollPidResult::RESTART;
+
+            return PollPidResult::FAILED;
+        }
+    }
 
-static int pollPid(pid_t pid, int timeout_in_ms)
-{
     struct pollfd pollfd;
-
-    int pid_fd = pidFdOpen(pid);
-    if (pid_fd == -1)
-    {
-        return false;
-    }
     pollfd.fd = pid_fd;
     pollfd.events = POLLIN;
-    int ready = poll(&pollfd, 1, timeout_in_ms);
-    int save_errno = errno;
+
+    int ready = HANDLE_EINTR(poll(&pollfd, 1, timeout_in_ms));
+
+    if (ready <= 0)
+        return PollPidResult::FAILED;
+
     close(pid_fd);
-    errno = save_errno;
-    return ready;
+
+    return PollPidResult::RESTART;
 }
+
 #elif defined(OS_DARWIN) || defined(OS_FREEBSD)
 
 #pragma clang diagnostic ignored "-Wreserved-identifier"
@@ -100,38 +120,32 @@ static int pollPid(pid_t pid, int timeout_in_ms)
 namespace DB
 {
 
-static int pollPid(pid_t pid, int timeout_in_ms)
+static PollPidResult pollPid(pid_t pid, int timeout_in_ms)
 {
-    int status = 0;
-    int kq = HANDLE_EINTR(kqueue());
+    int kq = kqueue();
     if (kq == -1)
-    {
-        return false;
-    }
+        return PollPidResult::FAILED;
+
     struct kevent change = {.ident = NULL};
     EV_SET(&change, pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL);
-    int result = HANDLE_EINTR(kevent(kq, &change, 1, NULL, 0, NULL));
-    if (result == -1)
+
+    int event_add_result = HANDLE_EINTR(kevent(kq, &change, 1, NULL, 0, NULL));
+    if (event_add_result == -1)
     {
-        if (errno != ESRCH)
-        {
-            return false;
-        }
-        // check if pid already died while we called kevent()
-        if (waitpid(pid, &status, WNOHANG) == pid)
-        {
-            return true;
-        }
-        return false;
+        if (errno == ESRCH)
+            return PollPidResult::RESTART;
+
+        return PollPidResult::FAILED;
     }
 
     struct kevent event = {.ident = NULL};
     struct timespec remaining_timespec = {.tv_sec = timeout_in_ms / 1000, .tv_nsec = (timeout_in_ms % 1000) * 1000000};
-    int ready = kevent(kq, nullptr, 0, &event, 1, &remaining_timespec);
-    int save_errno = errno;
+    int ready = HANDLE_EINTR(kevent(kq, nullptr, 0, &event, 1, &remaining_timespec));
+    PollPidResult result = ready < 0 ? PollPidResult::FAILED : PollPidResult::RESTART;
+
     close(kq);
-    errno = save_errno;
-    return ready;
+
+    return result;
 }
 #else
     #error "Unsupported OS type"
@@ -148,7 +162,7 @@ bool waitForPid(pid_t pid, size_t timeout_in_seconds)
         /// If there is no timeout before signal try to waitpid 1 time without block so we can avoid sending
         /// signal if process is already normally terminated.
 
-        int waitpid_res = waitpid(pid, &status, WNOHANG);
+        int waitpid_res = HANDLE_EINTR(waitpid(pid, &status, WNOHANG));
         bool process_terminated_normally = (waitpid_res == pid);
         return process_terminated_normally;
     }
@@ -159,34 +173,24 @@ bool waitForPid(pid_t pid, size_t timeout_in_seconds)
     int timeout_in_ms = timeout_in_seconds * 1000;
     while (timeout_in_ms > 0)
     {
-        int waitpid_res = waitpid(pid, &status, WNOHANG);
+        int waitpid_res = HANDLE_EINTR(waitpid(pid, &status, WNOHANG));
         bool process_terminated_normally = (waitpid_res == pid);
         if (process_terminated_normally)
-        {
             return true;
-        }
-        else if (waitpid_res == 0)
-        {
-            watch.restart();
-            int ready = pollPid(pid, timeout_in_ms);
-            if (ready <= 0)
-            {
-                if (errno == EINTR || errno == EAGAIN)
-                {
-                    timeout_in_ms -= watch.elapsedMilliseconds();
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            continue;
-        }
-        else if (waitpid_res == -1 && errno != EINTR)
-        {
+
+        if (waitpid_res != 0)
             return false;
-        }
+
+        watch.restart();
+
+        PollPidResult result = pollPid(pid, timeout_in_ms);
+
+        if (result == PollPidResult::FAILED)
+            return false;
+
+        timeout_in_ms -= watch.elapsedMilliseconds();
     }
+
     return false;
 }
 
diff --git a/src/Common/waitForPid.h b/src/Common/waitForPid.h
index 71c1a74712c..85a0d2c8dd9 100644
--- a/src/Common/waitForPid.h
+++ b/src/Common/waitForPid.h
@@ -4,8 +4,8 @@
 namespace DB
 {
 /*
- * Waits for a specific pid with timeout, using modern Linux and OSX facilities
- * Returns `true` if process terminated successfully or `false` otherwise
+ * Waits for a specific pid with timeout
+ * Returns `true` if process terminated successfully in specified timeout or `false` otherwise
  */
 bool waitForPid(pid_t pid, size_t timeout_in_seconds);
 
diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index 89004cec057..017c82701f5 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -292,7 +292,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
     const char * dest_start = dest;
 
     const UInt32 items_count = source_size / sizeof(ValueType);
-    unalignedStore<UInt32>(dest, items_count);
+    unalignedStoreLE<UInt32>(dest, items_count);
     dest += sizeof(items_count);
 
     ValueType prev_value{};
@@ -300,8 +300,8 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 
     if (source < source_end)
     {
-        prev_value = unalignedLoad<ValueType>(source);
-        unalignedStore<ValueType>(dest, prev_value);
+        prev_value = unalignedLoadLE<ValueType>(source);
+        unalignedStoreLE<ValueType>(dest, prev_value);
 
         source += sizeof(prev_value);
         dest += sizeof(prev_value);
@@ -309,10 +309,10 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 
     if (source < source_end)
     {
-        const ValueType curr_value = unalignedLoad<ValueType>(source);
+        const ValueType curr_value = unalignedLoadLE<ValueType>(source);
 
         prev_delta = curr_value - prev_value;
-        unalignedStore<UnsignedDeltaType>(dest, prev_delta);
+        unalignedStoreLE<UnsignedDeltaType>(dest, prev_delta);
 
         source += sizeof(curr_value);
         dest += sizeof(prev_delta);
@@ -324,7 +324,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
     int item = 2;
     for (; source < source_end; source += sizeof(ValueType), ++item)
     {
-        const ValueType curr_value = unalignedLoad<ValueType>(source);
+        const ValueType curr_value = unalignedLoadLE<ValueType>(source);
 
         const UnsignedDeltaType delta = curr_value - prev_value;
         const UnsignedDeltaType double_delta = delta - prev_delta;
@@ -368,7 +368,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(UInt32) > source_end)
         return;
 
-    const UInt32 items_count = unalignedLoad<UInt32>(source);
+    const UInt32 items_count = unalignedLoadLE<UInt32>(source);
     source += sizeof(items_count);
 
     ValueType prev_value{};
@@ -378,10 +378,10 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(ValueType) > source_end || items_count < 1)
         return;
 
-    prev_value = unalignedLoad<ValueType>(source);
+    prev_value = unalignedLoadLE<ValueType>(source);
     if (dest + sizeof(prev_value) > output_end)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-    unalignedStore<ValueType>(dest, prev_value);
+    unalignedStoreLE<ValueType>(dest, prev_value);
 
     source += sizeof(prev_value);
     dest += sizeof(prev_value);
@@ -390,11 +390,11 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(UnsignedDeltaType) > source_end || items_count < 2)
         return;
 
-    prev_delta = unalignedLoad<UnsignedDeltaType>(source);
+    prev_delta = unalignedLoadLE<UnsignedDeltaType>(source);
     prev_value = prev_value + static_cast<ValueType>(prev_delta);
     if (dest + sizeof(prev_value) > output_end)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-    unalignedStore<ValueType>(dest, prev_value);
+    unalignedStoreLE<ValueType>(dest, prev_value);
 
     source += sizeof(prev_delta);
     dest += sizeof(prev_value);
@@ -427,7 +427,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
         const ValueType curr_value = prev_value + delta;
         if (dest + sizeof(curr_value) > output_end)
             throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-        unalignedStore<ValueType>(dest, curr_value);
+        unalignedStoreLE<ValueType>(dest, curr_value);
         dest += sizeof(curr_value);
 
         prev_delta = curr_value - prev_value;
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 4631a666830..0ca3e5660e0 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -208,7 +208,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     const UInt32 items_count = source_size / sizeof(T);
 
-    unalignedStore<UInt32>(dest, items_count);
+    unalignedStoreLE<UInt32>(dest, items_count);
     dest += sizeof(items_count);
 
     T prev_value{};
@@ -217,8 +217,8 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     if (source < source_end)
     {
-        prev_value = unalignedLoad<T>(source);
-        unalignedStore<T>(dest, prev_value);
+        prev_value = unalignedLoadLE<T>(source);
+        unalignedStoreLE<T>(dest, prev_value);
 
         source += sizeof(prev_value);
         dest += sizeof(prev_value);
@@ -228,7 +228,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     while (source < source_end)
     {
-        const T curr_value = unalignedLoad<T>(source);
+        const T curr_value = unalignedLoadLE<T>(source);
         source += sizeof(curr_value);
 
         const auto xored_data = curr_value ^ prev_value;
@@ -274,7 +274,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
     if (source + sizeof(UInt32) > source_end)
         return;
 
-    const UInt32 items_count = unalignedLoad<UInt32>(source);
+    const UInt32 items_count = unalignedLoadLE<UInt32>(source);
     source += sizeof(items_count);
 
     T prev_value{};
@@ -283,8 +283,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
     if (source + sizeof(T) > source_end || items_count < 1)
         return;
 
-    prev_value = unalignedLoad<T>(source);
-    unalignedStore<T>(dest, prev_value);
+    prev_value = unalignedLoadLE<T>(source);
+    unalignedStoreLE<T>(dest, prev_value);
 
     source += sizeof(prev_value);
     dest += sizeof(prev_value);
@@ -326,7 +326,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
         }
         // else: 0b0 prefix - use prev_value
 
-        unalignedStore<T>(dest, curr_value);
+        unalignedStoreLE<T>(dest, curr_value);
         dest += sizeof(curr_value);
 
         prev_xored_info = curr_xored_info;
diff --git a/src/Compression/ICompressionCodec.cpp b/src/Compression/ICompressionCodec.cpp
index c48ca99d452..4c2b95682b3 100644
--- a/src/Compression/ICompressionCodec.cpp
+++ b/src/Compression/ICompressionCodec.cpp
@@ -86,8 +86,8 @@ UInt32 ICompressionCodec::compress(const char * source, UInt32 source_size, char
     UInt8 header_size = getHeaderSize();
     /// Write data from header_size
     UInt32 compressed_bytes_written = doCompressData(source, source_size, &dest[header_size]);
-    unalignedStore<UInt32>(&dest[1], compressed_bytes_written + header_size);
-    unalignedStore<UInt32>(&dest[5], source_size);
+    unalignedStoreLE<UInt32>(&dest[1], compressed_bytes_written + header_size);
+    unalignedStoreLE<UInt32>(&dest[5], source_size);
     return header_size + compressed_bytes_written;
 }
 
@@ -112,7 +112,7 @@ UInt32 ICompressionCodec::decompress(const char * source, UInt32 source_size, ch
 
 UInt32 ICompressionCodec::readCompressedBlockSize(const char * source)
 {
-    UInt32 compressed_block_size = unalignedLoad<UInt32>(&source[1]);
+    UInt32 compressed_block_size = unalignedLoadLE<UInt32>(&source[1]);
     if (compressed_block_size == 0)
         throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: header is corrupt with compressed block size 0");
     return compressed_block_size;
@@ -121,7 +121,7 @@ UInt32 ICompressionCodec::readCompressedBlockSize(const char * source)
 
 UInt32 ICompressionCodec::readDecompressedBlockSize(const char * source)
 {
-    UInt32 decompressed_block_size = unalignedLoad<UInt32>(&source[5]);
+    UInt32 decompressed_block_size = unalignedLoadLE<UInt32>(&source[5]);
     if (decompressed_block_size == 0)
         throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: header is corrupt with decompressed block size 0");
     return decompressed_block_size;
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 77050908265..b634a3137cd 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -175,7 +175,7 @@ private:
             throw std::runtime_error("No more data to read");
         }
 
-        current_value = unalignedLoad<T>(data);
+        current_value = unalignedLoadLE<T>(data);
         data = reinterpret_cast<const char *>(data) + sizeof(T);
     }
 };
@@ -371,7 +371,7 @@ CodecTestSequence makeSeq(Args && ... args)
     char * write_pos = data.data();
     for (const auto & v : vals)
     {
-        unalignedStore<T>(write_pos, v);
+        unalignedStoreLE<T>(write_pos, v);
         write_pos += sizeof(v);
     }
 
@@ -393,7 +393,7 @@ CodecTestSequence generateSeq(Generator gen, const char* gen_name, B Begin = 0,
     {
         const T v = gen(static_cast<T>(i));
 
-        unalignedStore<T>(write_pos, v);
+        unalignedStoreLE<T>(write_pos, v);
         write_pos += sizeof(v);
     }
 
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
index 0057fd7e96e..1e3f37b617f 100644
--- a/src/Coordination/KeeperSnapshotManager.cpp
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -635,12 +635,13 @@ nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::serializeSnapshotToBuffer(con
 
 bool KeeperSnapshotManager::isZstdCompressed(nuraft::ptr<nuraft::buffer> buffer)
 {
-    static constexpr uint32_t ZSTD_COMPRESSED_MAGIC = 0xFD2FB528;
+    static constexpr unsigned char ZSTD_COMPRESSED_MAGIC[4] = {0x28, 0xB5, 0x2F, 0xFD};
+
     ReadBufferFromNuraftBuffer reader(buffer);
-    uint32_t magic_from_buffer;
+    unsigned char magic_from_buffer[4]{};
     reader.readStrict(reinterpret_cast<char *>(&magic_from_buffer), sizeof(magic_from_buffer));
     buffer->pos(0);
-    return magic_from_buffer == ZSTD_COMPRESSED_MAGIC;
+    return memcmp(magic_from_buffer, ZSTD_COMPRESSED_MAGIC, 4) == 0;
 }
 
 SnapshotDeserializationResult KeeperSnapshotManager::deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const
diff --git a/src/Core/ProtocolDefines.h b/src/Core/ProtocolDefines.h
index 584720694d7..7e6ae4f5f82 100644
--- a/src/Core/ProtocolDefines.h
+++ b/src/Core/ProtocolDefines.h
@@ -52,10 +52,19 @@
 /// NOTE: DBMS_TCP_PROTOCOL_VERSION has nothing common with VERSION_REVISION,
 /// later is just a number for server version (one number instead of commit SHA)
 /// for simplicity (sometimes it may be more convenient in some use cases).
-#define DBMS_TCP_PROTOCOL_VERSION 54457
+#define DBMS_TCP_PROTOCOL_VERSION 54460
 
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_INITIAL_QUERY_START_TIME 54449
 
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS_IN_INSERT 54456
 
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_VIEW_IF_PERMITTED 54457
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM 54458
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_QUOTA_KEY 54458
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS 54459
+
+/// The server will send query elapsed run time in the Progress packet.
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS 54460
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 92af0576129..e11018b35eb 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -212,7 +212,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     \
     M(Bool, insert_deduplicate, true, "For INSERT queries in the replicated table, specifies that deduplication of insertings blocks should be performed", 0) \
     \
-    M(UInt64, insert_quorum, 0, "For INSERT queries in the replicated table, wait writing for the specified number of replicas and linearize the addition of the data. 0 - disabled.", 0) \
+    M(UInt64Auto, insert_quorum, 0, "For INSERT queries in the replicated table, wait writing for the specified number of replicas and linearize the addition of the data. 0 - disabled.", 0) \
     M(Milliseconds, insert_quorum_timeout, 600000, "", 0) \
     M(Bool, insert_quorum_parallel, true, "For quorum INSERT queries - enable to make parallel inserts without linearizability", 0) \
     M(UInt64, select_sequential_consistency, 0, "For SELECT queries from the replicated table, throw an exception if the replica does not have a chunk written with the quorum; do not read the parts that have not yet been written with the quorum.", 0) \
@@ -538,11 +538,12 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, engine_file_allow_create_multiple_files, false, "Enables or disables creating a new file on each insert in file engine tables if format has suffix.", 0) \
     M(Bool, allow_experimental_database_replicated, false, "Allow to create databases with Replicated engine", 0) \
     M(UInt64, database_replicated_initial_query_timeout_sec, 300, "How long initial DDL query should wait for Replicated database to precess previous DDL queue entries", 0) \
+    M(Bool, database_replicated_enforce_synchronous_settings, false, "Enforces synchronous waiting for some queries (see also database_atomic_wait_for_drop_and_detach_synchronously, mutation_sync, replication_alter_partitions_sync). Not recommended to enable these settings.", 0) \
     M(UInt64, max_distributed_depth, 5, "Maximum distributed query depth", 0) \
     M(Bool, database_replicated_always_detach_permanently, false, "Execute DETACH TABLE as DETACH TABLE PERMANENTLY if database engine is Replicated", 0) \
     M(Bool, database_replicated_allow_only_replicated_engine, false, "Allow to create only Replicated tables in database with engine Replicated", 0) \
     M(DistributedDDLOutputMode, distributed_ddl_output_mode, DistributedDDLOutputMode::THROW, "Format of distributed DDL query result", 0) \
-    M(UInt64, distributed_ddl_entry_format_version, 2, "Version of DDL entry to write into ZooKeeper", 0) \
+    M(UInt64, distributed_ddl_entry_format_version, 3, "Compatibility version of distributed DDL (ON CLUSTER) queries", 0) \
     \
     M(UInt64, external_storage_max_read_rows, 0, "Limit maximum number of rows when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializedMySQL. If equal to 0, this setting is disabled", 0) \
     M(UInt64, external_storage_max_read_bytes, 0, "Limit maximum number of bytes when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializedMySQL. If equal to 0, this setting is disabled", 0)  \
@@ -626,6 +627,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, compatibility_ignore_auto_increment_in_create_table, false, "Ignore AUTO_INCREMENT keyword in column declaration if true, otherwise return error. It simplifies migration from MySQL", 0) \
     M(Bool, multiple_joins_try_to_keep_original_names, false, "Do not add aliases to top level expression list on multiple joins rewrite", 0) \
     M(Bool, optimize_distinct_in_order, true, "Enable DISTINCT optimization if some columns in DISTINCT form a prefix of sorting. For example, prefix of sorting key in merge tree or ORDER BY statement", 0) \
+    M(Bool, optimize_sorting_by_input_stream_properties, true, "Optimize sorting by sorting properties of input stream", 0) \
     // End of COMMON_SETTINGS
     // Please add settings related to formats into the FORMAT_FACTORY_SETTINGS and move obsolete settings to OBSOLETE_SETTINGS.
 
@@ -705,6 +707,10 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, input_format_arrow_skip_columns_with_unsupported_types_in_schema_inference, false, "Skip columns with unsupported types while schema inference for format Arrow", 0) \
     M(String, column_names_for_schema_inference, "", "The list of column names to use in schema inference for formats without column names. The format: 'column1,column2,column3,...'", 0) \
     M(Bool, input_format_json_read_bools_as_numbers, true, "Allow to parse bools as numbers in JSON input formats", 0) \
+    M(Bool, input_format_json_try_infer_numbers_from_strings, true, "Try to infer numbers from string fields while schema inference", 0) \
+    M(Bool, input_format_try_infer_integers, true, "Try to infer numbers from string fields while schema inference in text formats", 0) \
+    M(Bool, input_format_try_infer_dates, true, "Try to infer dates from string fields while schema inference in text formats", 0) \
+    M(Bool, input_format_try_infer_datetimes, true, "Try to infer datetimes from string fields while schema inference in text formats", 0) \
     M(Bool, input_format_protobuf_flatten_google_wrappers, false, "Enable Google wrappers for regular non-nested columns, e.g. google.protobuf.StringValue 'str' for String column 'str'. For Nullable columns empty wrappers are recognized as defaults, and missing as nulls", 0) \
     M(Bool, output_format_protobuf_nullables_with_google_wrappers, false, "When serializing Nullable columns with Google wrappers, serialize default values as empty wrappers. If turned off, default and null values are not serialized", 0) \
     M(UInt64, input_format_csv_skip_first_lines, 0, "Skip specified number of lines at the beginning of data in CSV format", 0) \
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index d77a510d7f9..5b1b6b10cc2 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -153,6 +153,9 @@ template struct SettingFieldNumber<Int64>;
 template struct SettingFieldNumber<float>;
 template struct SettingFieldNumber<bool>;
 
+template struct SettingAutoWrapper<SettingFieldNumber<UInt64>>;
+template struct SettingAutoWrapper<SettingFieldNumber<Int64>>;
+template struct SettingAutoWrapper<SettingFieldNumber<float>>;
 
 namespace
 {
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 20f2b34084e..f01ac37d3cc 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -58,11 +58,82 @@ using SettingFieldInt64 = SettingFieldNumber<Int64>;
 using SettingFieldFloat = SettingFieldNumber<float>;
 using SettingFieldBool = SettingFieldNumber<bool>;
 
-
-/** Unlike SettingFieldUInt64, supports the value of 'auto' - the number of processor cores without taking into account SMT.
-  * A value of 0 is also treated as auto.
-  * When serializing, `auto` is written in the same way as 0.
+/** Wraps any SettingField to support special value 'auto' that can be checked with `is_auto` flag.
+  * Note about serialization:
+  * The new versions with `SettingsWriteFormat::STRINGS_WITH_FLAGS` serialize values as a string.
+  * In legacy SettingsWriteFormat mode, functions `read/writeBinary` would serialize values as a binary, and 'is_auto' would be ignored.
+  * It's possible to upgrade settings from regular type to wrapped ones and keep compatibility with old versions,
+  * but when serializing 'auto' old version will see binary representation of the default value.
   */
+template <typename Base>
+struct SettingAutoWrapper
+{
+    constexpr static auto keyword = "auto";
+    static bool isAuto(const Field & f) { return f.getType() == Field::Types::String && f.safeGet<const String &>() == keyword; }
+    static bool isAuto(const String & str) { return str == keyword; }
+
+    using Type = typename Base::Type;
+
+    Base base;
+    bool is_auto = false;
+    bool changed = false;
+
+    explicit SettingAutoWrapper() : is_auto(true) {}
+    explicit SettingAutoWrapper(Type val) : is_auto(false) { base = Base(val); }
+
+    explicit SettingAutoWrapper(const Field & f)
+        : is_auto(isAuto(f))
+    {
+        if (!is_auto)
+            base = Base(f);
+    }
+
+    SettingAutoWrapper & operator=(const Field & f)
+    {
+        changed = true;
+        if (is_auto = isAuto(f); !is_auto)
+            base = f;
+        return *this;
+    }
+
+    explicit operator Field() const { return is_auto ? Field(keyword) : Field(base); }
+
+    String toString() const { return is_auto ? keyword : base.toString(); }
+
+    void parseFromString(const String & str)
+    {
+        changed = true;
+        if (is_auto = isAuto(str); !is_auto)
+            base.parseFromString(str);
+    }
+
+    void writeBinary(WriteBuffer & out) const
+    {
+        if (is_auto)
+            Base().writeBinary(out); /// serialize default value
+        else
+            base.writeBinary(out);
+    }
+
+    /*
+     * That it is fine to reset `is_auto` here and to use default value in case `is_auto`
+     * because settings will be serialized only if changed.
+     * If they were changed they were requested to use explicit value instead of `auto`.
+     * And so interactions between client-server, and server-server (distributed queries), should be OK.
+     */
+    void readBinary(ReadBuffer & in) { changed = true; is_auto = false; base.readBinary(in); }
+
+    Type valueOr(Type default_value) const { return is_auto ? default_value : base.value; }
+};
+
+using SettingFieldUInt64Auto = SettingAutoWrapper<SettingFieldUInt64>;
+using SettingFieldInt64Auto = SettingAutoWrapper<SettingFieldInt64>;
+using SettingFieldFloatAuto = SettingAutoWrapper<SettingFieldFloat>;
+
+/* Similar to SettingFieldUInt64Auto with small differences to behave like regular UInt64, supported to compatibility.
+ * When setting to 'auto' it becomes equal to  the number of processor cores without taking into account SMT.
+ * A value of 0 is also treated as 'auto', so 'auto' is parsed and serialized in the same way as 0.
+ */
 struct SettingFieldMaxThreads
 {
     bool is_auto;
diff --git a/src/Core/SortDescription.cpp b/src/Core/SortDescription.cpp
index ff81f69383c..59018fb13b4 100644
--- a/src/Core/SortDescription.cpp
+++ b/src/Core/SortDescription.cpp
@@ -42,6 +42,22 @@ void SortColumnDescription::explain(JSONBuilder::JSONMap & map) const
     map.add("With Fill", with_fill);
 }
 
+bool SortDescription::hasPrefix(const SortDescription & prefix) const
+{
+    if (prefix.empty())
+        return true;
+
+    if (prefix.size() > size())
+        return false;
+
+    for (size_t i = 0; i < prefix.size(); ++i)
+    {
+        if ((*this)[i] != prefix[i])
+            return false;
+    }
+    return true;
+}
+
 #if USE_EMBEDDED_COMPILER
 
 static CHJIT & getJITInstance()
diff --git a/src/Core/SortDescription.h b/src/Core/SortDescription.h
index 6c19ce36115..0025e44b489 100644
--- a/src/Core/SortDescription.h
+++ b/src/Core/SortDescription.h
@@ -8,8 +8,7 @@
 #include <Core/SettingsEnums.h>
 #include <Common/IntervalKind.h>
 #include <DataTypes/IDataType.h>
-
-class Collator;
+#include <Columns/Collator.h>
 
 namespace DB
 {
@@ -65,9 +64,18 @@ struct SortColumnDescription
     {
     }
 
-    bool operator == (const SortColumnDescription & other) const
+    static bool compareCollators(const std::shared_ptr<Collator> & a, const std::shared_ptr<Collator> & b)
     {
-        return column_name == other.column_name && direction == other.direction && nulls_direction == other.nulls_direction;
+        if (unlikely(a && b))
+            return *a == *b;
+
+        return a == b;
+    }
+
+    bool operator==(const SortColumnDescription & other) const
+    {
+        return column_name == other.column_name && direction == other.direction && nulls_direction == other.nulls_direction
+            && compareCollators(collator, other.collator);
     }
 
     bool operator != (const SortColumnDescription & other) const
@@ -89,6 +97,13 @@ struct SortColumnDescriptionWithColumnIndex
         : base(std::move(description_)), column_number(column_number_)
     {
     }
+
+    bool operator==(const SortColumnDescriptionWithColumnIndex & other) const
+    {
+        return base == other.base && column_number == other.column_number;
+    }
+
+    bool operator!=(const SortColumnDescriptionWithColumnIndex & other) const { return !(*this == other); }
 };
 
 class CompiledSortDescriptionFunctionHolder;
@@ -104,6 +119,8 @@ public:
     std::shared_ptr<CompiledSortDescriptionFunctionHolder> compiled_sort_description_holder;
     size_t min_count_to_compile_sort_description = 3;
     bool compile_sort_description = false;
+
+    bool hasPrefix(const SortDescription & prefix) const;
 };
 
 /** Compile sort description for header_types.
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index b2ff203c18d..c89f55092f8 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -1013,7 +1013,11 @@ void BaseDaemon::setupWatchdog()
         /// If streaming compression of logs is used then we write watchdog logs to cerr
         if (config().getRawString("logger.stream_compress", "false") == "true")
         {
-            Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
+            Poco::AutoPtr<OwnPatternFormatter> pf;
+            if (config().getString("logger.formatting", "") == "json")
+                pf = new OwnJSONPatternFormatter;
+            else
+                pf = new OwnPatternFormatter;
             Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel(std::cerr));
             logger().setChannel(log);
         }
diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
index 8a0a95fc018..8c0f0b95025 100644
--- a/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -135,14 +135,14 @@ bool DataTypeAggregateFunction::equals(const IDataType & rhs) const
         if (lhs_state->function->getName() != rhs_state.function->getName())
             return false;
 
-        if (lhs_state->parameters.size() != lhs_state->parameters.size())
+        if (lhs_state->parameters.size() != rhs_state.parameters.size())
             return false;
 
         for (size_t i = 0; i < lhs_state->parameters.size(); ++i)
             if (lhs_state->parameters[i] != rhs_state.parameters[i])
                 return false;
 
-        if (lhs_state->argument_types.size() != lhs_state->argument_types.size())
+        if (lhs_state->argument_types.size() != rhs_state.argument_types.size())
             return false;
 
         for (size_t i = 0; i < lhs_state->argument_types.size(); ++i)
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
index 8dc15fc9841..8138b15c9af 100644
--- a/src/DataTypes/Serializations/SerializationTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -135,20 +135,21 @@ void SerializationTuple::deserializeText(IColumn & column, ReadBuffer & istr, co
             }
             elems[i]->deserializeTextQuoted(extractElementColumn(column, i), istr, settings);
         }
-    });
 
-    // Special format for one element tuple (1,)
-    if (1 == elems.size())
-    {
+        // Special format for one element tuple (1,)
+        if (1 == elems.size())
+        {
+            skipWhitespaceIfAny(istr);
+            // Allow both (1) and (1,)
+            checkChar(',', istr);
+        }
+
         skipWhitespaceIfAny(istr);
-        // Allow both (1) and (1,)
-        checkChar(',', istr);
-    }
-    skipWhitespaceIfAny(istr);
-    assertChar(')', istr);
+        assertChar(')', istr);
 
-    if (whole && !istr.eof())
-        throwUnexpectedDataAfterParsedValue(column, istr, settings, "Tuple");
+        if (whole && !istr.eof())
+            throwUnexpectedDataAfterParsedValue(column, istr, settings, "Tuple");
+    });
 }
 
 void SerializationTuple::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -213,19 +214,18 @@ void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr
                 auto & element_column = extractElementColumn(column, element_pos);
                 elems[element_pos]->deserializeTextJSON(element_column, istr, settings);
             }
-        });
 
-        skipWhitespaceIfAny(istr);
-        assertChar('}', istr);
+            skipWhitespaceIfAny(istr);
+            assertChar('}', istr);
+        });
     }
     else
     {
-        const size_t size = elems.size();
         assertChar('[', istr);
 
         addElementSafe(elems.size(), column, [&]
         {
-            for (size_t i = 0; i < size; ++i)
+            for (size_t i = 0; i < elems.size(); ++i)
             {
                 skipWhitespaceIfAny(istr);
                 if (i != 0)
@@ -235,10 +235,10 @@ void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr
                 }
                 elems[i]->deserializeTextJSON(extractElementColumn(column, i), istr, settings);
             }
-        });
 
-        skipWhitespaceIfAny(istr);
-        assertChar(']', istr);
+            skipWhitespaceIfAny(istr);
+            assertChar(']', istr);
+        });
     }
 }
 
diff --git a/src/DataTypes/transformTypesRecursively.cpp b/src/DataTypes/transformTypesRecursively.cpp
new file mode 100644
index 00000000000..3544c7e477d
--- /dev/null
+++ b/src/DataTypes/transformTypesRecursively.cpp
@@ -0,0 +1,178 @@
+#include <DataTypes/transformTypesRecursively.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeNullable.h>
+
+
+namespace DB
+{
+
+void transformTypesRecursively(DataTypes & types, std::function<void(DataTypes &)> transform_simple_types, std::function<void(DataTypes &)> transform_complex_types)
+{
+    {
+        /// Arrays
+        bool have_array = false;
+        bool all_arrays = true;
+        DataTypes nested_types;
+        for (const auto & type : types)
+        {
+            if (const DataTypeArray * type_array = typeid_cast<const DataTypeArray *>(type.get()))
+            {
+                have_array = true;
+                nested_types.push_back(type_array->getNestedType());
+            }
+            else
+                all_arrays = false;
+        }
+
+        if (have_array)
+        {
+            if (all_arrays)
+            {
+                transformTypesRecursively(nested_types, transform_simple_types, transform_complex_types);
+                for (size_t i = 0; i != types.size(); ++i)
+                    types[i] = std::make_shared<DataTypeArray>(nested_types[i]);
+            }
+
+            if (transform_complex_types)
+                transform_complex_types(types);
+
+            return;
+        }
+    }
+
+    {
+        /// Tuples
+        bool have_tuple = false;
+        bool all_tuples = true;
+        size_t tuple_size = 0;
+
+        std::vector<DataTypes> nested_types;
+
+        for (const auto & type : types)
+        {
+            if (const DataTypeTuple * type_tuple = typeid_cast<const DataTypeTuple *>(type.get()))
+            {
+                if (!have_tuple)
+                {
+                    tuple_size = type_tuple->getElements().size();
+                    nested_types.resize(tuple_size);
+                    for (size_t elem_idx = 0; elem_idx < tuple_size; ++elem_idx)
+                        nested_types[elem_idx].reserve(types.size());
+                }
+                else if (tuple_size != type_tuple->getElements().size())
+                    return;
+
+                have_tuple = true;
+
+                for (size_t elem_idx = 0; elem_idx < tuple_size; ++elem_idx)
+                    nested_types[elem_idx].emplace_back(type_tuple->getElements()[elem_idx]);
+            }
+            else
+                all_tuples = false;
+        }
+
+        if (have_tuple)
+        {
+            if (all_tuples)
+            {
+                std::vector<DataTypes> transposed_nested_types(types.size());
+                for (size_t elem_idx = 0; elem_idx < tuple_size; ++elem_idx)
+                {
+                    transformTypesRecursively(nested_types[elem_idx], transform_simple_types, transform_complex_types);
+                    for (size_t i = 0; i != types.size(); ++i)
+                        transposed_nested_types[i].push_back(nested_types[elem_idx][i]);
+                }
+
+                for (size_t i = 0; i != types.size(); ++i)
+                    types[i] = std::make_shared<DataTypeTuple>(transposed_nested_types[i]);
+            }
+
+            if (transform_complex_types)
+                transform_complex_types(types);
+
+            return;
+        }
+    }
+
+    {
+        /// Maps
+        bool have_maps = false;
+        bool all_maps = true;
+        DataTypes key_types;
+        DataTypes value_types;
+        key_types.reserve(types.size());
+        value_types.reserve(types.size());
+
+        for (const auto & type : types)
+        {
+            if (const DataTypeMap * type_map = typeid_cast<const DataTypeMap *>(type.get()))
+            {
+                have_maps = true;
+                key_types.emplace_back(type_map->getKeyType());
+                value_types.emplace_back(type_map->getValueType());
+            }
+            else
+                all_maps = false;
+        }
+
+        if (have_maps)
+        {
+            if (all_maps)
+            {
+                transformTypesRecursively(key_types, transform_simple_types, transform_complex_types);
+                transformTypesRecursively(value_types, transform_simple_types, transform_complex_types);
+
+                for (size_t i = 0; i != types.size(); ++i)
+                    types[i] = std::make_shared<DataTypeMap>(key_types[i], value_types[i]);
+            }
+
+            if (transform_complex_types)
+                transform_complex_types(types);
+
+            return;
+        }
+    }
+
+    {
+        /// Nullable
+        bool have_nullable = false;
+        std::vector<UInt8> is_nullable;
+        is_nullable.reserve(types.size());
+        DataTypes nested_types;
+        nested_types.reserve(types.size());
+        for (const auto & type : types)
+        {
+            if (const DataTypeNullable * type_nullable = typeid_cast<const DataTypeNullable *>(type.get()))
+            {
+                have_nullable = true;
+                is_nullable.push_back(1);
+                nested_types.push_back(type_nullable->getNestedType());
+            }
+            else
+            {
+                is_nullable.push_back(0);
+                nested_types.push_back(type);
+            }
+        }
+
+        if (have_nullable)
+        {
+            transformTypesRecursively(nested_types, transform_simple_types, transform_complex_types);
+            for (size_t i = 0; i != types.size(); ++i)
+            {
+                if (is_nullable[i])
+                    types[i] = makeNullable(nested_types[i]);
+                else
+                    types[i] = nested_types[i];
+            }
+
+            return;
+        }
+    }
+
+    transform_simple_types(types);
+}
+
+}
diff --git a/src/DataTypes/transformTypesRecursively.h b/src/DataTypes/transformTypesRecursively.h
new file mode 100644
index 00000000000..5cb8f095494
--- /dev/null
+++ b/src/DataTypes/transformTypesRecursively.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <DataTypes/IDataType.h>
+#include <functional>
+
+namespace DB
+{
+
+/// Function that applies custom transformation functions to provided types recursively.
+/// Implementation is similar to function getLeastSuperType:
+/// If all types are Array/Map/Tuple/Nullable, this function will be called to nested types.
+/// If not all types are the same complex type (Array/Map/Tuple), this function won't be called to nested types.
+/// Function transform_simple_types will be applied to resulting simple types after all recursive calls.
+/// 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);
+
+}
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index 92dae025dae..759f4b9276c 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -6,6 +6,7 @@
 #include <IO/ReadBufferFromFile.h>
 #include <Parsers/formatAST.h>
 #include <Common/atomicRename.h>
+#include <Common/filesystemHelpers.h>
 #include <Storages/StorageMaterializedView.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
@@ -117,13 +118,19 @@ void DatabaseAtomic::dropTable(ContextPtr local_context, const String & table_na
     if (table)
         table->dropInnerTableIfAny(sync, local_context);
     else
-        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} doesn't exist",
-                        backQuote(getDatabaseName()), backQuote(table_name));
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} doesn't exist", backQuote(getDatabaseName()), backQuote(table_name));
 
+    dropTableImpl(local_context, table_name, sync);
+}
+
+void DatabaseAtomic::dropTableImpl(ContextPtr local_context, const String & table_name, bool sync)
+{
     String table_metadata_path = getObjectMetadataPath(table_name);
     String table_metadata_path_drop;
+    StoragePtr table;
     {
         std::lock_guard lock(mutex);
+        table = getTableUnlocked(table_name);
         table_metadata_path_drop = DatabaseCatalog::instance().getPathForDroppedMetadata(table->getStorageID());
         auto txn = local_context->getZooKeeperMetadataTransaction();
         if (txn && !local_context->isInternalSubquery())
@@ -416,15 +423,15 @@ UUID DatabaseAtomic::tryGetTableUUID(const String & table_name) const
     return UUIDHelpers::Nil;
 }
 
-void DatabaseAtomic::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool force_restore, bool /*force_attach*/)
+void DatabaseAtomic::beforeLoadingMetadata(ContextMutablePtr /*context*/, LoadingStrictnessLevel mode)
 {
-    if (!force_restore)
+    if (mode < LoadingStrictnessLevel::FORCE_RESTORE)
         return;
 
     /// Recreate symlinks to table data dirs in case of force restore, because some of them may be broken
     for (const auto & table_path : fs::directory_iterator(path_to_table_symlinks))
     {
-        if (!fs::is_symlink(table_path))
+        if (!FS::isSymlink(table_path))
         {
             throw Exception(ErrorCodes::ABORTED,
                 "'{}' is not a symlink. Atomic database should contains only symlinks.", std::string(table_path.path()));
@@ -435,17 +442,17 @@ void DatabaseAtomic::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool f
 }
 
 void DatabaseAtomic::loadStoredObjects(
-    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+    ContextMutablePtr local_context, LoadingStrictnessLevel mode, bool skip_startup_tables)
 {
-    beforeLoadingMetadata(local_context, force_restore, force_attach);
-    DatabaseOrdinary::loadStoredObjects(local_context, force_restore, force_attach, skip_startup_tables);
+    beforeLoadingMetadata(local_context, mode);
+    DatabaseOrdinary::loadStoredObjects(local_context, mode, skip_startup_tables);
 }
 
-void DatabaseAtomic::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+void DatabaseAtomic::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode)
 {
-    DatabaseOrdinary::startupTables(thread_pool, force_restore, force_attach);
+    DatabaseOrdinary::startupTables(thread_pool, mode);
 
-    if (!force_restore)
+    if (mode < LoadingStrictnessLevel::FORCE_RESTORE)
         return;
 
     NameToPathMap table_names;
@@ -495,7 +502,7 @@ void DatabaseAtomic::tryCreateMetadataSymlink()
     fs::path metadata_symlink(path_to_metadata_symlink);
     if (fs::exists(metadata_symlink))
     {
-        if (!fs::is_symlink(metadata_symlink))
+        if (!FS::isSymlink(metadata_symlink))
             throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "Directory {} exists", path_to_metadata_symlink);
     }
     else
diff --git a/src/Databases/DatabaseAtomic.h b/src/Databases/DatabaseAtomic.h
index 6cb2226a7f8..cb275812098 100644
--- a/src/Databases/DatabaseAtomic.h
+++ b/src/Databases/DatabaseAtomic.h
@@ -36,6 +36,7 @@ public:
             bool dictionary) override;
 
     void dropTable(ContextPtr context, const String & table_name, bool sync) override;
+    void dropTableImpl(ContextPtr context, const String & table_name, bool sync);
 
     void attachTable(ContextPtr context, const String & name, const StoragePtr & table, const String & relative_table_path) override;
     StoragePtr detachTable(ContextPtr context, const String & name) override;
@@ -47,11 +48,11 @@ public:
 
     DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
-    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, LoadingStrictnessLevel mode, bool skip_startup_tables) override;
 
-    void beforeLoadingMetadata(ContextMutablePtr context, bool force_restore, bool force_attach) override;
+    void beforeLoadingMetadata(ContextMutablePtr context, LoadingStrictnessLevel mode) override;
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     /// Atomic database cannot be detached if there is detached table which still in use
     void assertCanBeDetached(bool cleanup) override;
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 6213fa62e3c..c16de2d33a5 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -16,6 +16,7 @@
 #include <Storages/ExternalDataSourceConfiguration.h>
 #include <Common/logger_useful.h>
 #include <Common/Macros.h>
+#include <Common/filesystemHelpers.h>
 
 #include "config_core.h"
 
@@ -60,8 +61,43 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
+void cckMetadataPathForOrdinary(const ASTCreateQuery & create, const String & metadata_path)
+{
+    const String & engine_name = create.storage->engine->name;
+    const String & database_name = create.getDatabase();
+
+    if (engine_name != "Ordinary")
+        return;
+
+    if (!FS::isSymlink(metadata_path))
+        return;
+
+    String target_path = FS::readSymlink(metadata_path).string();
+    fs::path path_to_remove = metadata_path;
+    if (path_to_remove.filename().empty())
+        path_to_remove = path_to_remove.parent_path();
+
+    /// Before 20.7 metadata/db_name.sql file might absent and Ordinary database was attached if there's metadata/db_name/ dir.
+    /// Between 20.7 and 22.7 metadata/db_name.sql was created in this case as well.
+    /// Since 20.7 `default` database is created with Atomic engine on the very first server run.
+    /// The problem is that if server crashed during the very first run and metadata/db_name/ -> store/whatever symlink was created
+    /// then it's considered as Ordinary database. And it even works somehow
+    /// until background task tries to remove unused dir from store/...
+    throw Exception(ErrorCodes::CANNOT_CREATE_DATABASE,
+                    "Metadata directory {} for Ordinary database {} is a symbolic link to {}. "
+                    "It may be a result of manual intervention, crash on very first server start or a bug. "
+                    "Database cannot be attached (it's kind of protection from potential data loss). "
+                    "Metadata directory must not be a symlink and must contain tables metadata files itself. "
+                    "You have to resolve this manually. It can be done like this: rm {}; sudo -u clickhouse mv {} {};",
+                    metadata_path, database_name, target_path,
+                    quoteString(path_to_remove.string()), quoteString(target_path), quoteString(path_to_remove.string()));
+
+}
+
 DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context)
 {
+    cckMetadataPathForOrdinary(create, metadata_path);
+
     /// Creates store/xxx/ for Atomic
     fs::create_directories(fs::path(metadata_path).parent_path());
 
@@ -127,19 +163,6 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
             throw Exception(ErrorCodes::UNKNOWN_DATABASE_ENGINE,
                             "Ordinary database engine is deprecated (see also allow_deprecated_database_ordinary setting)");
 
-        /// Before 20.7 metadata/db_name.sql file might absent and Ordinary database was attached if there's metadata/db_name/ dir.
-        /// Between 20.7 and 22.7 metadata/db_name.sql was created in this case as well.
-        /// Since 20.7 `default` database is created with Atomic engine on the very first server run.
-        /// The problem is that if server crashed during the very first run and metadata/db_name/ -> store/whatever symlink was created
-        /// then it's considered as Ordinary database. And it even works somehow
-        /// until background task tries to remove onused dir from store/...
-        if (fs::is_symlink(metadata_path))
-            throw Exception(ErrorCodes::CANNOT_CREATE_DATABASE, "Metadata directory {} for Ordinary database {} is a symbolic link to {}. "
-                            "It may be a result of manual intervention, crash on very first server start or a bug. "
-                            "Database cannot be attached (it's kind of protection from potential data loss). "
-                            "Metadata directory must not be a symlink and must contain tables metadata files itself. "
-                            "You have to resolve this manually.",
-                            metadata_path, database_name, fs::read_symlink(metadata_path).string());
         return std::make_shared<DatabaseOrdinary>(database_name, metadata_path, context);
     }
 
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index 3a1b3009878..9aa65602835 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -38,7 +38,7 @@ DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_,
 
 
 void DatabaseLazy::loadStoredObjects(
-    ContextMutablePtr local_context, bool /* force_restore */, bool /*force_attach*/, bool /* skip_startup_tables */)
+    ContextMutablePtr local_context, LoadingStrictnessLevel /*mode*/, bool /* skip_startup_tables */)
 {
     iterateMetadataFiles(local_context, [this, &local_context](const String & file_name)
     {
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index d3c3ed2843b..b01038073ef 100644
--- a/src/Databases/DatabaseLazy.h
+++ b/src/Databases/DatabaseLazy.h
@@ -26,7 +26,7 @@ public:
 
     bool canContainDistributedTables() const override { return false; }
 
-    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, LoadingStrictnessLevel /*mode*/, bool skip_startup_tables) override;
 
     void createTable(
         ContextPtr context,
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index fe229ba6ee9..b5bb6c7c759 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -230,7 +230,7 @@ void DatabaseOnDisk::createTable(
 
 /// If the table was detached permanently we will have a flag file with
 /// .sql.detached extension, is not needed anymore since we attached the table back
-void DatabaseOnDisk::removeDetachedPermanentlyFlag(ContextPtr, const String & table_name, const String & table_metadata_path, bool) const
+void DatabaseOnDisk::removeDetachedPermanentlyFlag(ContextPtr, const String & table_name, const String & table_metadata_path, bool)
 {
     try
     {
diff --git a/src/Databases/DatabaseOnDisk.h b/src/Databases/DatabaseOnDisk.h
index 90aba6be169..0db6a94b86d 100644
--- a/src/Databases/DatabaseOnDisk.h
+++ b/src/Databases/DatabaseOnDisk.h
@@ -94,7 +94,7 @@ protected:
     virtual void commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                                    const String & table_metadata_tmp_path, const String & table_metadata_path, ContextPtr query_context);
 
-    virtual void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) const;
+    virtual void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach);
     virtual void setDetachedTableNotInUseForce(const UUID & /*uuid*/) {}
 
     const String metadata_path;
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index 18b70222382..017199fe44a 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -81,7 +81,7 @@ DatabaseOrdinary::DatabaseOrdinary(
 }
 
 void DatabaseOrdinary::loadStoredObjects(
-    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+    ContextMutablePtr local_context, LoadingStrictnessLevel mode, bool skip_startup_tables)
 {
     /** Tables load faster if they are loaded in sorted (by name) order.
       * Otherwise (for the ext4 filesystem), `DirectoryIterator` iterates through them in some order,
@@ -89,6 +89,7 @@ void DatabaseOrdinary::loadStoredObjects(
       */
 
     ParsedTablesMetadata metadata;
+    bool force_attach = LoadingStrictnessLevel::FORCE_ATTACH <= mode;
     loadTablesMetadata(local_context, metadata, force_attach);
 
     size_t total_tables = metadata.parsed_tables.size() - metadata.total_dictionaries;
@@ -118,7 +119,7 @@ void DatabaseOrdinary::loadStoredObjects(
         {
             pool.scheduleOrThrowOnError([&]()
             {
-                loadTableFromMetadata(local_context, path, name, ast, force_restore);
+                loadTableFromMetadata(local_context, path, name, ast, mode);
 
                 /// Messages, so that it's not boring to wait for the server to load for a long time.
                 logAboutProgress(log, ++dictionaries_processed, metadata.total_dictionaries, watch);
@@ -140,7 +141,7 @@ void DatabaseOrdinary::loadStoredObjects(
         {
             pool.scheduleOrThrowOnError([&]()
             {
-                loadTableFromMetadata(local_context, path, name, ast, force_restore);
+                loadTableFromMetadata(local_context, path, name, ast, mode);
 
                 /// Messages, so that it's not boring to wait for the server to load for a long time.
                 logAboutProgress(log, ++tables_processed, total_tables, watch);
@@ -153,7 +154,7 @@ void DatabaseOrdinary::loadStoredObjects(
     if (!skip_startup_tables)
     {
         /// After all tables was basically initialized, startup them.
-        startupTables(pool, force_restore, force_attach);
+        startupTables(pool, mode);
     }
 }
 
@@ -198,6 +199,7 @@ void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTables
                 if (fs::exists(full_path.string() + detached_suffix))
                 {
                     const std::string table_name = unescapeForFileName(file_name.substr(0, file_name.size() - 4));
+                    permanently_detached_tables.push_back(table_name);
                     LOG_DEBUG(log, "Skipping permanently detached table {}.", backQuote(table_name));
                     return;
                 }
@@ -238,7 +240,8 @@ void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTables
              TSA_SUPPRESS_WARNING_FOR_READ(database_name), tables_in_database, dictionaries_in_database);
 }
 
-void DatabaseOrdinary::loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast, bool force_restore)
+void DatabaseOrdinary::loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast,
+    LoadingStrictnessLevel mode)
 {
     assert(name.database == TSA_SUPPRESS_WARNING_FOR_READ(database_name));
     const auto & create_query = ast->as<const ASTCreateQuery &>();
@@ -248,11 +251,10 @@ void DatabaseOrdinary::loadTableFromMetadata(ContextMutablePtr local_context, co
         create_query,
         *this,
         name.database,
-        file_path,
-        force_restore);
+        file_path, LoadingStrictnessLevel::FORCE_RESTORE <= mode);
 }
 
-void DatabaseOrdinary::startupTables(ThreadPool & thread_pool, bool /*force_restore*/, bool /*force_attach*/)
+void DatabaseOrdinary::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel /*mode*/)
 {
     LOG_INFO(log, "Starting up tables.");
 
diff --git a/src/Databases/DatabaseOrdinary.h b/src/Databases/DatabaseOrdinary.h
index 6e524ae18b0..f9aa3214ef5 100644
--- a/src/Databases/DatabaseOrdinary.h
+++ b/src/Databases/DatabaseOrdinary.h
@@ -21,21 +21,24 @@ public:
 
     String getEngineName() const override { return "Ordinary"; }
 
-    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, LoadingStrictnessLevel mode, bool skip_startup_tables) override;
 
     bool supportsLoadingInTopologicalOrder() const override { return true; }
 
     void loadTablesMetadata(ContextPtr context, ParsedTablesMetadata & metadata, bool is_startup) override;
 
-    void loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast, bool force_restore) override;
+    void loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast,
+        LoadingStrictnessLevel mode) override;
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     void alterTable(
         ContextPtr context,
         const StorageID & table_id,
         const StorageInMemoryMetadata & metadata) override;
 
+    Strings getNamesOfPermanentlyDetachedTables() const override { return permanently_detached_tables; }
+
 protected:
     virtual void commitAlterTable(
         const StorageID & table_id,
@@ -43,6 +46,8 @@ protected:
         const String & table_metadata_path,
         const String & statement,
         ContextPtr query_context);
+
+    Strings permanently_detached_tables;
 };
 
 }
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index a7ad632efff..21e7eb05d34 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -48,10 +48,12 @@ namespace ErrorCodes
     extern const int CANNOT_RESTORE_TABLE;
 }
 
+static constexpr const char * REPLICATED_DATABASE_MARK = "DatabaseReplicated";
 static constexpr const char * DROPPED_MARK = "DROPPED";
 static constexpr const char * BROKEN_TABLES_SUFFIX = "_broken_tables";
 static constexpr const char * BROKEN_REPLICATED_TABLES_SUFFIX = "_broken_replicated_tables";
 
+static constexpr size_t METADATA_FILE_BUFFER_SIZE = 32768;
 
 zkutil::ZooKeeperPtr DatabaseReplicated::getZooKeeper() const
 {
@@ -63,6 +65,13 @@ static inline String getHostID(ContextPtr global_context, const UUID & db_uuid)
     return Cluster::Address::toString(getFQDNOrHostName(), global_context->getTCPPort()) + ':' + toString(db_uuid);
 }
 
+static inline UInt64 getMetadataHash(const String & table_name, const String & metadata)
+{
+    SipHash hash;
+    hash.update(table_name);
+    hash.update(metadata);
+    return hash.get64();
+}
 
 DatabaseReplicated::~DatabaseReplicated() = default;
 
@@ -80,6 +89,7 @@ DatabaseReplicated::DatabaseReplicated(
     , shard_name(shard_name_)
     , replica_name(replica_name_)
     , db_settings(std::move(db_settings_))
+    , tables_metadata_digest(0)
 {
     if (zookeeper_path.empty() || shard_name.empty() || replica_name.empty())
         throw Exception("ZooKeeper path, shard and replica names must be non-empty", ErrorCodes::BAD_ARGUMENTS);
@@ -232,7 +242,7 @@ void DatabaseReplicated::fillClusterAuthInfo(String collection_name, const Poco:
     cluster_auth_info.cluster_secure_connection = config_ref.getBool(config_prefix + ".cluster_secure_connection", false);
 }
 
-void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(bool force_attach)
+void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessLevel mode)
 {
     try
     {
@@ -250,27 +260,48 @@ void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(bool force_attach)
         }
 
         replica_path = fs::path(zookeeper_path) / "replicas" / getFullReplicaName();
+        bool is_create_query = mode == LoadingStrictnessLevel::CREATE;
 
         String replica_host_id;
         if (current_zookeeper->tryGet(replica_path, replica_host_id))
         {
+            if (replica_host_id == DROPPED_MARK && !is_create_query)
+            {
+                LOG_WARNING(log, "Database {} exists locally, but marked dropped in ZooKeeper ({}). "
+                                 "Will not try to start it up", getDatabaseName(), replica_path);
+                is_probably_dropped = true;
+                return;
+            }
+
             String host_id = getHostID(getContext(), db_uuid);
-            if (replica_host_id != host_id)
-                throw Exception(ErrorCodes::REPLICA_IS_ALREADY_EXIST,
-                                "Replica {} of shard {} of replicated database at {} already exists. Replica host ID: '{}', current host ID: '{}'",
-                                replica_name, shard_name, zookeeper_path, replica_host_id, host_id);
+            if (is_create_query || replica_host_id != host_id)
+            {
+                throw Exception(
+                    ErrorCodes::REPLICA_IS_ALREADY_EXIST,
+                    "Replica {} of shard {} of replicated database at {} already exists. Replica host ID: '{}', current host ID: '{}'",
+                    replica_name, shard_name, zookeeper_path, replica_host_id, host_id);
+            }
+        }
+        else if (is_create_query)
+        {
+            /// Create new replica. Throws if replica with the same name already exists
+            createReplicaNodesInZooKeeper(current_zookeeper);
         }
         else
         {
-            /// Throws if replica with the same name already exists
-            createReplicaNodesInZooKeeper(current_zookeeper);
+            /// It's not CREATE query, but replica does not exist. Probably it was dropped.
+            /// Do not create anything, continue as readonly.
+            LOG_WARNING(log, "Database {} exists locally, but its replica does not exist in ZooKeeper ({}). "
+                             "Assuming it was dropped, will not try to start it up", getDatabaseName(), replica_path);
+            is_probably_dropped = true;
+            return;
         }
 
         is_readonly = false;
     }
     catch (...)
     {
-        if (!force_attach)
+        if (mode < LoadingStrictnessLevel::FORCE_ATTACH)
             throw;
 
         /// It's server startup, ignore error.
@@ -284,7 +315,7 @@ bool DatabaseReplicated::createDatabaseNodesInZooKeeper(const zkutil::ZooKeeperP
     current_zookeeper->createAncestors(zookeeper_path);
 
     Coordination::Requests ops;
-    ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, "", zkutil::CreateMode::Persistent));
+    ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, REPLICATED_DATABASE_MARK, zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/log", "", zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/replicas", "", zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/counter", "", zkutil::CreateMode::Persistent));
@@ -306,10 +337,42 @@ bool DatabaseReplicated::createDatabaseNodesInZooKeeper(const zkutil::ZooKeeperP
 
     /// Other codes are unexpected, will throw
     zkutil::KeeperMultiException::check(res, ops, responses);
-    assert(false);
+    chassert(false);
     __builtin_unreachable();
 }
 
+bool DatabaseReplicated::looksLikeReplicatedDatabasePath(const ZooKeeperPtr & current_zookeeper, const String & path)
+{
+    Coordination::Stat stat;
+    String maybe_database_mark;
+    if (!current_zookeeper->tryGet(path, maybe_database_mark, &stat))
+        return false;
+    if (maybe_database_mark.starts_with(REPLICATED_DATABASE_MARK))
+        return true;
+    if (maybe_database_mark.empty())
+        return false;
+
+    /// Old versions did not have REPLICATED_DATABASE_MARK. Check specific nodes exist and add mark.
+    Coordination::Requests ops;
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/log", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/replicas", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/counter", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/metadata", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/max_log_ptr", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/logs_to_keep", -1));
+    ops.emplace_back(zkutil::makeSetRequest(path, REPLICATED_DATABASE_MARK, stat.version));
+    Coordination::Responses responses;
+    auto res = current_zookeeper->tryMulti(ops, responses);
+    if (res == Coordination::Error::ZOK)
+        return true;
+
+    /// Recheck database mark (just in case of concurrent update).
+    if (!current_zookeeper->tryGet(path, maybe_database_mark, &stat))
+        return false;
+
+    return maybe_database_mark.starts_with(REPLICATED_DATABASE_MARK);
+}
+
 void DatabaseReplicated::createEmptyLogEntry(const ZooKeeperPtr & current_zookeeper)
 {
     /// On replica creation add empty entry to log. Can be used to trigger some actions on other replicas (e.g. update cluster info).
@@ -319,11 +382,17 @@ void DatabaseReplicated::createEmptyLogEntry(const ZooKeeperPtr & current_zookee
 
 bool DatabaseReplicated::waitForReplicaToProcessAllEntries(UInt64 timeout_ms)
 {
+    if (!ddl_worker)
+        return false;
     return ddl_worker->waitForReplicaToProcessAllEntries(timeout_ms);
 }
 
 void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPtr & current_zookeeper)
 {
+    if (!looksLikeReplicatedDatabasePath(current_zookeeper, zookeeper_path))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot add new database replica: provided path {} "
+                        "already contains some data and it does not look like Replicated database path.", zookeeper_path);
+
     /// Write host name to replica_path, it will protect from multiple replicas with the same name
     auto host_id = getHostID(getContext(), db_uuid);
 
@@ -334,6 +403,7 @@ void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPt
         Coordination::Requests ops;
         ops.emplace_back(zkutil::makeCreateRequest(replica_path, host_id, zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/log_ptr", "0", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/digest", "0", zkutil::CreateMode::Persistent));
         /// In addition to creating the replica nodes, we record the max_log_ptr at the instant where
         /// we declared ourself as an existing replica. We'll need this during recoverLostReplica to
         /// notify other nodes that issued new queries while this node was recovering.
@@ -354,25 +424,89 @@ void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPt
     createEmptyLogEntry(current_zookeeper);
 }
 
-void DatabaseReplicated::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool /*force_restore*/, bool force_attach)
+void DatabaseReplicated::beforeLoadingMetadata(ContextMutablePtr /*context*/, LoadingStrictnessLevel mode)
 {
-    tryConnectToZooKeeperAndInitDatabase(force_attach);
+    tryConnectToZooKeeperAndInitDatabase(mode);
 }
 
 void DatabaseReplicated::loadStoredObjects(
-    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+    ContextMutablePtr local_context, LoadingStrictnessLevel mode, bool skip_startup_tables)
 {
-    beforeLoadingMetadata(local_context, force_restore, force_attach);
-    DatabaseAtomic::loadStoredObjects(local_context, force_restore, force_attach, skip_startup_tables);
+    beforeLoadingMetadata(local_context, mode);
+    DatabaseAtomic::loadStoredObjects(local_context, mode, skip_startup_tables);
 }
 
-void DatabaseReplicated::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+UInt64 DatabaseReplicated::getMetadataHash(const String & table_name) const
 {
-    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
+    return DB::getMetadataHash(table_name, readMetadataFile(table_name));
+}
+
+void DatabaseReplicated::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode)
+{
+    DatabaseAtomic::startupTables(thread_pool, mode);
+
+    /// TSA: No concurrent writes are possible during loading
+    UInt64 digest = 0;
+    for (const auto & table : TSA_SUPPRESS_WARNING_FOR_READ(tables))
+        digest += getMetadataHash(table.first);
+
+    LOG_DEBUG(log, "Calculated metadata digest of {} tables: {}", TSA_SUPPRESS_WARNING_FOR_READ(tables).size(), digest);
+    chassert(!TSA_SUPPRESS_WARNING_FOR_READ(tables_metadata_digest));
+    TSA_SUPPRESS_WARNING_FOR_WRITE(tables_metadata_digest) = digest;
+
     ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, getContext());
+    if (is_probably_dropped)
+        return;
     ddl_worker->startup();
 }
 
+bool DatabaseReplicated::checkDigestValid(const ContextPtr & local_context, bool debug_check /* = true */) const
+{
+    if (debug_check)
+    {
+        /// Reduce number of debug checks
+        if (thread_local_rng() % 16)
+            return true;
+    }
+
+    LOG_TEST(log, "Current in-memory metadata digest: {}", tables_metadata_digest);
+
+    /// Database is probably being dropped
+    if (!local_context->getZooKeeperMetadataTransaction() && !ddl_worker->isCurrentlyActive())
+        return true;
+
+    UInt64 local_digest = 0;
+    {
+        std::lock_guard lock{mutex};
+        for (const auto & table : TSA_SUPPRESS_WARNING_FOR_READ(tables))
+            local_digest += getMetadataHash(table.first);
+    }
+
+    if (local_digest != tables_metadata_digest)
+    {
+        LOG_ERROR(log, "Digest of local metadata ({}) is not equal to in-memory digest ({})", local_digest, tables_metadata_digest);
+        return false;
+    }
+
+    /// Do not check digest in Keeper after internal subquery, it's probably not committed yet
+    if (local_context->isInternalSubquery())
+        return true;
+
+    /// Check does not make sense to check digest in Keeper during recovering
+    if (is_recovering)
+        return true;
+
+    String zk_digest = getZooKeeper()->get(replica_path + "/digest");
+    String local_digest_str = toString(local_digest);
+    if (zk_digest != local_digest_str)
+    {
+        LOG_ERROR(log, "Digest of local metadata ({}) is not equal to digest in Keeper ({})", local_digest_str, zk_digest);
+        return false;
+    }
+
+    return true;
+}
+
 void DatabaseReplicated::checkQueryValid(const ASTPtr & query, ContextPtr query_context) const
 {
     /// Replicas will set correct name of current database in query context (database name can be different on replicas)
@@ -512,7 +646,7 @@ static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context
         return UUIDHelpers::Nil;
     if (!startsWith(create.storage->engine->name, "Replicated") || !endsWith(create.storage->engine->name, "MergeTree"))
         return UUIDHelpers::Nil;
-    assert(create.uuid != UUIDHelpers::Nil);
+    chassert(create.uuid != UUIDHelpers::Nil);
     return create.uuid;
 }
 
@@ -532,9 +666,6 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     else
         LOG_WARNING(log, "Will recover replica with staled log pointer {} from log pointer {}", our_log_ptr, max_log_ptr);
 
-    if (new_replica && !empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "It's new replica, but database is not empty");
-
     auto table_name_to_metadata = tryGetConsistentMetadataSnapshot(current_zookeeper, max_log_ptr);
 
     /// For ReplicatedMergeTree tables we can compare only UUIDs to ensure that it's the same table.
@@ -578,7 +709,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         auto in_zk = table_name_to_metadata.find(name);
         if (in_zk == table_name_to_metadata.end() || in_zk->second != readMetadataFile(name))
         {
-            /// Local table does not exits in ZooKeeper or has different metadata
+            /// Local table does not exist in ZooKeeper or has different metadata
             tables_to_detach.emplace_back(std::move(name));
         }
     }
@@ -640,7 +771,13 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
             assert(db_name < to_database_name);
             DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(to_database_name, to_name);
             auto to_db_ptr = DatabaseCatalog::instance().getDatabase(to_database_name);
-            DatabaseAtomic::renameTable(make_query_context(), broken_table_name, *to_db_ptr, to_name, false, false);
+
+            std::lock_guard lock{metadata_mutex};
+            UInt64 new_digest = tables_metadata_digest;
+            new_digest -= getMetadataHash(broken_table_name);
+            DatabaseAtomic::renameTable(make_query_context(), broken_table_name, *to_db_ptr, to_name, /* exchange */ false, /* dictionary */ false);
+            tables_metadata_digest = new_digest;
+            assert(checkDigestValid(getContext()));
             ++moved_tables;
         };
 
@@ -649,9 +786,24 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
             LOG_DEBUG(log, "Will DROP TABLE {}, because it does not store data on disk and can be safely dropped", backQuoteIfNeed(table_name));
             dropped_tables.push_back(tryGetTableUUID(table_name));
             dropped_dictionaries += table->isDictionary();
-
             table->flushAndShutdown();
-            DatabaseAtomic::dropTable(make_query_context(), table_name, true);
+
+            if (table->getName() == "MaterializedView" || table->getName() == "WindowView")
+            {
+                /// We have to drop MV inner table, so MV will not try to do it implicitly breaking some invariants.
+                /// Also we have to commit metadata transaction, because it's not committed by default for inner tables of MVs.
+                /// Yep, I hate inner tables of materialized views.
+                auto mv_drop_inner_table_context = make_query_context();
+                table->dropInnerTableIfAny(sync, mv_drop_inner_table_context);
+                mv_drop_inner_table_context->getZooKeeperMetadataTransaction()->commit();
+            }
+
+            std::lock_guard lock{metadata_mutex};
+            UInt64 new_digest = tables_metadata_digest;
+            new_digest -= getMetadataHash(table_name);
+            DatabaseAtomic::dropTableImpl(make_query_context(), table_name, /* sync */ true);
+            tables_metadata_digest = new_digest;
+            assert(checkDigestValid(getContext()));
         }
         else if (!table->supportsReplication())
         {
@@ -677,7 +829,15 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         /// TODO Maybe we should do it in two steps: rename all tables to temporary names and then rename them to actual names?
         DDLGuardPtr table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::min(from, to));
         DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::max(from, to));
+
+        std::lock_guard lock{metadata_mutex};
+        UInt64 new_digest = tables_metadata_digest;
+        String statement = readMetadataFile(from);
+        new_digest -= DB::getMetadataHash(from, statement);
+        new_digest += DB::getMetadataHash(to, statement);
         DatabaseAtomic::renameTable(make_query_context(), from, *this, to, false, false);
+        tables_metadata_digest = new_digest;
+        assert(checkDigestValid(getContext()));
     }
 
     for (const auto & id : dropped_tables)
@@ -712,6 +872,10 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
                 LOG_INFO(log, "Marked recovered {} as finished", entry_name);
         }
     }
+
+    std::lock_guard lock{metadata_mutex};
+    chassert(checkDigestValid(getContext()));
+    current_zookeeper->set(replica_path + "/digest", toString(tables_metadata_digest));
 }
 
 std::map<String, String> DatabaseReplicated::tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr)
@@ -749,8 +913,8 @@ std::map<String, String> DatabaseReplicated::tryGetConsistentMetadataSnapshot(co
         }
         else
         {
-            assert(max_log_ptr == new_max_log_ptr);
-            assert(table_names.size() != table_name_to_metadata.size());
+            chassert(max_log_ptr == new_max_log_ptr);
+            chassert(table_names.size() != table_name_to_metadata.size());
             LOG_DEBUG(log, "Cannot get metadata of some tables due to ZooKeeper error, will retry");
         }
     }
@@ -801,6 +965,8 @@ void DatabaseReplicated::drop(ContextPtr context_)
 
 void DatabaseReplicated::stopReplication()
 {
+    if (is_probably_dropped)
+        return;
     if (ddl_worker)
         ddl_worker->shutdown();
 }
@@ -817,12 +983,29 @@ void DatabaseReplicated::dropTable(ContextPtr local_context, const String & tabl
 {
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn || startsWith(table_name, ".inner_id."));
-    if (txn && txn->isInitialQuery())
+    if (txn && txn->isInitialQuery() && !txn->isCreateOrReplaceQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
-    DatabaseAtomic::dropTable(local_context, table_name, sync);
+
+    auto table = tryGetTable(table_name, getContext());
+    if (table->getName() == "MaterializedView" || table->getName() == "WindowView")
+    {
+        /// Avoid recursive locking of metadata_mutex
+        table->dropInnerTableIfAny(sync, local_context);
+    }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest -= getMetadataHash(table_name);
+    if (txn && !txn->isCreateOrReplaceQuery())
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
+    DatabaseAtomic::dropTableImpl(local_context, table_name, sync);
+    tables_metadata_digest = new_digest;
+
+    assert(checkDigestValid(local_context));
 }
 
 void DatabaseReplicated::renameTable(ContextPtr local_context, const String & table_name, IDatabase & to_database,
@@ -831,31 +1014,51 @@ void DatabaseReplicated::renameTable(ContextPtr local_context, const String & ta
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(txn);
 
+    if (this != &to_database)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Moving tables between databases is not supported for Replicated engine");
+    if (table_name == to_table_name)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "Cannot rename table to itself");
+    if (!isTableExist(table_name, local_context))
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_name);
+    if (exchange && !to_database.isTableExist(to_table_name, local_context))
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", to_table_name);
+
+    String statement = readMetadataFile(table_name);
+    String statement_to;
+    if (exchange)
+        statement_to = readMetadataFile(to_table_name);
+
     if (txn->isInitialQuery())
     {
-        if (this != &to_database)
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Moving tables between databases is not supported for Replicated engine");
-        if (table_name == to_table_name)
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Cannot rename table to itself");
-        if (!isTableExist(table_name, local_context))
-            throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_name);
-        if (exchange && !to_database.isTableExist(to_table_name, local_context))
-            throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", to_table_name);
-
-        String statement = readMetadataFile(table_name);
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         String metadata_zk_path_to = zookeeper_path + "/metadata/" + escapeForFileName(to_table_name);
-        txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
+        if (!txn->isCreateOrReplaceQuery())
+            txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
+
         if (exchange)
         {
-            String statement_to = readMetadataFile(to_table_name);
             txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path_to, -1));
-            txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement_to, zkutil::CreateMode::Persistent));
+            if (!txn->isCreateOrReplaceQuery())
+                txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement_to, zkutil::CreateMode::Persistent));
         }
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path_to, statement, zkutil::CreateMode::Persistent));
     }
 
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest -= DB::getMetadataHash(table_name, statement);
+    new_digest += DB::getMetadataHash(to_table_name, statement);
+    if (exchange)
+    {
+        new_digest -= DB::getMetadataHash(to_table_name, statement_to);
+        new_digest += DB::getMetadataHash(table_name, statement_to);
+    }
+    if (txn)
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
     DatabaseAtomic::renameTable(local_context, table_name, to_database, to_table_name, exchange, dictionary);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(local_context));
 }
 
 void DatabaseReplicated::commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
@@ -864,14 +1067,24 @@ void DatabaseReplicated::commitCreateTable(const ASTCreateQuery & query, const S
 {
     auto txn = query_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
-    if (txn && txn->isInitialQuery())
+
+    String statement = getObjectDefinitionFromCreateQuery(query.clone());
+    if (txn && txn->isInitialQuery() && !txn->isCreateOrReplaceQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(query.getTable());
-        String statement = getObjectDefinitionFromCreateQuery(query.clone());
         /// zk::multi(...) will throw if `metadata_zk_path` exists
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement, zkutil::CreateMode::Persistent));
     }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest += DB::getMetadataHash(query.getTable(), statement);
+    if (txn && !txn->isCreateOrReplaceQuery())
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
     DatabaseAtomic::commitCreateTable(query, table, table_metadata_tmp_path, table_metadata_path, query_context);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(query_context));
 }
 
 void DatabaseReplicated::commitAlterTable(const StorageID & table_id,
@@ -879,12 +1092,23 @@ void DatabaseReplicated::commitAlterTable(const StorageID & table_id,
                                           const String & statement, ContextPtr query_context)
 {
     auto txn = query_context->getZooKeeperMetadataTransaction();
+    assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_id.table_name);
         txn->addOp(zkutil::makeSetRequest(metadata_zk_path, statement, -1));
     }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest -= getMetadataHash(table_id.table_name);
+    new_digest += DB::getMetadataHash(table_id.table_name, statement);
+    if (txn)
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
     DatabaseAtomic::commitAlterTable(table_id, table_metadata_tmp_path, table_metadata_path, statement, query_context);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(query_context));
 }
 
 void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const String & table_name)
@@ -898,10 +1122,19 @@ void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest -= getMetadataHash(table_name);
+    if (txn)
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
     DatabaseAtomic::detachTablePermanently(local_context, table_name);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(local_context));
 }
 
-void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context, const String & table_name, const String & table_metadata_path, bool attach) const
+void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context, const String & table_name, const String & table_metadata_path, bool attach)
 {
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
@@ -911,14 +1144,26 @@ void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context,
         String statement = readMetadataFile(table_name);
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement, zkutil::CreateMode::Persistent));
     }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    if (attach)
+    {
+        new_digest += getMetadataHash(table_name);
+        if (txn)
+            txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+    }
+
     DatabaseAtomic::removeDetachedPermanentlyFlag(local_context, table_name, table_metadata_path, attach);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(local_context));
 }
 
 
 String DatabaseReplicated::readMetadataFile(const String & table_name) const
 {
     String statement;
-    ReadBufferFromFile in(getObjectMetadataPath(table_name), 4096);
+    ReadBufferFromFile in(getObjectMetadataPath(table_name), METADATA_FILE_BUFFER_SIZE);
     readStringUntilEOF(statement, in);
     return statement;
 }
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index 07014702067..56689ed94bf 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -40,7 +40,7 @@ public:
                           const String & table_metadata_tmp_path, const String & table_metadata_path,
                           const String & statement, ContextPtr query_context) override;
     void detachTablePermanently(ContextPtr context, const String & table_name) override;
-    void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) const override;
+    void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) override;
 
     bool waitForReplicaToProcessAllEntries(UInt64 timeout_ms);
 
@@ -64,11 +64,11 @@ public:
 
     void drop(ContextPtr /*context*/) override;
 
-    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, LoadingStrictnessLevel mode, bool skip_startup_tables) override;
 
-    void beforeLoadingMetadata(ContextMutablePtr context, bool force_restore, bool force_attach) override;
+    void beforeLoadingMetadata(ContextMutablePtr context, LoadingStrictnessLevel mode) override;
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     void shutdown() override;
 
@@ -78,8 +78,9 @@ public:
     friend struct DatabaseReplicatedTask;
     friend class DatabaseReplicatedDDLWorker;
 private:
-    void tryConnectToZooKeeperAndInitDatabase(bool force_attach);
+    void tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessLevel mode);
     bool createDatabaseNodesInZooKeeper(const ZooKeeperPtr & current_zookeeper);
+    static bool looksLikeReplicatedDatabasePath(const ZooKeeperPtr & current_zookeeper, const String & path);
     void createReplicaNodesInZooKeeper(const ZooKeeperPtr & current_zookeeper);
 
     struct
@@ -110,6 +111,9 @@ private:
         return is_recovering && typeid_cast<DatabaseAtomic *>(&to_database);
     }
 
+    UInt64 getMetadataHash(const String & table_name) const;
+    bool checkDigestValid(const ContextPtr & local_context, bool debug_check = true) const TSA_REQUIRES(metadata_mutex);
+
     String zookeeper_path;
     String shard_name;
     String replica_name;
@@ -119,10 +123,20 @@ private:
     zkutil::ZooKeeperPtr getZooKeeper() const;
 
     std::atomic_bool is_readonly = true;
+    std::atomic_bool is_probably_dropped = false;
     std::atomic_bool is_recovering = false;
     std::unique_ptr<DatabaseReplicatedDDLWorker> ddl_worker;
     UInt32 max_log_ptr_at_creation = 0;
 
+    /// Usually operation with metadata are single-threaded because of the way replication works,
+    /// but StorageReplicatedMergeTree may call alterTable outside from DatabaseReplicatedDDLWorker causing race conditions.
+    std::mutex metadata_mutex;
+
+    /// Sum of hashes of pairs (table_name, table_create_statement).
+    /// We calculate this sum from local metadata files and compare it will value in ZooKeeper.
+    /// It allows to detect if metadata is broken and recover replica.
+    UInt64 tables_metadata_digest TSA_GUARDED_BY(metadata_mutex);
+
     mutable ClusterPtr cluster;
 };
 
diff --git a/src/Databases/DatabaseReplicatedSettings.h b/src/Databases/DatabaseReplicatedSettings.h
index 8bed1ababf6..c19ec1fb7a4 100644
--- a/src/Databases/DatabaseReplicatedSettings.h
+++ b/src/Databases/DatabaseReplicatedSettings.h
@@ -12,6 +12,7 @@ class ASTStorage;
     M(UInt64, max_replication_lag_to_enqueue, 10, "Replica will throw exception on attempt to execute query if its replication lag greater", 0) \
     M(UInt64, wait_entry_commited_timeout_sec, 3600, "Replicas will try to cancel query if timeout exceed, but initiator host has not executed it yet", 0) \
     M(String, collection_name, "", "A name of a collection defined in server's config where all info for cluster authentication is defined", 0) \
+    M(Bool, check_consistency, true, "Check consistency of local metadata and metadata in Keeper, do replica recovery on inconsistency", 0) \
 
 
 DECLARE_SETTINGS_TRAITS(DatabaseReplicatedSettingsTraits, LIST_OF_DATABASE_REPLICATED_SETTINGS)
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
index 96b4e273ce7..63d5af8da3d 100644
--- a/src/Databases/DatabaseReplicatedWorker.cpp
+++ b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -32,9 +32,10 @@ bool DatabaseReplicatedDDLWorker::initializeMainThread()
     {
         try
         {
+            chassert(!database->is_probably_dropped);
             auto zookeeper = getAndSetZooKeeper();
             if (database->is_readonly)
-                database->tryConnectToZooKeeperAndInitDatabase(false);
+                database->tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessLevel::ATTACH);
             initializeReplication();
             initialized = true;
             return true;
@@ -65,8 +66,34 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
     UInt32 our_log_ptr = parse<UInt32>(log_ptr_str);
     UInt32 max_log_ptr = parse<UInt32>(zookeeper->get(database->zookeeper_path + "/max_log_ptr"));
     logs_to_keep = parse<UInt32>(zookeeper->get(database->zookeeper_path + "/logs_to_keep"));
-    if (our_log_ptr == 0 || our_log_ptr + logs_to_keep < max_log_ptr)
+
+    UInt64 digest;
+    String digest_str;
+    UInt64 local_digest;
+    if (zookeeper->tryGet(database->replica_path + "/digest", digest_str))
     {
+        digest = parse<UInt64>(digest_str);
+        std::lock_guard lock{database->metadata_mutex};
+        local_digest = database->tables_metadata_digest;
+    }
+    else
+    {
+        /// Database was created by old ClickHouse versions, let's create the node
+        std::lock_guard lock{database->metadata_mutex};
+        digest = local_digest = database->tables_metadata_digest;
+        digest_str = toString(digest);
+        zookeeper->create(database->replica_path + "/digest", digest_str, zkutil::CreateMode::Persistent);
+    }
+
+    bool is_new_replica = our_log_ptr == 0;
+    bool lost_according_to_log_ptr = our_log_ptr + logs_to_keep < max_log_ptr;
+    bool lost_according_to_digest = database->db_settings.check_consistency && local_digest != digest;
+
+    if (is_new_replica || lost_according_to_log_ptr || lost_according_to_digest)
+    {
+        if (!is_new_replica)
+            LOG_WARNING(log, "Replica seems to be lost: our_log_ptr={}, max_log_ptr={}, local_digest={}, zk_digest={}",
+                        our_log_ptr, max_log_ptr, local_digest, digest);
         database->recoverLostReplica(zookeeper, our_log_ptr, max_log_ptr);
         zookeeper->set(database->replica_path + "/log_ptr", toString(max_log_ptr));
         initializeLogPointer(DDLTaskBase::getLogEntryName(max_log_ptr));
@@ -77,6 +104,10 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
         last_skipped_entry_name.emplace(log_entry_name);
         initializeLogPointer(log_entry_name);
     }
+
+    std::lock_guard lock{database->metadata_mutex};
+    if (!database->checkDigestValid(context))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Inconsistent database metadata after reconnection to ZooKeeper");
 }
 
 String DatabaseReplicatedDDLWorker::enqueueQuery(DDLLogEntry & entry)
@@ -93,7 +124,7 @@ bool DatabaseReplicatedDDLWorker::waitForReplicaToProcessAllEntries(UInt64 timeo
     const auto max_log_ptr_path = database->zookeeper_path + "/max_log_ptr";
     UInt32 our_log_ptr = parse<UInt32>(zookeeper->get(our_log_ptr_path));
     UInt32 max_log_ptr = parse<UInt32>(zookeeper->get(max_log_ptr_path));
-    assert(our_log_ptr <= max_log_ptr);
+    chassert(our_log_ptr <= max_log_ptr);
 
     /// max_log_ptr is the number of the last successfully executed request on the initiator
     /// The log could contain other entries which are not committed yet
@@ -108,7 +139,6 @@ bool DatabaseReplicatedDDLWorker::waitForReplicaToProcessAllEntries(UInt64 timeo
         std::unique_lock lock{mutex};
         bool processed = wait_current_task_change.wait_for(lock, std::chrono::milliseconds(timeout_ms), [&]()
         {
-            assert(zookeeper->expired() || current_task <= max_log);
             return zookeeper->expired() || current_task == max_log || stop_flag;
         });
 
@@ -181,6 +211,7 @@ String DatabaseReplicatedDDLWorker::enqueueQueryImpl(const ZooKeeperPtr & zookee
     /// Create status dirs
     ops.emplace_back(zkutil::makeCreateRequest(node_path + "/active", "", zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(node_path + "/finished", "", zkutil::CreateMode::Persistent));
+    ops.emplace_back(zkutil::makeCreateRequest(node_path + "/synced", "", zkutil::CreateMode::Persistent));
     zookeeper->multi(ops);
 
 
@@ -206,7 +237,7 @@ String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entr
     auto task = std::make_unique<DatabaseReplicatedTask>(entry_name, entry_path, database);
     task->entry = entry;
     task->parseQueryFromEntry(context);
-    assert(!task->entry.query.empty());
+    chassert(!task->entry.query.empty());
     assert(!zookeeper->exists(task->getFinishedNodePath()));
     task->is_initial_query = true;
 
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index 72155bc818c..65dfb80846d 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -1,12 +1,13 @@
 #pragma once
 
-#include <base/types.h>
+#include <Core/UUID.h>
+#include <Databases/LoadingStrictnessLevel.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
-#include <Interpreters/Context_fwd.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/ThreadPool.h>
-#include <Core/UUID.h>
 
 #include <ctime>
 #include <functional>
@@ -132,18 +133,15 @@ public:
     /// You can call only once, right after the object is created.
     virtual void loadStoredObjects( /// NOLINT
         ContextMutablePtr /*context*/,
-        bool /*force_restore*/,
-        bool /*force_attach*/ = false,
-        bool /* skip_startup_tables */ = false)
+        LoadingStrictnessLevel /*mode*/,
+        bool /* skip_startup_tables */)
     {
     }
 
     virtual bool supportsLoadingInTopologicalOrder() const { return false; }
 
     virtual void beforeLoadingMetadata(
-        ContextMutablePtr /*context*/,
-        bool /*force_restore*/,
-        bool /*force_attach*/)
+        ContextMutablePtr /*context*/, LoadingStrictnessLevel /*mode*/)
     {
     }
 
@@ -152,12 +150,13 @@ public:
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
     }
 
-    virtual void loadTableFromMetadata(ContextMutablePtr /*local_context*/, const String & /*file_path*/, const QualifiedTableName & /*name*/, const ASTPtr & /*ast*/, bool /*force_restore*/)
+    virtual void loadTableFromMetadata(ContextMutablePtr /*local_context*/, const String & /*file_path*/, const QualifiedTableName & /*name*/, const ASTPtr & /*ast*/,
+        LoadingStrictnessLevel /*mode*/)
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
     }
 
-    virtual void startupTables(ThreadPool & /*thread_pool*/, bool /*force_restore*/, bool /*force_attach*/) {}
+    virtual void startupTables(ThreadPool & /*thread_pool*/, LoadingStrictnessLevel /*mode*/) {}
 
     /// Check the existence of the table in memory (attached).
     virtual bool isTableExist(const String & name, ContextPtr context) const = 0;
@@ -223,6 +222,13 @@ public:
         throw Exception("There is no DETACH TABLE PERMANENTLY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    /// Returns list of table names that were permanently detached.
+    /// This list may not be updated in runtime and may be filled only on server startup
+    virtual Strings getNamesOfPermanentlyDetachedTables() const
+    {
+        throw Exception("Cannot get names of permanently detached tables for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     /// Rename the table and possibly move the table to another database.
     virtual void renameTable(
         ContextPtr /*context*/,
diff --git a/src/Databases/LoadingStrictnessLevel.cpp b/src/Databases/LoadingStrictnessLevel.cpp
new file mode 100644
index 00000000000..8d491ca5689
--- /dev/null
+++ b/src/Databases/LoadingStrictnessLevel.cpp
@@ -0,0 +1,28 @@
+#include <Databases/LoadingStrictnessLevel.h>
+#include <cassert>
+
+namespace DB
+{
+
+LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach, bool force_restore)
+{
+    if (force_restore)
+    {
+        assert(attach);
+        assert(force_attach);
+        return LoadingStrictnessLevel::FORCE_RESTORE;
+    }
+
+    if (force_attach)
+    {
+        assert(attach);
+        return LoadingStrictnessLevel::FORCE_ATTACH;
+    }
+
+    if (attach)
+        return LoadingStrictnessLevel::ATTACH;
+
+    return LoadingStrictnessLevel::CREATE;
+}
+
+}
diff --git a/src/Databases/LoadingStrictnessLevel.h b/src/Databases/LoadingStrictnessLevel.h
new file mode 100644
index 00000000000..b6449a0a9fd
--- /dev/null
+++ b/src/Databases/LoadingStrictnessLevel.h
@@ -0,0 +1,21 @@
+#pragma once
+
+namespace DB
+{
+
+/// Strictness mode for loading a table or database
+enum class LoadingStrictnessLevel
+{
+    /// Do all possible sanity checks
+    CREATE = 0,
+    /// Expect existing paths on FS and in ZK for ATTACH query
+    ATTACH = 1,
+    /// We ignore some error on server startup
+    FORCE_ATTACH = 2,
+    /// Skip all sanity checks (if force_restore_data flag exists)
+    FORCE_RESTORE = 3,
+};
+
+LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach, bool force_restore);
+
+}
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
index 230a0b4d4a4..91dbadca409 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
@@ -63,11 +63,11 @@ void DatabaseMaterializedMySQL::setException(const std::exception_ptr & exceptio
     exception = exception_;
 }
 
-void DatabaseMaterializedMySQL::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+void DatabaseMaterializedMySQL::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode)
 {
-    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
+    DatabaseAtomic::startupTables(thread_pool, mode);
 
-    if (!force_attach)
+    if (mode < LoadingStrictnessLevel::FORCE_ATTACH)
         materialize_thread.assertMySQLAvailable();
 
     materialize_thread.startSynchronization();
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.h b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
index a6810f29d87..27a7ddc8acf 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.h
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
@@ -48,7 +48,7 @@ protected:
 public:
     String getEngineName() const override { return "MaterializedMySQL"; }
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     void createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query) override;
 
diff --git a/src/Databases/MySQL/DatabaseMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp
index 95098ba9cbd..01c342c1771 100644
--- a/src/Databases/MySQL/DatabaseMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMySQL.cpp
@@ -398,7 +398,7 @@ String DatabaseMySQL::getMetadataPath() const
     return metadata_path;
 }
 
-void DatabaseMySQL::loadStoredObjects(ContextMutablePtr, bool, bool /*force_attach*/, bool /* skip_startup_tables */)
+void DatabaseMySQL::loadStoredObjects(ContextMutablePtr, LoadingStrictnessLevel /*mode*/, bool /* skip_startup_tables */)
 {
 
     std::lock_guard<std::mutex> lock{mutex};
diff --git a/src/Databases/MySQL/DatabaseMySQL.h b/src/Databases/MySQL/DatabaseMySQL.h
index 542cd65c1f1..5d0a366e5e6 100644
--- a/src/Databases/MySQL/DatabaseMySQL.h
+++ b/src/Databases/MySQL/DatabaseMySQL.h
@@ -76,7 +76,7 @@ public:
 
     void createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
 
-    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr, LoadingStrictnessLevel /*mode*/, bool skip_startup_tables) override;
 
     StoragePtr detachTable(ContextPtr context, const String & table_name) override;
 
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
index 08a0859e6db..523cc7041be 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
@@ -125,9 +125,9 @@ void DatabaseMaterializedPostgreSQL::startSynchronization()
 }
 
 
-void DatabaseMaterializedPostgreSQL::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+void DatabaseMaterializedPostgreSQL::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode)
 {
-    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
+    DatabaseAtomic::startupTables(thread_pool, mode);
     startup_task->activateAndSchedule();
 }
 
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
index ac2bcedca60..6363e8e07c4 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
@@ -40,7 +40,7 @@ public:
 
     String getMetadataPath() const override { return metadata_path; }
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     DatabaseTablesIteratorPtr
     getTablesIterator(ContextPtr context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const override;
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index c4b815c0c9f..8e89765b635 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -290,7 +290,7 @@ void DatabasePostgreSQL::drop(ContextPtr /*context*/)
 }
 
 
-void DatabasePostgreSQL::loadStoredObjects(ContextMutablePtr /* context */, bool, bool /*force_attach*/, bool /* skip_startup_tables */)
+void DatabasePostgreSQL::loadStoredObjects(ContextMutablePtr /* context */, LoadingStrictnessLevel /*mode*/, bool /* skip_startup_tables */)
 {
     {
         std::lock_guard<std::mutex> lock{mutex};
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index fe4dff2ca93..d70e529e4a6 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -45,7 +45,7 @@ public:
 
     bool empty() const override;
 
-    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr, LoadingStrictnessLevel /*mode*/, bool skip_startup_tables) override;
 
     DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
diff --git a/src/Databases/TablesLoader.cpp b/src/Databases/TablesLoader.cpp
index 7e9b83d423a..1114206d469 100644
--- a/src/Databases/TablesLoader.cpp
+++ b/src/Databases/TablesLoader.cpp
@@ -62,11 +62,10 @@ void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, Atomic
     }
 }
 
-TablesLoader::TablesLoader(ContextMutablePtr global_context_, Databases databases_, bool force_restore_, bool force_attach_)
+TablesLoader::TablesLoader(ContextMutablePtr global_context_, Databases databases_, LoadingStrictnessLevel strictness_mode_)
 : global_context(global_context_)
 , databases(std::move(databases_))
-, force_restore(force_restore_)
-, force_attach(force_attach_)
+, strictness_mode(strictness_mode_)
 {
     metadata.default_database = global_context->getCurrentDatabase();
     log = &Poco::Logger::get("TablesLoader");
@@ -83,7 +82,7 @@ void TablesLoader::loadTables()
         if (need_resolve_dependencies && database.second->supportsLoadingInTopologicalOrder())
             databases_to_load.push_back(database.first);
         else
-            database.second->loadStoredObjects(global_context, force_restore, force_attach, true);
+            database.second->loadStoredObjects(global_context, strictness_mode, /* skip_startup_tables */ true);
     }
 
     if (databases_to_load.empty())
@@ -92,8 +91,9 @@ void TablesLoader::loadTables()
     /// Read and parse metadata from Ordinary, Atomic, Materialized*, Replicated, etc databases. Build dependency graph.
     for (auto & database_name : databases_to_load)
     {
-        databases[database_name]->beforeLoadingMetadata(global_context, force_restore, force_attach);
-        databases[database_name]->loadTablesMetadata(global_context, metadata, force_attach);
+        databases[database_name]->beforeLoadingMetadata(global_context, strictness_mode);
+        bool is_startup = LoadingStrictnessLevel::FORCE_ATTACH <= strictness_mode;
+        databases[database_name]->loadTablesMetadata(global_context, metadata, is_startup);
     }
 
     LOG_INFO(log, "Parsed metadata of {} tables in {} databases in {} sec",
@@ -119,7 +119,7 @@ void TablesLoader::startupTables()
 {
     /// Startup tables after all tables are loaded. Background tasks (merges, mutations, etc) may slow down data parts loading.
     for (auto & database : databases)
-        database.second->startupTables(pool, force_restore, force_attach);
+        database.second->startupTables(pool, strictness_mode);
 }
 
 
@@ -253,7 +253,7 @@ void TablesLoader::startLoadingIndependentTables(ThreadPool & pool, size_t level
         pool.scheduleOrThrowOnError([this, load_context, total_tables, &table_name]()
         {
             const auto & path_and_query = metadata.parsed_tables[table_name];
-            databases[table_name.database]->loadTableFromMetadata(load_context, path_and_query.path, table_name, path_and_query.ast, force_restore);
+            databases[table_name.database]->loadTableFromMetadata(load_context, path_and_query.path, table_name, path_and_query.ast, strictness_mode);
             logAboutProgress(log, ++tables_processed, total_tables, stopwatch);
         });
     }
diff --git a/src/Databases/TablesLoader.h b/src/Databases/TablesLoader.h
index 43e8bfdb92c..7a29d0e3958 100644
--- a/src/Databases/TablesLoader.h
+++ b/src/Databases/TablesLoader.h
@@ -1,14 +1,15 @@
 #pragma once
-#include <Core/Types.h>
-#include <Core/QualifiedTableName.h>
-#include <Parsers/IAST_fwd.h>
-#include <Interpreters/Context_fwd.h>
-#include <Common/ThreadPool.h>
-#include <Common/Stopwatch.h>
 #include <map>
+#include <mutex>
 #include <unordered_map>
 #include <unordered_set>
-#include <mutex>
+#include <Core/QualifiedTableName.h>
+#include <Core/Types.h>
+#include <Databases/LoadingStrictnessLevel.h>
+#include <Interpreters/Context_fwd.h>
+#include <Parsers/IAST_fwd.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
 
 namespace Poco
 {
@@ -78,7 +79,7 @@ class TablesLoader
 public:
     using Databases = std::map<String, DatabasePtr>;
 
-    TablesLoader(ContextMutablePtr global_context_, Databases databases_, bool force_restore_ = false, bool force_attach_ = false);
+    TablesLoader(ContextMutablePtr global_context_, Databases databases_, LoadingStrictnessLevel strictness_mode_);
     TablesLoader() = delete;
 
     void loadTables();
@@ -87,8 +88,7 @@ public:
 private:
     ContextMutablePtr global_context;
     Databases databases;
-    bool force_restore;
-    bool force_attach;
+    LoadingStrictnessLevel strictness_mode;
 
     Strings databases_to_load;
     ParsedTablesMetadata metadata;
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index b616979ba2e..b1c47561948 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -29,7 +29,7 @@ namespace ErrorCodes
 }
 
 static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
-    "host", "port", "user", "password", "db", "database", "table",
+    "host", "port", "user", "password", "quota_key", "db", "database", "table",
     "update_field", "update_lag", "invalidate_query", "query", "where", "name", "secure"};
 
 namespace
@@ -54,6 +54,7 @@ namespace
             configuration.db,
             configuration.user,
             configuration.password,
+            configuration.quota_key,
             "", /* cluster */
             "", /* cluster_secret */
             "ClickHouseDictionarySource",
@@ -237,6 +238,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
         std::string host = config.getString(settings_config_prefix + ".host", "localhost");
         std::string user = config.getString(settings_config_prefix + ".user", "default");
         std::string password =  config.getString(settings_config_prefix + ".password", "");
+        std::string quota_key =  config.getString(settings_config_prefix + ".quota_key", "");
         std::string db = config.getString(settings_config_prefix + ".db", default_database);
         std::string table = config.getString(settings_config_prefix + ".table", "");
         UInt16 port = static_cast<UInt16>(config.getUInt(settings_config_prefix + ".port", default_port));
@@ -252,6 +254,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
             host = configuration.host;
             user = configuration.username;
             password = configuration.password;
+            quota_key = configuration.quota_key;
             db = configuration.database;
             table = configuration.table;
             port = configuration.port;
@@ -261,6 +264,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
             .host = host,
             .user = user,
             .password = password,
+            .quota_key = quota_key,
             .db = db,
             .table = table,
             .query = config.getString(settings_config_prefix + ".query", ""),
diff --git a/src/Dictionaries/ClickHouseDictionarySource.h b/src/Dictionaries/ClickHouseDictionarySource.h
index 007e3e8b29d..7bf6b805c03 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.h
+++ b/src/Dictionaries/ClickHouseDictionarySource.h
@@ -23,6 +23,7 @@ public:
         const std::string host;
         const std::string user;
         const std::string password;
+        const std::string quota_key;
         const std::string db;
         const std::string table;
         const std::string query;
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 5624f9595d7..3ba82164eb2 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -167,6 +167,12 @@ void DictionaryStructure::validateKeyTypes(const DataTypes & key_types) const
     }
 }
 
+bool DictionaryStructure::hasAttribute(const std::string & attribute_name) const
+{
+    auto it = attribute_name_to_index.find(attribute_name);
+    return it != attribute_name_to_index.end();
+}
+
 const DictionaryAttribute & DictionaryStructure::getAttribute(const std::string & attribute_name) const
 {
     auto it = attribute_name_to_index.find(attribute_name);
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index bb4c306affa..327606e97f7 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -127,6 +127,7 @@ struct DictionaryStructure final
     DataTypes getKeyTypes() const;
     void validateKeyTypes(const DataTypes & key_types) const;
 
+    bool hasAttribute(const std::string & attribute_name) const;
     const DictionaryAttribute & getAttribute(const std::string & attribute_name) const;
     const DictionaryAttribute & getAttribute(const std::string & attribute_name, const DataTypePtr & type) const;
 
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index 3f3c60206d6..d82f89b7473 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -5,16 +5,19 @@
 
 #include <Core/Names.h>
 #include <Columns/ColumnsNumber.h>
+#include <Core/ColumnsWithTypeAndName.h>
 #include <Interpreters/IExternalLoadable.h>
 #include <Interpreters/StorageID.h>
+#include <Interpreters/IKeyValueEntity.h>
 #include <Interpreters/castColumn.h>
+#include <Interpreters/JoinUtils.h>
 #include <Dictionaries/IDictionarySource.h>
 #include <Dictionaries/DictionaryStructure.h>
 #include <DataTypes/IDataType.h>
 
-
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
@@ -52,7 +55,7 @@ enum class DictionarySpecialKeyType
 /**
  * Base class for Dictionaries implementation.
  */
-class IDictionary : public IExternalLoadable
+class IDictionary : public IExternalLoadable, public IKeyValueEntity
 {
 public:
     explicit IDictionary(const StorageID & dictionary_id_)
@@ -290,6 +293,107 @@ public:
         return dictionary_comment;
     }
 
+    /// IKeyValueEntity implementation
+    Names getPrimaryKey() const  override { return getStructure().getKeysNames(); }
+
+    Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & out_null_map, const Names & result_names) const override
+    {
+        if (keys.empty())
+            return Chunk(getSampleBlock(result_names).cloneEmpty().getColumns(), 0);
+
+        const auto & dictionary_structure = getStructure();
+
+        /// Split column keys and types into separate vectors, to use in `IDictionary::getColumns`
+        Columns key_columns;
+        DataTypes key_types;
+        for (const auto & key : keys)
+        {
+            key_columns.emplace_back(key.column);
+            key_types.emplace_back(key.type);
+        }
+
+        /// Fill null map
+        {
+            out_null_map.clear();
+
+            auto mask = hasKeys(key_columns, key_types);
+            const auto & mask_data = mask->getData();
+
+            out_null_map.resize(mask_data.size(), 0);
+            std::copy(mask_data.begin(), mask_data.end(), out_null_map.begin());
+        }
+
+        Names attribute_names;
+        DataTypes result_types;
+        if (!result_names.empty())
+        {
+            for (const auto & attr_name : result_names)
+            {
+                if (!dictionary_structure.hasAttribute(attr_name))
+                    continue; /// skip keys
+                const auto & attr = dictionary_structure.getAttribute(attr_name);
+                attribute_names.emplace_back(attr.name);
+                result_types.emplace_back(attr.type);
+            }
+        }
+        else
+        {
+            /// If result_names is empty, then use all attributes from dictionary_structure
+            for (const auto & attr : dictionary_structure.attributes)
+            {
+                attribute_names.emplace_back(attr.name);
+                result_types.emplace_back(attr.type);
+            }
+        }
+
+        Columns default_cols(result_types.size());
+        for (size_t i = 0; i < result_types.size(); ++i)
+            /// Dictinonary may have non-standart default values specified
+            default_cols[i] = result_types[i]->createColumnConstWithDefaultValue(out_null_map.size());
+
+        Columns result_columns = getColumns(attribute_names, result_types, key_columns, key_types, default_cols);
+
+        /// Result block should consist of key columns and then attributes
+        for (const auto & key_col : key_columns)
+        {
+            /// Insert default values for keys that were not found
+            ColumnPtr filtered_key_col = JoinCommon::filterWithBlanks(key_col, out_null_map);
+            result_columns.insert(result_columns.begin(), filtered_key_col);
+        }
+
+        size_t num_rows = result_columns[0]->size();
+        return Chunk(std::move(result_columns), num_rows);
+    }
+
+    Block getSampleBlock(const Names & result_names) const override
+    {
+        const auto & dictionary_structure = getStructure();
+        const auto & key_types = dictionary_structure.getKeyTypes();
+        const auto & key_names = dictionary_structure.getKeysNames();
+
+        Block sample_block;
+
+        for (size_t i = 0; i < key_types.size(); ++i)
+            sample_block.insert(ColumnWithTypeAndName(nullptr, key_types.at(i), key_names.at(i)));
+
+        if (result_names.empty())
+        {
+            for (const auto & attr : dictionary_structure.attributes)
+                sample_block.insert(ColumnWithTypeAndName(nullptr, attr.type, attr.name));
+        }
+        else
+        {
+            for (const auto & attr_name : result_names)
+            {
+                if (!dictionary_structure.hasAttribute(attr_name))
+                    continue; /// skip keys
+                const auto & attr = dictionary_structure.getAttribute(attr_name);
+                sample_block.insert(ColumnWithTypeAndName(nullptr, attr.type, attr_name));
+            }
+        }
+        return sample_block;
+    }
+
 private:
     mutable std::mutex mutex;
     mutable StorageID dictionary_id TSA_GUARDED_BY(mutex);
diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 74e96cb5e30..b3a4b862be8 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -19,7 +19,6 @@
 #include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
 #include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
 
 #include <Storages/MergeTree/MergeTreeData.h>
 
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
index f58e91669c4..cbfcbdf7b88 100644
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
@@ -2,8 +2,8 @@
 
 #include <Common/Stopwatch.h>
 #include <Common/logger_useful.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <IO/ReadSettings.h>
 
 
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
index 3734509a605..b7738ee9cb9 100644
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
@@ -23,7 +23,7 @@ struct ReadSettings;
 *
 * Buffers chain for diskWeb:
 * AsynchronousIndirectReadBufferFromRemoteFS -> ReadBufferFromRemoteFS ->
-* -> ReadIndirectBufferFromWebServer -> ReadBufferFromHttp -> ReadBufferFromIStream.
+* -> ReadIndirectBufferFromWebServer -> ReadBufferFromHTTP -> ReadBufferFromIStream.
 *
 * We pass either `memory` or `prefetch_buffer` through all this chain and return it back.
 */
diff --git a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp b/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
index a3d5cfc408d..a10e136334e 100644
--- a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
@@ -1024,7 +1024,7 @@ std::optional<size_t> CachedReadBufferFromRemoteFS::getLastNonDownloadedOffset()
 
 void CachedReadBufferFromRemoteFS::assertCorrectness() const
 {
-    if (IFileCache::isReadOnly() && !settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
+    if (FileCache::isReadOnly() && !settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache usage is not allowed");
 }
 
diff --git a/src/Disks/IO/CachedReadBufferFromRemoteFS.h b/src/Disks/IO/CachedReadBufferFromRemoteFS.h
index aff29dd200c..7fe3af29ef7 100644
--- a/src/Disks/IO/CachedReadBufferFromRemoteFS.h
+++ b/src/Disks/IO/CachedReadBufferFromRemoteFS.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <IO/SeekableReadBuffer.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadSettings.h>
@@ -81,7 +81,7 @@ private:
     bool writeCache(char * data, size_t size, size_t offset, FileSegment & file_segment);
 
     Poco::Logger * log;
-    IFileCache::Key cache_key;
+    FileCache::Key cache_key;
     String remote_fs_object_path;
     FileCachePtr cache;
     ReadSettings settings;
@@ -128,7 +128,7 @@ private:
     CurrentMetrics::Increment metric_increment{CurrentMetrics::FilesystemCacheReadBuffers};
     ProfileEvents::Counters current_file_segment_counters;
 
-    IFileCache::QueryContextHolder query_context_holder;
+    FileCache::QueryContextHolder query_context_holder;
 
     bool is_persistent;
 };
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
index 3ac4ea07945..f21e2bd7642 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
@@ -35,7 +35,7 @@ ReadBufferFromRemoteFSGather::ReadBufferFromRemoteFSGather(
 
     with_cache = settings.remote_fs_cache
         && settings.enable_filesystem_cache
-        && (!IFileCache::isReadOnly() || settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache);
+        && (!FileCache::isReadOnly() || settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache);
 }
 
 SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(const String & path, size_t file_size)
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.cpp b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
index c534e59c710..0849a3f09e3 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -9,11 +9,9 @@
 #include <Common/createHardLink.h>
 #include <Common/quoteString.h>
 #include <Common/logger_useful.h>
-#include <Common/checkStackSize.h>
-#include <boost/algorithm/string.hpp>
 #include <Common/filesystemHelpers.h>
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.h>
 #include <Disks/ObjectStorages/DiskObjectStorageTransaction.h>
 #include <Disks/FakeDiskTransaction.h>
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
index b8ab2f49202..499791caf94 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
@@ -1,7 +1,7 @@
 #include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/FileCacheFactory.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileCacheSettings.h>
 #include <Interpreters/Context.h>
 
diff --git a/src/Disks/ObjectStorages/IObjectStorage.cpp b/src/Disks/ObjectStorages/IObjectStorage.cpp
index f3ac94768d8..4074b0f6908 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/IObjectStorage.cpp
@@ -4,6 +4,7 @@
 #include <IO/copyData.h>
 #include <Interpreters/Context.h>
 
+
 namespace DB
 {
 
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
index 1ab2d75ff86..69c1c31403d 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.h
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -16,6 +16,7 @@
 #include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
 #include <Disks/ObjectStorages/StoredObject.h>
 #include <Common/ThreadPool.h>
+#include <Common/FileCache.h>
 #include <Disks/WriteMode.h>
 
 
diff --git a/src/Disks/ObjectStorages/LocalObjectStorage.cpp b/src/Disks/ObjectStorages/LocalObjectStorage.cpp
index c052f2f0d77..af6dab0b8a6 100644
--- a/src/Disks/ObjectStorages/LocalObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/LocalObjectStorage.cpp
@@ -1,7 +1,7 @@
 #include <Disks/ObjectStorages/LocalObjectStorage.h>
 
 #include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileCacheFactory.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/logger_useful.h>
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index 25dafac4120..e017e19c06c 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -24,7 +24,7 @@
 #include <aws/s3/model/UploadPartCopyRequest.h>
 #include <aws/s3/model/AbortMultipartUploadRequest.h>
 
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileCacheFactory.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
@@ -128,7 +128,7 @@ void S3ObjectStorage::removeCacheIfExists(const std::string & path_key)
     if (!cache || path_key.empty())
         return;
 
-    IFileCache::Key key = cache->hash(path_key);
+    FileCache::Key key = cache->hash(path_key);
     cache->removeIfExists(key);
 }
 
@@ -500,7 +500,7 @@ ReadSettings S3ObjectStorage::patchSettings(const ReadSettings & read_settings)
     ReadSettings settings{read_settings};
     if (cache)
     {
-        if (IFileCache::isReadOnly())
+        if (FileCache::isReadOnly())
             settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
 
         settings.remote_fs_cache = cache;
diff --git a/src/Formats/EscapingRuleUtils.cpp b/src/Formats/EscapingRuleUtils.cpp
index 5aab8909a0c..a5c4dd1dd47 100644
--- a/src/Formats/EscapingRuleUtils.cpp
+++ b/src/Formats/EscapingRuleUtils.cpp
@@ -9,8 +9,12 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/getLeastSupertype.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeObject.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <DataTypes/transformTypesRecursively.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromString.h>
@@ -255,7 +259,220 @@ String readStringByEscapingRule(ReadBuffer & buf, FormatSettings::EscapingRule e
     return readByEscapingRule<true>(buf, escaping_rule, format_settings);
 }
 
-static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
+void transformInferredTypesIfNeededImpl(DataTypes & types, const FormatSettings & settings, bool is_json, const std::unordered_set<const IDataType *> * numbers_parsed_from_json_strings = nullptr)
+{
+    /// Do nothing if we didn't try to infer something special.
+    if (!settings.try_infer_integers && !settings.try_infer_dates && !settings.try_infer_datetimes && !is_json)
+        return;
+
+    auto transform_simple_types = [&](DataTypes & data_types)
+    {
+        /// If we have floats and integers convert them all to float.
+        if (settings.try_infer_integers)
+        {
+            bool have_floats = false;
+            bool have_integers = false;
+            for (const auto & type : data_types)
+            {
+                have_floats |= isFloat(type);
+                have_integers |= isInteger(type) && !isBool(type);
+            }
+
+            if (have_floats && have_integers)
+            {
+                for (auto & type : data_types)
+                {
+                    if (isInteger(type))
+                        type = std::make_shared<DataTypeFloat64>();
+                }
+            }
+        }
+
+        /// If we have only dates and datetimes, convert dates to datetime.
+        /// If we have date/datetimes and smth else, convert them to string, because
+        /// There is a special case when we inferred both Date/DateTime and Int64 from Strings,
+        /// for example: "arr: ["2020-01-01", "2000"]" -> Tuple(Date, Int64),
+        /// so if we have Date/DateTime and smth else (not only String) we should
+        /// convert Date/DateTime back to String, so then we will be able to
+        /// convert Int64 back to String as well.
+        if (settings.try_infer_dates || settings.try_infer_datetimes)
+        {
+            bool have_dates = false;
+            bool have_datetimes = false;
+            bool all_dates_or_datetimes = true;
+
+            for (const auto & type : data_types)
+            {
+                have_dates |= isDate(type);
+                have_datetimes |= isDateTime64(type);
+                all_dates_or_datetimes &= isDate(type) || isDateTime64(type);
+            }
+
+            if (!all_dates_or_datetimes && (have_dates || have_datetimes))
+            {
+                for (auto & type : data_types)
+                {
+                    if (isDate(type) || isDateTime64(type))
+                        type = std::make_shared<DataTypeString>();
+                }
+            }
+            else if (have_dates && have_datetimes)
+            {
+                for (auto & type : data_types)
+                {
+                    if (isDate(type))
+                        type = std::make_shared<DataTypeDateTime64>(9);
+                }
+            }
+        }
+
+        if (!is_json)
+            return;
+
+        /// Check settings specific for JSON formats.
+
+        /// If we have numbers and strings, convert numbers to strings.
+        if (settings.json.try_infer_numbers_from_strings)
+        {
+            bool have_strings = false;
+            bool have_numbers = false;
+            for (const auto & type : data_types)
+            {
+                have_strings |= isString(type);
+                have_numbers |= isNumber(type);
+            }
+
+            if (have_strings && have_numbers)
+            {
+                for (auto & type : data_types)
+                {
+                    if (isNumber(type) && (!numbers_parsed_from_json_strings || numbers_parsed_from_json_strings->contains(type.get())))
+                        type = std::make_shared<DataTypeString>();
+                }
+            }
+        }
+
+        if (settings.json.read_bools_as_numbers)
+        {
+            /// Note that have_floats and have_integers both cannot be
+            /// equal to true as in one of previous checks we convert
+            /// integers to floats if we have both.
+            bool have_floats = false;
+            bool have_integers = false;
+            bool have_bools = false;
+            for (const auto & type : data_types)
+            {
+                have_floats |= isFloat(type);
+                have_integers |= isInteger(type) && !isBool(type);
+                have_bools |= isBool(type);
+            }
+
+            if (have_bools && (have_integers || have_floats))
+            {
+                for (auto & type : data_types)
+                {
+                    if (isBool(type))
+                    {
+                        if (have_integers)
+                            type = std::make_shared<DataTypeInt64>();
+                        else
+                            type = std::make_shared<DataTypeFloat64>();
+                    }
+                }
+            }
+        }
+    };
+
+    auto transform_complex_types = [&](DataTypes & data_types)
+    {
+        if (!is_json)
+            return;
+
+        bool have_maps = false;
+        bool have_objects = false;
+        bool are_maps_equal = true;
+        DataTypePtr first_map_type;
+        for (const auto & type : data_types)
+        {
+            if (isMap(type))
+            {
+                if (!have_maps)
+                {
+                    first_map_type = type;
+                    have_maps = true;
+                }
+                else
+                {
+                    are_maps_equal &= type->equals(*first_map_type);
+                }
+            }
+            else if (isObject(type))
+            {
+                have_objects = true;
+            }
+        }
+
+        if (have_maps && (have_objects || !are_maps_equal))
+        {
+            for (auto & type : data_types)
+            {
+                if (isMap(type))
+                    type = std::make_shared<DataTypeObject>("json", true);
+            }
+        }
+    };
+
+    transformTypesRecursively(types, transform_simple_types, transform_complex_types);
+}
+
+void transformInferredTypesIfNeeded(DataTypes & types, const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule)
+{
+    transformInferredTypesIfNeededImpl(types, settings, escaping_rule == FormatSettings::EscapingRule::JSON);
+}
+
+void transformInferredTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule)
+{
+    DataTypes types = {first, second};
+    transformInferredTypesIfNeeded(types, settings, escaping_rule);
+    first = std::move(types[0]);
+    second = std::move(types[1]);
+}
+
+void transformInferredJSONTypesIfNeeded(DataTypes & types, const FormatSettings & settings, const std::unordered_set<const IDataType *> * numbers_parsed_from_json_strings)
+{
+    transformInferredTypesIfNeededImpl(types, settings, true, numbers_parsed_from_json_strings);
+}
+
+void transformInferredJSONTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings)
+{
+    DataTypes types = {first, second};
+    transformInferredJSONTypesIfNeeded(types, settings);
+    first = std::move(types[0]);
+    second = std::move(types[1]);
+}
+
+DataTypePtr tryInferDateOrDateTime(const std::string_view & field, const FormatSettings & settings)
+{
+    if (settings.try_infer_dates)
+    {
+        ReadBufferFromString buf(field);
+        DayNum tmp;
+        if (tryReadDateText(tmp, buf) && buf.eof())
+            return makeNullable(std::make_shared<DataTypeDate>());
+    }
+
+    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 nullptr;
+}
+
+static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBufferFromString & buf, const FormatSettings & settings)
 {
     if (buf.eof())
         return nullptr;
@@ -279,7 +496,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             else
                 first = false;
 
-            auto nested_type = determineDataTypeForSingleFieldImpl(buf);
+            auto nested_type = determineDataTypeForSingleFieldImpl(buf, settings);
             if (!nested_type)
                 return nullptr;
 
@@ -294,6 +511,8 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
         if (nested_types.empty())
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeNothing>());
 
+        transformInferredTypesIfNeeded(nested_types, settings);
+
         auto least_supertype = tryGetLeastSupertype(nested_types);
         if (!least_supertype)
             return nullptr;
@@ -320,7 +539,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             else
                 first = false;
 
-            auto nested_type = determineDataTypeForSingleFieldImpl(buf);
+            auto nested_type = determineDataTypeForSingleFieldImpl(buf, settings);
             if (!nested_type)
                 return nullptr;
 
@@ -355,7 +574,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             else
                 first = false;
 
-            auto key_type = determineDataTypeForSingleFieldImpl(buf);
+            auto key_type = determineDataTypeForSingleFieldImpl(buf, settings);
             if (!key_type)
                 return nullptr;
 
@@ -366,7 +585,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
                 return nullptr;
             skipWhitespaceIfAny(buf);
 
-            auto value_type = determineDataTypeForSingleFieldImpl(buf);
+            auto value_type = determineDataTypeForSingleFieldImpl(buf, settings);
             if (!value_type)
                 return nullptr;
 
@@ -382,6 +601,9 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
         if (key_types.empty())
             return std::make_shared<DataTypeMap>(std::make_shared<DataTypeNothing>(), std::make_shared<DataTypeNothing>());
 
+        transformInferredTypesIfNeeded(key_types, settings);
+        transformInferredTypesIfNeeded(value_types, settings);
+
         auto key_least_supertype = tryGetLeastSupertype(key_types);
 
         auto value_least_supertype = tryGetLeastSupertype(value_types);
@@ -398,9 +620,11 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
     if (*buf.position() == '\'')
     {
         ++buf.position();
+        String field;
         while (!buf.eof())
         {
             char * next_pos = find_first_symbols<'\\', '\''>(buf.position(), buf.buffer().end());
+            field.append(buf.position(), next_pos);
             buf.position() = next_pos;
 
             if (!buf.hasPendingData())
@@ -409,6 +633,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             if (*buf.position() == '\'')
                 break;
 
+            field.push_back(*buf.position());
             if (*buf.position() == '\\')
                 ++buf.position();
         }
@@ -417,6 +642,9 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             return nullptr;
 
         ++buf.position();
+        if (auto type = tryInferDateOrDateTime(field, settings))
+            return type;
+
         return std::make_shared<DataTypeString>();
     }
 
@@ -430,15 +658,29 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
 
     /// Number
     Float64 tmp;
+    auto * pos_before_float = buf.position();
     if (tryReadFloatText(tmp, buf))
+    {
+        if (settings.try_infer_integers)
+        {
+            auto * float_end_pos = buf.position();
+            buf.position() = pos_before_float;
+            Int64 tmp_int;
+            if (tryReadIntText(tmp_int, buf) && buf.position() == float_end_pos)
+                return std::make_shared<DataTypeInt64>();
+
+            buf.position() = float_end_pos;
+        }
+
         return std::make_shared<DataTypeFloat64>();
+    }
 
     return nullptr;
 }
 
-static DataTypePtr determineDataTypeForSingleField(ReadBuffer & buf)
+static DataTypePtr determineDataTypeForSingleField(ReadBufferFromString & buf, const FormatSettings & settings)
 {
-    return makeNullableRecursivelyAndCheckForNothing(determineDataTypeForSingleFieldImpl(buf));
+    return makeNullableRecursivelyAndCheckForNothing(determineDataTypeForSingleFieldImpl(buf, settings));
 }
 
 DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSettings & format_settings, FormatSettings::EscapingRule escaping_rule)
@@ -448,11 +690,11 @@ DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSe
         case FormatSettings::EscapingRule::Quoted:
         {
             ReadBufferFromString buf(field);
-            auto type = determineDataTypeForSingleField(buf);
+            auto type = determineDataTypeForSingleField(buf, format_settings);
             return buf.eof() ? type : nullptr;
         }
         case FormatSettings::EscapingRule::JSON:
-            return JSONUtils::getDataTypeFromField(field);
+            return JSONUtils::getDataTypeFromField(field, format_settings);
         case FormatSettings::EscapingRule::CSV:
         {
             if (!format_settings.csv.input_format_use_best_effort_in_schema_inference)
@@ -466,9 +708,13 @@ DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSe
 
             if (field.size() > 1 && ((field.front() == '\'' && field.back() == '\'') || (field.front() == '"' && field.back() == '"')))
             {
-                ReadBufferFromString buf(std::string_view(field.data() + 1, field.size() - 2));
+                auto data = std::string_view(field.data() + 1, field.size() - 2);
+                if (auto date_type = tryInferDateOrDateTime(data, format_settings))
+                    return date_type;
+
+                ReadBufferFromString buf(data);
                 /// Try to determine the type of value inside quotes
-                auto type = determineDataTypeForSingleField(buf);
+                auto type = determineDataTypeForSingleField(buf, format_settings);
 
                 if (!type)
                     return nullptr;
@@ -481,6 +727,14 @@ DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSe
             }
 
             /// Case when CSV value is not in quotes. Check if it's a number, and if not, determine it's as a string.
+            if (format_settings.try_infer_integers)
+            {
+                ReadBufferFromString buf(field);
+                Int64 tmp_int;
+                if (tryReadIntText(tmp_int, buf) && buf.eof())
+                    return makeNullable(std::make_shared<DataTypeInt64>());
+            }
+
             ReadBufferFromString buf(field);
             Float64 tmp;
             if (tryReadFloatText(tmp, buf) && buf.eof())
@@ -500,8 +754,11 @@ DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSe
             if (field == format_settings.bool_false_representation || field == format_settings.bool_true_representation)
                 return DataTypeFactory::instance().get("Nullable(Bool)");
 
+            if (auto date_type = tryInferDateOrDateTime(field, format_settings))
+                return date_type;
+
             ReadBufferFromString buf(field);
-            auto type = determineDataTypeForSingleField(buf);
+            auto type = determineDataTypeForSingleField(buf, format_settings);
             if (!buf.eof())
                 return makeNullable(std::make_shared<DataTypeString>());
 
diff --git a/src/Formats/EscapingRuleUtils.h b/src/Formats/EscapingRuleUtils.h
index 1ce04a8d1b7..ad4ce65a430 100644
--- a/src/Formats/EscapingRuleUtils.h
+++ b/src/Formats/EscapingRuleUtils.h
@@ -60,4 +60,21 @@ DataTypes determineDataTypesByEscapingRule(const std::vector<String> & fields, c
 DataTypePtr getDefaultDataTypeForEscapingRule(FormatSettings::EscapingRule escaping_rule);
 DataTypes getDefaultDataTypeForEscapingRules(const std::vector<FormatSettings::EscapingRule> & escaping_rules);
 
+/// Try to infer Date or Datetime from string if corresponding settings are enabled.
+DataTypePtr tryInferDateOrDateTime(const std::string_view & field, const FormatSettings & settings);
+
+/// Check if we need to transform types inferred from data and transform it if necessary.
+/// It's used when we try to infer some not ordinary types from another types.
+/// For example dates from strings, we should check if dates were inferred from all strings
+/// in the same way and if not, transform inferred dates back to strings.
+/// For example, if we have array of strings and we tried to infer dates from them,
+/// to make the result type Array(Date) we should ensure that all strings were
+/// successfully parsed as dated and if not, convert all dates back to strings and make result type Array(String).
+void transformInferredTypesIfNeeded(DataTypes & types, const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule = FormatSettings::EscapingRule::Escaped);
+void transformInferredTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule = FormatSettings::EscapingRule::Escaped);
+
+/// Same as transformInferredTypesIfNeeded but takes into account settings that are special for JSON formats.
+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);
+
 }
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 50d2ee12082..962a57bb512 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -94,6 +94,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.json.quote_64bit_integers = settings.output_format_json_quote_64bit_integers;
     format_settings.json.quote_denormals = settings.output_format_json_quote_denormals;
     format_settings.json.read_bools_as_numbers = settings.input_format_json_read_bools_as_numbers;
+    format_settings.json.try_infer_numbers_from_strings = settings.input_format_json_try_infer_numbers_from_strings;
     format_settings.null_as_default = settings.input_format_null_as_default;
     format_settings.decimal_trailing_zeros = settings.output_format_decimal_trailing_zeros;
     format_settings.parquet.row_group_size = settings.output_format_parquet_row_group_size;
@@ -165,6 +166,9 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.sql_insert.table_name = settings.output_format_sql_insert_table_name;
     format_settings.sql_insert.use_replace = settings.output_format_sql_insert_use_replace;
     format_settings.sql_insert.quote_names = settings.output_format_sql_insert_quote_names;
+    format_settings.try_infer_integers = settings.input_format_try_infer_integers;
+    format_settings.try_infer_dates = settings.input_format_try_infer_dates;
+    format_settings.try_infer_datetimes = settings.input_format_try_infer_datetimes;
 
     /// Validate avro_schema_registry_url with RemoteHostFilter when non-empty and in Server context
     if (format_settings.schema.is_server)
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index b7c55d11beb..c240d9bcb01 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -38,6 +38,9 @@ struct FormatSettings
     UInt64 max_rows_to_read_for_schema_inference = 100;
 
     String column_names_for_schema_inference;
+    bool try_infer_integers = false;
+    bool try_infer_dates = false;
+    bool try_infer_datetimes = false;
 
     enum class DateTimeInputFormat
     {
@@ -142,6 +145,7 @@ struct FormatSettings
         bool named_tuples_as_objects = false;
         bool serialize_as_strings = false;
         bool read_bools_as_numbers = true;
+        bool try_infer_numbers_from_strings = false;
     } json;
 
     struct
diff --git a/src/Formats/JSONUtils.cpp b/src/Formats/JSONUtils.cpp
index 7c94b122096..895833abf4d 100644
--- a/src/Formats/JSONUtils.cpp
+++ b/src/Formats/JSONUtils.cpp
@@ -1,6 +1,7 @@
 #include <IO/ReadHelpers.h>
 #include <Formats/JSONUtils.h>
 #include <Formats/ReadSchemaUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferValidUTF8.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
@@ -121,7 +122,7 @@ namespace JSONUtils
     }
 
     template <class Element>
-    DataTypePtr getDataTypeFromFieldImpl(const Element & field)
+    DataTypePtr getDataTypeFromFieldImpl(const Element & field, const FormatSettings & settings, std::unordered_set<const IDataType *> & numbers_parsed_from_json_strings)
     {
         if (field.isNull())
             return nullptr;
@@ -129,11 +130,48 @@ namespace JSONUtils
         if (field.isBool())
             return DataTypeFactory::instance().get("Nullable(Bool)");
 
-        if (field.isInt64() || field.isUInt64() || field.isDouble())
+        if (field.isInt64() || field.isUInt64())
+        {
+            if (settings.try_infer_integers)
+                return makeNullable(std::make_shared<DataTypeInt64>());
+
+            return makeNullable(std::make_shared<DataTypeFloat64>());
+        }
+
+        if (field.isDouble())
             return makeNullable(std::make_shared<DataTypeFloat64>());
 
         if (field.isString())
+        {
+            if (auto date_type = tryInferDateOrDateTime(field.getString(), settings))
+                return date_type;
+
+            if (!settings.json.try_infer_numbers_from_strings)
+                return makeNullable(std::make_shared<DataTypeString>());
+
+            ReadBufferFromString buf(field.getString());
+
+            if (settings.try_infer_integers)
+            {
+                Int64 tmp_int;
+                if (tryReadIntText(tmp_int, buf) && buf.eof())
+                {
+                    auto type = std::make_shared<DataTypeInt64>();
+                    numbers_parsed_from_json_strings.insert(type.get());
+                    return makeNullable(type);
+                }
+            }
+
+            Float64 tmp;
+            if (tryReadFloatText(tmp, buf) && buf.eof())
+            {
+                auto type = std::make_shared<DataTypeFloat64>();
+                numbers_parsed_from_json_strings.insert(type.get());
+                return makeNullable(type);
+            }
+
             return makeNullable(std::make_shared<DataTypeString>());
+        }
 
         if (field.isArray())
         {
@@ -145,20 +183,32 @@ namespace JSONUtils
 
             DataTypes nested_data_types;
             /// If this array contains fields with different types we will treat it as Tuple.
-            bool is_tuple = false;
+            bool are_types_the_same = true;
             for (const auto element : array)
             {
-                auto type = getDataTypeFromFieldImpl(element);
+                auto type = getDataTypeFromFieldImpl(element, settings, numbers_parsed_from_json_strings);
                 if (!type)
                     return nullptr;
 
-                if (!nested_data_types.empty() && type->getName() != nested_data_types.back()->getName())
-                    is_tuple = true;
+                if (!nested_data_types.empty() && !type->equals(*nested_data_types.back()))
+                    are_types_the_same = false;
 
                 nested_data_types.push_back(std::move(type));
             }
 
-            if (is_tuple)
+            if (!are_types_the_same)
+            {
+                auto nested_types_copy = nested_data_types;
+                transformInferredJSONTypesIfNeeded(nested_types_copy, settings, &numbers_parsed_from_json_strings);
+                are_types_the_same = true;
+                for (size_t i = 1; i < nested_types_copy.size(); ++i)
+                    are_types_the_same &= nested_types_copy[i]->equals(*nested_types_copy[i - 1]);
+
+                if (are_types_the_same)
+                    nested_data_types = std::move(nested_types_copy);
+            }
+
+            if (!are_types_the_same)
                 return std::make_shared<DataTypeTuple>(nested_data_types);
 
             return std::make_shared<DataTypeArray>(nested_data_types.back());
@@ -167,38 +217,35 @@ namespace JSONUtils
         if (field.isObject())
         {
             auto object = field.getObject();
-            DataTypePtr value_type;
-            bool is_object = false;
+            DataTypes value_types;
+            bool have_object_value = false;
             for (const auto key_value_pair : object)
             {
-                auto type = getDataTypeFromFieldImpl(key_value_pair.second);
+                auto type = getDataTypeFromFieldImpl(key_value_pair.second, settings, numbers_parsed_from_json_strings);
                 if (!type)
                     continue;
 
                 if (isObject(type))
                 {
-                    is_object = true;
+                    have_object_value = true;
                     break;
                 }
 
-                if (!value_type)
-                {
-                    value_type = type;
-                }
-                else if (!value_type->equals(*type))
-                {
-                    is_object = true;
-                    break;
-                }
+                value_types.push_back(type);
             }
 
-            if (is_object)
+            if (value_types.empty())
+                return nullptr;
+
+            transformInferredJSONTypesIfNeeded(value_types, settings, &numbers_parsed_from_json_strings);
+            bool are_types_equal = true;
+            for (size_t i = 1; i < value_types.size(); ++i)
+                are_types_equal &= value_types[i]->equals(*value_types[0]);
+
+            if (have_object_value || !are_types_equal)
                 return std::make_shared<DataTypeObject>("json", true);
 
-            if (value_type)
-                return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), value_type);
-
-            return nullptr;
+            return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), value_types[0]);
         }
 
         throw Exception{ErrorCodes::INCORRECT_DATA, "Unexpected JSON type"};
@@ -215,18 +262,19 @@ namespace JSONUtils
 #endif
     }
 
-    DataTypePtr getDataTypeFromField(const String & field)
+    DataTypePtr getDataTypeFromField(const String & field, const FormatSettings & settings)
     {
         auto [parser, element] = getJSONParserAndElement();
         bool parsed = parser.parse(field, element);
         if (!parsed)
             throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse JSON object here: {}", field);
 
-        return getDataTypeFromFieldImpl(element);
+        std::unordered_set<const IDataType *> numbers_parsed_from_json_strings;
+        return getDataTypeFromFieldImpl(element, settings, numbers_parsed_from_json_strings);
     }
 
     template <class Extractor, const char opening_bracket, const char closing_bracket>
-    static DataTypes determineColumnDataTypesFromJSONEachRowDataImpl(ReadBuffer & in, bool /*json_strings*/, Extractor & extractor)
+    static DataTypes determineColumnDataTypesFromJSONEachRowDataImpl(ReadBuffer & in, const FormatSettings & settings, bool /*json_strings*/, Extractor & extractor)
     {
         String line = readJSONEachRowLineIntoStringImpl<opening_bracket, closing_bracket>(in);
         auto [parser, element] = getJSONParserAndElement();
@@ -238,8 +286,9 @@ namespace JSONUtils
 
         DataTypes data_types;
         data_types.reserve(fields.size());
+        std::unordered_set<const IDataType *> numbers_parsed_from_json_strings;
         for (const auto & field : fields)
-            data_types.push_back(getDataTypeFromFieldImpl(field));
+            data_types.push_back(getDataTypeFromFieldImpl(field, settings, numbers_parsed_from_json_strings));
 
         /// TODO: For JSONStringsEachRow/JSONCompactStringsEach all types will be strings.
         ///       Should we try to parse data inside strings somehow in this case?
@@ -284,11 +333,11 @@ namespace JSONUtils
         std::vector<String> column_names;
     };
 
-    NamesAndTypesList readRowAndGetNamesAndDataTypesForJSONEachRow(ReadBuffer & in, bool json_strings)
+    NamesAndTypesList readRowAndGetNamesAndDataTypesForJSONEachRow(ReadBuffer & in, const FormatSettings & settings, bool json_strings)
     {
         JSONEachRowFieldsExtractor extractor;
         auto data_types
-            = determineColumnDataTypesFromJSONEachRowDataImpl<JSONEachRowFieldsExtractor, '{', '}'>(in, json_strings, extractor);
+            = determineColumnDataTypesFromJSONEachRowDataImpl<JSONEachRowFieldsExtractor, '{', '}'>(in, settings, json_strings, extractor);
         NamesAndTypesList result;
         for (size_t i = 0; i != extractor.column_names.size(); ++i)
             result.emplace_back(extractor.column_names[i], data_types[i]);
@@ -313,10 +362,10 @@ namespace JSONUtils
         }
     };
 
-    DataTypes readRowAndGetDataTypesForJSONCompactEachRow(ReadBuffer & in, bool json_strings)
+    DataTypes readRowAndGetDataTypesForJSONCompactEachRow(ReadBuffer & in, const FormatSettings & settings, bool json_strings)
     {
         JSONCompactEachRowFieldsExtractor extractor;
-        return determineColumnDataTypesFromJSONEachRowDataImpl<JSONCompactEachRowFieldsExtractor, '[', ']'>(in, json_strings, extractor);
+        return determineColumnDataTypesFromJSONEachRowDataImpl<JSONCompactEachRowFieldsExtractor, '[', ']'>(in, settings, json_strings, extractor);
     }
 
 
diff --git a/src/Formats/JSONUtils.h b/src/Formats/JSONUtils.h
index f2aba3cbcb5..b4ab6a29c93 100644
--- a/src/Formats/JSONUtils.h
+++ b/src/Formats/JSONUtils.h
@@ -22,16 +22,16 @@ namespace JSONUtils
     /// Parse JSON from string and convert it's type to ClickHouse type. Make the result type always Nullable.
     /// JSON array with different nested types is treated as Tuple.
     /// If cannot convert (for example when field contains null), return nullptr.
-    DataTypePtr getDataTypeFromField(const String & field);
+    DataTypePtr getDataTypeFromField(const String & field, const FormatSettings & settings);
 
     /// Read row in JSONEachRow format and try to determine type for each field.
     /// Return list of names and types.
     /// If cannot determine the type of some field, return nullptr for it.
-    NamesAndTypesList readRowAndGetNamesAndDataTypesForJSONEachRow(ReadBuffer & in, bool json_strings);
+    NamesAndTypesList readRowAndGetNamesAndDataTypesForJSONEachRow(ReadBuffer & in, const FormatSettings & settings, bool json_strings);
 
     /// Read row in JSONCompactEachRow format and try to determine type for each field.
     /// If cannot determine the type of some field, return nullptr for it.
-    DataTypes readRowAndGetDataTypesForJSONCompactEachRow(ReadBuffer & in, bool json_strings);
+    DataTypes readRowAndGetDataTypesForJSONCompactEachRow(ReadBuffer & in, const FormatSettings & settings, bool json_strings);
 
     bool nonTrivialPrefixAndSuffixCheckerJSONEachRowImpl(ReadBuffer & buf);
 
diff --git a/src/Formats/ReadSchemaUtils.cpp b/src/Formats/ReadSchemaUtils.cpp
index 058f9b7059b..5ae21340864 100644
--- a/src/Formats/ReadSchemaUtils.cpp
+++ b/src/Formats/ReadSchemaUtils.cpp
@@ -88,8 +88,13 @@ ColumnsDescription readSchemaFromFormat(
             catch (...)
             {
                 auto exception_message = getCurrentExceptionMessage(false);
-                throw Exception(ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE, "Cannot extract table structure from {} format file: {}. You can specify the structure manually", format_name, exception_message);
+                throw Exception(
+                    ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                    "Cannot extract table structure from {} format file:\n{}\nYou can specify the structure manually",
+                    format_name,
+                    exception_message);
             }
+
             ++iterations;
 
             if (is_eof)
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 4aaaf37e6cf..fa13008f352 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -39,6 +39,7 @@
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
+#include <Interpreters/Context.h>
 
 #if USE_EMBEDDED_COMPILER
 #    pragma GCC diagnostic push
@@ -1179,6 +1180,21 @@ public:
                 {
                     if constexpr (IsDataTypeDecimal<LeftDataType> && IsDataTypeDecimal<RightDataType>)
                     {
+                        if constexpr (is_division)
+                        {
+                            if (context->getSettingsRef().decimal_check_overflow)
+                            {
+                                /// Check overflow by using operands scale (based on big decimal division implementation details):
+                                /// big decimal arithmetic is based on big integers, decimal operands are converted to big integers
+                                /// i.e. int_operand = decimal_operand*10^scale
+                                /// For division, left operand will be scaled by right operand scale also to do big integer division,
+                                /// BigInt result = left*10^(left_scale + right_scale) / right * 10^right_scale
+                                /// So, we can check upfront possible overflow just by checking max scale used for left operand
+                                /// Note: it doesn't detect all possible overflow during big decimal division
+                                if (left.getScale() + right.getScale() > ResultDataType::maxPrecision())
+                                    throw Exception("Overflow during decimal division", ErrorCodes::DECIMAL_OVERFLOW);
+                            }
+                        }
                         ResultDataType result_type = decimalResultType<is_multiply, is_division>(left, right);
                         type_res = std::make_shared<ResultDataType>(result_type.getPrecision(), result_type.getScale());
                     }
diff --git a/src/Functions/FunctionHashID.h b/src/Functions/FunctionHashID.h
index 30f08c96eca..e469381a784 100644
--- a/src/Functions/FunctionHashID.h
+++ b/src/Functions/FunctionHashID.h
@@ -52,6 +52,7 @@ public:
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2, 3}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
@@ -69,7 +70,7 @@ public:
         if (arguments.size() > 1)
         {
             const auto & hash_col = arguments[1];
-            if (!isString(hash_col.type) || !isColumnConst(*hash_col.column.get()))
+            if (!isString(hash_col.type))
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Second argument of function {} must be String, got {}",
@@ -80,7 +81,7 @@ public:
         if (arguments.size() > 2)
         {
             const auto & min_length_col = arguments[2];
-            if (!isUInt8(min_length_col.type) || !isColumnConst(*min_length_col.column.get()))
+            if (!isUInt8(min_length_col.type))
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Third argument of function {} must be UInt8, got {}",
@@ -91,7 +92,7 @@ public:
         if (arguments.size() > 3)
         {
             const auto & alphabet_col = arguments[3];
-            if (!isString(alphabet_col.type) || !isColumnConst(*alphabet_col.column.get()))
+            if (!isString(alphabet_col.type))
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Fourth argument of function {} must be String, got {}",
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index b12fcc00014..0d8e5a5546a 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -167,8 +167,8 @@ private:
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
                 {"mode", &isStringOrFixedString<IDataType>, isColumnConst, "encryption mode string"},
-                {"input", &isStringOrFixedString<IDataType>, nullptr, "plaintext"},
-                {"key", &isStringOrFixedString<IDataType>, nullptr, "encryption key binary string"},
+                {"input", &isStringOrFixedString<IDataType>, {}, "plaintext"},
+                {"key", &isStringOrFixedString<IDataType>, {}, "encryption key binary string"},
             },
             optional_args
         );
@@ -439,8 +439,8 @@ private:
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
                 {"mode", &isStringOrFixedString<IDataType>, isColumnConst, "decryption mode string"},
-                {"input", nullptr, nullptr, "ciphertext"},
-                {"key", &isStringOrFixedString<IDataType>, nullptr, "decryption key binary string"},
+                {"input", &isStringOrFixedString<IDataType>, {}, "ciphertext"},
+                {"key", &isStringOrFixedString<IDataType>, {}, "decryption key binary string"},
             },
             optional_args
         );
diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index ae6ad0a6034..dc0235f810f 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -103,6 +103,9 @@ REGISTER_FUNCTION(Conversion)
     factory.registerFunction<FunctionParseDateTime64BestEffort>();
     factory.registerFunction<FunctionParseDateTime64BestEffortOrZero>();
     factory.registerFunction<FunctionParseDateTime64BestEffortOrNull>();
+    factory.registerFunction<FunctionParseDateTime64BestEffortUS>();
+    factory.registerFunction<FunctionParseDateTime64BestEffortUSOrZero>();
+    factory.registerFunction<FunctionParseDateTime64BestEffortUSOrNull>();
 
     factory.registerFunction<FunctionConvert<DataTypeInterval, NameToIntervalNanosecond, PositiveMonotonicity>>();
     factory.registerFunction<FunctionConvert<DataTypeInterval, NameToIntervalMicrosecond, PositiveMonotonicity>>();
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 014ce98a795..d888a181d7a 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -599,8 +599,9 @@ template <typename Name> struct ConvertImpl<DataTypeFloat32, DataTypeDateTime, N
 template <typename Name> struct ConvertImpl<DataTypeFloat64, DataTypeDateTime, Name>
     : DateTimeTransformImpl<DataTypeFloat64, DataTypeDateTime, ToDateTimeTransform64Signed<Float64, UInt32>> {};
 
-const time_t LUT_MIN_TIME = -1420070400l;       // 1925-01-01 UTC
-const time_t LUT_MAX_TIME = 9877248000l;        // 2282-12-31 UTC
+const time_t LUT_MIN_TIME = -2208988800l;           //  1900-01-01 UTC
+
+const time_t LUT_MAX_TIME = 10413791999l;           // 2299-12-31 UTC
 
 /** Conversion of numeric to DateTime64
   */
@@ -1336,9 +1337,18 @@ struct ConvertThroughParsing
                 }
                 else if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
                 {
-                    time_t res;
-                    parsed = tryParseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
-                    convertFromTime<ToDataType>(vec_to[i],res);
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 res = 0;
+                        parsed = tryParseDateTime64BestEffortUS(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
+                        vec_to[i] = res;
+                    }
+                    else
+                    {
+                        time_t res;
+                        parsed = tryParseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
+                        convertFromTime<ToDataType>(vec_to[i],res);
+                    }
                 }
                 else
                 {
@@ -2525,6 +2535,9 @@ struct NameParseDateTime32BestEffortOrNull { static constexpr auto name = "parse
 struct NameParseDateTime64BestEffort { static constexpr auto name = "parseDateTime64BestEffort"; };
 struct NameParseDateTime64BestEffortOrZero { static constexpr auto name = "parseDateTime64BestEffortOrZero"; };
 struct NameParseDateTime64BestEffortOrNull { static constexpr auto name = "parseDateTime64BestEffortOrNull"; };
+struct NameParseDateTime64BestEffortUS { static constexpr auto name = "parseDateTime64BestEffortUS"; };
+struct NameParseDateTime64BestEffortUSOrZero { static constexpr auto name = "parseDateTime64BestEffortUSOrZero"; };
+struct NameParseDateTime64BestEffortUSOrNull { static constexpr auto name = "parseDateTime64BestEffortUSOrNull"; };
 
 
 using FunctionParseDateTimeBestEffort = FunctionConvertFromString<
@@ -2555,6 +2568,14 @@ using FunctionParseDateTime64BestEffortOrZero = FunctionConvertFromString<
 using FunctionParseDateTime64BestEffortOrNull = FunctionConvertFromString<
     DataTypeDateTime64, NameParseDateTime64BestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
 
+using FunctionParseDateTime64BestEffortUS = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUS, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTime64BestEffortUSOrZero = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUSOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTime64BestEffortUSOrNull = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUSOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffortUS>;
+
+
 class ExecutableFunctionCast : public IExecutableFunction
 {
 public:
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index 5be2ea3c5e3..c1c6606e40f 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -2,7 +2,6 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <Common/LRUCache.h>
 #include <Common/SipHash.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
diff --git a/src/Functions/MatchImpl.h b/src/Functions/MatchImpl.h
index 78ce2627c35..d5465dc3498 100644
--- a/src/Functions/MatchImpl.h
+++ b/src/Functions/MatchImpl.h
@@ -476,8 +476,7 @@ struct MatchImpl
             }
             else
             {
-                cache.getOrSet<is_like, /*no_capture*/ true, case_insensitive>(needle, regexp);
-
+                regexp = cache.getOrSet<is_like, /*no_capture*/ true, case_insensitive>(needle);
                 regexp->getAnalyzeResult(required_substr, is_trivial, required_substring_is_prefix);
 
                 if (required_substr.empty())
@@ -589,8 +588,7 @@ struct MatchImpl
             }
             else
             {
-                cache.getOrSet<is_like, /*no_capture*/ true, case_insensitive>(needle, regexp);
-
+                regexp = cache.getOrSet<is_like, /*no_capture*/ true, case_insensitive>(needle);
                 regexp->getAnalyzeResult(required_substr, is_trivial, required_substring_is_prefix);
 
                 if (required_substr.empty())
diff --git a/src/Functions/MultiMatchAllIndicesImpl.h b/src/Functions/MultiMatchAllIndicesImpl.h
index 5c5de846a3f..e19d1691c6a 100644
--- a/src/Functions/MultiMatchAllIndicesImpl.h
+++ b/src/Functions/MultiMatchAllIndicesImpl.h
@@ -86,9 +86,10 @@ struct MultiMatchAllIndicesImpl
             return;
         }
 
-        const auto & hyperscan_regex = MultiRegexps::get</*SaveIndices=*/true, WithEditDistance>(needles, edit_distance);
+        MultiRegexps::DeferredConstructedRegexpsPtr deferred_constructed_regexps = MultiRegexps::getOrSet</*SaveIndices*/ true, WithEditDistance>(needles, edit_distance);
+        MultiRegexps::Regexps * regexps = deferred_constructed_regexps->get();
         hs_scratch_t * scratch = nullptr;
-        hs_error_t err = hs_clone_scratch(hyperscan_regex->getScratch(), &scratch);
+        hs_error_t err = hs_clone_scratch(regexps->getScratch(), &scratch);
 
         if (err != HS_SUCCESS)
             throw Exception("Could not clone scratch space for hyperscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@@ -114,7 +115,7 @@ struct MultiMatchAllIndicesImpl
                 throw Exception("Too long string to search", ErrorCodes::TOO_MANY_BYTES);
             /// scan, check, update the offsets array and the offset of haystack.
             err = hs_scan(
-                hyperscan_regex->getDB(),
+                regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + offset,
                 length,
                 0,
@@ -197,9 +198,10 @@ struct MultiMatchAllIndicesImpl
 
             checkHyperscanRegexp(needles, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
 
-            const auto & hyperscan_regex = MultiRegexps::get</*SaveIndices=*/true, WithEditDistance>(needles, edit_distance);
+            MultiRegexps::DeferredConstructedRegexpsPtr deferred_constructed_regexps = MultiRegexps::getOrSet</*SaveIndices*/ true, WithEditDistance>(needles, edit_distance);
+            MultiRegexps::Regexps * regexps = deferred_constructed_regexps->get();
             hs_scratch_t * scratch = nullptr;
-            hs_error_t err = hs_clone_scratch(hyperscan_regex->getScratch(), &scratch);
+            hs_error_t err = hs_clone_scratch(regexps->getScratch(), &scratch);
 
             if (err != HS_SUCCESS)
                 throw Exception("Could not clone scratch space for hyperscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@@ -224,7 +226,7 @@ struct MultiMatchAllIndicesImpl
 
             /// scan, check, update the offsets array and the offset of haystack.
             err = hs_scan(
-                hyperscan_regex->getDB(),
+                regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + prev_haystack_offset,
                 cur_haystack_length,
                 0,
diff --git a/src/Functions/MultiMatchAnyImpl.h b/src/Functions/MultiMatchAnyImpl.h
index 0490a81d707..a5d5a354290 100644
--- a/src/Functions/MultiMatchAnyImpl.h
+++ b/src/Functions/MultiMatchAnyImpl.h
@@ -100,9 +100,11 @@ struct MultiMatchAnyImpl
             return;
         }
 #if USE_VECTORSCAN
-        const auto & hyperscan_regex = MultiRegexps::get</*SaveIndices*/ FindAnyIndex, WithEditDistance>(needles, edit_distance);
+        MultiRegexps::DeferredConstructedRegexpsPtr deferred_constructed_regexps = MultiRegexps::getOrSet</*SaveIndices*/ FindAnyIndex, WithEditDistance>(needles, edit_distance);
+        MultiRegexps::Regexps * regexps = deferred_constructed_regexps->get();
+
         hs_scratch_t * scratch = nullptr;
-        hs_error_t err = hs_clone_scratch(hyperscan_regex->getScratch(), &scratch);
+        hs_error_t err = hs_clone_scratch(regexps->getScratch(), &scratch);
 
         if (err != HS_SUCCESS)
             throw Exception("Could not clone scratch space for vectorscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@@ -133,7 +135,7 @@ struct MultiMatchAnyImpl
             /// zero the result, scan, check, update the offset.
             res[i] = 0;
             err = hs_scan(
-                hyperscan_regex->getDB(),
+                regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + offset,
                 length,
                 0,
@@ -155,7 +157,7 @@ struct MultiMatchAnyImpl
         memset(accum.data(), 0, accum.size());
         for (size_t j = 0; j < needles.size(); ++j)
         {
-            MatchImpl<Name, MatchTraits::Syntax::Re2, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>::vectorConstant(haystack_data, haystack_offsets, std::string(needles[j].data(), needles[j].size()), nullptr, accum);
+            MatchImpl<Name, MatchTraits::Syntax::Re2, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>::vectorConstant(haystack_data, haystack_offsets, String(needles[j].data(), needles[j].size()), nullptr, accum);
             for (size_t i = 0; i < res.size(); ++i)
             {
                 if constexpr (FindAny)
@@ -224,9 +226,10 @@ struct MultiMatchAnyImpl
 
             checkHyperscanRegexp(needles, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
 
-            const auto & hyperscan_regex = MultiRegexps::get</*SaveIndices*/ FindAnyIndex, WithEditDistance>(needles, edit_distance);
+            MultiRegexps::DeferredConstructedRegexpsPtr deferred_constructed_regexps = MultiRegexps::getOrSet</*SaveIndices*/ FindAnyIndex, WithEditDistance>(needles, edit_distance);
+            MultiRegexps::Regexps * regexps = deferred_constructed_regexps->get();
             hs_scratch_t * scratch = nullptr;
-            hs_error_t err = hs_clone_scratch(hyperscan_regex->getScratch(), &scratch);
+            hs_error_t err = hs_clone_scratch(regexps->getScratch(), &scratch);
 
             if (err != HS_SUCCESS)
                 throw Exception("Could not clone scratch space for vectorscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@@ -256,7 +259,7 @@ struct MultiMatchAnyImpl
             /// zero the result, scan, check, update the offset.
             res[i] = 0;
             err = hs_scan(
-                hyperscan_regex->getDB(),
+                regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + prev_haystack_offset,
                 cur_haystack_length,
                 0,
diff --git a/src/Functions/Regexps.h b/src/Functions/Regexps.h
index b932b14a6a9..08c819fae99 100644
--- a/src/Functions/Regexps.h
+++ b/src/Functions/Regexps.h
@@ -12,7 +12,9 @@
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/ProfileEvents.h>
 #include <Common/config.h>
+#include <base/defines.h>
 #include <base/StringRef.h>
+#include <boost/container_hash/hash.hpp>
 
 #include "config_functions.h"
 
@@ -41,7 +43,7 @@ using Regexp = OptimizedRegularExpressionSingleThreaded;
 using RegexpPtr = std::shared_ptr<Regexp>;
 
 template <bool like, bool no_capture, bool case_insensitive>
-inline Regexp createRegexp(const std::string & pattern)
+inline Regexp createRegexp(const String & pattern)
 {
     int flags = OptimizedRegularExpression::RE_DOT_NL;
     if constexpr (no_capture)
@@ -66,39 +68,32 @@ public:
     using RegexpPtr = std::shared_ptr<Regexp>;
 
     template <bool like, bool no_capture, bool case_insensitive>
-    void getOrSet(const String & pattern, RegexpPtr & regexp)
+    RegexpPtr getOrSet(const String & pattern)
     {
-        StringAndRegexp & bucket = known_regexps[hasher(pattern) % max_regexp_cache_size];
+        Bucket & bucket = known_regexps[hasher(pattern) % CACHE_SIZE];
 
-        if (likely(bucket.regexp != nullptr))
-        {
-            if (pattern == bucket.pattern)
-                regexp = bucket.regexp;
-            else
-            {
-                regexp = std::make_shared<Regexp>(createRegexp<like, no_capture, case_insensitive>(pattern));
-                bucket = {pattern, regexp};
-            }
-        }
+        if (bucket.regexp == nullptr) [[unlikely]]
+            /// insert new entry
+            bucket = {pattern, std::make_shared<Regexp>(createRegexp<like, no_capture, case_insensitive>(pattern))};
         else
-        {
-            regexp = std::make_shared<Regexp>(createRegexp<like, no_capture, case_insensitive>(pattern));
-            bucket = {pattern, regexp};
-        }
+            if (pattern != bucket.pattern)
+                /// replace existing entry
+                bucket = {pattern, std::make_shared<Regexp>(createRegexp<like, no_capture, case_insensitive>(pattern))};
+
+        return bucket.regexp;
     }
 
 private:
-    constexpr static size_t max_regexp_cache_size = 100; // collision probability
+    constexpr static size_t CACHE_SIZE = 100; /// collision probability
 
-    std::hash<std::string> hasher;
-    struct StringAndRegexp
+    std::hash<String> hasher;
+    struct Bucket
     {
-        std::string pattern;
-        RegexpPtr regexp;
+        String pattern;   /// key
+        RegexpPtr regexp; /// value
     };
-    using CacheTable = std::array<StringAndRegexp, max_regexp_cache_size>;
+    using CacheTable = std::array<Bucket, CACHE_SIZE>;
     CacheTable known_regexps;
-
 };
 
 }
@@ -136,35 +131,29 @@ private:
     ScratchPtr scratch;
 };
 
-class RegexpsConstructor
+class DeferredConstructedRegexps
 {
 public:
-    RegexpsConstructor() = default;
+    explicit DeferredConstructedRegexps(std::function<Regexps()> constructor_)
+        : constructor(std::move(constructor_))
+    {}
 
-    void setConstructor(std::function<Regexps()> constructor_) { constructor = std::move(constructor_); }
-
-    Regexps * operator()()
+    Regexps * get()
     {
         std::lock_guard lock(mutex);
-        if (regexp)
-            return &*regexp;
-        regexp = constructor();
-        return &*regexp;
+        if (regexps)
+            return &*regexps;
+        regexps = constructor();
+        return &*regexps;
     }
 
 private:
-    std::function<Regexps()> constructor;
-    std::optional<Regexps> regexp;
+    std::function<Regexps()> constructor TSA_GUARDED_BY(mutex);
+    std::optional<Regexps> regexps TSA_GUARDED_BY(mutex);
     std::mutex mutex;
 };
 
-struct Pool
-{
-    /// Mutex for finding in map.
-    std::mutex mutex;
-    /// Patterns + possible edit_distance to database and scratch.
-    std::map<std::pair<std::vector<String>, std::optional<UInt32>>, RegexpsConstructor> storage;
-};
+using DeferredConstructedRegexpsPtr = std::shared_ptr<DeferredConstructedRegexps>;
 
 template <bool save_indices, bool WithEditDistance>
 inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[maybe_unused]] std::optional<UInt32> edit_distance)
@@ -186,9 +175,9 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
         ext_exprs_ptrs.reserve(str_patterns.size());
     }
 
-    for (const StringRef ref : str_patterns)
+    for (std::string_view ref : str_patterns)
     {
-        patterns.push_back(ref.data);
+        patterns.push_back(ref.data());
         /* Flags below are the pattern matching flags.
          * HS_FLAG_DOTALL is a compile flag where matching a . will not exclude newlines. This is a good
          * performance practice according to Hyperscan API. https://intel.github.io/hyperscan/dev-reference/performance.html#dot-all-mode
@@ -251,11 +240,9 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
         CompilerError error(compile_error);
 
         if (error->expression < 0)
-            throw Exception(String(error->message), ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, String(error->message));
         else
-            throw Exception(
-                "Pattern '" + str_patterns[error->expression] + "' failed with error '" + String(error->message),
-                ErrorCodes::BAD_ARGUMENTS);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Pattern '{}' failed with error '{}'", str_patterns[error->expression], String(error->message));
     }
 
     ProfileEvents::increment(ProfileEvents::RegexpCreated);
@@ -267,45 +254,90 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
 
     /// If not HS_SUCCESS, it is guaranteed that the memory would not be allocated for scratch.
     if (err != HS_SUCCESS)
-        throw Exception("Could not allocate scratch space for hyperscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
+        throw Exception(ErrorCodes::CANNOT_ALLOCATE_MEMORY, "Could not allocate scratch space for hyperscan");
 
     return {db, scratch};
 }
 
-/// If WithEditDistance is False, edit_distance must be nullopt
-/// Also, we use templates here because each instantiation of function
-/// template has its own copy of local static variables which must not be the same
-/// for different hyperscan compilations.
-template <bool save_indices, bool WithEditDistance>
-inline Regexps * get(const std::vector<std::string_view> & patterns, std::optional<UInt32> edit_distance)
+/// Maps string pattern vectors + edit distance to compiled vectorscan regexps. Uses the same eviction mechanism as the LocalCacheTable for
+/// re2 patterns. Because vectorscan regexes are overall more heavy-weight (more expensive compilation, regexes can grow up to multiple
+/// MBs, usage of scratch space), 1. GlobalCacheTable is a global singleton and, as a result, needs locking 2. the pattern compilation is
+/// done outside GlobalCacheTable's lock, at the cost of another level of locking.
+struct GlobalCacheTable
 {
-    static Pool known_regexps; /// Different variables for different pattern parameters, thread-safe in C++11
+    constexpr static size_t CACHE_SIZE = 500; /// collision probability
+
+    struct Bucket
+    {
+        std::vector<String> patterns;          /// key
+        std::optional<UInt32> edit_distance;   /// key
+        /// The compiled patterns and their state (vectorscan 'database' + scratch space) are wrapped in a shared_ptr. Refcounting guarantees
+        /// that eviction of a pattern does not affect parallel threads still using the pattern.
+        DeferredConstructedRegexpsPtr regexps; /// value
+    };
+
+    std::array<Bucket, CACHE_SIZE> known_regexps TSA_GUARDED_BY(mutex);
+    std::mutex mutex;
+
+    static size_t getBucketIndexFor(const std::vector<String> patterns, std::optional<UInt32> edit_distance)
+    {
+        size_t hash = 0;
+        for (const auto & pattern : patterns)
+            boost::hash_combine(hash, pattern);
+        boost::hash_combine(hash, edit_distance);
+        return hash % CACHE_SIZE;
+    }
+};
+
+/// If WithEditDistance is False, edit_distance must be nullopt. Also, we use templates here because each instantiation of function template
+/// has its own copy of local static variables which must not be the same for different hyperscan compilations.
+template <bool save_indices, bool WithEditDistance>
+inline DeferredConstructedRegexpsPtr getOrSet(const std::vector<std::string_view> & patterns, std::optional<UInt32> edit_distance)
+{
+    static GlobalCacheTable pool; /// Different variables for different pattern parameters, thread-safe in C++11
 
     std::vector<String> str_patterns;
     str_patterns.reserve(patterns.size());
     for (const auto & pattern : patterns)
-        str_patterns.emplace_back(std::string(pattern.data(), pattern.size()));
+        str_patterns.emplace_back(String(pattern));
 
-    /// Get the lock for finding database.
-    std::unique_lock lock(known_regexps.mutex);
+    size_t bucket_idx = GlobalCacheTable::getBucketIndexFor(str_patterns, edit_distance);
 
-    auto it = known_regexps.storage.find({str_patterns, edit_distance});
+    /// Lock cache to find compiled regexp for given pattern vector + edit distance.
+    std::lock_guard lock(pool.mutex);
 
-    /// If not found, compile and let other threads wait.
-    if (known_regexps.storage.end() == it)
+    GlobalCacheTable::Bucket & bucket = pool.known_regexps[bucket_idx];
+
+    /// Pattern compilation is expensive and we don't want to block other threads reading from / inserting into the cache while we hold the
+    /// cache lock during pattern compilation. Therefore, when a cache entry is created or replaced, only set the regexp constructor method
+    /// and compile outside the cache lock.
+    /// Note that the string patterns and the edit distance is passed into the constructor lambda by value, i.e. copied - it is not an
+    /// option to reference the corresponding string patterns / edit distance key in the cache table bucket because the cache entry may
+    /// already be evicted at the time the compilation starts.
+
+    if (bucket.regexps == nullptr) [[unlikely]]
     {
-        it = known_regexps.storage
-                 .emplace(std::piecewise_construct, std::make_tuple(std::move(str_patterns), edit_distance), std::make_tuple())
-                 .first;
-        it->second.setConstructor([&str_patterns = it->first.first, edit_distance]()
-        {
-            return constructRegexps<save_indices, WithEditDistance>(str_patterns, edit_distance);
-        });
+        /// insert new entry
+        auto deferred_constructed_regexps = std::make_shared<DeferredConstructedRegexps>(
+                [str_patterns, edit_distance]()
+                {
+                    return constructRegexps<save_indices, WithEditDistance>(str_patterns, edit_distance);
+                });
+        bucket = {std::move(str_patterns), edit_distance, deferred_constructed_regexps};
     }
+    else
+        if (bucket.patterns != str_patterns || bucket.edit_distance != edit_distance)
+        {
+            /// replace existing entry
+            auto deferred_constructed_regexps = std::make_shared<DeferredConstructedRegexps>(
+                    [str_patterns, edit_distance]()
+                    {
+                        return constructRegexps<save_indices, WithEditDistance>(str_patterns, edit_distance);
+                    });
+            bucket = {std::move(str_patterns), edit_distance, deferred_constructed_regexps};
+        }
 
-    /// Unlock before possible construction.
-    lock.unlock();
-    return it->second();
+    return bucket.regexps;
 }
 
 }
diff --git a/src/Functions/array/arrayDifference.cpp b/src/Functions/array/arrayDifference.cpp
index a19f04f4e02..118fe87270b 100644
--- a/src/Functions/array/arrayDifference.cpp
+++ b/src/Functions/array/arrayDifference.cpp
@@ -84,7 +84,7 @@ struct ArrayDifferenceImpl
                 }
                 else
                 {
-                    dst[pos] = curr - prev;
+                    dst[pos] = static_cast<Result>(curr) - static_cast<Result>(prev);
                 }
 
                 prev = curr;
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index d3255d6412e..a7b27bae268 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -475,10 +475,11 @@ ColumnPtr FunctionArrayElement::executeNumberConst(
 
     auto col_res = ColumnVector<DataType>::create();
 
-    if (index.getType() == Field::Types::UInt64)
+    if (index.getType() == Field::Types::UInt64
+        || (index.getType() == Field::Types::Int64 && get<Int64>(index) >= 0))
     {
         ArrayElementNumImpl<DataType>::template vectorConst<false>(
-            col_nested->getData(), col_array->getOffsets(), safeGet<UInt64>(index) - 1, col_res->getData(), builder);
+            col_nested->getData(), col_array->getOffsets(), get<UInt64>(index) - 1, col_res->getData(), builder);
     }
     else if (index.getType() == Field::Types::Int64)
     {
@@ -537,12 +538,13 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
 
     auto col_res = ColumnString::create();
 
-    if (index.getType() == Field::Types::UInt64)
+    if (index.getType() == Field::Types::UInt64
+        || (index.getType() == Field::Types::Int64 && get<Int64>(index) >= 0))
         ArrayElementStringImpl::vectorConst<false>(
             col_nested->getChars(),
             col_array->getOffsets(),
             col_nested->getOffsets(),
-            safeGet<UInt64>(index) - 1,
+            get<UInt64>(index) - 1,
             col_res->getChars(),
             col_res->getOffsets(),
             builder);
@@ -551,7 +553,7 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
             col_nested->getChars(),
             col_array->getOffsets(),
             col_nested->getOffsets(),
-            -(UInt64(safeGet<Int64>(index)) + 1),
+            -(UInt64(get<Int64>(index)) + 1),
             col_res->getChars(),
             col_res->getOffsets(),
             builder);
@@ -600,12 +602,13 @@ ColumnPtr FunctionArrayElement::executeGenericConst(
     const auto & col_nested = col_array->getData();
     auto col_res = col_nested.cloneEmpty();
 
-    if (index.getType() == Field::Types::UInt64)
+    if (index.getType() == Field::Types::UInt64
+        || (index.getType() == Field::Types::Int64 && get<Int64>(index) >= 0))
         ArrayElementGenericImpl::vectorConst<false>(
-            col_nested, col_array->getOffsets(), safeGet<UInt64>(index) - 1, *col_res, builder);
+            col_nested, col_array->getOffsets(), get<UInt64>(index) - 1, *col_res, builder);
     else if (index.getType() == Field::Types::Int64)
         ArrayElementGenericImpl::vectorConst<true>(
-            col_nested, col_array->getOffsets(), -(static_cast<UInt64>(safeGet<Int64>(index) + 1)), *col_res, builder);
+            col_nested, col_array->getOffsets(), -(static_cast<UInt64>(get<Int64>(index) + 1)), *col_res, builder);
     else
         throw Exception("Illegal type of array index", ErrorCodes::LOGICAL_ERROR);
 
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index dd6e9e70381..27948a35f57 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -114,7 +114,7 @@ public:
             dispatchForColumns<ToRelativeWeekNumImpl>(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());
-        else if (unit == "hour" || unit == "hh")
+        else if (unit == "hour" || unit == "hh" || unit == "h")
             dispatchForColumns<ToRelativeHourNumImpl>(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());
diff --git a/src/Functions/makeDate.cpp b/src/Functions/makeDate.cpp
index 3e53dcff600..5b04ed05a3c 100644
--- a/src/Functions/makeDate.cpp
+++ b/src/Functions/makeDate.cpp
@@ -164,9 +164,9 @@ struct MakeDate32Traits
     using ReturnDataType = DataTypeDate32;
     using ReturnColumnType = ColumnInt32;
 
-    static constexpr auto MIN_YEAR = 1925;
-    static constexpr auto MAX_YEAR = 2283;
-    static constexpr auto MAX_DATE = YearMonthDayToSingleInt(MAX_YEAR, 11, 11);
+    static constexpr auto MIN_YEAR = 1900;
+    static constexpr auto MAX_YEAR = 2299;
+    static constexpr auto MAX_DATE = YearMonthDayToSingleInt(MAX_YEAR, 12, 31);
 };
 
 /// Common implementation for makeDateTime, makeDateTime64
diff --git a/src/IO/ConnectionTimeouts.h b/src/IO/ConnectionTimeouts.h
index 42b800f15d0..95a2ded6466 100644
--- a/src/IO/ConnectionTimeouts.h
+++ b/src/IO/ConnectionTimeouts.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/Defines.h>
 #include <Interpreters/Context_fwd.h>
 
 #include <Poco/Timespan.h>
@@ -22,6 +23,9 @@ struct ConnectionTimeouts
     Poco::Timespan hedged_connection_timeout;
     Poco::Timespan receive_data_timeout;
 
+    /// Timeout for synchronous request-result protocol call (like Ping or TablesStatus)
+    Poco::Timespan sync_request_timeout = Poco::Timespan(DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC, 0);
+
     ConnectionTimeouts() = default;
 
     ConnectionTimeouts(Poco::Timespan connection_timeout_,
diff --git a/src/IO/MMappedFileCache.h b/src/IO/MMappedFileCache.h
index fe5e7e8e1f7..0a8a80d15d0 100644
--- a/src/IO/MMappedFileCache.h
+++ b/src/IO/MMappedFileCache.h
@@ -2,7 +2,7 @@
 
 #include <Core/Types.h>
 #include <Common/HashTable/Hash.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/SipHash.h>
 #include <Common/ProfileEvents.h>
 #include <IO/MMappedFile.h>
@@ -21,10 +21,10 @@ namespace DB
 /** Cache of opened and mmapped files for reading.
   * mmap/munmap is heavy operation and better to keep mapped file to subsequent use than to map/unmap every time.
   */
-class MMappedFileCache : public LRUCache<UInt128, MMappedFile, UInt128TrivialHash>
+class MMappedFileCache : public CacheBase<UInt128, MMappedFile, UInt128TrivialHash>
 {
 private:
-    using Base = LRUCache<UInt128, MMappedFile, UInt128TrivialHash>;
+    using Base = CacheBase<UInt128, MMappedFile, UInt128TrivialHash>;
 
 public:
     explicit MMappedFileCache(size_t max_size_in_bytes)
diff --git a/src/IO/Progress.cpp b/src/IO/Progress.cpp
index eb6eb7fe573..1069803633c 100644
--- a/src/IO/Progress.cpp
+++ b/src/IO/Progress.cpp
@@ -11,38 +11,34 @@ namespace DB
 {
 void ProgressValues::read(ReadBuffer & in, UInt64 server_revision)
 {
-    size_t new_read_rows = 0;
-    size_t new_read_bytes = 0;
-    size_t new_total_rows_to_read = 0;
-    size_t new_written_rows = 0;
-    size_t new_written_bytes = 0;
-
-    readVarUInt(new_read_rows, in);
-    readVarUInt(new_read_bytes, in);
-    readVarUInt(new_total_rows_to_read, in);
+    readVarUInt(read_rows, in);
+    readVarUInt(read_bytes, in);
+    readVarUInt(total_rows_to_read, in);
     if (server_revision >= DBMS_MIN_REVISION_WITH_CLIENT_WRITE_INFO)
     {
-        readVarUInt(new_written_rows, in);
-        readVarUInt(new_written_bytes, in);
+        readVarUInt(written_rows, in);
+        readVarUInt(written_bytes, in);
+    }
+    if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS)
+    {
+        readVarUInt(elapsed_ns, in);
     }
-
-    this->read_rows = new_read_rows;
-    this->read_bytes = new_read_bytes;
-    this->total_rows_to_read = new_total_rows_to_read;
-    this->written_rows = new_written_rows;
-    this->written_bytes = new_written_bytes;
 }
 
 
 void ProgressValues::write(WriteBuffer & out, UInt64 client_revision) const
 {
-    writeVarUInt(this->read_rows, out);
-    writeVarUInt(this->read_bytes, out);
-    writeVarUInt(this->total_rows_to_read, out);
+    writeVarUInt(read_rows, out);
+    writeVarUInt(read_bytes, out);
+    writeVarUInt(total_rows_to_read, out);
     if (client_revision >= DBMS_MIN_REVISION_WITH_CLIENT_WRITE_INFO)
     {
-        writeVarUInt(this->written_rows, out);
-        writeVarUInt(this->written_bytes, out);
+        writeVarUInt(written_rows, out);
+        writeVarUInt(written_bytes, out);
+    }
+    if (client_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS)
+    {
+        writeVarUInt(elapsed_ns, out);
     }
 }
 
@@ -52,19 +48,19 @@ void ProgressValues::writeJSON(WriteBuffer & out) const
     ///  of 64-bit integers after interpretation by JavaScript.
 
     writeCString("{\"read_rows\":\"", out);
-    writeText(this->read_rows, out);
+    writeText(read_rows, out);
     writeCString("\",\"read_bytes\":\"", out);
-    writeText(this->read_bytes, out);
+    writeText(read_bytes, out);
     writeCString("\",\"written_rows\":\"", out);
-    writeText(this->written_rows, out);
+    writeText(written_rows, out);
     writeCString("\",\"written_bytes\":\"", out);
-    writeText(this->written_bytes, out);
+    writeText(written_bytes, out);
     writeCString("\",\"total_rows_to_read\":\"", out);
-    writeText(this->total_rows_to_read, out);
+    writeText(total_rows_to_read, out);
     writeCString("\",\"result_rows\":\"", out);
-    writeText(this->result_rows, out);
+    writeText(result_rows, out);
     writeCString("\",\"result_bytes\":\"", out);
-    writeText(this->result_bytes, out);
+    writeText(result_bytes, out);
     writeCString("\"}", out);
 }
 
@@ -82,6 +78,8 @@ bool Progress::incrementPiecewiseAtomically(const Progress & rhs)
     result_rows += rhs.result_rows;
     result_bytes += rhs.result_bytes;
 
+    elapsed_ns += rhs.elapsed_ns;
+
     return rhs.read_rows || rhs.written_rows;
 }
 
@@ -98,6 +96,8 @@ void Progress::reset()
 
     result_rows = 0;
     result_bytes = 0;
+
+    elapsed_ns = 0;
 }
 
 ProgressValues Progress::getValues() const
@@ -116,6 +116,8 @@ ProgressValues Progress::getValues() const
     res.result_rows = result_rows.load(std::memory_order_relaxed);
     res.result_bytes = result_bytes.load(std::memory_order_relaxed);
 
+    res.elapsed_ns = elapsed_ns.load(std::memory_order_relaxed);
+
     return res;
 }
 
@@ -135,6 +137,8 @@ ProgressValues Progress::fetchValuesAndResetPiecewiseAtomically()
     res.result_rows = result_rows.fetch_and(0);
     res.result_bytes = result_bytes.fetch_and(0);
 
+    res.elapsed_ns = elapsed_ns.fetch_and(0);
+
     return res;
 }
 
@@ -154,6 +158,8 @@ Progress Progress::fetchAndResetPiecewiseAtomically()
     res.result_rows = result_rows.fetch_and(0);
     res.result_bytes = result_bytes.fetch_and(0);
 
+    res.elapsed_ns = elapsed_ns.fetch_and(0);
+
     return res;
 }
 
@@ -171,6 +177,8 @@ Progress & Progress::operator=(Progress && other) noexcept
     result_rows = other.result_rows.load(std::memory_order_relaxed);
     result_bytes = other.result_bytes.load(std::memory_order_relaxed);
 
+    elapsed_ns = other.elapsed_ns.load(std::memory_order_relaxed);
+
     return *this;
 }
 
@@ -185,6 +193,8 @@ void Progress::read(ReadBuffer & in, UInt64 server_revision)
 
     written_rows.store(values.written_rows, std::memory_order_relaxed);
     written_bytes.store(values.written_bytes, std::memory_order_relaxed);
+
+    elapsed_ns.store(values.elapsed_ns, std::memory_order_relaxed);
 }
 
 void Progress::write(WriteBuffer & out, UInt64 client_revision) const
diff --git a/src/IO/Progress.h b/src/IO/Progress.h
index 8340974b03d..c21b1b854b0 100644
--- a/src/IO/Progress.h
+++ b/src/IO/Progress.h
@@ -16,17 +16,19 @@ class WriteBuffer;
 /// See Progress.
 struct ProgressValues
 {
-    size_t read_rows;
-    size_t read_bytes;
+    UInt64 read_rows = 0;
+    UInt64 read_bytes = 0;
 
-    size_t total_rows_to_read;
-    size_t total_bytes_to_read;
+    UInt64 total_rows_to_read = 0;
+    UInt64 total_bytes_to_read = 0;
 
-    size_t written_rows;
-    size_t written_bytes;
+    UInt64 written_rows = 0;
+    UInt64 written_bytes = 0;
 
-    size_t result_rows;
-    size_t result_bytes;
+    UInt64 result_rows = 0;
+    UInt64 result_bytes = 0;
+
+    UInt64 elapsed_ns = 0;
 
     void read(ReadBuffer & in, UInt64 server_revision);
     void write(WriteBuffer & out, UInt64 client_revision) const;
@@ -35,39 +37,39 @@ struct ProgressValues
 
 struct ReadProgress
 {
-    size_t read_rows;
-    size_t read_bytes;
-    size_t total_rows_to_read;
+    UInt64 read_rows = 0;
+    UInt64 read_bytes = 0;
+    UInt64 total_rows_to_read = 0;
 
-    ReadProgress(size_t read_rows_, size_t read_bytes_, size_t total_rows_to_read_ = 0)
+    ReadProgress(UInt64 read_rows_, UInt64 read_bytes_, UInt64 total_rows_to_read_ = 0)
         : read_rows(read_rows_), read_bytes(read_bytes_), total_rows_to_read(total_rows_to_read_) {}
 };
 
 struct WriteProgress
 {
-    size_t written_rows;
-    size_t written_bytes;
+    UInt64 written_rows = 0;
+    UInt64 written_bytes = 0;
 
-    WriteProgress(size_t written_rows_, size_t written_bytes_)
+    WriteProgress(UInt64 written_rows_, UInt64 written_bytes_)
         : written_rows(written_rows_), written_bytes(written_bytes_) {}
 };
 
 struct ResultProgress
 {
-    size_t result_rows;
-    size_t result_bytes;
+    UInt64 result_rows = 0;
+    UInt64 result_bytes = 0;
 
-    ResultProgress(size_t result_rows_, size_t result_bytes_)
+    ResultProgress(UInt64 result_rows_, UInt64 result_bytes_)
         : result_rows(result_rows_), result_bytes(result_bytes_) {}
 };
 
 struct FileProgress
 {
     /// Here read_bytes (raw bytes) - do not equal ReadProgress::read_bytes, which are calculated according to column types.
-    size_t read_bytes;
-    size_t total_bytes_to_read;
+    UInt64 read_bytes = 0;
+    UInt64 total_bytes_to_read = 0;
 
-    explicit FileProgress(size_t read_bytes_, size_t total_bytes_to_read_ = 0) : read_bytes(read_bytes_), total_bytes_to_read(total_bytes_to_read_) {}
+    explicit FileProgress(UInt64 read_bytes_, UInt64 total_bytes_to_read_ = 0) : read_bytes(read_bytes_), total_bytes_to_read(total_bytes_to_read_) {}
 };
 
 
@@ -77,24 +79,26 @@ struct FileProgress
   */
 struct Progress
 {
-    std::atomic<size_t> read_rows {0};        /// Rows (source) processed.
-    std::atomic<size_t> read_bytes {0};       /// Bytes (uncompressed, source) processed.
+    std::atomic<UInt64> read_rows {0};        /// Rows (source) processed.
+    std::atomic<UInt64> read_bytes {0};       /// Bytes (uncompressed, source) processed.
 
     /** How much rows/bytes must be processed, in total, approximately. Non-zero value is sent when there is information about
       * some new part of job. Received values must be summed to get estimate of total rows to process.
       */
-    std::atomic<size_t> total_rows_to_read {0};
-    std::atomic<size_t> total_bytes_to_read {0};
+    std::atomic<UInt64> total_rows_to_read {0};
+    std::atomic<UInt64> total_bytes_to_read {0};
 
-    std::atomic<size_t> written_rows {0};
-    std::atomic<size_t> written_bytes {0};
+    std::atomic<UInt64> written_rows {0};
+    std::atomic<UInt64> written_bytes {0};
 
-    std::atomic<size_t> result_rows {0};
-    std::atomic<size_t> result_bytes {0};
+    std::atomic<UInt64> result_rows {0};
+    std::atomic<UInt64> result_bytes {0};
+
+    std::atomic<UInt64> elapsed_ns {0};
 
     Progress() = default;
 
-    Progress(size_t read_rows_, size_t read_bytes_, size_t total_rows_to_read_ = 0)
+    Progress(UInt64 read_rows_, UInt64 read_bytes_, UInt64 total_rows_to_read_ = 0)
         : read_rows(read_rows_), read_bytes(read_bytes_), total_rows_to_read(total_rows_to_read_) {}
 
     explicit Progress(ReadProgress read_progress)
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 7a5df1ed5ac..502e76a6c5e 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -7,6 +7,7 @@
 #include <limits>
 #include <algorithm>
 #include <iterator>
+#include <bit>
 
 #include <type_traits>
 
@@ -1027,15 +1028,17 @@ requires is_arithmetic_v<T> && (sizeof(T) <= 8)
 inline void readBinaryBigEndian(T & x, ReadBuffer & buf)    /// Assuming little endian architecture.
 {
     readPODBinary(x, buf);
-
-    if constexpr (sizeof(x) == 1)
-        return;
-    else if constexpr (sizeof(x) == 2)
-        x = __builtin_bswap16(x);
-    else if constexpr (sizeof(x) == 4)
-        x = __builtin_bswap32(x);
-    else if constexpr (sizeof(x) == 8)
-        x = __builtin_bswap64(x);
+    if constexpr (std::endian::native == std::endian::little)
+    {
+        if constexpr (sizeof(x) == 1)
+            return;
+        else if constexpr (sizeof(x) == 2)
+            x = __builtin_bswap16(x);
+        else if constexpr (sizeof(x) == 4)
+            x = __builtin_bswap32(x);
+        else if constexpr (sizeof(x) == 8)
+            x = __builtin_bswap64(x);
+    }
 }
 
 template <typename T>
diff --git a/src/IO/UncompressedCache.h b/src/IO/UncompressedCache.h
index 93ca1235a42..3d1c907d364 100644
--- a/src/IO/UncompressedCache.h
+++ b/src/IO/UncompressedCache.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <Common/LRUCache.h>
 #include <Common/SipHash.h>
 #include <Common/ProfileEvents.h>
 #include <Common/HashTable/Hash.h>
 #include <IO/BufferWithOwnMemory.h>
+#include <Common/CacheBase.h>
 
 
 namespace ProfileEvents
@@ -36,14 +36,14 @@ struct UncompressedSizeWeightFunction
 
 /** Cache of decompressed blocks for implementation of CachedCompressedReadBuffer. thread-safe.
   */
-class UncompressedCache : public LRUCache<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>
+class UncompressedCache : public CacheBase<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>
 {
 private:
-    using Base = LRUCache<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>;
+    using Base = CacheBase<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>;
 
 public:
-    explicit UncompressedCache(size_t max_size_in_bytes)
-        : Base(max_size_in_bytes) {}
+    explicit UncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy = "")
+        : Base(max_size_in_bytes, 0, uncompressed_cache_policy) {}
 
     /// Calculate key from path to file and offset.
     static UInt128 hash(const String & path_to_file, size_t offset)
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 51f0c0d0743..23754c90af8 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -3,8 +3,8 @@
 #if USE_AWS_S3
 
 #include <Common/logger_useful.h>
-#include <Common/IFileCache.h>
 #include <Common/Throttler.h>
+#include <Common/FileCache.h>
 
 #include <IO/WriteBufferFromS3.h>
 #include <IO/WriteHelpers.h>
@@ -256,6 +256,7 @@ void WriteBufferFromS3::writePart()
     if (schedule)
     {
         UploadPartTask * task = nullptr;
+
         int part_number;
         {
             std::lock_guard lock(bg_tasks_mutex);
@@ -264,45 +265,57 @@ void WriteBufferFromS3::writePart()
             part_number = num_added_bg_tasks;
         }
 
-        fillUploadRequest(task->req, part_number);
-
-        if (file_segments_holder)
+        /// Notify waiting thread when task finished
+        auto task_finish_notify = [&, task]()
         {
-            task->cache_files.emplace(std::move(*file_segments_holder));
-            file_segments_holder.reset();
+            std::lock_guard lock(bg_tasks_mutex);
+            task->is_finised = true;
+            ++num_finished_bg_tasks;
+
+            /// Notification under mutex is important here.
+            /// Otherwise, WriteBuffer could be destroyed in between
+            /// Releasing lock and condvar notification.
+            bg_tasks_condvar.notify_one();
+        };
+
+        try
+        {
+            fillUploadRequest(task->req, part_number);
+
+            if (file_segments_holder)
+            {
+                task->cache_files.emplace(std::move(*file_segments_holder));
+                file_segments_holder.reset();
+            }
+
+            schedule([this, task, task_finish_notify]()
+            {
+                try
+                {
+                    processUploadRequest(*task);
+                }
+                catch (...)
+                {
+                    task->exception = std::current_exception();
+                }
+
+                try
+                {
+                    finalizeCacheIfNeeded(task->cache_files);
+                }
+                catch (...)
+                {
+                    tryLogCurrentException(__PRETTY_FUNCTION__);
+                }
+
+                task_finish_notify();
+            });
         }
-
-        schedule([this, task]()
+        catch (...)
         {
-            try
-            {
-                processUploadRequest(*task);
-            }
-            catch (...)
-            {
-                task->exception = std::current_exception();
-            }
-
-            try
-            {
-                finalizeCacheIfNeeded(task->cache_files);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-
-            {
-                std::lock_guard lock(bg_tasks_mutex);
-                task->is_finised = true;
-                ++num_finished_bg_tasks;
-
-                /// Notification under mutex is important here.
-                /// Otherwise, WriteBuffer could be destroyed in between
-                /// Releasing lock and condvar notification.
-                bg_tasks_condvar.notify_one();
-            }
-        });
+            task_finish_notify();
+            throw;
+        }
     }
     else
     {
@@ -397,43 +410,56 @@ void WriteBufferFromS3::makeSinglepartUpload()
     {
         put_object_task = std::make_unique<PutObjectTask>();
 
-        fillPutRequest(put_object_task->req);
-        if (file_segments_holder)
+        /// Notify waiting thread when put object task finished
+        auto task_notify_finish = [&]()
         {
-            put_object_task->cache_files.emplace(std::move(*file_segments_holder));
-            file_segments_holder.reset();
+            std::lock_guard lock(bg_tasks_mutex);
+            put_object_task->is_finised = true;
+
+            /// Notification under mutex is important here.
+            /// Othervies, WriteBuffer could be destroyed in between
+            /// Releasing lock and condvar notification.
+            bg_tasks_condvar.notify_one();
+        };
+
+        try
+        {
+            fillPutRequest(put_object_task->req);
+
+            if (file_segments_holder)
+            {
+                put_object_task->cache_files.emplace(std::move(*file_segments_holder));
+                file_segments_holder.reset();
+            }
+
+            schedule([this, task_notify_finish]()
+            {
+                try
+                {
+                    processPutRequest(*put_object_task);
+                }
+                catch (...)
+                {
+                    put_object_task->exception = std::current_exception();
+                }
+
+                try
+                {
+                    finalizeCacheIfNeeded(put_object_task->cache_files);
+                }
+                catch (...)
+                {
+                    tryLogCurrentException(__PRETTY_FUNCTION__);
+                }
+
+                task_notify_finish();
+            });
         }
-
-        schedule([this]()
+        catch (...)
         {
-            try
-            {
-                processPutRequest(*put_object_task);
-            }
-            catch (...)
-            {
-                put_object_task->exception = std::current_exception();
-            }
-
-            try
-            {
-                finalizeCacheIfNeeded(put_object_task->cache_files);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-
-            {
-                std::lock_guard lock(bg_tasks_mutex);
-                put_object_task->is_finised = true;
-
-                /// Notification under mutex is important here.
-                /// Othervies, WriteBuffer could be destroyed in between
-                /// Releasing lock and condvar notification.
-                bg_tasks_condvar.notify_one();
-            }
-        });
+            task_notify_finish();
+            throw;
+        }
     }
     else
     {
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index 2903a70b61a..f9892ac6194 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <iterator>
 #include <concepts>
+#include <bit>
 
 #include <pcg-random/pcg_random.hpp>
 
@@ -1110,13 +1111,15 @@ template <typename T>
 requires is_arithmetic_v<T> && (sizeof(T) <= 8)
 inline void writeBinaryBigEndian(T x, WriteBuffer & buf)    /// Assuming little endian architecture.
 {
-    if constexpr (sizeof(x) == 2)
-        x = __builtin_bswap16(x);
-    else if constexpr (sizeof(x) == 4)
-        x = __builtin_bswap32(x);
-    else if constexpr (sizeof(x) == 8)
-        x = __builtin_bswap64(x);
-
+    if constexpr (std::endian::native == std::endian::little)
+    {
+        if constexpr (sizeof(x) == 2)
+            x = __builtin_bswap16(x);
+        else if constexpr (sizeof(x) == 4)
+            x = __builtin_bswap32(x);
+        else if constexpr (sizeof(x) == 8)
+            x = __builtin_bswap64(x);
+    }
     writePODBinary(x, buf);
 }
 
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index 3c6f9b8f9f5..df3f02708a9 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -697,4 +697,9 @@ bool tryParseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & i
     return parseDateTime64BestEffortImpl<bool, false>(res, scale, in, local_time_zone, utc_time_zone);
 }
 
+bool tryParseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone)
+{
+    return parseDateTime64BestEffortImpl<bool, true>(res, scale, in, local_time_zone, utc_time_zone);
+}
+
 }
diff --git a/src/IO/parseDateTimeBestEffort.h b/src/IO/parseDateTimeBestEffort.h
index fe3da24a797..22af44f9e76 100644
--- a/src/IO/parseDateTimeBestEffort.h
+++ b/src/IO/parseDateTimeBestEffort.h
@@ -27,7 +27,6 @@ class ReadBuffer;
   *
   * DD/MM/YY
   * DD/MM/YYYY - when '/' separator is used, these are the only possible forms
-  * Note that American style is not supported.
   *
   * hh:mm:ss - when ':' separator is used, it is always time
   * hh:mm - it can be specified without seconds
@@ -61,7 +60,7 @@ bool tryParseDateTimeBestEffort(time_t & res, ReadBuffer & in, const DateLUTImpl
 void parseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 bool tryParseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 void parseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
-void parseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 bool tryParseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
-
+void parseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
+bool tryParseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 }
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index af7d10175a9..d5e1f332b50 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -11,6 +11,7 @@
 #include <Interpreters/Context.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
+#include <Core/SortDescription.h>
 
 #include <stack>
 #include <base/sort.h>
@@ -57,7 +58,7 @@ void ActionsDAG::Node::toTree(JSONBuilder::JSONMap & map) const
 ActionsDAG::ActionsDAG(const NamesAndTypesList & inputs_)
 {
     for (const auto & input : inputs_)
-        index.push_back(&addInput(input.name, input.type));
+        outputs.push_back(&addInput(input.name, input.type));
 }
 
 ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
@@ -74,10 +75,10 @@ ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
             ///   without any respect to header structure. So, it is a way to drop materialized column and use
             ///   constant value from header.
             /// We cannot remove such input right now cause inputs positions are important in some cases.
-            index.push_back(&addColumn(input));
+            outputs.push_back(&addColumn(input));
         }
         else
-            index.push_back(&addInput(input.name, input.type));
+            outputs.push_back(&addInput(input.name, input.type));
     }
 }
 
@@ -237,42 +238,42 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
     return addNode(std::move(node));
 }
 
-const ActionsDAG::Node & ActionsDAG::findInIndex(const std::string & name) const
+const ActionsDAG::Node & ActionsDAG::findInOutputs(const std::string & name) const
 {
-    if (const auto * node = tryFindInIndex(name))
+    if (const auto * node = tryFindInOutputs(name))
         return *node;
 
     throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER, "Unknown identifier: '{}'", name);
 }
 
-const ActionsDAG::Node * ActionsDAG::tryFindInIndex(const std::string & name) const
+const ActionsDAG::Node * ActionsDAG::tryFindInOutputs(const std::string & name) const
 {
-    for (const auto & node : index)
+    for (const auto & node : outputs)
         if (node->result_name == name)
             return node;
 
     return nullptr;
 }
 
-void ActionsDAG::addOrReplaceInIndex(const Node & node)
+void ActionsDAG::addOrReplaceInOutputs(const Node & node)
 {
-    for (auto & index_node : index)
+    for (auto & output_node : outputs)
     {
-        if (index_node->result_name == node.result_name)
+        if (output_node->result_name == node.result_name)
         {
-            index_node = &node;
+            output_node = &node;
             return;
         }
     }
 
-    index.push_back(&node);
+    outputs.push_back(&node);
 }
 
 NamesAndTypesList ActionsDAG::getRequiredColumns() const
 {
     NamesAndTypesList result;
-    for (const auto & input : inputs)
-        result.emplace_back(input->result_name, input->result_type);
+    for (const auto & input_node : inputs)
+        result.emplace_back(input_node->result_name, input_node->result_type);
 
     return result;
 }
@@ -282,8 +283,8 @@ Names ActionsDAG::getRequiredColumnsNames() const
     Names result;
     result.reserve(inputs.size());
 
-    for (const auto & input : inputs)
-        result.emplace_back(input->result_name);
+    for (const auto & input_node : inputs)
+        result.emplace_back(input_node->result_name);
 
     return result;
 }
@@ -291,8 +292,9 @@ Names ActionsDAG::getRequiredColumnsNames() const
 ColumnsWithTypeAndName ActionsDAG::getResultColumns() const
 {
     ColumnsWithTypeAndName result;
-    result.reserve(index.size());
-    for (const auto & node : index)
+    result.reserve(outputs.size());
+
+    for (const auto & node : outputs)
         result.emplace_back(node->column, node->result_type, node->result_name);
 
     return result;
@@ -301,7 +303,7 @@ ColumnsWithTypeAndName ActionsDAG::getResultColumns() const
 NamesAndTypesList ActionsDAG::getNamesAndTypesList() const
 {
     NamesAndTypesList result;
-    for (const auto & node : index)
+    for (const auto & node : outputs)
         result.emplace_back(node->result_name, node->result_type);
 
     return result;
@@ -310,8 +312,9 @@ NamesAndTypesList ActionsDAG::getNamesAndTypesList() const
 Names ActionsDAG::getNames() const
 {
     Names names;
-    names.reserve(index.size());
-    for (const auto & node : index)
+    names.reserve(outputs.size());
+
+    for (const auto & node : outputs)
         names.emplace_back(node->result_name);
 
     return names;
@@ -335,7 +338,7 @@ void ActionsDAG::removeUnusedActions(const NameSet & required_names, bool allow_
     required_nodes.reserve(required_names.size());
 
     NameSet added;
-    for (const auto & node : index)
+    for (const auto & node : outputs)
     {
         if (required_names.contains(node->result_name) && !added.contains(node->result_name))
         {
@@ -352,7 +355,7 @@ void ActionsDAG::removeUnusedActions(const NameSet & required_names, bool allow_
                                 "Unknown column: {}, there are only columns {}", name, dumpNames());
     }
 
-    index.swap(required_nodes);
+    outputs.swap(required_nodes);
     removeUnusedActions(allow_remove_inputs, allow_constant_folding);
 }
 
@@ -362,7 +365,7 @@ void ActionsDAG::removeUnusedActions(const Names & required_names, bool allow_re
     required_nodes.reserve(required_names.size());
 
     std::unordered_map<std::string_view, const Node *> names_map;
-    for (const auto * node : index)
+    for (const auto * node : outputs)
         names_map[node->result_name] = node;
 
     for (const auto & name : required_names)
@@ -375,7 +378,7 @@ void ActionsDAG::removeUnusedActions(const Names & required_names, bool allow_re
         required_nodes.push_back(it->second);
     }
 
-    index.swap(required_nodes);
+    outputs.swap(required_nodes);
     removeUnusedActions(allow_remove_inputs, allow_constant_folding);
 }
 
@@ -384,7 +387,7 @@ void ActionsDAG::removeUnusedActions(bool allow_remove_inputs, bool allow_consta
     std::unordered_set<const Node *> visited_nodes;
     std::stack<Node *> stack;
 
-    for (const auto * node : index)
+    for (const auto * node : outputs)
     {
         visited_nodes.insert(node);
         stack.push(const_cast<Node *>(node));
@@ -516,7 +519,7 @@ Block ActionsDAG::updateHeader(Block header) const
     }
 
     ColumnsWithTypeAndName result_columns;
-    result_columns.reserve(index.size());
+    result_columns.reserve(outputs.size());
 
     struct Frame
     {
@@ -525,12 +528,12 @@ Block ActionsDAG::updateHeader(Block header) const
     };
 
     {
-        for (const auto * output : index)
+        for (const auto * output_node : outputs)
         {
-            if (!node_to_column.contains(output))
+            if (!node_to_column.contains(output_node))
             {
                 std::stack<Frame> stack;
-                stack.push({.node = output});
+                stack.push({.node = output_node});
 
                 while (!stack.empty())
                 {
@@ -567,8 +570,8 @@ Block ActionsDAG::updateHeader(Block header) const
                 }
             }
 
-            if (node_to_column[output].column)
-                result_columns.push_back(node_to_column[output]);
+            if (node_to_column[output_node].column)
+                result_columns.push_back(node_to_column[output_node]);
         }
     }
 
@@ -592,35 +595,35 @@ NameSet ActionsDAG::foldActionsByProjection(
     const NameSet & required_columns, const Block & projection_block_for_keys, const String & predicate_column_name, bool add_missing_keys)
 {
     std::unordered_set<const Node *> visited_nodes;
-    std::unordered_set<std::string_view> visited_index_names;
+    std::unordered_set<std::string_view> visited_output_nodes_names;
     std::stack<Node *> stack;
 
-    /// Record all needed index nodes to start folding.
-    for (const auto & node : index)
+    /// Record all needed output nodes to start folding.
+    for (const auto & output_node : outputs)
     {
-        if (required_columns.find(node->result_name) != required_columns.end() || node->result_name == predicate_column_name)
+        if (required_columns.find(output_node->result_name) != required_columns.end() || output_node->result_name == predicate_column_name)
         {
-            visited_nodes.insert(node);
-            visited_index_names.insert(node->result_name);
-            stack.push(const_cast<Node *>(node));
+            visited_nodes.insert(output_node);
+            visited_output_nodes_names.insert(output_node->result_name);
+            stack.push(const_cast<Node *>(output_node));
         }
     }
 
-    /// If some required columns are not in any index node, try searching from all projection key
+    /// If some required columns are not in any output node, try searching from all projection key
     /// columns. If still missing, return empty set which means current projection fails to match
     /// (missing columns).
     if (add_missing_keys)
     {
         for (const auto & column : required_columns)
         {
-            if (visited_index_names.find(column) == visited_index_names.end())
+            if (visited_output_nodes_names.find(column) == visited_output_nodes_names.end())
             {
                 if (const ColumnWithTypeAndName * column_with_type_name = projection_block_for_keys.findByName(column))
                 {
                     const auto * node = &addInput(*column_with_type_name);
                     visited_nodes.insert(node);
-                    index.push_back(node);
-                    visited_index_names.insert(column);
+                    outputs.push_back(node);
+                    visited_output_nodes_names.insert(column);
                 }
                 else
                 {
@@ -662,20 +665,20 @@ NameSet ActionsDAG::foldActionsByProjection(
 
     /// Clean up unused nodes after folding.
     std::erase_if(inputs, [&](const Node * node) { return !visited_nodes.contains(node); });
-    std::erase_if(index, [&](const Node * node) { return !visited_index_names.contains(node->result_name); });
+    std::erase_if(outputs, [&](const Node * node) { return !visited_output_nodes_names.contains(node->result_name); });
     nodes.remove_if([&](const Node & node) { return !visited_nodes.contains(&node); });
 
     /// Calculate the required columns after folding.
     NameSet next_required_columns;
-    for (const auto & input : inputs)
-        next_required_columns.insert(input->result_name);
+    for (const auto & input_node : inputs)
+        next_required_columns.insert(input_node->result_name);
 
     return next_required_columns;
 }
 
 void ActionsDAG::reorderAggregationKeysForProjection(const std::unordered_map<std::string_view, size_t> & key_names_pos_map)
 {
-    ::sort(index.begin(), index.end(), [&key_names_pos_map](const Node * lhs, const Node * rhs)
+    ::sort(outputs.begin(), outputs.end(), [&key_names_pos_map](const Node * lhs, const Node * rhs)
     {
         return key_names_pos_map.find(lhs->result_name)->second < key_names_pos_map.find(rhs->result_name)->second;
     });
@@ -684,17 +687,21 @@ void ActionsDAG::reorderAggregationKeysForProjection(const std::unordered_map<st
 void ActionsDAG::addAggregatesViaProjection(const Block & aggregates)
 {
     for (const auto & aggregate : aggregates)
-        index.push_back(&addInput(aggregate));
+        outputs.push_back(&addInput(aggregate));
 }
 
 void ActionsDAG::addAliases(const NamesWithAliases & aliases)
 {
     std::unordered_map<std::string_view, size_t> names_map;
-    for (size_t i = 0; i < index.size(); ++i)
-        names_map[index[i]->result_name] = i;
+    size_t output_nodes_size = outputs.size();
+
+    for (size_t i = 0; i < output_nodes_size; ++i)
+        names_map[outputs[i]->result_name] = i;
+
+    size_t aliases_size = aliases.size();
 
     NodeRawConstPtrs required_nodes;
-    required_nodes.reserve(aliases.size());
+    required_nodes.reserve(aliases_size);
 
     for (const auto & item : aliases)
     {
@@ -703,10 +710,10 @@ void ActionsDAG::addAliases(const NamesWithAliases & aliases)
             throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
                             "Unknown column: {}, there are only columns {}", item.first, dumpNames());
 
-        required_nodes.push_back(index[it->second]);
+        required_nodes.push_back(outputs[it->second]);
     }
 
-    for (size_t i = 0; i < aliases.size(); ++i)
+    for (size_t i = 0; i < aliases_size; ++i)
     {
         const auto & item = aliases[i];
         const auto * child = required_nodes[i];
@@ -726,22 +733,24 @@ void ActionsDAG::addAliases(const NamesWithAliases & aliases)
         auto it = names_map.find(child->result_name);
         if (it == names_map.end())
         {
-            names_map[child->result_name] = index.size();
-            index.push_back(child);
+            names_map[child->result_name] = outputs.size();
+            outputs.push_back(child);
         }
         else
-            index[it->second] = child;
+            outputs[it->second] = child;
     }
 }
 
 void ActionsDAG::project(const NamesWithAliases & projection)
 {
     std::unordered_map<std::string_view, const Node *> names_map;
-    for (const auto * node : index)
-        names_map.emplace(node->result_name, node);
+    for (const auto * output_node : outputs)
+        names_map.emplace(output_node->result_name, output_node);
 
-    index.clear();
-    index.reserve(projection.size());
+    outputs.clear();
+
+    size_t projection_size = projection.size();
+    outputs.reserve(projection_size);
 
     for (const auto & item : projection)
     {
@@ -750,13 +759,13 @@ void ActionsDAG::project(const NamesWithAliases & projection)
             throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
                             "Unknown column: {}, there are only columns {}", item.first, dumpNames());
 
-        index.push_back(it->second);
+        outputs.push_back(it->second);
     }
 
-    for (size_t i = 0; i < projection.size(); ++i)
+    for (size_t i = 0; i < projection_size; ++i)
     {
         const auto & item = projection[i];
-        auto & child = index[i];
+        auto & child = outputs[i];
 
         if (!item.second.empty() && item.first != item.second)
         {
@@ -778,8 +787,8 @@ void ActionsDAG::project(const NamesWithAliases & projection)
 
 bool ActionsDAG::tryRestoreColumn(const std::string & column_name)
 {
-    for (const auto * node : index)
-        if (node->result_name == column_name)
+    for (const auto * output_node : outputs)
+        if (output_node->result_name == column_name)
             return true;
 
     for (auto it = nodes.rbegin(); it != nodes.rend(); ++it)
@@ -787,7 +796,7 @@ bool ActionsDAG::tryRestoreColumn(const std::string & column_name)
         auto & node = *it;
         if (node.result_name == column_name)
         {
-            index.push_back(&node);
+            outputs.push_back(&node);
             return true;
         }
     }
@@ -797,19 +806,19 @@ bool ActionsDAG::tryRestoreColumn(const std::string & column_name)
 
 bool ActionsDAG::removeUnusedResult(const std::string & column_name)
 {
-    /// Find column in index and remove.
+    /// Find column in output nodes and remove.
     const Node * col;
     {
-        auto it = index.begin();
-        for (; it != index.end(); ++it)
+        auto it = outputs.begin();
+        for (; it != outputs.end(); ++it)
             if ((*it)->result_name == column_name)
                 break;
 
-        if (it == index.end())
+        if (it == outputs.end())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Not found result {} in ActionsDAG\n{}", column_name, dumpDAG());
 
         col = *it;
-        index.erase(it);
+        outputs.erase(it);
     }
 
     /// Check if column is in input.
@@ -827,9 +836,9 @@ bool ActionsDAG::removeUnusedResult(const std::string & column_name)
             if (col == child)
                 return false;
 
-    /// Do not remove input if it was mentioned in index several times.
-    for (const auto * node : index)
-        if (col == node)
+    /// Do not remove input if it was mentioned in output nodes several times.
+    for (const auto * output_node : outputs)
+        if (col == output_node)
             return false;
 
     /// Remove from nodes and inputs.
@@ -864,11 +873,11 @@ ActionsDAGPtr ActionsDAG::clone() const
         for (auto & child : node.children)
             child = copy_map[child];
 
-    for (const auto & node : index)
-        actions->index.push_back(copy_map[node]);
+    for (const auto & output_node : outputs)
+        actions->outputs.push_back(copy_map[output_node]);
 
-    for (const auto & node : inputs)
-        actions->inputs.push_back(copy_map[node]);
+    for (const auto & input_node : inputs)
+        actions->inputs.push_back(copy_map[input_node]);
 
     return actions;
 }
@@ -939,8 +948,8 @@ std::string ActionsDAG::dumpDAG() const
         out << "\n";
     }
 
-    out << "Index:";
-    for (const auto * node : index)
+    out << "Output nodes:";
+    for (const auto * node : outputs)
         out << ' ' << map[node];
     out << '\n';
 
@@ -984,8 +993,8 @@ void ActionsDAG::assertDeterministic() const
 
 void ActionsDAG::addMaterializingOutputActions()
 {
-    for (auto & node : index)
-        node = &materializeNode(*node);
+    for (auto & output_node : outputs)
+        output_node = &materializeNode(*output_node);
 }
 
 const ActionsDAG::Node & ActionsDAG::materializeNode(const Node & node)
@@ -1023,7 +1032,8 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
     std::map<std::string_view, std::list<size_t>> inputs;
     if (mode == MatchColumnsMode::Name)
     {
-        for (size_t pos = 0; pos < actions_dag->inputs.size(); ++pos)
+        size_t input_nodes_size = actions_dag->inputs.size();
+        for (size_t pos = 0; pos < input_nodes_size; ++pos)
             inputs[actions_dag->inputs[pos]->result_name].push_back(pos);
     }
 
@@ -1134,7 +1144,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
         }
     }
 
-    actions_dag->index.swap(projection);
+    actions_dag->outputs.swap(projection);
     actions_dag->removeUnusedActions();
     actions_dag->projectInput();
 
@@ -1153,7 +1163,7 @@ ActionsDAGPtr ActionsDAG::makeAddingColumnActions(ColumnWithTypeAndName column)
     const auto & function_node = adding_column_action->addFunction(func_builder_materialize, std::move(inputs), {});
     const auto & alias_node = adding_column_action->addAlias(function_node, std::move(column_name));
 
-    adding_column_action->index.push_back(&alias_node);
+    adding_column_action->outputs.push_back(&alias_node);
     return adding_column_action;
 }
 
@@ -1165,7 +1175,7 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 
     /// Will store merged result in `first`.
 
-    /// This map contains nodes which should be removed from `first` index, cause they are used as inputs for `second`.
+    /// This map contains nodes which should be removed from `first` outputs, cause they are used as inputs for `second`.
     /// The second element is the number of removes (cause one node may be repeated several times in result).
     std::unordered_map<const Node *, size_t> removed_first_result;
     /// Map inputs of `second` to nodes of `first`.
@@ -1173,25 +1183,25 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 
     /// Update inputs list.
     {
-        /// Index may have multiple columns with same name. They also may be used by `second`. Order is important.
+        /// Outputs may have multiple columns with same name. They also may be used by `second`. Order is important.
         std::unordered_map<std::string_view, std::list<const Node *>> first_result;
-        for (const auto & node : first.index)
-            first_result[node->result_name].push_back(node);
+        for (const auto & output_node : first.outputs)
+            first_result[output_node->result_name].push_back(output_node);
 
-        for (const auto & node : second.inputs)
+        for (const auto & input_node : second.inputs)
         {
-            auto it = first_result.find(node->result_name);
+            auto it = first_result.find(input_node->result_name);
             if (it == first_result.end() || it->second.empty())
             {
                 if (first.project_input)
                     throw Exception(ErrorCodes::LOGICAL_ERROR,
-                                    "Cannot find column {} in ActionsDAG result", node->result_name);
+                                    "Cannot find column {} in ActionsDAG result", input_node->result_name);
 
-                first.inputs.push_back(node);
+                first.inputs.push_back(input_node);
             }
             else
             {
-                inputs_map[node] = it->second.front();
+                inputs_map[input_node] = it->second.front();
                 removed_first_result[it->second.front()] += 1;
                 it->second.pop_front();
             }
@@ -1212,35 +1222,35 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
         }
     }
 
-    for (auto & node : second.index)
+    for (auto & output_node : second.outputs)
     {
-        if (node->type == ActionType::INPUT)
+        if (output_node->type == ActionType::INPUT)
         {
-            auto it = inputs_map.find(node);
+            auto it = inputs_map.find(output_node);
             if (it != inputs_map.end())
-                node = it->second;
+                output_node = it->second;
         }
     }
 
-    /// Update index.
+    /// Update output nodes.
     if (second.project_input)
     {
-        first.index.swap(second.index);
+        first.outputs.swap(second.outputs);
         first.project_input = true;
     }
     else
     {
         /// Add not removed result from first actions.
-        for (const auto * node : first.index)
+        for (const auto * output_node : first.outputs)
         {
-            auto it = removed_first_result.find(node);
+            auto it = removed_first_result.find(output_node);
             if (it != removed_first_result.end() && it->second > 0)
                 --it->second;
             else
-                second.index.push_back(node);
+                second.outputs.push_back(output_node);
         }
 
-        first.index.swap(second.index);
+        first.outputs.swap(second.outputs);
     }
 
     first.nodes.splice(first.nodes.end(), std::move(second.nodes));
@@ -1256,12 +1266,13 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split_nodes) const
 {
     /// Split DAG into two parts.
-    /// (first_nodes, first_index) is a part which will have split_list in result.
-    /// (second_nodes, second_index) is a part which will have same index as current actions.
-    Nodes second_nodes;
+    /// (first_nodes, first_outputs) is a part which will have split_list in result.
+    /// (second_nodes, second_outputs) is a part which will have same outputs as current actions.
     Nodes first_nodes;
-    NodeRawConstPtrs second_index;
-    NodeRawConstPtrs first_index;
+    NodeRawConstPtrs first_outputs;
+
+    Nodes second_nodes;
+    NodeRawConstPtrs second_outputs;
 
     /// List of nodes from current actions which are not inputs, but will be in second part.
     NodeRawConstPtrs new_inputs;
@@ -1287,8 +1298,8 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
     std::stack<Frame> stack;
     std::unordered_map<const Node *, Data> data;
 
-    for (const auto & node : index)
-        data[node].used_in_result = true;
+    for (const auto & output_node : outputs)
+        data[output_node].used_in_result = true;
 
     /// DFS. Decide if node is needed by split.
     for (const auto & node : nodes)
@@ -1422,15 +1433,15 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
         }
     }
 
-    for (const auto * node : index)
-        second_index.push_back(data[node].to_second);
+    for (const auto * output_node : outputs)
+        second_outputs.push_back(data[output_node].to_second);
 
     NodeRawConstPtrs second_inputs;
     NodeRawConstPtrs first_inputs;
 
-    for (const auto * input : inputs)
+    for (const auto * input_node : inputs)
     {
-        const auto & cur = data[input];
+        const auto & cur = data[input_node];
         first_inputs.push_back(cur.to_first);
     }
 
@@ -1438,17 +1449,17 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
     {
         const auto & cur = data[input];
         second_inputs.push_back(cur.to_second);
-        first_index.push_back(cur.to_first);
+        first_outputs.push_back(cur.to_first);
     }
 
     auto first_actions = std::make_shared<ActionsDAG>();
     first_actions->nodes.swap(first_nodes);
-    first_actions->index.swap(first_index);
+    first_actions->outputs.swap(first_outputs);
     first_actions->inputs.swap(first_inputs);
 
     auto second_actions = std::make_shared<ActionsDAG>();
     second_actions->nodes.swap(second_nodes);
-    second_actions->index.swap(second_index);
+    second_actions->outputs.swap(second_outputs);
     second_actions->inputs.swap(second_inputs);
 
     return {std::move(first_actions), std::move(second_actions)};
@@ -1524,11 +1535,13 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBySortingDescription(const NameS
 {
     std::unordered_set<const Node *> split_nodes;
     for (const auto & sort_column : sort_columns)
-        if (const auto * node = tryFindInIndex(sort_column))
+        if (const auto * node = tryFindInOutputs(sort_column))
             split_nodes.insert(node);
         else
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR, "Sorting column {} wasn't found in the ActionsDAG's index. DAG:\n{}", sort_column, dumpDAG());
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Sorting column {} wasn't found in the ActionsDAG's outputs. DAG:\n{}",
+                sort_column,
+                dumpDAG());
 
     auto res = split(split_nodes);
     res.second->project_input = project_input;
@@ -1537,11 +1550,12 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBySortingDescription(const NameS
 
 ActionsDAG::SplitResult ActionsDAG::splitActionsForFilter(const std::string & column_name) const
 {
-    const auto * node = tryFindInIndex(column_name);
+    const auto * node = tryFindInOutputs(column_name);
     if (!node)
         throw Exception(ErrorCodes::LOGICAL_ERROR,
-                        "Index for ActionsDAG does not contain filter column name {}. DAG:\n{}",
-                        column_name, dumpDAG());
+                        "Outputs for ActionsDAG does not contain filter column name {}. DAG:\n{}",
+                        column_name,
+                        dumpDAG());
 
     std::unordered_set<const Node *> split_nodes = {node};
     auto res = split(split_nodes);
@@ -1689,7 +1703,7 @@ ColumnsWithTypeAndName prepareFunctionArguments(const ActionsDAG::NodeRawConstPt
 /// Create actions which calculate conjunction of selected nodes.
 /// Assume conjunction nodes are predicates (and may be used as arguments of function AND).
 ///
-/// Result actions add single column with conjunction result (it is always first in index).
+/// Result actions add single column with conjunction result (it is always first in outputs).
 /// No other columns are added or removed.
 ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs)
 {
@@ -1763,7 +1777,7 @@ ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunctio
         result_predicate = &actions->addFunction(func_builder_and, std::move(args), {});
     }
 
-    actions->index.push_back(result_predicate);
+    actions->outputs.push_back(result_predicate);
 
     for (const auto & col : all_inputs)
     {
@@ -1778,9 +1792,9 @@ ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunctio
             actions->inputs.push_back(input);
         }
 
-        /// We should not add result_predicate into the index for the second time.
+        /// We should not add result_predicate into the outputs for the second time.
         if (input->result_name != result_predicate->result_name)
-            actions->index.push_back(input);
+            actions->outputs.push_back(input);
     }
 
     return actions;
@@ -1792,10 +1806,12 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
     const Names & available_inputs,
     const ColumnsWithTypeAndName & all_inputs)
 {
-    Node * predicate = const_cast<Node *>(tryFindInIndex(filter_name));
+    Node * predicate = const_cast<Node *>(tryFindInOutputs(filter_name));
     if (!predicate)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR, "Index for ActionsDAG does not contain filter column name {}. DAG:\n{}", filter_name, dumpDAG());
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Output nodes for ActionsDAG do not contain filter column name {}. DAG:\n{}",
+                filter_name,
+                dumpDAG());
 
     /// If condition is constant let's do nothing.
     /// It means there is nothing to push down or optimization was already applied.
@@ -1807,8 +1823,8 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
     /// Get input nodes from available_inputs names.
     {
         std::unordered_map<std::string_view, std::list<const Node *>> inputs_map;
-        for (const auto & input : inputs)
-            inputs_map[input->result_name].emplace_back(input);
+        for (const auto & input_node : inputs)
+            inputs_map[input_node->result_name].emplace_back(input_node);
 
         for (const auto & name : available_inputs)
         {
@@ -1833,8 +1849,8 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
         /// The whole predicate was split.
         if (can_remove_filter)
         {
-            /// If filter column is not needed, remove it from index.
-            std::erase_if(index, [&](const Node * node) { return node == predicate; });
+            /// If filter column is not needed, remove it from output nodes.
+            std::erase_if(outputs, [&](const Node * node) { return node == predicate; });
 
             /// At the very end of this method we'll call removeUnusedActions() with allow_remove_inputs=false,
             /// so we need to manually remove predicate if it is an input node.
@@ -1859,11 +1875,11 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
             {
                 /// Special case. We cannot replace input to constant inplace.
                 /// Because we cannot affect inputs list for actions.
-                /// So we just add a new constant and update index.
+                /// So we just add a new constant and update outputs.
                 const auto * new_predicate = &addNode(node);
-                for (auto & index_node : index)
-                    if (index_node == predicate)
-                        index_node = new_predicate;
+                for (auto & output_node : outputs)
+                    if (output_node == predicate)
+                        output_node = new_predicate;
             }
         }
     }
@@ -1926,4 +1942,106 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
     return actions;
 }
 
+static bool isColumnSortingPreserved(const ActionsDAG::Node * start_node, const String & sorted_column)
+{
+    /// only function node can several children
+    /// but we support monotonicity check only for functions with one argument
+    /// so, currently we consider just first child - it covers majority of cases
+    /// TODO: if one parameter is variable and other are constant then we can try to check monotonicity as well
+
+    /// first find the column
+    const ActionsDAG::Node * node = start_node;
+    bool found = false;
+    while (node)
+    {
+        /// if column found
+        if (node->type == ActionsDAG::ActionType::INPUT && node->result_name == sorted_column)
+        {
+            found = true;
+            break;
+        }
+
+        if (node->children.empty())
+            break; /// column not found
+
+        node = node->children.front();
+    }
+    if (!found)
+        return false;
+
+    /// if column found, check if sorting is preserved
+    const Field field{};
+    node = start_node;
+    while (node)
+    {
+        if (node->type == ActionsDAG::ActionType::FUNCTION)
+        {
+            auto func = node->function_base;
+            if (func)
+            {
+                if (!func->hasInformationAboutMonotonicity())
+                    return false;
+
+                const auto & types = func->getArgumentTypes();
+                if (types.empty())
+                    return false;
+
+                const auto monotonicity = func->getMonotonicityForRange(*types.front(), field, field);
+                if (!monotonicity.is_always_monotonic)
+                    return false;
+            }
+        }
+
+        if (node->children.empty())
+            break;
+
+        node = node->children.front();
+    }
+    return true;
+}
+
+bool ActionsDAG::isSortingPreserved(
+    const Block & input_header, const SortDescription & sort_description, const String & ignore_output_column) const
+{
+    if (sort_description.empty())
+        return true;
+
+    if (hasArrayJoin())
+        return false;
+
+    const Block & output_header = updateHeader(input_header);
+    for (const auto & desc : sort_description)
+    {
+        /// header contains column with the same name
+        if (output_header.findByName(desc.column_name))
+        {
+            /// find the corresponding node in output
+            const auto * output_node = tryFindInOutputs(desc.column_name);
+            if (!output_node)
+            {
+                /// sorted column name in header but NOT in expression output -> no expression is applied to it -> sorting preserved
+                continue;
+            }
+        }
+
+        /// check if any output node is related to the sorted column and sorting order is preserved
+        bool preserved = false;
+        for (const auto * output_node : outputs)
+        {
+            if (output_node->result_name == ignore_output_column)
+                continue;
+
+            if (isColumnSortingPreserved(output_node, desc.column_name))
+            {
+                preserved = true;
+                break;
+            }
+        }
+        if (!preserved)
+            return false;
+    }
+
+    return true;
+}
+
 }
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 07d9ee192ce..14d1dcca6b7 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -33,6 +33,8 @@ namespace JSONBuilder
     using ItemPtr = std::unique_ptr<IItem>;
 }
 
+class SortDescription;
+
 /// Directed acyclic graph of expressions.
 /// This is an intermediate representation of actions which is usually built from expression list AST.
 /// Node of DAG describe calculation of a single column with known type, name, and constant value (if applicable).
@@ -73,7 +75,7 @@ public:
         DataTypePtr result_type;
 
         FunctionOverloadResolverPtr function_builder;
-        /// Can be used after action was added to ExpressionActions if we want to get function signature or properties like monotonicity.
+        /// Can be used to get function signature or properties like monotonicity.
         FunctionBasePtr function_base;
         /// Prepared function which is used in function execution.
         ExecutableFunctionPtr function;
@@ -96,8 +98,8 @@ public:
 
 private:
     Nodes nodes;
-    NodeRawConstPtrs index;
     NodeRawConstPtrs inputs;
+    NodeRawConstPtrs outputs;
 
     bool project_input = false;
     bool projected_output = false;
@@ -111,7 +113,12 @@ public:
     explicit ActionsDAG(const ColumnsWithTypeAndName & inputs_);
 
     const Nodes & getNodes() const { return nodes; }
-    const NodeRawConstPtrs & getIndex() const { return index; }
+    const NodeRawConstPtrs & getOutputs() const { return outputs; }
+    /** Output nodes can contain any column returned from DAG.
+      * You may manually change it if needed.
+      */
+    NodeRawConstPtrs & getOutputs() { return outputs; }
+
     const NodeRawConstPtrs & getInputs() const { return inputs; }
 
     NamesAndTypesList getRequiredColumns() const;
@@ -133,25 +140,26 @@ public:
             NodeRawConstPtrs children,
             std::string result_name);
 
-    /// Index can contain any column returned from DAG.
-    /// You may manually change it if needed.
-    NodeRawConstPtrs & getIndex() { return index; }
-    /// Find first column by name in index. This search is linear.
-    const Node & findInIndex(const std::string & name) const;
+    /// Find first column by name in output nodes. This search is linear.
+    const Node & findInOutputs(const std::string & name) const;
+
     /// Same, but return nullptr if node not found.
-    const Node * tryFindInIndex(const std::string & name) const;
-    /// Find first node with the same name in index and replace it.
-    /// If was not found, add node to index end.
-    void addOrReplaceInIndex(const Node & node);
+    const Node * tryFindInOutputs(const std::string & name) const;
+
+    /// Find first node with the same name in output nodes and replace it.
+    /// If was not found, add node to outputs end.
+    void addOrReplaceInOutputs(const Node & node);
 
     /// Call addAlias several times.
     void addAliases(const NamesWithAliases & aliases);
-    /// Add alias actions and remove unused columns from index. Also specify result columns order in index.
+
+    /// Add alias actions and remove unused columns from outputs. Also specify result columns order in outputs.
     void project(const NamesWithAliases & projection);
 
-    /// If column is not in index, try to find it in nodes and insert back into index.
+    /// If column is not in outputs, try to find it in nodes and insert back into outputs.
     bool tryRestoreColumn(const std::string & column_name);
-    /// Find column in result. Remove it from index.
+
+    /// Find column in result. Remove it from outputs.
     /// If columns is in inputs and has no dependent nodes, remove it from inputs too.
     /// Return true if column was removed from inputs.
     bool removeUnusedResult(const std::string & column_name);
@@ -160,7 +168,13 @@ public:
     bool isInputProjected() const { return project_input; }
     bool isOutputProjected() const { return projected_output; }
 
+    /// Remove actions that are not needed to compute output nodes
+    void removeUnusedActions(bool allow_remove_inputs = true, bool allow_constant_folding = true);
+
+    /// Remove actions that are not needed to compute output nodes with required names
     void removeUnusedActions(const Names & required_names, bool allow_remove_inputs = true, bool allow_constant_folding = true);
+
+    /// Remove actions that are not needed to compute output nodes with required names
     void removeUnusedActions(const NameSet & required_names, bool allow_remove_inputs = true, bool allow_constant_folding = true);
 
     /// Transform the current DAG in a way that leaf nodes get folded into their parents. It's done
@@ -196,10 +210,10 @@ public:
         const String & predicate_column_name = {},
         bool add_missing_keys = true);
 
-    /// Reorder the index nodes using given position mapping.
+    /// Reorder the output nodes using given position mapping.
     void reorderAggregationKeysForProjection(const std::unordered_map<std::string_view, size_t> & key_names_pos_map);
 
-    /// Add aggregate columns to index nodes from projection
+    /// Add aggregate columns to output nodes from projection
     void addAggregatesViaProjection(const Block & aggregates);
 
     bool hasArrayJoin() const;
@@ -263,7 +277,7 @@ public:
 
     /// Split ActionsDAG into two DAGs, where first part contains all nodes from split_nodes and their children.
     /// Execution of first then second parts on block is equivalent to execution of initial DAG.
-    /// First DAG and initial DAG have equal inputs, second DAG and initial DAG has equal index (outputs).
+    /// First DAG and initial DAG have equal inputs, second DAG and initial DAG has equal outputs.
     /// Second DAG inputs may contain less inputs then first DAG (but also include other columns).
     SplitResult split(std::unordered_set<const Node *> split_nodes) const;
 
@@ -271,7 +285,7 @@ public:
     SplitResult splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const;
 
     /// Splits actions into two parts. First part has minimal size sufficient for calculation of column_name.
-    /// Index of initial actions must contain column_name.
+    /// Outputs of initial actions must contain column_name.
     SplitResult splitActionsForFilter(const std::string & column_name) const;
 
     /// Splits actions into two parts. The first part contains all the calculations required to calculate sort_columns.
@@ -301,11 +315,12 @@ public:
         const Names & available_inputs,
         const ColumnsWithTypeAndName & all_inputs);
 
+    bool
+    isSortingPreserved(const Block & input_header, const SortDescription & sort_description, const String & ignore_output_column = "") const;
+
 private:
     Node & addNode(Node node);
 
-    void removeUnusedActions(bool allow_remove_inputs = true, bool allow_constant_folding = true);
-
 #if USE_EMBEDDED_COMPILER
     void compileFunctions(size_t min_count_to_compile_expression, const std::unordered_set<const Node *> & lazy_executed_nodes = {});
 #endif
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index e31fea977ae..6c9e54a966d 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -389,7 +389,7 @@ SetPtr makeExplicitSet(
     const ASTPtr & right_arg = args.children.at(1);
 
     auto column_name = left_arg->getColumnName();
-    const auto & dag_node = actions.findInIndex(column_name);
+    const auto & dag_node = actions.findInOutputs(column_name);
     const DataTypePtr & left_arg_type = dag_node.result_type;
 
     DataTypes set_element_types = {left_arg_type};
@@ -402,8 +402,8 @@ SetPtr makeExplicitSet(
             element_type = low_cardinality_type->getDictionaryType();
 
     auto set_key = PreparedSetKey::forLiteral(*right_arg, set_element_types);
-    if (auto it = prepared_sets.find(set_key); it != prepared_sets.end())
-        return it->second; /// Already prepared.
+    if (auto set = prepared_sets.get(set_key))
+        return set; /// Already prepared.
 
     Block block;
     const auto & right_arg_func = std::dynamic_pointer_cast<ASTFunction>(right_arg);
@@ -418,7 +418,7 @@ SetPtr makeExplicitSet(
     set->insertFromBlock(block.getColumnsWithTypeAndName());
     set->finishInsert();
 
-    prepared_sets.emplace(set_key, set);
+    prepared_sets.set(set_key, set);
     return set;
 }
 
@@ -485,8 +485,7 @@ ActionsMatcher::Data::Data(
     size_t subquery_depth_,
     std::reference_wrapper<const NamesAndTypesList> source_columns_,
     ActionsDAGPtr actions_dag,
-    PreparedSets & prepared_sets_,
-    SubqueriesForSets & subqueries_for_sets_,
+    PreparedSetsPtr prepared_sets_,
     bool no_subqueries_,
     bool no_makeset_,
     bool only_consts_,
@@ -498,7 +497,6 @@ ActionsMatcher::Data::Data(
     , subquery_depth(subquery_depth_)
     , source_columns(source_columns_)
     , prepared_sets(prepared_sets_)
-    , subqueries_for_sets(subqueries_for_sets_)
     , no_subqueries(no_subqueries_)
     , no_makeset(no_makeset_)
     , only_consts(only_consts_)
@@ -507,7 +505,7 @@ ActionsMatcher::Data::Data(
     , actions_stack(std::move(actions_dag), context_)
     , aggregation_keys_info(aggregation_keys_info_)
     , build_expression_with_window_functions(build_expression_with_window_functions_)
-    , next_unique_suffix(actions_stack.getLastActions().getIndex().size() + 1)
+    , next_unique_suffix(actions_stack.getLastActions().getOutputs().size() + 1)
 {
 }
 
@@ -526,9 +524,9 @@ ScopeStack::ScopeStack(ActionsDAGPtr actions_dag, ContextPtr context_) : WithCon
 {
     auto & level = stack.emplace_back();
     level.actions_dag = std::move(actions_dag);
-    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getIndex());
+    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getOutputs());
 
-    for (const auto & node : level.actions_dag->getIndex())
+    for (const auto & node : level.actions_dag->getOutputs())
         if (node->type == ActionsDAG::ActionType::INPUT)
             level.inputs.emplace(node->result_name);
 }
@@ -537,7 +535,7 @@ void ScopeStack::pushLevel(const NamesAndTypesList & input_columns)
 {
     auto & level = stack.emplace_back();
     level.actions_dag = std::make_shared<ActionsDAG>();
-    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getIndex());
+    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getOutputs());
     const auto & prev = stack[stack.size() - 2];
 
     for (const auto & input_column : input_columns)
@@ -547,7 +545,7 @@ void ScopeStack::pushLevel(const NamesAndTypesList & input_columns)
         level.inputs.emplace(input_column.name);
     }
 
-    for (const auto & node : prev.actions_dag->getIndex())
+    for (const auto & node : prev.actions_dag->getOutputs())
     {
         if (!level.index->contains(node->result_name))
         {
@@ -947,7 +945,6 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
             data.source_columns,
             std::make_shared<ActionsDAG>(data.source_columns),
             data.prepared_sets,
-            data.subqueries_for_sets,
             data.no_subqueries,
             data.no_makeset,
             data.only_consts,
@@ -1309,6 +1306,9 @@ void ActionsMatcher::visit(const ASTLiteral & literal, const ASTPtr & /* ast */,
 
 SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_subqueries)
 {
+    if (!data.prepared_sets)
+        return nullptr;
+
     /** You need to convert the right argument to a set.
       * This can be a table name, a value, a value enumeration, or a subquery.
       * The enumeration of values is parsed as a function `tuple`.
@@ -1324,8 +1324,8 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
         if (no_subqueries)
             return {};
         auto set_key = PreparedSetKey::forSubquery(*right_in_operand);
-        if (auto it = data.prepared_sets.find(set_key); it != data.prepared_sets.end())
-            return it->second;
+        if (SetPtr set = data.prepared_sets->get(set_key))
+            return set;
 
         /// A special case is if the name of the table is specified on the right side of the IN statement,
         ///  and the table has the type Set (a previously prepared set).
@@ -1339,25 +1339,17 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
                 StorageSet * storage_set = dynamic_cast<StorageSet *>(table.get());
                 if (storage_set)
                 {
-                    data.prepared_sets.emplace(set_key, storage_set->getSet());
-                    return storage_set->getSet();
+                    SetPtr set = storage_set->getSet();
+                    data.prepared_sets->set(set_key, set);
+                    return set;
                 }
             }
         }
 
         /// We get the stream of blocks for the subquery. Create Set and put it in place of the subquery.
         String set_id = right_in_operand->getColumnName();
-
-        SubqueryForSet & subquery_for_set = data.subqueries_for_sets[set_id];
-
-        /// If you already created a Set with the same subquery / table.
-        if (subquery_for_set.set)
-        {
-            data.prepared_sets.emplace(set_key, subquery_for_set.set);
-            return subquery_for_set.set;
-        }
-
-        SetPtr set = std::make_shared<Set>(data.set_size_limit, false, data.getContext()->getSettingsRef().transform_null_in);
+        bool transform_null_in =  data.getContext()->getSettingsRef().transform_null_in;
+        SubqueryForSet & subquery_for_set = data.prepared_sets->createOrGetSubquery(set_id, set_key, data.set_size_limit, transform_null_in);
 
         /** The following happens for GLOBAL INs or INs:
           * - in the addExternalStorage function, the IN (SELECT ...) subquery is replaced with IN _data1,
@@ -1367,24 +1359,21 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
           * In case that we have HAVING with IN subquery, we have to force creating set for it.
           * Also it doesn't make sense if it is GLOBAL IN or ordinary IN.
           */
-        if (!subquery_for_set.source && data.create_source_for_in)
+        if (data.create_source_for_in && !subquery_for_set.hasSource())
         {
             auto interpreter = interpretSubquery(right_in_operand, data.getContext(), data.subquery_depth, {});
-            subquery_for_set.source = std::make_unique<QueryPlan>();
-            interpreter->buildQueryPlan(*subquery_for_set.source);
+            subquery_for_set.createSource(*interpreter);
         }
 
-        subquery_for_set.set = set;
-        data.prepared_sets.emplace(set_key, set);
-        return set;
+        return subquery_for_set.set;
     }
     else
     {
         const auto & last_actions = data.actions_stack.getLastActions();
         const auto & index = data.actions_stack.getLastActionsIndex();
-        if (index.contains(left_in_operand->getColumnName()))
+        if (data.prepared_sets && index.contains(left_in_operand->getColumnName()))
             /// An explicit enumeration of values in parentheses.
-            return makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, data.prepared_sets);
+            return makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, *data.prepared_sets);
         else
             return {};
     }
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index 5b5a3d31da2..a27745d2cfa 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -5,10 +5,9 @@
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/PreparedSets.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Parsers/IAST.h>
 #include <Core/ColumnNumbers.h>
-
+#include <Core/ColumnWithTypeAndName.h>
 
 namespace DB
 {
@@ -115,7 +114,7 @@ struct AggregationKeysInfo
     GroupByKind group_by_kind;
 };
 
-/// Collect ExpressionAction from AST. Returns PreparedSets and SubqueriesForSets too.
+/// Collect ExpressionAction from AST. Returns PreparedSets
 class ActionsMatcher
 {
 public:
@@ -126,8 +125,7 @@ public:
         SizeLimits set_size_limit;
         size_t subquery_depth;
         const NamesAndTypesList & source_columns;
-        PreparedSets & prepared_sets;
-        SubqueriesForSets & subqueries_for_sets;
+        PreparedSetsPtr prepared_sets;
         bool no_subqueries;
         bool no_makeset;
         bool only_consts;
@@ -150,8 +148,7 @@ public:
             size_t subquery_depth_,
             std::reference_wrapper<const NamesAndTypesList> source_columns_,
             ActionsDAGPtr actions_dag,
-            PreparedSets & prepared_sets_,
-            SubqueriesForSets & subqueries_for_sets_,
+            PreparedSetsPtr prepared_sets_,
             bool no_subqueries_,
             bool no_makeset_,
             bool only_consts_,
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index fc5774735a0..6e101005599 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -17,7 +17,7 @@
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Interpreters/Aggregator.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/MemoryTracker.h>
 #include <Common/CurrentThread.h>
 #include <Common/typeid_cast.h>
@@ -34,11 +34,14 @@
 
 namespace ProfileEvents
 {
-extern const Event ExternalAggregationWritePart;
-extern const Event ExternalAggregationCompressedBytes;
-extern const Event ExternalAggregationUncompressedBytes;
-extern const Event AggregationPreallocatedElementsInHashTables;
-extern const Event AggregationHashTablesInitializedAsTwoLevel;
+    extern const Event ExternalAggregationWritePart;
+    extern const Event ExternalAggregationCompressedBytes;
+    extern const Event ExternalAggregationUncompressedBytes;
+    extern const Event AggregationPreallocatedElementsInHashTables;
+    extern const Event AggregationHashTablesInitializedAsTwoLevel;
+    extern const Event OverflowThrow;
+    extern const Event OverflowBreak;
+    extern const Event OverflowAny;
 }
 
 namespace
@@ -54,7 +57,7 @@ public:
         size_t median_size; // roughly the size we're going to preallocate on each thread
     };
 
-    using Cache = DB::LRUCache<UInt64, Entry>;
+    using Cache = DB::CacheBase<UInt64, Entry>;
     using CachePtr = std::shared_ptr<Cache>;
     using Params = DB::Aggregator::Params::StatsCollectingParams;
 
@@ -1667,14 +1670,17 @@ bool Aggregator::checkLimits(size_t result_size, bool & no_more_keys) const
         switch (params.group_by_overflow_mode)
         {
             case OverflowMode::THROW:
+                ProfileEvents::increment(ProfileEvents::OverflowThrow);
                 throw Exception("Limit for rows to GROUP BY exceeded: has " + toString(result_size)
                     + " rows, maximum: " + toString(params.max_rows_to_group_by),
                     ErrorCodes::TOO_MANY_ROWS);
 
             case OverflowMode::BREAK:
+                ProfileEvents::increment(ProfileEvents::OverflowBreak);
                 return false;
 
             case OverflowMode::ANY:
+                ProfileEvents::increment(ProfileEvents::OverflowAny);
                 no_more_keys = true;
                 break;
         }
diff --git a/src/Interpreters/AsynchronousMetrics.cpp b/src/Interpreters/AsynchronousMetrics.cpp
index 9fd27fc28b6..f9bc22dd110 100644
--- a/src/Interpreters/AsynchronousMetrics.cpp
+++ b/src/Interpreters/AsynchronousMetrics.cpp
@@ -12,9 +12,9 @@
 #include <Common/typeid_cast.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/FileCacheFactory.h>
-#include <Common/IFileCache.h>
 #include <Common/getCurrentProcessFDCount.h>
 #include <Common/getMaxFileDescriptorCount.h>
+#include <Common/FileCache.h>
 #include <Server/ProtocolServerAdapter.h>
 #include <Storages/MarkCache.h>
 #include <Storages/StorageMergeTree.h>
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index ddf3b46f102..6877c0ece06 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -425,7 +425,7 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
             auto pool = ConnectionPoolFactory::instance().get(
                 settings.distributed_connections_pool_size,
                 address.host_name, address.port,
-                address.default_database, address.user, address.password,
+                address.default_database, address.user, address.password, address.quota_key,
                 address.cluster, address.cluster_secret,
                 "server", address.compression,
                 address.secure, address.priority);
@@ -499,7 +499,7 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
                 auto replica_pool = ConnectionPoolFactory::instance().get(
                     settings.distributed_connections_pool_size,
                     replica.host_name, replica.port,
-                    replica.default_database, replica.user, replica.password,
+                    replica.default_database, replica.user, replica.password, replica.quota_key,
                     replica.cluster, replica.cluster_secret,
                     "server", replica.compression,
                     replica.secure, replica.priority);
@@ -587,7 +587,7 @@ Cluster::Cluster(
             auto replica_pool = ConnectionPoolFactory::instance().get(
                         settings.distributed_connections_pool_size,
                         replica.host_name, replica.port,
-                        replica.default_database, replica.user, replica.password,
+                        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);
@@ -699,6 +699,7 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
                 address.default_database,
                 address.user,
                 address.password,
+                address.quota_key,
                 address.cluster,
                 address.cluster_secret,
                 "server",
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index 72958703d0e..ada04aa1cae 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -93,6 +93,7 @@ public:
         UInt16 port{0};
         String user;
         String password;
+        String quota_key;
 
         /// For inter-server authorization
         String cluster;
diff --git a/src/Interpreters/ConcurrentHashJoin.cpp b/src/Interpreters/ConcurrentHashJoin.cpp
index fd802a49008..b7ad56dca91 100644
--- a/src/Interpreters/ConcurrentHashJoin.cpp
+++ b/src/Interpreters/ConcurrentHashJoin.cpp
@@ -9,7 +9,6 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/PreparedSets.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/createBlockSelector.h>
 #include <Parsers/DumpASTNode.h>
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index a5629b33d22..a8810ada1b0 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -1657,14 +1657,14 @@ ProcessList::Element * Context::getProcessListElement() const
 }
 
 
-void Context::setUncompressedCache(size_t max_size_in_bytes)
+void Context::setUncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy)
 {
     auto lock = getLock();
 
     if (shared->uncompressed_cache)
         throw Exception("Uncompressed cache has been already created.", ErrorCodes::LOGICAL_ERROR);
 
-    shared->uncompressed_cache = std::make_shared<UncompressedCache>(max_size_in_bytes);
+    shared->uncompressed_cache = std::make_shared<UncompressedCache>(max_size_in_bytes, uncompressed_cache_policy);
 }
 
 
@@ -1683,14 +1683,14 @@ void Context::dropUncompressedCache() const
 }
 
 
-void Context::setMarkCache(size_t cache_size_in_bytes)
+void Context::setMarkCache(size_t cache_size_in_bytes, const String & mark_cache_policy)
 {
     auto lock = getLock();
 
     if (shared->mark_cache)
         throw Exception("Mark cache has been already created.", ErrorCodes::LOGICAL_ERROR);
 
-    shared->mark_cache = std::make_shared<MarkCache>(cache_size_in_bytes);
+    shared->mark_cache = std::make_shared<MarkCache>(cache_size_in_bytes, mark_cache_policy);
 }
 
 MarkCachePtr Context::getMarkCache() const
@@ -2965,6 +2965,11 @@ void Context::setQueryParameter(const String & name, const String & value)
         throw Exception("Duplicate name " + backQuote(name) + " of query parameter", ErrorCodes::BAD_ARGUMENTS);
 }
 
+void Context::addQueryParameters(const NameToNameMap & parameters)
+{
+    for (const auto & [name, value] : parameters)
+        query_parameters.insert_or_assign(name, value);
+}
 
 void Context::addBridgeCommand(std::unique_ptr<ShellCommand> cmd) const
 {
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index cf508c7bfdb..ea03b8e6586 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -780,12 +780,12 @@ public:
     void setSystemZooKeeperLogAfterInitializationIfNeeded();
 
     /// Create a cache of uncompressed blocks of specified size. This can be done only once.
-    void setUncompressedCache(size_t max_size_in_bytes);
+    void setUncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy);
     std::shared_ptr<UncompressedCache> getUncompressedCache() const;
     void dropUncompressedCache() const;
 
     /// Create a cache of marks of specified size. This can be done only once.
-    void setMarkCache(size_t cache_size_in_bytes);
+    void setMarkCache(size_t cache_size_in_bytes, const String & mark_cache_policy);
     std::shared_ptr<MarkCache> getMarkCache() const;
     void dropMarkCache() const;
 
@@ -946,9 +946,14 @@ public:
     /// Query parameters for prepared statements.
     bool hasQueryParameters() const;
     const NameToNameMap & getQueryParameters() const;
+
+    /// Throws if parameter with the given name already set.
     void setQueryParameter(const String & name, const String & value);
     void setQueryParameters(const NameToNameMap & parameters) { query_parameters = parameters; }
 
+    /// Overrides values of existing parameters.
+    void addQueryParameters(const NameToNameMap & parameters);
+
     /// Add started bridge command. It will be killed after context destruction
     void addBridgeCommand(std::unique_ptr<ShellCommand> cmd) const;
 
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 71fcd7a1884..880a624376d 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -25,6 +25,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_TYPE_OF_QUERY;
     extern const int INCONSISTENT_CLUSTER_DEFINITION;
     extern const int LOGICAL_ERROR;
+    extern const int DNS_ERROR;
 }
 
 HostID HostID::fromString(const String & host_port_str)
@@ -58,7 +59,12 @@ void DDLLogEntry::assertVersion() const
 void DDLLogEntry::setSettingsIfRequired(ContextPtr context)
 {
     version = context->getSettingsRef().distributed_ddl_entry_format_version;
-    if (version == 2)
+
+    /// NORMALIZE_CREATE_ON_INITIATOR_VERSION does not affect entry format in ZooKeeper
+    if (version == NORMALIZE_CREATE_ON_INITIATOR_VERSION)
+        version = SETTINGS_IN_ZK_VERSION;
+
+    if (version == SETTINGS_IN_ZK_VERSION)
         settings.emplace(context->getSettingsRef().changes());
 }
 
@@ -69,7 +75,7 @@ String DDLLogEntry::toString() const
     wb << "version: " << version << "\n";
     wb << "query: " << escape << query << "\n";
 
-    bool write_hosts = version == 1 || !hosts.empty();
+    bool write_hosts = version == OLDEST_VERSION || !hosts.empty();
     if (write_hosts)
     {
         Strings host_id_strings(hosts.size());
@@ -79,7 +85,7 @@ String DDLLogEntry::toString() const
 
     wb << "initiator: " << initiator << "\n";
 
-    bool write_settings = 1 <= version && settings && !settings->empty();
+    bool write_settings = SETTINGS_IN_ZK_VERSION <= version && settings && !settings->empty();
     if (write_settings)
     {
         ASTSetQuery ast;
@@ -164,17 +170,33 @@ ContextMutablePtr DDLTaskBase::makeQueryContext(ContextPtr from_context, const Z
 bool DDLTask::findCurrentHostID(ContextPtr global_context, Poco::Logger * log)
 {
     bool host_in_hostlist = false;
+    std::exception_ptr first_exception = nullptr;
 
     for (const HostID & host : entry.hosts)
     {
         auto maybe_secure_port = global_context->getTCPPortSecure();
 
-        /// The port is considered local if it matches TCP or TCP secure port that the server is listening.
-        bool is_local_port = (maybe_secure_port && host.isLocalAddress(*maybe_secure_port))
-                             || host.isLocalAddress(global_context->getTCPPort());
+        try
+        {
+            /// The port is considered local if it matches TCP or TCP secure port that the server is listening.
+            bool is_local_port
+                = (maybe_secure_port && host.isLocalAddress(*maybe_secure_port)) || host.isLocalAddress(global_context->getTCPPort());
 
-        if (!is_local_port)
+            if (!is_local_port)
+                continue;
+        }
+        catch (const Exception & e)
+        {
+            if (e.code() != ErrorCodes::DNS_ERROR)
+                throw;
+
+            if (!first_exception)
+                first_exception = std::current_exception();
+
+            /// Ignore unknown hosts (in case DNS record was removed)
+            /// We will rethrow exception if we don't find local host in the list.
             continue;
+        }
 
         if (host_in_hostlist)
         {
@@ -190,6 +212,12 @@ bool DDLTask::findCurrentHostID(ContextPtr global_context, Poco::Logger * log)
         }
     }
 
+    if (!host_in_hostlist && first_exception)
+    {
+        /// We don't know for sure if we should process task or not
+        std::rethrow_exception(first_exception);
+    }
+
     return host_in_hostlist;
 }
 
@@ -361,7 +389,7 @@ void DatabaseReplicatedTask::parseQueryFromEntry(ContextPtr context)
     if (auto * ddl_query = dynamic_cast<ASTQueryWithTableAndOutput *>(query.get()))
     {
         /// Update database name with actual name of local database
-        assert(!ddl_query->database);
+        chassert(!ddl_query->database);
         ddl_query->setDatabase(database->getDatabaseName());
     }
 }
@@ -397,6 +425,24 @@ Coordination::RequestPtr DatabaseReplicatedTask::getOpToUpdateLogPointer()
     return zkutil::makeSetRequest(database->replica_path + "/log_ptr", toString(getLogEntryNumber(entry_name)), -1);
 }
 
+void DatabaseReplicatedTask::createSyncedNodeIfNeed(const ZooKeeperPtr & zookeeper)
+{
+    assert(!completely_processed);
+    if (!entry.settings)
+        return;
+
+    Field value;
+    if (!entry.settings->tryGet("database_replicated_enforce_synchronous_settings", value))
+        return;
+
+    /// Bool type is really weird, sometimes it's Bool and sometimes it's UInt64...
+    assert(value.getType() == Field::Types::Bool || value.getType() == Field::Types::UInt64);
+    if (!value.get<UInt64>())
+        return;
+
+    zookeeper->createIfNotExists(getSyncedNodePath(), "");
+}
+
 String DDLTaskBase::getLogEntryName(UInt32 log_entry_number)
 {
     return zkutil::getSequentialNodeName("query-", log_entry_number);
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index d3728918a2d..d5990edd43f 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -66,6 +66,10 @@ struct HostID
 
 struct DDLLogEntry
 {
+    static constexpr const UInt64 OLDEST_VERSION = 1;
+    static constexpr const UInt64 SETTINGS_IN_ZK_VERSION = 2;
+    static constexpr const UInt64 NORMALIZE_CREATE_ON_INITIATOR_VERSION = 3;
+
     UInt64 version = 1;
     String query;
     std::vector<HostID> hosts;
@@ -109,9 +113,12 @@ struct DDLTaskBase
     virtual ContextMutablePtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper);
     virtual Coordination::RequestPtr getOpToUpdateLogPointer() { return nullptr; }
 
+    virtual void createSyncedNodeIfNeed(const ZooKeeperPtr & /*zookeeper*/) {}
+
     inline String getActiveNodePath() const { return fs::path(entry_path) / "active" / host_id_str; }
     inline String getFinishedNodePath() const { return fs::path(entry_path) / "finished" / host_id_str; }
     inline String getShardNodePath() const { return fs::path(entry_path) / "shards" / getShardID(); }
+    inline String getSyncedNodePath() const { return fs::path(entry_path) / "synced" / host_id_str; }
 
     static String getLogEntryName(UInt32 log_entry_number);
     static UInt32 getLogEntryNumber(const String & log_entry_name);
@@ -147,6 +154,7 @@ struct DatabaseReplicatedTask : public DDLTaskBase
     void parseQueryFromEntry(ContextPtr context) override;
     ContextMutablePtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper) override;
     Coordination::RequestPtr getOpToUpdateLogPointer() override;
+    void createSyncedNodeIfNeed(const ZooKeeperPtr & zookeeper) override;
 
     DatabaseReplicated * database;
 };
@@ -174,6 +182,12 @@ class ZooKeeperMetadataTransaction
     String task_path;
     Coordination::Requests ops;
 
+    /// CREATE OR REPLACE is special query that consists of 3 separate DDL queries (CREATE, RENAME, DROP)
+    /// and not all changes should be applied to metadata in ZooKeeper
+    /// (otherwise we may get partially applied changes on connection loss).
+    /// So we need this flag to avoid doing unnecessary operations with metadata.
+    bool is_create_or_replace_query = false;
+
 public:
     ZooKeeperMetadataTransaction(const ZooKeeperPtr & current_zookeeper_, const String & zookeeper_path_, bool is_initial_query_, const String & task_path_)
     : current_zookeeper(current_zookeeper_)
@@ -193,6 +207,10 @@ public:
 
     ZooKeeperPtr getZooKeeper() const { return current_zookeeper; }
 
+    void setIsCreateOrReplaceQuery() { is_create_or_replace_query = true; }
+
+    bool isCreateOrReplaceQuery() const { return is_create_or_replace_query; }
+
     void addOp(Coordination::RequestPtr && op)
     {
         if (isExecuted())
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 13432940c1b..6ec20ab5f5f 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -112,6 +112,8 @@ DDLWorker::DDLWorker(
 
 void DDLWorker::startup()
 {
+    [[maybe_unused]] bool prev_stop_flag = stop_flag.exchange(false);
+    chassert(true);
     main_thread = ThreadFromGlobalPool(&DDLWorker::runMainThread, this);
     cleanup_thread = ThreadFromGlobalPool(&DDLWorker::runCleanupThread, this);
 }
@@ -251,7 +253,7 @@ void DDLWorker::scheduleTasks(bool reinitialized)
             auto & task = *task_it;
             if (task->completely_processed)
             {
-                assert(task->was_executed);
+                chassert(task->was_executed);
                 /// Status must be written (but finished/ node may not exist if entry was deleted).
                 /// If someone is deleting entry concurrently, then /active status dir must not exist.
                 assert(zookeeper->exists(task->getFinishedNodePath()) || !zookeeper->exists(fs::path(task->entry_path) / "active"));
@@ -267,7 +269,13 @@ void DDLWorker::scheduleTasks(bool reinitialized)
                 /// but we lost connection while waiting for the response.
                 /// Yeah, distributed systems is a zoo.
                 if (status_written)
+                {
+                    /// TODO We cannot guarantee that query was actually executed synchronously if connection was lost.
+                    /// Let's simple create synced/ node for now, but it would be better to pass UNFINISHED status to initiator
+                    /// or wait for query to actually finish (requires https://github.com/ClickHouse/ClickHouse/issues/23513)
+                    task->createSyncedNodeIfNeed(zookeeper);
                     task->completely_processed = true;
+                }
                 else
                     processTask(*task, zookeeper);
                 ++task_it;
@@ -312,7 +320,7 @@ void DDLWorker::scheduleTasks(bool reinitialized)
     if (first_failed_task_name)
     {
         /// If we had failed tasks, then we should start from the first failed task.
-        assert(reinitialized);
+        chassert(reinitialized);
         begin_node = std::lower_bound(queue_nodes.begin(), queue_nodes.end(), first_failed_task_name);
     }
     else
@@ -505,7 +513,7 @@ void DDLWorker::updateMaxDDLEntryID(const String & entry_name)
 void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
 {
     LOG_DEBUG(log, "Processing task {} ({})", task.entry_name, task.entry.query);
-    assert(!task.completely_processed);
+    chassert(!task.completely_processed);
 
     String active_node_path = task.getActiveNodePath();
     String finished_node_path = task.getFinishedNodePath();
@@ -523,14 +531,14 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
     {
         if (create_active_res != Coordination::Error::ZNONODE && create_active_res != Coordination::Error::ZNODEEXISTS)
         {
-            assert(Coordination::isHardwareError(create_active_res));
+            chassert(Coordination::isHardwareError(create_active_res));
             throw Coordination::Exception(create_active_res, active_node_path);
         }
 
         /// Status dirs were not created in enqueueQuery(...) or someone is removing entry
         if (create_active_res == Coordination::Error::ZNONODE)
         {
-            assert(dynamic_cast<DatabaseReplicatedTask *>(&task) == nullptr);
+            chassert(dynamic_cast<DatabaseReplicatedTask *>(&task) == nullptr);
             if (task.was_executed)
             {
                 /// Special case:
@@ -643,6 +651,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
     /// Active node was removed in multi ops
     active_node->setAlreadyRemoved();
 
+    task.createSyncedNodeIfNeed(zookeeper);
     task.completely_processed = true;
     updateMaxDDLEntryID(task.entry_name);
 }
@@ -810,7 +819,7 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
         }
     }
 
-    assert(!(executed_by_us && executed_by_other_leader));
+    chassert(!(executed_by_us && executed_by_other_leader));
 
     /// Not executed by leader so was not executed at all
     if (!executed_by_us && !executed_by_other_leader)
@@ -901,9 +910,9 @@ void DDLWorker::cleanupQueue(Int64, const ZooKeeperPtr & zookeeper)
                 /// Possible rare case: initiator node has lost connection after enqueueing entry and failed to create status dirs.
                 /// No one has started to process the entry, so node_path/active and node_path/finished nodes were never created, node_path has no children.
                 /// Entry became outdated, but we cannot remove remove it in a transaction with node_path/finished.
-                assert(res[0]->error == Coordination::Error::ZOK && res[1]->error == Coordination::Error::ZNONODE);
+                chassert(res[0]->error == Coordination::Error::ZOK && res[1]->error == Coordination::Error::ZNONODE);
                 rm_entry_res = zookeeper->tryRemove(node_path);
-                assert(rm_entry_res != Coordination::Error::ZNOTEMPTY);
+                chassert(rm_entry_res != Coordination::Error::ZNOTEMPTY);
                 continue;
             }
             zkutil::KeeperMultiException::check(rm_entry_res, ops, res);
@@ -1004,7 +1013,7 @@ String DDLWorker::enqueueQuery(DDLLogEntry & entry)
 
 bool DDLWorker::initializeMainThread()
 {
-    assert(!initialized);
+    chassert(!initialized);
     setThreadName("DDLWorker");
     LOG_DEBUG(log, "Initializing DDLWorker thread");
 
@@ -1023,7 +1032,7 @@ bool DDLWorker::initializeMainThread()
             {
                 /// A logical error.
                 LOG_ERROR(log, "ZooKeeper error: {}. Failed to start DDLWorker.", getCurrentExceptionMessage(true));
-                assert(false);  /// Catch such failures in tests with debug build
+                chassert(false);  /// Catch such failures in tests with debug build
             }
 
             tryLogCurrentException(__PRETTY_FUNCTION__);
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index 5dc6d4acbe5..7ddcc80c02a 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -138,7 +138,7 @@ protected:
     std::shared_ptr<Poco::Event> queue_updated_event = std::make_shared<Poco::Event>();
     std::shared_ptr<Poco::Event> cleanup_event = std::make_shared<Poco::Event>();
     std::atomic<bool> initialized = false;
-    std::atomic<bool> stop_flag = false;
+    std::atomic<bool> stop_flag = true;
 
     ThreadFromGlobalPool main_thread;
     ThreadFromGlobalPool cleanup_thread;
diff --git a/src/Interpreters/DictionaryReader.cpp b/src/Interpreters/DictionaryReader.cpp
deleted file mode 100644
index 3c66b0019ed..00000000000
--- a/src/Interpreters/DictionaryReader.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <Interpreters/DictionaryReader.h>
-#include <Interpreters/Context.h>
-#include <Common/typeid_cast.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnConst.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Functions/FunctionFactory.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
-    extern const int TYPE_MISMATCH;
-}
-
-
-DictionaryReader::FunctionWrapper::FunctionWrapper(FunctionOverloadResolverPtr resolver, const ColumnsWithTypeAndName & arguments,
-                                                   Block & block, const ColumnNumbers & arg_positions_, const String & column_name,
-                                                   TypeIndex expected_type)
-    : arg_positions(arg_positions_)
-    , result_pos(block.columns())
-{
-    FunctionBasePtr prepared_function = resolver->build(arguments);
-
-    ColumnWithTypeAndName result;
-    result.name = "get_" + column_name;
-    result.type = prepared_function->getResultType();
-    if (result.type->getTypeId() != expected_type)
-        throw Exception("Type mismatch in dictionary reader for: " + column_name, ErrorCodes::TYPE_MISMATCH);
-    block.insert(result);
-
-    ColumnsWithTypeAndName args;
-    args.reserve(arg_positions.size());
-    for (auto pos : arg_positions)
-        args.emplace_back(block.getByPosition(pos));
-
-    function = prepared_function->prepare(block.getColumnsWithTypeAndName());
-}
-
-static constexpr const size_t key_size = 1;
-
-DictionaryReader::DictionaryReader(const String & dictionary_name, const Names & src_column_names, const NamesAndTypesList & result_columns,
-                                   ContextPtr context)
-    : result_header(makeResultBlock(result_columns))
-    , key_position(key_size + result_header.columns())
-{
-    if (src_column_names.size() != result_columns.size())
-        throw Exception("Columns number mismatch in dictionary reader", ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH);
-
-    ColumnWithTypeAndName dict_name;
-    ColumnWithTypeAndName key;
-    ColumnWithTypeAndName column_name;
-
-    {
-        dict_name.name = "dict";
-        dict_name.type = std::make_shared<DataTypeString>();
-        dict_name.column = dict_name.type->createColumnConst(1, dictionary_name);
-
-        /// TODO: composite key (key_size > 1)
-        key.name = "key";
-        key.type = std::make_shared<DataTypeUInt64>();
-
-        column_name.name = "column";
-        column_name.type = std::make_shared<DataTypeString>();
-    }
-
-    /// dictHas('dict_name', id)
-    ColumnsWithTypeAndName arguments_has;
-    arguments_has.push_back(dict_name);
-    arguments_has.push_back(key);
-
-    /// dictGet('dict_name', 'attr_name', id)
-    ColumnsWithTypeAndName arguments_get;
-    arguments_get.push_back(dict_name);
-    arguments_get.push_back(column_name);
-    arguments_get.push_back(key);
-
-    sample_block.insert(dict_name);
-
-    for (const auto & columns_name : src_column_names)
-    {
-        ColumnWithTypeAndName name;
-        name.name = "col_" + columns_name;
-        name.type = std::make_shared<DataTypeString>();
-        name.column = name.type->createColumnConst(1, columns_name);
-
-        sample_block.insert(name);
-    }
-
-    sample_block.insert(key);
-
-    ColumnNumbers positions_has{0, key_position};
-    function_has = std::make_unique<FunctionWrapper>(FunctionFactory::instance().get("dictHas", context),
-                                                        arguments_has, sample_block, positions_has, "has", DataTypeUInt8().getTypeId());
-    functions_get.reserve(result_header.columns());
-
-    for (size_t i = 0; i < result_header.columns(); ++i)
-    {
-        size_t column_name_pos = key_size + i;
-        auto & column = result_header.getByPosition(i);
-        arguments_get[1].column = DataTypeString().createColumnConst(1, src_column_names[i]);
-        ColumnNumbers positions_get{0, column_name_pos, key_position};
-        functions_get.emplace_back(
-            FunctionWrapper(FunctionFactory::instance().get("dictGet", context),
-                            arguments_get, sample_block, positions_get, column.name, column.type->getTypeId()));
-    }
-}
-
-void DictionaryReader::readKeys(const IColumn & keys, Block & out_block, ColumnVector<UInt8>::Container & found,
-                                std::vector<size_t> & positions) const
-{
-    auto working_block = sample_block.getColumnsWithTypeAndName();
-    size_t has_position = key_position + 1;
-    size_t size = keys.size();
-
-    /// set keys for dictHas()
-    ColumnWithTypeAndName & key_column = working_block[key_position];
-    key_column.column = keys.cloneResized(size); /// just a copy we cannot avoid
-
-    /// calculate and extract dictHas()
-    function_has->execute(working_block, size);
-    ColumnWithTypeAndName & has_column = working_block[has_position];
-    auto mutable_has = IColumn::mutate(std::move(has_column.column));
-    found.swap(typeid_cast<ColumnVector<UInt8> &>(*mutable_has).getData());
-    has_column.column = nullptr;
-
-    /// set mapping from source keys to resulting rows in output block
-    positions.clear();
-    positions.resize(size, 0);
-    size_t pos = 0;
-    for (size_t i = 0; i < size; ++i)
-        if (found[i])
-            positions[i] = pos++;
-
-    /// set keys for dictGet(): remove not found keys
-    key_column.column = key_column.column->filter(found, -1);
-    size_t rows = key_column.column->size();
-
-    /// calculate dictGet()
-    for (const auto & func : functions_get)
-        func.execute(working_block, rows);
-
-    /// make result: copy header block with correct names and move data columns
-    out_block = result_header.cloneEmpty();
-    size_t first_get_position = has_position + 1;
-    for (size_t i = 0; i < out_block.columns(); ++i)
-    {
-        auto & src_column = working_block[first_get_position + i];
-        auto & dst_column = out_block.getByPosition(i);
-        dst_column.column = src_column.column;
-        src_column.column = nullptr;
-    }
-}
-
-Block DictionaryReader::makeResultBlock(const NamesAndTypesList & names)
-{
-    Block block;
-    for (const auto & nm : names)
-    {
-        ColumnWithTypeAndName column{nullptr, nm.type, nm.name};
-        if (column.type->isNullable())
-            column.type = typeid_cast<const DataTypeNullable &>(*column.type).getNestedType();
-        block.insert(std::move(column));
-    }
-    return block;
-}
-
-}
diff --git a/src/Interpreters/DictionaryReader.h b/src/Interpreters/DictionaryReader.h
deleted file mode 100644
index bfb21e2f050..00000000000
--- a/src/Interpreters/DictionaryReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-#include <Columns/ColumnVector.h>
-#include <Functions/IFunctionAdaptors.h>
-#include <Interpreters/Context_fwd.h>
-
-namespace DB
-{
-
-/// Read block of required columns from Dictionary by UInt64 key column. Rename columns if needed.
-/// Current implementation uses dictHas() + N * dictGet() functions.
-class DictionaryReader
-{
-public:
-    struct FunctionWrapper
-    {
-        ExecutableFunctionPtr function;
-        ColumnNumbers arg_positions;
-        size_t result_pos = 0;
-
-        FunctionWrapper(FunctionOverloadResolverPtr resolver, const ColumnsWithTypeAndName & arguments, Block & block,
-                        const ColumnNumbers & arg_positions_, const String & column_name, TypeIndex expected_type);
-
-        void execute(ColumnsWithTypeAndName & columns, size_t rows) const
-        {
-            ColumnsWithTypeAndName args;
-            args.reserve(arg_positions.size());
-            for (auto pos : arg_positions)
-                args.emplace_back(columns[pos]);
-
-            columns[result_pos].column = function->execute(args, columns[result_pos].type, rows, false);
-        }
-    };
-
-    DictionaryReader(const String & dictionary_name, const Names & src_column_names, const NamesAndTypesList & result_columns,
-                     ContextPtr context);
-    void readKeys(const IColumn & keys, Block & out_block, ColumnVector<UInt8>::Container & found, std::vector<size_t> & positions) const;
-
-private:
-    Block result_header;
-    Block sample_block; /// dictionary name, column names, key, dictHas() result, dictGet() results
-    size_t key_position;
-    std::unique_ptr<FunctionWrapper> function_has;
-    std::vector<FunctionWrapper> functions_get;
-
-    static Block makeResultBlock(const NamesAndTypesList & names);
-};
-
-}
diff --git a/src/Interpreters/DirectJoin.cpp b/src/Interpreters/DirectJoin.cpp
index af6bd484753..02b3854a47b 100644
--- a/src/Interpreters/DirectJoin.cpp
+++ b/src/Interpreters/DirectJoin.cpp
@@ -30,6 +30,11 @@ static MutableColumns convertBlockStructure(
     MutableColumns result_columns;
     for (const auto & out_sample_col : result_sample_block)
     {
+        /// Some columns from result_sample_block may not be in source_sample_block,
+        /// e.g. if they will be calculated later based on joined columns
+        if (!source_sample_block.has(out_sample_col.name))
+            continue;
+
         auto i = source_sample_block.getPositionByName(out_sample_col.name);
         if (columns[i] == nullptr)
         {
@@ -58,24 +63,31 @@ static MutableColumns convertBlockStructure(
 
 DirectKeyValueJoin::DirectKeyValueJoin(std::shared_ptr<TableJoin> table_join_,
                                        const Block & right_sample_block_,
-                                       std::shared_ptr<IKeyValueStorage> storage_)
+                                       std::shared_ptr<const IKeyValueEntity> storage_)
     : table_join(table_join_)
     , storage(storage_)
     , right_sample_block(right_sample_block_)
     , log(&Poco::Logger::get("DirectKeyValueJoin"))
 {
-    if (!table_join->oneDisjunct()
-        || table_join->getOnlyClause().key_names_left.size() != 1
-        || table_join->getOnlyClause().key_names_right.size() != 1)
+    if (!table_join->oneDisjunct() ||
+        table_join->getOnlyClause().key_names_left.size() != 1 ||
+        table_join->getOnlyClause().key_names_right.size() != 1)
     {
         throw DB::Exception(ErrorCodes::UNSUPPORTED_JOIN_KEYS, "Not supported by direct JOIN");
     }
 
-    if (table_join->strictness() != JoinStrictness::All &&
-        table_join->strictness() != JoinStrictness::Any &&
-        table_join->strictness() != JoinStrictness::RightAny)
+    bool allowed_inner = isInner(table_join->kind()) && (table_join->strictness() == JoinStrictness::All ||
+                                                         table_join->strictness() == JoinStrictness::Any ||
+                                                         table_join->strictness() != JoinStrictness::RightAny);
+
+    bool allowed_left = isLeft(table_join->kind()) && (table_join->strictness() == JoinStrictness::Any ||
+                                                       table_join->strictness() == JoinStrictness::All ||
+                                                       table_join->strictness() == JoinStrictness::Semi ||
+                                                       table_join->strictness() == JoinStrictness::Anti);
+    if (!allowed_inner && !allowed_left)
     {
-        throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "Not supported by direct JOIN");
+        throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "Strictness {} and kind {} is not supported by direct JOIN",
+            table_join->strictness(), table_join->kind());
     }
 
     LOG_TRACE(log, "Using direct join");
@@ -101,12 +113,14 @@ void DirectKeyValueJoin::joinBlock(Block & block, std::shared_ptr<ExtraBlock> &)
     if (!key_col.column)
         return;
 
-    NullMap null_map;
-    Chunk joined_chunk = storage->getByKeys({key_col}, null_map);
-
-    /// Expected right block may differ from structure in storage, because of `join_use_nulls` or we just select not all columns.
     Block original_right_block = originalRightBlock(right_sample_block, *table_join);
-    Block sample_storage_block = storage->getInMemoryMetadataPtr()->getSampleBlock();
+    const Names & attribute_names = original_right_block.getNames();
+
+    NullMap null_map;
+    Chunk joined_chunk = storage->getByKeys({key_col}, null_map, attribute_names);
+
+    /// Expected right block may differ from structure in storage, because of `join_use_nulls` or we just select not all joined attributes
+    Block sample_storage_block = storage->getSampleBlock(attribute_names);
     MutableColumns result_columns = convertBlockStructure(sample_storage_block, original_right_block, joined_chunk.mutateColumns(), null_map);
 
     for (size_t i = 0; i < result_columns.size(); ++i)
@@ -116,7 +130,18 @@ void DirectKeyValueJoin::joinBlock(Block & block, std::shared_ptr<ExtraBlock> &)
         block.insert(std::move(col));
     }
 
-    if (!isLeftOrFull(table_join->kind()))
+    bool is_semi_join = table_join->strictness() == JoinStrictness::Semi;
+    bool is_anti_join = table_join->strictness() == JoinStrictness::Anti;
+
+    if (is_anti_join)
+    {
+        /// invert null_map
+        for (auto & val : null_map)
+            val = !val;
+    }
+
+    /// Filter non joined rows
+    if (isInner(table_join->kind()) || (isLeft(table_join->kind()) && (is_semi_join || is_anti_join)))
     {
         MutableColumns dst_columns = block.mutateColumns();
         for (auto & col : dst_columns)
diff --git a/src/Interpreters/DirectJoin.h b/src/Interpreters/DirectJoin.h
index f7da06ef826..8e82b59da02 100644
--- a/src/Interpreters/DirectJoin.h
+++ b/src/Interpreters/DirectJoin.h
@@ -9,7 +9,7 @@
 
 #include <QueryPipeline/SizeLimits.h>
 
-#include <Storages/IKVStorage.h>
+#include <Interpreters/IKeyValueEntity.h>
 #include <Storages/IStorage_fwd.h>
 
 namespace DB
@@ -23,7 +23,7 @@ public:
     DirectKeyValueJoin(
         std::shared_ptr<TableJoin> table_join_,
         const Block & right_sample_block_,
-        std::shared_ptr<IKeyValueStorage> storage_);
+        std::shared_ptr<const IKeyValueEntity> storage_);
 
     virtual const TableJoin & getTableJoin() const override { return *table_join; }
 
@@ -50,7 +50,7 @@ public:
 
 private:
     std::shared_ptr<TableJoin> table_join;
-    std::shared_ptr<IKeyValueStorage> storage;
+    std::shared_ptr<const IKeyValueEntity> storage;
     Block right_sample_block;
     Block sample_block_with_columns_to_add;
     Poco::Logger * log;
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index 2e96ffe7947..b27df0f1c35 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -47,8 +47,6 @@ namespace ErrorCodes
     extern const int TYPE_MISMATCH;
 }
 
-ExpressionActions::~ExpressionActions() = default;
-
 static std::unordered_set<const ActionsDAG::Node *> processShortCircuitFunctions(const ActionsDAG & actions_dag, ShortCircuitFunctionEvaluation short_circuit_function_evaluation);
 
 ExpressionActions::ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_)
@@ -301,7 +299,7 @@ static std::unordered_set<const ActionsDAG::Node *> processShortCircuitFunctions
     if (short_circuit_nodes.empty())
         return {};
 
-    auto reverse_info = getActionsDAGReverseInfo(nodes, actions_dag.getIndex());
+    auto reverse_info = getActionsDAGReverseInfo(nodes, actions_dag.getOutputs());
 
     /// For each node we fill LazyExecutionInfo.
     std::unordered_map<const ActionsDAG::Node *, LazyExecutionInfo> lazy_execution_infos;
@@ -335,10 +333,10 @@ void ExpressionActions::linearizeActions(const std::unordered_set<const ActionsD
     };
 
     const auto & nodes = getNodes();
-    const auto & index = actions_dag->getIndex();
+    const auto & outputs = actions_dag->getOutputs();
     const auto & inputs = actions_dag->getInputs();
 
-    auto reverse_info = getActionsDAGReverseInfo(nodes, index);
+    auto reverse_info = getActionsDAGReverseInfo(nodes, outputs);
     std::vector<Data> data;
     for (const auto & node : nodes)
         data.push_back({.node = &node});
@@ -428,9 +426,9 @@ void ExpressionActions::linearizeActions(const std::unordered_set<const ActionsD
         }
     }
 
-    result_positions.reserve(index.size());
+    result_positions.reserve(outputs.size());
 
-    for (const auto & node : index)
+    for (const auto & node : outputs)
     {
         auto pos = data[reverse_info.reverse_index[node]].position;
 
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index 332ae941bba..889617e0a22 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -83,7 +83,6 @@ private:
 
 public:
     ExpressionActions() = delete;
-    ~ExpressionActions();
     explicit ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_ = {});
     ExpressionActions(const ExpressionActions &) = default;
     ExpressionActions & operator=(const ExpressionActions &) = default;
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 16b23f00084..105d46eed1f 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -18,7 +18,6 @@
 #include <Interpreters/ArrayJoinAction.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ConcurrentHashJoin.h>
-#include <Interpreters/DictionaryReader.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ExpressionAnalyzer.h>
@@ -40,7 +39,7 @@
 #include <Storages/StorageDistributed.h>
 #include <Storages/StorageDictionary.h>
 #include <Storages/StorageJoin.h>
-
+#include <Functions/FunctionsExternalDictionaries.h>
 
 #include <Dictionaries/DictionaryStructure.h>
 
@@ -64,7 +63,7 @@
 #include <Interpreters/GetAggregatesVisitor.h>
 #include <Interpreters/GlobalSubqueriesVisitor.h>
 #include <Interpreters/interpretSubquery.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <Interpreters/misc.h>
 
 #include <IO/Operators.h>
@@ -113,6 +112,8 @@ bool allowEarlyConstantFolding(const ActionsDAG & actions, const Settings & sett
     return true;
 }
 
+Poco::Logger * getLogger() { return &Poco::Logger::get("ExpressionAnalyzer"); }
+
 }
 
 bool sanitizeBlock(Block & block, bool throw_if_cannot_create_column)
@@ -154,18 +155,19 @@ ExpressionAnalyzer::ExpressionAnalyzer(
     size_t subquery_depth_,
     bool do_global,
     bool is_explain,
-    SubqueriesForSets subqueries_for_sets_,
-    PreparedSets prepared_sets_)
+    PreparedSetsPtr prepared_sets_)
     : WithContext(context_)
     , query(query_), settings(getContext()->getSettings())
     , subquery_depth(subquery_depth_)
     , syntax(syntax_analyzer_result_)
 {
     /// Cache prepared sets because we might run analysis multiple times
-    subqueries_for_sets = std::move(subqueries_for_sets_);
-    prepared_sets = std::move(prepared_sets_);
+    if (prepared_sets_)
+        prepared_sets = prepared_sets_;
+    else
+        prepared_sets = std::make_shared<PreparedSets>();
 
-    /// external_tables, subqueries_for_sets for global subqueries.
+    /// external_tables, sets for global subqueries.
     /// Replaces global subqueries with the generated names of temporary tables that will be sent to remote servers.
     initGlobalSubqueriesAndExternalTables(do_global, is_explain);
 
@@ -304,7 +306,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
 
                         ssize_t group_size = group_elements_ast.size();
                         const auto & column_name = group_elements_ast[j]->getColumnName();
-                        const auto * node = temp_actions->tryFindInIndex(column_name);
+                        const auto * node = temp_actions->tryFindInOutputs(column_name);
                         if (!node)
                             throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
 
@@ -358,7 +360,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
                     getRootActionsNoMakeSet(group_asts[i], temp_actions, false);
 
                     const auto & column_name = group_asts[i]->getColumnName();
-                    const auto * node = temp_actions->tryFindInIndex(column_name);
+                    const auto * node = temp_actions->tryFindInOutputs(column_name);
                     if (!node)
                         throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
 
@@ -429,7 +431,7 @@ void ExpressionAnalyzer::initGlobalSubqueriesAndExternalTables(bool do_global, b
     if (do_global)
     {
         GlobalSubqueriesVisitor::Data subqueries_data(
-            getContext(), subquery_depth, isRemoteStorage(), is_explain, external_tables, subqueries_for_sets, has_global_subqueries);
+            getContext(), subquery_depth, isRemoteStorage(), is_explain, external_tables, prepared_sets, has_global_subqueries);
         GlobalSubqueriesVisitor(subqueries_data).visit(query);
     }
 }
@@ -437,14 +439,17 @@ void ExpressionAnalyzer::initGlobalSubqueriesAndExternalTables(bool do_global, b
 
 void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_or_table_name, const SelectQueryOptions & query_options)
 {
+    if (!prepared_sets)
+        return;
+
     auto set_key = PreparedSetKey::forSubquery(*subquery_or_table_name);
 
-    if (prepared_sets.contains(set_key))
+    if (prepared_sets->get(set_key))
         return; /// Already prepared.
 
     if (auto set_ptr_from_storage_set = isPlainStorageSetInSubquery(subquery_or_table_name))
     {
-        prepared_sets.insert({set_key, set_ptr_from_storage_set});
+        prepared_sets->set(set_key, set_ptr_from_storage_set);
         return;
     }
 
@@ -468,7 +473,7 @@ void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_
 
     set->finishInsert();
 
-    prepared_sets[set_key] = std::move(set);
+    prepared_sets->set(set_key, std::move(set));
 }
 
 SetPtr ExpressionAnalyzer::isPlainStorageSetInSubquery(const ASTPtr & subquery_or_table_name)
@@ -524,8 +529,8 @@ void SelectQueryExpressionAnalyzer::makeSetsForIndex(const ASTPtr & node)
                 auto temp_actions = std::make_shared<ActionsDAG>(columns_after_join);
                 getRootActions(left_in_operand, true, temp_actions);
 
-                if (temp_actions->tryFindInIndex(left_in_operand->getColumnName()))
-                    makeExplicitSet(func, *temp_actions, true, getContext(), settings.size_limits_for_set, prepared_sets);
+                if (prepared_sets && temp_actions->tryFindInOutputs(left_in_operand->getColumnName()))
+                    makeExplicitSet(func, *temp_actions, true, getContext(), settings.size_limits_for_set, *prepared_sets);
             }
         }
     }
@@ -542,7 +547,6 @@ void ExpressionAnalyzer::getRootActions(const ASTPtr & ast, bool no_makeset_for_
         sourceColumns(),
         std::move(actions),
         prepared_sets,
-        subqueries_for_sets,
         no_makeset_for_subqueries,
         false /* no_makeset */,
         only_consts,
@@ -562,7 +566,6 @@ void ExpressionAnalyzer::getRootActionsNoMakeSet(const ASTPtr & ast, ActionsDAGP
         sourceColumns(),
         std::move(actions),
         prepared_sets,
-        subqueries_for_sets,
         true /* no_makeset_for_subqueries, no_makeset implies no_makeset_for_subqueries */,
         true /* no_makeset */,
         only_consts,
@@ -584,7 +587,6 @@ void ExpressionAnalyzer::getRootActionsForHaving(
         sourceColumns(),
         std::move(actions),
         prepared_sets,
-        subqueries_for_sets,
         no_makeset_for_subqueries,
         false /* no_makeset */,
         only_consts,
@@ -605,7 +607,6 @@ void ExpressionAnalyzer::getRootActionsForWindowFunctions(const ASTPtr & ast, bo
         sourceColumns(),
         std::move(actions),
         prepared_sets,
-        subqueries_for_sets,
         no_makeset_for_subqueries,
         false /* no_makeset */,
         false /*only_consts */,
@@ -634,7 +635,7 @@ void ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions, Aggr
         for (size_t i = 0; i < arguments.size(); ++i)
         {
             const std::string & name = arguments[i]->getColumnName();
-            const auto * dag_node = actions->tryFindInIndex(name);
+            const auto * dag_node = actions->tryFindInOutputs(name);
             if (!dag_node)
             {
                 throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
@@ -841,7 +842,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
         for (size_t i = 0; i < arguments.size(); ++i)
         {
             const std::string & name = arguments[i]->getColumnName();
-            const auto * node = actions->tryFindInIndex(name);
+            const auto * node = actions->tryFindInOutputs(name);
 
             if (!node)
             {
@@ -937,8 +938,8 @@ ArrayJoinActionPtr ExpressionAnalyzer::addMultipleArrayJoinAction(ActionsDAGPtr
         /// Assign new names to columns, if needed.
         if (result_source.first != result_source.second)
         {
-            const auto & node = actions->findInIndex(result_source.second);
-            actions->getIndex().push_back(&actions->addAlias(node, result_source.first));
+            const auto & node = actions->findInOutputs(result_source.second);
+            actions->getOutputs().push_back(&actions->addAlias(node, result_source.first));
         }
 
         /// Make ARRAY JOIN (replace arrays with their insides) for the columns in these new names.
@@ -1014,19 +1015,12 @@ static std::shared_ptr<IJoin> chooseJoinAlgorithm(std::shared_ptr<TableJoin> ana
 
     if (analyzed_join->isEnabledAlgorithm(JoinAlgorithm::DIRECT))
     {
-        if (JoinPtr kvjoin = tryKeyValueJoin(analyzed_join, right_sample_block))
+        JoinPtr direct_join = tryKeyValueJoin(analyzed_join, right_sample_block);
+        if (direct_join)
         {
-            /// Do not need to execute plan for right part
+            /// Do not need to execute plan for right part, it's ready.
             joined_plan.reset();
-            return kvjoin;
-        }
-
-        /// It's not a hash join actually, that's why we check JoinAlgorithm::DIRECT
-        /// It's would be fixed in https://github.com/ClickHouse/ClickHouse/pull/38956
-        if (analyzed_join->tryInitDictJoin(right_sample_block, context))
-        {
-            joined_plan.reset();
-            return std::make_shared<HashJoin>(analyzed_join, right_sample_block);
+            return direct_join;
         }
     }
 
@@ -1097,10 +1091,10 @@ static std::unique_ptr<QueryPlan> buildJoinedPlan(
             {
                 auto pos = original_right_columns.getPositionByName(name_with_alias.first);
                 const auto & alias = rename_dag->addAlias(*rename_dag->getInputs()[pos], name_with_alias.second);
-                rename_dag->getIndex()[pos] = &alias;
+                rename_dag->getOutputs()[pos] = &alias;
             }
         }
-
+        rename_dag->projectInput();
         auto rename_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(rename_dag));
         rename_step->setStepDescription("Rename joined columns");
         joined_plan->addStep(std::move(rename_step));
@@ -1120,19 +1114,17 @@ std::shared_ptr<DirectKeyValueJoin> tryKeyValueJoin(std::shared_ptr<TableJoin> a
 
     auto storage = analyzed_join->getStorageKeyValue();
     if (!storage)
-    {
         return nullptr;
-    }
 
-    if (!isInnerOrLeft(analyzed_join->kind()))
-    {
-        return nullptr;
-    }
-
-    if (analyzed_join->strictness() != JoinStrictness::All &&
-        analyzed_join->strictness() != JoinStrictness::Any &&
-        analyzed_join->strictness() != JoinStrictness::RightAny)
+    bool allowed_inner = isInner(analyzed_join->kind()) && analyzed_join->strictness() == JoinStrictness::All;
+    bool allowed_left = isLeft(analyzed_join->kind()) && (analyzed_join->strictness() == JoinStrictness::Any ||
+                                                          analyzed_join->strictness() == JoinStrictness::All ||
+                                                          analyzed_join->strictness() == JoinStrictness::Semi ||
+                                                          analyzed_join->strictness() == JoinStrictness::Anti);
+    if (!allowed_inner && !allowed_left)
     {
+        LOG_TRACE(getLogger(), "Can't use direct join: {} {} is not supported",
+            analyzed_join->kind(), analyzed_join->strictness());
         return nullptr;
     }
 
@@ -1145,6 +1137,7 @@ std::shared_ptr<DirectKeyValueJoin> tryKeyValueJoin(std::shared_ptr<TableJoin> a
 
     if (!only_one_key)
     {
+        LOG_TRACE(getLogger(), "Can't use direct join: only one key is supported");
         return nullptr;
     }
 
@@ -1153,6 +1146,8 @@ std::shared_ptr<DirectKeyValueJoin> tryKeyValueJoin(std::shared_ptr<TableJoin> a
     const auto & storage_primary_key = storage->getPrimaryKey();
     if (storage_primary_key.size() != 1 || storage_primary_key[0] != original_key_name)
     {
+        LOG_TRACE(getLogger(), "Can't use direct join: join key '{}' doesn't match to storage key ({})",
+            original_key_name, fmt::join(storage_primary_key, ", "));
         return nullptr;
     }
 
@@ -1192,7 +1187,6 @@ JoinPtr SelectQueryExpressionAnalyzer::makeJoin(
     }
 
     JoinPtr join = chooseJoinAlgorithm(analyzed_join, joined_plan, getContext());
-
     return join;
 }
 
@@ -1212,7 +1206,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
     String prewhere_column_name = select_query->prewhere()->getColumnName();
     step.addRequiredOutput(prewhere_column_name);
 
-    const auto & node = step.actions()->findInIndex(prewhere_column_name);
+    const auto & node = step.actions()->findInOutputs(prewhere_column_name);
     auto filter_type = node.result_type;
     if (!filter_type->canBeUsedInBooleanContext())
         throw Exception("Invalid type for filter in PREWHERE: " + filter_type->getName(),
@@ -1295,7 +1289,7 @@ bool SelectQueryExpressionAnalyzer::appendWhere(ExpressionActionsChain & chain,
     auto where_column_name = select_query->where()->getColumnName();
     step.addRequiredOutput(where_column_name);
 
-    const auto & node = step.actions()->findInIndex(where_column_name);
+    const auto & node = step.actions()->findInOutputs(where_column_name);
     auto filter_type = node.result_type;
     if (!filter_type->canBeUsedInBooleanContext())
         throw Exception("Invalid type for filter in WHERE: " + filter_type->getName(),
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index da92bc10832..ddb41a00f84 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -5,10 +5,9 @@
 #include <Interpreters/ActionsVisitor.h>
 #include <Interpreters/AggregateDescription.h>
 #include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/WindowDescription.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/SelectQueryInfo.h>
@@ -50,8 +49,7 @@ struct ExpressionAnalyzerData
 {
     ~ExpressionAnalyzerData();
 
-    SubqueriesForSets subqueries_for_sets;
-    PreparedSets prepared_sets;
+    PreparedSetsPtr prepared_sets;
 
     std::unique_ptr<QueryPlan> joined_plan;
 
@@ -106,7 +104,7 @@ public:
     /// Ctor for non-select queries. Generally its usage is:
     /// auto actions = ExpressionAnalyzer(query, syntax, context).getActions();
     ExpressionAnalyzer(const ASTPtr & query_, const TreeRewriterResultPtr & syntax_analyzer_result_, ContextPtr context_)
-        : ExpressionAnalyzer(query_, syntax_analyzer_result_, context_, 0, false, false, {}, {})
+        : ExpressionAnalyzer(query_, syntax_analyzer_result_, context_, 0, false, false, {})
     {
     }
 
@@ -130,9 +128,7 @@ public:
       * That is, you need to call getSetsWithSubqueries after all calls of `append*` or `getActions`
       *  and create all the returned sets before performing the actions.
       */
-    SubqueriesForSets & getSubqueriesForSets() { return subqueries_for_sets; }
-
-    PreparedSets & getPreparedSets() { return prepared_sets; }
+    PreparedSetsPtr getPreparedSets() { return prepared_sets; }
 
     /// Get intermediates for tests
     const ExpressionAnalyzerData & getAnalyzedData() const { return *this; }
@@ -143,14 +139,12 @@ public:
     void makeWindowDescriptionFromAST(const Context & context, const WindowDescriptions & existing_descriptions, WindowDescription & desc, const IAST * ast);
     void makeWindowDescriptions(ActionsDAGPtr actions);
 
-    /**
-      * Create Set from a subquery or a table expression in the query. The created set is suitable for using the index.
+    /** Create Set from a subquery or a table expression in the query. The created set is suitable for using the index.
       * The set will not be created if its size hits the limit.
       */
     void tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_or_table_name, const SelectQueryOptions & query_options = {});
 
-    /**
-      * Checks if subquery is not a plain StorageSet.
+    /** Checks if subquery is not a plain StorageSet.
       * Because while making set we will read data from StorageSet which is not allowed.
       * Returns valid SetPtr from StorageSet if the latter is used after IN or nullptr otherwise.
       */
@@ -164,8 +158,7 @@ protected:
         size_t subquery_depth_,
         bool do_global_,
         bool is_explain_,
-        SubqueriesForSets subqueries_for_sets_,
-        PreparedSets prepared_sets_);
+        PreparedSetsPtr prepared_sets_);
 
     ASTPtr query;
     const ExtractedSettings settings;
@@ -317,8 +310,7 @@ public:
         const NameSet & required_result_columns_ = {},
         bool do_global_ = false,
         const SelectQueryOptions & options_ = {},
-        SubqueriesForSets subqueries_for_sets_ = {},
-        PreparedSets prepared_sets_ = {})
+        PreparedSetsPtr prepared_sets_ = nullptr)
         : ExpressionAnalyzer(
             query_,
             syntax_analyzer_result_,
@@ -326,8 +318,7 @@ public:
             options_.subquery_depth,
             do_global_,
             options_.is_explain,
-            std::move(subqueries_for_sets_),
-            std::move(prepared_sets_))
+            prepared_sets_)
         , metadata_snapshot(metadata_snapshot_)
         , required_result_columns(required_result_columns_)
         , query_options(options_)
diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 01c92598142..a179c4d8bf6 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -551,10 +551,10 @@ void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression, const
             node_to_data[child].all_parents_compilable &= node_is_valid_for_compilation;
     }
 
-    for (const auto & node : index)
+    for (const auto & output_node : outputs)
     {
-        /// Force result nodes to compile
-        node_to_data[node].all_parents_compilable = false;
+        /// Force output nodes to compile
+        node_to_data[output_node].all_parents_compilable = false;
     }
 
     std::vector<Node *> nodes_to_compile;
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index 1dcf48da130..704dff325b7 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -1299,6 +1299,7 @@ scope_guard ExternalLoader::addConfigRepository(std::unique_ptr<IExternalLoaderC
     return [this, ptr, name]()
     {
         config_files_reader->removeConfigRepository(ptr);
+        CurrentStatusInfo::unset(CurrentStatusInfo::DictionaryStatus, name);
         reloadConfig(name);
     };
 }
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index ee46920331d..dc9294be878 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -8,7 +8,7 @@
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/interpretSubquery.h>
-#include <Interpreters/SubqueryForSet.h>
+#include <Interpreters/PreparedSets.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
@@ -41,7 +41,7 @@ public:
         bool is_remote;
         bool is_explain;
         TemporaryTablesMapping & external_tables;
-        SubqueriesForSets & subqueries_for_sets;
+        PreparedSetsPtr prepared_sets;
         bool & has_global_subqueries;
 
         Data(
@@ -50,14 +50,14 @@ public:
             bool is_remote_,
             bool is_explain_,
             TemporaryTablesMapping & tables,
-            SubqueriesForSets & subqueries_for_sets_,
+            PreparedSetsPtr prepared_sets_,
             bool & has_global_subqueries_)
             : WithContext(context_)
             , subquery_depth(subquery_depth_)
             , is_remote(is_remote_)
             , is_explain(is_explain_)
             , external_tables(tables)
-            , subqueries_for_sets(subqueries_for_sets_)
+            , prepared_sets(prepared_sets_)
             , has_global_subqueries(has_global_subqueries_)
         {
         }
@@ -178,9 +178,8 @@ public:
             }
             else
             {
-                subqueries_for_sets[external_table_name].source = std::make_unique<QueryPlan>();
-                interpreter->buildQueryPlan(*subqueries_for_sets[external_table_name].source);
-                subqueries_for_sets[external_table_name].table = external_storage;
+                auto & subquery_for_set = prepared_sets->getSubquery(external_table_name);
+                subquery_for_set.createSource(*interpreter, external_storage);
             }
 
             /** NOTE If it was written IN tmp_table - the existing temporary (but not external) table,
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 95a0008c257..e559977be49 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -15,13 +15,11 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Interpreters/HashJoin.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/joinDispatch.h>
 #include <Interpreters/NullableUtils.h>
-#include <Interpreters/DictionaryReader.h>
 
-#include <Storages/StorageDictionary.h>
 #include <Storages/IStorage.h>
 
 #include <Core/ColumnNumbers.h>
@@ -179,36 +177,6 @@ namespace JoinStuff
     }
 }
 
-static ColumnPtr filterWithBlanks(ColumnPtr src_column, const IColumn::Filter & filter, bool inverse_filter = false)
-{
-    ColumnPtr column = src_column->convertToFullColumnIfConst();
-    MutableColumnPtr mut_column = column->cloneEmpty();
-    mut_column->reserve(column->size());
-
-    if (inverse_filter)
-    {
-        for (size_t row = 0; row < filter.size(); ++row)
-        {
-            if (filter[row])
-                mut_column->insertDefault();
-            else
-                mut_column->insertFrom(*column, row);
-        }
-    }
-    else
-    {
-        for (size_t row = 0; row < filter.size(); ++row)
-        {
-            if (filter[row])
-                mut_column->insertFrom(*column, row);
-            else
-                mut_column->insertDefault();
-        }
-    }
-
-    return mut_column;
-}
-
 static ColumnWithTypeAndName correctNullability(ColumnWithTypeAndName && column, bool nullable)
 {
     if (nullable)
@@ -220,7 +188,7 @@ static ColumnWithTypeAndName correctNullability(ColumnWithTypeAndName && column,
         /// We have to replace values masked by NULLs with defaults.
         if (column.column)
             if (const auto * nullable_column = checkAndGetColumn<ColumnNullable>(*column.column))
-                column.column = filterWithBlanks(column.column, nullable_column->getNullMapColumn().getData(), true);
+                column.column = JoinCommon::filterWithBlanks(column.column, nullable_column->getNullMapColumn().getData(), true);
 
         JoinCommon::removeColumnNullability(column);
     }
@@ -298,16 +266,7 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
         const auto & key_names_right = clause.key_names_right;
         ColumnRawPtrs key_columns = JoinCommon::extractKeysForJoin(right_table_keys, key_names_right);
 
-        if (table_join->getDictionaryReader())
-        {
-            assert(disjuncts_num == 1);
-            data->type = Type::DICT;
-
-            data->maps.resize(disjuncts_num);
-            std::get<MapsOne>(data->maps[0]).create(Type::DICT);
-            chooseMethod(kind, key_columns, key_sizes.emplace_back()); /// init key_sizes
-        }
-        else if (strictness == JoinStrictness::Asof)
+        if (strictness == JoinStrictness::Asof)
         {
             assert(disjuncts_num == 1);
 
@@ -429,36 +388,6 @@ static KeyGetter createKeyGetter(const ColumnRawPtrs & key_columns, const Sizes
 template <typename Mapped, bool need_offset = false>
 using FindResultImpl = ColumnsHashing::columns_hashing_impl::FindResultImpl<Mapped, true>;
 
-class KeyGetterForDict
-{
-public:
-    using Mapped = RowRef;
-    using FindResult = FindResultImpl<Mapped, true>;
-
-    KeyGetterForDict(const TableJoin & table_join, const ColumnRawPtrs & key_columns)
-    {
-        assert(table_join.getDictionaryReader());
-        table_join.getDictionaryReader()->readKeys(*key_columns[0], read_result, found, positions);
-
-        for (ColumnWithTypeAndName & column : read_result)
-            if (table_join.rightBecomeNullable(column.type))
-                JoinCommon::convertColumnToNullable(column);
-    }
-
-    FindResult findKey(const TableJoin &, size_t row, const Arena &)
-    {
-        result.block = &read_result;
-        result.row_num = positions[row];
-        return FindResult(&result, found[row], 0);
-    }
-
-private:
-    Block read_result;
-    Mapped result;
-    ColumnVector<UInt8>::Container found;
-    std::vector<size_t> positions;
-};
-
 /// Dummy key getter, always find nothing, used for JOIN ON NULL
 template <typename Mapped>
 class KeyGetterEmpty
@@ -529,20 +458,13 @@ struct KeyGetterForType
 
 void HashJoin::dataMapInit(MapsVariant & map)
 {
-    if (data->type == Type::DICT)
-        return;
+
     if (kind == JoinKind::Cross)
         return;
     joinDispatchInit(kind, strictness, map);
     joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { map_.create(data->type); });
 }
 
-bool HashJoin::overDictionary() const
-{
-    assert(data->type != Type::DICT || table_join->getDictionaryReader());
-    return data->type == Type::DICT;
-}
-
 bool HashJoin::empty() const
 {
     return data->type == Type::EMPTY;
@@ -550,7 +472,7 @@ bool HashJoin::empty() const
 
 bool HashJoin::alwaysReturnsEmptySet() const
 {
-    return isInnerOrRight(getKind()) && data->empty && !overDictionary();
+    return isInnerOrRight(getKind()) && data->empty;
 }
 
 size_t HashJoin::getTotalRowCount() const
@@ -562,7 +484,7 @@ size_t HashJoin::getTotalRowCount() const
         for (const auto & block : data->blocks)
             res += block.rows();
     }
-    else if (data->type != Type::DICT)
+    else
     {
         for (const auto & map : data->maps)
         {
@@ -570,6 +492,7 @@ size_t HashJoin::getTotalRowCount() const
         }
     }
 
+
     return res;
 }
 
@@ -582,7 +505,7 @@ size_t HashJoin::getTotalByteCount() const
         for (const auto & block : data->blocks)
             res += block.bytes();
     }
-    else if (data->type != Type::DICT)
+    else
     {
         for (const auto & map : data->maps)
         {
@@ -693,7 +616,6 @@ namespace
         {
             case HashJoin::Type::EMPTY: return 0;
             case HashJoin::Type::CROSS: return 0; /// Do nothing. We have already saved block, and it is enough.
-            case HashJoin::Type::DICT:  return 0; /// No one should call it with Type::DICT.
 
         #define M(TYPE) \
             case HashJoin::Type::TYPE: \
@@ -753,9 +675,6 @@ Block HashJoin::structureRightBlock(const Block & block) const
 
 bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
 {
-    if (overDictionary())
-        throw Exception("Logical error: insert into hash-map in HashJoin over dictionary", ErrorCodes::LOGICAL_ERROR);
-
     /// RowRef::SizeT is uint32_t (not size_t) for hash table Cell memory efficiency.
     /// It's possible to split bigger blocks and insert them by parts here. But it would be a dead code.
     if (unlikely(source_block.rows() > std::numeric_limits<RowRef::SizeT>::max()))
@@ -1476,28 +1395,6 @@ IColumn::Filter switchJoinRightColumns(
     }
 }
 
-template <JoinKind KIND, JoinStrictness STRICTNESS>
-IColumn::Filter dictionaryJoinRightColumns(const TableJoin & table_join, AddedColumns & added_columns)
-{
-    if constexpr (KIND == JoinKind::Left &&
-        (STRICTNESS == JoinStrictness::Any ||
-        STRICTNESS == JoinStrictness::Semi ||
-        STRICTNESS == JoinStrictness::Anti))
-    {
-        assert(added_columns.join_on_keys.size() == 1);
-
-        std::vector<const TableJoin *> maps_vector;
-        maps_vector.push_back(&table_join);
-
-        JoinStuff::JoinUsedFlags flags;
-        std::vector<KeyGetterForDict> key_getter_vector;
-        key_getter_vector.push_back(KeyGetterForDict(table_join, added_columns.join_on_keys[0].key_columns));
-        return joinRightColumnsSwitchNullability<KIND, STRICTNESS, KeyGetterForDict>(std::move(key_getter_vector), maps_vector, added_columns, flags);
-    }
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", STRICTNESS, KIND);
-}
-
 } /// nameless
 
 template <JoinKind KIND, JoinStrictness STRICTNESS, typename Maps>
@@ -1544,9 +1441,7 @@ void HashJoin::joinBlockImpl(
     bool has_required_right_keys = (required_right_keys.columns() != 0);
     added_columns.need_filter = jf.need_filter || has_required_right_keys;
 
-    IColumn::Filter row_filter = overDictionary() ?
-        dictionaryJoinRightColumns<KIND, STRICTNESS>(*table_join, added_columns) :
-        switchJoinRightColumns<KIND, STRICTNESS>(maps_, added_columns, data->type, used_flags);
+    IColumn::Filter row_filter = switchJoinRightColumns<KIND, STRICTNESS>(maps_, added_columns, data->type, used_flags);
 
     for (size_t i = 0; i < added_columns.size(); ++i)
         block.insert(added_columns.moveColumn(i));
@@ -1607,7 +1502,7 @@ void HashJoin::joinBlockImpl(
                 const auto & col = block.getByName(left_name);
                 bool is_nullable = JoinCommon::isNullable(right_key.type);
 
-                ColumnPtr thin_column = filterWithBlanks(col.column, filter);
+                ColumnPtr thin_column = JoinCommon::filterWithBlanks(col.column, filter);
 
                 ColumnWithTypeAndName right_col(thin_column, col.type, right_col_name);
                 if (right_col.type->lowCardinality() != right_key.type->lowCardinality())
@@ -1802,39 +1697,7 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
         materializeBlockInplace(block);
     }
 
-    if (overDictionary())
     {
-        auto & map = std::get<MapsOne>(data->maps[0]);
-        std::vector<const std::decay_t<decltype(map)>*> maps_vector;
-        maps_vector.push_back(&map);
-
-        if (kind == JoinKind::Left)
-        {
-            switch (strictness)
-            {
-            case JoinStrictness::Any:
-            case JoinStrictness::All:
-                    joinBlockImpl<JoinKind::Left, JoinStrictness::Any>(block, sample_block_with_columns_to_add, maps_vector);
-                    break;
-            case JoinStrictness::Semi:
-                    joinBlockImpl<JoinKind::Left, JoinStrictness::Semi>(block, sample_block_with_columns_to_add, maps_vector);
-                    break;
-            case JoinStrictness::Anti:
-                    joinBlockImpl<JoinKind::Left, JoinStrictness::Anti>(block, sample_block_with_columns_to_add, maps_vector);
-                    break;
-            default:
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: dictionary + {} {}", strictness, kind);
-            }
-        }
-        else if (kind == JoinKind::Inner && strictness == JoinStrictness::All)
-            joinBlockImpl<JoinKind::Left, JoinStrictness::Semi>(block, sample_block_with_columns_to_add, maps_vector);
-
-        else
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", strictness, kind);
-    }
-    else
-    {
-
         std::vector<const std::decay_t<decltype(data->maps[0])> * > maps_vector;
         for (size_t i = 0; i < table_join->getClauses().size(); ++i)
             maps_vector.push_back(&data->maps[i]);
diff --git a/src/Interpreters/HashJoin.h b/src/Interpreters/HashJoin.h
index 54c641627c0..33955333aa2 100644
--- a/src/Interpreters/HashJoin.h
+++ b/src/Interpreters/HashJoin.h
@@ -27,13 +27,12 @@
 #include <Core/Block.h>
 
 #include <Storages/IStorage_fwd.h>
-#include <Storages/IKVStorage.h>
+#include <Interpreters/IKeyValueEntity.h>
 
 namespace DB
 {
 
 class TableJoin;
-class DictionaryReader;
 
 namespace JoinStuff
 {
@@ -171,13 +170,12 @@ public:
     /// Used by joinGet function that turns StorageJoin into a dictionary.
     ColumnWithTypeAndName joinGet(const Block & block, const Block & block_with_columns_to_add) const;
 
-    bool isFilled() const override { return from_storage_join || data->type == Type::DICT; }
+    bool isFilled() const override { return from_storage_join; }
 
     JoinPipelineType pipelineType() const override
     {
-        /// No need to process anything in the right stream if it's a dictionary will just join the left stream with it.
-        bool is_filled = from_storage_join || data->type == Type::DICT;
-        if (is_filled)
+        /// No need to process anything in the right stream if hash table was already filled
+        if (from_storage_join)
             return JoinPipelineType::FilledRight;
 
         /// Default pipeline processes right stream at first and then left.
@@ -233,7 +231,6 @@ public:
     {
         EMPTY,
         CROSS,
-        DICT,
         #define M(NAME) NAME,
             APPLY_FOR_JOIN_VARIANTS(M)
         #undef M
@@ -261,7 +258,6 @@ public:
             {
                 case Type::EMPTY:            break;
                 case Type::CROSS:            break;
-                case Type::DICT:             break;
 
             #define M(NAME) \
                 case Type::NAME: NAME = std::make_unique<typename decltype(NAME)::element_type>(); break;
@@ -276,7 +272,6 @@ public:
             {
                 case Type::EMPTY:            return 0;
                 case Type::CROSS:            return 0;
-                case Type::DICT:             return 0;
 
             #define M(NAME) \
                 case Type::NAME: return NAME ? NAME->size() : 0;
@@ -293,7 +288,6 @@ public:
             {
                 case Type::EMPTY:            return 0;
                 case Type::CROSS:            return 0;
-                case Type::DICT:             return 0;
 
             #define M(NAME) \
                 case Type::NAME: return NAME ? NAME->getBufferSizeInBytes() : 0;
@@ -310,7 +304,6 @@ public:
             {
                 case Type::EMPTY:            return 0;
                 case Type::CROSS:            return 0;
-                case Type::DICT:             return 0;
 
             #define M(NAME) \
                 case Type::NAME: return NAME ? NAME->getBufferSizeInCells() : 0;
@@ -424,7 +417,6 @@ private:
     static Type chooseMethod(JoinKind kind, const ColumnRawPtrs & key_columns, Sizes & key_sizes);
 
     bool empty() const;
-    bool overDictionary() const;
 };
 
 }
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index 05486f65da5..6319949655b 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -106,14 +106,14 @@ static ActionsDAGPtr makeAdditionalPostFilter(ASTPtr & ast, ContextPtr context,
     auto syntax_result = TreeRewriter(context).analyze(ast, header.getNamesAndTypesList());
     String result_column_name = ast->getColumnName();
     auto dag = ExpressionAnalyzer(ast, syntax_result, context).getActionsDAG(false, false);
-    const ActionsDAG::Node * result_node = &dag->findInIndex(result_column_name);
-    auto & index = dag->getIndex();
-    index.clear();
-    index.reserve(dag->getInputs().size() + 1);
+    const ActionsDAG::Node * result_node = &dag->findInOutputs(result_column_name);
+    auto & outputs = dag->getOutputs();
+    outputs.clear();
+    outputs.reserve(dag->getInputs().size() + 1);
     for (const auto * node : dag->getInputs())
-        index.push_back(node);
+        outputs.push_back(node);
 
-    index.push_back(result_node);
+    outputs.push_back(result_node);
 
     return dag;
 }
@@ -128,7 +128,7 @@ void IInterpreterUnionOrSelectQuery::addAdditionalPostFilter(QueryPlan & plan) c
         return;
 
     auto dag = makeAdditionalPostFilter(ast, context, plan.getCurrentDataStream().header);
-    std::string filter_name = dag->getIndex().back()->result_name;
+    std::string filter_name = dag->getOutputs().back()->result_name;
     auto filter_step = std::make_unique<FilterStep>(
         plan.getCurrentDataStream(), std::move(dag), std::move(filter_name), true);
     filter_step->setStepDescription("Additional result filter");
diff --git a/src/Storages/IKVStorage.h b/src/Interpreters/IKeyValueEntity.h
similarity index 56%
rename from src/Storages/IKVStorage.h
rename to src/Interpreters/IKeyValueEntity.h
index 667ccda0c41..d1ceda57f0e 100644
--- a/src/Storages/IKVStorage.h
+++ b/src/Interpreters/IKeyValueEntity.h
@@ -1,17 +1,17 @@
 #pragma once
 
 #include <Core/Names.h>
-#include <Storages/IStorage.h>
 #include <Processors/Chunk.h>
 
 namespace DB
 {
 
-/// Storage that support key-value requests
-class IKeyValueStorage : public IStorage
+/// Interface for entities with key-value semantics.
+class IKeyValueEntity
 {
 public:
-    using IStorage::IStorage;
+    IKeyValueEntity() = default;
+    virtual ~IKeyValueEntity() = default;
 
     /// Get primary key name that supports key-value requests.
     /// Primary key can constist of multiple columns.
@@ -22,12 +22,20 @@ public:
      *
      * @param keys - keys to get data for. Key can be compound and represented by several columns.
      * @param out_null_map - output parameter indicating which keys were not found.
+     * @param required_columns - if we don't need all attributes, implementation can use it to benefit from reading a subset of them.
      *
      * @return - chunk of data corresponding for keys.
      *   Number of rows in chunk is equal to size of columns in keys.
      *   If the key was not found row would have a default value.
      */
-    virtual Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & out_null_map) const = 0;
+    virtual Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & out_null_map, const Names & required_columns) const = 0;
+
+    /// Header for getByKeys result
+    virtual Block getSampleBlock(const Names & required_columns) const = 0;
+
+protected:
+    /// Names of result columns. If empty then all columns are required.
+    Names key_value_result_names;
 };
 
 }
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index 056a3d9f7b4..762afd28923 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -66,7 +66,7 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
 {
     BlockIO res;
 
-    if (!alter.cluster.empty())
+    if (!alter.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
         DDLQueryOnClusterParams params;
         params.access_to_check = getRequiredAccess();
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 7a00bbf524c..e66fe543ab0 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -249,6 +249,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
     bool need_write_metadata = !create.attach || !fs::exists(metadata_file_path);
     bool need_lock_uuid = internal || need_write_metadata;
+    auto mode = getLoadingStrictnessLevel(create.attach, force_attach, has_force_restore_data_flag);
 
     /// Lock uuid, so we will known it's already in use.
     /// We do it when attaching databases on server startup (internal) and on CREATE query (!create.attach);
@@ -303,8 +304,9 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
         if (!load_database_without_tables)
         {
+
             /// We use global context here, because storages lifetime is bigger than query context lifetime
-            TablesLoader loader{getContext()->getGlobalContext(), {{database_name, database}}, has_force_restore_data_flag, create.attach && force_attach}; //-V560
+            TablesLoader loader{getContext()->getGlobalContext(), {{database_name, database}}, mode}; //-V560
             loader.loadTables();
             loader.startupTables();
         }
@@ -1017,6 +1019,9 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
             }
         }
 
+        if (!create.cluster.empty())
+            return executeQueryOnCluster(create);
+
         bool if_not_exists = create.if_not_exists;
 
         // Table SQL definition is available even if the table is detached (even permanently)
@@ -1153,6 +1158,9 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
         }
     }
 
+    if (!create.cluster.empty())
+        return executeQueryOnCluster(create);
+
     if (create.replace_table)
         return doCreateOrReplaceTable(create, properties);
 
@@ -1358,25 +1366,15 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
 {
     /// Replicated database requires separate contexts for each DDL query
     ContextPtr current_context = getContext();
+    if (auto txn = current_context->getZooKeeperMetadataTransaction())
+        txn->setIsCreateOrReplaceQuery();
     ContextMutablePtr create_context = Context::createCopy(current_context);
     create_context->setQueryContext(std::const_pointer_cast<Context>(current_context));
 
-    auto make_drop_context = [&](bool on_error) -> ContextMutablePtr
+    auto make_drop_context = [&]() -> ContextMutablePtr
     {
         ContextMutablePtr drop_context = Context::createCopy(current_context);
-        drop_context->makeQueryContext();
-        if (on_error)
-            return drop_context;
-
-        if (auto txn = current_context->getZooKeeperMetadataTransaction())
-        {
-            /// Execute drop as separate query, because [CREATE OR] REPLACE query can be considered as
-            /// successfully executed after RENAME/EXCHANGE query.
-            drop_context->resetZooKeeperMetadataTransaction();
-            auto drop_txn = std::make_shared<ZooKeeperMetadataTransaction>(txn->getZooKeeper(), txn->getDatabaseZooKeeperPath(),
-                                                                           txn->isInitialQuery(), txn->getTaskZooKeeperPath());
-            drop_context->initZooKeeperMetadataTransaction(drop_txn);
-        }
+        drop_context->setQueryContext(std::const_pointer_cast<Context>(current_context));
         return drop_context;
     };
 
@@ -1452,7 +1450,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
         if (!interpreter_rename.renamedInsteadOfExchange())
         {
             /// Target table was replaced with new one, drop old table
-            auto drop_context = make_drop_context(false);
+            auto drop_context = make_drop_context();
             InterpreterDropQuery(ast_drop, drop_context).execute();
         }
 
@@ -1465,7 +1463,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
         /// Drop temporary table if it was successfully created, but was not renamed to target name
         if (created && !renamed)
         {
-            auto drop_context = make_drop_context(true);
+            auto drop_context = make_drop_context();
             InterpreterDropQuery(ast_drop, drop_context).execute();
         }
         throw;
@@ -1511,6 +1509,11 @@ void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, Cont
 
     if (cluster->maybeCrossReplication())
     {
+        auto on_cluster_version = local_context->getSettingsRef().distributed_ddl_entry_format_version;
+        if (DDLLogEntry::NORMALIZE_CREATE_ON_INITIATOR_VERSION <= on_cluster_version)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Value {} of setting distributed_ddl_entry_format_version "
+                                                         "is incompatible with cross-replication", on_cluster_version);
+
         /// Check that {uuid} macro is not used in zookeeper_path for ReplicatedMergeTree.
         /// Otherwise replicas will generate different paths.
         if (!create.storage)
@@ -1543,16 +1546,25 @@ void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, Cont
     }
 }
 
+BlockIO InterpreterCreateQuery::executeQueryOnCluster(ASTCreateQuery & create)
+{
+    prepareOnClusterQuery(create, getContext(), create.cluster);
+    DDLQueryOnClusterParams params;
+    params.access_to_check = getRequiredAccess();
+    return executeDDLQueryOnCluster(query_ptr, getContext(), params);
+}
+
 BlockIO InterpreterCreateQuery::execute()
 {
     FunctionNameNormalizer().visit(query_ptr.get());
     auto & create = query_ptr->as<ASTCreateQuery &>();
-    if (!create.cluster.empty())
+
+    bool is_create_database = create.database && !create.table;
+    if (!create.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
-        prepareOnClusterQuery(create, getContext(), create.cluster);
-        DDLQueryOnClusterParams params;
-        params.access_to_check = getRequiredAccess();
-        return executeDDLQueryOnCluster(query_ptr, getContext(), params);
+        auto on_cluster_version = getContext()->getSettingsRef().distributed_ddl_entry_format_version;
+        if (is_create_database || on_cluster_version < DDLLogEntry::NORMALIZE_CREATE_ON_INITIATOR_VERSION)
+            return executeQueryOnCluster(create);
     }
 
     getContext()->checkAccess(getRequiredAccess());
@@ -1560,7 +1572,7 @@ BlockIO InterpreterCreateQuery::execute()
     ASTQueryWithOutput::resetOutputASTIfExist(create);
 
     /// CREATE|ATTACH DATABASE
-    if (create.database && !create.table)
+    if (is_create_database)
         return createDatabase(create);
     else
         return createTable(create);
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index b6c8e10668a..984310b2952 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -100,6 +100,8 @@ private:
     /// It's used to prevent automatic schema inference while table creation on each server startup.
     void addColumnsDescriptionToCreateQueryIfNecessary(ASTCreateQuery & create, const StoragePtr & storage);
 
+    BlockIO executeQueryOnCluster(ASTCreateQuery & create);
+
     ASTPtr query_ptr;
 
     /// Skip safety threshold when loading tables.
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index 497fae8f573..5e5bebfdc58 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -12,9 +12,8 @@
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
 #include <Storages/MutationCommands.h>
-#include <Storages/StorageMergeTree.h>
-#include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/LightweightDeleteDescription.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
 
 namespace DB
@@ -50,10 +49,9 @@ BlockIO InterpreterDeleteQuery::execute()
 
     /// First check table storage for validations.
     StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
-    auto storage_merge_tree = std::dynamic_pointer_cast<StorageMergeTree>(table);
-    auto storage_replicated_merge_tree = std::dynamic_pointer_cast<StorageReplicatedMergeTree>(table);
-    if (!storage_merge_tree && !storage_replicated_merge_tree)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only MergeTree or ReplicatedMergeTree tables are supported");
+    auto merge_tree = std::dynamic_pointer_cast<MergeTreeData>(table);
+    if (!merge_tree)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only MergeTree family tables are supported");
 
     checkStorageSupportsTransactionsIfNeeded(table, getContext());
     if (table->isStaticStorage())
diff --git a/src/Interpreters/InterpreterDescribeCacheQuery.cpp b/src/Interpreters/InterpreterDescribeCacheQuery.cpp
index dd6df26c6af..d7c13dbb077 100644
--- a/src/Interpreters/InterpreterDescribeCacheQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeCacheQuery.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Storages/ColumnsDescription.h>
 #include <Common/FileCacheFactory.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Access/Common/AccessFlags.h>
 #include <Core/Block.h>
 
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index bb3f91d5210..1f83992dbbe 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -54,7 +54,7 @@ InterpreterDropQuery::InterpreterDropQuery(const ASTPtr & query_ptr_, ContextMut
 BlockIO InterpreterDropQuery::execute()
 {
     auto & drop = query_ptr->as<ASTDropQuery &>();
-    if (!drop.cluster.empty())
+    if (!drop.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
         DDLQueryOnClusterParams params;
         params.access_to_check = getRequiredAccessForDDLOnCluster();
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 6715947da43..4799970b6a1 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -174,7 +174,8 @@ struct QueryPlanSettings
             {"actions", query_plan_options.actions},
             {"indexes", query_plan_options.indexes},
             {"optimize", optimize},
-            {"json", json}
+            {"json", json},
+            {"sorting", query_plan_options.sorting},
     };
 };
 
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 7b6066575ae..4c7823ddc4e 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -326,7 +326,7 @@ BlockIO InterpreterInsertQuery::execute()
     if (!query.table_function)
         getContext()->checkAccess(AccessType::INSERT, query.table_id, query_sample_block.getNames());
 
-    if (query.select && table->isRemote() && settings.parallel_distributed_insert_select)
+    if (query.select && settings.parallel_distributed_insert_select)
         // Distributed INSERT SELECT
         distributed_pipeline = table->distributedWrite(query, getContext());
 
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 3af95fd77b8..55d46eda92c 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -162,7 +162,7 @@ FilterDAGInfoPtr generateFilterActions(
     filter_info->actions->projectInput(false);
 
     for (const auto * node : filter_info->actions->getInputs())
-        filter_info->actions->getIndex().push_back(node);
+        filter_info->actions->getOutputs().push_back(node);
 
     auto required_columns_from_filter = filter_info->actions->getRequiredColumns();
 
@@ -212,10 +212,9 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
     const ContextPtr & context_,
     const SelectQueryOptions & options_,
-    SubqueriesForSets subquery_for_sets_,
-    PreparedSets prepared_sets_)
+    PreparedSetsPtr prepared_sets_)
     : InterpreterSelectQuery(
-        query_ptr_, context_, std::nullopt, nullptr, options_, {}, {}, std::move(subquery_for_sets_), std::move(prepared_sets_))
+        query_ptr_, context_, std::nullopt, nullptr, options_, {}, {}, prepared_sets_)
 {}
 
 InterpreterSelectQuery::~InterpreterSelectQuery() = default;
@@ -333,8 +332,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     const SelectQueryOptions & options_,
     const Names & required_result_column_names,
     const StorageMetadataPtr & metadata_snapshot_,
-    SubqueriesForSets subquery_for_sets_,
-    PreparedSets prepared_sets_)
+    PreparedSetsPtr prepared_sets_)
     : InterpreterSelectQuery(
         query_ptr_,
         Context::createCopy(context_),
@@ -343,8 +341,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         options_,
         required_result_column_names,
         metadata_snapshot_,
-        std::move(subquery_for_sets_),
-        std::move(prepared_sets_))
+        prepared_sets_)
 {}
 
 InterpreterSelectQuery::InterpreterSelectQuery(
@@ -355,19 +352,20 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     const SelectQueryOptions & options_,
     const Names & required_result_column_names,
     const StorageMetadataPtr & metadata_snapshot_,
-    SubqueriesForSets subquery_for_sets_,
-    PreparedSets prepared_sets_)
+    PreparedSetsPtr prepared_sets_)
     /// NOTE: the query almost always should be cloned because it will be modified during analysis.
     : IInterpreterUnionOrSelectQuery(options_.modify_inplace ? query_ptr_ : query_ptr_->clone(), context_, options_)
     , storage(storage_)
     , input_pipe(std::move(input_pipe_))
     , log(&Poco::Logger::get("InterpreterSelectQuery"))
     , metadata_snapshot(metadata_snapshot_)
-    , subquery_for_sets(std::move(subquery_for_sets_))
-    , prepared_sets(std::move(prepared_sets_))
+    , prepared_sets(prepared_sets_)
 {
     checkStackSize();
 
+    if (!prepared_sets)
+        prepared_sets = std::make_shared<PreparedSets>();
+
     query_info.ignore_projections = options.ignore_projections;
     query_info.is_projection_query = options.is_projection_query;
 
@@ -566,8 +564,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             NameSet(required_result_column_names.begin(), required_result_column_names.end()),
             !options.only_analyze,
             options,
-            std::move(subquery_for_sets),
-            std::move(prepared_sets));
+            prepared_sets);
 
         if (!options.only_analyze)
         {
@@ -611,11 +608,15 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
         if (storage)
         {
+            query_info.filter_asts.clear();
+
             /// Fix source_header for filter actions.
             if (row_policy_filter)
             {
                 filter_info = generateFilterActions(
                     table_id, row_policy_filter, context, storage, storage_snapshot, metadata_snapshot, required_columns);
+
+                query_info.filter_asts.push_back(row_policy_filter);
             }
 
             if (query_info.additional_filter_ast)
@@ -624,6 +625,8 @@ InterpreterSelectQuery::InterpreterSelectQuery(
                     table_id, query_info.additional_filter_ast, context, storage, storage_snapshot, metadata_snapshot, required_columns);
 
                 additional_filter_info->do_remove_column = true;
+
+                query_info.filter_asts.push_back(query_info.additional_filter_ast);
             }
 
             source_header = storage_snapshot->getSampleBlockForColumns(required_columns);
@@ -658,8 +661,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         LOG_TRACE(log, "Running 'analyze' second time");
 
         /// Reuse already built sets for multiple passes of analysis
-        subquery_for_sets = std::move(query_analyzer->getSubqueriesForSets());
-        prepared_sets = std::move(query_analyzer->getPreparedSets());
+        prepared_sets = query_analyzer->getPreparedSets();
 
         /// Do not try move conditions to PREWHERE for the second time.
         /// Otherwise, we won't be able to fallback from inefficient PREWHERE to WHERE later.
@@ -762,14 +764,9 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
     {
         query_analyzer->makeSetsForIndex(select_query.where());
         query_analyzer->makeSetsForIndex(select_query.prewhere());
-        query_info.sets = std::move(query_analyzer->getPreparedSets());
-        query_info.subquery_for_sets = std::move(query_analyzer->getSubqueriesForSets());
+        query_info.prepared_sets = query_analyzer->getPreparedSets();
 
         from_stage = storage->getQueryProcessingStage(context, options.to_stage, storage_snapshot, query_info);
-
-        /// query_info.sets is used for further set index analysis. Use copy instead of move.
-        query_analyzer->getPreparedSets() = query_info.sets;
-        query_analyzer->getSubqueriesForSets() = std::move(query_info.subquery_for_sets);
     }
 
     /// Do I need to perform the first part of the pipeline?
@@ -1182,7 +1179,6 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
     auto & query = getSelectQuery();
     const Settings & settings = context->getSettingsRef();
     auto & expressions = analysis_result;
-    auto & subqueries_for_sets = query_analyzer->getSubqueriesForSets();
     bool intermediate_stage = false;
     bool to_aggregation_stage = false;
     bool from_aggregation_stage = false;
@@ -1435,7 +1431,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
 
                         auto sorting_step = std::make_unique<SortingStep>(
                             plan.getCurrentDataStream(),
-                            order_descr,
+                            std::move(order_descr),
                             settings.max_block_size,
                             0 /* LIMIT */,
                             SizeLimits(settings.max_rows_to_sort, settings.max_bytes_to_sort, settings.sort_overflow_mode),
@@ -1443,7 +1439,8 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
                             settings.remerge_sort_lowered_memory_bytes_ratio,
                             settings.max_bytes_before_external_sort,
                             this->context->getTemporaryVolume(),
-                            settings.min_free_disk_space_for_temporary_data);
+                            settings.min_free_disk_space_for_temporary_data,
+                            settings.optimize_sorting_by_input_stream_properties);
                         sorting_step->setStepDescription(fmt::format("Sort {} before JOIN", is_right ? "right" : "left"));
                         plan.addStep(std::move(sorting_step));
                     };
@@ -1690,8 +1687,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
         }
     }
 
-    if (!subqueries_for_sets.empty())
-        executeSubqueriesInSetsAndJoins(query_plan, subqueries_for_sets);
+    executeSubqueriesInSetsAndJoins(query_plan);
 }
 
 static void executeMergeAggregatedImpl(
@@ -2013,8 +2009,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
         && storage
         && storage->getName() != "MaterializedMySQL"
         && !storage->hasLightweightDeletedMask()
-        && !row_policy_filter
-        && !query_info.additional_filter_ast
+        && query_info.filter_asts.empty()
         && processing_stage == QueryProcessingStage::FetchColumns
         && query_analyzer->hasAggregation()
         && (query_analyzer->aggregates().size() == 1)
@@ -2035,7 +2030,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
             SelectQueryInfo temp_query_info;
             temp_query_info.query = query_ptr;
             temp_query_info.syntax_analyzer_result = syntax_analyzer_result;
-            temp_query_info.sets = query_analyzer->getPreparedSets();
+            temp_query_info.prepared_sets = query_analyzer->getPreparedSets();
 
             num_rows = storage->totalRowsByPartitionPredicate(temp_query_info, context);
         }
@@ -2114,7 +2109,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
         && !query.limit_with_ties
         && !query.prewhere()
         && !query.where()
-        && !query_info.additional_filter_ast
+        && query_info.filter_asts.empty()
         && !query.groupBy()
         && !query.having()
         && !query.orderBy()
@@ -2577,7 +2572,8 @@ void InterpreterSelectQuery::executeWindow(QueryPlan & query_plan)
                 settings.remerge_sort_lowered_memory_bytes_ratio,
                 settings.max_bytes_before_external_sort,
                 context->getTemporaryVolume(),
-                settings.min_free_disk_space_for_temporary_data);
+                settings.min_free_disk_space_for_temporary_data,
+                settings.optimize_sorting_by_input_stream_properties);
             sorting_step->setStepDescription("Sorting for window '" + window.window_name + "'");
             query_plan.addStep(std::move(sorting_step));
         }
@@ -2635,7 +2631,8 @@ void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfo
         settings.remerge_sort_lowered_memory_bytes_ratio,
         settings.max_bytes_before_external_sort,
         context->getTemporaryVolume(),
-        settings.min_free_disk_space_for_temporary_data);
+        settings.min_free_disk_space_for_temporary_data,
+        settings.optimize_sorting_by_input_stream_properties);
 
     sorting_step->setStepDescription("Sorting for ORDER BY");
     query_plan.addStep(std::move(sorting_step));
@@ -2644,19 +2641,12 @@ void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfo
 
 void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const std::string & description)
 {
-    auto & query = getSelectQuery();
-    SortDescription order_descr = getSortDescription(query, context);
-    UInt64 limit = getLimitForSorting(query, context);
-
-    executeMergeSorted(query_plan, order_descr, limit, description);
-}
-
-void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const SortDescription & sort_description, UInt64 limit, const std::string & description)
-{
-    const Settings & settings = context->getSettingsRef();
-
-    auto merging_sorted = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(), sort_description, settings.max_block_size, limit);
+    const auto & query = getSelectQuery();
+    SortDescription sort_description = getSortDescription(query, context);
+    const UInt64 limit = getLimitForSorting(query, context);
+    const auto max_block_size = context->getSettingsRef().max_block_size;
 
+    auto merging_sorted = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(), std::move(sort_description), max_block_size, limit);
     merging_sorted->setStepDescription("Merge sorted streams " + description);
     query_plan.addStep(std::move(merging_sorted));
 }
@@ -2847,12 +2837,9 @@ void InterpreterSelectQuery::executeExtremes(QueryPlan & query_plan)
     query_plan.addStep(std::move(extremes_step));
 }
 
-void InterpreterSelectQuery::executeSubqueriesInSetsAndJoins(QueryPlan & query_plan, SubqueriesForSets & subqueries_for_sets)
+void InterpreterSelectQuery::executeSubqueriesInSetsAndJoins(QueryPlan & query_plan)
 {
-    const Settings & settings = context->getSettingsRef();
-
-    SizeLimits limits(settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode);
-    addCreatingSetsStep(query_plan, std::move(subqueries_for_sets), limits, context);
+    addCreatingSetsStep(query_plan, prepared_sets, context);
 }
 
 
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index e70490f13ac..3b933547422 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -23,7 +23,7 @@ class Logger;
 
 namespace DB
 {
-struct SubqueryForSet;
+class SubqueryForSet;
 class InterpreterSelectWithUnionQuery;
 class Context;
 class QueryPlan;
@@ -77,14 +77,13 @@ public:
         const StorageMetadataPtr & metadata_snapshot_ = nullptr,
         const SelectQueryOptions & = {});
 
-    /// Reuse existing subqueries_for_sets and prepared_sets for another pass of analysis. It's used for projection.
+    /// Reuse existing prepared_sets for another pass of analysis. It's used for projection.
     /// TODO: Find a general way of sharing sets among different interpreters, such as subqueries.
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
         const ContextPtr & context_,
         const SelectQueryOptions &,
-        SubqueriesForSets subquery_for_sets_,
-        PreparedSets prepared_sets_);
+        PreparedSetsPtr prepared_sets_);
 
     ~InterpreterSelectQuery() override;
 
@@ -128,6 +127,8 @@ public:
     /// It will set shard_num and shard_count to the client_info
     void setProperClientInfo(size_t replica_num, size_t replica_count);
 
+    FilterDAGInfoPtr getAdditionalQueryInfo() const { return additional_filter_info; }
+
     static SortDescription getSortDescription(const ASTSelectQuery & query, const ContextPtr & context);
     static UInt64 getLimitForSorting(const ASTSelectQuery & query, const ContextPtr & context);
 
@@ -140,8 +141,7 @@ private:
         const SelectQueryOptions &,
         const Names & required_result_column_names = {},
         const StorageMetadataPtr & metadata_snapshot_ = nullptr,
-        SubqueriesForSets subquery_for_sets_ = {},
-        PreparedSets prepared_sets_ = {});
+        PreparedSetsPtr prepared_sets_ = nullptr);
 
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
@@ -151,8 +151,7 @@ private:
         const SelectQueryOptions &,
         const Names & required_result_column_names = {},
         const StorageMetadataPtr & metadata_snapshot_ = nullptr,
-        SubqueriesForSets subquery_for_sets_ = {},
-        PreparedSets prepared_sets_ = {});
+        PreparedSetsPtr prepared_sets_ = nullptr);
 
     ASTSelectQuery & getSelectQuery() { return query_ptr->as<ASTSelectQuery &>(); }
 
@@ -185,9 +184,7 @@ private:
     static void executeProjection(QueryPlan & query_plan, const ActionsDAGPtr & expression);
     void executeDistinct(QueryPlan & query_plan, bool before_order, Names columns, bool pre_distinct);
     void executeExtremes(QueryPlan & query_plan);
-    void executeSubqueriesInSetsAndJoins(QueryPlan & query_plan, std::unordered_map<String, SubqueryForSet> & subqueries_for_sets);
-    void
-    executeMergeSorted(QueryPlan & query_plan, const SortDescription & sort_description, UInt64 limit, const std::string & description);
+    void executeSubqueriesInSetsAndJoins(QueryPlan & query_plan);
 
     enum class Modificator
     {
@@ -244,8 +241,7 @@ private:
     StorageSnapshotPtr storage_snapshot;
 
     /// Reuse already built sets for multiple passes of analysis, possibly across interpreters.
-    SubqueriesForSets subquery_for_sets;
-    PreparedSets prepared_sets;
+    PreparedSetsPtr prepared_sets;
 };
 
 }
diff --git a/src/Interpreters/InterpreterSetQuery.cpp b/src/Interpreters/InterpreterSetQuery.cpp
index 1c6a4236bf6..2bd8d648040 100644
--- a/src/Interpreters/InterpreterSetQuery.cpp
+++ b/src/Interpreters/InterpreterSetQuery.cpp
@@ -1,6 +1,6 @@
-#include <Parsers/ASTSetQuery.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSetQuery.h>
+#include <Parsers/ASTSetQuery.h>
 
 namespace DB
 {
@@ -10,7 +10,9 @@ BlockIO InterpreterSetQuery::execute()
 {
     const auto & ast = query_ptr->as<ASTSetQuery &>();
     getContext()->checkSettingsConstraints(ast.changes);
-    getContext()->getSessionContext()->applySettingsChanges(ast.changes);
+    auto session_context = getContext()->getSessionContext();
+    session_context->applySettingsChanges(ast.changes);
+    session_context->addQueryParameters(ast.query_parameters);
     return {};
 }
 
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index 695ea53e65e..8fe55a1635d 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -8,7 +8,7 @@
 #include <Common/escapeForFileName.h>
 #include <Common/ShellCommand.h>
 #include <Common/FileCacheFactory.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
@@ -760,6 +760,7 @@ void InterpreterSystemQuery::syncReplica(ASTSystemQuery &)
 void InterpreterSystemQuery::syncReplicatedDatabase(ASTSystemQuery & query)
 {
     const auto database_name = query.getDatabase();
+    auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, "");
     auto database = DatabaseCatalog::instance().getDatabase(database_name);
 
     if (auto * ptr = typeid_cast<DatabaseReplicated *>(database.get()))
@@ -767,8 +768,7 @@ void InterpreterSystemQuery::syncReplicatedDatabase(ASTSystemQuery & query)
         LOG_TRACE(log, "Synchronizing entries in the database replica's (name: {}) queue with the log", database_name);
         if (!ptr->waitForReplicaToProcessAllEntries(getContext()->getSettingsRef().receive_timeout.totalMilliseconds()))
         {
-            LOG_ERROR(log, "SYNC DATABASE REPLICA {}: Timed out!", database_name);
-            throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "SYNC DATABASE REPLICA {}: command timed out. " \
+            throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "SYNC DATABASE REPLICA {}: database is readonly or command timed out. " \
                     "See the 'receive_timeout' setting", database_name);
         }
         LOG_TRACE(log, "SYNC DATABASE REPLICA {}: OK", database_name);
diff --git a/src/Interpreters/JIT/CompiledExpressionCache.h b/src/Interpreters/JIT/CompiledExpressionCache.h
index 936b5798280..a2a8141759c 100644
--- a/src/Interpreters/JIT/CompiledExpressionCache.h
+++ b/src/Interpreters/JIT/CompiledExpressionCache.h
@@ -3,7 +3,7 @@
 #include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
-#    include <Common/LRUCache.h>
+#    include <Common/CacheBase.h>
 #    include <Common/HashTable/Hash.h>
 #    include <Interpreters/JIT/CHJIT.h>
 
@@ -35,10 +35,10 @@ struct CompiledFunctionWeightFunction
     }
 };
 
-class CompiledExpressionCache : public LRUCache<UInt128, CompiledExpressionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>
+class CompiledExpressionCache : public CacheBase<UInt128, CompiledExpressionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>
 {
 public:
-    using Base = LRUCache<UInt128, CompiledExpressionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>;
+    using Base = CacheBase<UInt128, CompiledExpressionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>;
     using Base::Base;
 };
 
diff --git a/src/Interpreters/JoinSwitcher.cpp b/src/Interpreters/JoinSwitcher.cpp
index 34c8bb4cfd5..5d5a9b27825 100644
--- a/src/Interpreters/JoinSwitcher.cpp
+++ b/src/Interpreters/JoinSwitcher.cpp
@@ -2,7 +2,7 @@
 #include <Interpreters/JoinSwitcher.h>
 #include <Interpreters/HashJoin.h>
 #include <Interpreters/MergeJoin.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/JoinUtils.cpp
similarity index 96%
rename from src/Interpreters/join_common.cpp
rename to src/Interpreters/JoinUtils.cpp
index c81f4a193c3..59e2475a9b2 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/JoinUtils.cpp
@@ -1,4 +1,4 @@
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnLowCardinality.h>
@@ -573,6 +573,36 @@ void splitAdditionalColumns(const Names & key_names, const Block & sample_block,
     }
 }
 
+ColumnPtr filterWithBlanks(ColumnPtr src_column, const IColumn::Filter & filter, bool inverse_filter)
+{
+    ColumnPtr column = src_column->convertToFullColumnIfConst();
+    MutableColumnPtr mut_column = column->cloneEmpty();
+    mut_column->reserve(column->size());
+
+    if (inverse_filter)
+    {
+        for (size_t row = 0; row < filter.size(); ++row)
+        {
+            if (filter[row])
+                mut_column->insertDefault();
+            else
+                mut_column->insertFrom(*column, row);
+        }
+    }
+    else
+    {
+        for (size_t row = 0; row < filter.size(); ++row)
+        {
+            if (filter[row])
+                mut_column->insertFrom(*column, row);
+            else
+                mut_column->insertDefault();
+        }
+    }
+
+    return mut_column;
+}
+
 }
 
 NotJoinedBlocks::NotJoinedBlocks(std::unique_ptr<RightColumnsFiller> filler_,
diff --git a/src/Interpreters/join_common.h b/src/Interpreters/JoinUtils.h
similarity index 97%
rename from src/Interpreters/join_common.h
rename to src/Interpreters/JoinUtils.h
index 38b431db3e0..2e26ab782a1 100644
--- a/src/Interpreters/join_common.h
+++ b/src/Interpreters/JoinUtils.h
@@ -106,6 +106,9 @@ void splitAdditionalColumns(const Names & key_names, const Block & sample_block,
 
 void changeLowCardinalityInplace(ColumnWithTypeAndName & column);
 
+/// Insert default values for rows marked in filter
+ColumnPtr filterWithBlanks(ColumnPtr src_column, const IColumn::Filter & filter, bool inverse_filter = false);
+
 }
 
 /// Creates result from right table data in RIGHT and FULL JOIN when keys are not present in left table.
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 74b54ef537f..f4a98ada199 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -7,6 +7,7 @@
 #include <Interpreters/InJoinSubqueriesPreprocessor.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/getTableExpressions.h>
+#include <Functions/FunctionsExternalDictionaries.h>
 
 #include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTFunction.h>
@@ -320,13 +321,26 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
             {
                 table_join->setStorageJoin(storage_join);
             }
-            else if (auto storage_dict = std::dynamic_pointer_cast<StorageDictionary>(storage);
-                     storage_dict && join_algorithm.isSet(JoinAlgorithm::DIRECT))
+
+            if (auto storage_dict = std::dynamic_pointer_cast<StorageDictionary>(storage);
+                storage_dict && join_algorithm.isSet(JoinAlgorithm::DIRECT))
             {
-                table_join->setStorageJoin(storage_dict);
+                FunctionDictHelper dictionary_helper(context);
+
+                auto dictionary_name = storage_dict->getDictionaryName();
+                auto dictionary = dictionary_helper.getDictionary(dictionary_name);
+                if (!dictionary)
+                {
+                    LOG_TRACE(&Poco::Logger::get("JoinedTables"), "Can't use dictionary join: dictionary '{}' was not found", dictionary_name);
+                    return nullptr;
+                }
+
+                auto dictionary_kv = std::dynamic_pointer_cast<const IKeyValueEntity>(dictionary);
+                table_join->setStorageJoin(dictionary_kv);
             }
-            else if (auto storage_kv = std::dynamic_pointer_cast<IKeyValueStorage>(storage);
-                     storage_kv && join_algorithm.isSet(JoinAlgorithm::DIRECT))
+
+            if (auto storage_kv = std::dynamic_pointer_cast<IKeyValueEntity>(storage);
+                storage_kv && join_algorithm.isSet(JoinAlgorithm::DIRECT))
             {
                 table_join->setStorageJoin(storage_kv);
             }
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index 655d50355f9..f1dcff70c4c 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -9,7 +9,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/MergeJoin.h>
 #include <Interpreters/TableJoin.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <Interpreters/sortBlock.h>
 #include <Processors/Sources/BlocksListSource.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
diff --git a/src/Interpreters/MergeJoin.h b/src/Interpreters/MergeJoin.h
index 3b8ad6063e3..99bd7deffe2 100644
--- a/src/Interpreters/MergeJoin.h
+++ b/src/Interpreters/MergeJoin.h
@@ -2,7 +2,7 @@
 
 #include <shared_mutex>
 
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Core/Block.h>
 #include <Core/SortDescription.h>
 #include <Interpreters/IJoin.h>
@@ -69,7 +69,7 @@ private:
         size_t operator()(const Block & block) const { return block.bytes(); }
     };
 
-    using Cache = LRUCache<size_t, Block, std::hash<size_t>, BlockByteWeight>;
+    using Cache = CacheBase<size_t, Block, std::hash<size_t>, BlockByteWeight>;
 
     mutable std::shared_mutex rwlock;
     std::shared_ptr<TableJoin> table_join;
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index 7b2d55911d1..d3679aac891 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -28,6 +28,7 @@
 #include <IO/WriteHelpers.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
 #include <DataTypes/NestedUtils.h>
+#include <Interpreters/PreparedSets.h>
 #include <Storages/LightweightDeleteDescription.h>
 
 
@@ -859,9 +860,9 @@ ASTPtr MutationsInterpreter::prepareInterpreterSelectQuery(std::vector<Stage> &
             for (const auto & kv : stage.column_to_updated)
             {
                 auto column_name = kv.second->getColumnName();
-                const auto & dag_node = actions->findInIndex(column_name);
+                const auto & dag_node = actions->findInOutputs(column_name);
                 const auto & alias = actions->addAlias(dag_node, kv.first);
-                actions->addOrReplaceInIndex(alias);
+                actions->addOrReplaceInOutputs(alias);
             }
         }
 
@@ -934,14 +935,7 @@ QueryPipelineBuilder MutationsInterpreter::addStreamsForLaterStages(const std::v
             }
         }
 
-        SubqueriesForSets & subqueries_for_sets = stage.analyzer->getSubqueriesForSets();
-        if (!subqueries_for_sets.empty())
-        {
-            const Settings & settings = context->getSettingsRef();
-            SizeLimits network_transfer_limits(
-                    settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode);
-            addCreatingSetsStep(plan, std::move(subqueries_for_sets), network_transfer_limits, context);
-        }
+        addCreatingSetsStep(plan, stage.analyzer->getPreparedSets(), context);
     }
 
     QueryPlanOptimizationSettings do_not_optimize_plan;
diff --git a/src/Interpreters/PreparedSets.cpp b/src/Interpreters/PreparedSets.cpp
new file mode 100644
index 00000000000..79cfb8b688a
--- /dev/null
+++ b/src/Interpreters/PreparedSets.cpp
@@ -0,0 +1,109 @@
+#include <Interpreters/PreparedSets.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <Interpreters/Set.h>
+
+namespace DB
+{
+
+PreparedSetKey PreparedSetKey::forLiteral(const IAST & ast, DataTypes types_)
+{
+    /// Remove LowCardinality types from type list because Set doesn't support LowCardinality keys now,
+    ///   just converts LowCardinality to ordinary types.
+    for (auto & type : types_)
+        type = recursiveRemoveLowCardinality(type);
+
+    PreparedSetKey key;
+    key.ast_hash = ast.getTreeHash();
+    key.types = std::move(types_);
+    return key;
+}
+
+PreparedSetKey PreparedSetKey::forSubquery(const IAST & ast)
+{
+    PreparedSetKey key;
+    key.ast_hash = ast.getTreeHash();
+    return key;
+}
+
+bool PreparedSetKey::operator==(const PreparedSetKey & other) const
+{
+    if (ast_hash != other.ast_hash)
+        return false;
+
+    if (types.size() != other.types.size())
+        return false;
+
+    for (size_t i = 0; i < types.size(); ++i)
+    {
+        if (!types[i]->equals(*other.types[i]))
+            return false;
+    }
+
+    return true;
+}
+
+SubqueryForSet & PreparedSets::createOrGetSubquery(const String & subquery_id, const PreparedSetKey & key,
+                                                   SizeLimits set_size_limit, bool transform_null_in)
+{
+    SubqueryForSet & subquery = subqueries[subquery_id];
+
+    /// If you already created a Set with the same subquery / table for another ast
+    /// In that case several PreparedSetKey would share same subquery and set
+    /// Not sure if it's really possible case (maybe for distributed query when set was filled by external table?)
+    if (subquery.set)
+        sets[key] = subquery.set;
+    else
+        sets[key] = subquery.set = std::make_shared<Set>(set_size_limit, false, transform_null_in);
+    return subquery;
+}
+
+/// If the subquery is not associated with any set, create default-constructed SubqueryForSet.
+/// It's aimed to fill external table passed to SubqueryForSet::createSource.
+SubqueryForSet & PreparedSets::getSubquery(const String & subquery_id) { return subqueries[subquery_id]; }
+
+void PreparedSets::set(const PreparedSetKey & key, SetPtr set_) { sets[key] = set_; }
+
+SetPtr & PreparedSets::get(const PreparedSetKey & key) { return sets[key]; }
+
+std::vector<SetPtr> PreparedSets::getByTreeHash(IAST::Hash ast_hash)
+{
+    std::vector<SetPtr> res;
+    for (const auto & it : this->sets)
+    {
+        if (it.first.ast_hash == ast_hash)
+            res.push_back(it.second);
+    }
+    return res;
+}
+
+PreparedSets::SubqueriesForSets PreparedSets::detachSubqueries()
+{
+    auto res = std::move(subqueries);
+    subqueries = SubqueriesForSets();
+    return res;
+}
+
+bool PreparedSets::empty() const { return sets.empty(); }
+
+void SubqueryForSet::createSource(InterpreterSelectWithUnionQuery & interpreter, StoragePtr table_)
+{
+    source = std::make_unique<QueryPlan>();
+    interpreter.buildQueryPlan(*source);
+    if (table_)
+        table = table_;
+}
+
+bool SubqueryForSet::hasSource() const
+{
+    return source != nullptr;
+}
+
+QueryPlanPtr SubqueryForSet::detachSource()
+{
+    auto res = std::move(source);
+    source = nullptr;
+    return res;
+}
+
+};
diff --git a/src/Interpreters/PreparedSets.h b/src/Interpreters/PreparedSets.h
index f486752e192..06600c49f13 100644
--- a/src/Interpreters/PreparedSets.h
+++ b/src/Interpreters/PreparedSets.h
@@ -4,58 +4,61 @@
 #include <DataTypes/IDataType.h>
 #include <memory>
 #include <unordered_map>
+#include <vector>
 #include <DataTypes/DataTypeLowCardinality.h>
-
+#include <Storages/IStorage_fwd.h>
+#include <QueryPipeline/SizeLimits.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 
 namespace DB
 {
 
+class QueryPlan;
+
+class Set;
+using SetPtr = std::shared_ptr<Set>;
+class InterpreterSelectWithUnionQuery;
+
+/// Information on how to build set for the [GLOBAL] IN section.
+class SubqueryForSet
+{
+public:
+
+    void createSource(InterpreterSelectWithUnionQuery & interpreter, StoragePtr table_ = nullptr);
+
+    bool hasSource() const;
+
+    /// Returns query plan for the set's source
+    /// and removes it from SubqueryForSet because we need to build it only once.
+    std::unique_ptr<QueryPlan> detachSource();
+
+    /// Build this set from the result of the subquery.
+    SetPtr set;
+
+    /// If set, put the result into the table.
+    /// This is a temporary table for transferring to remote servers for distributed query processing.
+    StoragePtr table;
+
+private:
+    /// The source is obtained using the InterpreterSelectQuery subquery.
+    std::unique_ptr<QueryPlan> source;
+};
+
 struct PreparedSetKey
 {
     /// Prepared sets for tuple literals are indexed by the hash of the tree contents and by the desired
     /// data types of set elements (two different Sets can be required for two tuples with the same contents
     /// if left hand sides of the IN operators have different types).
-    static PreparedSetKey forLiteral(const IAST & ast, DataTypes types_)
-    {
-        /// Remove LowCardinality types from type list because Set doesn't support LowCardinality keys now,
-        ///   just converts LowCardinality to ordinary types.
-        for (auto & type : types_)
-            type = recursiveRemoveLowCardinality(type);
-
-        PreparedSetKey key;
-        key.ast_hash = ast.getTreeHash();
-        key.types = std::move(types_);
-        return key;
-    }
+    static PreparedSetKey forLiteral(const IAST & ast, DataTypes types_);
 
     /// Prepared sets for subqueries are indexed only by the AST contents because the type of the resulting
     /// set is fully determined by the subquery.
-    static PreparedSetKey forSubquery(const IAST & ast)
-    {
-        PreparedSetKey key;
-        key.ast_hash = ast.getTreeHash();
-        return key;
-    }
+    static PreparedSetKey forSubquery(const IAST & ast);
 
     IAST::Hash ast_hash;
     DataTypes types; /// Empty for subqueries.
 
-    bool operator==(const PreparedSetKey & other) const
-    {
-        if (ast_hash != other.ast_hash)
-            return false;
-
-        if (types.size() != other.types.size())
-            return false;
-
-        for (size_t i = 0; i < types.size(); ++i)
-        {
-            if (!types[i]->equals(*other.types[i]))
-                return false;
-        }
-
-        return true;
-    }
+    bool operator==(const PreparedSetKey & other) const;
 
     struct Hash
     {
@@ -63,9 +66,36 @@ struct PreparedSetKey
     };
 };
 
-class Set;
-using SetPtr = std::shared_ptr<Set>;
+class PreparedSets
+{
+public:
+    using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
 
-using PreparedSets = std::unordered_map<PreparedSetKey, SetPtr, PreparedSetKey::Hash>;
+    SubqueryForSet & createOrGetSubquery(const String & subquery_id, const PreparedSetKey & key,
+                                         SizeLimits set_size_limit, bool transform_null_in);
+    SubqueryForSet & getSubquery(const String & subquery_id);
+
+    void set(const PreparedSetKey & key, SetPtr set_);
+    SetPtr & get(const PreparedSetKey & key);
+
+    /// Get subqueries and clear them.
+    /// We need to build a plan for subqueries just once. That's why we can clear them after accessing them.
+    /// SetPtr would still be available for consumers of PreparedSets.
+    SubqueriesForSets detachSubqueries();
+
+    /// Returns all sets that match the given ast hash not checking types
+    /// Used in KeyCondition and MergeTreeIndexConditionBloomFilter to make non exact match for types in PreparedSetKey
+    std::vector<SetPtr> getByTreeHash(IAST::Hash ast_hash);
+
+    bool empty() const;
+
+private:
+    std::unordered_map<PreparedSetKey, SetPtr, PreparedSetKey::Hash> sets;
+
+    /// This is the information required for building sets
+    SubqueriesForSets subqueries;
+};
+
+using PreparedSetsPtr = std::shared_ptr<PreparedSets>;
 
 }
diff --git a/src/Interpreters/ProcessorsProfileLog.cpp b/src/Interpreters/ProcessorsProfileLog.cpp
index 0589f78105d..f6ce801605a 100644
--- a/src/Interpreters/ProcessorsProfileLog.cpp
+++ b/src/Interpreters/ProcessorsProfileLog.cpp
@@ -26,12 +26,18 @@ NamesAndTypesList ProcessorProfileLogElement::getNamesAndTypes()
 
         {"id", std::make_shared<DataTypeUInt64>()},
         {"parent_ids", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
+        {"plan_step", std::make_shared<DataTypeUInt64>()},
+        {"plan_group", std::make_shared<DataTypeUInt64>()},
 
         {"query_id", std::make_shared<DataTypeString>()},
         {"name", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
         {"elapsed_us", std::make_shared<DataTypeUInt64>()},
         {"input_wait_elapsed_us", std::make_shared<DataTypeUInt64>()},
         {"output_wait_elapsed_us", std::make_shared<DataTypeUInt64>()},
+        {"input_rows", std::make_shared<DataTypeUInt64>()},
+        {"input_bytes", std::make_shared<DataTypeUInt64>()},
+        {"output_rows", std::make_shared<DataTypeUInt64>()},
+        {"output_bytes", std::make_shared<DataTypeUInt64>()},
     };
 }
 
@@ -52,11 +58,17 @@ void ProcessorProfileLogElement::appendToBlock(MutableColumns & columns) const
         columns[i++]->insert(parent_ids_array);
     }
 
+    columns[i++]->insert(plan_step);
+    columns[i++]->insert(plan_group);
     columns[i++]->insertData(query_id.data(), query_id.size());
     columns[i++]->insertData(processor_name.data(), processor_name.size());
     columns[i++]->insert(elapsed_us);
     columns[i++]->insert(input_wait_elapsed_us);
     columns[i++]->insert(output_wait_elapsed_us);
+    columns[i++]->insert(input_rows);
+    columns[i++]->insert(input_bytes);
+    columns[i++]->insert(output_rows);
+    columns[i++]->insert(output_bytes);
 }
 
 ProcessorsProfileLog::ProcessorsProfileLog(ContextPtr context_, const String & database_name_,
diff --git a/src/Interpreters/ProcessorsProfileLog.h b/src/Interpreters/ProcessorsProfileLog.h
index 33cb3988e9f..07837bdd10e 100644
--- a/src/Interpreters/ProcessorsProfileLog.h
+++ b/src/Interpreters/ProcessorsProfileLog.h
@@ -13,9 +13,12 @@ struct ProcessorProfileLogElement
     time_t event_time{};
     Decimal64 event_time_microseconds{};
 
-    UInt64 id;
+    UInt64 id{};
     std::vector<UInt64> parent_ids;
 
+    UInt64 plan_step{};
+    UInt64 plan_group{};
+
     String query_id;
     String processor_name;
 
@@ -26,6 +29,11 @@ struct ProcessorProfileLogElement
     /// IProcessor::PortFull
     UInt32 output_wait_elapsed_us{};
 
+    size_t input_rows{};
+    size_t input_bytes{};
+    size_t output_rows{};
+    size_t output_bytes{};
+
     static std::string name() { return "ProcessorsProfileLog"; }
     static NamesAndTypesList getNamesAndTypes();
     static NamesAndAliases getNamesAndAliases() { return {}; }
diff --git a/src/Interpreters/SubqueryForSet.cpp b/src/Interpreters/SubqueryForSet.cpp
deleted file mode 100644
index d669e091131..00000000000
--- a/src/Interpreters/SubqueryForSet.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <Interpreters/SubqueryForSet.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Interpreters/PreparedSets.h>
-
-namespace DB
-{
-
-SubqueryForSet::SubqueryForSet() = default;
-SubqueryForSet::~SubqueryForSet() = default;
-SubqueryForSet::SubqueryForSet(SubqueryForSet &&) noexcept = default;
-SubqueryForSet & SubqueryForSet::operator= (SubqueryForSet &&) noexcept = default;
-
-}
diff --git a/src/Interpreters/SubqueryForSet.h b/src/Interpreters/SubqueryForSet.h
deleted file mode 100644
index f737ec4582b..00000000000
--- a/src/Interpreters/SubqueryForSet.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-#include <Storages/IStorage_fwd.h>
-
-
-namespace DB
-{
-
-class QueryPlan;
-
-class Set;
-using SetPtr = std::shared_ptr<Set>;
-
-/// Information on what to do when executing a subquery in the [GLOBAL] IN/JOIN section.
-struct SubqueryForSet
-{
-    SubqueryForSet();
-    ~SubqueryForSet();
-    SubqueryForSet(SubqueryForSet &&) noexcept;
-    SubqueryForSet & operator=(SubqueryForSet &&) noexcept;
-
-    /// The source is obtained using the InterpreterSelectQuery subquery.
-    std::unique_ptr<QueryPlan> source;
-
-    /// If set, build it from result.
-    SetPtr set;
-
-    /// If set, put the result into the table.
-    /// This is a temporary table for transferring to remote servers for distributed query processing.
-    StoragePtr table;
-};
-
-/// ID of subquery -> what to do with it.
-using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
-
-}
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index 5d402ca4127..5d065e564b2 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -13,7 +13,6 @@
 
 #include <Dictionaries/DictionaryStructure.h>
 
-#include <Interpreters/DictionaryReader.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 
 #include <Parsers/ASTExpressionList.h>
@@ -417,75 +416,6 @@ bool TableJoin::needStreamWithNonJoinedRows() const
     return isRightOrFull(kind());
 }
 
-static std::optional<String> getDictKeyName(const String & dict_name , ContextPtr context)
-{
-    auto dictionary = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
-    if (!dictionary)
-        return {};
-
-    if (const auto & structure = dictionary->getStructure(); structure.id)
-        return structure.id->name;
-    return {};
-}
-
-bool TableJoin::tryInitDictJoin(const Block & sample_block, ContextPtr context)
-{
-    bool allowed_inner = isInner(kind()) && strictness() == JoinStrictness::All;
-    bool allowed_left = isLeft(kind()) && (strictness() == JoinStrictness::Any ||
-                                           strictness() == JoinStrictness::All ||
-                                           strictness() == JoinStrictness::Semi ||
-                                           strictness() == JoinStrictness::Anti);
-
-    /// Support ALL INNER, [ANY | ALL | SEMI | ANTI] LEFT
-    if (!allowed_inner && !allowed_left)
-        return false;
-
-    if (clauses.size() != 1 || clauses[0].key_names_right.size() != 1)
-        return false;
-
-    const auto & right_key = getOnlyClause().key_names_right[0];
-
-    /// TODO: support 'JOIN ... ON expr(dict_key) = table_key'
-    auto it_key = original_names.find(right_key);
-    if (it_key == original_names.end())
-        return false;
-
-    if (!right_storage_dictionary)
-        return false;
-
-    auto dict_name = right_storage_dictionary->getDictionaryName();
-
-    auto dict_key = getDictKeyName(dict_name, context);
-    if (!dict_key.has_value() || *dict_key != it_key->second)
-        return false; /// JOIN key != Dictionary key
-
-    Names src_names;
-    NamesAndTypesList dst_columns;
-    for (const auto & col : sample_block)
-    {
-        if (col.name == right_key)
-            continue; /// do not extract key column
-
-        auto it = original_names.find(col.name);
-        if (it != original_names.end())
-        {
-            String original = it->second;
-            src_names.push_back(original);
-            dst_columns.push_back({col.name, col.type});
-        }
-        else
-        {
-            /// Can't extract column from dictionary table
-            /// TODO: Sometimes it should be possible to recunstruct required column,
-            /// e.g. if it's an expression depending on dictionary attributes
-            return false;
-        }
-    }
-    dictionary_reader = std::make_shared<DictionaryReader>(dict_name, src_names, dst_columns, context);
-
-    return true;
-}
-
 static void renameIfNeeded(String & name, const NameToNameMap & renames)
 {
     if (const auto it = renames.find(name); it != renames.end())
@@ -715,23 +645,24 @@ ActionsDAGPtr TableJoin::applyKeyConvertToTable(
     return dag_stage1;
 }
 
-void TableJoin::setStorageJoin(std::shared_ptr<IKeyValueStorage> storage)
+void TableJoin::setStorageJoin(std::shared_ptr<const IKeyValueEntity> storage)
 {
     right_kv_storage = storage;
 }
 
 void TableJoin::setStorageJoin(std::shared_ptr<StorageJoin> storage)
 {
-    if (right_storage_dictionary)
-        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "StorageJoin and Dictionary join are mutually exclusive");
     right_storage_join = storage;
 }
 
-void TableJoin::setStorageJoin(std::shared_ptr<StorageDictionary> storage)
+void TableJoin::setRightStorageName(const std::string & storage_name)
 {
-    if (right_storage_join)
-        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "StorageJoin and Dictionary join are mutually exclusive");
-    right_storage_dictionary = storage;
+    right_storage_name = storage_name;
+}
+
+const std::string & TableJoin::getRightStorageName() const
+{
+    return right_storage_name;
 }
 
 String TableJoin::renamedRightColumnName(const String & name) const
@@ -818,7 +749,7 @@ void TableJoin::resetToCross()
 
 bool TableJoin::allowParallelHashJoin() const
 {
-    if (dictionary_reader || !join_algorithm.isSet(JoinAlgorithm::PARALLEL_HASH))
+    if (!right_storage_name.empty() || !join_algorithm.isSet(JoinAlgorithm::PARALLEL_HASH))
         return false;
     if (table_join.kind != JoinKind::Left && table_join.kind != JoinKind::Inner)
         return false;
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index 3bb3b00416c..d0bf64fdebe 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -5,10 +5,10 @@
 #include <Core/SettingsEnums.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Interpreters/IJoin.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <QueryPipeline/SizeLimits.h>
 #include <DataTypes/getLeastSupertype.h>
-#include <Storages/IKVStorage.h>
+#include <Interpreters/IKeyValueEntity.h>
 
 #include <Common/Exception.h>
 #include <Parsers/IAST_fwd.h>
@@ -28,10 +28,10 @@ class Context;
 class ASTSelectQuery;
 struct DatabaseAndTableWithAlias;
 class Block;
-class DictionaryReader;
+class DictionaryJoinAdapter;
 class StorageJoin;
 class StorageDictionary;
-class IKeyValueStorage;
+class IKeyValueEntity;
 
 struct ColumnWithTypeAndName;
 using ColumnsWithTypeAndName = std::vector<ColumnWithTypeAndName>;
@@ -140,10 +140,9 @@ private:
 
     std::shared_ptr<StorageJoin> right_storage_join;
 
-    std::shared_ptr<StorageDictionary> right_storage_dictionary;
-    std::shared_ptr<DictionaryReader> dictionary_reader;
+    std::shared_ptr<const IKeyValueEntity> right_kv_storage;
 
-    std::shared_ptr<IKeyValueStorage> right_kv_storage;
+    std::string right_storage_name;
 
     Names requiredJoinedNames() const;
 
@@ -301,18 +300,18 @@ public:
 
     std::unordered_map<String, String> leftToRightKeyRemap() const;
 
-    void setStorageJoin(std::shared_ptr<IKeyValueStorage> storage);
+    /// Remember storage name in case of joining with dictionary or another special storage
+    void setRightStorageName(const std::string & storage_name);
+    const std::string & getRightStorageName() const;
+
+    void setStorageJoin(std::shared_ptr<const IKeyValueEntity> storage);
     void setStorageJoin(std::shared_ptr<StorageJoin> storage);
-    void setStorageJoin(std::shared_ptr<StorageDictionary> storage);
 
     std::shared_ptr<StorageJoin> getStorageJoin() { return right_storage_join; }
 
-    bool tryInitDictJoin(const Block & sample_block, ContextPtr context);
+    bool isSpecialStorage() const { return !right_storage_name.empty() || right_storage_join || right_kv_storage; }
 
-    bool isSpecialStorage() const { return right_storage_dictionary || right_storage_join || right_kv_storage; }
-    const DictionaryReader * getDictionaryReader() const { return dictionary_reader.get(); }
-
-    std::shared_ptr<IKeyValueStorage> getStorageKeyValue() { return right_kv_storage; }
+    std::shared_ptr<const IKeyValueEntity> getStorageKeyValue() { return right_kv_storage; }
 };
 
 }
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 39f3453c7c4..9248e8eecb6 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -6,29 +6,30 @@
 #include <Common/checkStackSize.h>
 #include <Core/SettingsEnums.h>
 
-#include <Interpreters/TreeRewriter.h>
-#include <Interpreters/LogicalExpressionsOptimizer.h>
-#include <Interpreters/QueryAliasesVisitor.h>
 #include <Interpreters/ArrayJoinedColumnsVisitor.h>
-#include <Interpreters/TranslateQualifiedNamesVisitor.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/FunctionNameNormalizer.h>
-#include <Interpreters/MarkTableIdentifiersVisitor.h>
-#include <Interpreters/QueryNormalizer.h>
-#include <Interpreters/GroupingSetsRewriterVisitor.h>
-#include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
 #include <Interpreters/CollectJoinOnKeysVisitor.h>
-#include <Interpreters/RequiredSourceColumnsVisitor.h>
-#include <Interpreters/GetAggregatesVisitor.h>
-#include <Interpreters/UserDefinedSQLFunctionVisitor.h>
-#include <Interpreters/TableJoin.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
 #include <Interpreters/ExpressionActions.h> /// getSmallestColumn()
-#include <Interpreters/getTableExpressions.h>
-#include <Interpreters/TreeOptimizer.h>
-#include <Interpreters/replaceAliasColumnsInQuery.h>
-#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/GetAggregatesVisitor.h>
+#include <Interpreters/GroupingSetsRewriterVisitor.h>
+#include <Interpreters/LogicalExpressionsOptimizer.h>
+#include <Interpreters/MarkTableIdentifiersVisitor.h>
 #include <Interpreters/PredicateExpressionsOptimizer.h>
+#include <Interpreters/QueryAliasesVisitor.h>
+#include <Interpreters/QueryNormalizer.h>
+#include <Interpreters/RequiredSourceColumnsVisitor.h>
 #include <Interpreters/RewriteOrderByVisitor.hpp>
+#include <Interpreters/TableJoin.h>
+#include <Interpreters/TranslateQualifiedNamesVisitor.h>
+#include <Interpreters/TreeOptimizer.h>
+#include <Interpreters/TreeRewriter.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
+#include <Interpreters/UserDefinedSQLFunctionVisitor.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/getTableExpressions.h>
+#include <Interpreters/replaceAliasColumnsInQuery.h>
 #include <Interpreters/replaceForPositionalArguments.h>
 
 #include <Parsers/IAST_fwd.h>
@@ -1405,8 +1406,11 @@ TreeRewriterResultPtr TreeRewriter::analyze(
 void TreeRewriter::normalize(
     ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, bool ignore_alias, const Settings & settings, bool allow_self_aliases, ContextPtr context_)
 {
-    UserDefinedSQLFunctionVisitor::Data data_user_defined_functions_visitor;
-    UserDefinedSQLFunctionVisitor(data_user_defined_functions_visitor).visit(query);
+    if (!UserDefinedSQLFunctionFactory::instance().empty())
+    {
+        UserDefinedSQLFunctionVisitor::Data data_user_defined_functions_visitor;
+        UserDefinedSQLFunctionVisitor(data_user_defined_functions_visitor).visit(query);
+    }
 
     CustomizeCountDistinctVisitor::Data data_count_distinct{settings.count_distinct_implementation};
     CustomizeCountDistinctVisitor(data_count_distinct).visit(query);
diff --git a/src/Interpreters/UserDefinedSQLFunctionFactory.cpp b/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
index 698faac5fab..2f876f00cc3 100644
--- a/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
+++ b/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
@@ -160,4 +160,9 @@ std::vector<std::string> UserDefinedSQLFunctionFactory::getAllRegisteredNames()
     return registered_names;
 }
 
+bool UserDefinedSQLFunctionFactory::empty() const
+{
+    std::lock_guard lock(mutex);
+    return function_name_to_create_query.empty();
+}
 }
diff --git a/src/Interpreters/UserDefinedSQLFunctionFactory.h b/src/Interpreters/UserDefinedSQLFunctionFactory.h
index 63bf5d73c15..db43bb7298e 100644
--- a/src/Interpreters/UserDefinedSQLFunctionFactory.h
+++ b/src/Interpreters/UserDefinedSQLFunctionFactory.h
@@ -43,6 +43,9 @@ public:
     /// Get all user defined functions registered names.
     std::vector<String> getAllRegisteredNames() const override;
 
+    /// Check whether any UDFs have been registered
+    bool empty() const;
+
 private:
     std::unordered_map<String, ASTPtr> function_name_to_create_query;
     mutable std::mutex mutex;
diff --git a/src/Interpreters/addMissingDefaults.cpp b/src/Interpreters/addMissingDefaults.cpp
index 62cfa7f6f4e..3febcfc74a8 100644
--- a/src/Interpreters/addMissingDefaults.cpp
+++ b/src/Interpreters/addMissingDefaults.cpp
@@ -23,7 +23,7 @@ ActionsDAGPtr addMissingDefaults(
     bool null_as_default)
 {
     auto actions = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
-    auto & index = actions->getIndex();
+    auto & index = actions->getOutputs();
 
     /// For missing columns of nested structure, you need to create not a column of empty arrays, but a column of arrays of correct lengths.
     /// First, remember the offset columns for all arrays in the block.
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 387f4e892a1..7cc4efcb64d 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -12,9 +12,11 @@
 #include <Access/ContextAccess.h>
 #include <Common/Macros.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
+#include <Databases/DatabaseReplicated.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeEnum.h>
 #include <Processors/Sinks/EmptySink.h>
 #include <QueryPipeline/Pipe.h>
 #include <filesystem>
@@ -181,10 +183,24 @@ public:
 private:
     static Strings getChildrenAllowNoNode(const std::shared_ptr<zkutil::ZooKeeper> & zookeeper, const String & node_path);
 
+    static Block getSampleBlock(ContextPtr context_, bool hosts_to_wait);
+
     Strings getNewAndUpdate(const Strings & current_list_of_finished_hosts);
 
     std::pair<String, UInt16> parseHostAndPort(const String & host_id) const;
 
+    Chunk generateChunkWithUnfinishedHosts() const;
+
+    enum ReplicatedDatabaseQueryStatus
+    {
+        /// Query is (successfully) finished
+        OK = 0,
+        /// Query is not finished yet, but replica is currently executing it
+        IN_PROGRESS = 1,
+        /// Replica is not available or busy with previous queries. It will process query asynchronously
+        QUEUED = 2,
+    };
+
     String node_path;
     ContextPtr context;
     Stopwatch watch;
@@ -200,7 +216,7 @@ private:
     std::unique_ptr<Exception> first_exception;
 
     Int64 timeout_seconds = 120;
-    bool by_hostname = true;
+    bool is_replicated_database = false;
     bool throw_on_timeout = true;
     bool timeout_exceeded = false;
 };
@@ -221,7 +237,7 @@ BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & en
     return io;
 }
 
-static Block getSampleBlock(ContextPtr context_, bool hosts_to_wait)
+Block DDLQueryStatusSource::getSampleBlock(ContextPtr context_, bool hosts_to_wait)
 {
     auto output_mode = context_->getSettingsRef().distributed_ddl_output_mode;
 
@@ -232,19 +248,38 @@ static Block getSampleBlock(ContextPtr context_, bool hosts_to_wait)
         return std::make_shared<DataTypeNullable>(type);
     };
 
-    Block res = Block{
-        {std::make_shared<DataTypeString>(),                         "host"},
-        {std::make_shared<DataTypeUInt16>(),                         "port"},
-        {maybe_make_nullable(std::make_shared<DataTypeInt64>()),     "status"},
-        {maybe_make_nullable(std::make_shared<DataTypeString>()),    "error"},
-        {std::make_shared<DataTypeUInt64>(),                         "num_hosts_remaining"},
-        {std::make_shared<DataTypeUInt64>(),                         "num_hosts_active"},
+    auto get_status_enum = []()
+    {
+        return std::make_shared<DataTypeEnum8>(
+            DataTypeEnum8::Values
+            {
+                {"OK",              static_cast<Int8>(OK)},
+                {"IN_PROGRESS",     static_cast<Int8>(IN_PROGRESS)},
+                {"QUEUED",          static_cast<Int8>(QUEUED)},
+            });
     };
 
     if (hosts_to_wait)
-        res.erase("port");
-
-    return res;
+    {
+        return Block{
+            {std::make_shared<DataTypeString>(), "shard"},
+            {std::make_shared<DataTypeString>(), "replica"},
+            {get_status_enum(), "status"},
+            {std::make_shared<DataTypeUInt64>(), "num_hosts_remaining"},
+            {std::make_shared<DataTypeUInt64>(), "num_hosts_active"},
+        };
+    }
+    else
+    {
+        return Block{
+            {std::make_shared<DataTypeString>(), "host"},
+            {std::make_shared<DataTypeUInt16>(), "port"},
+            {maybe_make_nullable(std::make_shared<DataTypeInt64>()), "status"},
+            {maybe_make_nullable(std::make_shared<DataTypeString>()), "error"},
+            {std::make_shared<DataTypeUInt64>(), "num_hosts_remaining"},
+            {std::make_shared<DataTypeUInt64>(), "num_hosts_active"},
+        };
+    }
 }
 
 DDLQueryStatusSource::DDLQueryStatusSource(
@@ -261,7 +296,7 @@ DDLQueryStatusSource::DDLQueryStatusSource(
     if (hosts_to_wait)
     {
         waiting_hosts = NameSet(hosts_to_wait->begin(), hosts_to_wait->end());
-        by_hostname = false;
+        is_replicated_database = true;
     }
     else
     {
@@ -277,7 +312,7 @@ std::pair<String, UInt16> DDLQueryStatusSource::parseHostAndPort(const String &
 {
     String host = host_id;
     UInt16 port = 0;
-    if (by_hostname)
+    if (!is_replicated_database)
     {
         auto host_and_port = Cluster::Address::fromString(host_id);
         host = host_and_port.first;
@@ -286,6 +321,43 @@ std::pair<String, UInt16> DDLQueryStatusSource::parseHostAndPort(const String &
     return {host, port};
 }
 
+Chunk DDLQueryStatusSource::generateChunkWithUnfinishedHosts() const
+{
+    NameSet unfinished_hosts = waiting_hosts;
+    for (const auto & host_id : finished_hosts)
+        unfinished_hosts.erase(host_id);
+
+    NameSet active_hosts_set = NameSet{current_active_hosts.begin(), current_active_hosts.end()};
+
+    /// Query is not finished on the rest hosts, so fill the corresponding rows with NULLs.
+    MutableColumns columns = output.getHeader().cloneEmptyColumns();
+    for (const String & host_id : unfinished_hosts)
+    {
+        size_t num = 0;
+        if (is_replicated_database)
+        {
+            auto [shard, replica] = DatabaseReplicated::parseFullReplicaName(host_id);
+            columns[num++]->insert(shard);
+            columns[num++]->insert(replica);
+            if (active_hosts_set.contains(host_id))
+                columns[num++]->insert(IN_PROGRESS);
+            else
+                columns[num++]->insert(QUEUED);
+        }
+        else
+        {
+            auto [host, port] = parseHostAndPort(host_id);
+            columns[num++]->insert(host);
+            columns[num++]->insert(port);
+            columns[num++]->insert(Field{});
+            columns[num++]->insert(Field{});
+        }
+        columns[num++]->insert(unfinished_hosts.size());
+        columns[num++]->insert(current_active_hosts.size());
+    }
+    return Chunk(std::move(columns), unfinished_hosts.size());
+}
+
 Chunk DDLQueryStatusSource::generate()
 {
     bool all_hosts_finished = num_hosts_finished >= waiting_hosts.size();
@@ -296,6 +368,10 @@ Chunk DDLQueryStatusSource::generate()
     if (all_hosts_finished || timeout_exceeded)
         return {};
 
+    String node_to_wait = "finished";
+    if (is_replicated_database && context->getSettingsRef().database_replicated_enforce_synchronous_settings)
+        node_to_wait = "synced";
+
     auto zookeeper = context->getZooKeeper();
     size_t try_number = 0;
 
@@ -320,30 +396,16 @@ Chunk DDLQueryStatusSource::generate()
                     first_exception = std::make_unique<Exception>(
                         fmt::format(msg_format, node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts),
                         ErrorCodes::TIMEOUT_EXCEEDED);
+
+                /// For Replicated database print a list of unfinished hosts as well. Will return empty block on next iteration.
+                if (is_replicated_database)
+                    return generateChunkWithUnfinishedHosts();
                 return {};
             }
 
             LOG_INFO(log, msg_format, node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts);
 
-            NameSet unfinished_hosts = waiting_hosts;
-            for (const auto & host_id : finished_hosts)
-                unfinished_hosts.erase(host_id);
-
-            /// Query is not finished on the rest hosts, so fill the corresponding rows with NULLs.
-            MutableColumns columns = output.getHeader().cloneEmptyColumns();
-            for (const String & host_id : unfinished_hosts)
-            {
-                auto [host, port] = parseHostAndPort(host_id);
-                size_t num = 0;
-                columns[num++]->insert(host);
-                if (by_hostname)
-                    columns[num++]->insert(port);
-                columns[num++]->insert(Field{});
-                columns[num++]->insert(Field{});
-                columns[num++]->insert(num_unfinished_hosts);
-                columns[num++]->insert(num_active_hosts);
-            }
-            return Chunk(std::move(columns), unfinished_hosts.size());
+            return generateChunkWithUnfinishedHosts();
         }
 
         if (num_hosts_finished != 0 || try_number != 0)
@@ -365,7 +427,7 @@ Chunk DDLQueryStatusSource::generate()
             return {};
         }
 
-        Strings new_hosts = getNewAndUpdate(getChildrenAllowNoNode(zookeeper, fs::path(node_path) / "finished"));
+        Strings new_hosts = getNewAndUpdate(getChildrenAllowNoNode(zookeeper, fs::path(node_path) / node_to_wait));
         ++try_number;
         if (new_hosts.empty())
             continue;
@@ -376,17 +438,27 @@ Chunk DDLQueryStatusSource::generate()
         for (const String & host_id : new_hosts)
         {
             ExecutionStatus status(-1, "Cannot obtain error message");
+
+            if (node_to_wait == "finished")
             {
                 String status_data;
                 if (zookeeper->tryGet(fs::path(node_path) / "finished" / host_id, status_data))
                     status.tryDeserializeText(status_data);
             }
+            else
+            {
+                status = ExecutionStatus{0};
+            }
 
-            auto [host, port] = parseHostAndPort(host_id);
 
             if (status.code != 0 && !first_exception
                 && context->getSettingsRef().distributed_ddl_output_mode != DistributedDDLOutputMode::NEVER_THROW)
             {
+                /// Replicated database retries in case of error, it should not write error status.
+                if (is_replicated_database)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "There was an error on {}: {} (probably it's a bug)", host_id, status.message);
+
+                auto [host, port] = parseHostAndPort(host_id);
                 first_exception = std::make_unique<Exception>(
                     fmt::format("There was an error on [{}:{}]: {}", host, port, status.message), status.code);
             }
@@ -394,11 +466,23 @@ Chunk DDLQueryStatusSource::generate()
             ++num_hosts_finished;
 
             size_t num = 0;
-            columns[num++]->insert(host);
-            if (by_hostname)
+            if (is_replicated_database)
+            {
+                if (status.code != 0)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "There was an error on {}: {} (probably it's a bug)", host_id, status.message);
+                auto [shard, replica] = DatabaseReplicated::parseFullReplicaName(host_id);
+                columns[num++]->insert(shard);
+                columns[num++]->insert(replica);
+                columns[num++]->insert(OK);
+            }
+            else
+            {
+                auto [host, port] = parseHostAndPort(host_id);
+                columns[num++]->insert(host);
                 columns[num++]->insert(port);
-            columns[num++]->insert(status.code);
-            columns[num++]->insert(status.message);
+                columns[num++]->insert(status.code);
+                columns[num++]->insert(status.message);
+            }
             columns[num++]->insert(waiting_hosts.size() - num_hosts_finished);
             columns[num++]->insert(current_active_hosts.size());
         }
@@ -464,4 +548,26 @@ Strings DDLQueryStatusSource::getNewAndUpdate(const Strings & current_list_of_fi
 }
 
 
+bool maybeRemoveOnCluster(const ASTPtr & query_ptr, ContextPtr context)
+{
+    const auto * query = dynamic_cast<const ASTQueryWithTableAndOutput *>(query_ptr.get());
+    if (!query || !query->table)
+        return false;
+
+    String database_name = query->getDatabase();
+    if (database_name.empty())
+        database_name = context->getCurrentDatabase();
+
+    auto * query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query_ptr.get());
+    if (database_name != query_on_cluster->cluster)
+        return false;
+
+    auto db = DatabaseCatalog::instance().tryGetDatabase(database_name);
+    if (!db || db->getEngineName() != "Replicated")
+        return false;
+
+    query_on_cluster->cluster.clear();
+    return true;
+}
+
 }
diff --git a/src/Interpreters/executeDDLQueryOnCluster.h b/src/Interpreters/executeDDLQueryOnCluster.h
index 3004fe2ff2e..8df199f0ede 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.h
+++ b/src/Interpreters/executeDDLQueryOnCluster.h
@@ -45,4 +45,6 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, c
 BlockIO getDistributedDDLStatus(
     const String & node_path, const DDLLogEntry & entry, ContextPtr context, const std::optional<Strings> & hosts_to_wait = {});
 
+bool maybeRemoveOnCluster(const ASTPtr & query_ptr, ContextPtr context);
+
 }
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index d6f9b9af0b0..cdddd28adeb 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -924,12 +924,21 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                             processor_elem.id = get_proc_id(*processor);
                             processor_elem.parent_ids = std::move(parents);
 
+                            processor_elem.plan_step = reinterpret_cast<std::uintptr_t>(processor->getQueryPlanStep());
+                            processor_elem.plan_group = processor->getQueryPlanStepGroup();
+
                             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();
 
+                            auto stats = processor->getProcessorDataStats();
+                            processor_elem.input_rows = stats.input_rows;
+                            processor_elem.input_bytes = stats.input_bytes;
+                            processor_elem.output_rows = stats.output_rows;
+                            processor_elem.output_bytes = stats.output_bytes;
+
                             processors_profile_log->add(processor_elem);
                         }
                     }
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index 15d4f7929f8..7d79e2b0224 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -1,7 +1,5 @@
 #include <Common/ThreadPool.h>
 
-#include <Poco/DirectoryIterator.h>
-
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/parseQuery.h>
@@ -13,6 +11,7 @@
 
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/TablesLoader.h>
+#include <Storages/StorageMaterializedView.h>
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
@@ -38,6 +37,7 @@ static void executeCreateQuery(
     ContextMutablePtr context,
     const String & database,
     const String & file_name,
+    bool create,
     bool has_force_restore_data_flag)
 {
     ParserCreateQuery parser;
@@ -49,8 +49,11 @@ static void executeCreateQuery(
 
     InterpreterCreateQuery interpreter(ast, context);
     interpreter.setInternal(true);
-    interpreter.setForceAttach(true);
-    interpreter.setForceRestoreData(has_force_restore_data_flag);
+    if (!create)
+    {
+        interpreter.setForceAttach(true);
+        interpreter.setForceRestoreData(has_force_restore_data_flag);
+    }
     interpreter.setLoadDatabaseWithoutTables(true);
     interpreter.execute();
 }
@@ -86,7 +89,7 @@ static void loadDatabase(
 
     try
     {
-        executeCreateQuery(database_attach_query, context, database, database_metadata_file, force_restore_data);
+        executeCreateQuery(database_attach_query, context, database, database_metadata_file, /* create */ true, force_restore_data);
     }
     catch (Exception & e)
     {
@@ -173,7 +176,8 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
         loaded_databases.insert({name, DatabaseCatalog::instance().getDatabase(name)});
     }
 
-    TablesLoader loader{context, std::move(loaded_databases), has_force_restore_data_flag, /* force_attach */ true};
+    auto mode = getLoadingStrictnessLevel(/* attach */ true, /* force_attach */ true, has_force_restore_data_flag);
+    TablesLoader loader{context, std::move(loaded_databases), mode};
     loader.loadTables();
     loader.startupTables();
 
@@ -207,21 +211,16 @@ static void loadSystemDatabaseImpl(ContextMutablePtr context, const String & dat
         database_create_query += database_name;
         database_create_query += " ENGINE=";
         database_create_query += default_engine;
-        executeCreateQuery(database_create_query, context, database_name, "<no file>", true);
+        executeCreateQuery(database_create_query, context, database_name, "<no file>", true, true);
     }
 }
 
-static void convertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const DatabasePtr & database)
+static void convertOrdinaryDatabaseToAtomic(Poco::Logger * log, ContextMutablePtr context, const DatabasePtr & database,
+                                            const String & name, const String tmp_name)
 {
     /// It's kind of C++ script that creates temporary database with Atomic engine,
     /// moves all tables to it, drops old database and then renames new one to old name.
 
-    Poco::Logger * log = &Poco::Logger::get("loadMetadata");
-
-    String name = database->getDatabaseName();
-
-    String tmp_name = fmt::format(".tmp_convert.{}.{}", name, thread_local_rng());
-
     String name_quoted = backQuoteIfNeed(name);
     String tmp_name_quoted = backQuoteIfNeed(tmp_name);
 
@@ -235,19 +234,34 @@ static void convertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const Dat
     assert(tmp_database->getEngineName() == "Atomic");
 
     size_t num_tables = 0;
+    std::unordered_set<String> inner_mv_tables;
     for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
     {
         ++num_tables;
         auto id = iterator->table()->getStorageID();
         id.database_name = tmp_name;
+        /// We need some uuid for checkTableCanBeRenamed
+        id.uuid = UUIDHelpers::generateV4();
         iterator->table()->checkTableCanBeRenamed(id);
+        if (const auto * mv = dynamic_cast<const StorageMaterializedView *>(iterator->table().get()))
+        {
+            /// We should not rename inner tables of MVs, because MVs are responsible for renaming it...
+            if (mv->hasInnerTable())
+                inner_mv_tables.emplace(mv->getTargetTable()->getStorageID().table_name);
+        }
     }
 
-    LOG_INFO(log, "Will move {} tables to {}", num_tables, tmp_name_quoted);
+    LOG_INFO(log, "Will move {} tables to {} (including {} inner tables of MVs)", num_tables, tmp_name_quoted, inner_mv_tables.size());
 
     for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
     {
         auto id = iterator->table()->getStorageID();
+        if (inner_mv_tables.contains(id.table_name))
+        {
+            LOG_DEBUG(log, "Do not rename {}, because it will be renamed together with MV", id.getNameForLogs());
+            continue;
+        }
+
         String qualified_quoted_name = id.getFullTableName();
         id.database_name = tmp_name;
         String tmp_qualified_quoted_name = id.getFullTableName();
@@ -264,6 +278,7 @@ static void convertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const Dat
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Database {} is not empty after moving tables", name_quoted);
 
     String drop_query = fmt::format("DROP DATABASE {}", name_quoted);
+    context->setSetting("force_remove_data_recursively_on_drop", false);
     res = executeQuery(drop_query, context, true);
     executeTrivialBlockIO(res, context);
     res = {};
@@ -275,31 +290,54 @@ static void convertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const Dat
     LOG_INFO(log, "Finished database engine conversion of {}", name_quoted);
 }
 
-void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const DatabasePtr & database)
+/// Converts database with Ordinary engine to Atomic. Does nothing if database is not Ordinary.
+/// Can be called only during server startup when there are no queries from users.
+static void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const String & database_name, bool tables_started)
 {
+    Poco::Logger * log = &Poco::Logger::get("loadMetadata");
+
+    auto database = DatabaseCatalog::instance().getDatabase(database_name);
+    if (!database)
+    {
+        LOG_WARNING(log, "Database {} not found (while trying to convert it from Ordinary to Atomic)", database_name);
+        return;
+    }
+
     if (database->getEngineName() != "Ordinary")
         return;
 
-    if (context->getSettingsRef().allow_deprecated_database_ordinary)
-        return;
+    Strings permanently_detached_tables = database->getNamesOfPermanentlyDetachedTables();
+    if (!permanently_detached_tables.empty())
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot automatically convert database {} from Ordinary to Atomic, "
+                        "because it contains permanently detached tables ({}) that were not loaded during startup. "
+                        "Attach these tables, so server will load and convert them",
+                        database_name, fmt::join(permanently_detached_tables, ", "));
+    }
+
+    String tmp_name = fmt::format(".tmp_convert.{}.{}", database_name, thread_local_rng());
 
     try
     {
-        /// It's not quite correct to run DDL queries while database is not started up.
-        startupSystemTables();
+        if (!tables_started)
+        {
+            /// It's not quite correct to run DDL queries while database is not started up.
+            ThreadPool pool;
+            DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, LoadingStrictnessLevel::FORCE_RESTORE);
+        }
 
         auto local_context = Context::createCopy(context);
         local_context->setSetting("check_table_dependencies", false);
-        convertOrdinaryDatabaseToAtomic(local_context, database);
+        convertOrdinaryDatabaseToAtomic(log, local_context, database, database_name, tmp_name);
 
-        auto new_database = DatabaseCatalog::instance().getDatabase(DatabaseCatalog::SYSTEM_DATABASE);
+        auto new_database = DatabaseCatalog::instance().getDatabase(database_name);
         UUID db_uuid = new_database->getUUID();
         std::vector<UUID> tables_uuids;
         for (auto iterator = new_database->getTablesIterator(context); iterator->isValid(); iterator->next())
             tables_uuids.push_back(iterator->uuid());
 
         /// Reload database just in case (and update logger name)
-        String detach_query = fmt::format("DETACH DATABASE {}", backQuoteIfNeed(DatabaseCatalog::SYSTEM_DATABASE));
+        String detach_query = fmt::format("DETACH DATABASE {}", backQuoteIfNeed(database_name));
         auto res = executeQuery(detach_query, context, true);
         executeTrivialBlockIO(res, context);
         res = {};
@@ -310,28 +348,59 @@ void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const Datab
         for (const auto & uuid : tables_uuids)
             DatabaseCatalog::instance().removeUUIDMappingFinally(uuid);
 
-        loadSystemDatabaseImpl(context, DatabaseCatalog::SYSTEM_DATABASE, "Atomic");
+        String path = context->getPath() + "metadata/" + escapeForFileName(database_name);
+        /// force_restore_data is needed to re-create metadata symlinks
+        loadDatabase(context, database_name, path, /* force_restore_data */ true);
+
         TablesLoader::Databases databases =
         {
-            {DatabaseCatalog::SYSTEM_DATABASE, DatabaseCatalog::instance().getSystemDatabase()},
+            {database_name, DatabaseCatalog::instance().getDatabase(database_name)},
         };
-        TablesLoader loader{context, databases, /* force_restore */ true, /* force_attach */ true};
+        TablesLoader loader{context, databases, LoadingStrictnessLevel::FORCE_RESTORE};
         loader.loadTables();
 
-        /// Will startup tables usual way
+        /// Startup tables if they were started before conversion and detach/attach
+        if (tables_started)
+            loader.startupTables();
     }
     catch (Exception & e)
     {
-        e.addMessage("While trying to convert {} to Atomic", database->getDatabaseName());
+        e.addMessage("Exception while trying to convert database {} from Ordinary to Atomic. It may be in some intermediate state."
+            "You can finish conversion manually by moving the rest tables from {} to {} (using RENAME TABLE)"
+            "and executing DROP DATABASE {} and RENAME DATABASE {} TO {}.",
+            database_name, database_name, tmp_name, database_name, tmp_name, database_name);
         throw;
     }
 }
 
+void maybeConvertSystemDatabase(ContextMutablePtr context)
+{
+    /// TODO remove this check, convert system database unconditionally
+    if (context->getSettingsRef().allow_deprecated_database_ordinary)
+        return;
+
+    maybeConvertOrdinaryDatabaseToAtomic(context, DatabaseCatalog::SYSTEM_DATABASE, /* tables_started */ false);
+}
+
+void convertDatabasesEnginesIfNeed(ContextMutablePtr context)
+{
+    auto convert_flag_path = fs::path(context->getFlagsPath()) / "convert_ordinary_to_atomic";
+    if (!fs::exists(convert_flag_path))
+        return;
+
+    LOG_INFO(&Poco::Logger::get("loadMetadata"), "Found convert_ordinary_to_atomic file in flags directory, "
+                                                 "will try to convert all Ordinary databases to Atomic");
+    fs::remove(convert_flag_path);
+
+    for (const auto & [name, _] : DatabaseCatalog::instance().getDatabases())
+        if (name != DatabaseCatalog::SYSTEM_DATABASE)
+            maybeConvertOrdinaryDatabaseToAtomic(context, name, /* tables_started */ true);
+}
 
 void startupSystemTables()
 {
     ThreadPool pool;
-    DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, /* force_restore */ true, /* force_attach */ true);
+    DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, LoadingStrictnessLevel::FORCE_RESTORE);
 }
 
 void loadMetadataSystem(ContextMutablePtr context)
@@ -346,7 +415,7 @@ void loadMetadataSystem(ContextMutablePtr context)
         {DatabaseCatalog::INFORMATION_SCHEMA, DatabaseCatalog::instance().getDatabase(DatabaseCatalog::INFORMATION_SCHEMA)},
         {DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE, DatabaseCatalog::instance().getDatabase(DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE)},
     };
-    TablesLoader loader{context, databases, /* force_restore */ true, /* force_attach */ true};
+    TablesLoader loader{context, databases, LoadingStrictnessLevel::FORCE_RESTORE};
     loader.loadTables();
     /// Will startup tables in system database after all databases are loaded.
 }
diff --git a/src/Interpreters/loadMetadata.h b/src/Interpreters/loadMetadata.h
index 8dc332defc5..b229a2b4c31 100644
--- a/src/Interpreters/loadMetadata.h
+++ b/src/Interpreters/loadMetadata.h
@@ -19,8 +19,10 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
 /// so we startup system tables after all databases are loaded.
 void startupSystemTables();
 
-/// Converts database with Ordinary engine to Atomic. Does nothing if database is not Ordinary.
-/// Can be called only during server startup when there are no queries from users.
-void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const DatabasePtr & database);
+/// Converts `system` database from Ordinary to Atomic (if needed)
+void maybeConvertSystemDatabase(ContextMutablePtr context);
+
+/// Converts all databases (except system) from Ordinary to Atomic if convert_ordinary_to_atomic flag exists
+void convertDatabasesEnginesIfNeed(ContextMutablePtr context);
 
 }
diff --git a/src/Loggers/Loggers.cpp b/src/Loggers/Loggers.cpp
index 70205998bb5..dec6bcd51c7 100644
--- a/src/Loggers/Loggers.cpp
+++ b/src/Loggers/Loggers.cpp
@@ -97,7 +97,12 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
         log_file->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
+        Poco::AutoPtr<OwnPatternFormatter> pf;
+
+        if (config.getString("logger.formatting", "") == "json")
+            pf = new OwnJSONPatternFormatter;
+        else
+            pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, log_file);
         log->setLevel(log_level);
@@ -133,7 +138,12 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         error_log_file->setProperty(Poco::FileChannel::PROP_FLUSH, config.getRawString("logger.flush", "true"));
         error_log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
+        Poco::AutoPtr<OwnPatternFormatter> pf;
+
+        if (config.getString("logger.formatting", "") == "json")
+            pf = new OwnJSONPatternFormatter;
+        else
+            pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> errorlog = new DB::OwnFormattingChannel(pf, error_log_file);
         errorlog->setLevel(errorlog_level);
@@ -172,7 +182,12 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         }
         syslog_channel->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
+        Poco::AutoPtr<OwnPatternFormatter> pf;
+
+        if (config.getString("logger.formatting", "") == "json")
+            pf = new OwnJSONPatternFormatter;
+        else
+            pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, syslog_channel);
         log->setLevel(syslog_level);
@@ -195,7 +210,11 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
             max_log_level = console_log_level;
         }
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(color_enabled);
+        Poco::AutoPtr<OwnPatternFormatter> pf;
+        if (config.getString("logger.formatting", "") == "json")
+            pf = new OwnJSONPatternFormatter;
+        else
+            pf = new OwnPatternFormatter(color_enabled);
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel);
         log->setLevel(console_log_level);
         split->addChannel(log, "console");
diff --git a/src/Loggers/OwnFormattingChannel.h b/src/Loggers/OwnFormattingChannel.h
index 1120117fbb7..da7cde315f9 100644
--- a/src/Loggers/OwnFormattingChannel.h
+++ b/src/Loggers/OwnFormattingChannel.h
@@ -4,6 +4,7 @@
 #include <Poco/Channel.h>
 #include <Poco/FormattingChannel.h>
 #include "ExtendedLogChannel.h"
+#include "OwnJSONPatternFormatter.h"
 #include "OwnPatternFormatter.h"
 
 
diff --git a/src/Loggers/OwnJSONPatternFormatter.cpp b/src/Loggers/OwnJSONPatternFormatter.cpp
new file mode 100644
index 00000000000..d12506e2451
--- /dev/null
+++ b/src/Loggers/OwnJSONPatternFormatter.cpp
@@ -0,0 +1,104 @@
+#include "OwnJSONPatternFormatter.h"
+
+#include <functional>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/InternalTextLogsQueue.h>
+#include <base/terminalColors.h>
+#include <Common/CurrentThread.h>
+#include <Common/HashTable/Hash.h>
+
+OwnJSONPatternFormatter::OwnJSONPatternFormatter() : OwnPatternFormatter("")
+{
+}
+
+
+void OwnJSONPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const
+{
+    DB::WriteBufferFromString wb(text);
+
+    DB::FormatSettings settings;
+
+    const Poco::Message & msg = msg_ext.base;
+    DB::writeChar('{', wb);
+
+    writeJSONString("date_time", wb, settings);
+    DB::writeChar(':', wb);
+
+    DB::writeChar('\"', wb);
+    /// Change delimiters in date for compatibility with old logs.
+    writeDateTimeUnixTimestamp(msg_ext.time_seconds, 0, wb);
+    DB::writeChar('.', wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 100000) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 10000) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 1000) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 100) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 10) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 1) % 10), wb);
+    DB::writeChar('\"', wb);
+
+    DB::writeChar(',', wb);
+
+    writeJSONString("thread_name", wb, settings);
+    DB::writeChar(':', wb);
+
+    writeJSONString(msg.getThread(), wb, settings);
+
+    DB::writeChar(',', wb);
+
+    writeJSONString("thread_id", wb, settings);
+    DB::writeChar(':', wb);
+    DB::writeChar('\"', wb);
+    DB::writeIntText(msg_ext.thread_id, wb);
+    DB::writeChar('\"', wb);
+
+    DB::writeChar(',', wb);
+
+    writeJSONString("level", wb, settings);
+    DB::writeChar(':', wb);
+    int priority = static_cast<int>(msg.getPriority());
+    writeJSONString(std::to_string(priority), wb, settings);
+    DB::writeChar(',', wb);
+
+    /// We write query_id even in case when it is empty (no query context)
+    /// just to be convenient for various log parsers.
+
+    writeJSONString("query_id", wb, settings);
+    DB::writeChar(':', wb);
+    writeJSONString(msg_ext.query_id, wb, settings);
+
+    DB::writeChar(',', wb);
+
+    writeJSONString("logger_name", wb, settings);
+    DB::writeChar(':', wb);
+
+    writeJSONString(msg.getSource(), wb, settings);
+    DB::writeChar(',', wb);
+
+    writeJSONString("message", wb, settings);
+    DB::writeChar(':', wb);
+    writeJSONString(msg.getText(), wb, settings);
+    DB::writeChar(',', wb);
+
+    writeJSONString("source_file", wb, settings);
+    DB::writeChar(':', wb);
+    const char * source_file = msg.getSourceFile();
+    if (source_file != nullptr)
+        writeJSONString(source_file, wb, settings);
+    else
+        writeJSONString("", wb, settings);
+    DB::writeChar(',', wb);
+
+    writeJSONString("source_line", wb, settings);
+    DB::writeChar(':', wb);
+    DB::writeChar('\"', wb);
+    DB::writeIntText(msg.getSourceLine(), wb);
+    DB::writeChar('\"', wb);
+
+    DB::writeChar('}', wb);
+}
+
+void OwnJSONPatternFormatter::format(const Poco::Message & msg, std::string & text)
+{
+    formatExtended(DB::ExtendedLogMessage::getFrom(msg), text);
+}
diff --git a/src/Loggers/OwnJSONPatternFormatter.h b/src/Loggers/OwnJSONPatternFormatter.h
new file mode 100644
index 00000000000..032506b15e3
--- /dev/null
+++ b/src/Loggers/OwnJSONPatternFormatter.h
@@ -0,0 +1,32 @@
+#pragma once
+
+
+#include <Poco/PatternFormatter.h>
+#include "ExtendedLogChannel.h"
+#include "OwnPatternFormatter.h"
+
+
+/** Format log messages own way in JSON.
+  * We can't obtain some details using Poco::PatternFormatter.
+  *
+  * Firstly, the thread number here is peaked not from Poco::Thread
+  * threads only, but from all threads with number assigned (see ThreadNumber.h)
+  *
+  * Secondly, the local date and time are correctly displayed.
+  * Poco::PatternFormatter does not work well with local time,
+  * when timestamps are close to DST timeshift moments.
+  * - see Poco sources and http://thread.gmane.org/gmane.comp.time.tz/8883
+  *
+  * Also it's made a bit more efficient (unimportant).
+  */
+
+class Loggers;
+
+class OwnJSONPatternFormatter : public OwnPatternFormatter
+{
+public:
+    OwnJSONPatternFormatter();
+
+    void format(const Poco::Message & msg, std::string & text) override;
+    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const override;
+};
diff --git a/src/Loggers/OwnPatternFormatter.h b/src/Loggers/OwnPatternFormatter.h
index fba4f0964cb..d776b097cb2 100644
--- a/src/Loggers/OwnPatternFormatter.h
+++ b/src/Loggers/OwnPatternFormatter.h
@@ -27,7 +27,7 @@ public:
     OwnPatternFormatter(bool color_ = false);
 
     void format(const Poco::Message & msg, std::string & text) override;
-    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const;
+    virtual void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const;
 
 private:
     bool color;
diff --git a/src/Parsers/ASTSetQuery.h b/src/Parsers/ASTSetQuery.h
index 40a0b679650..4e3d9d227b6 100644
--- a/src/Parsers/ASTSetQuery.h
+++ b/src/Parsers/ASTSetQuery.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Common/SettingsChanges.h>
+#include <Core/Names.h>
 #include <Parsers/IAST.h>
-
+#include <Common/SettingsChanges.h>
 
 namespace DB
 {
@@ -15,6 +15,7 @@ public:
     bool is_standalone = true; /// If false, this AST is a part of another query, such as SELECT.
 
     SettingsChanges changes;
+    NameToNameMap query_parameters;
 
     /** Get the text that identifies this element. */
     String getID(char) const override { return "Set"; }
diff --git a/src/Parsers/IAST.cpp b/src/Parsers/IAST.cpp
index 72fdbd924f2..f1557076a07 100644
--- a/src/Parsers/IAST.cpp
+++ b/src/Parsers/IAST.cpp
@@ -28,34 +28,65 @@ const char * IAST::hilite_none         = "\033[0m";
 
 IAST::~IAST()
 {
-    /// If deleter was set, move our children to it.
-    /// Will avoid recursive destruction.
-    if (deleter)
-    {
-        deleter->push_back(std::move(children));
-        return;
-    }
+    /** Create intrusive linked list of children to delete.
+      * Each ASTPtr child contains pointer to next child to delete.
+      */
+    ASTPtr delete_list_head_holder = nullptr;
+    const bool delete_directly = next_to_delete_list_head == nullptr;
+    ASTPtr & delete_list_head_reference = next_to_delete_list_head ? *next_to_delete_list_head : delete_list_head_holder;
 
-    std::list<ASTs> queue;
-    queue.push_back(std::move(children));
-    while (!queue.empty())
+    /// Move children into intrusive list
+    for (auto & child : children)
     {
-        for (auto & node : queue.front())
+        /** If two threads remove ASTPtr concurrently,
+          * it is possible that neither thead will see use_count == 1.
+          * It is ok. Will need one more extra stack frame in this case.
+          */
+        if (child.use_count() != 1)
+            continue;
+
+        ASTPtr child_to_delete;
+        child_to_delete.swap(child);
+
+        if (!delete_list_head_reference)
         {
-            /// If two threads remove ASTPtr concurrently,
-            /// it is possible that neither thead will see use_count == 1.
-            /// It is ok. Will need one more extra stack frame in this case.
-            if (node.use_count() == 1)
-            {
-                /// Deleter is only set when current thread is the single owner.
-                /// No extra synchronisation is needed.
-                ASTPtr to_delete;
-                node.swap(to_delete);
-                to_delete->deleter = &queue;
-            }
+            /// Initialize list first time
+            delete_list_head_reference = std::move(child_to_delete);
+            continue;
         }
 
-        queue.pop_front();
+        ASTPtr previous_head = std::move(delete_list_head_reference);
+        delete_list_head_reference = std::move(child_to_delete);
+        delete_list_head_reference->next_to_delete = std::move(previous_head);
+    }
+
+    if (!delete_directly)
+        return;
+
+    while (delete_list_head_reference)
+    {
+        /** Extract child to delete from current list head.
+          * Child will be destroyed at the end of scope.
+          */
+        ASTPtr child_to_delete;
+        child_to_delete.swap(delete_list_head_reference);
+
+        /// Update list head
+        delete_list_head_reference = std::move(child_to_delete->next_to_delete);
+
+        /** Pass list head into child before destruction.
+          * It is important to properly handle cases where subclass has member same as one of its children.
+          *
+          * class ASTSubclass : IAST
+          * {
+          *     ASTPtr first_child; /// Same as first child
+          * }
+          *
+          * In such case we must move children into list only in IAST destructor.
+          * If we try to move child to delete children into list before subclasses desruction,
+          * first child use count will be 2.
+          */
+        child_to_delete->next_to_delete_list_head = &delete_list_head_reference;
     }
 }
 
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index 5714a829693..e91d419acd8 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -275,8 +275,11 @@ public:
 private:
     size_t checkDepthImpl(size_t max_depth, size_t level) const;
 
-    /// This deleter is used in ~IAST to avoid possible stack overflow in destructor.
-    std::list<ASTs> * deleter = nullptr;
+    /** Forward linked list of ASTPtr to delete.
+      * Used in IAST destructor to avoid possible stack overflow.
+      */
+    ASTPtr next_to_delete = nullptr;
+    ASTPtr * next_to_delete_list_head = nullptr;
 };
 
 template <typename AstArray>
diff --git a/src/Parsers/ParserSetQuery.cpp b/src/Parsers/ParserSetQuery.cpp
index 0ff437bcfb1..20de785ac1b 100644
--- a/src/Parsers/ParserSetQuery.cpp
+++ b/src/Parsers/ParserSetQuery.cpp
@@ -5,13 +5,38 @@
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ParserSetQuery.h>
 
-#include <Common/typeid_cast.h>
+#include <Core/Names.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <Common/FieldVisitorToString.h>
 #include <Common/SettingsChanges.h>
-
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+static NameToNameMap::value_type convertToQueryParameter(SettingChange change)
+{
+    auto name = change.name.substr(strlen(QUERY_PARAMETER_NAME_PREFIX));
+    if (name.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parameter name cannot be empty");
+
+    auto value = applyVisitor(FieldVisitorToString(), change.value);
+    /// writeQuoted is not always quoted in line with SQL standard https://github.com/ClickHouse/ClickHouse/blob/master/src/IO/WriteHelpers.h
+    if (value.starts_with('\''))
+    {
+        ReadBufferFromOwnString buf(value);
+        readQuoted(value, buf);
+    }
+    return {name, value};
+}
+
+
 class ParserLiteralOrMap : public IParserBase
 {
 public:
@@ -111,16 +136,23 @@ bool ParserSetQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     }
 
     SettingsChanges changes;
+    NameToNameMap query_parameters;
 
     while (true)
     {
-        if (!changes.empty() && !s_comma.ignore(pos))
+        if ((!changes.empty() || !query_parameters.empty()) && !s_comma.ignore(pos))
             break;
 
-        changes.push_back(SettingChange{});
+        /// Either a setting or a parameter for prepared statement (if name starts with QUERY_PARAMETER_NAME_PREFIX)
+        SettingChange current;
 
-        if (!parseNameValuePair(changes.back(), pos, expected))
+        if (!parseNameValuePair(current, pos, expected))
             return false;
+
+        if (current.name.starts_with(QUERY_PARAMETER_NAME_PREFIX))
+            query_parameters.emplace(convertToQueryParameter(std::move(current)));
+        else
+            changes.push_back(std::move(current));
     }
 
     auto query = std::make_shared<ASTSetQuery>();
@@ -128,6 +160,7 @@ bool ParserSetQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     query->is_standalone = !parse_only_internals;
     query->changes = std::move(changes);
+    query->query_parameters = std::move(query_parameters);
 
     return true;
 }
diff --git a/src/Parsers/ParserSetQuery.h b/src/Parsers/ParserSetQuery.h
index 0bc1cec3093..d9c69358ac2 100644
--- a/src/Parsers/ParserSetQuery.h
+++ b/src/Parsers/ParserSetQuery.h
@@ -9,6 +9,8 @@ namespace DB
 
 struct SettingChange;
 
+constexpr char QUERY_PARAMETER_NAME_PREFIX[] = "param_";
+
 /** Query like this:
   * SET name1 = value1, name2 = value2, ...
   */
diff --git a/src/Parsers/parseIntervalKind.cpp b/src/Parsers/parseIntervalKind.cpp
index 0704aa107ca..77c3178ae2b 100644
--- a/src/Parsers/parseIntervalKind.cpp
+++ b/src/Parsers/parseIntervalKind.cpp
@@ -43,7 +43,7 @@ bool parseIntervalKind(IParser::Pos & pos, Expected & expected, IntervalKind & r
     }
 
     if (ParserKeyword("HOUR").ignore(pos, expected) || ParserKeyword("SQL_TSI_HOUR").ignore(pos, expected)
-        || ParserKeyword("HH").ignore(pos, expected))
+        || ParserKeyword("HH").ignore(pos, expected) || ParserKeyword("H").ignore(pos, expected))
     {
         result = IntervalKind::Hour;
         return true;
diff --git a/src/Processors/Formats/ISchemaReader.cpp b/src/Processors/Formats/ISchemaReader.cpp
index 5a6ebf00660..3df9ea70e34 100644
--- a/src/Processors/Formats/ISchemaReader.cpp
+++ b/src/Processors/Formats/ISchemaReader.cpp
@@ -1,5 +1,6 @@
 #include <Processors/Formats/ISchemaReader.h>
 #include <Formats/ReadSchemaUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <DataTypes/DataTypeString.h>
 #include <boost/algorithm/string.hpp>
 
@@ -17,35 +18,38 @@ namespace ErrorCodes
 
 void chooseResultColumnType(
     DataTypePtr & type,
-    const DataTypePtr & new_type,
-    CommonDataTypeChecker common_type_checker,
+    DataTypePtr & new_type,
+    std::function<void(DataTypePtr &, DataTypePtr &)> transform_types_if_needed,
     const DataTypePtr & default_type,
     const String & column_name,
     size_t row)
 {
     if (!type)
+    {
         type = new_type;
+        return;
+    }
+
+    if (!new_type || type->equals(*new_type))
+        return;
+
+    transform_types_if_needed(type, new_type);
+    if (type->equals(*new_type))
+        return;
 
     /// If the new type and the previous type for this column are different,
     /// we will use default type if we have it or throw an exception.
-    if (new_type && !type->equals(*new_type))
+    if (default_type)
+        type = default_type;
+    else
     {
-        DataTypePtr common_type;
-        if (common_type_checker)
-            common_type = common_type_checker(type, new_type);
-
-        if (common_type)
-            type = common_type;
-        else if (default_type)
-            type = default_type;
-        else
-            throw Exception(
-                ErrorCodes::TYPE_MISMATCH,
-                "Automatically defined type {} for column {} in row {} differs from type defined by previous rows: {}",
-                type->getName(),
-                column_name,
-                row,
-                new_type->getName());
+        throw Exception(
+            ErrorCodes::TYPE_MISMATCH,
+            "Automatically defined type {} for column {} in row {} differs from type defined by previous rows: {}",
+            type->getName(),
+            column_name,
+            row,
+            new_type->getName());
     }
 }
 
@@ -63,8 +67,8 @@ void checkResultColumnTypeAndAppend(NamesAndTypesList & result, DataTypePtr & ty
     result.emplace_back(name, type);
 }
 
-IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings)
-    : ISchemaReader(in_)
+IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
+    : ISchemaReader(in_), format_settings(format_settings_)
 {
     if (!format_settings.column_names_for_schema_inference.empty())
     {
@@ -79,14 +83,14 @@ IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & form
     }
 }
 
-IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings, DataTypePtr default_type_)
-    : IRowSchemaReader(in_, format_settings)
+IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_)
+    : IRowSchemaReader(in_, format_settings_)
 {
     default_type = default_type_;
 }
 
-IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings, const DataTypes & default_types_)
-    : IRowSchemaReader(in_, format_settings)
+IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, const DataTypes & default_types_)
+    : IRowSchemaReader(in_, format_settings_)
 {
     default_types = default_types_;
 }
@@ -116,7 +120,8 @@ NamesAndTypesList IRowSchemaReader::readSchema()
             if (!new_data_types[i])
                 continue;
 
-            chooseResultColumnType(data_types[i], new_data_types[i], common_type_checker, getDefaultType(i), std::to_string(i + 1), rows_read);
+            auto transform_types_if_needed = [&](DataTypePtr & type, DataTypePtr & new_type){ transformTypesIfNeeded(type, new_type, i); };
+            chooseResultColumnType(data_types[i], new_data_types[i], transform_types_if_needed, getDefaultType(i), std::to_string(i + 1), rows_read);
         }
     }
 
@@ -156,8 +161,13 @@ DataTypePtr IRowSchemaReader::getDefaultType(size_t column) const
     return nullptr;
 }
 
-IRowWithNamesSchemaReader::IRowWithNamesSchemaReader(ReadBuffer & in_, DataTypePtr default_type_)
-    : ISchemaReader(in_), default_type(default_type_)
+void IRowSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings);
+}
+
+IRowWithNamesSchemaReader::IRowWithNamesSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_)
+    : ISchemaReader(in_), format_settings(format_settings_), default_type(default_type_)
 {
 }
 
@@ -181,6 +191,7 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
         names_order.push_back(name);
     }
 
+    auto transform_types_if_needed = [&](DataTypePtr & type, DataTypePtr & new_type){ transformTypesIfNeeded(type, new_type); };
     for (rows_read = 1; rows_read < max_rows_to_read; ++rows_read)
     {
         auto new_names_and_types = readRowAndGetNamesAndDataTypes(eof);
@@ -188,7 +199,7 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
             /// We reached eof.
             break;
 
-        for (const auto & [name, new_type] : new_names_and_types)
+        for (auto & [name, new_type] : new_names_and_types)
         {
             auto it = names_to_types.find(name);
             /// If we didn't see this column before, just add it.
@@ -200,7 +211,7 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
             }
 
             auto & type = it->second;
-            chooseResultColumnType(type, new_type, common_type_checker, default_type, name, rows_read);
+            chooseResultColumnType(type, new_type, transform_types_if_needed, default_type, name, rows_read);
         }
     }
 
@@ -219,4 +230,9 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
     return result;
 }
 
+void IRowWithNamesSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings);
+}
+
 }
diff --git a/src/Processors/Formats/ISchemaReader.h b/src/Processors/Formats/ISchemaReader.h
index 00987540d04..02c42495b2a 100644
--- a/src/Processors/Formats/ISchemaReader.h
+++ b/src/Processors/Formats/ISchemaReader.h
@@ -53,8 +53,6 @@ public:
 
     NamesAndTypesList readSchema() override;
 
-    void setCommonTypeChecker(CommonDataTypeChecker checker) { common_type_checker = checker; }
-
 protected:
     /// Read one row and determine types of columns in it.
     /// Return types in the same order in which the values were in the row.
@@ -67,6 +65,10 @@ protected:
     void setMaxRowsToRead(size_t max_rows) override { max_rows_to_read = max_rows; }
     size_t getNumRowsRead() const override { return rows_read; }
 
+    FormatSettings format_settings;
+
+    virtual void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t column_idx);
+
 private:
 
     DataTypePtr getDefaultType(size_t column) const;
@@ -74,7 +76,6 @@ private:
     size_t rows_read = 0;
     DataTypePtr default_type;
     DataTypes default_types;
-    CommonDataTypeChecker common_type_checker;
     std::vector<String> column_names;
 };
 
@@ -86,12 +87,10 @@ private:
 class IRowWithNamesSchemaReader : public ISchemaReader
 {
 public:
-    IRowWithNamesSchemaReader(ReadBuffer & in_, DataTypePtr default_type_ = nullptr);
+    IRowWithNamesSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_ = nullptr);
     NamesAndTypesList readSchema() override;
     bool hasStrictOrderOfColumns() const override { return false; }
 
-    void setCommonTypeChecker(CommonDataTypeChecker checker) { common_type_checker = checker; }
-
 protected:
     /// Read one row and determine types of columns in it.
     /// Return list with names and types.
@@ -102,11 +101,14 @@ protected:
     void setMaxRowsToRead(size_t max_rows) override { max_rows_to_read = max_rows; }
     size_t getNumRowsRead() const override { return rows_read; }
 
+    virtual void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type);
+
+    FormatSettings format_settings;
+
 private:
     size_t max_rows_to_read;
     size_t rows_read = 0;
     DataTypePtr default_type;
-    CommonDataTypeChecker common_type_checker;
 };
 
 /// Base class for schema inference for formats that don't need any data to
@@ -122,8 +124,8 @@ public:
 
 void chooseResultColumnType(
     DataTypePtr & type,
-    const DataTypePtr & new_type,
-    CommonDataTypeChecker common_type_checker,
+    DataTypePtr & new_type,
+    std::function<void(DataTypePtr &, DataTypePtr &)> transform_types_if_needed,
     const DataTypePtr & default_type,
     const String & column_name,
     size_t row);
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index f922ff048b2..36f4536d918 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -326,6 +326,69 @@ static std::shared_ptr<arrow::ChunkedArray> getNestedArrowColumn(std::shared_ptr
     return std::make_shared<arrow::ChunkedArray>(array_vector);
 }
 
+static ColumnWithTypeAndName createLCColumnFromArrowDictionaryValues(
+    const std::shared_ptr<ColumnWithTypeAndName> & dict_values,
+    const ColumnPtr & indexes_column,
+    const String & column_name
+)
+{
+    auto lc_type = std::make_shared<DataTypeLowCardinality>(dict_values->type);
+
+    auto lc_column = lc_type->createColumn();
+
+    for (auto i = 0u; i < indexes_column->size(); i++)
+    {
+        Field f;
+        dict_values->column->get(indexes_column->getUInt(i), f);
+        lc_column->insert(f);
+    }
+
+    return {std::move(lc_column), std::move(lc_type), column_name};
+}
+
+/*
+ * Dictionary(Nullable(X)) in ArrowColumn format is composed of a nullmap, dictionary and an index.
+ * It doesn't have the concept of null or default values.
+ * An empty string is just a regular value appended at any position of the dictionary.
+ * Null values have an index of 0, but it should be ignored since the nullmap will return null.
+ * In ClickHouse LowCardinality, it's different. The dictionary contains null and default values at the beginning.
+ * [null, default, ...]. Therefore, null values have an index of 0 and default values have an index of 1.
+ * No nullmap is used.
+ * */
+static ColumnWithTypeAndName createLCOfNullableColumnFromArrowDictionaryValues(
+    const std::shared_ptr<ColumnWithTypeAndName> & dict_values,
+    const ColumnPtr & indexes_column,
+    const ColumnPtr & nullmap_column,
+    const String & column_name
+)
+{
+    /*
+     * ArrowColumn format handles nulls by maintaining a nullmap column, there is no nullable type.
+     * Therefore, dict_values->type is the actual data type/ non-nullable. It needs to be transformed into nullable
+     * so LC column is created from nullable type and a null value at the beginning of the collection
+     * is automatically added.
+     * */
+    auto lc_type = std::make_shared<DataTypeLowCardinality>(makeNullable(dict_values->type));
+
+    auto lc_column = lc_type->createColumn();
+
+    for (auto i = 0u; i < indexes_column->size(); i++)
+    {
+        if (nullmap_column && nullmap_column->getBool(i))
+        {
+            lc_column->insertDefault();
+        }
+        else
+        {
+            Field f;
+            dict_values->column->get(indexes_column->getUInt(i), f);
+            lc_column->insert(f);
+        }
+    }
+
+    return {std::move(lc_column), std::move(lc_type), column_name};
+}
+
 static ColumnWithTypeAndName readColumnFromArrowColumn(
     std::shared_ptr<arrow::ChunkedArray> & arrow_column,
     const std::string & column_name,
@@ -338,7 +401,8 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
     bool & skipped)
 {
     if (!is_nullable && arrow_column->null_count() && arrow_column->type()->id() != arrow::Type::LIST
-        && arrow_column->type()->id() != arrow::Type::MAP && arrow_column->type()->id() != arrow::Type::STRUCT)
+        && arrow_column->type()->id() != arrow::Type::MAP && arrow_column->type()->id() != arrow::Type::STRUCT &&
+        arrow_column->type()->id() != arrow::Type::DICTIONARY)
     {
         auto nested_column = readColumnFromArrowColumn(arrow_column, column_name, format_name, true, dictionary_values, read_ints_as_dates, allow_null_type, skip_columns_with_unsupported_types, skipped);
         if (skipped)
@@ -455,12 +519,6 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                 }
                 auto arrow_dict_column = std::make_shared<arrow::ChunkedArray>(dict_array);
                 auto dict_column = readColumnFromArrowColumn(arrow_dict_column, column_name, format_name, false, dictionary_values, read_ints_as_dates, allow_null_type, skip_columns_with_unsupported_types, skipped);
-
-                /// We should convert read column to ColumnUnique.
-                auto tmp_lc_column = DataTypeLowCardinality(dict_column.type).createColumn();
-                auto tmp_dict_column = IColumn::mutate(assert_cast<ColumnLowCardinality *>(tmp_lc_column.get())->getDictionaryPtr());
-                static_cast<IColumnUnique *>(tmp_dict_column.get())->uniqueInsertRangeFrom(*dict_column.column, 0, dict_column.column->size());
-                dict_column.column = std::move(tmp_dict_column);
                 dict_values = std::make_shared<ColumnWithTypeAndName>(std::move(dict_column));
             }
 
@@ -473,9 +531,19 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
 
             auto arrow_indexes_column = std::make_shared<arrow::ChunkedArray>(indexes_array);
             auto indexes_column = readColumnWithIndexesData(arrow_indexes_column);
-            auto lc_column = ColumnLowCardinality::create(dict_values->column, indexes_column);
-            auto lc_type = std::make_shared<DataTypeLowCardinality>(dict_values->type);
-            return {std::move(lc_column), std::move(lc_type), column_name};
+
+            const auto contains_null = arrow_column->null_count() > 0;
+
+            if (contains_null)
+            {
+                auto nullmap_column = readByteMapFromArrowColumn(arrow_column);
+
+                return createLCOfNullableColumnFromArrowDictionaryValues(dict_values, indexes_column, nullmap_column, column_name);
+            }
+            else
+            {
+                return createLCColumnFromArrowDictionaryValues(dict_values, indexes_column, column_name);
+            }
         }
 #    define DISPATCH(ARROW_NUMERIC_TYPE, CPP_NUMERIC_TYPE) \
         case ARROW_NUMERIC_TYPE: \
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index 6b056e64d41..75a318ce372 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -6,7 +6,7 @@
 
 #include <Core/Field.h>
 
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 
 #include <IO/Operators.h>
 #include <IO/ReadHelpers.h>
@@ -777,13 +777,13 @@ private:
     }
 
     Poco::URI base_url;
-    LRUCache<uint32_t, avro::ValidSchema> schema_cache;
+    CacheBase<uint32_t, avro::ValidSchema> schema_cache;
 };
 
 using ConfluentSchemaRegistry = AvroConfluentRowInputFormat::SchemaRegistry;
 #define SCHEMA_REGISTRY_CACHE_MAX_SIZE 1000
 /// Cache of Schema Registry URL -> SchemaRegistry
-static LRUCache<std::string, ConfluentSchemaRegistry>  schema_registry_cache(SCHEMA_REGISTRY_CACHE_MAX_SIZE);
+static CacheBase<std::string, ConfluentSchemaRegistry>  schema_registry_cache(SCHEMA_REGISTRY_CACHE_MAX_SIZE);
 
 static std::shared_ptr<ConfluentSchemaRegistry> getConfluentSchemaRegistry(const FormatSettings & format_settings)
 {
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
index 0dadbb75532..3916a8e4ba6 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
@@ -49,6 +49,11 @@ kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
 {
     uint32_t segment_count;
     in->readStrict(reinterpret_cast<char*>(&segment_count), sizeof(uint32_t));
+    /// Don't allow large amount of segments as it's done in capnproto library:
+    /// https://github.com/capnproto/capnproto/blob/931074914eda9ca574b5c24d1169c0f7a5156594/c%2B%2B/src/capnp/serialize.c%2B%2B#L181
+    /// Large amount of segments can indicate that corruption happened.
+    if (segment_count >= 512)
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Message has too many segments. Most likely, data was corrupted");
 
     // one for segmentCount and one because segmentCount starts from 0
     const auto prefix_size = (2 + segment_count) * sizeof(uint32_t);
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
index 61488a94ccd..e5397ca0757 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
@@ -318,6 +318,11 @@ DataTypes CustomSeparatedSchemaReader::readRowAndGetDataTypes()
     return determineDataTypesByEscapingRule(fields, reader.getFormatSettings(), reader.getEscapingRule());
 }
 
+void CustomSeparatedSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings, reader.getEscapingRule());
+}
+
 void registerInputFormatCustomSeparated(FormatFactory & factory)
 {
     for (bool ignore_spaces : {false, true})
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
index d9e62a1b8e9..c7e332b983f 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
@@ -97,6 +97,8 @@ public:
 private:
     DataTypes readRowAndGetDataTypes() override;
 
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t) override;
+
     PeekableReadBuffer buf;
     CustomSeparatedFormatReader reader;
     bool first_row = true;
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
index cdde87f2cf6..7f9fbddd554 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
@@ -1,5 +1,6 @@
 #include <Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h>
 #include <Formats/JSONUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <IO/ReadHelpers.h>
 #include <base/find_symbols.h>
 
@@ -181,13 +182,14 @@ JSONColumnsSchemaReaderBase::JSONColumnsSchemaReaderBase(
 {
 }
 
-void JSONColumnsSchemaReaderBase::chooseResulType(DataTypePtr & type, const DataTypePtr & new_type, const String & column_name, size_t row) const
+void JSONColumnsSchemaReaderBase::chooseResulType(DataTypePtr & type, DataTypePtr & new_type, const String & column_name, size_t row) const
 {
-    auto common_type_checker = [&](const DataTypePtr & first, const DataTypePtr & second)
+    auto convert_types_if_needed = [&](DataTypePtr & first, DataTypePtr & second)
     {
-        return JSONUtils::getCommonTypeForJSONFormats(first, second, format_settings.json.read_bools_as_numbers);
+        DataTypes types = {first, second};
+        transformInferredJSONTypesIfNeeded(types, format_settings);
     };
-    chooseResultColumnType(type, new_type, common_type_checker, nullptr, column_name, row);
+    chooseResultColumnType(type, new_type, convert_types_if_needed, nullptr, column_name, row);
 }
 
 NamesAndTypesList JSONColumnsSchemaReaderBase::readSchema()
@@ -260,7 +262,7 @@ DataTypePtr JSONColumnsSchemaReaderBase::readColumnAndGetDataType(const String &
         }
 
         readJSONField(field, in);
-        DataTypePtr field_type = JSONUtils::getDataTypeFromField(field);
+        DataTypePtr field_type = JSONUtils::getDataTypeFromField(field, format_settings);
         chooseResulType(column_type, field_type, column_name, rows_read);
         ++rows_read;
     }
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
index ac746a2e2d1..6769e60be22 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
@@ -83,7 +83,7 @@ private:
     DataTypePtr readColumnAndGetDataType(const String & column_name, size_t & rows_read, size_t max_rows_to_read);
 
     /// Choose result type for column from two inferred types from different rows.
-    void chooseResulType(DataTypePtr & type, const DataTypePtr & new_type, const String & column_name, size_t row) const;
+    void chooseResulType(DataTypePtr & type, DataTypePtr & new_type, const String & column_name, size_t row) const;
 
     const FormatSettings format_settings;
     std::unique_ptr<JSONColumnsReaderBase> reader;
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
index 1bc5223a712..8ea379beae5 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
@@ -6,6 +6,7 @@
 #include <Formats/FormatFactory.h>
 #include <Formats/verbosePrintString.h>
 #include <Formats/JSONUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <Formats/registerWithNamesAndTypes.h>
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
@@ -187,11 +188,6 @@ JSONCompactEachRowRowSchemaReader::JSONCompactEachRowRowSchemaReader(
     : FormatWithNamesAndTypesSchemaReader(in_, format_settings_, with_names_, with_types_, &reader)
     , reader(in_, yield_strings_, format_settings_)
 {
-    bool allow_bools_as_numbers = format_settings_.json.read_bools_as_numbers;
-    setCommonTypeChecker([allow_bools_as_numbers](const DataTypePtr & first, const DataTypePtr & second)
-    {
-        return JSONUtils::getCommonTypeForJSONFormats(first, second, allow_bools_as_numbers);
-    });
 }
 
 DataTypes JSONCompactEachRowRowSchemaReader::readRowAndGetDataTypes()
@@ -210,7 +206,12 @@ DataTypes JSONCompactEachRowRowSchemaReader::readRowAndGetDataTypes()
     if (in.eof())
         return {};
 
-    return JSONUtils::readRowAndGetDataTypesForJSONCompactEachRow(in, reader.yieldStrings());
+    return JSONUtils::readRowAndGetDataTypesForJSONCompactEachRow(in, format_settings, reader.yieldStrings());
+}
+
+void JSONCompactEachRowRowSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t)
+{
+    transformInferredJSONTypesIfNeeded(type, new_type, format_settings);
 }
 
 void registerInputFormatJSONCompactEachRow(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
index 79c76214774..7be9ba9289b 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
@@ -80,6 +80,8 @@ public:
 private:
     DataTypes readRowAndGetDataTypes() override;
 
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t) override;
+
     JSONCompactEachRowFormatReader reader;
     bool first_row = true;
 };
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index 3bcea8a8843..7cb62f9bf83 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -3,6 +3,7 @@
 
 #include <Processors/Formats/Impl/JSONEachRowRowInputFormat.h>
 #include <Formats/JSONUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <Formats/FormatFactory.h>
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
@@ -306,18 +307,12 @@ void JSONEachRowRowInputFormat::readSuffix()
     assertEOF(*in);
 }
 
-JSONEachRowSchemaReader::JSONEachRowSchemaReader(ReadBuffer & in_, bool json_strings_, const FormatSettings & format_settings)
-    : IRowWithNamesSchemaReader(in_)
+JSONEachRowSchemaReader::JSONEachRowSchemaReader(ReadBuffer & in_, bool json_strings_, const FormatSettings & format_settings_)
+    : IRowWithNamesSchemaReader(in_, format_settings_)
     , json_strings(json_strings_)
 {
-    bool allow_bools_as_numbers = format_settings.json.read_bools_as_numbers;
-    setCommonTypeChecker([allow_bools_as_numbers](const DataTypePtr & first, const DataTypePtr & second)
-    {
-        return JSONUtils::getCommonTypeForJSONFormats(first, second, allow_bools_as_numbers);
-    });
 }
 
-
 NamesAndTypesList JSONEachRowSchemaReader::readRowAndGetNamesAndDataTypes(bool & eof)
 {
     if (first_row)
@@ -350,7 +345,12 @@ NamesAndTypesList JSONEachRowSchemaReader::readRowAndGetNamesAndDataTypes(bool &
         return {};
     }
 
-    return JSONUtils::readRowAndGetNamesAndDataTypesForJSONEachRow(in, json_strings);
+    return JSONUtils::readRowAndGetNamesAndDataTypesForJSONEachRow(in, format_settings, json_strings);
+}
+
+void JSONEachRowSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type)
+{
+    transformInferredJSONTypesIfNeeded(type, new_type, format_settings);
 }
 
 void registerInputFormatJSONEachRow(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
index 1673d55b9fd..e6db45bb056 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
@@ -92,6 +92,7 @@ public:
 
 private:
     NamesAndTypesList readRowAndGetNamesAndDataTypes(bool & eof) override;
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type) override;
 
     bool json_strings;
     bool first_row = true;
diff --git a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
index 8e787edf8ab..8e1beb8ec89 100644
--- a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
@@ -402,7 +402,7 @@ void MySQLDumpRowInputFormat::skipField()
 }
 
 MySQLDumpSchemaReader::MySQLDumpSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
-    : IRowSchemaReader(in_, format_settings_), format_settings(format_settings_), table_name(format_settings_.mysql_dump.table_name)
+    : IRowSchemaReader(in_, format_settings_), table_name(format_settings_.mysql_dump.table_name)
 {
 }
 
diff --git a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.h b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.h
index 2457f3d4762..6be20550e49 100644
--- a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.h
+++ b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.h
@@ -35,7 +35,6 @@ private:
     NamesAndTypesList readSchema() override;
     DataTypes readRowAndGetDataTypes() override;
 
-    const FormatSettings format_settings;
     String table_name;
 };
 
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
index 8fbf0a14916..4920bf659f7 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -9,7 +9,6 @@
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-#include <Common/PODArray.h>
 #include <Common/UTF8Helpers.h>
 
 namespace DB
@@ -21,8 +20,8 @@ namespace ErrorCodes
 
 
 PrettyBlockOutputFormat::PrettyBlockOutputFormat(
-    WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_)
-     : IOutputFormat(header_, out_), format_settings(format_settings_), serializations(header_.getSerializations())
+    WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_, bool mono_block_)
+     : IOutputFormat(header_, out_), format_settings(format_settings_), serializations(header_.getSerializations()), mono_block(mono_block_)
 {
     struct winsize w;
     if (0 == ioctl(STDOUT_FILENO, TIOCGWINSZ, &w))
@@ -142,17 +141,33 @@ GridSymbols ascii_grid_symbols {
 
 }
 
-
 void PrettyBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
 {
-    UInt64 max_rows = format_settings.pretty.max_rows;
-
-    if (total_rows >= max_rows)
+    if (total_rows >= format_settings.pretty.max_rows)
     {
         total_rows += chunk.getNumRows();
         return;
     }
+    if (mono_block)
+    {
+        if (port_kind == PortKind::Main)
+        {
+            if (mono_chunk)
+                mono_chunk.append(chunk);
+            else
+                mono_chunk = std::move(chunk);
+            return;
+        }
 
+        /// Should be written from writeSuffix()
+        assert(!mono_chunk);
+    }
+
+    writeChunk(chunk, port_kind);
+}
+
+void PrettyBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind)
+{
     auto num_rows = chunk.getNumRows();
     auto num_columns = chunk.getNumColumns();
     const auto & columns = chunk.getColumns();
@@ -265,7 +280,7 @@ void PrettyBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
     }
     writeString(middle_names_separator_s, out);
 
-    for (size_t i = 0; i < num_rows && total_rows + i < max_rows; ++i)
+    for (size_t i = 0; i < num_rows && total_rows + i < format_settings.pretty.max_rows; ++i)
     {
         if (i != 0)
         {
@@ -385,8 +400,19 @@ void PrettyBlockOutputFormat::consumeExtremes(Chunk chunk)
 }
 
 
+void PrettyBlockOutputFormat::writeMonoChunkIfNeeded()
+{
+    if (mono_chunk)
+    {
+        writeChunk(mono_chunk, PortKind::Main);
+        mono_chunk.clear();
+    }
+}
+
 void PrettyBlockOutputFormat::writeSuffix()
 {
+    writeMonoChunkIfNeeded();
+
     if (total_rows >= format_settings.pretty.max_rows)
     {
         writeCString("  Showed first ", out);
@@ -395,32 +421,9 @@ void PrettyBlockOutputFormat::writeSuffix()
     }
 }
 
-
 void registerOutputFormatPretty(FormatFactory & factory)
 {
-    factory.registerOutputFormat("Pretty", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        return std::make_shared<PrettyBlockOutputFormat>(buf, sample, format_settings);
-    });
-
-    factory.markOutputFormatSupportsParallelFormatting("Pretty");
-
-    factory.registerOutputFormat("PrettyNoEscapes", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        FormatSettings changed_settings = format_settings;
-        changed_settings.pretty.color = false;
-        return std::make_shared<PrettyBlockOutputFormat>(buf, sample, changed_settings);
-    });
-
-    factory.markOutputFormatSupportsParallelFormatting("PrettyNoEscapes");
+    registerPrettyFormatWithNoEscapesAndMonoBlock<PrettyBlockOutputFormat>(factory, "Pretty");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
index cfdd2213515..c8ab22b123f 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -3,6 +3,7 @@
 #include <Core/Block.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Formats/FormatSettings.h>
+#include <Formats/FormatFactory.h>
 
 
 namespace DB
@@ -18,7 +19,7 @@ class PrettyBlockOutputFormat : public IOutputFormat
 {
 public:
     /// no_escapes - do not use ANSI escape sequences - to display in the browser, not in the console.
-    PrettyBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_);
+    PrettyBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_, bool mono_block_);
 
     String getName() const override { return "PrettyBlockOutputFormat"; }
 
@@ -38,7 +39,9 @@ protected:
     using Widths = PODArray<size_t>;
     using WidthsPerColumn = std::vector<Widths>;
 
-    virtual void write(Chunk chunk, PortKind port_kind);
+    void write(Chunk chunk, PortKind port_kind);
+    virtual void writeChunk(const Chunk & chunk, PortKind port_kind);
+    void writeMonoChunkIfNeeded();
     void writeSuffix() override;
 
     void onRowsReadBeforeUpdate() override { total_rows = getRowsReadBefore(); }
@@ -50,6 +53,39 @@ protected:
     void writeValueWithPadding(
         const IColumn & column, const ISerialization & serialization, size_t row_num,
         size_t value_width, size_t pad_to_width, bool align_right);
+
+private:
+    bool mono_block;
+    /// For mono_block == true only
+    Chunk mono_chunk;
 };
 
+template <class OutputFormat>
+void registerPrettyFormatWithNoEscapesAndMonoBlock(FormatFactory & factory, const String & base_name)
+{
+    auto creator = [&](FormatFactory & fact, const String & name, bool no_escapes, bool mono_block)
+    {
+        fact.registerOutputFormat(name, [no_escapes, mono_block](
+            WriteBuffer & buf,
+            const Block & sample,
+            const RowOutputFormatParams &,
+            const FormatSettings & format_settings)
+        {
+            if (no_escapes)
+            {
+                FormatSettings changed_settings = format_settings;
+                changed_settings.pretty.color = false;
+                return std::make_shared<OutputFormat>(buf, sample, changed_settings, mono_block);
+            }
+            return std::make_shared<OutputFormat>(buf, sample, format_settings, mono_block);
+        });
+        if (!mono_block)
+            factory.markOutputFormatSupportsParallelFormatting(name);
+    };
+    creator(factory, base_name, false, false);
+    creator(factory, base_name + "NoEscapes", true, false);
+    creator(factory, base_name + "MonoBlock", false, true);
+    creator(factory, base_name + "NoEscapesMonoBlock", true, true);
+}
+
 }
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
index 9ba358a76e1..cc26a064b54 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
@@ -49,22 +49,10 @@ GridSymbols ascii_grid_symbols {
 }
 
 PrettyCompactBlockOutputFormat::PrettyCompactBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_)
-    : PrettyBlockOutputFormat(out_, header, format_settings_)
-    , mono_block(mono_block_)
+    : PrettyBlockOutputFormat(out_, header, format_settings_, mono_block_)
 {
 }
 
-void PrettyCompactBlockOutputFormat::writeSuffix()
-{
-    if (mono_chunk)
-    {
-        writeChunk(mono_chunk, PortKind::Main);
-        mono_chunk.clear();
-    }
-
-    PrettyBlockOutputFormat::writeSuffix();
-}
-
 void PrettyCompactBlockOutputFormat::writeHeader(
     const Block & block,
     const Widths & max_widths,
@@ -186,38 +174,6 @@ void PrettyCompactBlockOutputFormat::writeRow(
     writeCString("\n", out);
 }
 
-void PrettyCompactBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
-{
-    UInt64 max_rows = format_settings.pretty.max_rows;
-
-    if (total_rows >= max_rows)
-    {
-        total_rows += chunk.getNumRows();
-        return;
-    }
-    if (mono_block)
-    {
-        if (port_kind == PortKind::Main)
-        {
-            if (!mono_chunk)
-            {
-                mono_chunk = std::move(chunk);
-                return;
-            }
-
-            mono_chunk.append(chunk);
-            return;
-        }
-        else
-        {
-            /// Should be written from writeSuffix()
-            assert(!mono_chunk);
-        }
-    }
-
-    writeChunk(chunk, port_kind);
-}
-
 void PrettyCompactBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind)
 {
     UInt64 max_rows = format_settings.pretty.max_rows;
@@ -244,31 +200,7 @@ void PrettyCompactBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind po
 
 void registerOutputFormatPrettyCompact(FormatFactory & factory)
 {
-    for (const auto & [name, mono_block] : {std::make_pair("PrettyCompact", false), std::make_pair("PrettyCompactMonoBlock", true)})
-    {
-        factory.registerOutputFormat(name, [mono_block = mono_block](
-            WriteBuffer & buf,
-            const Block & sample,
-            const RowOutputFormatParams &,
-            const FormatSettings & format_settings)
-        {
-            return std::make_shared<PrettyCompactBlockOutputFormat>(buf, sample, format_settings, mono_block);
-        });
-    }
-
-    factory.markOutputFormatSupportsParallelFormatting("PrettyCompact");
-
-    factory.registerOutputFormat("PrettyCompactNoEscapes", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        FormatSettings changed_settings = format_settings;
-        changed_settings.pretty.color = false;
-        return std::make_shared<PrettyCompactBlockOutputFormat>(buf, sample, changed_settings, false /* mono_block */);
-    });
-    factory.markOutputFormatSupportsParallelFormatting("PrettyCompactNoEscapes");
+    registerPrettyFormatWithNoEscapesAndMonoBlock<PrettyCompactBlockOutputFormat>(factory, "PrettyCompact");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
index 5c39328051c..432ff0ee120 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
@@ -17,7 +17,6 @@ public:
     String getName() const override { return "PrettyCompactBlockOutputFormat"; }
 
 private:
-    void write(Chunk chunk, PortKind port_kind) override;
     void writeHeader(const Block & block, const Widths & max_widths, const Widths & name_widths);
     void writeBottom(const Widths & max_widths);
     void writeRow(
@@ -27,12 +26,7 @@ private:
         const WidthsPerColumn & widths,
         const Widths & max_widths);
 
-    bool mono_block;
-    /// For mono_block == true only
-    Chunk mono_chunk;
-
-    void writeChunk(const Chunk & chunk, PortKind port_kind);
-    void writeSuffix() override;
+    void writeChunk(const Chunk & chunk, PortKind port_kind) override;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
index 730907ba45c..4afb380dec9 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
@@ -9,7 +9,7 @@ namespace DB
 {
 
 
-void PrettySpaceBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
+void PrettySpaceBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind)
 {
     UInt64 max_rows = format_settings.pretty.max_rows;
 
@@ -100,6 +100,8 @@ void PrettySpaceBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
 
 void PrettySpaceBlockOutputFormat::writeSuffix()
 {
+    writeMonoChunkIfNeeded();
+
     if (total_rows >= format_settings.pretty.max_rows)
     {
         writeCString("\nShowed first ", out);
@@ -111,29 +113,7 @@ void PrettySpaceBlockOutputFormat::writeSuffix()
 
 void registerOutputFormatPrettySpace(FormatFactory & factory)
 {
-    factory.registerOutputFormat("PrettySpace", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        return std::make_shared<PrettySpaceBlockOutputFormat>(buf, sample, format_settings);
-    });
-
-    factory.markOutputFormatSupportsParallelFormatting("PrettySpace");
-
-    factory.registerOutputFormat("PrettySpaceNoEscapes", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        FormatSettings changed_settings = format_settings;
-        changed_settings.pretty.color = false;
-        return std::make_shared<PrettySpaceBlockOutputFormat>(buf, sample, changed_settings);
-    });
-
-    factory.markOutputFormatSupportsParallelFormatting("PrettySpaceNoEscapes");
+    registerPrettyFormatWithNoEscapesAndMonoBlock<PrettySpaceBlockOutputFormat>(factory, "PrettySpace");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
index 6a8cb4e799c..1cccd5fb476 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
@@ -11,13 +11,13 @@ namespace DB
 class PrettySpaceBlockOutputFormat : public PrettyBlockOutputFormat
 {
 public:
-    PrettySpaceBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_)
-        : PrettyBlockOutputFormat(out_, header, format_settings_) {}
+    PrettySpaceBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_)
+        : PrettyBlockOutputFormat(out_, header, format_settings_, mono_block_) {}
 
     String getName() const override { return "PrettySpaceBlockOutputFormat"; }
 
 private:
-    void write(Chunk chunk, PortKind port_kind) override;
+    void writeChunk(const Chunk & chunk, PortKind port_kind) override;
     void writeSuffix() override;
 };
 
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
index d92f65f33d1..c6150863bd4 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
@@ -133,7 +133,6 @@ RegexpSchemaReader::RegexpSchemaReader(ReadBuffer & in_, const FormatSettings &
         buf,
         format_settings_,
         getDefaultDataTypeForEscapingRule(format_settings_.regexp.escaping_rule))
-    , format_settings(format_settings_)
     , field_extractor(format_settings)
     , buf(in_)
 {
@@ -157,6 +156,12 @@ DataTypes RegexpSchemaReader::readRowAndGetDataTypes()
     return data_types;
 }
 
+void RegexpSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings, format_settings.regexp.escaping_rule);
+}
+
+
 void registerInputFormatRegexp(FormatFactory & factory)
 {
     factory.registerInputFormat("Regexp", [](
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.h b/src/Processors/Formats/Impl/RegexpRowInputFormat.h
index 3cc6a3192fd..7fbb3fc320f 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.h
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.h
@@ -81,8 +81,10 @@ public:
 private:
     DataTypes readRowAndGetDataTypes() override;
 
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t) override;
+
+
     using EscapingRule = FormatSettings::EscapingRule;
-    const FormatSettings format_settings;
     RegexpFieldExtractor field_extractor;
     PeekableReadBuffer buf;
 };
diff --git a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
index fe2c0c5ecdd..7393a1d6ce6 100644
--- a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
@@ -214,8 +214,7 @@ void TSKVRowInputFormat::resetParser()
 }
 
 TSKVSchemaReader::TSKVSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
-    : IRowWithNamesSchemaReader(in_, getDefaultDataTypeForEscapingRule(FormatSettings::EscapingRule::Escaped))
-    , format_settings(format_settings_)
+    : IRowWithNamesSchemaReader(in_, format_settings_, getDefaultDataTypeForEscapingRule(FormatSettings::EscapingRule::Escaped))
 {
 }
 
diff --git a/src/Processors/Formats/Impl/TSKVRowInputFormat.h b/src/Processors/Formats/Impl/TSKVRowInputFormat.h
index bf8580bc6b7..5130ee5e827 100644
--- a/src/Processors/Formats/Impl/TSKVRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TSKVRowInputFormat.h
@@ -61,7 +61,6 @@ public:
 private:
     NamesAndTypesList readRowAndGetNamesAndDataTypes(bool & eof) override;
 
-    const FormatSettings format_settings;
     bool first_row = true;
 };
 
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
index df4d49b172c..6e8bba89d8c 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
@@ -458,7 +458,6 @@ TemplateSchemaReader::TemplateSchemaReader(
     , buf(in_)
     , format(format_)
     , row_format(row_format_)
-    , format_settings(format_settings_)
     , format_reader(buf, ignore_spaces_, format, row_format, row_between_delimiter, format_settings)
 {
     setColumnNames(row_format.column_names);
@@ -494,6 +493,11 @@ DataTypes TemplateSchemaReader::readRowAndGetDataTypes()
     return data_types;
 }
 
+void TemplateSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t column_idx)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings, row_format.escaping_rules[column_idx]);
+}
+
 static ParsedTemplateFormatString fillResultSetFormat(const FormatSettings & settings)
 {
     ParsedTemplateFormatString resultset_format;
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.h b/src/Processors/Formats/Impl/TemplateRowInputFormat.h
index ab7043f057e..740683ad95d 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.h
@@ -121,10 +121,11 @@ public:
     DataTypes readRowAndGetDataTypes() override;
 
 private:
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t column_idx) override;
+
     PeekableReadBuffer buf;
     const ParsedTemplateFormatString format;
     const ParsedTemplateFormatString row_format;
-    FormatSettings format_settings;
     TemplateFormatReader format_reader;
     bool first_row = true;
 };
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 41f77f8bbf2..49b758b78c4 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -567,7 +567,7 @@ void ValuesBlockInputFormat::setReadBuffer(ReadBuffer & in_)
 }
 
 ValuesSchemaReader::ValuesSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
-    : IRowSchemaReader(buf, format_settings_), buf(in_), format_settings(format_settings_)
+    : IRowSchemaReader(buf, format_settings_), buf(in_)
 {
 }
 
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
index 9653e431b4e..bf243c54bd7 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
@@ -103,7 +103,6 @@ private:
     DataTypes readRowAndGetDataTypes() override;
 
     PeekableReadBuffer buf;
-    const FormatSettings format_settings;
     ParserExpression parser;
     bool first_row = true;
     bool end_of_data = false;
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
index a3dcbe914bb..9ff227e5dab 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
@@ -229,12 +229,12 @@ void RowInputFormatWithNamesAndTypes::setReadBuffer(ReadBuffer & in_)
 
 FormatWithNamesAndTypesSchemaReader::FormatWithNamesAndTypesSchemaReader(
     ReadBuffer & in_,
-    const FormatSettings & format_settings,
+    const FormatSettings & format_settings_,
     bool with_names_,
     bool with_types_,
     FormatWithNamesAndTypesReader * format_reader_,
     DataTypePtr default_type_)
-    : IRowSchemaReader(in_, format_settings, default_type_), with_names(with_names_), with_types(with_types_), format_reader(format_reader_)
+    : IRowSchemaReader(in_, format_settings_, default_type_), with_names(with_names_), with_types(with_types_), format_reader(format_reader_)
 {
 }
 
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
index 9fc8b2083df..0afc0146846 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
@@ -123,7 +123,7 @@ class FormatWithNamesAndTypesSchemaReader : public IRowSchemaReader
 public:
     FormatWithNamesAndTypesSchemaReader(
         ReadBuffer & in,
-        const FormatSettings & format_settings,
+        const FormatSettings & format_settings_,
         bool with_names_,
         bool with_types_,
         FormatWithNamesAndTypesReader * format_reader_,
diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index 9d885002cfe..6d17db69c9e 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -307,6 +307,33 @@ public:
     uint64_t getInputWaitElapsedUs() const { return input_wait_elapsed_us; }
     uint64_t getOutputWaitElapsedUs() const { return output_wait_elapsed_us; }
 
+    struct ProcessorDataStats
+    {
+        size_t input_rows = 0;
+        size_t input_bytes = 0;
+        size_t output_rows = 0;
+        size_t output_bytes = 0;
+    };
+
+    ProcessorDataStats getProcessorDataStats() const
+    {
+        ProcessorDataStats stats;
+
+        for (const auto & input : inputs)
+        {
+            stats.input_rows += input.rows;
+            stats.input_bytes += input.bytes;
+        }
+
+        for (const auto & output : outputs)
+        {
+            stats.output_rows += output.rows;
+            stats.output_bytes += output.bytes;
+        }
+
+        return stats;
+    }
+
     struct ReadProgressCounters
     {
         uint64_t read_rows = 0;
diff --git a/src/Processors/Port.h b/src/Processors/Port.h
index 06f9059c9c3..e3fb0e3e342 100644
--- a/src/Processors/Port.h
+++ b/src/Processors/Port.h
@@ -254,6 +254,10 @@ protected:
         if (likely(update_info))
             update_info->update();
     }
+
+    /// For processors_profile_log
+    size_t rows = 0;
+    size_t bytes = 0;
 };
 
 /// Invariants:
@@ -300,6 +304,9 @@ public:
                 chunk.dumpStructure());
         }
 
+        rows += data->chunk.getNumRows();
+        bytes += data->chunk.bytes();
+
         return std::move(*data);
     }
 
@@ -422,6 +429,10 @@ public:
 
         std::uintptr_t flags = 0;
         *data = std::move(data_);
+
+        rows += data->chunk.getNumRows();
+        bytes += data->chunk.bytes();
+
         state->push(data, flags);
     }
 
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index f4e3749bd70..f0374d2419b 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -239,15 +239,15 @@ void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const B
 
                 /// Here we create a DAG which fills missing keys and adds `__grouping_set` column
                 auto dag = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
-                ActionsDAG::NodeRawConstPtrs index;
-                index.reserve(output_header.columns() + 1);
+                ActionsDAG::NodeRawConstPtrs outputs;
+                outputs.reserve(output_header.columns() + 1);
 
                 auto grouping_col = ColumnConst::create(ColumnUInt64::create(1, set_counter), 0);
                 const auto * grouping_node = &dag->addColumn(
                     {ColumnPtr(std::move(grouping_col)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
 
                 grouping_node = &dag->materializeNode(*grouping_node);
-                index.push_back(grouping_node);
+                outputs.push_back(grouping_node);
 
                 const auto & missing_columns = grouping_sets_params[set_counter].missing_keys;
 
@@ -264,19 +264,19 @@ void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const B
                         auto column = ColumnConst::create(std::move(column_with_default), 0);
                         const auto * node = &dag->addColumn({ColumnPtr(std::move(column)), col.type, col.name});
                         node = &dag->materializeNode(*node);
-                        index.push_back(node);
+                        outputs.push_back(node);
                     }
                     else
                     {
-                        const auto * column_node = dag->getIndex()[header.getPositionByName(col.name)];
+                        const auto * column_node = dag->getOutputs()[header.getPositionByName(col.name)];
                         if (group_by_use_nulls && column_node->result_type->canBeInsideNullable())
-                            index.push_back(&dag->addFunction(to_nullable_function, { column_node }, col.name));
+                            outputs.push_back(&dag->addFunction(to_nullable_function, { column_node }, col.name));
                         else
-                            index.push_back(column_node);
+                            outputs.push_back(column_node);
                     }
                 }
 
-                dag->getIndex().swap(index);
+                dag->getOutputs().swap(outputs);
                 auto expression = std::make_shared<ExpressionActions>(dag, settings.getActionsSettings());
                 auto transform = std::make_shared<ExpressionTransform>(header, expression);
 
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp
index 94d841ff095..bd079c0b8a9 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.cpp
+++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp
@@ -5,6 +5,8 @@
 #include <IO/Operators.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Common/JSONBuilder.h>
+#include <Interpreters/PreparedSets.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -61,8 +63,6 @@ void CreatingSetStep::describeActions(FormatSettings & settings) const
     settings.out << prefix;
     if (subquery_for_set.set)
         settings.out << "Set: ";
-    // else if (subquery_for_set.join)
-    //     settings.out << "Join: ";
 
     settings.out << description << '\n';
 }
@@ -71,8 +71,6 @@ void CreatingSetStep::describeActions(JSONBuilder::JSONMap & map) const
 {
     if (subquery_for_set.set)
         map.add("Set", description);
-    // else if (subquery_for_set.join)
-    //     map.add("Join", description);
 }
 
 
@@ -124,9 +122,11 @@ void CreatingSetsStep::describePipeline(FormatSettings & settings) const
     IQueryPlanStep::describePipeline(processors, settings);
 }
 
-void addCreatingSetsStep(
-    QueryPlan & query_plan, SubqueriesForSets subqueries_for_sets, const SizeLimits & limits, ContextPtr context)
+void addCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context)
 {
+    if (!prepared_sets || prepared_sets->empty())
+        return;
+
     DataStreams input_streams;
     input_streams.emplace_back(query_plan.getCurrentDataStream());
 
@@ -134,18 +134,19 @@ void addCreatingSetsStep(
     plans.emplace_back(std::make_unique<QueryPlan>(std::move(query_plan)));
     query_plan = QueryPlan();
 
-    for (auto & [description, set] : subqueries_for_sets)
+    for (auto & [description, subquery_for_set] : prepared_sets->detachSubqueries())
     {
-        if (!set.source)
+        if (!subquery_for_set.hasSource())
             continue;
 
-        auto plan = std::move(set.source);
+        auto plan = subquery_for_set.detachSource();
 
+        const Settings & settings = context->getSettingsRef();
         auto creating_set = std::make_unique<CreatingSetStep>(
                 plan->getCurrentDataStream(),
                 description,
-                std::move(set),
-                limits,
+                std::move(subquery_for_set),
+                SizeLimits(settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode),
                 context);
         creating_set->setStepDescription("Create set for subquery");
         plan->addStep(std::move(creating_set));
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.h b/src/Processors/QueryPlan/CreatingSetsStep.h
index 20cdd24c8a9..9c61eb2012c 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.h
+++ b/src/Processors/QueryPlan/CreatingSetsStep.h
@@ -2,8 +2,8 @@
 
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <QueryPipeline/SizeLimits.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/Context_fwd.h>
+#include <Interpreters/PreparedSets.h>
 
 namespace DB
 {
@@ -49,10 +49,6 @@ private:
     Processors processors;
 };
 
-void addCreatingSetsStep(
-    QueryPlan & query_plan,
-    SubqueriesForSets subqueries_for_sets,
-    const SizeLimits & limits,
-    ContextPtr context);
+void addCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context);
 
 }
diff --git a/src/Processors/QueryPlan/CubeStep.cpp b/src/Processors/QueryPlan/CubeStep.cpp
index 52539dec75f..03f952ac782 100644
--- a/src/Processors/QueryPlan/CubeStep.cpp
+++ b/src/Processors/QueryPlan/CubeStep.cpp
@@ -40,17 +40,17 @@ CubeStep::CubeStep(const DataStream & input_stream_, Aggregator::Params params_,
 ProcessorPtr addGroupingSetForTotals(const Block & header, const Names & keys, bool use_nulls, const BuildQueryPipelineSettings & settings, UInt64 grouping_set_number)
 {
     auto dag = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
-    auto & index = dag->getIndex();
+    auto & outputs = dag->getOutputs();
 
     if (use_nulls)
     {
         auto to_nullable = FunctionFactory::instance().get("toNullable", nullptr);
         for (const auto & key : keys)
         {
-            const auto * node = dag->getIndex()[header.getPositionByName(key)];
+            const auto * node = dag->getOutputs()[header.getPositionByName(key)];
             if (node->result_type->canBeInsideNullable())
             {
-                dag->addOrReplaceInIndex(dag->addFunction(to_nullable, { node }, node->result_name));
+                dag->addOrReplaceInOutputs(dag->addFunction(to_nullable, { node }, node->result_name));
             }
         }
     }
@@ -60,7 +60,7 @@ ProcessorPtr addGroupingSetForTotals(const Block & header, const Names & keys, b
         {ColumnPtr(std::move(grouping_col)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
 
     grouping_node = &dag->materializeNode(*grouping_node);
-    index.insert(index.begin(), grouping_node);
+    outputs.insert(outputs.begin(), grouping_node);
 
     auto expression = std::make_shared<ExpressionActions>(dag, settings.getActionsSettings());
     return std::make_shared<ExpressionTransform>(header, expression);
diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp
index aa0e66b4b84..7da2b5252f5 100644
--- a/src/Processors/QueryPlan/DistinctStep.cpp
+++ b/src/Processors/QueryPlan/DistinctStep.cpp
@@ -114,15 +114,19 @@ void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const Buil
 
                 if (distinct_sort_desc.size() < columns.size())
                 {
-                    pipeline.addSimpleTransform(
-                        [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
-                        {
-                            if (stream_type != QueryPipelineBuilder::StreamType::Main)
-                                return nullptr;
+                    if (DistinctSortedTransform::isApplicable(pipeline.getHeader(), distinct_sort_desc, columns))
+                    {
+                        pipeline.addSimpleTransform(
+                            [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+                            {
+                                if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                                    return nullptr;
 
-                            return std::make_shared<DistinctSortedTransform>(
-                                header, distinct_sort_desc, set_size_limits, limit_hint, columns);
-                        });
+                                return std::make_shared<DistinctSortedTransform>(
+                                    header, distinct_sort_desc, set_size_limits, limit_hint, columns);
+                            });
+                        return;
+                    }
                 }
                 else
                 {
@@ -135,8 +139,8 @@ void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const Buil
                             return std::make_shared<DistinctSortedChunkTransform>(
                                 header, set_size_limits, limit_hint, distinct_sort_desc, columns, true);
                         });
+                    return;
                 }
-                return;
             }
         }
     }
diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp
index c9f1e1ce242..dcfa6e5a891 100644
--- a/src/Processors/QueryPlan/ExpressionStep.cpp
+++ b/src/Processors/QueryPlan/ExpressionStep.cpp
@@ -5,13 +5,12 @@
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
 #include <Interpreters/JoinSwitcher.h>
-
 #include <Common/JSONBuilder.h>
 
 namespace DB
 {
 
-static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions)
+static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions, const Block & header, const SortDescription & sort_description)
 {
     return ITransformingStep::Traits
     {
@@ -19,7 +18,7 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions)
             .preserves_distinct_columns = !actions->hasArrayJoin(),
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
-            .preserves_sorting = !actions->hasArrayJoin(),
+            .preserves_sorting = actions->isSortingPreserved(header, sort_description),
         },
         {
             .preserves_number_of_rows = !actions->hasArrayJoin(),
@@ -27,12 +26,12 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions)
     };
 }
 
-ExpressionStep::ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_)
+ExpressionStep::ExpressionStep(const DataStream & input_stream_, const ActionsDAGPtr & actions_dag_)
     : ITransformingStep(
         input_stream_,
         ExpressionTransform::transformHeader(input_stream_.header, *actions_dag_),
-        getTraits(actions_dag_))
-    , actions_dag(std::move(actions_dag_))
+        getTraits(actions_dag_, input_stream_.header, input_stream_.sort_description))
+    , actions_dag(actions_dag_)
 {
     /// Some columns may be removed by expression.
     updateDistinctColumns(output_stream->header, output_stream->distinct_columns);
diff --git a/src/Processors/QueryPlan/ExpressionStep.h b/src/Processors/QueryPlan/ExpressionStep.h
index 96869a9e9ca..3eef14ac129 100644
--- a/src/Processors/QueryPlan/ExpressionStep.h
+++ b/src/Processors/QueryPlan/ExpressionStep.h
@@ -15,7 +15,7 @@ class ExpressionStep : public ITransformingStep
 {
 public:
 
-    explicit ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_);
+    explicit ExpressionStep(const DataStream & input_stream_, const ActionsDAGPtr & actions_dag_);
     String getName() const override { return "Expression"; }
 
     void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index becfe1062fb..4699a7c1908 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -9,15 +9,24 @@
 namespace DB
 {
 
-static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression)
+static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression, const Block & header, const SortDescription & sort_description, bool remove_filter_column, const String & filter_column_name)
 {
+    bool preserves_sorting = expression->isSortingPreserved(header, sort_description, remove_filter_column ? filter_column_name : "");
+    if (remove_filter_column)
+    {
+        preserves_sorting &= find_if(
+                                 begin(sort_description),
+                                 end(sort_description),
+                                 [&](const auto & column_desc) { return column_desc.column_name == filter_column_name; })
+            == sort_description.end();
+    }
     return ITransformingStep::Traits
     {
         {
             .preserves_distinct_columns = !expression->hasArrayJoin(), /// I suppose it actually never happens
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
-            .preserves_sorting = true,
+            .preserves_sorting = preserves_sorting,
         },
         {
             .preserves_number_of_rows = false,
@@ -27,7 +36,7 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression)
 
 FilterStep::FilterStep(
     const DataStream & input_stream_,
-    ActionsDAGPtr actions_dag_,
+    const ActionsDAGPtr & actions_dag_,
     String filter_column_name_,
     bool remove_filter_column_)
     : ITransformingStep(
@@ -37,8 +46,8 @@ FilterStep::FilterStep(
             actions_dag_.get(),
             filter_column_name_,
             remove_filter_column_),
-        getTraits(actions_dag_))
-    , actions_dag(std::move(actions_dag_))
+        getTraits(actions_dag_, input_stream_.header, input_stream_.sort_description, remove_filter_column_, filter_column_name_))
+    , actions_dag(actions_dag_)
     , filter_column_name(std::move(filter_column_name_))
     , remove_filter_column(remove_filter_column_)
 {
@@ -113,5 +122,4 @@ void FilterStep::updateOutputStream()
         getDataStreamTraits());
 }
 
-
 }
diff --git a/src/Processors/QueryPlan/FilterStep.h b/src/Processors/QueryPlan/FilterStep.h
index daea1e13c58..e020cd3c4d3 100644
--- a/src/Processors/QueryPlan/FilterStep.h
+++ b/src/Processors/QueryPlan/FilterStep.h
@@ -13,7 +13,7 @@ class FilterStep : public ITransformingStep
 public:
     FilterStep(
         const DataStream & input_stream_,
-        ActionsDAGPtr actions_dag_,
+        const ActionsDAGPtr & actions_dag_,
         String filter_column_name_,
         bool remove_filter_column_);
 
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index 96b48ed55fd..a66582ff06d 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -34,6 +34,7 @@ public:
     /// How data is sorted.
     enum class SortMode
     {
+        None,
         Chunk, /// Separate chunks are sorted
         Port, /// Data from each port is sorted
         Stream, /// Data is globally sorted
@@ -41,7 +42,7 @@ public:
 
     /// It is not guaranteed that header has columns from sort_description.
     SortDescription sort_description = {};
-    SortMode sort_mode = SortMode::Chunk;
+    SortMode sort_mode = SortMode::None;
 
     /// Things which may be added:
     /// * limit
diff --git a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
index fc9215b9295..6c6c8954ea4 100644
--- a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
+++ b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
@@ -84,7 +84,7 @@ tryAddNewFilterStep(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, con
     const auto & expression = filter->getExpression();
     const auto & filter_column_name = filter->getFilterColumnName();
 
-    const auto * filter_node = expression->tryFindInIndex(filter_column_name);
+    const auto * filter_node = expression->tryFindInOutputs(filter_column_name);
     if (!filter_node && !filter->removesFilterColumn())
         throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Filter column {} was removed from ActionsDAG but it is needed in result. DAG:\n{}",
@@ -102,7 +102,8 @@ tryAddNewFilterStep(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, con
     /// Expression/Filter -> Aggregating -> Filter -> Something
 
     /// New filter column is the first one.
-    String split_filter_column_name = split_filter->getIndex().front()->result_name;
+    String split_filter_column_name = split_filter->getOutputs().front()->result_name;
+
     node.step = std::make_unique<FilterStep>(
         node.children.at(0)->step->getOutputStream(), split_filter, std::move(split_filter_column_name), can_remove_filter);
 
@@ -284,7 +285,7 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
              *
              * New filter column is the first one.
              */
-            const String & split_filter_column_name = split_filter->getIndex().front()->result_name;
+            const String & split_filter_column_name = split_filter->getOutputs().front()->result_name;
             bool can_remove_filter = source_columns.end() == std::find(source_columns.begin(), source_columns.end(), split_filter_column_name);
             const size_t updated_steps = tryAddNewFilterStep(parent_node, nodes, split_filter, can_remove_filter, child_idx);
             if (updated_steps > 0)
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
index e559c23bbaf..7d682c408e5 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
@@ -1,9 +1,10 @@
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <Storages/StorageMerge.h>
 #include <Interpreters/ActionsDAG.h>
-#include <stack>
+#include <deque>
 
 namespace DB::QueryPlanOptimizations
 {
@@ -16,33 +17,41 @@ void optimizePrimaryKeyCondition(QueryPlan::Node & root)
         size_t next_child = 0;
     };
 
-    std::stack<Frame> stack;
-    stack.push({.node = &root});
+    std::deque<Frame> stack;
+    stack.push_back({.node = &root});
 
     while (!stack.empty())
     {
-        auto & frame = stack.top();
+        auto & frame = stack.back();
 
         /// Traverse all children first.
         if (frame.next_child < frame.node->children.size())
         {
-            stack.push({.node = frame.node->children[frame.next_child]});
+            stack.push_back({.node = frame.node->children[frame.next_child]});
 
             ++frame.next_child;
             continue;
         }
 
-        if (auto * filter_step = typeid_cast<FilterStep *>(frame.node->step.get()))
+        auto add_filter = [&](auto & storage)
         {
-            auto * child = frame.node->children.at(0);
-            if (auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(child->step.get()))
-                read_from_merge_tree->addFilter(filter_step->getExpression(), filter_step->getFilterColumnName());
+            for (auto iter=stack.rbegin() + 1; iter!=stack.rend(); ++iter)
+            {
+                if (auto * filter_step = typeid_cast<FilterStep *>(iter->node->step.get()))
+                    storage.addFilter(filter_step->getExpression(), filter_step->getFilterColumnName());
+                else if (typeid_cast<ExpressionStep *>(iter->node->step.get()))
+                    ;
+                else
+                    break;
+            }
+        };
 
-            if (auto * read_from_merge = typeid_cast<ReadFromMerge *>(child->step.get()))
-                read_from_merge->addFilter(filter_step->getExpression(), filter_step->getFilterColumnName());
-        }
+        if (auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(frame.node->step.get()))
+            add_filter(*read_from_merge_tree);
+        else if (auto * read_from_merge = typeid_cast<ReadFromMerge *>(frame.node->step.get()))
+            add_filter(*read_from_merge);
 
-        stack.pop();
+        stack.pop_back();
     }
 }
 
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 024acb7ad8f..c27c0c0d318 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -325,8 +325,22 @@ static void explainStep(
                 elem.dumpNameAndType(settings.out);
             }
         }
-
         settings.out.write('\n');
+
+    }
+
+    if (options.sorting)
+    {
+        if (step.hasOutputStream())
+        {
+            settings.out << prefix << "Sorting (" << step.getOutputStream().sort_mode << ")";
+            if (step.getOutputStream().sort_mode != DataStream::SortMode::None)
+            {
+                settings.out << ": ";
+                dumpSortDescription(step.getOutputStream().sort_description, settings.out);
+            }
+            settings.out.write('\n');
+        }
     }
 
     if (options.actions)
diff --git a/src/Processors/QueryPlan/QueryPlan.h b/src/Processors/QueryPlan/QueryPlan.h
index e9b08c20280..7598bdff63e 100644
--- a/src/Processors/QueryPlan/QueryPlan.h
+++ b/src/Processors/QueryPlan/QueryPlan.h
@@ -71,6 +71,8 @@ public:
         bool actions = false;
         /// Add information about indexes actions.
         bool indexes = false;
+        /// Add information about sorting
+        bool sorting = false;
     };
 
     struct ExplainPipelineOptions
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 44326fc9ab8..d7dae54bb1e 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -73,18 +73,6 @@ static const PrewhereInfoPtr & getPrewhereInfo(const SelectQueryInfo & query_inf
                                  : query_info.prewhere_info;
 }
 
-static int getSortDirection(const SelectQueryInfo & query_info)
-{
-    const InputOrderInfoPtr & order_info = query_info.input_order_info
-        ? query_info.input_order_info
-        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
-
-    if (!order_info)
-        return 1;
-
-    return order_info->direction;
-}
-
 ReadFromMergeTree::ReadFromMergeTree(
     MergeTreeData::DataPartsVector parts_,
     Names real_column_names_,
@@ -143,7 +131,7 @@ ReadFromMergeTree::ReadFromMergeTree(
         SortDescription sort_description;
         const Names & sorting_key_columns = storage_snapshot->getMetadataForQuery()->getSortingKeyColumns();
         const Block & header = output_stream->header;
-        const int sort_direction = getSortDirection(query_info);
+        const int sort_direction = getSortDirection();
         for (const auto & column_name : sorting_key_columns)
         {
             if (std::find_if(header.begin(), header.end(), [&](ColumnWithTypeAndName const & col) { return col.name == column_name; })
@@ -151,8 +139,17 @@ ReadFromMergeTree::ReadFromMergeTree(
                 break;
             sort_description.emplace_back(column_name, sort_direction);
         }
+        if (!sort_description.empty())
+        {
+            auto const & settings = context->getSettingsRef();
+            if ((settings.optimize_read_in_order || settings.optimize_aggregation_in_order) && query_info.getInputOrderInfo())
+                output_stream->sort_mode = DataStream::SortMode::Port;
+            else
+                output_stream->sort_mode = DataStream::SortMode::Chunk;
+        }
+
         output_stream->sort_description = std::move(sort_description);
-        output_stream->sort_mode = DataStream::SortMode::Chunk;
+
     }
 }
 
@@ -835,8 +832,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(Merge
     return selectRangesToRead(
         std::move(parts),
         prewhere_info,
-        added_filter,
-        added_filter_column_name,
+        added_filter_nodes,
         storage_snapshot->metadata,
         storage_snapshot->getMetadataForQuery(),
         query_info,
@@ -852,8 +848,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(Merge
 MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     MergeTreeData::DataPartsVector parts,
     const PrewhereInfoPtr & prewhere_info,
-    const ActionsDAGPtr & added_filter,
-    const std::string & added_filter_column_name,
+    const ActionDAGNodes & added_filter_nodes,
     const StorageMetadataPtr & metadata_snapshot_base,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
@@ -895,21 +890,27 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
         ActionDAGNodes nodes;
         if (prewhere_info)
         {
-            const auto & node = prewhere_info->prewhere_actions->findInIndex(prewhere_info->prewhere_column_name);
-            nodes.nodes.push_back(&node);
+            {
+                const auto & node = prewhere_info->prewhere_actions->findInOutputs(prewhere_info->prewhere_column_name);
+                nodes.nodes.push_back(&node);
+            }
+
+            if (prewhere_info->row_level_filter)
+            {
+                const auto & node = prewhere_info->row_level_filter->findInOutputs(prewhere_info->row_level_column_name);
+                nodes.nodes.push_back(&node);
+            }
         }
 
-        if (added_filter)
-        {
-            const auto & node = added_filter->findInIndex(added_filter_column_name);
-            nodes.nodes.push_back(&node);
-        }
+        for (const auto & node : added_filter_nodes.nodes)
+            nodes.nodes.push_back(node);
 
-        key_condition.emplace(std::move(nodes), query_info.syntax_analyzer_result, query_info.sets, context, primary_key_columns, primary_key.expression);
+        key_condition.emplace(
+            std::move(nodes), query_info.syntax_analyzer_result, query_info.prepared_sets, context, primary_key_columns, primary_key.expression);
     }
     else
     {
-        key_condition.emplace(query_info.query, query_info.syntax_analyzer_result, query_info.sets, context, primary_key_columns, primary_key.expression);
+        key_condition.emplace(query_info, context, primary_key_columns, primary_key.expression);
     }
 
     if (settings.force_primary_key && key_condition->alwaysUnknownOrTrue())
@@ -1005,10 +1006,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     result.total_marks_pk = total_marks_pk;
     result.selected_rows = sum_rows;
 
-    const auto & input_order_info = query_info.input_order_info
-        ? query_info.input_order_info
-        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
-
+    const auto & input_order_info = query_info.getInputOrderInfo();
     if ((settings.optimize_read_in_order || settings.optimize_aggregation_in_order) && input_order_info)
         result.read_type = (input_order_info->direction > 0) ? ReadType::InOrder
                                                              : ReadType::InReverseOrder;
@@ -1096,13 +1094,10 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
                                    column_names_to_read.end());
     }
 
-    const auto & input_order_info = query_info.input_order_info
-        ? query_info.input_order_info
-        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
-
     Pipe pipe;
 
     const auto & settings = context->getSettingsRef();
+    const auto & input_order_info = query_info.getInputOrderInfo();
 
     if (select.final())
     {
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
index 1ba68b3fdb3..43e7eecac5d 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.h
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -2,6 +2,7 @@
 #include <Processors/QueryPlan/ISourceStep.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Storages/MergeTree/RequestResponse.h>
+#include <Storages/SelectQueryInfo.h>
 
 namespace DB
 {
@@ -116,8 +117,14 @@ public:
 
     void addFilter(ActionsDAGPtr expression, std::string column_name)
     {
-        added_filter = std::move(expression);
-        added_filter_column_name = std::move(column_name);
+        added_filter_dags.push_back(expression);
+        added_filter_nodes.nodes.push_back(&expression->findInOutputs(column_name));
+    }
+
+    void addFilterNodes(const ActionDAGNodes & filter_nodes)
+    {
+        for (const auto & node : filter_nodes.nodes)
+            added_filter_nodes.nodes.push_back(node);
     }
 
     StorageID getStorageID() const { return data.getStorageID(); }
@@ -128,8 +135,7 @@ public:
     static MergeTreeDataSelectAnalysisResultPtr selectRangesToRead(
         MergeTreeData::DataPartsVector parts,
         const PrewhereInfoPtr & prewhere_info,
-        const ActionsDAGPtr & added_filter,
-        const std::string & added_filter_column_name,
+        const ActionDAGNodes & added_filter_nodes,
         const StorageMetadataPtr & metadata_snapshot_base,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
@@ -149,6 +155,15 @@ public:
     void setQueryInfoInputOrderInfo(InputOrderInfoPtr order_info);
 
 private:
+    int getSortDirection() const
+    {
+        const InputOrderInfoPtr & order_info = query_info.getInputOrderInfo();
+        if (order_info)
+            return order_info->direction;
+
+        return 1;
+    }
+
     const MergeTreeReaderSettings reader_settings;
 
     MergeTreeData::DataPartsVector prepared_parts;
@@ -160,8 +175,8 @@ private:
     PrewhereInfoPtr prewhere_info;
     ExpressionActionsSettings actions_settings;
 
-    ActionsDAGPtr added_filter;
-    std::string added_filter_column_name;
+    std::vector<ActionsDAGPtr> added_filter_dags;
+    ActionDAGNodes added_filter_nodes;
 
     StorageSnapshotPtr storage_snapshot;
     StorageMetadataPtr metadata_for_reading;
diff --git a/src/Processors/QueryPlan/SortingStep.cpp b/src/Processors/QueryPlan/SortingStep.cpp
index 46588ada225..38e02eebd44 100644
--- a/src/Processors/QueryPlan/SortingStep.cpp
+++ b/src/Processors/QueryPlan/SortingStep.cpp
@@ -30,7 +30,7 @@ static ITransformingStep::Traits getTraits(size_t limit)
 
 SortingStep::SortingStep(
     const DataStream & input_stream,
-    const SortDescription & description_,
+    SortDescription description_,
     size_t max_block_size_,
     UInt64 limit_,
     SizeLimits size_limits_,
@@ -38,17 +38,20 @@ SortingStep::SortingStep(
     double remerge_lowered_memory_bytes_ratio_,
     size_t max_bytes_before_external_sort_,
     VolumePtr tmp_volume_,
-    size_t min_free_disk_space_)
+    size_t min_free_disk_space_,
+    bool optimize_sorting_by_input_stream_properties_)
     : ITransformingStep(input_stream, input_stream.header, getTraits(limit_))
     , type(Type::Full)
-    , result_description(description_)
+    , result_description(std::move(description_))
     , max_block_size(max_block_size_)
     , limit(limit_)
     , size_limits(size_limits_)
     , max_bytes_before_remerge(max_bytes_before_remerge_)
     , remerge_lowered_memory_bytes_ratio(remerge_lowered_memory_bytes_ratio_)
-    , max_bytes_before_external_sort(max_bytes_before_external_sort_), tmp_volume(tmp_volume_)
+    , max_bytes_before_external_sort(max_bytes_before_external_sort_)
+    , tmp_volume(tmp_volume_)
     , min_free_disk_space(min_free_disk_space_)
+    , optimize_sorting_by_input_stream_properties(optimize_sorting_by_input_stream_properties_)
 {
     /// TODO: check input_stream is partially sorted by the same description.
     output_stream->sort_description = result_description;
@@ -111,129 +114,173 @@ void SortingStep::convertToFinishSorting(SortDescription prefix_description_)
     prefix_description = std::move(prefix_description_);
 }
 
-void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+void SortingStep::finishSorting(
+    QueryPipelineBuilder & pipeline, const SortDescription & input_sort_desc, const SortDescription & result_sort_desc, const UInt64 limit_)
 {
-    if (type == Type::FinishSorting)
-    {
-        bool need_finish_sorting = (prefix_description.size() < result_description.size());
-        if (pipeline.getNumStreams() > 1)
+    pipeline.addSimpleTransform(
+        [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
         {
-            UInt64 limit_for_merging = (need_finish_sorting ? 0 : limit);
-            auto transform = std::make_shared<MergingSortedTransform>(
-                    pipeline.getHeader(),
-                    pipeline.getNumStreams(),
-                    prefix_description,
-                    max_block_size,
-                    SortingQueueStrategy::Batch,
-                    limit_for_merging);
+            if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                return nullptr;
 
-            pipeline.addTransform(std::move(transform));
-        }
+            return std::make_shared<PartialSortingTransform>(header, result_sort_desc, limit_);
+        });
 
-        if (need_finish_sorting)
+    bool increase_sort_description_compile_attempts = true;
+
+    /// NOTE limits are not applied to the size of temporary sets in FinishSortingTransform
+    pipeline.addSimpleTransform(
+        [&, increase_sort_description_compile_attempts](const Block & header) mutable -> ProcessorPtr
         {
-            pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
-            {
-                if (stream_type != QueryPipelineBuilder::StreamType::Main)
-                    return nullptr;
-
-                return std::make_shared<PartialSortingTransform>(header, result_description, limit);
-            });
-
-            bool increase_sort_description_compile_attempts = true;
-
-            /// NOTE limits are not applied to the size of temporary sets in FinishSortingTransform
-            pipeline.addSimpleTransform([&, increase_sort_description_compile_attempts](const Block & header) mutable -> ProcessorPtr
-            {
-                /** For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan
+            /** For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan
                   * To property support min_count_to_compile_sort_description.
                   */
-                bool increase_sort_description_compile_attempts_current = increase_sort_description_compile_attempts;
+            bool increase_sort_description_compile_attempts_current = increase_sort_description_compile_attempts;
 
-                if (increase_sort_description_compile_attempts)
-                    increase_sort_description_compile_attempts = false;
+            if (increase_sort_description_compile_attempts)
+                increase_sort_description_compile_attempts = false;
 
-                return std::make_shared<FinishSortingTransform>(
-                    header, prefix_description, result_description, max_block_size, limit, increase_sort_description_compile_attempts_current);
-            });
-        }
-    }
-    else if (type == Type::Full)
+            return std::make_shared<FinishSortingTransform>(
+                header, input_sort_desc, result_sort_desc, max_block_size, limit_, increase_sort_description_compile_attempts_current);
+        });
+}
+
+void SortingStep::mergingSorted(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, const UInt64 limit_)
+{
+    /// If there are several streams, then we merge them into one
+    if (pipeline.getNumStreams() > 1)
     {
-        pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
-        {
-            if (stream_type != QueryPipelineBuilder::StreamType::Main)
-                return nullptr;
+        auto transform = std::make_shared<MergingSortedTransform>(
+            pipeline.getHeader(),
+            pipeline.getNumStreams(),
+            result_sort_desc,
+            max_block_size,
+            SortingQueueStrategy::Batch,
+            limit_);
 
-            return std::make_shared<PartialSortingTransform>(header, result_description, limit);
-        });
+        pipeline.addTransform(std::move(transform));
+    }
+}
 
-        StreamLocalLimits limits;
-        limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
-        limits.size_limits = size_limits;
+void SortingStep::mergeSorting(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, UInt64 limit_)
+{
+    bool increase_sort_description_compile_attempts = true;
 
-        pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
-        {
-            if (stream_type != QueryPipelineBuilder::StreamType::Main)
-                return nullptr;
-
-            auto transform = std::make_shared<LimitsCheckingTransform>(header, limits);
-            return transform;
-        });
-
-        bool increase_sort_description_compile_attempts = true;
-
-        pipeline.addSimpleTransform([&, increase_sort_description_compile_attempts](const Block & header, QueryPipelineBuilder::StreamType stream_type) mutable -> ProcessorPtr
+    pipeline.addSimpleTransform(
+        [&, increase_sort_description_compile_attempts](
+            const Block & header, QueryPipelineBuilder::StreamType stream_type) mutable -> ProcessorPtr
         {
             if (stream_type == QueryPipelineBuilder::StreamType::Totals)
                 return nullptr;
 
-            /** For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan.
-              * To property support min_count_to_compile_sort_description.
-              */
+            // For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan.
+            // To property support min_count_to_compile_sort_description.
             bool increase_sort_description_compile_attempts_current = increase_sort_description_compile_attempts;
 
             if (increase_sort_description_compile_attempts)
                 increase_sort_description_compile_attempts = false;
 
             return std::make_shared<MergeSortingTransform>(
-                    header, result_description, max_block_size, limit, increase_sort_description_compile_attempts_current,
-                    max_bytes_before_remerge / pipeline.getNumStreams(),
-                    remerge_lowered_memory_bytes_ratio,
-                    max_bytes_before_external_sort,
-                    tmp_volume,
-                    min_free_disk_space);
+                header,
+                result_sort_desc,
+                max_block_size,
+                limit_,
+                increase_sort_description_compile_attempts_current,
+                max_bytes_before_remerge / pipeline.getNumStreams(),
+                remerge_lowered_memory_bytes_ratio,
+                max_bytes_before_external_sort,
+                tmp_volume,
+                min_free_disk_space);
         });
+}
 
-        /// If there are several streams, then we merge them into one
-        if (pipeline.getNumStreams() > 1)
+void SortingStep::fullSort(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, const UInt64 limit_, const bool skip_partial_sort)
+{
+    if (!skip_partial_sort || limit_)
+    {
+        pipeline.addSimpleTransform(
+            [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+            {
+                if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                    return nullptr;
+
+                return std::make_shared<PartialSortingTransform>(header, result_sort_desc, limit_);
+            });
+
+        StreamLocalLimits limits;
+        limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
+        limits.size_limits = size_limits;
+
+        pipeline.addSimpleTransform(
+            [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+            {
+                if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                    return nullptr;
+
+                return std::make_shared<LimitsCheckingTransform>(header, limits);
+            });
+    }
+
+    mergeSorting(pipeline, result_sort_desc, limit_);
+
+    /// If there are several streams, then we merge them into one
+    if (pipeline.getNumStreams() > 1)
+    {
+        auto transform = std::make_shared<MergingSortedTransform>(
+            pipeline.getHeader(), pipeline.getNumStreams(), result_sort_desc, max_block_size, SortingQueueStrategy::Batch, limit_);
+
+        pipeline.addTransform(std::move(transform));
+    }
+}
+
+void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    /// We consider that a caller has more information what type of sorting to apply.
+    /// The type depends on constructor used to create sorting step.
+    /// So we'll try to infer sorting to use only in case of Full sorting
+
+    if (type == Type::MergingSorted)
+    {
+        mergingSorted(pipeline, result_description, limit);
+        return;
+    }
+
+    if (type == Type::FinishSorting)
+    {
+        bool need_finish_sorting = (prefix_description.size() < result_description.size());
+        mergingSorted(pipeline, prefix_description, (need_finish_sorting ? 0 : limit));
+        if (need_finish_sorting)
         {
-            auto transform = std::make_shared<MergingSortedTransform>(
-                    pipeline.getHeader(),
-                    pipeline.getNumStreams(),
-                    result_description,
-                    max_block_size,
-                    SortingQueueStrategy::Batch,
-                    limit);
+            finishSorting(pipeline, prefix_description, result_description, limit);
+        }
+        return;
+    }
 
-            pipeline.addTransform(std::move(transform));
+    const auto input_sort_mode = input_streams.front().sort_mode;
+    const SortDescription & input_sort_desc = input_streams.front().sort_description;
+    if (optimize_sorting_by_input_stream_properties)
+    {
+        /// skip sorting if stream is already sorted
+        if (input_sort_mode == DataStream::SortMode::Stream && input_sort_desc.hasPrefix(result_description))
+            return;
+
+        /// merge sorted
+        if (input_sort_mode == DataStream::SortMode::Port && input_sort_desc.hasPrefix(result_description))
+        {
+            mergingSorted(pipeline, result_description, limit);
+            return;
+        }
+
+        /// if chunks already sorted according to result_sort_desc, then we can skip chunk sorting
+        if (input_sort_mode == DataStream::SortMode::Chunk && input_sort_desc.hasPrefix(result_description))
+        {
+            const bool skip_partial_sort = true;
+            fullSort(pipeline, result_description, limit, skip_partial_sort);
+            return;
         }
     }
-    else if (type == Type::MergingSorted)
-    {        /// If there are several streams, then we merge them into one
-        if (pipeline.getNumStreams() > 1)
-        {
-            auto transform = std::make_shared<MergingSortedTransform>(
-                    pipeline.getHeader(),
-                    pipeline.getNumStreams(),
-                    result_description,
-                    max_block_size,
-                    SortingQueueStrategy::Batch,
-                    limit);
 
-            pipeline.addTransform(std::move(transform));
-        }
-    }
+    fullSort(pipeline, result_description, limit);
 }
 
 void SortingStep::describeActions(FormatSettings & settings) const
diff --git a/src/Processors/QueryPlan/SortingStep.h b/src/Processors/QueryPlan/SortingStep.h
index ce78bb863bf..5ba0ba7ec63 100644
--- a/src/Processors/QueryPlan/SortingStep.h
+++ b/src/Processors/QueryPlan/SortingStep.h
@@ -14,7 +14,7 @@ public:
     /// Full
     SortingStep(
         const DataStream & input_stream,
-        const SortDescription & description_,
+        SortDescription description_,
         size_t max_block_size_,
         UInt64 limit_,
         SizeLimits size_limits_,
@@ -22,7 +22,8 @@ public:
         double remerge_lowered_memory_bytes_ratio_,
         size_t max_bytes_before_external_sort_,
         VolumePtr tmp_volume_,
-        size_t min_free_disk_space_);
+        size_t min_free_disk_space_,
+        bool optimize_sorting_by_input_stream_properties_);
 
     /// FinishSorting
     SortingStep(
@@ -49,13 +50,23 @@ public:
     /// Add limit or change it to lower value.
     void updateLimit(size_t limit_);
 
-    SortDescription getSortDescription() const { return result_description; }
+    const SortDescription & getSortDescription() const { return result_description; }
 
     void convertToFinishSorting(SortDescription prefix_description);
 
 private:
     void updateOutputStream() override;
 
+    void mergingSorted(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, UInt64 limit_);
+    void mergeSorting(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, UInt64 limit_);
+    void finishSorting(
+        QueryPipelineBuilder & pipeline, const SortDescription & input_sort_desc, const SortDescription & result_sort_desc, UInt64 limit_);
+    void fullSort(
+        QueryPipelineBuilder & pipeline,
+        const SortDescription & result_sort_desc,
+        UInt64 limit_,
+        bool skip_partial_sort = false);
+
     enum class Type
     {
         Full,
@@ -66,8 +77,8 @@ private:
     Type type;
 
     SortDescription prefix_description;
-    SortDescription result_description;
-    size_t max_block_size;
+    const SortDescription result_description;
+    const size_t max_block_size;
     UInt64 limit;
     SizeLimits size_limits;
 
@@ -76,6 +87,7 @@ private:
     size_t max_bytes_before_external_sort = 0;
     VolumePtr tmp_volume;
     size_t min_free_disk_space = 0;
+    const bool optimize_sorting_by_input_stream_properties = false;
 };
 
 }
diff --git a/src/Processors/Transforms/CreatingSetsTransform.h b/src/Processors/Transforms/CreatingSetsTransform.h
index 48a32ea8663..ca59fb9e220 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.h
+++ b/src/Processors/Transforms/CreatingSetsTransform.h
@@ -2,10 +2,10 @@
 
 #include <QueryPipeline/SizeLimits.h>
 #include <Interpreters/Context_fwd.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Processors/IAccumulatingTransform.h>
 #include <QueryPipeline/Chain.h>
 #include <QueryPipeline/QueryPipeline.h>
+#include <Interpreters/PreparedSets.h>
 #include <Common/Stopwatch.h>
 
 #include <Poco/Logger.h>
@@ -50,7 +50,6 @@ private:
     Stopwatch watch;
 
     bool done_with_set = true;
-    //bool done_with_join = true;
     bool done_with_table = true;
 
     SizeLimits network_transfer_limits;
diff --git a/src/Processors/Transforms/DistinctSortedTransform.cpp b/src/Processors/Transforms/DistinctSortedTransform.cpp
index a5f058aaa8e..4c6ca03950c 100644
--- a/src/Processors/Transforms/DistinctSortedTransform.cpp
+++ b/src/Processors/Transforms/DistinctSortedTransform.cpp
@@ -6,49 +6,41 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int SET_SIZE_LIMIT_EXCEEDED;
+    extern const int LOGICAL_ERROR;
 }
 
-static void handleAllColumnsConst(Chunk & chunk)
+/// calculate column positions to use during chunk transformation
+static void calcColumnPositionsInHeader(const Block& header, const Names & column_names, ColumnNumbers& column_positions, ColumnNumbers& const_column_positions)
 {
-    const size_t rows = chunk.getNumRows();
-    IColumn::Filter filter(rows);
-
-    Chunk res_chunk;
-    std::fill(filter.begin(), filter.end(), 0);
-    filter[0] = 1;
-    for (const auto & column : chunk.getColumns())
-        res_chunk.addColumn(column->filter(filter, -1));
-
-    chunk = std::move(res_chunk);
-}
-
-DistinctSortedTransform::DistinctSortedTransform(
-    Block header_, SortDescription sort_description, const SizeLimits & set_size_limits_, UInt64 limit_hint_, const Names & columns)
-    : ISimpleTransform(header_, header_, true)
-    , header(std::move(header_))
-    , description(std::move(sort_description))
-    , column_names(columns)
-    , limit_hint(limit_hint_)
-    , set_size_limits(set_size_limits_)
-{
-    /// pre-calculate column positions to use during chunk transformation
     const size_t num_columns = column_names.empty() ? header.columns() : column_names.size();
+    column_positions.clear();
     column_positions.reserve(num_columns);
+    const_column_positions.clear();
+    const_column_positions.reserve(num_columns);
     for (size_t i = 0; i < num_columns; ++i)
     {
         auto pos = column_names.empty() ? i : header.getPositionByName(column_names[i]);
         const auto & column = header.getByPosition(pos).column;
-        if (column && !isColumnConst(*column))
+        if (column)
         {
-            column_positions.emplace_back(pos);
-            all_columns_const = false;
+            if (isColumnConst(*column))
+                const_column_positions.emplace_back(pos);
+            else
+                column_positions.emplace_back(pos);
         }
     }
-    column_ptrs.reserve(column_positions.size());
+}
 
-    /// pre-calculate DISTINCT column positions which form sort prefix of sort description
-    sort_prefix_positions.reserve(description.size());
-    for (const auto & column_sort_descr : description)
+/// calculate DISTINCT column positions which form sort prefix of sort description
+static void calcSortPrefixPositionsInHeader(
+    const Block & header,
+    const SortDescription & sort_description,
+    const ColumnNumbers & column_positions,
+    const ColumnNumbers & const_column_positions,
+    ColumnNumbers & sort_prefix_positions)
+{
+    sort_prefix_positions.reserve(sort_description.size());
+    for (const auto & column_sort_descr : sort_description)
     {
         /// check if there is such column in header
         if (!header.has(column_sort_descr.column_name))
@@ -57,10 +49,62 @@ DistinctSortedTransform::DistinctSortedTransform(
         /// check if sorted column position matches any DISTINCT column
         const auto pos = header.getPositionByName(column_sort_descr.column_name);
         if (std::find(begin(column_positions), end(column_positions), pos) == column_positions.end())
+        {
+            /// if sorted column found in const columns then we can skip it
+            if (std::find(begin(const_column_positions), end(const_column_positions), pos) != const_column_positions.end())
+                continue;
+
             break;
+        }
 
         sort_prefix_positions.emplace_back(pos);
     }
+}
+
+///  check if distinct sorted is applicable for provided header, sort description and distinct columns
+bool DistinctSortedTransform::isApplicable(const Block & header, const SortDescription & sort_description, const Names & column_names)
+{
+    if (sort_description.empty())
+        return false;
+
+    ColumnNumbers column_positions;
+    ColumnNumbers const_column_positions;
+    calcColumnPositionsInHeader(header, column_names, column_positions, const_column_positions);
+    if (column_positions.empty())
+        return false;
+
+    /// check if sorted columns matches DISTINCT columns
+    ColumnNumbers sort_prefix_positions;
+    calcSortPrefixPositionsInHeader(header, sort_description, column_positions, const_column_positions, sort_prefix_positions);
+    return !sort_prefix_positions.empty();
+}
+
+DistinctSortedTransform::DistinctSortedTransform(
+    const Block & header,
+    const SortDescription & sort_description,
+    const SizeLimits & set_size_limits_,
+    const UInt64 limit_hint_,
+    const Names & column_names)
+    : ISimpleTransform(header, header, true)
+    , limit_hint(limit_hint_)
+    , set_size_limits(set_size_limits_)
+{
+    if (sort_description.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DistinctSortedTransform: sort description can't be empty");
+
+    /// pre-calculate column positions to use during chunk transformation
+    ColumnNumbers const_column_positions;
+    calcColumnPositionsInHeader(header, column_names, column_positions, const_column_positions);
+    if (column_positions.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DistinctSortedTransform: all columns can't be const. DistinctTransform should be used instead");
+
+    /// pre-calculate DISTINCT column positions which form sort prefix of sort description
+    calcSortPrefixPositionsInHeader(header, sort_description, column_positions, const_column_positions, sort_prefix_positions);
+    if (sort_prefix_positions.empty())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR, "DistinctSortedTransform: columns have to form a sort prefix for provided sort description");
+
+    column_ptrs.reserve(column_positions.size());
     sort_prefix_columns.reserve(sort_prefix_positions.size());
 }
 
@@ -69,14 +113,6 @@ void DistinctSortedTransform::transform(Chunk & chunk)
     if (unlikely(!chunk.hasRows()))
         return;
 
-    /// special case - all column constant
-    if (unlikely(all_columns_const))
-    {
-        handleAllColumnsConst(chunk);
-        stopReading();
-        return;
-    }
-
     /// get DISTINCT columns from chunk
     column_ptrs.clear();
     for (const auto pos : column_positions)
@@ -136,7 +172,7 @@ void DistinctSortedTransform::transform(Chunk & chunk)
     prev_chunk.chunk = std::move(chunk);
     prev_chunk.clearing_hint_columns = std::move(sort_prefix_columns);
 
-    size_t all_columns = prev_chunk.chunk.getNumColumns();
+    const size_t all_columns = prev_chunk.chunk.getNumColumns();
     Chunk res_chunk;
     for (size_t i = 0; i < all_columns; ++i)
         res_chunk.addColumn(prev_chunk.chunk.getColumns().at(i)->filter(filter, -1));
@@ -144,38 +180,40 @@ void DistinctSortedTransform::transform(Chunk & chunk)
     chunk = std::move(res_chunk);
 }
 
-
 template <typename Method>
 bool DistinctSortedTransform::buildFilter(
     Method & method,
     const ColumnRawPtrs & columns,
     const ColumnRawPtrs & clearing_hint_columns,
     IColumn::Filter & filter,
-    size_t rows,
+    const size_t rows,
     ClearableSetVariants & variants) const
 {
     typename Method::State state(columns, key_sizes, nullptr);
 
     /// Compare last row of previous block and first row of current block,
-    /// If rows not equal, we can clear HashSet,
-    /// If clearing_hint_columns is empty, we CAN'T clear HashSet.
-    if (!clearing_hint_columns.empty() && !prev_chunk.clearing_hint_columns.empty()
-        && !rowsEqual(clearing_hint_columns, 0, prev_chunk.clearing_hint_columns, prev_chunk.chunk.getNumRows() - 1))
+    /// If rows are NOT equal, we can clear HashSet
+    if (!prev_chunk.clearing_hint_columns.empty()) /// it's not first chunk in stream
     {
-        method.data.clear();
+        if (!rowsEqual(clearing_hint_columns, 0, prev_chunk.clearing_hint_columns, prev_chunk.chunk.getNumRows() - 1))
+            method.data.clear();
     }
 
     bool has_new_data = false;
-    for (size_t i = 0; i < rows; ++i)
+    { /// handle 0-indexed row to avoid index check in loop below
+        const auto emplace_result = state.emplaceKey(method.data, 0, variants.string_pool);
+        if (emplace_result.isInserted())
+            has_new_data = true;
+        filter[0] = emplace_result.isInserted();
+    }
+    for (size_t i = 1; i < rows; ++i)
     {
         /// Compare i-th row and i-1-th row,
-        /// If rows are not equal, we can clear HashSet,
-        /// If clearing_hint_columns is empty, we CAN'T clear HashSet.
-        if (i > 0 && !clearing_hint_columns.empty() && !rowsEqual(clearing_hint_columns, i, clearing_hint_columns, i - 1))
+        /// If rows are not equal, we can clear HashSet
+        if (!rowsEqual(clearing_hint_columns, i, clearing_hint_columns, i - 1))
             method.data.clear();
 
-        auto emplace_result = state.emplaceKey(method.data, i, variants.string_pool);
-
+        const auto emplace_result = state.emplaceKey(method.data, i, variants.string_pool);
         if (emplace_result.isInserted())
             has_new_data = true;
 
@@ -192,7 +230,7 @@ bool DistinctSortedTransform::rowsEqual(const ColumnRawPtrs & lhs, size_t n, con
     {
         const auto & lhs_column = *lhs[column_index];
         const auto & rhs_column = *rhs[column_index];
-        if (lhs_column.compareAt(n, m, rhs_column, 0) != 0) /// not equal
+        if (lhs_column.compareAt(n, m, rhs_column, -1) != 0) /// not equal
             return false;
     }
     return true;
diff --git a/src/Processors/Transforms/DistinctSortedTransform.h b/src/Processors/Transforms/DistinctSortedTransform.h
index 440754ce6a4..86c5c968e4b 100644
--- a/src/Processors/Transforms/DistinctSortedTransform.h
+++ b/src/Processors/Transforms/DistinctSortedTransform.h
@@ -12,6 +12,9 @@ namespace DB
 /** This class is intended for implementation of SELECT DISTINCT clause and
   * leaves only unique rows in the stream.
   *
+  * DistinctSortedTransform::isApplicable() have to be used to check if DistinctSortedTransform can be constructed with particular arguments,
+  * otherwise the constructor can throw LOGICAL_ERROR exception
+  *
   * Implementation for case, when input stream has rows for same DISTINCT key or at least its prefix,
   *  grouped together (going consecutively).
   *
@@ -24,10 +27,16 @@ class DistinctSortedTransform : public ISimpleTransform
 public:
     /// Empty columns_ means all columns.
     DistinctSortedTransform(
-        Block header_, SortDescription sort_description, const SizeLimits & set_size_limits_, UInt64 limit_hint_, const Names & columns);
+        const Block & header,
+        const SortDescription & sort_description,
+        const SizeLimits & set_size_limits_,
+        UInt64 limit_hint_,
+        const Names & column_names);
 
     String getName() const override { return "DistinctSortedTransform"; }
 
+    static bool isApplicable(const Block & header, const SortDescription & sort_description, const Names & column_names);
+
 protected:
     void transform(Chunk & chunk) override;
 
@@ -44,9 +53,6 @@ private:
         size_t rows,
         ClearableSetVariants & variants) const;
 
-    Block header;
-    SortDescription description;
-
     struct PreviousChunk
     {
         Chunk chunk;
@@ -54,11 +60,10 @@ private:
     };
     PreviousChunk prev_chunk;
 
-    Names column_names;
     ColumnNumbers column_positions;      /// DISTINCT columns positions in header
     ColumnNumbers sort_prefix_positions; /// DISTINCT columns positions which form sort prefix of sort description
     ColumnRawPtrs column_ptrs;           /// DISTINCT columns from chunk
-    ColumnRawPtrs sort_prefix_columns; /// DISTINCT columns from chunk which form sort prefix of sort description
+    ColumnRawPtrs sort_prefix_columns;   /// DISTINCT columns from chunk which form sort prefix of sort description
 
     ClearableSetVariants data;
     Sizes key_sizes;
@@ -66,7 +71,6 @@ private:
 
     /// Restrictions on the maximum size of the output data.
     SizeLimits set_size_limits;
-    bool all_columns_const = true;
 };
 
 }
diff --git a/src/Processors/Transforms/IntersectOrExceptTransform.cpp b/src/Processors/Transforms/IntersectOrExceptTransform.cpp
index 3e39123ae4b..1ac82e99cf2 100644
--- a/src/Processors/Transforms/IntersectOrExceptTransform.cpp
+++ b/src/Processors/Transforms/IntersectOrExceptTransform.cpp
@@ -128,7 +128,11 @@ void IntersectOrExceptTransform::accumulate(Chunk chunk)
     column_ptrs.reserve(key_columns_pos.size());
 
     for (auto pos : key_columns_pos)
+    {
+        /// Hash methods expect non-const column
+        columns[pos] = columns[pos]->convertToFullColumnIfConst();
         column_ptrs.emplace_back(columns[pos].get());
+    }
 
     if (!data)
         data.emplace();
@@ -160,8 +164,11 @@ void IntersectOrExceptTransform::filter(Chunk & chunk)
     column_ptrs.reserve(key_columns_pos.size());
 
     for (auto pos : key_columns_pos)
+    {
+        /// Hash methods expect non-const column
+        columns[pos] = columns[pos]->convertToFullColumnIfConst();
         column_ptrs.emplace_back(columns[pos].get());
-
+    }
     if (!data)
         data.emplace();
 
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index 64343946ff4..fed28a11ad5 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -1,6 +1,6 @@
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Interpreters/ExpressionAnalyzer.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 #include <Common/logger_useful.h>
 
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 5e0d896599c..4155ab7c7f1 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -968,9 +968,6 @@ void WindowTransform::updateAggregationState()
             }
         }
     }
-
-    prev_frame_start = frame_start;
-    prev_frame_end = frame_end;
 }
 
 void WindowTransform::writeOutCurrentRow()
@@ -1212,6 +1209,9 @@ void WindowTransform::appendChunk(Chunk & chunk)
                 return;
             }
 
+            prev_frame_start = frame_start;
+            prev_frame_end = frame_end;
+
             // Move to the next row. The frame will have to be recalculated.
             // The peer group start is updated at the beginning of the loop,
             // because current_row might now be past-the-end.
@@ -1617,16 +1617,12 @@ struct StatefulWindowFunction : public WindowFunction
 
 struct ExponentialTimeDecayedSumState
 {
-    RowNumber previous_frame_start;
-    RowNumber previous_frame_end;
     Float64 previous_time;
     Float64 previous_sum;
 };
 
 struct ExponentialTimeDecayedAvgState
 {
-    RowNumber previous_frame_start;
-    RowNumber previous_frame_end;
     Float64 previous_time;
     Float64 previous_sum;
     Float64 previous_count;
@@ -1685,40 +1681,43 @@ struct WindowFunctionExponentialTimeDecayedSum final : public StatefulWindowFunc
         auto & state = getState(workspace);
 
         Float64 result = 0;
-        Float64 curr_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, transform->current_row);
 
-        if (state.previous_frame_start <= transform->frame_start
-            && transform->frame_start < state.previous_frame_end
-            && state.previous_frame_end <= transform->frame_end)
+        if (transform->frame_start < transform->frame_end)
         {
-            for (RowNumber i = state.previous_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result -= std::exp((prev_t - curr_t) / decay_length) * prev_val;
-            }
-            result += std::exp((state.previous_time - curr_t) / decay_length) * state.previous_sum;
-            for (RowNumber i = state.previous_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result += std::exp((prev_t - curr_t) / decay_length) * prev_val;
-            }
-        }
-        else
-        {
-            for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result += std::exp((prev_t - curr_t) / decay_length) * prev_val;
-            }
-        }
+            RowNumber frame_back = transform->prevRowNumber(transform->frame_end);
+            Float64 back_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, frame_back);
 
-        state.previous_sum = result;
-        state.previous_time = curr_t;
-        state.previous_frame_start = transform->frame_start;
-        state.previous_frame_end = transform->frame_end;
+            if (transform->prev_frame_start <= transform->frame_start
+                && transform->frame_start < transform->prev_frame_end
+                && transform->prev_frame_end <= transform->frame_end)
+            {
+                for (RowNumber i = transform->prev_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result -= std::exp((prev_t - back_t) / decay_length) * prev_val;
+                }
+                result += std::exp((state.previous_time - back_t) / decay_length) * state.previous_sum;
+                for (RowNumber i = transform->prev_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result += std::exp((prev_t - back_t) / decay_length) * prev_val;
+                }
+            }
+            else
+            {
+                for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result += std::exp((prev_t - back_t) / decay_length) * prev_val;
+                }
+            }
+
+            state.previous_sum = result;
+            state.previous_time = back_t;
+        }
 
         WindowFunctionHelpers::setValueToOutputColumn<Float64>(transform, function_index, result);
     }
@@ -1776,18 +1775,24 @@ struct WindowFunctionExponentialTimeDecayedMax final : public WindowFunction
     void windowInsertResultInto(const WindowTransform * transform,
         size_t function_index) override
     {
-        Float64 result = std::numeric_limits<Float64>::lowest();
-        Float64 curr_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, transform->current_row);
+        Float64 result = std::numeric_limits<Float64>::quiet_NaN();
 
-        for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
+        if (transform->frame_start < transform->frame_end)
         {
-            Float64 value = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-            Float64 t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+            result = std::numeric_limits<Float64>::lowest();
+            RowNumber frame_back = transform->prevRowNumber(transform->frame_end);
+            Float64 back_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, frame_back);
 
-            /// Avoiding extra calls to `exp` and multiplications.
-            if (value > result || t > curr_t || result < 0)
+            for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
             {
-                result = std::max(std::exp((t - curr_t) / decay_length) * value, result);
+                Float64 value = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                Float64 t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+
+                /// Avoiding extra calls to `exp` and multiplications.
+                if (value > result || t > back_t || result < 0)
+                {
+                    result = std::max(std::exp((t - back_t) / decay_length) * value, result);
+                }
             }
         }
 
@@ -1842,37 +1847,40 @@ struct WindowFunctionExponentialTimeDecayedCount final : public StatefulWindowFu
         auto & state = getState(workspace);
 
         Float64 result = 0;
-        Float64 curr_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, transform->current_row);
 
-        if (state.previous_frame_start <= transform->frame_start
-            && transform->frame_start < state.previous_frame_end
-            && state.previous_frame_end <= transform->frame_end)
+        if (transform->frame_start < transform->frame_end)
         {
-            for (RowNumber i = state.previous_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
-            {
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result -= std::exp((prev_t - curr_t) / decay_length);
-            }
-            result += std::exp((state.previous_time - curr_t) / decay_length) * state.previous_sum;
-            for (RowNumber i = state.previous_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result += std::exp((prev_t - curr_t) / decay_length);
-            }
-        }
-        else
-        {
-            for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result += std::exp((prev_t - curr_t) / decay_length);
-            }
-        }
+            RowNumber frame_back = transform->prevRowNumber(transform->frame_end);
+            Float64 back_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, frame_back);
 
-        state.previous_sum = result;
-        state.previous_time = curr_t;
-        state.previous_frame_start = transform->frame_start;
-        state.previous_frame_end = transform->frame_end;
+            if (transform->prev_frame_start <= transform->frame_start
+                && transform->frame_start < transform->prev_frame_end
+                && transform->prev_frame_end <= transform->frame_end)
+            {
+                for (RowNumber i = transform->prev_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result -= std::exp((prev_t - back_t) / decay_length);
+                }
+                result += std::exp((state.previous_time - back_t) / decay_length) * state.previous_sum;
+                for (RowNumber i = transform->prev_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result += std::exp((prev_t - back_t) / decay_length);
+                }
+            }
+            else
+            {
+                for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result += std::exp((prev_t - back_t) / decay_length);
+                }
+            }
+
+            state.previous_sum = result;
+            state.previous_time = back_t;
+        }
 
         WindowFunctionHelpers::setValueToOutputColumn<Float64>(transform, function_index, result);
     }
@@ -1935,55 +1943,61 @@ struct WindowFunctionExponentialTimeDecayedAvg final : public StatefulWindowFunc
 
         Float64 count = 0;
         Float64 sum = 0;
-        Float64 curr_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, transform->current_row);
+        Float64 result = std::numeric_limits<Float64>::quiet_NaN();
 
-        if (state.previous_frame_start <= transform->frame_start
-            && transform->frame_start < state.previous_frame_end
-            && state.previous_frame_end <= transform->frame_end)
+        if (transform->frame_start < transform->frame_end)
         {
-            for (RowNumber i = state.previous_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
+            RowNumber frame_back = transform->prevRowNumber(transform->frame_end);
+            Float64 back_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, frame_back);
+
+            if (transform->prev_frame_start <= transform->frame_start
+                && transform->frame_start < transform->prev_frame_end
+                && transform->prev_frame_end <= transform->frame_end)
             {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                Float64 decay = std::exp((prev_t - curr_t) / decay_length);
-                sum -= decay * prev_val;
-                count -= decay;
+                for (RowNumber i = transform->prev_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    Float64 decay = std::exp((prev_t - back_t) / decay_length);
+                    sum -= decay * prev_val;
+                    count -= decay;
+                }
+
+                {
+                    Float64 decay = std::exp((state.previous_time - back_t) / decay_length);
+                    sum += decay * state.previous_sum;
+                    count += decay * state.previous_count;
+                }
+
+                for (RowNumber i = transform->prev_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    Float64 decay = std::exp((prev_t - back_t) / decay_length);
+                    sum += decay * prev_val;
+                    count += decay;
+                }
+            }
+            else
+            {
+                for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    Float64 decay = std::exp((prev_t - back_t) / decay_length);
+                    sum += decay * prev_val;
+                    count += decay;
+                }
             }
 
-            {
-                Float64 decay = std::exp((state.previous_time - curr_t) / decay_length);
-                sum += decay * state.previous_sum;
-                count += decay * state.previous_count;
-            }
+            state.previous_sum = sum;
+            state.previous_count = count;
+            state.previous_time = back_t;
 
-            for (RowNumber i = state.previous_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                Float64 decay = std::exp((prev_t - curr_t) / decay_length);
-                sum += decay * prev_val;
-                count += decay;
-            }
-        }
-        else
-        {
-            for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                Float64 decay = std::exp((prev_t - curr_t) / decay_length);
-                sum += decay * prev_val;
-                count += decay;
-            }
+            result = sum/count;
         }
 
-        state.previous_sum = sum;
-        state.previous_count = count;
-        state.previous_time = curr_t;
-        state.previous_frame_start = transform->frame_start;
-        state.previous_frame_end = transform->frame_end;
-
-        WindowFunctionHelpers::setValueToOutputColumn<Float64>(transform, function_index, sum/count);
+        WindowFunctionHelpers::setValueToOutputColumn<Float64>(transform, function_index, result);
     }
 
     private:
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index e6db8402c5f..424466bca8a 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -198,8 +198,19 @@ public:
         ++x.block;
     }
 
+    RowNumber nextRowNumber(const RowNumber & x) const
+    {
+        RowNumber result = x;
+        advanceRowNumber(result);
+        return result;
+    }
+
     void retreatRowNumber(RowNumber & x) const
     {
+#ifndef NDEBUG
+        auto original_x = x;
+#endif
+
         if (x.row > 0)
         {
             --x.row;
@@ -213,12 +224,19 @@ public:
         x.row = blockAt(x).rows - 1;
 
 #ifndef NDEBUG
-        auto xx = x;
-        advanceRowNumber(xx);
-        assert(xx == x);
+        auto advanced_retreated_x = x;
+        advanceRowNumber(advanced_retreated_x);
+        assert(advanced_retreated_x == original_x);
 #endif
     }
 
+    RowNumber prevRowNumber(const RowNumber & x) const
+    {
+        RowNumber result = x;
+        retreatRowNumber(result);
+        return result;
+    }
+
     auto moveRowNumber(const RowNumber & _x, int64_t offset) const;
     auto moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const;
 
diff --git a/src/QueryPipeline/ExecutionSpeedLimits.cpp b/src/QueryPipeline/ExecutionSpeedLimits.cpp
index d66344d5a05..b88e70cd14f 100644
--- a/src/QueryPipeline/ExecutionSpeedLimits.cpp
+++ b/src/QueryPipeline/ExecutionSpeedLimits.cpp
@@ -9,6 +9,8 @@
 namespace ProfileEvents
 {
     extern const Event ThrottlerSleepMicroseconds;
+    extern const Event OverflowBreak;
+    extern const Event OverflowThrow;
 }
 
 
@@ -104,8 +106,10 @@ static bool handleOverflowMode(OverflowMode mode, int code, fmt::format_string<A
     switch (mode)
     {
         case OverflowMode::THROW:
+            ProfileEvents::increment(ProfileEvents::OverflowThrow);
             throw Exception(code, std::move(fmt), std::forward<Args>(args)...);
         case OverflowMode::BREAK:
+            ProfileEvents::increment(ProfileEvents::OverflowBreak);
             return false;
         default:
             throw Exception("Logical error: unknown overflow mode", ErrorCodes::LOGICAL_ERROR);
diff --git a/src/QueryPipeline/QueryPipelineBuilder.h b/src/QueryPipeline/QueryPipelineBuilder.h
index 346b47a1d1d..100a2e07341 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.h
+++ b/src/QueryPipeline/QueryPipelineBuilder.h
@@ -20,8 +20,7 @@ class QueryPlan;
 class PipelineExecutor;
 using PipelineExecutorPtr = std::shared_ptr<PipelineExecutor>;
 
-struct SubqueryForSet;
-using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
+class SubqueryForSet;
 
 struct SizeLimits;
 
diff --git a/src/QueryPipeline/RemoteInserter.cpp b/src/QueryPipeline/RemoteInserter.cpp
index 58fed6e5466..cd0485ec8e3 100644
--- a/src/QueryPipeline/RemoteInserter.cpp
+++ b/src/QueryPipeline/RemoteInserter.cpp
@@ -67,7 +67,8 @@ RemoteInserter::RemoteInserter(
     /** Send query and receive "header", that describes table structure.
       * Header is needed to know, what structure is required for blocks to be passed to 'write' method.
       */
-    connection.sendQuery(timeouts, query, "", QueryProcessingStage::Complete, &settings, &modified_client_info, false, {});
+    connection.sendQuery(
+        timeouts, query, /* query_parameters */ {}, "", QueryProcessingStage::Complete, &settings, &modified_client_info, false, {});
 
     while (true)
     {
diff --git a/src/QueryPipeline/SizeLimits.cpp b/src/QueryPipeline/SizeLimits.cpp
index 3fe73f61402..76832b1f951 100644
--- a/src/QueryPipeline/SizeLimits.cpp
+++ b/src/QueryPipeline/SizeLimits.cpp
@@ -1,9 +1,17 @@
 #include <QueryPipeline/SizeLimits.h>
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
 #include <string>
 
 
+namespace ProfileEvents
+{
+    extern const Event OverflowThrow;
+    extern const Event OverflowBreak;
+}
+
+
 namespace DB
 {
 
@@ -12,20 +20,26 @@ bool SizeLimits::check(UInt64 rows, UInt64 bytes, const char * what, int too_man
     if (overflow_mode == OverflowMode::THROW)
     {
         if (max_rows && rows > max_rows)
+        {
+            ProfileEvents::increment(ProfileEvents::OverflowThrow);
             throw Exception(
                 too_many_rows_exception_code,
                 "Limit for {} exceeded, max rows: {}, current rows: {}",
                 what,
                 formatReadableQuantity(max_rows),
                 formatReadableQuantity(rows));
+        }
 
         if (max_bytes && bytes > max_bytes)
+        {
+            ProfileEvents::increment(ProfileEvents::OverflowThrow);
             throw Exception(
                 too_many_bytes_exception_code,
                 "Limit for {} exceeded, max bytes: {}, current bytes: {}",
                 what,
                 ReadableSize(max_bytes),
                 ReadableSize(bytes));
+        }
 
         return true;
     }
@@ -37,10 +51,12 @@ bool SizeLimits::softCheck(UInt64 rows, UInt64 bytes) const
 {
     /// For result_overflow_mode = 'break', we check for >= to tell that no more data is needed.
     /// Last chunk will be processed.
-    if (max_rows && rows >= max_rows)
-        return false;
-    if (max_bytes && bytes >= max_bytes)
+    if ((max_rows && rows >= max_rows)
+        || (max_bytes && bytes >= max_bytes))
+    {
+        ProfileEvents::increment(ProfileEvents::OverflowBreak);
         return false;
+    }
     return true;
 }
 
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index cdf856e87d5..5b8e17eb279 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -26,6 +26,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
+#include <Parsers/ParserSetQuery.h>
 
 #include <base/getFQDNOrHostName.h>
 #include <base/scope_guard.h>
@@ -1014,10 +1015,10 @@ bool DynamicQueryHandler::customizeQueryParam(ContextMutablePtr context, const s
     if (key == param_name)
         return true;    /// do nothing
 
-    if (startsWith(key, "param_"))
+    if (startsWith(key, QUERY_PARAMETER_NAME_PREFIX))
     {
         /// Save name and values of substitution in dictionary.
-        const String parameter_name = key.substr(strlen("param_"));
+        const String parameter_name = key.substr(strlen(QUERY_PARAMETER_NAME_PREFIX));
 
         if (!context->getQueryParameters().contains(parameter_name))
             context->setQueryParameter(parameter_name, value);
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index 1011524e057..b268179ae93 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -57,6 +57,7 @@
 #include <Common/config_version.h>
 
 using namespace std::literals;
+using namespace DB;
 
 
 namespace CurrentMetrics
@@ -64,6 +65,23 @@ namespace CurrentMetrics
     extern const Metric QueryThread;
 }
 
+namespace
+{
+NameToNameMap convertToQueryParameters(const Settings & passed_params)
+{
+    NameToNameMap query_parameters;
+    for (const auto & param : passed_params)
+    {
+        std::string value;
+        ReadBufferFromOwnString buf(param.getValueString());
+        readQuoted(value, buf);
+        query_parameters.emplace(param.getName(), value);
+    }
+    return query_parameters;
+}
+
+}
+
 namespace DB
 {
 
@@ -134,6 +152,8 @@ void TCPHandler::runImpl()
     {
         receiveHello();
         sendHello();
+        if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM)
+            receiveAddendum();
 
         if (!is_interserver_mode) /// In interserver mode queries are executed without a session context.
         {
@@ -195,7 +215,6 @@ void TCPHandler::runImpl()
             break;
         }
 
-        Stopwatch watch;
         state.reset();
 
         /// Initialized later.
@@ -374,10 +393,11 @@ void TCPHandler::runImpl()
 
                 /// Send final progress
                 ///
-                /// NOTE: we cannot send Progress for regular INSERT (w/ VALUES)
+                /// NOTE: we cannot send Progress for regular INSERT (with VALUES)
                 /// without breaking protocol compatibility, but it can be done
                 /// by increasing revision.
                 sendProgress();
+                sendSelectProfileEvents();
             }
 
             state.io.onFinish();
@@ -385,8 +405,7 @@ void TCPHandler::runImpl()
             /// Do it before sending end of stream, to have a chance to show log message in client.
             query_scope->logPeakMemoryUsage();
 
-            watch.stop();
-            LOG_DEBUG(log, "Processed in {} sec.", watch.elapsedSeconds());
+            LOG_DEBUG(log, "Processed in {} sec.", state.watch.elapsedSeconds());
             query_duration_already_logged = true;
 
             if (state.is_connection_closed)
@@ -500,6 +519,11 @@ void TCPHandler::runImpl()
             LOG_WARNING(log, "Can't skip data packets after query failure.");
         }
 
+        if (!query_duration_already_logged)
+        {
+            LOG_DEBUG(log, "Processed in {} sec.", state.watch.elapsedSeconds());
+        }
+
         try
         {
             /// QueryState should be cleared before QueryScope, since otherwise
@@ -517,12 +541,6 @@ void TCPHandler::runImpl()
              */
         }
 
-        if (!query_duration_already_logged)
-        {
-            watch.stop();
-            LOG_DEBUG(log, "Processed in {} sec.", watch.elapsedSeconds());
-        }
-
         /// It is important to destroy query context here. We do not want it to live arbitrarily longer than the query.
         query_context.reset();
 
@@ -1039,6 +1057,7 @@ std::unique_ptr<Session> TCPHandler::makeSession()
     client_info.connection_client_version_patch = client_version_patch;
     client_info.connection_tcp_protocol_version = client_tcp_protocol_version;
 
+    client_info.quota_key = quota_key;
     client_info.interface = interface;
 
     return res;
@@ -1097,6 +1116,16 @@ void TCPHandler::receiveHello()
     session->authenticate(user, password, socket().peerAddress());
 }
 
+void TCPHandler::receiveAddendum()
+{
+    if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_QUOTA_KEY)
+    {
+        readStringBinary(quota_key, *in);
+        if (!is_interserver_mode)
+            session->getClientInfo().quota_key = quota_key;
+    }
+}
+
 
 void TCPHandler::receiveUnexpectedHello()
 {
@@ -1321,6 +1350,10 @@ void TCPHandler::receiveQuery()
 
     readStringBinary(state.query, *in);
 
+    Settings passed_params;
+    if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
+        passed_params.read(*in, settings_format);
+
     /// TODO Unify interserver authentication (and make sure that it's secure enough)
     if (is_interserver_mode)
     {
@@ -1411,6 +1444,8 @@ void TCPHandler::receiveQuery()
     /// so we have to apply the changes first.
     query_context->setCurrentQueryId(state.query_id);
 
+    query_context->addQueryParameters(convertToQueryParameters(passed_params));
+
     /// For testing hedged requests
     if (unlikely(sleep_after_receiving_query.totalMilliseconds()))
     {
@@ -1447,6 +1482,9 @@ void TCPHandler::receiveUnexpectedQuery()
 
     readStringBinary(skip_string, *in);
 
+    if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
+        skip_settings.read(*in, settings_format);
+
     throw NetException("Unexpected packet Query received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
 }
 
@@ -1782,6 +1820,9 @@ void TCPHandler::sendProgress()
 {
     writeVarUInt(Protocol::Server::Progress, *out);
     auto increment = state.progress.fetchValuesAndResetPiecewiseAtomically();
+    UInt64 current_elapsed_ns = state.watch.elapsedNanoseconds();
+    increment.elapsed_ns = current_elapsed_ns - state.prev_elapsed_ns;
+    state.prev_elapsed_ns = current_elapsed_ns;
     increment.write(*out, client_tcp_protocol_version);
     out->next();
 }
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index bea00c815c8..ea5fb2f9fe0 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -102,6 +102,8 @@ struct QueryState
 
     /// To output progress, the difference after the previous sending of progress.
     Progress progress;
+    Stopwatch watch;
+    UInt64 prev_elapsed_ns = 0;
 
     /// Timeouts setter for current query
     std::unique_ptr<TimeoutSetter> timeout_setter;
@@ -155,6 +157,7 @@ private:
     UInt64 client_version_minor = 0;
     UInt64 client_version_patch = 0;
     UInt64 client_tcp_protocol_version = 0;
+    String quota_key;
 
     /// Connection settings, which are extracted from a context.
     bool send_exception_with_stack_trace = true;
@@ -211,6 +214,7 @@ private:
 
     bool receiveProxyHeader();
     void receiveHello();
+    void receiveAddendum();
     bool receivePacket();
     void receiveQuery();
     void receiveIgnoredPartUUIDs();
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index 21b4e20a26f..ff5a38fcc52 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -538,6 +538,7 @@ ConnectionPoolPtr StorageDistributedDirectoryMonitor::createPool(const std::stri
             address.default_database,
             address.user,
             address.password,
+            address.quota_key,
             address.cluster,
             address.cluster_secret,
             storage.getName() + '_' + address.user, /* client */
diff --git a/src/Storages/ExternalDataSourceConfiguration.cpp b/src/Storages/ExternalDataSourceConfiguration.cpp
index 0d6beb1733b..5710aa6cd6a 100644
--- a/src/Storages/ExternalDataSourceConfiguration.cpp
+++ b/src/Storages/ExternalDataSourceConfiguration.cpp
@@ -35,7 +35,7 @@ namespace ErrorCodes
 IMPLEMENT_SETTINGS_TRAITS(EmptySettingsTraits, EMPTY_SETTINGS)
 
 static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
-    "host", "port", "user", "password", "db",
+    "host", "port", "user", "password", "quota_key", "db",
     "database", "table", "schema", "replica",
     "update_field", "update_lag", "invalidate_query", "query",
     "where", "name", "secure", "uri", "collection"};
@@ -84,6 +84,7 @@ void ExternalDataSourceConfiguration::set(const ExternalDataSourceConfiguration
     port = conf.port;
     username = conf.username;
     password = conf.password;
+    quota_key = conf.quota_key;
     database = conf.database;
     table = conf.table;
     schema = conf.schema;
@@ -123,6 +124,7 @@ std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
         configuration.port = config.getInt(collection_prefix + ".port", 0);
         configuration.username = config.getString(collection_prefix + ".user", "");
         configuration.password = config.getString(collection_prefix + ".password", "");
+        configuration.quota_key = config.getString(collection_prefix + ".quota_key", "");
         configuration.database = config.getString(collection_prefix + ".database", "");
         configuration.table = config.getString(collection_prefix + ".table", config.getString(collection_prefix + ".collection", ""));
         configuration.schema = config.getString(collection_prefix + ".schema", "");
@@ -169,6 +171,8 @@ std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
                         configuration.username = arg_value.safeGet<String>();
                     else if (arg_name == "password")
                         configuration.password = arg_value.safeGet<String>();
+                    else if (arg_name == "quota_key")
+                        configuration.quota_key = arg_value.safeGet<String>();
                     else if (arg_name == "database")
                         configuration.database = arg_value.safeGet<String>();
                     else if (arg_name == "table")
@@ -236,6 +240,7 @@ std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
         configuration.port = dict_config.getInt(dict_config_prefix + ".port", config.getUInt(collection_prefix + ".port", 0));
         configuration.username = dict_config.getString(dict_config_prefix + ".user", config.getString(collection_prefix + ".user", ""));
         configuration.password = dict_config.getString(dict_config_prefix + ".password", config.getString(collection_prefix + ".password", ""));
+        configuration.quota_key = dict_config.getString(dict_config_prefix + ".quota_key", config.getString(collection_prefix + ".quota_key", ""));
         configuration.database = dict_config.getString(dict_config_prefix + ".db", config.getString(dict_config_prefix + ".database",
             config.getString(collection_prefix + ".db", config.getString(collection_prefix + ".database", ""))));
         configuration.table = dict_config.getString(dict_config_prefix + ".table", config.getString(collection_prefix + ".table", ""));
@@ -328,6 +333,7 @@ ExternalDataSourcesByPriority getExternalDataSourceConfigurationByPriority(
         common_configuration.port = dict_config.getUInt(dict_config_prefix + ".port", 0);
         common_configuration.username = dict_config.getString(dict_config_prefix + ".user", "");
         common_configuration.password = dict_config.getString(dict_config_prefix + ".password", "");
+        common_configuration.quota_key = dict_config.getString(dict_config_prefix + ".quota_key", "");
         common_configuration.database = dict_config.getString(dict_config_prefix + ".db", dict_config.getString(dict_config_prefix + ".database", ""));
         common_configuration.table = dict_config.getString(fmt::format("{}.table", dict_config_prefix), "");
         common_configuration.schema = dict_config.getString(fmt::format("{}.schema", dict_config_prefix), "");
@@ -359,6 +365,7 @@ ExternalDataSourcesByPriority getExternalDataSourceConfigurationByPriority(
                 replica_configuration.port = dict_config.getUInt(replica_name + ".port", common_configuration.port);
                 replica_configuration.username = dict_config.getString(replica_name + ".user", common_configuration.username);
                 replica_configuration.password = dict_config.getString(replica_name + ".password", common_configuration.password);
+                replica_configuration.quota_key = dict_config.getString(replica_name + ".quota_key", common_configuration.quota_key);
 
                 if (replica_configuration.host.empty() || replica_configuration.port == 0
                     || replica_configuration.username.empty() || replica_configuration.password.empty())
diff --git a/src/Storages/ExternalDataSourceConfiguration.h b/src/Storages/ExternalDataSourceConfiguration.h
index 4ed46e1b26c..719fceb7df1 100644
--- a/src/Storages/ExternalDataSourceConfiguration.h
+++ b/src/Storages/ExternalDataSourceConfiguration.h
@@ -19,6 +19,7 @@ struct ExternalDataSourceConfiguration
     UInt16 port = 0;
     String username = "default";
     String password;
+    String quota_key;
     String database;
     String table;
     String schema;
diff --git a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
index eab5c2ab134..ef6eb5e7a80 100644
--- a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
@@ -3,10 +3,10 @@
 #if USE_HDFS
 #include <mutex>
 #include <Common/logger_useful.h>
-#include <Storages/HDFS/HDFSCommon.h>
 #include <Storages/HDFS/ReadBufferFromHDFS.h>
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
 
+
 namespace CurrentMetrics
 {
     extern const Metric AsynchronousReadWait;
diff --git a/src/Storages/HDFS/StorageHDFSCluster.cpp b/src/Storages/HDFS/StorageHDFSCluster.cpp
index 08dabfccf55..200c8cb3320 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.cpp
+++ b/src/Storages/HDFS/StorageHDFSCluster.cpp
@@ -41,7 +41,7 @@ StorageHDFSCluster::StorageHDFSCluster(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & compression_method_)
-    : IStorage(table_id_)
+    : IStorageCluster(table_id_)
     , cluster_name(cluster_name_)
     , uri(uri_)
     , format_name(format_name_)
@@ -74,13 +74,7 @@ Pipe StorageHDFSCluster::read(
     size_t /*max_block_size*/,
     unsigned /*num_streams*/)
 {
-    auto cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
-
-    auto iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(context, uri);
-    auto callback = std::make_shared<HDFSSource::IteratorWrapper>([iterator]() mutable -> String
-    {
-        return iterator->next();
-    });
+    createIteratorAndCallback(context);
 
     /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
     Block header =
@@ -99,7 +93,7 @@ Pipe StorageHDFSCluster::read(
         {
             auto connection = std::make_shared<Connection>(
                 node.host_name, node.port, context->getGlobalContext()->getCurrentDatabase(),
-                node.user, node.password, node.cluster, node.cluster_secret,
+                node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
                 "HDFSClusterInititiator",
                 node.compression,
                 node.secure
@@ -140,6 +134,29 @@ QueryProcessingStage::Enum StorageHDFSCluster::getQueryProcessingStage(
 }
 
 
+void StorageHDFSCluster::createIteratorAndCallback(ContextPtr context) const
+{
+    cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
+
+    iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(context, uri);
+    callback = std::make_shared<HDFSSource::IteratorWrapper>([iter = this->iterator]() mutable -> String { return iter->next(); });
+}
+
+
+RemoteQueryExecutor::Extension StorageHDFSCluster::getTaskIteratorExtension(ContextPtr context) const
+{
+    createIteratorAndCallback(context);
+    return RemoteQueryExecutor::Extension{.task_iterator = callback};
+}
+
+
+ClusterPtr StorageHDFSCluster::getCluster(ContextPtr context) const
+{
+    createIteratorAndCallback(context);
+    return cluster;
+}
+
+
 NamesAndTypesList StorageHDFSCluster::getVirtuals() const
 {
     return NamesAndTypesList{
diff --git a/src/Storages/HDFS/StorageHDFSCluster.h b/src/Storages/HDFS/StorageHDFSCluster.h
index 21ae73c11ea..64b5fa86e05 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.h
+++ b/src/Storages/HDFS/StorageHDFSCluster.h
@@ -9,6 +9,7 @@
 
 #include <Client/Connection.h>
 #include <Interpreters/Cluster.h>
+#include <Storages/IStorageCluster.h>
 #include <Storages/HDFS/StorageHDFS.h>
 
 namespace DB
@@ -16,7 +17,7 @@ namespace DB
 
 class Context;
 
-class StorageHDFSCluster : public IStorage
+class StorageHDFSCluster : public IStorageCluster
 {
 public:
     StorageHDFSCluster(
@@ -39,11 +40,20 @@ public:
 
     NamesAndTypesList getVirtuals() const override;
 
+    ClusterPtr getCluster(ContextPtr context) const override;
+    RemoteQueryExecutor::Extension getTaskIteratorExtension(ContextPtr context) const override;
+
 private:
     String cluster_name;
     String uri;
     String format_name;
     String compression_method;
+
+    mutable ClusterPtr cluster;
+    mutable std::shared_ptr<HDFSSource::DisclosedGlobIterator> iterator;
+    mutable std::shared_ptr<HDFSSource::IteratorWrapper> callback;
+
+    void createIteratorAndCallback(ContextPtr context) const;
 };
 
 
diff --git a/src/Storages/Hive/HiveCommon.h b/src/Storages/Hive/HiveCommon.h
index 55f79bbaaeb..297b79da935 100644
--- a/src/Storages/Hive/HiveCommon.h
+++ b/src/Storages/Hive/HiveCommon.h
@@ -10,7 +10,7 @@
 #include <ThriftHiveMetastore.h>
 
 #include <base/types.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/PoolBase.h>
 #include <Storages/HDFS/HDFSCommon.h>
 #include <Storages/Hive/HiveFile.h>
@@ -135,7 +135,7 @@ private:
 
     void tryCallHiveClient(std::function<void(ThriftHiveMetastoreClientPool::Entry &)> func);
 
-    LRUCache<String, HiveTableMetadata> table_metadata_cache;
+    CacheBase<String, HiveTableMetadata> table_metadata_cache;
     ThriftHiveMetastoreClientPool client_pool;
 
     Poco::Logger * log = &Poco::Logger::get("HiveMetastoreClient");
diff --git a/src/Storages/Hive/HiveFile.h b/src/Storages/Hive/HiveFile.h
index a4bd345aa48..26e1b844b9d 100644
--- a/src/Storages/Hive/HiveFile.h
+++ b/src/Storages/Hive/HiveFile.h
@@ -170,7 +170,7 @@ protected:
 
 using HiveFilePtr = std::shared_ptr<IHiveFile>;
 using HiveFiles = std::vector<HiveFilePtr>;
-using HiveFilesCache = LRUCache<String, IHiveFile>;
+using HiveFilesCache = CacheBase<String, IHiveFile>;
 using HiveFilesCachePtr = std::shared_ptr<HiveFilesCache>;
 
 class HiveTextFile : public IHiveFile
diff --git a/src/Storages/Hive/StorageHive.cpp b/src/Storages/Hive/StorageHive.cpp
index 2ddca5e9ba6..01ee5a8c3c5 100644
--- a/src/Storages/Hive/StorageHive.cpp
+++ b/src/Storages/Hive/StorageHive.cpp
@@ -20,7 +20,6 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <IO/ReadBufferFromString.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <Storages/Cache/ExternalDataSourceCache.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTCreateQuery.h>
@@ -623,7 +622,7 @@ HiveFiles StorageHive::collectHiveFilesFromPartition(
         for (size_t i = 0; i < partition_names.size(); ++i)
             ranges.emplace_back(fields[i]);
 
-        const KeyCondition partition_key_condition(query_info.query, query_info.syntax_analyzer_result, query_info.sets, getContext(), partition_names, partition_minmax_idx_expr);
+        const KeyCondition partition_key_condition(query_info, getContext(), partition_names, partition_minmax_idx_expr);
         if (!partition_key_condition.checkInHyperrectangle(ranges, partition_types).can_be_true)
             return {};
     }
@@ -691,7 +690,7 @@ HiveFilePtr StorageHive::getHiveFileIfNeeded(
 
     if (prune_level >= PruneLevel::File)
     {
-        const KeyCondition hivefile_key_condition(query_info.query, query_info.syntax_analyzer_result, query_info.sets, getContext(), hivefile_name_types.getNames(), hivefile_minmax_idx_expr);
+        const KeyCondition hivefile_key_condition(query_info, getContext(), hivefile_name_types.getNames(), hivefile_minmax_idx_expr);
         if (hive_file->useFileMinMaxIndex())
         {
             /// Load file level minmax index and apply
diff --git a/src/Storages/IStorageCluster.h b/src/Storages/IStorageCluster.h
new file mode 100644
index 00000000000..ecab7266153
--- /dev/null
+++ b/src/Storages/IStorageCluster.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Storages/IStorage.h>
+#include <Interpreters/Cluster.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
+
+namespace DB
+{
+
+
+/**
+ *  Base cluster for Storages used in table functions like s3Cluster and hdfsCluster
+ *  Needed for code simplification around parallel_distributed_insert_select
+ */
+class IStorageCluster: public IStorage
+{
+public:
+
+    explicit IStorageCluster(const StorageID & table_id_) : IStorage(table_id_) {}
+
+    virtual ClusterPtr getCluster(ContextPtr context) const = 0;
+    virtual RemoteQueryExecutor::Extension getTaskIteratorExtension(ContextPtr context) const = 0;
+
+    bool isRemote() const override { return true; }
+};
+
+
+}
diff --git a/src/Storages/KVStorageUtils.cpp b/src/Storages/KVStorageUtils.cpp
new file mode 100644
index 00000000000..41aa91eef31
--- /dev/null
+++ b/src/Storages/KVStorageUtils.cpp
@@ -0,0 +1,182 @@
+#include <Storages/KVStorageUtils.h>
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+
+#include <Interpreters/Set.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Interpreters/evaluateConstantExpression.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+// returns keys may be filter by condition
+bool traverseASTFilter(
+    const std::string & primary_key, const DataTypePtr & primary_key_type, const ASTPtr & elem, const PreparedSetsPtr & prepared_sets, const ContextPtr & context, FieldVectorPtr & res)
+{
+    const auto * function = elem->as<ASTFunction>();
+    if (!function)
+        return false;
+
+    if (function->name == "and")
+    {
+        // one child has the key filter condition is ok
+        for (const auto & child : function->arguments->children)
+            if (traverseASTFilter(primary_key, primary_key_type, child, prepared_sets, context, res))
+                return true;
+        return false;
+    }
+    else if (function->name == "or")
+    {
+        // make sure every child has the key filter condition
+        for (const auto & child : function->arguments->children)
+            if (!traverseASTFilter(primary_key, primary_key_type, child, prepared_sets, context, res))
+                return false;
+        return true;
+    }
+    else if (function->name == "equals" || function->name == "in")
+    {
+        const auto & args = function->arguments->as<ASTExpressionList &>();
+        const ASTIdentifier * ident;
+        std::shared_ptr<IAST> value;
+
+        if (args.children.size() != 2)
+            return false;
+
+        if (function->name == "in")
+        {
+            if (!prepared_sets)
+                return false;
+
+            ident = args.children.at(0)->as<ASTIdentifier>();
+            if (!ident)
+                return false;
+
+            if (ident->name() != primary_key)
+                return false;
+            value = args.children.at(1);
+
+            PreparedSetKey set_key;
+            if ((value->as<ASTSubquery>() || value->as<ASTIdentifier>()))
+                set_key = PreparedSetKey::forSubquery(*value);
+            else
+                set_key = PreparedSetKey::forLiteral(*value, {primary_key_type});
+
+            SetPtr set = prepared_sets->get(set_key);
+            if (!set)
+                return false;
+
+            if (!set->hasExplicitSetElements())
+                return false;
+
+            set->checkColumnsNumber(1);
+            const auto & set_column = *set->getSetElements()[0];
+            for (size_t row = 0; row < set_column.size(); ++row)
+                res->push_back(set_column[row]);
+            return true;
+        }
+        else
+        {
+            if ((ident = args.children.at(0)->as<ASTIdentifier>()))
+                value = args.children.at(1);
+            else if ((ident = args.children.at(1)->as<ASTIdentifier>()))
+                value = args.children.at(0);
+            else
+                return false;
+
+            if (ident->name() != primary_key)
+                return false;
+
+            const auto node = evaluateConstantExpressionAsLiteral(value, context);
+            /// function->name == "equals"
+            if (const auto * literal = node->as<ASTLiteral>())
+            {
+                auto converted_field = convertFieldToType(literal->value, *primary_key_type);
+                if (!converted_field.isNull())
+                    res->push_back(converted_field);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+}
+
+std::pair<FieldVectorPtr, bool> getFilterKeys(
+    const String & primary_key, const DataTypePtr & primary_key_type, const SelectQueryInfo & query_info, const ContextPtr & context)
+{
+    const auto & select = query_info.query->as<ASTSelectQuery &>();
+    if (!select.where())
+        return {{}, true};
+
+    FieldVectorPtr res = std::make_shared<FieldVector>();
+    auto matched_keys = traverseASTFilter(primary_key, primary_key_type, select.where(), query_info.prepared_sets, context, res);
+    return std::make_pair(res, !matched_keys);
+}
+
+std::vector<std::string> serializeKeysToRawString(
+    FieldVector::const_iterator & it,
+    FieldVector::const_iterator end,
+    DataTypePtr key_column_type,
+    size_t max_block_size)
+{
+    size_t num_keys = end - it;
+
+    std::vector<std::string> result;
+    result.reserve(num_keys);
+
+    size_t rows_processed = 0;
+    while (it < end && (max_block_size == 0 || rows_processed < max_block_size))
+    {
+        std::string & serialized_key = result.emplace_back();
+        WriteBufferFromString wb(serialized_key);
+        key_column_type->getDefaultSerialization()->serializeBinary(*it, wb);
+        wb.finalize();
+
+        ++it;
+        ++rows_processed;
+    }
+    return result;
+}
+
+std::vector<std::string> serializeKeysToRawString(const ColumnWithTypeAndName & keys)
+{
+    if (!keys.column)
+        return {};
+
+    size_t num_keys = keys.column->size();
+    std::vector<std::string> result;
+    result.reserve(num_keys);
+
+    for (size_t i = 0; i < num_keys; ++i)
+    {
+        std::string & serialized_key = result.emplace_back();
+        WriteBufferFromString wb(serialized_key);
+        Field field;
+        keys.column->get(i, field);
+        /// TODO(@vdimir): use serializeBinaryBulk
+        keys.type->getDefaultSerialization()->serializeBinary(field, wb);
+        wb.finalize();
+    }
+    return result;
+}
+
+/// In current implementation rocks db can have key with only one column.
+size_t getPrimaryKeyPos(const Block & header, const Names & primary_key)
+{
+    if (primary_key.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Only one primary key is supported");
+    return header.getPositionByName(primary_key[0]);
+}
+
+}
diff --git a/src/Storages/KVStorageUtils.h b/src/Storages/KVStorageUtils.h
new file mode 100644
index 00000000000..e3216164869
--- /dev/null
+++ b/src/Storages/KVStorageUtils.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <Common/logger_useful.h>
+#include <Storages/SelectQueryInfo.h>
+
+#include <Interpreters/PreparedSets.h>
+#include <Core/Field.h>
+
+#include <IO/ReadBufferFromString.h>
+
+namespace DB
+{
+
+using FieldVectorPtr = std::shared_ptr<FieldVector>;
+
+class IDataType;
+using DataTypePtr = std::shared_ptr<const IDataType>;
+
+/** Retrieve from the query a condition of the form `key = 'key'`, `key in ('xxx_'), from conjunctions in the WHERE clause.
+  * TODO support key like search
+  */
+std::pair<FieldVectorPtr, bool> getFilterKeys(
+    const std::string & primary_key, const DataTypePtr & primary_key_type, const SelectQueryInfo & query_info, const ContextPtr & context);
+
+template <typename K, typename V>
+void fillColumns(const K & key, const V & value, size_t key_pos, const Block & header, MutableColumns & columns)
+{
+    ReadBufferFromString key_buffer(key);
+    ReadBufferFromString value_buffer(value);
+    for (size_t i = 0; i < header.columns(); ++i)
+    {
+        const auto & serialization = header.getByPosition(i).type->getDefaultSerialization();
+        serialization->deserializeBinary(*columns[i], i == key_pos ? key_buffer : value_buffer);
+    }
+}
+
+std::vector<std::string> serializeKeysToRawString(
+    FieldVector::const_iterator & it,
+    FieldVector::const_iterator end,
+    DataTypePtr key_column_type,
+    size_t max_block_size);
+
+std::vector<std::string> serializeKeysToRawString(const ColumnWithTypeAndName & keys);
+
+/// In current implementation key with only column is supported.
+size_t getPrimaryKeyPos(const Block & header, const Names & primary_key);
+
+}
diff --git a/src/Storages/MarkCache.h b/src/Storages/MarkCache.h
index a3f92650426..9095bf6bb35 100644
--- a/src/Storages/MarkCache.h
+++ b/src/Storages/MarkCache.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
 #include <Interpreters/AggregationCommon.h>
@@ -34,14 +34,14 @@ struct MarksWeightFunction
 /** Cache of 'marks' for StorageMergeTree.
   * Marks is an index structure that addresses ranges in column file, corresponding to ranges of primary key.
   */
-class MarkCache : public LRUCache<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>
+class MarkCache : public CacheBase<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>
 {
 private:
-    using Base = LRUCache<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>;
+    using Base = CacheBase<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>;
 
 public:
-    explicit MarkCache(size_t max_size_in_bytes)
-        : Base(max_size_in_bytes) {}
+    explicit MarkCache(size_t max_size_in_bytes, const String & mark_cache_policy = "")
+        : Base(max_size_in_bytes, 0, mark_cache_policy) {}
 
     /// Calculate key from path to file and offset.
     static UInt128 hash(const String & path_to_file)
diff --git a/src/Storages/MergeTree/DataPartStorageOnDisk.cpp b/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
index f3b228a0748..1cd6fd0305b 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
+++ b/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
@@ -208,6 +208,8 @@ void DataPartStorageOnDisk::remove(
     const NameSet & names_not_to_remove,
     const MergeTreeDataPartChecksums & checksums,
     std::list<ProjectionChecksums> projections,
+    bool is_temp,
+    MergeTreeDataPartState state,
     Poco::Logger * log) const
 {
     /// NOTE We rename part to delete_tmp_<relative_path> instead of delete_tmp_<name> to avoid race condition
@@ -276,7 +278,7 @@ void DataPartStorageOnDisk::remove(
 
         clearDirectory(
             fs::path(to) / proj_dir_name,
-            can_remove_shared_data, names_not_to_remove, projection.checksums, {}, log, true);
+            can_remove_shared_data, names_not_to_remove, projection.checksums, {}, is_temp, state, log, true);
     }
 
     /// It is possible that we are removing the part which have a written but not loaded projection.
@@ -303,7 +305,7 @@ void DataPartStorageOnDisk::remove(
 
                     clearDirectory(
                         fs::path(to) / name,
-                        can_remove_shared_data, names_not_to_remove, tmp_checksums, {}, log, true);
+                        can_remove_shared_data, names_not_to_remove, tmp_checksums, {}, is_temp, state, log, true);
                 }
                 catch (...)
                 {
@@ -313,7 +315,7 @@ void DataPartStorageOnDisk::remove(
         }
     }
 
-    clearDirectory(to, can_remove_shared_data, names_not_to_remove, checksums, projection_directories, log, false);
+    clearDirectory(to, can_remove_shared_data, names_not_to_remove, checksums, projection_directories, is_temp, state, log, false);
 }
 
 void DataPartStorageOnDisk::clearDirectory(
@@ -322,24 +324,22 @@ void DataPartStorageOnDisk::clearDirectory(
     const NameSet & names_not_to_remove,
     const MergeTreeDataPartChecksums & checksums,
     const std::unordered_set<String> & skip_directories,
+    bool is_temp,
+    MergeTreeDataPartState state,
     Poco::Logger * log,
     bool is_projection) const
 {
     auto disk = volume->getDisk();
 
-    if (checksums.empty())
+    /// It does not make sense to try fast path for incomplete temporary parts, because some files are probably absent.
+    /// Sometimes we add something to checksums.files before actually writing checksums and columns on disk.
+    /// Also sometimes we write checksums.txt and columns.txt in arbitrary order, so this check becomes complex...
+    bool is_temporary_part = is_temp || state == MergeTreeDataPartState::Temporary;
+    bool incomplete_temporary_part = is_temporary_part && (!disk->exists(fs::path(dir) / "checksums.txt") || !disk->exists(fs::path(dir) / "columns.txt"));
+    if (checksums.empty() || incomplete_temporary_part)
     {
-        if (is_projection)
-        {
-            LOG_ERROR(
-                log,
-                "Cannot quickly remove directory {} by removing files; fallback to recursive removal. Reason: checksums.txt is missing",
-                fullPath(disk, dir));
-        }
-
         /// If the part is not completely written, we cannot use fast path by listing files.
         disk->removeSharedRecursive(fs::path(dir) / "", !can_remove_shared_data, names_not_to_remove);
-
         return;
     }
 
diff --git a/src/Storages/MergeTree/DataPartStorageOnDisk.h b/src/Storages/MergeTree/DataPartStorageOnDisk.h
index 2426b5eee80..5b5cff8e636 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDisk.h
+++ b/src/Storages/MergeTree/DataPartStorageOnDisk.h
@@ -49,6 +49,8 @@ public:
         const NameSet & names_not_to_remove,
         const MergeTreeDataPartChecksums & checksums,
         std::list<ProjectionChecksums> projections,
+        bool is_temp,
+        MergeTreeDataPartState state,
         Poco::Logger * log) const override;
 
     std::string getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached) const override;
@@ -120,6 +122,8 @@ private:
         const NameSet & names_not_to_remove,
         const MergeTreeDataPartChecksums & checksums,
         const std::unordered_set<String> & skip_directories,
+        bool is_temp,
+        MergeTreeDataPartState state,
         Poco::Logger * log,
         bool is_projection) const;
 };
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 4bf44689ba2..5fe3ee4da28 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -420,6 +420,13 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     if (blocker.isCancelled())
         throw Exception("Fetching of part was cancelled", ErrorCodes::ABORTED);
 
+    /// It should be "tmp-fetch_" and not "tmp_fetch_", because we can fetch part to detached/,
+    /// but detached part name prefix should not contain underscore.
+    static const String TMP_PREFIX = "tmp-fetch_";
+    String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
+    String part_dir = tmp_prefix + part_name;
+    auto temporary_directory_lock = data.getTemporaryPartDirectoryHolder(part_dir);
+
     /// Validation of the input that may come from malicious replica.
     auto part_info = MergeTreePartInfo::fromPartName(part_name, data.format_version);
     const auto data_settings = data.getSettings();
@@ -555,7 +562,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
 
         try
         {
-            return downloadPartToDiskRemoteMeta(part_name, replica_path, to_detached, tmp_prefix_, disk, *in, throttler);
+            return downloadPartToDiskRemoteMeta(part_name, replica_path, to_detached, tmp_prefix, disk, *in, throttler);
         }
         catch (const Exception & e)
         {
@@ -575,9 +582,11 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
                 tryLogCurrentException(log);
             }
 
+            temporary_directory_lock = {};
+
             /// Try again but without zero-copy
             return fetchPart(metadata_snapshot, context, part_name, replica_path, host, port, timeouts,
-                user, password, interserver_scheme, throttler, to_detached, tmp_prefix_, nullptr, false, disk);
+                user, password, interserver_scheme, throttler, to_detached, tmp_prefix, nullptr, false, disk);
         }
     }
 
@@ -597,7 +606,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     MergeTreeData::DataPart::Checksums checksums;
     return part_type == "InMemory"
         ? downloadPartToMemory(part_name, part_uuid, metadata_snapshot, context, disk, *in, projections, throttler)
-        : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix_, sync, disk, *in, projections, checksums, throttler);
+        : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix, sync, disk, *in, projections, checksums, throttler);
 }
 
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
@@ -719,7 +728,7 @@ void Fetcher::downloadBaseOrProjectionPartToDisk(
                 "This may happen if we are trying to download part from malicious replica or logical error.",
                 absolute_file_path, data_part_storage_builder->getRelativePath());
 
-        auto file_out = data_part_storage_builder->writeFile(file_name, file_size, {});
+        auto file_out = data_part_storage_builder->writeFile(file_name, std::min<UInt64>(file_size, DBMS_DEFAULT_BUFFER_SIZE), {});
         HashingWriteBuffer hashing_out(*file_out);
         copyDataWithThrottler(in, hashing_out, file_size, blocker.getCounter(), throttler);
 
@@ -755,7 +764,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     const String & part_name,
     const String & replica_path,
     bool to_detached,
-    const String & tmp_prefix_,
+    const String & tmp_prefix,
     bool sync,
     DiskPtr disk,
     PooledReadWriteBufferFromHTTP & in,
@@ -763,8 +772,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     MergeTreeData::DataPart::Checksums & checksums,
     ThrottlerPtr throttler)
 {
-    static const String TMP_PREFIX = "tmp-fetch_";
-    String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
+    assert(!tmp_prefix.empty());
 
     /// We will remove directory if it's already exists. Make precautions.
     if (tmp_prefix.empty() //-V560
@@ -836,7 +844,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDiskRemoteMeta(
     const String & part_name,
     const String & replica_path,
     bool to_detached,
-    const String & tmp_prefix_,
+    const String & tmp_prefix,
     DiskPtr disk,
     PooledReadWriteBufferFromHTTP & in,
     ThrottlerPtr throttler)
@@ -854,8 +862,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDiskRemoteMeta(
 
     data.lockSharedDataTemporary(part_name, part_id, disk);
 
-    static const String TMP_PREFIX = "tmp-fetch_";
-    String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
+    assert(!tmp_prefix.empty());
 
     String part_dir = tmp_prefix + part_name;
     String part_relative_path = data.getRelativeDataPath() + String(to_detached ? "detached/" : "");
diff --git a/src/Storages/MergeTree/IDataPartStorage.h b/src/Storages/MergeTree/IDataPartStorage.h
index f0173baecb7..946c1c5fd47 100644
--- a/src/Storages/MergeTree/IDataPartStorage.h
+++ b/src/Storages/MergeTree/IDataPartStorage.h
@@ -3,6 +3,7 @@
 #include <base/types.h>
 #include <Core/NamesAndTypes.h>
 #include <Interpreters/TransactionVersionMetadata.h>
+#include <Storages/MergeTree/MergeTreeDataPartState.h>
 #include <optional>
 
 namespace DB
@@ -116,6 +117,8 @@ public:
         const NameSet & names_not_to_remove,
         const MergeTreeDataPartChecksums & checksums,
         std::list<ProjectionChecksums> projections,
+        bool is_temp,
+        MergeTreeDataPartState state,
         Poco::Logger * log) const = 0;
 
     /// Get a name like 'prefix_partdir_tryN' which does not exist in a root dir.
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 188a159c4b4..00ecbacdcc2 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -207,55 +207,55 @@ void IMergeTreeDataPart::MinMaxIndex::appendFiles(const MergeTreeData & data, St
 }
 
 
-static void incrementStateMetric(IMergeTreeDataPart::State state)
+static void incrementStateMetric(MergeTreeDataPartState state)
 {
     switch (state)
     {
-        case IMergeTreeDataPart::State::Temporary:
+        case MergeTreeDataPartState::Temporary:
             CurrentMetrics::add(CurrentMetrics::PartsTemporary);
             return;
-        case IMergeTreeDataPart::State::PreActive:
+        case MergeTreeDataPartState::PreActive:
             CurrentMetrics::add(CurrentMetrics::PartsPreActive);
             CurrentMetrics::add(CurrentMetrics::PartsPreCommitted);
             return;
-        case IMergeTreeDataPart::State::Active:
+        case MergeTreeDataPartState::Active:
             CurrentMetrics::add(CurrentMetrics::PartsActive);
             CurrentMetrics::add(CurrentMetrics::PartsCommitted);
             return;
-        case IMergeTreeDataPart::State::Outdated:
+        case MergeTreeDataPartState::Outdated:
             CurrentMetrics::add(CurrentMetrics::PartsOutdated);
             return;
-        case IMergeTreeDataPart::State::Deleting:
+        case MergeTreeDataPartState::Deleting:
             CurrentMetrics::add(CurrentMetrics::PartsDeleting);
             return;
-        case IMergeTreeDataPart::State::DeleteOnDestroy:
+        case MergeTreeDataPartState::DeleteOnDestroy:
             CurrentMetrics::add(CurrentMetrics::PartsDeleteOnDestroy);
             return;
     }
 }
 
-static void decrementStateMetric(IMergeTreeDataPart::State state)
+static void decrementStateMetric(MergeTreeDataPartState state)
 {
     switch (state)
     {
-        case IMergeTreeDataPart::State::Temporary:
+        case MergeTreeDataPartState::Temporary:
             CurrentMetrics::sub(CurrentMetrics::PartsTemporary);
             return;
-        case IMergeTreeDataPart::State::PreActive:
+        case MergeTreeDataPartState::PreActive:
             CurrentMetrics::sub(CurrentMetrics::PartsPreActive);
             CurrentMetrics::sub(CurrentMetrics::PartsPreCommitted);
             return;
-        case IMergeTreeDataPart::State::Active:
+        case MergeTreeDataPartState::Active:
             CurrentMetrics::sub(CurrentMetrics::PartsActive);
             CurrentMetrics::sub(CurrentMetrics::PartsCommitted);
             return;
-        case IMergeTreeDataPart::State::Outdated:
+        case MergeTreeDataPartState::Outdated:
             CurrentMetrics::sub(CurrentMetrics::PartsOutdated);
             return;
-        case IMergeTreeDataPart::State::Deleting:
+        case MergeTreeDataPartState::Deleting:
             CurrentMetrics::sub(CurrentMetrics::PartsDeleting);
             return;
-        case IMergeTreeDataPart::State::DeleteOnDestroy:
+        case MergeTreeDataPartState::DeleteOnDestroy:
             CurrentMetrics::sub(CurrentMetrics::PartsDeleteOnDestroy);
             return;
     }
@@ -313,7 +313,7 @@ IMergeTreeDataPart::IMergeTreeDataPart(
     , use_metadata_cache(storage.use_metadata_cache)
 {
     if (parent_part)
-        state = State::Active;
+        state = MergeTreeDataPartState::Active;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
 
@@ -339,7 +339,7 @@ IMergeTreeDataPart::IMergeTreeDataPart(
     , use_metadata_cache(storage.use_metadata_cache)
 {
     if (parent_part)
-        state = State::Active;
+        state = MergeTreeDataPartState::Active;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
 
@@ -381,14 +381,14 @@ std::optional<size_t> IMergeTreeDataPart::getColumnPosition(const String & colum
 }
 
 
-void IMergeTreeDataPart::setState(IMergeTreeDataPart::State new_state) const
+void IMergeTreeDataPart::setState(MergeTreeDataPartState new_state) const
 {
     decrementStateMetric(state);
     state = new_state;
     incrementStateMetric(state);
 }
 
-IMergeTreeDataPart::State IMergeTreeDataPart::getState() const
+MergeTreeDataPartState IMergeTreeDataPart::getState() const
 {
     return state;
 }
@@ -496,7 +496,7 @@ SerializationPtr IMergeTreeDataPart::tryGetSerialization(const String & column_n
 void IMergeTreeDataPart::removeIfNeeded()
 {
     assert(assertHasValidVersionMetadata());
-    if (!is_temp && state != State::DeleteOnDestroy)
+    if (!is_temp && state != MergeTreeDataPartState::DeleteOnDestroy)
         return;
 
     try
@@ -526,7 +526,7 @@ void IMergeTreeDataPart::removeIfNeeded()
 
         remove();
 
-        if (state == State::DeleteOnDestroy)
+        if (state == MergeTreeDataPartState::DeleteOnDestroy)
         {
             LOG_TRACE(storage.log, "Removed part from old location {}", path);
         }
@@ -539,8 +539,8 @@ void IMergeTreeDataPart::removeIfNeeded()
         /// Seems like it's especially important for remote disks, because removal may fail due to network issues.
         tryLogCurrentException(__PRETTY_FUNCTION__);
         assert(!is_temp);
-        assert(state != State::DeleteOnDestroy);
-        assert(state != State::Temporary);
+        assert(state != MergeTreeDataPartState::DeleteOnDestroy);
+        assert(state != MergeTreeDataPartState::Temporary);
     }
 }
 
@@ -561,7 +561,7 @@ UInt64 IMergeTreeDataPart::getIndexSizeInAllocatedBytes() const
     return res;
 }
 
-void IMergeTreeDataPart::assertState(const std::initializer_list<IMergeTreeDataPart::State> & affordable_states) const
+void IMergeTreeDataPart::assertState(const std::initializer_list<MergeTreeDataPartState> & affordable_states) const
 {
     if (!checkState(affordable_states))
     {
@@ -1295,7 +1295,7 @@ catch (Exception & e)
 
 bool IMergeTreeDataPart::wasInvolvedInTransaction() const
 {
-    assert(!version.creation_tid.isEmpty() || (state == State::Temporary /* && std::uncaught_exceptions() */));
+    assert(!version.creation_tid.isEmpty() || (state == MergeTreeDataPartState::Temporary /* && std::uncaught_exceptions() */));
     bool created_by_transaction = !version.creation_tid.isPrehistoric();
     bool removed_by_transaction = version.isRemovalTIDLocked() && version.removal_tid_lock != Tx::PrehistoricTID.getHash();
     return created_by_transaction || removed_by_transaction;
@@ -1319,7 +1319,7 @@ bool IMergeTreeDataPart::assertHasValidVersionMetadata() const
     if (part_is_probably_removed_from_disk)
         return true;
 
-    if (state == State::Temporary)
+    if (state == MergeTreeDataPartState::Temporary)
         return true;
 
     if (!data_part_storage->exists())
@@ -1455,7 +1455,7 @@ void IMergeTreeDataPart::remove() const
         projection_checksums.emplace_back(IDataPartStorage::ProjectionChecksums{.name = p_name, .checksums = projection_part->checksums});
     }
 
-    data_part_storage->remove(can_remove, files_not_to_remove, checksums, projection_checksums, storage.log);
+    data_part_storage->remove(can_remove, files_not_to_remove, checksums, projection_checksums, is_temp, getState(), storage.log);
 }
 
 String IMergeTreeDataPart::getRelativePathForPrefix(const String & prefix, bool detached) const
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 2a5e95e23d1..bdf42223d2f 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -6,6 +6,7 @@
 #include <Storages/IStorage.h>
 #include <Storages/LightweightDeleteDescription.h>
 #include <Storages/MergeTree/IDataPartStorage.h>
+#include <Storages/MergeTree/MergeTreeDataPartState.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularityInfo.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
@@ -223,45 +224,22 @@ public:
     /// Flag for keep S3 data when zero-copy replication over S3 turned on.
     mutable bool force_keep_shared_data = false;
 
-    /**
-     * Part state is a stage of its lifetime. States are ordered and state of a part could be increased only.
-     * Part state should be modified under data_parts mutex.
-     *
-     * Possible state transitions:
-     * Temporary -> PreActive:       we are trying to add a fetched, inserted or merged part to active set
-     * PreActive -> Outdated:        we could not add a part to active set and are doing a rollback (for example it is duplicated part)
-     * PreActive -> Active:          we successfully added a part to active dataset
-     * PreActive -> Outdated:        a part was replaced by a covering part or DROP PARTITION
-     * Outdated -> Deleting:         a cleaner selected this part for deletion
-     * Deleting -> Outdated:         if an ZooKeeper error occurred during the deletion, we will retry deletion
-     * Active -> DeleteOnDestroy:    if part was moved to another disk
-     */
-    enum class State
-    {
-        Temporary,       /// the part is generating now, it is not in data_parts list
-        PreActive,    /// the part is in data_parts, but not used for SELECTs
-        Active,       /// active data part, used by current and upcoming SELECTs
-        Outdated,        /// not active data part, but could be used by only current SELECTs, could be deleted after SELECTs finishes
-        Deleting,        /// not active data part with identity refcounter, it is deleting right now by a cleaner
-        DeleteOnDestroy, /// part was moved to another disk and should be deleted in own destructor
-    };
-
     using TTLInfo = MergeTreeDataPartTTLInfo;
     using TTLInfos = MergeTreeDataPartTTLInfos;
 
     mutable TTLInfos ttl_infos;
 
     /// Current state of the part. If the part is in working set already, it should be accessed via data_parts mutex
-    void setState(State new_state) const;
-    State getState() const;
+    void setState(MergeTreeDataPartState new_state) const;
+    MergeTreeDataPartState getState() const;
 
-    static constexpr std::string_view stateString(State state) { return magic_enum::enum_name(state); }
+    static constexpr std::string_view stateString(MergeTreeDataPartState state) { return magic_enum::enum_name(state); }
     constexpr std::string_view stateString() const { return stateString(state); }
 
     String getNameWithState() const { return fmt::format("{} (state {})", name, stateString()); }
 
     /// Returns true if state of part is one of affordable_states
-    bool checkState(const std::initializer_list<State> & affordable_states) const
+    bool checkState(const std::initializer_list<MergeTreeDataPartState> & affordable_states) const
     {
         for (auto affordable_state : affordable_states)
         {
@@ -272,7 +250,7 @@ public:
     }
 
     /// Throws an exception if state of the part is not in affordable_states
-    void assertState(const std::initializer_list<State> & affordable_states) const;
+    void assertState(const std::initializer_list<MergeTreeDataPartState> & affordable_states) const;
 
     /// Primary key (correspond to primary.idx file).
     /// Always loaded in RAM. Contains each index_granularity-th value of primary key tuple.
@@ -592,13 +570,12 @@ private:
     /// for this column with default parameters.
     CompressionCodecPtr detectDefaultCompressionCodec() const;
 
-    mutable State state{State::Temporary};
+    mutable MergeTreeDataPartState state{MergeTreeDataPartState::Temporary};
 
     /// This ugly flag is needed for debug assertions only
     mutable bool part_is_probably_removed_from_disk = false;
 };
 
-using MergeTreeDataPartState = IMergeTreeDataPart::State;
 using MergeTreeDataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
 using MergeTreeMutableDataPartPtr = std::shared_ptr<IMergeTreeDataPart>;
 
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index a44ecd512ea..b42fe49a1d0 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -279,56 +279,47 @@ public:
     }
 
     ConstSetPtr tryGetPreparedSet(
-        const PreparedSets & sets,
+        const PreparedSetsPtr & sets,
         const std::vector<MergeTreeSetIndex::KeyTuplePositionMapping> & indexes_mapping,
         const DataTypes & data_types) const
     {
-        if (ast)
+        if (sets && ast)
         {
             if (ast->as<ASTSubquery>() || ast->as<ASTTableIdentifier>())
-            {
-                auto set_it = sets.find(PreparedSetKey::forSubquery(*ast));
-                if (set_it != sets.end())
-                    return set_it->second;
-            }
-            else
-            {
-                /// We have `PreparedSetKey::forLiteral` but it is useless here as we don't have enough information
-                /// about types in left argument of the IN operator. Instead, we manually iterate through all the sets
-                /// and find the one for the right arg based on the AST structure (getTreeHash), after that we check
-                /// that the types it was prepared with are compatible with the types of the primary key.
-                auto set_ast_hash = ast->getTreeHash();
-                auto set_it = std::find_if(
-                    sets.begin(), sets.end(),
-                    [&](const auto & candidate_entry)
-                    {
-                        if (candidate_entry.first.ast_hash != set_ast_hash)
-                            return false;
+                return sets->get(PreparedSetKey::forSubquery(*ast));
 
-                        for (size_t i = 0; i < indexes_mapping.size(); ++i)
-                            if (!candidate_entry.second->areTypesEqual(indexes_mapping[i].tuple_index, data_types[i]))
-                                return false;
+            /// We have `PreparedSetKey::forLiteral` but it is useless here as we don't have enough information
+            /// about types in left argument of the IN operator. Instead, we manually iterate through all the sets
+            /// and find the one for the right arg based on the AST structure (getTreeHash), after that we check
+            /// that the types it was prepared with are compatible with the types of the primary key.
+            auto types_match = [&indexes_mapping, &data_types](const SetPtr & candidate_set)
+            {
+                assert(indexes_mapping.size() == data_types.size());
 
-                        return true;
-                });
-                if (set_it != sets.end())
-                    return set_it->second;
+                for (size_t i = 0; i < indexes_mapping.size(); ++i)
+                    if (!candidate_set->areTypesEqual(indexes_mapping[i].tuple_index, data_types[i]))
+                        return false;
+
+                return true;
+            };
+
+            for (const auto & set : sets->getByTreeHash(ast->getTreeHash()))
+            {
+                if (types_match(set))
+                    return set;
             }
         }
-        else
+        else if (dag->column)
         {
-            if (dag->column)
-            {
-                const IColumn * col = dag->column.get();
-                if (const auto * col_const = typeid_cast<const ColumnConst *>(col))
-                    col = &col_const->getDataColumn();
+            const IColumn * col = dag->column.get();
+            if (const auto * col_const = typeid_cast<const ColumnConst *>(col))
+                col = &col_const->getDataColumn();
 
-                if (const auto * col_set = typeid_cast<const ColumnSet *>(col))
-                {
-                    auto set = col_set->getData();
-                    if (set->isCreated())
-                        return set;
-                }
+            if (const auto * col_set = typeid_cast<const ColumnSet *>(col))
+            {
+                auto set = col_set->getData();
+                if (set->isCreated())
+                    return set;
             }
         }
 
@@ -748,7 +739,7 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
                     if (const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction()))
                     {
                         const auto & index_hint_dag = index_hint->getActions();
-                        children = index_hint_dag->getIndex();
+                        children = index_hint_dag->getOutputs();
 
                         for (auto & arg : children)
                             arg = &cloneASTWithInversionPushDown(*arg, inverted_dag, to_inverted, context, need_inversion);
@@ -824,7 +815,7 @@ static ActionsDAGPtr cloneASTWithInversionPushDown(ActionsDAG::NodeRawConstPtrs
         nodes = {&res->addFunction(function_builder, std::move(nodes), "")};
     }
 
-    res->getIndex().swap(nodes);
+    res->getOutputs().swap(nodes);
 
     return res;
 }
@@ -863,8 +854,9 @@ static NameSet getAllSubexpressionNames(const ExpressionActions & key_expr)
 
 KeyCondition::KeyCondition(
     const ASTPtr & query,
+    const ASTs & additional_filter_asts,
     TreeRewriterResultPtr syntax_analyzer_result,
-    PreparedSets prepared_sets_,
+    PreparedSetsPtr prepared_sets_,
     ContextPtr context,
     const Names & key_column_names,
     const ExpressionActionsPtr & key_expr_,
@@ -872,7 +864,7 @@ KeyCondition::KeyCondition(
     bool strict_)
     : key_expr(key_expr_)
     , key_subexpr_names(getAllSubexpressionNames(*key_expr))
-    , prepared_sets(std::move(prepared_sets_))
+    , prepared_sets(prepared_sets_)
     , single_point(single_point_)
     , strict(strict_)
 {
@@ -892,13 +884,35 @@ KeyCondition::KeyCondition(
         array_joined_columns.insert(name);
 
     const ASTSelectQuery & select = query->as<ASTSelectQuery &>();
-    if (select.where() || select.prewhere())
+
+    ASTs filters;
+    if (select.where())
+        filters.push_back(select.where());
+
+    if (select.prewhere())
+        filters.push_back(select.prewhere());
+
+    for (const auto & filter_ast : additional_filter_asts)
+        filters.push_back(filter_ast);
+
+    if (!filters.empty())
     {
         ASTPtr filter_query;
-        if (select.where() && select.prewhere())
-            filter_query = makeASTFunction("and", select.where(), select.prewhere());
+        if (filters.size() == 1)
+        {
+            filter_query = filters.front();
+        }
         else
-            filter_query = select.where() ? select.where() : select.prewhere();
+        {
+            auto function = std::make_shared<ASTFunction>();
+
+            function->name = "and";
+            function->arguments = std::make_shared<ASTExpressionList>();
+            function->children.push_back(function->arguments);
+            function->arguments->children = std::move(filters);
+
+            filter_query = function;
+        }
 
         /** When non-strictly monotonic functions are employed in functional index (e.g. ORDER BY toStartOfHour(dateTime)),
           * the use of NOT operator in predicate will result in the indexing algorithm leave out some data.
@@ -919,7 +933,7 @@ KeyCondition::KeyCondition(
 KeyCondition::KeyCondition(
     ActionDAGNodes dag_nodes,
     TreeRewriterResultPtr syntax_analyzer_result,
-    PreparedSets prepared_sets_,
+    PreparedSetsPtr prepared_sets_,
     ContextPtr context,
     const Names & key_column_names,
     const ExpressionActionsPtr & key_expr_,
@@ -927,7 +941,7 @@ KeyCondition::KeyCondition(
     bool strict_)
     : key_expr(key_expr_)
     , key_subexpr_names(getAllSubexpressionNames(*key_expr))
-    , prepared_sets(std::move(prepared_sets_))
+    , prepared_sets(prepared_sets_)
     , single_point(single_point_)
     , strict(strict_)
 {
@@ -948,7 +962,7 @@ KeyCondition::KeyCondition(
         // std::cerr << "========== inverted dag: " << inverted_dag->dumpDAG() << std::endl;
 
         Block empty;
-        for (const auto * node : inverted_dag->getIndex())
+        for (const auto * node : inverted_dag->getOutputs())
             traverseAST(Tree(node), context, empty);
     }
     else
diff --git a/src/Storages/MergeTree/KeyCondition.h b/src/Storages/MergeTree/KeyCondition.h
index 3d9e3273b3c..586bc43f791 100644
--- a/src/Storages/MergeTree/KeyCondition.h
+++ b/src/Storages/MergeTree/KeyCondition.h
@@ -208,18 +208,39 @@ public:
     /// Does not take into account the SAMPLE section. all_columns - the set of all columns of the table.
     KeyCondition(
         const ASTPtr & query,
+        const ASTs & additional_filter_asts,
         TreeRewriterResultPtr syntax_analyzer_result,
-        PreparedSets prepared_sets_,
+        PreparedSetsPtr prepared_sets_,
         ContextPtr context,
         const Names & key_column_names,
         const ExpressionActionsPtr & key_expr,
         bool single_point_ = false,
         bool strict_ = false);
 
+    KeyCondition(
+        const SelectQueryInfo & query_info,
+        ContextPtr context,
+        const Names & key_column_names,
+        const ExpressionActionsPtr & key_expr_,
+        bool single_point_ = false,
+        bool strict_ = false)
+        : KeyCondition(
+            query_info.query,
+            query_info.filter_asts,
+            query_info.syntax_analyzer_result,
+            query_info.prepared_sets,
+            context,
+            key_column_names,
+            key_expr_,
+            single_point_,
+            strict_)
+    {
+    }
+
     KeyCondition(
         ActionDAGNodes dag_nodes,
         TreeRewriterResultPtr syntax_analyzer_result,
-        PreparedSets prepared_sets_,
+        PreparedSetsPtr prepared_sets_,
         ContextPtr context,
         const Names & key_column_names,
         const ExpressionActionsPtr & key_expr,
@@ -450,7 +471,7 @@ private:
     const NameSet key_subexpr_names;
 
     NameSet array_joined_columns;
-    PreparedSets prepared_sets;
+    PreparedSetsPtr prepared_sets;
 
     // If true, always allow key_expr to be wrapped by function
     bool single_point;
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index 90d866e78bb..81840f0cffb 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -28,6 +28,7 @@
 #include <Processors/Transforms/TTLTransform.h>
 #include <Processors/Transforms/TTLCalcTransform.h>
 #include <Processors/Transforms/DistinctSortedTransform.h>
+#include <Processors/Transforms/DistinctTransform.h>
 
 namespace DB
 {
@@ -142,10 +143,8 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     if (global_ctx->data_part_storage_builder->exists())
         throw Exception("Directory " + global_ctx->data_part_storage_builder->getFullPath() + " already exists", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
 
-    global_ctx->data->temporary_parts.add(local_tmp_part_basename);
-    SCOPE_EXIT(
-        global_ctx->data->temporary_parts.remove(local_tmp_part_basename);
-    );
+    if (!global_ctx->parent_part)
+        global_ctx->temporary_directory_lock = global_ctx->data->getTemporaryPartDirectoryHolder(local_tmp_part_basename);
 
     global_ctx->all_column_names = global_ctx->metadata_snapshot->getColumns().getNamesOfPhysical();
     global_ctx->storage_columns = global_ctx->metadata_snapshot->getColumns().getAllPhysical();
@@ -913,8 +912,14 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
     res_pipe.addTransform(std::move(merged_transform));
 
     if (global_ctx->deduplicate)
-        res_pipe.addTransform(std::make_shared<DistinctSortedTransform>(
-            res_pipe.getHeader(), sort_description, SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+    {
+        if (DistinctSortedTransform::isApplicable(header, sort_description, global_ctx->deduplicate_by_columns))
+            res_pipe.addTransform(std::make_shared<DistinctSortedTransform>(
+                res_pipe.getHeader(), sort_description, SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+        else
+            res_pipe.addTransform(std::make_shared<DistinctTransform>(
+                res_pipe.getHeader(), SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+    }
 
     if (ctx->need_remove_expired_values)
         res_pipe.addTransform(std::make_shared<TTLTransform>(
diff --git a/src/Storages/MergeTree/MergeTask.h b/src/Storages/MergeTree/MergeTask.h
index 0ddeb70763c..2c338e03973 100644
--- a/src/Storages/MergeTree/MergeTask.h
+++ b/src/Storages/MergeTree/MergeTask.h
@@ -178,6 +178,8 @@ private:
         IMergedBlockOutputStream::WrittenOffsetColumns written_offset_columns{};
 
         MergeTreeTransactionPtr txn;
+
+        scope_guard temporary_directory_lock;
     };
 
     using GlobalRuntimeContextPtr = std::shared_ptr<GlobalRuntimeContext>;
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 07f73759014..114f13b1c40 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -1599,6 +1599,12 @@ size_t MergeTreeData::clearOldTemporaryDirectories(size_t custom_directories_lif
     return cleared_count;
 }
 
+scope_guard MergeTreeData::getTemporaryPartDirectoryHolder(const String & part_dir_name)
+{
+    temporary_parts.add(part_dir_name);
+    return [this, part_dir_name]() { temporary_parts.remove(part_dir_name); };
+}
+
 
 MergeTreeData::DataPartsVector MergeTreeData::grabOldParts(bool force)
 {
@@ -2858,6 +2864,13 @@ void MergeTreeData::preparePartForCommit(MutableDataPartPtr & part, Transaction
     part->is_temp = false;
     part->setState(DataPartState::PreActive);
 
+    assert([&]()
+           {
+               String dir_name = fs::path(part->data_part_storage->getRelativePath()).filename();
+               bool may_be_cleaned_up = dir_name.starts_with("tmp_") || dir_name.starts_with("tmp-fetch_");
+               return !may_be_cleaned_up || temporary_parts.contains(dir_name);
+           }());
+
     part->renameTo(part->name, true, builder);
 
     data_parts_indexes.insert(part);
@@ -2939,18 +2952,18 @@ void MergeTreeData::removePartsFromWorkingSet(MergeTreeTransaction * txn, const
         if (part->version.creation_csn != Tx::RolledBackCSN)
             MergeTreeTransaction::removeOldPart(shared_from_this(), part, txn);
 
-        if (part->getState() == IMergeTreeDataPart::State::Active)
+        if (part->getState() == MergeTreeDataPartState::Active)
         {
             removePartContributionToColumnAndSecondaryIndexSizes(part);
             removePartContributionToDataVolume(part);
             removed_active_part = true;
         }
 
-        if (part->getState() == IMergeTreeDataPart::State::Active || clear_without_timeout)
+        if (part->getState() == MergeTreeDataPartState::Active || clear_without_timeout)
             part->remove_time.store(remove_time, std::memory_order_relaxed);
 
-        if (part->getState() != IMergeTreeDataPart::State::Outdated)
-            modifyPartState(part, IMergeTreeDataPart::State::Outdated);
+        if (part->getState() != MergeTreeDataPartState::Outdated)
+            modifyPartState(part, MergeTreeDataPartState::Outdated);
 
         if (isInMemoryPart(part) && getSettings()->in_memory_parts_enable_wal)
             getWriteAheadLog()->dropPart(part->name);
@@ -2970,9 +2983,9 @@ void MergeTreeData::removePartsFromWorkingSetImmediatelyAndSetTemporaryState(con
         if (it_part == data_parts_by_info.end())
             throw Exception("Part " + part->getNameWithState() + " not found in data_parts", ErrorCodes::LOGICAL_ERROR);
 
-        assert(part->getState() == IMergeTreeDataPart::State::PreActive);
+        assert(part->getState() == MergeTreeDataPartState::PreActive);
 
-        modifyPartState(part, IMergeTreeDataPart::State::Temporary);
+        modifyPartState(part, MergeTreeDataPartState::Temporary);
         /// Erase immediately
         data_parts_indexes.erase(it_part);
     }
@@ -3195,8 +3208,10 @@ void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr
                 pos = (*it)->info.max_block + 1;
                 restored.push_back((*it)->name);
             }
-            else
+            else if ((*it)->info.partition_id == part->info.partition_id)
                 update_error(it);
+            else
+                error = true;
         }
         else
             error = true;
@@ -3217,7 +3232,7 @@ void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr
                 update_error(it);
 
             if ((*it)->getState() != DataPartState::Active)
-                    activate_part(it);
+                activate_part(it);
 
             pos = (*it)->info.max_block + 1;
             restored.push_back((*it)->name);
@@ -5142,8 +5157,7 @@ static void selectBestProjection(
     const MergeTreeDataSelectExecutor & reader,
     const StorageSnapshotPtr & storage_snapshot,
     const SelectQueryInfo & query_info,
-    const ActionsDAGPtr & added_filter,
-    const std::string & added_filter_column_name,
+    const ActionDAGNodes & added_filter_nodes,
     const Names & required_columns,
     ProjectionCandidate & candidate,
     ContextPtr query_context,
@@ -5174,8 +5188,7 @@ static void selectBestProjection(
         storage_snapshot->metadata,
         candidate.desc->metadata,
         query_info,
-        added_filter,
-        added_filter_column_name,
+        added_filter_nodes,
         query_context,
         settings.max_threads,
         max_added_blocks);
@@ -5198,8 +5211,7 @@ static void selectBestProjection(
             storage_snapshot->metadata,
             storage_snapshot->metadata,
             query_info, // TODO syntax_analysis_result set in index
-            added_filter,
-            added_filter_column_name,
+            added_filter_nodes,
             query_context,
             settings.max_threads,
             max_added_blocks);
@@ -5293,9 +5305,7 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
             minmax_columns_types = getMinMaxColumnsTypes(partition_key);
 
             minmax_idx_condition.emplace(
-                query_info.query, query_info.syntax_analyzer_result, query_info.sets,
-                query_context,
-                minmax_columns_names,
+                query_info, query_context, minmax_columns_names,
                 getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(query_context)));
             partition_pruner.emplace(metadata_snapshot, query_info, query_context, false /* strict */);
         }
@@ -5517,16 +5527,23 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
         query_ptr,
         query_context,
         query_options,
-        std::move(query_info.subquery_for_sets),
-        std::move(query_info.sets));
+        query_info.prepared_sets);
     const auto & analysis_result = select.getAnalysisResult();
 
-    query_info.sets = std::move(select.getQueryAnalyzer()->getPreparedSets());
-    query_info.subquery_for_sets = std::move(select.getQueryAnalyzer()->getSubqueriesForSets());
+    query_info.prepared_sets = select.getQueryAnalyzer()->getPreparedSets();
     query_info.prewhere_info = analysis_result.prewhere_info;
+
     const auto & before_where = analysis_result.before_where;
     const auto & where_column_name = analysis_result.where_column_name;
 
+    /// For PK analysis
+    ActionDAGNodes added_filter_nodes;
+    if (auto additional_filter_info = select.getAdditionalQueryInfo())
+        added_filter_nodes.nodes.push_back(&additional_filter_info->actions->findInOutputs(additional_filter_info->column_name));
+
+    if (before_where)
+        added_filter_nodes.nodes.push_back(&before_where->findInOutputs(where_column_name));
+
     bool can_use_aggregate_projection = true;
     /// If the first stage of the query pipeline is more complex than Aggregating - Expression - Filter - ReadFromStorage,
     /// we cannot use aggregate projection.
@@ -5578,7 +5595,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
 
         if (analysis_result.prewhere_info)
         {
-            candidate.prewhere_info = analysis_result.prewhere_info;
+            candidate.prewhere_info = analysis_result.prewhere_info->clone();
 
             auto prewhere_actions = candidate.prewhere_info->prewhere_actions->clone();
             auto prewhere_required_columns = required_columns;
@@ -5753,7 +5770,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
         query_info.minmax_count_projection_block = getMinMaxCountProjectionBlock(
             metadata_snapshot,
             minmax_count_projection_candidate->required_columns,
-            analysis_result.prewhere_info || analysis_result.before_where,
+            !query_info.filter_asts.empty() || analysis_result.prewhere_info || analysis_result.before_where,
             query_info,
             parts,
             normal_parts,
@@ -5795,8 +5812,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
                 metadata_snapshot,
                 metadata_snapshot,
                 query_info,
-                before_where,
-                where_column_name,
+                added_filter_nodes,
                 query_context,
                 settings.max_threads,
                 max_added_blocks);
@@ -5828,8 +5844,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
             metadata_snapshot,
             metadata_snapshot,
             query_info,
-            before_where,
-            where_column_name,
+            added_filter_nodes,
             query_context,
             settings.max_threads,
             max_added_blocks);
@@ -5855,8 +5870,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
                     reader,
                     storage_snapshot,
                     query_info,
-                    before_where,
-                    where_column_name,
+                    added_filter_nodes,
                     analysis_result.required_columns,
                     candidate,
                     query_context,
@@ -5877,8 +5891,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
                     reader,
                     storage_snapshot,
                     query_info,
-                    before_where,
-                    where_column_name,
+                    added_filter_nodes,
                     analysis_result.required_columns,
                     candidate,
                     query_context,
@@ -5970,7 +5983,7 @@ MergeTreeData & MergeTreeData::checkStructureAndGetMergeTreeData(
     return checkStructureAndGetMergeTreeData(*source_table, src_snapshot, my_snapshot);
 }
 
-MergeTreeData::MutableDataPartPtr MergeTreeData::cloneAndLoadDataPartOnSameDisk(
+std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAndLoadDataPartOnSameDisk(
     const MergeTreeData::DataPartPtr & src_part,
     const String & tmp_part_prefix,
     const MergeTreePartInfo & dst_part_info,
@@ -5998,6 +6011,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::cloneAndLoadDataPartOnSameDisk(
     String dst_part_name = src_part->getNewName(dst_part_info);
     assert(!tmp_part_prefix.empty());
     String tmp_dst_part_name = tmp_part_prefix + dst_part_name;
+    auto temporary_directory_lock = getTemporaryPartDirectoryHolder(tmp_dst_part_name);
 
     /// Why it is needed if we only hardlink files?
     auto reservation = src_part->data_part_storage->reserve(src_part->getBytesOnDisk());
@@ -6045,7 +6059,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::cloneAndLoadDataPartOnSameDisk(
 
     dst_data_part->loadColumnsChecksumsIndexes(require_part_metadata, true);
     dst_data_part->modification_time = dst_part_storage->getLastModified().epochTime();
-    return dst_data_part;
+    return std::make_pair(dst_data_part, std::move(temporary_directory_lock));
 }
 
 String MergeTreeData::getFullPathOnDisk(const DiskPtr & disk) const
@@ -6097,7 +6111,7 @@ void MergeTreeData::reportBrokenPart(MergeTreeData::DataPartPtr & data_part) con
                 broken_part_callback(part->name);
         }
     }
-    else if (data_part && data_part->getState() == IMergeTreeDataPart::State::Active)
+    else if (data_part && data_part->getState() == MergeTreeDataPartState::Active)
         broken_part_callback(data_part->name);
     else
         LOG_DEBUG(log, "Will not check potentially broken part {} because it's not active", data_part->getNameWithState());
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 024311f4494..68ec191412b 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -142,7 +142,7 @@ public:
     /// After the DataPart is added to the working set, it cannot be changed.
     using DataPartPtr = std::shared_ptr<const DataPart>;
 
-    using DataPartState = IMergeTreeDataPart::State;
+    using DataPartState = MergeTreeDataPartState;
     using DataPartStates = std::initializer_list<DataPartState>;
     using DataPartStateVector = std::vector<DataPartState>;
 
@@ -638,7 +638,7 @@ public:
 
     /// Delete all directories which names begin with "tmp"
     /// Must be called with locked lockForShare() because it's using relative_data_path.
-    size_t clearOldTemporaryDirectories(size_t custom_directories_lifetime_seconds, const NameSet & valid_prefixes = {"tmp_", });
+    size_t clearOldTemporaryDirectories(size_t custom_directories_lifetime_seconds, const NameSet & valid_prefixes = {"tmp_", "tmp-fetch_"});
 
     size_t clearEmptyParts();
 
@@ -792,7 +792,7 @@ public:
         NameSet hardlinks_from_source_part;
     };
 
-    MergeTreeData::MutableDataPartPtr cloneAndLoadDataPartOnSameDisk(
+    std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> cloneAndLoadDataPartOnSameDisk(
         const MergeTreeData::DataPartPtr & src_part, const String & tmp_part_prefix,
         const MergeTreePartInfo & dst_part_info, const StorageMetadataPtr & metadata_snapshot,
         const MergeTreeTransactionPtr & txn, HardlinkedFiles * hardlinked_files,
@@ -1001,6 +1001,9 @@ public:
     /// Used for freezePartitionsByMatcher and unfreezePartitionsByMatcher
     using MatcherFn = std::function<bool(const String &)>;
 
+    /// Returns an object that protects temporary directory from cleanup
+    scope_guard getTemporaryPartDirectoryHolder(const String & part_dir_name);
+
 protected:
     friend class IMergeTreeDataPart;
     friend class MergeTreeDataMergerMutator;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartState.h b/src/Storages/MergeTree/MergeTreeDataPartState.h
new file mode 100644
index 00000000000..a52f7559375
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeDataPartState.h
@@ -0,0 +1,29 @@
+#pragma once
+
+namespace DB
+{
+
+/**
+     * Part state is a stage of its lifetime. States are ordered and state of a part could be increased only.
+     * Part state should be modified under data_parts mutex.
+     *
+     * Possible state transitions:
+     * Temporary -> PreActive:       we are trying to add a fetched, inserted or merged part to active set
+     * PreActive -> Outdated:        we could not add a part to active set and are doing a rollback (for example it is duplicated part)
+     * PreActive -> Active:          we successfully added a part to active dataset
+     * PreActive -> Outdated:        a part was replaced by a covering part or DROP PARTITION
+     * Outdated -> Deleting:         a cleaner selected this part for deletion
+     * Deleting -> Outdated:         if an ZooKeeper error occurred during the deletion, we will retry deletion
+     * Active -> DeleteOnDestroy:    if part was moved to another disk
+     */
+enum class MergeTreeDataPartState
+{
+    Temporary,       /// the part is generating now, it is not in data_parts list
+    PreActive,    /// the part is in data_parts, but not used for SELECTs
+    Active,       /// active data part, used by current and upcoming SELECTs
+    Outdated,        /// not active data part, but could be used by only current SELECTs, could be deleted after SELECTs finishes
+    Deleting,        /// not active data part with identity refcounter, it is deleting right now by a cleaner
+    DeleteOnDestroy, /// part was moved to another disk and should be deleted in own destructor
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index c223e285c39..c5f546a9c36 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -770,7 +770,7 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
         minmax_columns_types = data.getMinMaxColumnsTypes(partition_key);
 
         minmax_idx_condition.emplace(
-            query_info.query, query_info.syntax_analyzer_result, query_info.sets, context, minmax_columns_names, data.getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(context)));
+            query_info, context, minmax_columns_names, data.getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(context)));
         partition_pruner.emplace(metadata_snapshot, query_info, context, false /* strict */);
 
         if (settings.force_index_by_date && (minmax_idx_condition->alwaysUnknownOrTrue() && partition_pruner->isUseless()))
@@ -1273,8 +1273,7 @@ MergeTreeDataSelectAnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
     const StorageMetadataPtr & metadata_snapshot_base,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
-    const ActionsDAGPtr & added_filter,
-    const std::string & added_filter_column_name,
+    const ActionDAGNodes & added_filter_nodes,
     ContextPtr context,
     unsigned num_streams,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read) const
@@ -1295,8 +1294,7 @@ MergeTreeDataSelectAnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
     return ReadFromMergeTree::selectRangesToRead(
         std::move(parts),
         query_info.prewhere_info,
-        added_filter,
-        added_filter_column_name,
+        added_filter_nodes,
         metadata_snapshot_base,
         metadata_snapshot,
         query_info,
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index 899cf1f2862..bb44f260eec 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -60,8 +60,7 @@ public:
         const StorageMetadataPtr & metadata_snapshot_base,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const ActionsDAGPtr & added_filter,
-        const std::string & added_filter_column_name,
+        const ActionDAGNodes & added_filter_nodes,
         ContextPtr context,
         unsigned num_streams,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr) const;
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 957958e0a50..b83d592e40d 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -321,6 +321,9 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPart(
     else
         part_name = new_part_info.getPartName();
 
+    String part_dir = TMP_PREFIX + part_name;
+    temp_part.temporary_directory_lock = data.getTemporaryPartDirectoryHolder(part_dir);
+
     /// If we need to calculate some columns to sort.
     if (metadata_snapshot->hasSortingKey() || metadata_snapshot->hasSecondaryIndices())
         data.getSortingKeyAndSkipIndicesExpression(metadata_snapshot)->execute(block);
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.h b/src/Storages/MergeTree/MergeTreeDataWriter.h
index 29c7baaa775..2f9ab1aae8b 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.h
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.h
@@ -64,6 +64,8 @@ public:
 
         std::vector<Stream> streams;
 
+        scope_guard temporary_directory_lock;
+
         void finalize();
     };
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
index 7b194de8103..a80f7093775 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -691,16 +691,15 @@ SetPtr MergeTreeIndexConditionBloomFilter::getPreparedSet(const ASTPtr & node)
     if (header.has(node->getColumnName()))
     {
         const auto & column_and_type = header.getByName(node->getColumnName());
-        const auto & prepared_set_it = query_info.sets.find(getPreparedSetKey(node, column_and_type.type));
-
-        if (prepared_set_it != query_info.sets.end() && prepared_set_it->second->hasExplicitSetElements())
-            return prepared_set_it->second;
+        auto set_key = getPreparedSetKey(node, column_and_type.type);
+        if (auto prepared_set = query_info.prepared_sets->get(set_key))
+            return prepared_set;
     }
     else
     {
-        for (const auto & prepared_set_it : query_info.sets)
-            if (prepared_set_it.first.ast_hash == node->getTreeHash() && prepared_set_it.second->hasExplicitSetElements())
-                return prepared_set_it.second;
+        for (const auto & set : query_info.prepared_sets->getByTreeHash(node->getTreeHash()))
+            if (set->hasExplicitSetElements())
+                return set;
     }
 
     return DB::SetPtr();
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index b244bd489f1..ff924290783 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -146,7 +146,7 @@ MergeTreeConditionFullText::MergeTreeConditionFullText(
     , index_data_types(index_sample_block.getNamesAndTypesList().getTypes())
     , params(params_)
     , token_extractor(token_extactor_)
-    , prepared_sets(query_info.sets)
+    , prepared_sets(query_info.prepared_sets)
 {
     rpn = std::move(
             RPNBuilder<RPNElement>(
@@ -609,11 +609,10 @@ bool MergeTreeConditionFullText::tryPrepareSetBloomFilter(
     else
         set_key = PreparedSetKey::forLiteral(*right_arg, data_types);
 
-    auto set_it = prepared_sets.find(set_key);
-    if (set_it == prepared_sets.end())
+    auto prepared_set = prepared_sets->get(set_key);
+    if (!prepared_set)
         return false;
 
-    const SetPtr & prepared_set = set_it->second;
     if (!prepared_set->hasExplicitSetElements())
         return false;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.h b/src/Storages/MergeTree/MergeTreeIndexFullText.h
index 5f5956553dc..bb4f52a463e 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.h
@@ -142,8 +142,9 @@ private:
     BloomFilterParameters params;
     TokenExtractorPtr token_extractor;
     RPN rpn;
+
     /// Sets from syntax analyzer.
-    PreparedSets prepared_sets;
+    PreparedSetsPtr prepared_sets;
 };
 
 class MergeTreeIndexFullText final : public IMergeTreeIndex
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index 80f3e140c41..b190ac2b2fd 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -157,11 +157,9 @@ void MergeTreeIndexAggregatorMinMax::update(const Block & block, size_t * pos, s
 
 
 MergeTreeIndexConditionMinMax::MergeTreeIndexConditionMinMax(
-    const IndexDescription & index,
-    const SelectQueryInfo & query,
-    ContextPtr context)
+    const IndexDescription & index, const SelectQueryInfo & query, ContextPtr context)
     : index_data_types(index.data_types)
-    , condition(query.query, query.syntax_analyzer_result, query.sets, context, index.column_names, index.expression)
+    , condition(query, context, index.column_names, index.expression)
 {
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index d8dfa017b7f..89081fe924f 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -128,9 +128,6 @@ struct Settings;
     M(UInt64, concurrent_part_removal_threshold, 100, "Activate concurrent part removal (see 'max_part_removal_threads') only if the number of inactive data parts is at least this.", 0) \
     M(String, storage_policy, "default", "Name of storage disk policy", 0) \
     M(Bool, allow_nullable_key, false, "Allow Nullable types as primary keys.", 0) \
-    M(Bool, allow_remote_fs_zero_copy_replication, true, "Allow Zero-copy replication over remote fs.", 0) \
-    M(String, remote_fs_zero_copy_zookeeper_path, "/clickhouse/zero_copy", "ZooKeeper path for Zero-copy table-independet info.", 0) \
-    M(Bool, remote_fs_zero_copy_path_compatible_mode, false, "Run zero-copy in compatible mode during conversion process.", 0) \
     M(Bool, remove_empty_parts, true, "Remove empty parts after they were pruned by TTL, mutation, or collapsing merge algorithm.", 0) \
     M(Bool, assign_part_uuids, false, "Generate UUIDs for parts. Before enabling check that all replicas support new format.", 0) \
     M(Int64, max_partitions_to_read, -1, "Limit the max number of partitions that can be accessed in one query. <= 0 means unlimited. This setting is the default that can be overridden by the query-level setting with the same name.", 0) \
@@ -143,6 +140,9 @@ struct Settings;
     M(UInt64, part_moves_between_shards_enable, 0, "Experimental/Incomplete feature to move parts between shards. Does not take into account sharding expressions.", 0) \
     M(UInt64, part_moves_between_shards_delay_seconds, 30, "Time to wait before/after moving parts between shards.", 0) \
     M(Bool, use_metadata_cache, false, "Experimental feature to speed up parts loading process by using MergeTree metadata cache", 0) \
+    M(Bool, allow_remote_fs_zero_copy_replication, false, "Don't use this setting in production, because it is not ready.", 0) \
+    M(String, remote_fs_zero_copy_zookeeper_path, "/clickhouse/zero_copy", "ZooKeeper path for Zero-copy table-independet info.", 0) \
+    M(Bool, remote_fs_zero_copy_path_compatible_mode, false, "Run zero-copy in compatible mode during conversion process.", 0) \
     \
     /** Obsolete settings. Kept for backward compatibility only. */ \
     M(UInt64, min_relative_delay_to_yield_leadership, 120, "Obsolete setting, does nothing.", 0) \
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index d52948d71c1..35c731595bd 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -490,7 +490,8 @@ static NameSet collectFilesToSkip(
 
     for (const auto & index : indices_to_recalc)
     {
-        files_to_skip.insert(index->getFileName() + ".idx");
+        /// Since MinMax index has .idx2 extension, we need to add correct extension.
+        files_to_skip.insert(index->getFileName() + index->getSerializedFileExtension());
         files_to_skip.insert(index->getFileName() + mrk_extension);
     }
 
@@ -735,6 +736,8 @@ struct MutationContext
     MergeTreeTransactionPtr txn;
 
     MergeTreeData::HardlinkedFiles hardlinked_files;
+
+    scope_guard temporary_directory_lock;
 };
 
 using MutationContextPtr = std::shared_ptr<MutationContext>;
@@ -1500,7 +1503,9 @@ bool MutateTask::prepare()
         ctx->storage_from_source_part, ctx->metadata_snapshot, ctx->commands_for_part, Context::createCopy(context_for_reading)))
     {
         LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {}", ctx->source_part->name, ctx->future_part->part_info.mutation);
-        promise.set_value(ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_clone_", ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false));
+        auto [part, lock] = ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_clone_", ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false);
+        ctx->temporary_directory_lock = std::move(lock);
+        promise.set_value(std::move(part));
         return false;
     }
     else
@@ -1531,15 +1536,18 @@ bool MutateTask::prepare()
     /// FIXME new_data_part is not used in the case when we clone part with cloneAndLoadDataPartOnSameDisk and return false
     /// Is it possible to handle this case earlier?
 
+    String tmp_part_dir_name = "tmp_mut_" + ctx->future_part->name;
+    ctx->temporary_directory_lock = ctx->data->getTemporaryPartDirectoryHolder(tmp_part_dir_name);
+
     auto data_part_storage = std::make_shared<DataPartStorageOnDisk>(
         single_disk_volume,
         ctx->data->getRelativeDataPath(),
-        "tmp_mut_" + ctx->future_part->name);
+        tmp_part_dir_name);
 
     ctx->data_part_storage_builder = std::make_shared<DataPartStorageBuilderOnDisk>(
         single_disk_volume,
         ctx->data->getRelativeDataPath(),
-        "tmp_mut_" + ctx->future_part->name);
+        tmp_part_dir_name);
 
     ctx->new_data_part = ctx->data->createPart(
         ctx->future_part->name, ctx->future_part->type, ctx->future_part->part_info, data_part_storage);
@@ -1607,7 +1615,11 @@ bool MutateTask::prepare()
             && ctx->files_to_rename.empty())
         {
             LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {} (optimized)", ctx->source_part->name, ctx->future_part->part_info.mutation);
-            promise.set_value(ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_mut_", ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false));
+            /// new_data_part is not used here, another part is created instead (see the comment above)
+            ctx->temporary_directory_lock = {};
+            auto [part, lock] = ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_mut_", ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false);
+            ctx->temporary_directory_lock = std::move(lock);
+            promise.set_value(std::move(part));
             return false;
         }
 
diff --git a/src/Storages/MergeTree/PartitionPruner.h b/src/Storages/MergeTree/PartitionPruner.h
index 3af52fd9a38..9953c52b593 100644
--- a/src/Storages/MergeTree/PartitionPruner.h
+++ b/src/Storages/MergeTree/PartitionPruner.h
@@ -26,9 +26,7 @@ private:
 public:
     PartitionPruner(const StorageMetadataPtr & metadata, const SelectQueryInfo & query_info, ContextPtr context, bool strict)
         : partition_key(MergeTreePartition::adjustPartitionKey(metadata, context))
-        , partition_condition(
-              query_info.query, query_info.syntax_analyzer_result, query_info.sets,
-              context, partition_key.column_names, partition_key.expression, true /* single_point */, strict)
+        , partition_condition(query_info, context, partition_key.column_names, partition_key.expression, true /* single_point */, strict)
         , useless(strict ? partition_condition.anyUnknownOrAlwaysTrue() : partition_condition.alwaysUnknownOrTrue())
     {
     }
diff --git a/src/Storages/MergeTree/TemporaryParts.cpp b/src/Storages/MergeTree/TemporaryParts.cpp
index 4239c8232e5..b868531a72e 100644
--- a/src/Storages/MergeTree/TemporaryParts.cpp
+++ b/src/Storages/MergeTree/TemporaryParts.cpp
@@ -1,24 +1,34 @@
 #include <Storages/MergeTree/TemporaryParts.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 bool TemporaryParts::contains(const std::string & basename) const
 {
     std::lock_guard lock(mutex);
     return parts.contains(basename);
 }
 
-void TemporaryParts::add(std::string basename)
+void TemporaryParts::add(const std::string & basename)
 {
     std::lock_guard lock(mutex);
-    parts.emplace(std::move(basename));
+    bool inserted = parts.emplace(basename).second;
+    if (!inserted)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary part {} already added", basename);
 }
 
 void TemporaryParts::remove(const std::string & basename)
 {
     std::lock_guard lock(mutex);
-    parts.erase(basename);
+    bool removed = parts.erase(basename);
+    if (!removed)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary part {} does not exist", basename);
 }
 
 }
diff --git a/src/Storages/MergeTree/TemporaryParts.h b/src/Storages/MergeTree/TemporaryParts.h
index bc9d270856f..49615f4800f 100644
--- a/src/Storages/MergeTree/TemporaryParts.h
+++ b/src/Storages/MergeTree/TemporaryParts.h
@@ -18,6 +18,10 @@ private:
     /// NOTE: It is pretty short, so use STL is fine.
     std::unordered_set<std::string> parts;
 
+    void add(const std::string & basename);
+    void remove(const std::string & basename);
+
+    friend class MergeTreeData;
 public:
     /// Returns true if passed part name is active.
     /// (is the destination for one of active mutation/merge).
@@ -25,9 +29,6 @@ public:
     /// NOTE: that it accept basename (i.e. dirname), not the path,
     /// since later requires canonical form.
     bool contains(const std::string & basename) const;
-
-    void add(std::string basename);
-    void remove(const std::string & basename);
 };
 
 }
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 917bee59b29..e8aa04c6a48 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -3,31 +3,17 @@
 
 #include <DataTypes/DataTypesNumber.h>
 
-#include <Storages/checkAndGetLiteralArgument.h>
-#include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageFactory.h>
+#include <Storages/KVStorageUtils.h>
 
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTCreateQuery.h>
 
-#include <IO/WriteBufferFromString.h>
-#include <IO/ReadBufferFromString.h>
-
 #include <QueryPipeline/Pipe.h>
 #include <Processors/ISource.h>
 
 #include <Interpreters/castColumn.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/Set.h>
-#include <Interpreters/PreparedSets.h>
 #include <Interpreters/TreeRewriter.h>
-#include <Interpreters/convertFieldToType.h>
-#include <Interpreters/evaluateConstantExpression.h>
 
 #include <Poco/Logger.h>
 #include <Poco/Util/AbstractConfiguration.h>
@@ -76,177 +62,6 @@ static RocksDBOptions getOptionsFromConfig(const Poco::Util::AbstractConfigurati
     return options;
 }
 
-// returns keys may be filter by condition
-static bool traverseASTFilter(
-    const String & primary_key, const DataTypePtr & primary_key_type, const ASTPtr & elem, const PreparedSets & sets, const ContextPtr & context, FieldVectorPtr & res)
-{
-    const auto * function = elem->as<ASTFunction>();
-    if (!function)
-        return false;
-
-    if (function->name == "and")
-    {
-        // one child has the key filter condition is ok
-        for (const auto & child : function->arguments->children)
-            if (traverseASTFilter(primary_key, primary_key_type, child, sets, context, res))
-                return true;
-        return false;
-    }
-    else if (function->name == "or")
-    {
-        // make sure every child has the key filter condition
-        for (const auto & child : function->arguments->children)
-            if (!traverseASTFilter(primary_key, primary_key_type, child, sets, context, res))
-                return false;
-        return true;
-    }
-    else if (function->name == "equals" || function->name == "in")
-    {
-        const auto & args = function->arguments->as<ASTExpressionList &>();
-        const ASTIdentifier * ident;
-        std::shared_ptr<IAST> value;
-
-        if (args.children.size() != 2)
-            return false;
-
-        if (function->name == "in")
-        {
-            ident = args.children.at(0)->as<ASTIdentifier>();
-            if (!ident)
-                return false;
-
-            if (ident->name() != primary_key)
-                return false;
-            value = args.children.at(1);
-
-            PreparedSetKey set_key;
-            if ((value->as<ASTSubquery>() || value->as<ASTIdentifier>()))
-                set_key = PreparedSetKey::forSubquery(*value);
-            else
-                set_key = PreparedSetKey::forLiteral(*value, {primary_key_type});
-
-            auto set_it = sets.find(set_key);
-            if (set_it == sets.end())
-                return false;
-            SetPtr prepared_set = set_it->second;
-
-            if (!prepared_set->hasExplicitSetElements())
-                return false;
-
-            prepared_set->checkColumnsNumber(1);
-            const auto & set_column = *prepared_set->getSetElements()[0];
-            for (size_t row = 0; row < set_column.size(); ++row)
-                res->push_back(set_column[row]);
-            return true;
-        }
-        else
-        {
-            if ((ident = args.children.at(0)->as<ASTIdentifier>()))
-                value = args.children.at(1);
-            else if ((ident = args.children.at(1)->as<ASTIdentifier>()))
-                value = args.children.at(0);
-            else
-                return false;
-
-            if (ident->name() != primary_key)
-                return false;
-
-            const auto node = evaluateConstantExpressionAsLiteral(value, context);
-            /// function->name == "equals"
-            if (const auto * literal = node->as<ASTLiteral>())
-            {
-                auto converted_field = convertFieldToType(literal->value, *primary_key_type);
-                if (!converted_field.isNull())
-                    res->push_back(converted_field);
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-/** Retrieve from the query a condition of the form `key = 'key'`, `key in ('xxx_'), from conjunctions in the WHERE clause.
-  * TODO support key like search
-  */
-static std::pair<FieldVectorPtr, bool> getFilterKeys(
-    const String & primary_key, const DataTypePtr & primary_key_type, const SelectQueryInfo & query_info, const ContextPtr & context)
-{
-    const auto & select = query_info.query->as<ASTSelectQuery &>();
-    if (!select.where())
-        return {{}, true};
-
-    FieldVectorPtr res = std::make_shared<FieldVector>();
-    auto matched_keys = traverseASTFilter(primary_key, primary_key_type, select.where(), query_info.sets, context, res);
-    return std::make_pair(res, !matched_keys);
-}
-
-template <typename K, typename V>
-static void fillColumns(const K & key, const V & value, size_t key_pos, const Block & header, MutableColumns & columns)
-{
-    ReadBufferFromString key_buffer(key);
-    ReadBufferFromString value_buffer(value);
-    for (size_t i = 0; i < header.columns(); ++i)
-    {
-        const auto & serialization = header.getByPosition(i).type->getDefaultSerialization();
-        serialization->deserializeBinary(*columns[i], i == key_pos ? key_buffer : value_buffer);
-    }
-}
-
-static std::vector<std::string> serializeKeysToRawString(
-    FieldVector::const_iterator & it,
-    FieldVector::const_iterator end,
-    DataTypePtr key_column_type,
-    size_t max_block_size)
-{
-    size_t num_keys = end - it;
-
-    std::vector<std::string> result;
-    result.reserve(num_keys);
-
-    size_t rows_processed = 0;
-    while (it < end && (max_block_size == 0 || rows_processed < max_block_size))
-    {
-        std::string & serialized_key = result.emplace_back();
-        WriteBufferFromString wb(serialized_key);
-        key_column_type->getDefaultSerialization()->serializeBinary(*it, wb);
-        wb.finalize();
-
-        ++it;
-        ++rows_processed;
-    }
-    return result;
-}
-
-static std::vector<std::string> serializeKeysToRawString(const ColumnWithTypeAndName & keys)
-{
-    if (!keys.column)
-        return {};
-
-    size_t num_keys = keys.column->size();
-    std::vector<std::string> result;
-    result.reserve(num_keys);
-
-    for (size_t i = 0; i < num_keys; ++i)
-    {
-        std::string & serialized_key = result.emplace_back();
-        WriteBufferFromString wb(serialized_key);
-        Field field;
-        keys.column->get(i, field);
-        /// TODO(@vdimir): use serializeBinaryBulk
-        keys.type->getDefaultSerialization()->serializeBinary(field, wb);
-        wb.finalize();
-    }
-    return result;
-}
-
-/// In current implementation rocks db can have key with only one column.
-static size_t getPrimaryKeyPos(const Block & header, const Names & primary_key)
-{
-    if (primary_key.size() != 1)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "RocksDB: only one primary key is supported");
-    return header.getPositionByName(primary_key[0]);
-}
-
 class EmbeddedRocksDBSource : public ISource
 {
 public:
@@ -352,7 +167,7 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
         const String & primary_key_,
         Int32 ttl_,
         bool read_only_)
-    : IKeyValueStorage(table_id_)
+    : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
     , primary_key{primary_key_}
     , ttl(ttl_)
@@ -591,7 +406,8 @@ std::vector<rocksdb::Status> StorageEmbeddedRocksDB::multiGet(const std::vector<
 
 Chunk StorageEmbeddedRocksDB::getByKeys(
     const ColumnsWithTypeAndName & keys,
-    PaddedPODArray<UInt8> & null_map) const
+    PaddedPODArray<UInt8> & null_map,
+    const Names &) const
 {
     if (keys.size() != 1)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "StorageEmbeddedRocksDB supports only one key, got: {}", keys.size());
@@ -604,6 +420,12 @@ Chunk StorageEmbeddedRocksDB::getByKeys(
     return getBySerializedKeys(raw_keys, &null_map);
 }
 
+Block StorageEmbeddedRocksDB::getSampleBlock(const Names &) const
+{
+    auto metadata = getInMemoryMetadataPtr();
+    return metadata ? metadata->getSampleBlock() : Block();
+}
+
 Chunk StorageEmbeddedRocksDB::getBySerializedKeys(
     const std::vector<std::string> & keys,
     PaddedPODArray<UInt8> * null_map) const
@@ -621,7 +443,6 @@ Chunk StorageEmbeddedRocksDB::getBySerializedKeys(
     for (const auto & key : keys)
         slices_keys.emplace_back(key);
 
-
     auto statuses = multiGet(slices_keys, values);
     if (null_map)
     {
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index 5e566e4d885..1d1b24f4ac7 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <shared_mutex>
 #include <Storages/IStorage.h>
-#include <Storages/IKVStorage.h>
+#include <Interpreters/IKeyValueEntity.h>
 #include <rocksdb/status.h>
 
 
@@ -23,7 +23,7 @@ class Context;
 /// Operates with rocksdb data structures via rocksdb API (holds pointer to rocksdb::DB inside for that).
 /// Storage have one primary key.
 /// Values are serialized into raw strings to store in rocksdb.
-class StorageEmbeddedRocksDB final : public IKeyValueStorage, WithContext
+class StorageEmbeddedRocksDB final : public IStorage, public IKeyValueEntity, WithContext
 {
     friend class EmbeddedRocksDBSink;
 public:
@@ -65,7 +65,9 @@ public:
     std::vector<rocksdb::Status> multiGet(const std::vector<rocksdb::Slice> & slices_keys, std::vector<String> & values) const;
     Names getPrimaryKey() const override { return {primary_key}; }
 
-    Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map) const override;
+    Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map, const Names &) const override;
+
+    Block getSampleBlock(const Names &) const override;
 
     /// Return chunk with data for given serialized keys.
     /// If out_null_map is passed, fill it with 1/0 depending on key was/wasn't found. Result chunk may contain default values.
diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
index 36eea35e728..758e4736fc1 100644
--- a/src/Storages/SelectQueryInfo.h
+++ b/src/Storages/SelectQueryInfo.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Interpreters/PreparedSets.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Core/SortDescription.h>
 #include <Core/Names.h>
@@ -44,9 +43,6 @@ using ClusterPtr = std::shared_ptr<Cluster>;
 struct MergeTreeDataSelectAnalysisResult;
 using MergeTreeDataSelectAnalysisResultPtr = std::shared_ptr<MergeTreeDataSelectAnalysisResult>;
 
-struct SubqueryForSet;
-using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
-
 struct PrewhereInfo
 {
     /// Actions for row level security filter. Applied separately before prewhere_actions.
@@ -64,6 +60,24 @@ struct PrewhereInfo
             : prewhere_actions(std::move(prewhere_actions_)), prewhere_column_name(std::move(prewhere_column_name_)) {}
 
     std::string dump() const;
+
+    PrewhereInfoPtr clone() const
+    {
+        PrewhereInfoPtr prewhere_info = std::make_shared<PrewhereInfo>();
+
+        if (row_level_filter)
+            prewhere_info->row_level_filter = row_level_filter->clone();
+
+        if (prewhere_actions)
+            prewhere_info->prewhere_actions = prewhere_actions->clone();
+
+        prewhere_info->row_level_column_name = row_level_column_name;
+        prewhere_info->prewhere_column_name = prewhere_column_name;
+        prewhere_info->remove_prewhere_column = remove_prewhere_column;
+        prewhere_info->need_filter = need_filter;
+
+        return prewhere_info;
+    }
 };
 
 /// Helper struct to store all the information about the filter expression.
@@ -136,8 +150,13 @@ struct ProjectionCandidate
   *  that can be used during query processing
   *  inside storage engines.
   */
-struct SelectQueryInfoBase
+struct SelectQueryInfo
 {
+
+    SelectQueryInfo()
+        : prepared_sets(std::make_shared<PreparedSets>())
+    {}
+
     ASTPtr query;
     ASTPtr view_query; /// Optimized VIEW query
     ASTPtr original_query; /// Unmodified query for projection analysis
@@ -155,16 +174,18 @@ struct SelectQueryInfoBase
     TreeRewriterResultPtr syntax_analyzer_result;
 
     /// This is an additional filer applied to current table.
-    /// It is needed only for additional PK filtering.
     ASTPtr additional_filter_ast;
 
+    /// It is needed for PK analysis based on row_level_policy and additional_filters.
+    ASTs filter_asts;
+
     ReadInOrderOptimizerPtr order_optimizer;
     /// Can be modified while reading from storage
     InputOrderInfoPtr input_order_info;
 
     /// Prepared sets are used for indices by storage engine.
     /// Example: x IN (1, 2, 3)
-    PreparedSets sets;
+    PreparedSetsPtr prepared_sets;
 
     /// Cached value of ExpressionAnalysisResult
     bool has_window = false;
@@ -182,16 +203,10 @@ struct SelectQueryInfoBase
     bool settings_limit_offset_done = false;
     Block minmax_count_projection_block;
     MergeTreeDataSelectAnalysisResultPtr merge_tree_select_result_ptr;
+
+    InputOrderInfoPtr getInputOrderInfo() const
+    {
+        return input_order_info ? input_order_info : (projection ? projection->input_order_info : nullptr);
+    }
 };
-
-/// Contains non-copyable stuff
-struct SelectQueryInfo : SelectQueryInfoBase
-{
-    SelectQueryInfo() = default;
-    SelectQueryInfo(const SelectQueryInfo & other) : SelectQueryInfoBase(other) {}
-
-    /// Make subquery_for_sets reusable across different interpreters.
-    SubqueriesForSets subquery_for_sets;
-};
-
 }
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index b3ea2cb9f5b..cc55b2ae271 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -59,6 +59,8 @@
 #include <TableFunctions/TableFunctionView.h>
 #include <TableFunctions/TableFunctionFactory.h>
 
+#include <Storages/IStorageCluster.h>
+
 #include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
@@ -759,55 +761,35 @@ SinkToStoragePtr StorageDistributed::write(const ASTPtr &, const StorageMetadata
 }
 
 
-std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
+std::optional<QueryPipeline> StorageDistributed::distributedWriteBetweenDistributedTables(const StorageDistributed & src_distributed, const ASTInsertQuery & query, ContextPtr local_context) const
 {
-    QueryPipeline pipeline;
-
-    const Settings & settings = local_context->getSettingsRef();
-    if (settings.max_distributed_depth && local_context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
-        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
-
-    std::shared_ptr<StorageDistributed> storage_src;
-    auto & select = query.select->as<ASTSelectWithUnionQuery &>();
+    const auto & settings = local_context->getSettingsRef();
     auto new_query = std::dynamic_pointer_cast<ASTInsertQuery>(query.clone());
-    if (select.list_of_selects->children.size() == 1)
+
+    /// Unwrap view() function.
+    if (src_distributed.remote_table_function_ptr)
     {
-        if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
-        {
-            JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
+        const TableFunctionPtr src_table_function =
+            TableFunctionFactory::instance().get(src_distributed.remote_table_function_ptr, local_context);
+        const TableFunctionView * view_function =
+            assert_cast<const TableFunctionView *>(src_table_function.get());
+        new_query->select = view_function->getSelectQuery().clone();
+    }
+    else
+    {
+        const auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
+        select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
 
-            if (joined_tables.tablesCount() == 1)
-            {
-                storage_src = std::dynamic_pointer_cast<StorageDistributed>(joined_tables.getLeftTableStorage());
-                if (storage_src)
-                {
-                    /// Unwrap view() function.
-                    if (storage_src->remote_table_function_ptr)
-                    {
-                        const TableFunctionPtr src_table_function =
-                            TableFunctionFactory::instance().get(storage_src->remote_table_function_ptr, local_context);
-                        const TableFunctionView * view_function =
-                            assert_cast<const TableFunctionView *>(src_table_function.get());
-                        new_query->select = view_function->getSelectQuery().clone();
-                    }
-                    else
-                    {
-                        const auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
-                        select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
+        auto * select = query.select->as<ASTSelectWithUnionQuery &>().list_of_selects->children.at(0)->as<ASTSelectQuery>();
+        auto new_select_query = std::dynamic_pointer_cast<ASTSelectQuery>(select->clone());
+        select_with_union_query->list_of_selects->children.push_back(new_select_query);
 
-                        auto new_select_query = std::dynamic_pointer_cast<ASTSelectQuery>(select_query->clone());
-                        select_with_union_query->list_of_selects->children.push_back(new_select_query);
+        new_select_query->replaceDatabaseAndTable(src_distributed.getRemoteDatabaseName(), src_distributed.getRemoteTableName());
 
-                        new_select_query->replaceDatabaseAndTable(storage_src->getRemoteDatabaseName(), storage_src->getRemoteTableName());
-
-                        new_query->select = select_with_union_query;
-                    }
-                }
-            }
-        }
+        new_query->select = select_with_union_query;
     }
 
-    const Cluster::AddressesWithFailover & src_addresses = storage_src ? storage_src->getCluster()->getShardsAddresses() : Cluster::AddressesWithFailover{};
+    const Cluster::AddressesWithFailover & src_addresses = src_distributed.getCluster()->getShardsAddresses();
     const Cluster::AddressesWithFailover & dst_addresses = getCluster()->getShardsAddresses();
     /// Compare addresses instead of cluster name, to handle remote()/cluster().
     /// (since for remote()/cluster() the getClusterName() is empty string)
@@ -822,7 +804,7 @@ std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInser
             LOG_WARNING(log,
                 "Parallel distributed INSERT SELECT is not possible "
                 "(source cluster={} ({} addresses), destination cluster={} ({} addresses))",
-                storage_src ? storage_src->getClusterName() : "<not a Distributed table>",
+                src_distributed.getClusterName(),
                 src_addresses.size(),
                 getClusterName(),
                 dst_addresses.size());
@@ -849,6 +831,7 @@ std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInser
         new_query_str = buf.str();
     }
 
+    QueryPipeline pipeline;
     ContextMutablePtr query_context = Context::createCopy(local_context);
     ++query_context->getClientInfo().distributed_depth;
 
@@ -882,6 +865,114 @@ std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInser
 }
 
 
+std::optional<QueryPipeline> StorageDistributed::distributedWriteFromClusterStorage(const IStorageCluster & src_storage_cluster, const ASTInsertQuery & query, ContextPtr local_context) const
+{
+    const auto & settings = local_context->getSettingsRef();
+    auto extension = src_storage_cluster.getTaskIteratorExtension(local_context);
+
+    auto dst_cluster = getCluster();
+
+    auto new_query = std::dynamic_pointer_cast<ASTInsertQuery>(query.clone());
+    if (settings.parallel_distributed_insert_select == PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL)
+    {
+        new_query->table_id = StorageID(getRemoteDatabaseName(), getRemoteTableName());
+        /// Reset table function for INSERT INTO remote()/cluster()
+        new_query->table_function.reset();
+    }
+
+    String new_query_str;
+    {
+        WriteBufferFromOwnString buf;
+        IAST::FormatSettings ast_format_settings(buf, /*one_line*/ true);
+        ast_format_settings.always_quote_identifiers = true;
+        new_query->IAST::format(ast_format_settings);
+        new_query_str = buf.str();
+    }
+
+    QueryPipeline pipeline;
+    ContextMutablePtr query_context = Context::createCopy(local_context);
+    ++query_context->getClientInfo().distributed_depth;
+
+    /// Here we take addresses from destination cluster and assume source table exists on these nodes
+    for (const auto & replicas : getCluster()->getShardsAddresses())
+    {
+        /// There will be only one replica, because we consider each replica as a shard
+        for (const auto & node : replicas)
+        {
+            auto connection = std::make_shared<Connection>(
+                node.host_name, node.port, query_context->getGlobalContext()->getCurrentDatabase(),
+                node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
+                "ParallelInsertSelectInititiator",
+                node.compression,
+                node.secure
+            );
+
+            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
+                connection,
+                new_query_str,
+                Block{},
+                query_context,
+                /*throttler=*/nullptr,
+                Scalars{},
+                Tables{},
+                QueryProcessingStage::Complete,
+                extension);
+
+            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote));
+            remote_pipeline.complete(std::make_shared<EmptySink>(remote_query_executor->getHeader()));
+
+            pipeline.addCompletedPipeline(std::move(remote_pipeline));
+        }
+    }
+
+    return pipeline;
+}
+
+
+std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
+{
+    const Settings & settings = local_context->getSettingsRef();
+    if (settings.max_distributed_depth && local_context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
+        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
+
+    auto & select = query.select->as<ASTSelectWithUnionQuery &>();
+
+    StoragePtr src_storage;
+
+    if (select.list_of_selects->children.size() == 1)
+    {
+        if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
+        {
+            JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
+
+            if (joined_tables.tablesCount() == 1)
+            {
+                src_storage = joined_tables.getLeftTableStorage();
+            }
+        }
+    }
+
+    if (!src_storage)
+        return {};
+
+    if (auto src_distributed = std::dynamic_pointer_cast<StorageDistributed>(src_storage))
+    {
+        return distributedWriteBetweenDistributedTables(*src_distributed, query, local_context);
+    }
+    else if (auto src_storage_cluster = std::dynamic_pointer_cast<IStorageCluster>(src_storage))
+    {
+        return distributedWriteFromClusterStorage(*src_storage_cluster, query, local_context);
+    }
+    else if (local_context->getClientInfo().distributed_depth == 0)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parallel distributed INSERT SELECT is not possible. "\
+            "Reason: distributed reading is supported only from Distributed engine or *Cluster table functions, but got {} storage", src_storage->getName());
+    }
+
+    return {};
+}
+
+
 void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
     auto name_deps = getDependentViewsByColumn(local_context);
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 7cb25ae46ab..3161f4b50f6 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Storages/IStorage.h>
+#include <Storages/IStorageCluster.h>
 #include <Storages/Distributed/DirectoryMonitor.h>
 #include <Storages/Distributed/DistributedSettings.h>
 #include <Storages/getStructureOfRemoteTable.h>
@@ -207,6 +208,9 @@ private:
 
     void delayInsertOrThrowIfNeeded() const;
 
+    std::optional<QueryPipeline> distributedWriteFromClusterStorage(const IStorageCluster & src_storage_cluster, const ASTInsertQuery & query, ContextPtr context) const;
+    std::optional<QueryPipeline> distributedWriteBetweenDistributedTables(const StorageDistributed & src_distributed, const ASTInsertQuery & query, ContextPtr context) const;
+
     String remote_database;
     String remote_table;
     ASTPtr remote_table_function_ptr;
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 672727b1478..4f66c76f1eb 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -444,36 +444,24 @@ public:
 
     using FilesInfoPtr = std::shared_ptr<FilesInfo>;
 
-    static Block getHeader(const StorageMetadataPtr & metadata_snapshot, bool need_path_column, bool need_file_column)
+    static Block getBlockForSource(const Block & block_for_format, const FilesInfoPtr & files_info)
     {
-        auto header = metadata_snapshot->getSampleBlock();
-
-        /// Note: AddingDefaultsTransform doesn't change header.
-
-        if (need_path_column)
-            header.insert(
+        auto res = block_for_format;
+        if (files_info->need_path_column)
+        {
+            res.insert(
                 {DataTypeLowCardinality{std::make_shared<DataTypeString>()}.createColumn(),
                  std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
                  "_path"});
-        if (need_file_column)
-            header.insert(
+        }
+        if (files_info->need_file_column)
+        {
+            res.insert(
                 {DataTypeLowCardinality{std::make_shared<DataTypeString>()}.createColumn(),
                  std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
                  "_file"});
-
-        return header;
-    }
-
-    static Block getBlockForSource(
-        const StorageFilePtr & storage,
-        const StorageSnapshotPtr & storage_snapshot,
-        const ColumnsDescription & columns_description,
-        const FilesInfoPtr & files_info)
-    {
-        if (storage->supportsSubsetOfColumns())
-            return storage_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical());
-        else
-            return getHeader(storage_snapshot->metadata, files_info->need_path_column, files_info->need_file_column);
+        }
+        return res;
     }
 
     StorageFileSource(
@@ -483,13 +471,15 @@ public:
         UInt64 max_block_size_,
         FilesInfoPtr files_info_,
         ColumnsDescription columns_description_,
+        const Block & block_for_format_,
         std::unique_ptr<ReadBuffer> read_buf_)
-        : ISource(getBlockForSource(storage_, storage_snapshot_, columns_description_, files_info_))
+        : ISource(getBlockForSource(block_for_format_, files_info_))
         , storage(std::move(storage_))
         , storage_snapshot(storage_snapshot_)
         , files_info(std::move(files_info_))
         , read_buf(std::move(read_buf_))
         , columns_description(std::move(columns_description_))
+        , block_for_format(block_for_format_)
         , context(context_)
         , max_block_size(max_block_size_)
     {
@@ -533,15 +523,8 @@ public:
                 if (!read_buf)
                     read_buf = createReadBuffer(current_path, storage->use_table_fd, storage->getName(), storage->table_fd, storage->compression_method, context);
 
-                auto get_block_for_format = [&]() -> Block
-                {
-                    if (storage->supportsSubsetOfColumns())
-                        return storage_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical());
-                    return storage_snapshot->metadata->getSampleBlock();
-                };
-
-                auto format = context->getInputFormat(
-                    storage->format_name, *read_buf, get_block_for_format(), max_block_size, storage->format_settings);
+                auto format
+                    = context->getInputFormat(storage->format_name, *read_buf, block_for_format, max_block_size, storage->format_settings);
 
                 QueryPipelineBuilder builder;
                 builder.init(Pipe(format));
@@ -627,6 +610,7 @@ private:
     std::unique_ptr<PullingPipelineExecutor> reader;
 
     ColumnsDescription columns_description;
+    Block block_for_format;
 
     ContextPtr context;    /// TODO Untangle potential issues with context lifetime.
     UInt64 max_block_size;
@@ -693,13 +677,30 @@ Pipe StorageFile::read(
 
     for (size_t i = 0; i < num_streams; ++i)
     {
-        const auto get_columns_for_format = [&]() -> ColumnsDescription
+        ColumnsDescription columns_description;
+        Block block_for_format;
+        if (supportsSubsetOfColumns())
         {
-            if (supportsSubsetOfColumns())
-                return storage_snapshot->getDescriptionForColumns(column_names);
-            else
-                return storage_snapshot->metadata->getColumns();
-        };
+            auto fetch_columns = column_names;
+            const auto & virtuals = getVirtuals();
+            std::erase_if(
+                fetch_columns,
+                [&](const String & col)
+                {
+                    return std::any_of(
+                        virtuals.begin(), virtuals.end(), [&](const NameAndTypePair & virtual_col) { return col == virtual_col.name; });
+                });
+
+            if (fetch_columns.empty())
+                fetch_columns.push_back(ExpressionActions::getSmallestColumn(storage_snapshot->metadata->getColumns().getAllPhysical()));
+            columns_description = storage_snapshot->getDescriptionForColumns(fetch_columns);
+        }
+        else
+        {
+            columns_description = storage_snapshot->metadata->getColumns();
+        }
+
+        block_for_format = storage_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical());
 
         /// In case of reading from fd we have to check whether we have already created
         /// the read buffer from it in Storage constructor (for schema inference) or not.
@@ -710,7 +711,14 @@ Pipe StorageFile::read(
             read_buffer = std::move(peekable_read_buffer_from_fd);
 
         pipes.emplace_back(std::make_shared<StorageFileSource>(
-            this_ptr, storage_snapshot, context, max_block_size, files_info, get_columns_for_format(), std::move(read_buffer)));
+            this_ptr,
+            storage_snapshot,
+            context,
+            max_block_size,
+            files_info,
+            columns_description,
+            block_for_format,
+            std::move(read_buffer)));
     }
 
     return Pipe::unitePipes(std::move(pipes));
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index d875b4ee80c..9cac1e57297 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -220,7 +220,10 @@ ColumnPtr fillColumnWithRandomData(
         {
             auto column = ColumnInt32::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int32), rng);
+
+            for (size_t i = 0; i < limit; ++i)
+                column->getData()[i] = (rng() % static_cast<UInt64>(DATE_LUT_SIZE)) - DAYNUM_OFFSET_EPOCH;
+
             return column;
         }
         case TypeIndex::UInt32: [[fallthrough]];
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index c94fd3b2256..2e3e1d443ae 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -14,7 +14,7 @@
 #include <Interpreters/castColumn.h>
 #include <Common/quoteString.h>
 #include <Common/Exception.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 #include <Compression/CompressedWriteBuffer.h>
 #include <Processors/ISource.h>
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index a75fe944a34..390af09422c 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -4,7 +4,7 @@
 #include <Storages/StorageSet.h>
 #include <Storages/TableLockHolder.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 
 namespace DB
@@ -76,14 +76,10 @@ public:
     Block getRightSampleBlock() const
     {
         auto metadata_snapshot = getInMemoryMetadataPtr();
-        Block block = metadata_snapshot->getSampleBlock().sortColumns();
+        Block block = metadata_snapshot->getSampleBlock();
         if (use_nulls && isLeftOrFull(kind))
-        {
             for (auto & col : block)
-            {
                 JoinCommon::convertColumnToNullable(col);
-            }
-        }
         return block;
     }
 
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index ccb88992732..c6bc55fd620 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -729,6 +729,7 @@ void StorageLog::rename(const String & new_path_to_table_data, const StorageID &
 {
     assert(table_path != new_path_to_table_data);
     {
+        disk->createDirectories(new_path_to_table_data);
         disk->moveDirectory(table_path, new_path_to_table_data);
 
         table_path = new_path_to_table_data;
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 666717e50a0..2bedf406b7d 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -542,7 +542,7 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
             return {};
 
         if (auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(plan.getRootNode()->step.get()))
-            read_from_merge_tree->addFilter(added_filter, added_filter_column_name);
+            read_from_merge_tree->addFilterNodes(added_filter_nodes);
 
         builder = plan.buildQueryPipeline(
             QueryPlanOptimizationSettings::fromContext(modified_context),
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index d2f94ac6b88..6bf68660803 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -140,8 +140,8 @@ public:
 
     void addFilter(ActionsDAGPtr expression, std::string column_name)
     {
-        added_filter = std::move(expression);
-        added_filter_column_name = std::move(column_name);
+        added_filter_dags.push_back(expression);
+        added_filter_nodes.nodes.push_back(&expression->findInOutputs(column_name));
     }
 
 private:
@@ -160,7 +160,9 @@ private:
     ContextMutablePtr context;
     QueryProcessingStage::Enum common_processed_stage;
 
-    ActionsDAGPtr added_filter;
+    std::vector<ActionsDAGPtr> added_filter_dags;
+    ActionDAGNodes added_filter_nodes;
+
     std::string added_filter_column_name;
 
     struct AliasData
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 30d8449df95..908372b462e 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -123,7 +123,7 @@ void StorageMergeTree::startup()
 
     /// Temporary directories contain incomplete results of merges (after forced restart)
     ///  and don't allow to reinitialize them, so delete each of them immediately
-    clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_"});
+    clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_", "tmp-fetch_"});
 
     /// NOTE background task will also do the above cleanups periodically.
     time_after_previous_cleanup_parts.restart();
@@ -1594,6 +1594,7 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
 
     DataPartsVector src_parts = src_data.getVisibleDataPartsVectorInPartition(local_context, partition_id);
     MutableDataPartsVector dst_parts;
+    std::vector<scope_guard> dst_parts_locks;
 
     static const String TMP_PREFIX = "tmp_replace_from_";
 
@@ -1608,8 +1609,9 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
         Int64 temp_index = insert_increment.get();
         MergeTreePartInfo dst_part_info(partition_id, temp_index, temp_index, src_part->info.level);
 
-        auto dst_part = cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, my_metadata_snapshot, local_context->getCurrentTransaction(), {}, false);
+        auto [dst_part, part_lock] = cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, my_metadata_snapshot, local_context->getCurrentTransaction(), {}, false);
         dst_parts.emplace_back(std::move(dst_part));
+        dst_parts_locks.emplace_back(std::move(part_lock));
     }
 
     /// ATTACH empty part set
@@ -1687,6 +1689,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
 
     DataPartsVector src_parts = src_data.getVisibleDataPartsVectorInPartition(local_context, partition_id);
     MutableDataPartsVector dst_parts;
+    std::vector<scope_guard> dst_parts_locks;
 
     static const String TMP_PREFIX = "tmp_move_from_";
 
@@ -1701,8 +1704,9 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
         Int64 temp_index = insert_increment.get();
         MergeTreePartInfo dst_part_info(partition_id, temp_index, temp_index, src_part->info.level);
 
-        auto dst_part = dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, dest_metadata_snapshot, local_context->getCurrentTransaction(), {}, false);
+        auto [dst_part, part_lock] = dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, dest_metadata_snapshot, local_context->getCurrentTransaction(), {}, false);
         dst_parts.emplace_back(std::move(dst_part));
+        dst_parts_locks.emplace_back(std::move(part_lock));
     }
 
     /// empty part set
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index b4fc6b34c9e..393cdf76c7a 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -41,14 +41,17 @@
 #include <Storages/Freeze.h>
 
 #include <Databases/DatabaseOnDisk.h>
+#include <Databases/DatabaseReplicated.h>
 
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
+#include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTOptimizeQuery.h>
 #include <Parsers/ASTPartition.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ExpressionListParsers.h>
@@ -58,6 +61,7 @@
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
+#include <Processors/Sinks/EmptySink.h>
 
 #include <IO/ReadBufferFromString.h>
 #include <IO/Operators.h>
@@ -72,6 +76,7 @@
 #include <Interpreters/InterserverCredentials.h>
 #include <Interpreters/SelectQueryOptions.h>
 #include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/JoinedTables.h>
 
 #include <Backups/BackupEntriesCollector.h>
 #include <Backups/IBackup.h>
@@ -158,6 +163,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int CONCURRENT_ACCESS_NOT_SUPPORTED;
     extern const int CHECKSUM_DOESNT_MATCH;
+    extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
 }
 
 namespace ActionLocks
@@ -466,7 +472,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         }
         /// Temporary directories contain uninitialized results of Merges or Fetches (after forced restart),
         /// don't allow to reinitialize them, delete each of them immediately.
-        clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_"});
+        clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_", "tmp-fetch_"});
         clearOldWriteAheadLogs();
         if (getSettings()->merge_tree_enable_clear_old_broken_detached)
             clearOldBrokenPartsFromDetachedDirecory();
@@ -1107,19 +1113,18 @@ void StorageReplicatedMergeTree::checkTableStructure(const String & zookeeper_pr
     }
 }
 
-void StorageReplicatedMergeTree::setTableStructure(
+void StorageReplicatedMergeTree::setTableStructure(const StorageID & table_id, const ContextPtr & local_context,
     ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff)
 {
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
-    StorageInMemoryMetadata new_metadata = metadata_diff.getNewMetadata(new_columns, getContext(), old_metadata);
+    StorageInMemoryMetadata new_metadata = metadata_diff.getNewMetadata(new_columns, local_context, old_metadata);
 
     /// Even if the primary/sorting/partition keys didn't change we must reinitialize it
     /// because primary/partition key column types might have changed.
     checkTTLExpressions(new_metadata, old_metadata);
     setProperties(new_metadata, old_metadata);
 
-    auto table_id = getStorageID();
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(getContext(), table_id, new_metadata);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
 }
 
 
@@ -1957,6 +1962,8 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
         String replica;
 
         MergeTreeData::HardlinkedFiles hardlinked_files;
+
+        scope_guard temporary_part_lock;
     };
 
     using PartDescriptionPtr = std::shared_ptr<PartDescription>;
@@ -2203,8 +2210,10 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
             if (part_desc->checksum_hex != part_desc->src_table_part->checksums.getTotalChecksumHex())
                 throw Exception("Checksums of " + part_desc->src_table_part->name + " is suddenly changed", ErrorCodes::UNFINISHED);
 
-            part_desc->res_part = cloneAndLoadDataPartOnSameDisk(
+            auto [res_part, temporary_part_lock] = cloneAndLoadDataPartOnSameDisk(
                 part_desc->src_table_part, TMP_PREFIX + "clone_", part_desc->new_part_info, metadata_snapshot, NO_TRANSACTION_PTR, &part_desc->hardlinked_files, false);
+            part_desc->res_part = std::move(res_part);
+            part_desc->temporary_part_lock = std::move(temporary_part_lock);
         }
         else if (!part_desc->replica.empty())
         {
@@ -3841,7 +3850,7 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
 
     if (!to_detached)
     {
-        if (auto part = getPartIfExists(part_info, {IMergeTreeDataPart::State::Outdated, IMergeTreeDataPart::State::Deleting}))
+        if (auto part = getPartIfExists(part_info, {MergeTreeDataPartState::Outdated, MergeTreeDataPartState::Deleting}))
         {
             LOG_DEBUG(log, "Part {} should be deleted after previous attempt before fetch", part->name);
             /// Force immediate parts cleanup to delete the part that was left from the previous fetch attempt.
@@ -3943,12 +3952,15 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
     std::optional<CurrentlySubmergingEmergingTagger> tagger_ptr;
     std::function<MutableDataPartPtr()> get_part;
     MergeTreeData::HardlinkedFiles hardlinked_files;
+    scope_guard part_to_clone_lock;
 
     if (part_to_clone)
     {
         get_part = [&, part_to_clone]()
         {
-            return cloneAndLoadDataPartOnSameDisk(part_to_clone, "tmp_clone_", part_info, metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, false);
+            auto [cloned_part, lock] = cloneAndLoadDataPartOnSameDisk(part_to_clone, "tmp_clone_", part_info, metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, false);
+            part_to_clone_lock = std::move(lock);
+            return cloned_part;
         };
     }
     else
@@ -4044,7 +4056,10 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
         /// The same part is being written right now (but probably it's not committed yet).
         /// We will check the need for fetch later.
         if (e.code() == ErrorCodes::DIRECTORY_ALREADY_EXISTS)
+        {
+            LOG_TRACE(log, "Not fetching part: {}", e.message());
             return false;
+        }
 
         throw;
     }
@@ -4077,7 +4092,7 @@ DataPartStoragePtr StorageReplicatedMergeTree::fetchExistsPart(
     auto zookeeper = getZooKeeper();
     const auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
 
-    if (auto part = getPartIfExists(part_info, {IMergeTreeDataPart::State::Outdated, IMergeTreeDataPart::State::Deleting}))
+    if (auto part = getPartIfExists(part_info, {MergeTreeDataPartState::Outdated, MergeTreeDataPartState::Deleting}))
     {
         LOG_DEBUG(log, "Part {} should be deleted after previous attempt before fetch", part->name);
         /// Force immediate parts cleanup to delete the part that was left from the previous fetch attempt.
@@ -4156,7 +4171,10 @@ DataPartStoragePtr StorageReplicatedMergeTree::fetchExistsPart(
         /// The same part is being written right now (but probably it's not committed yet).
         /// We will check the need for fetch later.
         if (e.code() == ErrorCodes::DIRECTORY_ALREADY_EXISTS)
+        {
+            LOG_TRACE(log, "Not fetching part: {}", e.message());
             return nullptr;
+        }
 
         throw;
     }
@@ -4443,8 +4461,9 @@ SinkToStoragePtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, con
     bool deduplicate = storage_settings_ptr->replicated_deduplication_window != 0 && query_settings.insert_deduplicate;
 
     // TODO: should we also somehow pass list of columns to deduplicate on to the ReplicatedMergeTreeSink?
+    // TODO: insert_quorum = 'auto' would be supported in https://github.com/ClickHouse/ClickHouse/pull/39970, now it's same as 0.
     return std::make_shared<ReplicatedMergeTreeSink>(
-        *this, metadata_snapshot, query_settings.insert_quorum,
+        *this, metadata_snapshot, query_settings.insert_quorum.valueOr(0),
         query_settings.insert_quorum_timeout.totalMilliseconds(),
         query_settings.max_partitions_per_insert_block,
         query_settings.insert_quorum_parallel,
@@ -4453,6 +4472,106 @@ SinkToStoragePtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, con
 }
 
 
+std::optional<QueryPipeline> StorageReplicatedMergeTree::distributedWriteFromClusterStorage(const std::shared_ptr<IStorageCluster> & src_storage_cluster, const ASTInsertQuery & query, ContextPtr local_context)
+{
+    const auto & settings = local_context->getSettingsRef();
+    auto extension = src_storage_cluster->getTaskIteratorExtension(local_context);
+
+    /// Here we won't check that the cluster formed from table replicas is a subset of a cluster specified in s3Cluster/hdfsCluster table function
+    auto src_cluster = src_storage_cluster->getCluster(local_context);
+
+    /// Actually the query doesn't change, we just serialize it to string
+    String query_str;
+    {
+        WriteBufferFromOwnString buf;
+        IAST::FormatSettings ast_format_settings(buf, /*one_line*/ true);
+        ast_format_settings.always_quote_identifiers = true;
+        query.IAST::format(ast_format_settings);
+        query_str = buf.str();
+    }
+
+    QueryPipeline pipeline;
+    ContextMutablePtr query_context = Context::createCopy(local_context);
+    ++query_context->getClientInfo().distributed_depth;
+
+    for (const auto & replicas : src_cluster->getShardsAddresses())
+    {
+        /// There will be only one replica, because we consider each replica as a shard
+        for (const auto & node : replicas)
+        {
+            auto connection = std::make_shared<Connection>(
+                node.host_name, node.port, query_context->getGlobalContext()->getCurrentDatabase(),
+                node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
+                "ParallelInsertSelectInititiator",
+                node.compression,
+                node.secure
+            );
+
+            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
+                connection,
+                query_str,
+                Block{},
+                query_context,
+                /*throttler=*/nullptr,
+                Scalars{},
+                Tables{},
+                QueryProcessingStage::Complete,
+                extension);
+
+            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote));
+            remote_pipeline.complete(std::make_shared<EmptySink>(remote_query_executor->getHeader()));
+
+            pipeline.addCompletedPipeline(std::move(remote_pipeline));
+        }
+    }
+
+    return pipeline;
+}
+
+std::optional<QueryPipeline> StorageReplicatedMergeTree::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
+{
+    /// Do not enable parallel distributed INSERT SELECT in case when query probably comes from another server
+    if (local_context->getClientInfo().query_kind != ClientInfo::QueryKind::INITIAL_QUERY)
+        return {};
+
+    const Settings & settings = local_context->getSettingsRef();
+    if (settings.max_distributed_depth && local_context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
+        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
+
+    auto & select = query.select->as<ASTSelectWithUnionQuery &>();
+
+    StoragePtr src_storage;
+
+    if (select.list_of_selects->children.size() == 1)
+    {
+        if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
+        {
+            JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
+
+            if (joined_tables.tablesCount() == 1)
+            {
+                src_storage = joined_tables.getLeftTableStorage();
+            }
+        }
+    }
+
+    if (!src_storage)
+        return {};
+
+    if (auto src_distributed = std::dynamic_pointer_cast<IStorageCluster>(src_storage))
+    {
+        return distributedWriteFromClusterStorage(src_distributed, query, local_context);
+    }
+    else if (local_context->getClientInfo().distributed_depth == 0)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parallel distributed INSERT SELECT is not possible. Reason: distributed "\
+            "reading into Replicated table is supported only from *Cluster table functions, but got {} storage", src_storage->getName());
+    }
+
+    return {};
+}
+
+
 bool StorageReplicatedMergeTree::optimize(
     const ASTPtr &,
     const StorageMetadataPtr &,
@@ -4614,7 +4733,31 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
     requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "columns", entry.columns_str, -1));
     requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "metadata", entry.metadata_str, -1));
 
-    zookeeper->multi(requests);
+    auto table_id = getStorageID();
+    auto alter_context = getContext();
+
+    auto database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
+    bool is_in_replicated_database = database->getEngineName() == "Replicated";
+
+    if (is_in_replicated_database)
+    {
+        auto mutable_alter_context = Context::createCopy(getContext());
+        const auto * replicated = dynamic_cast<const DatabaseReplicated *>(database.get());
+        mutable_alter_context->makeQueryContext();
+        auto alter_txn = std::make_shared<ZooKeeperMetadataTransaction>(zookeeper, replicated->getZooKeeperPath(),
+                                                                       /* is_initial_query */ false, /* task_zk_path */ "");
+        mutable_alter_context->initZooKeeperMetadataTransaction(alter_txn);
+        alter_context = mutable_alter_context;
+
+        for (auto & op : requests)
+            alter_txn->addOp(std::move(op));
+        requests.clear();
+        /// Requests will be executed by database in setTableStructure
+    }
+    else
+    {
+        zookeeper->multi(requests);
+    }
 
     {
         auto table_lock_holder = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
@@ -4622,13 +4765,14 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
         LOG_INFO(log, "Metadata changed in ZooKeeper. Applying changes locally.");
 
         auto metadata_diff = ReplicatedMergeTreeTableMetadata(*this, getInMemoryMetadataPtr()).checkAndFindDiff(metadata_from_entry, getInMemoryMetadataPtr()->getColumns(), getContext());
-        setTableStructure(std::move(columns_from_entry), metadata_diff);
+        setTableStructure(table_id, alter_context, std::move(columns_from_entry), metadata_diff);
         metadata_version = entry.alter_version;
 
         LOG_INFO(log, "Applied changes to the metadata of the table. Current metadata version: {}", metadata_version);
     }
 
     /// This transaction may not happen, but it's OK, because on the next retry we will eventually create/update this node
+    /// TODO Maybe do in in one transaction for Replicated database?
     zookeeper->createOrUpdate(fs::path(replica_path) / "metadata_version", std::to_string(metadata_version), zkutil::CreateMode::Persistent);
 
     return true;
@@ -5142,9 +5286,28 @@ void StorageReplicatedMergeTree::checkTableCanBeRenamed(const StorageID & new_na
         return;
 
     if (renaming_restrictions == RenamingRestrictions::DO_NOT_ALLOW)
-        throw Exception("Cannot rename Replicated table, because zookeeper_path contains implicit 'database' or 'table' macro. "
-                        "We cannot rename path in ZooKeeper, so path may become inconsistent with table name. If you really want to rename table, "
-                        "you should edit metadata file first and restart server or reattach the table.", ErrorCodes::NOT_IMPLEMENTED);
+    {
+        auto old_name = getStorageID();
+        bool is_server_startup = Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER
+            && !Context::getGlobalContextInstance()->isServerCompletelyStarted();
+        bool move_to_atomic = old_name.uuid == UUIDHelpers::Nil && new_name.uuid != UUIDHelpers::Nil;
+
+        bool likely_converting_ordinary_to_atomic = is_server_startup && move_to_atomic;
+        if (likely_converting_ordinary_to_atomic)
+        {
+            LOG_INFO(log, "Table {} should not be renamed, because zookeeper_path contains implicit 'database' or 'table' macro. "
+                          "We cannot rename path in ZooKeeper, so path may become inconsistent with table name. "
+                          "However, we allow renaming while converting Ordinary database to Atomic, because all tables will be renamed back",
+                          old_name.getNameForLogs());
+            return;
+        }
+
+        throw Exception(
+            "Cannot rename Replicated table, because zookeeper_path contains implicit 'database' or 'table' macro. "
+            "We cannot rename path in ZooKeeper, so path may become inconsistent with table name. If you really want to rename table, "
+            "you should edit metadata file first and restart server or reattach the table.",
+            ErrorCodes::NOT_IMPLEMENTED);
+    }
 
     assert(renaming_restrictions == RenamingRestrictions::ALLOW_PRESERVING_UUID);
     if (!new_name.hasUUID() && getStorageID().hasUUID())
@@ -6376,6 +6539,7 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     {
         DataPartsVector src_parts;
         MutableDataPartsVector dst_parts;
+        std::vector<scope_guard> dst_parts_locks;
         Strings block_id_paths;
         Strings part_checksums;
         std::vector<EphemeralLockInZooKeeper> ephemeral_locks;
@@ -6442,10 +6606,11 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
             bool copy_instead_of_hardlink = storage_settings_ptr->allow_remote_fs_zero_copy_replication
                                             && src_part->isStoredOnRemoteDiskWithZeroCopySupport();
 
-            auto dst_part = cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, copy_instead_of_hardlink);
+            auto [dst_part, part_lock] = cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, copy_instead_of_hardlink);
 
             src_parts.emplace_back(src_part);
             dst_parts.emplace_back(dst_part);
+            dst_parts_locks.emplace_back(std::move(part_lock));
             ephemeral_locks.emplace_back(std::move(*lock));
             block_id_paths.emplace_back(block_id_path);
             part_checksums.emplace_back(hash_hex);
@@ -6645,6 +6810,7 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
         Coordination::Stat dest_alter_partition_version_stat;
         zookeeper->get(dest_alter_partition_version_path, &dest_alter_partition_version_stat);
         std::vector<MergeTreeData::HardlinkedFiles> hardlinked_files_for_parts;
+        std::vector<scope_guard> temporary_parts_locks;
 
         for (const auto & src_part : src_all_parts)
         {
@@ -6671,10 +6837,11 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
             bool copy_instead_of_hardlink = storage_settings_ptr->allow_remote_fs_zero_copy_replication
                                             && src_part->isStoredOnRemoteDiskWithZeroCopySupport();
 
-            auto dst_part = dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, dest_metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, copy_instead_of_hardlink);
+            auto [dst_part, dst_part_lock] = dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, dest_metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, copy_instead_of_hardlink);
 
             src_parts.emplace_back(src_part);
             dst_parts.emplace_back(dst_part);
+            temporary_parts_locks.emplace_back(std::move(dst_part_lock));
             ephemeral_locks.emplace_back(std::move(*lock));
             block_id_paths.emplace_back(block_id_path);
             part_checksums.emplace_back(hash_hex);
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index c35e2d5cf5c..3f03fb70f7a 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -4,6 +4,7 @@
 #include <atomic>
 #include <pcg_random.hpp>
 #include <Storages/IStorage.h>
+#include <Storages/IStorageCluster.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
 #include <Storages/MergeTree/MergeTreePartsMover.h>
@@ -136,6 +137,8 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
+    std::optional<QueryPipeline> distributedWrite(const ASTInsertQuery & /*query*/, ContextPtr /*context*/) override;
+
     bool optimize(
         const ASTPtr & query,
         const StorageMetadataPtr & metadata_snapshot,
@@ -465,6 +468,8 @@ private:
     std::mutex last_broken_disks_mutex;
     std::set<String> last_broken_disks;
 
+    static std::optional<QueryPipeline> distributedWriteFromClusterStorage(const std::shared_ptr<IStorageCluster> & src_storage_cluster, const ASTInsertQuery & query, ContextPtr context);
+
     template <class Func>
     void foreachActiveParts(Func && func, bool select_sequential_consistency) const;
 
@@ -486,7 +491,8 @@ private:
 
     /// A part of ALTER: apply metadata changes only (data parts are altered separately).
     /// Must be called under IStorage::lockForAlter() lock.
-    void setTableStructure(ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff);
+    void setTableStructure(const StorageID & table_id, const ContextPtr & local_context,
+                           ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff);
 
     /** Check that the set of parts corresponds to that in ZK (/replicas/me/parts/).
       * If any parts described in ZK are not locally, throw an exception.
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index 297f806d086..0c5e69cb906 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -56,7 +56,7 @@ StorageS3Cluster::StorageS3Cluster(
     const ConstraintsDescription & constraints_,
     ContextPtr context_,
     const String & compression_method_)
-    : IStorage(table_id_)
+    : IStorageCluster(table_id_)
     , s3_configuration{S3::URI{Poco::URI{filename_}}, access_key_id_, secret_access_key_, {}, {}, S3Settings::ReadWriteSettings(context_->getSettingsRef())}
     , filename(filename_)
     , cluster_name(cluster_name_)
@@ -105,12 +105,7 @@ Pipe StorageS3Cluster::read(
     unsigned /*num_streams*/)
 {
     StorageS3::updateS3Configuration(context, s3_configuration);
-
-    auto cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
-
-    auto iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
-        *s3_configuration.client, s3_configuration.uri, query_info.query, virtual_block, context);
-    auto callback = std::make_shared<StorageS3Source::IteratorWrapper>([iterator]() mutable -> String { return iterator->next(); });
+    createIteratorAndCallback(query_info.query, context);
 
     /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
     Block header =
@@ -129,7 +124,7 @@ Pipe StorageS3Cluster::read(
         {
             auto connection = std::make_shared<Connection>(
                 node.host_name, node.port, context->getGlobalContext()->getCurrentDatabase(),
-                node.user, node.password, node.cluster, node.cluster_secret,
+                node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
                 "S3ClusterInititiator",
                 node.compression,
                 node.secure
@@ -170,6 +165,29 @@ QueryProcessingStage::Enum StorageS3Cluster::getQueryProcessingStage(
 }
 
 
+void StorageS3Cluster::createIteratorAndCallback(ASTPtr query, ContextPtr context) const
+{
+    cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
+    iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
+        *s3_configuration.client, s3_configuration.uri, query, virtual_block, context);
+    callback = std::make_shared<StorageS3Source::IteratorWrapper>([iter = this->iterator]() mutable -> String { return iter->next(); });
+}
+
+
+RemoteQueryExecutor::Extension StorageS3Cluster::getTaskIteratorExtension(ContextPtr context) const
+{
+    createIteratorAndCallback(/*query=*/nullptr, context);
+    return RemoteQueryExecutor::Extension{.task_iterator = callback};
+}
+
+
+ClusterPtr StorageS3Cluster::getCluster(ContextPtr context) const
+{
+    createIteratorAndCallback(/*query=*/nullptr, context);
+    return cluster;
+}
+
+
 NamesAndTypesList StorageS3Cluster::getVirtuals() const
 {
     return virtual_columns;
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index f823d1fdf04..e18c33e79da 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -10,6 +10,7 @@
 #include "Client/Connection.h"
 #include <Interpreters/Cluster.h>
 #include <IO/S3Common.h>
+#include <Storages/IStorageCluster.h>
 #include <Storages/StorageS3.h>
 
 namespace DB
@@ -17,7 +18,7 @@ namespace DB
 
 class Context;
 
-class StorageS3Cluster : public IStorage
+class StorageS3Cluster : public IStorageCluster
 {
 public:
     StorageS3Cluster(
@@ -42,15 +43,22 @@ public:
 
     NamesAndTypesList getVirtuals() const override;
 
+    RemoteQueryExecutor::Extension getTaskIteratorExtension(ContextPtr context) const override;
+    ClusterPtr getCluster(ContextPtr context) const override;
 private:
     StorageS3::S3Configuration s3_configuration;
-
     String filename;
     String cluster_name;
     String format_name;
     String compression_method;
     NamesAndTypesList virtual_columns;
     Block virtual_block;
+
+    mutable ClusterPtr cluster;
+    mutable std::shared_ptr<StorageS3Source::DisclosedGlobIterator> iterator;
+    mutable std::shared_ptr<StorageS3Source::IteratorWrapper> callback;
+
+    void createIteratorAndCallback(ASTPtr query, ContextPtr context) const;
 };
 
 
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index 2f586a3c26c..48f8adfece2 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -81,12 +81,11 @@ SetOrJoinSink::SetOrJoinSink(
 
 void SetOrJoinSink::consume(Chunk chunk)
 {
-    /// Sort columns in the block. This is necessary, since Set and Join count on the same column order in different blocks.
-    Block sorted_block = getHeader().cloneWithColumns(chunk.detachColumns()).sortColumns();
+    Block block = getHeader().cloneWithColumns(chunk.detachColumns());
 
-    table.insertBlock(sorted_block, getContext());
+    table.insertBlock(block, getContext());
     if (persistent)
-        backup_stream.write(sorted_block);
+        backup_stream.write(block);
 }
 
 void SetOrJoinSink::onFinish()
@@ -147,9 +146,7 @@ StorageSet::StorageSet(
     : StorageSetOrJoinBase{disk_, relative_path_, table_id_, columns_, constraints_, comment, persistent_}
     , set(std::make_shared<Set>(SizeLimits(), false, true))
 {
-
     Block header = getInMemoryMetadataPtr()->getSampleBlock();
-    header = header.sortColumns();
     set->setHeader(header.getColumnsWithTypeAndName());
 
     restore();
@@ -170,7 +167,6 @@ void StorageSet::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_sn
     disk->createDirectories(fs::path(path) / "tmp/");
 
     Block header = metadata_snapshot->getSampleBlock();
-    header = header.sortColumns();
 
     increment = 0;
     set = std::make_shared<Set>(SizeLimits(), false, true);
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index e3f477936db..0ecbdb0db10 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -320,6 +320,7 @@ void StorageStripeLog::rename(const String & new_path_to_table_data, const Stora
 {
     assert(table_path != new_path_to_table_data);
     {
+        disk->createDirectories(new_path_to_table_data);
         disk->moveDirectory(table_path, new_path_to_table_data);
 
         table_path = new_path_to_table_data;
diff --git a/src/Storages/System/StorageSystemFilesystemCache.cpp b/src/Storages/System/StorageSystemFilesystemCache.cpp
index 2baddadec90..6d711498091 100644
--- a/src/Storages/System/StorageSystemFilesystemCache.cpp
+++ b/src/Storages/System/StorageSystemFilesystemCache.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileSegment.h>
 #include <Common/FileCacheFactory.h>
 #include <Interpreters/Context.h>
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index 1b207d1d165..07f3cd0ccc5 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -98,7 +98,7 @@ StorageSystemParts::StorageSystemParts(const StorageID & table_id_)
 void StorageSystemParts::processNextStorage(
     ContextPtr context, MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column)
 {
-    using State = IMergeTreeDataPart::State;
+    using State = MergeTreeDataPartState;
     MergeTreeData::DataPartStateVector all_parts_state;
     MergeTreeData::DataPartsVector all_parts;
 
diff --git a/src/Storages/System/StorageSystemPartsColumns.cpp b/src/Storages/System/StorageSystemPartsColumns.cpp
index 292d8087c10..87a5afe2439 100644
--- a/src/Storages/System/StorageSystemPartsColumns.cpp
+++ b/src/Storages/System/StorageSystemPartsColumns.cpp
@@ -117,7 +117,7 @@ void StorageSystemPartsColumns::processNextStorage(
         auto index_size_in_bytes = part->getIndexSizeInBytes();
         auto index_size_in_allocated_bytes = part->getIndexSizeInAllocatedBytes();
 
-        using State = IMergeTreeDataPart::State;
+        using State = MergeTreeDataPartState;
 
         size_t column_position = 0;
         for (const auto & column : part->getColumns())
diff --git a/src/Storages/System/StorageSystemProjectionParts.cpp b/src/Storages/System/StorageSystemProjectionParts.cpp
index 7314c1e5012..3934e7c9623 100644
--- a/src/Storages/System/StorageSystemProjectionParts.cpp
+++ b/src/Storages/System/StorageSystemProjectionParts.cpp
@@ -92,7 +92,7 @@ StorageSystemProjectionParts::StorageSystemProjectionParts(const StorageID & tab
 void StorageSystemProjectionParts::processNextStorage(
     ContextPtr, MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column)
 {
-    using State = IMergeTreeDataPart::State;
+    using State = MergeTreeDataPartState;
     MergeTreeData::DataPartStateVector all_parts_state;
     MergeTreeData::ProjectionPartsVector all_parts = info.getProjectionParts(all_parts_state, has_state_column);
     for (size_t part_number = 0; part_number < all_parts.projection_parts.size(); ++part_number)
diff --git a/src/Storages/System/StorageSystemProjectionPartsColumns.cpp b/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
index 78a6df58761..0847010faaa 100644
--- a/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
+++ b/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
@@ -122,7 +122,7 @@ void StorageSystemProjectionPartsColumns::processNextStorage(
         auto index_size_in_bytes = part->getIndexSizeInBytes();
         auto index_size_in_allocated_bytes = part->getIndexSizeInAllocatedBytes();
 
-        using State = IMergeTreeDataPart::State;
+        using State = MergeTreeDataPartState;
 
         size_t column_position = 0;
         auto & columns_info = projection_columns_info[part->name];
diff --git a/src/Storages/System/StorageSystemRemoteDataPaths.cpp b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
index a482f5d87ca..b224a72e787 100644
--- a/src/Storages/System/StorageSystemRemoteDataPaths.cpp
+++ b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
@@ -1,7 +1,7 @@
 #include "StorageSystemRemoteDataPaths.h"
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeArray.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileCacheFactory.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnArray.h>
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index 40cf650f690..43e31b8e4f4 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -1,3 +1,4 @@
+#include <memory>
 #include <Core/NamesAndTypes.h>
 
 #include <Interpreters/Context.h>
@@ -154,14 +155,13 @@ bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block
     std::function<bool(const ASTPtr &)> is_constant = [&block, &context](const ASTPtr & node)
     {
         auto actions = std::make_shared<ActionsDAG>(block.getColumnsWithTypeAndName());
-        PreparedSets prepared_sets;
-        SubqueriesForSets subqueries_for_sets;
+        PreparedSetsPtr prepared_sets = std::make_shared<PreparedSets>();
         const NamesAndTypesList source_columns;
         const NamesAndTypesList aggregation_keys;
         const ColumnNumbersList grouping_set_keys;
 
         ActionsVisitor::Data visitor_data(
-            context, SizeLimits{}, 1, source_columns, std::move(actions), prepared_sets, subqueries_for_sets, true, true, true, false,
+            context, SizeLimits{}, 1, source_columns, std::move(actions), prepared_sets, true, true, true, false,
             { aggregation_keys, grouping_set_keys, GroupByKind::NONE });
         ActionsVisitor(visitor_data).visit(node);
         actions = visitor_data.getActions();
diff --git a/tests/ci/ast_fuzzer_check.py b/tests/ci/ast_fuzzer_check.py
index 918e27a4e11..9f3ddbe9932 100644
--- a/tests/ci/ast_fuzzer_check.py
+++ b/tests/ci/ast_fuzzer_check.py
@@ -117,7 +117,7 @@ if __name__ == "__main__":
         "core.gz": os.path.join(workspace_path, "core.gz"),
     }
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     for f in paths:
         try:
             paths[f] = s3_helper.upload_test_report_to_s3(paths[f], s3_prefix + "/" + f)
diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index 488fd1bbb34..610877a5508 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -15,6 +15,7 @@ from env_helper import (
     IMAGES_PATH,
     REPO_COPY,
     S3_BUILDS_BUCKET,
+    S3_DOWNLOAD,
     TEMP_PATH,
 )
 from s3_helper import S3Helper
@@ -142,11 +143,9 @@ def check_for_success_run(
     for url in build_results:
         url_escaped = url.replace("+", "%2B").replace(" ", "%20")
         if BUILD_LOG_NAME in url:
-            log_url = f"https://s3.amazonaws.com/{S3_BUILDS_BUCKET}/{url_escaped}"
+            log_url = f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{url_escaped}"
         else:
-            build_urls.append(
-                f"https://s3.amazonaws.com/{S3_BUILDS_BUCKET}/{url_escaped}"
-            )
+            build_urls.append(f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{url_escaped}")
     if not log_url:
         # log is uploaded the last, so if there's no log we need to rerun the build
         return
@@ -250,7 +249,7 @@ def main():
 
     logging.info("Repo copy path %s", REPO_COPY)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     version = get_version_from_repo(git=Git(True))
     release_or_pr, performance_pr = get_release_or_pr(pr_info, version)
diff --git a/tests/ci/build_report_check.py b/tests/ci/build_report_check.py
index f1f92cded1d..7ebebb881bc 100644
--- a/tests/ci/build_report_check.py
+++ b/tests/ci/build_report_check.py
@@ -244,7 +244,7 @@ def main():
         logging.error("No success builds, failing check")
         sys.exit(1)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     branch_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/commits/master"
     branch_name = "master"
diff --git a/tests/ci/ccache_utils.py b/tests/ci/ccache_utils.py
index bd155b02cb4..cfe07363589 100644
--- a/tests/ci/ccache_utils.py
+++ b/tests/ci/ccache_utils.py
@@ -7,9 +7,10 @@ import os
 import shutil
 from pathlib import Path
 
-import requests
+import requests  # type: ignore
 
 from compress_files import decompress_fast, compress_fast
+from env_helper import S3_DOWNLOAD, S3_BUILDS_BUCKET
 
 DOWNLOAD_RETRIES_COUNT = 5
 
@@ -73,7 +74,7 @@ def get_ccache_if_not_exists(
         for obj in objects:
             if ccache_name in obj:
                 logging.info("Found ccache on path %s", obj)
-                url = "https://s3.amazonaws.com/clickhouse-builds/" + obj
+                url = f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{obj}"
                 compressed_cache = os.path.join(temp_path, os.path.basename(obj))
                 dowload_file_with_progress(url, compressed_cache)
 
diff --git a/tests/ci/cherry_pick.py b/tests/ci/cherry_pick.py
index 5382106d26b..d8e4b8fe3a5 100644
--- a/tests/ci/cherry_pick.py
+++ b/tests/ci/cherry_pick.py
@@ -206,8 +206,13 @@ Merge it only if you intend to backport changes to the target branch, otherwise
         )
         self.cherrypick_pr.add_to_labels(Labels.LABEL_CHERRYPICK)
         self.cherrypick_pr.add_to_labels(Labels.LABEL_DO_NOT_TEST)
-        if self.pr.assignee is not None:
-            self.cherrypick_pr.add_to_assignees(self.pr.assignee)
+        if self.pr.assignees:
+            logging.info(
+                "Assing to assignees of the original PR: %s",
+                ", ".join(user.login for user in self.pr.assignees),
+            )
+            self.cherrypick_pr.add_to_assignees(self.pr.assignees)
+        logging.info("Assign to the author of the original PR: %s", self.pr.user.login)
         self.cherrypick_pr.add_to_assignees(self.pr.user)
 
     def create_backport(self):
@@ -239,8 +244,13 @@ Merge it only if you intend to backport changes to the target branch, otherwise
             head=self.backport_branch,
         )
         self.backport_pr.add_to_labels(Labels.LABEL_BACKPORT)
-        if self.pr.assignee is not None:
-            self.cherrypick_pr.add_to_assignees(self.pr.assignee)
+        if self.pr.assignees:
+            logging.info(
+                "Assing to assignees of the original PR: %s",
+                ", ".join(user.login for user in self.pr.assignees),
+            )
+            self.cherrypick_pr.add_to_assignees(self.pr.assignees)
+        logging.info("Assign to the author of the original PR: %s", self.pr.user.login)
         self.backport_pr.add_to_assignees(self.pr.user)
 
     @property
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index 5b8f3b4227e..4b2cf4df743 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -354,4 +354,9 @@ REQUIRED_CHECKS = [
     "ClickHouse special build check",
     "Stateful tests (release)",
     "Stateless tests (release)",
+    "Unit tests (release-clang)",
+    "Unit tests (asan)",
+    "Unit tests (msan)",
+    "Unit tests (tsan)",
+    "Unit tests (ubsan)",
 ]
diff --git a/tests/ci/codebrowser_check.py b/tests/ci/codebrowser_check.py
index 230a778c598..97036c6fc7b 100644
--- a/tests/ci/codebrowser_check.py
+++ b/tests/ci/codebrowser_check.py
@@ -7,7 +7,7 @@ import logging
 
 from github import Github
 
-from env_helper import IMAGES_PATH, REPO_COPY
+from env_helper import IMAGES_PATH, REPO_COPY, S3_TEST_REPORTS_BUCKET, S3_DOWNLOAD
 from stopwatch import Stopwatch
 from upload_result_helper import upload_results
 from s3_helper import S3Helper
@@ -23,7 +23,7 @@ def get_run_command(repo_path, output_path, image):
     cmd = (
         "docker run " + f"--volume={repo_path}:/repo_folder "
         f"--volume={output_path}:/test_output "
-        f"-e 'DATA=https://s3.amazonaws.com/clickhouse-test-reports/codebrowser/data' {image}"
+        f"-e 'DATA={S3_DOWNLOAD}/{S3_TEST_REPORTS_BUCKET}/codebrowser/data' {image}"
     )
     return cmd
 
@@ -41,7 +41,7 @@ if __name__ == "__main__":
         os.makedirs(temp_path)
 
     docker_image = get_image_with_version(IMAGES_PATH, "clickhouse/codebrowser")
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     result_path = os.path.join(temp_path, "result_path")
     if not os.path.exists(result_path):
@@ -69,7 +69,10 @@ if __name__ == "__main__":
         report_path, s3_path_prefix, "clickhouse-test-reports"
     )
 
-    index_html = '<a href="https://s3.amazonaws.com/clickhouse-test-reports/codebrowser/index.html">HTML report</a>'
+    index_html = (
+        '<a href="{S3_DOWNLOAD}/{S3_TEST_REPORTS_BUCKET}/codebrowser/index.html">'
+        "HTML report</a>"
+    )
 
     test_results = [(index_html, "Look at the report")]
 
diff --git a/tests/ci/compatibility_check.py b/tests/ci/compatibility_check.py
index 2a1b9716189..39d027ad3c0 100644
--- a/tests/ci/compatibility_check.py
+++ b/tests/ci/compatibility_check.py
@@ -169,7 +169,7 @@ if __name__ == "__main__":
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_result(
         result_path, server_log_path
     )
diff --git a/tests/ci/docker_images_check.py b/tests/ci/docker_images_check.py
index 8b838defa8b..181555f3a94 100644
--- a/tests/ci/docker_images_check.py
+++ b/tests/ci/docker_images_check.py
@@ -460,7 +460,7 @@ def main():
     with open(changed_json, "w", encoding="utf-8") as images_file:
         json.dump(result_images, images_file)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     s3_path_prefix = (
         str(pr_info.number) + "/" + pr_info.sha + "/" + NAME.lower().replace(" ", "_")
diff --git a/tests/ci/docker_manifests_merge.py b/tests/ci/docker_manifests_merge.py
index 00ab0b9e77f..09b7a99da78 100644
--- a/tests/ci/docker_manifests_merge.py
+++ b/tests/ci/docker_manifests_merge.py
@@ -203,7 +203,7 @@ def main():
         json.dump(changed_images, ci)
 
     pr_info = PRInfo()
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, [], NAME)
 
diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
index 09a75206442..e0053f09664 100644
--- a/tests/ci/docker_server.py
+++ b/tests/ci/docker_server.py
@@ -16,7 +16,7 @@ from build_check import get_release_or_pr
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
 from commit_status_helper import post_commit_status
 from docker_images_check import DockerImage
-from env_helper import CI, GITHUB_RUN_URL, RUNNER_TEMP, S3_BUILDS_BUCKET
+from env_helper import CI, GITHUB_RUN_URL, RUNNER_TEMP, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from git_helper import Git
 from pr_info import PRInfo
@@ -309,8 +309,7 @@ def main():
         pr_info = PRInfo()
         release_or_pr, _ = get_release_or_pr(pr_info, args.version)
         args.bucket_prefix = (
-            f"https://s3.amazonaws.com/{S3_BUILDS_BUCKET}/"
-            f"{release_or_pr}/{pr_info.sha}"
+            f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{release_or_pr}/{pr_info.sha}"
         )
 
     if args.push:
@@ -336,7 +335,7 @@ def main():
                 status = "failure"
 
     pr_info = pr_info or PRInfo()
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, [], NAME)
 
diff --git a/tests/ci/docs_check.py b/tests/ci/docs_check.py
index cf4fd8da692..c95770b646d 100644
--- a/tests/ci/docs_check.py
+++ b/tests/ci/docs_check.py
@@ -120,7 +120,7 @@ if __name__ == "__main__":
         else:
             lines.append(("Non zero exit code", "FAIL"))
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     ch_helper = ClickHouseHelper()
 
     report_url = upload_results(
diff --git a/tests/ci/docs_release.py b/tests/ci/docs_release.py
index 35203486fae..355e4af7426 100644
--- a/tests/ci/docs_release.py
+++ b/tests/ci/docs_release.py
@@ -106,7 +106,7 @@ if __name__ == "__main__":
         else:
             lines.append(("Non zero exit code", "FAIL"))
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     report_url = upload_results(
         s3_helper, pr_info.number, pr_info.sha, lines, additional_files, NAME
diff --git a/tests/ci/env_helper.py b/tests/ci/env_helper.py
index dd081523db1..12c21398781 100644
--- a/tests/ci/env_helper.py
+++ b/tests/ci/env_helper.py
@@ -1,6 +1,8 @@
 import os
 from os import path as p
 
+from build_download_helper import get_with_retries
+
 module_dir = p.abspath(p.dirname(__file__))
 git_root = p.abspath(p.join(module_dir, "..", ".."))
 
@@ -20,5 +22,41 @@ IMAGES_PATH = os.getenv("IMAGES_PATH", TEMP_PATH)
 REPORTS_PATH = os.getenv("REPORTS_PATH", p.abspath(p.join(module_dir, "./reports")))
 REPO_COPY = os.getenv("REPO_COPY", git_root)
 RUNNER_TEMP = os.getenv("RUNNER_TEMP", p.abspath(p.join(module_dir, "./tmp")))
+S3_URL = os.getenv("S3_URL", "https://s3.amazonaws.com")
+S3_DOWNLOAD = os.getenv("S3_DOWNLOAD", S3_URL)
 S3_BUILDS_BUCKET = os.getenv("S3_BUILDS_BUCKET", "clickhouse-builds")
 S3_TEST_REPORTS_BUCKET = os.getenv("S3_TEST_REPORTS_BUCKET", "clickhouse-test-reports")
+
+# These parameters are set only on demand, and only once
+_GITHUB_JOB_ID = ""
+_GITHUB_JOB_URL = ""
+
+
+def GITHUB_JOB_ID() -> str:
+    global _GITHUB_JOB_ID
+    global _GITHUB_JOB_URL
+    if _GITHUB_JOB_ID:
+        return _GITHUB_JOB_ID
+    jobs = []
+    while not _GITHUB_JOB_ID:
+        response = get_with_retries(
+            f"https://api.github.com/repos/{GITHUB_REPOSITORY}/"
+            f"actions/runs/{GITHUB_RUN_ID}/jobs?per_page=100"
+        )
+        data = response.json()
+        jobs.extend(data["jobs"])
+        for job in data["jobs"]:
+            if job["name"] != GITHUB_JOB:
+                continue
+            _GITHUB_JOB_ID = job["id"]
+            _GITHUB_JOB_URL = job["html_url"]
+            return _GITHUB_JOB_ID
+        if len(jobs) == data["total_count"]:
+            _GITHUB_JOB_ID = "0"
+
+    return _GITHUB_JOB_ID
+
+
+def GITHUB_JOB_URL() -> str:
+    GITHUB_JOB_ID()
+    return _GITHUB_JOB_URL
diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py
index 9852175ca92..038289406de 100644
--- a/tests/ci/fast_test_check.py
+++ b/tests/ci/fast_test_check.py
@@ -31,6 +31,9 @@ from ccache_utils import get_ccache_if_not_exists, upload_ccache
 
 NAME = "Fast test"
 
+# Will help to avoid errors like _csv.Error: field larger than field limit (131072)
+csv.field_size_limit(sys.maxsize)
+
 
 def get_fasttest_cmd(
     workspace, output_path, ccache_path, repo_path, pr_number, commit_sha, image
@@ -105,7 +108,7 @@ if __name__ == "__main__":
 
     docker_image = get_image_with_version(temp_path, "clickhouse/fasttest")
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     workspace = os.path.join(temp_path, "fasttest-workspace")
     if not os.path.exists(workspace):
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
index 690ac3c1851..388f93f34ec 100644
--- a/tests/ci/functional_test_check.py
+++ b/tests/ci/functional_test_check.py
@@ -88,7 +88,8 @@ def get_run_command(
 
     envs = [
         f"-e MAX_RUN_TIME={int(0.9 * kill_timeout)}",
-        '-e S3_URL="https://clickhouse-datasets.s3.amazonaws.com"',
+        # a static link, don't use S3_URL or S3_DOWNLOAD
+        '-e S3_URL="https://s3.amazonaws.com/clickhouse-datasets"',
     ]
 
     if flaky_check:
@@ -314,7 +315,7 @@ if __name__ == "__main__":
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     state, description, test_results, additional_logs = process_results(
         result_path, server_log_path
diff --git a/tests/ci/integration_test_check.py b/tests/ci/integration_test_check.py
index 565864d576c..3709a7271d7 100644
--- a/tests/ci/integration_test_check.py
+++ b/tests/ci/integration_test_check.py
@@ -249,7 +249,7 @@ if __name__ == "__main__":
     ch_helper = ClickHouseHelper()
     mark_flaky_tests(ch_helper, check_name, test_results)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     report_url = upload_results(
         s3_helper,
         pr_info.number,
diff --git a/tests/ci/keeper_jepsen_check.py b/tests/ci/keeper_jepsen_check.py
index 88ccf8e8828..a0695d3283a 100644
--- a/tests/ci/keeper_jepsen_check.py
+++ b/tests/ci/keeper_jepsen_check.py
@@ -9,7 +9,7 @@ import boto3
 from github import Github
 import requests
 
-from env_helper import REPO_COPY, TEMP_PATH
+from env_helper import REPO_COPY, TEMP_PATH, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from stopwatch import Stopwatch
 from upload_result_helper import upload_results
 from s3_helper import S3Helper
@@ -192,7 +192,7 @@ if __name__ == "__main__":
     # run (see .github/workflows/jepsen.yml) So we cannot add explicit
     # dependency on a build job and using busy loop on it's results. For the
     # same reason we are using latest docker image.
-    build_url = f"https://s3.amazonaws.com/clickhouse-builds/{release_or_pr}/{pr_info.sha}/{build_name}/clickhouse"
+    build_url = f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{release_or_pr}/{pr_info.sha}/{build_name}/clickhouse"
     head = requests.head(build_url)
     counter = 0
     while head.status_code != 200:
@@ -248,7 +248,7 @@ if __name__ == "__main__":
         description = "No Jepsen output log"
         test_result = [("No Jepsen output log", "FAIL")]
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     report_url = upload_results(
         s3_helper,
         pr_info.number,
diff --git a/tests/ci/performance_comparison_check.py b/tests/ci/performance_comparison_check.py
index 57a52dcaa6a..40befc78de2 100644
--- a/tests/ci/performance_comparison_check.py
+++ b/tests/ci/performance_comparison_check.py
@@ -15,7 +15,7 @@ from github import Github
 from commit_status_helper import get_commit, post_commit_status
 from ci_config import CI_CONFIG
 from docker_pull_helper import get_image_with_version
-from env_helper import GITHUB_EVENT_PATH, GITHUB_RUN_URL
+from env_helper import GITHUB_EVENT_PATH, GITHUB_RUN_URL, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from pr_info import PRInfo
 from rerun_helper import RerunHelper
@@ -86,7 +86,7 @@ if __name__ == "__main__":
 
     docker_env = ""
 
-    docker_env += " -e S3_URL=https://s3.amazonaws.com/clickhouse-builds"
+    docker_env += f" -e S3_URL={S3_DOWNLOAD}/{S3_BUILDS_BUCKET}"
     docker_env += f" -e BUILD_NAME={required_build}"
 
     if pr_info.number == 0:
@@ -197,7 +197,7 @@ if __name__ == "__main__":
     }
 
     s3_prefix = f"{pr_info.number}/{pr_info.sha}/{check_name_prefix}/"
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     uploaded = {}  # type: Dict[str, str]
     for name, path in paths.items():
         try:
diff --git a/tests/ci/push_to_artifactory.py b/tests/ci/push_to_artifactory.py
index 98de315ddae..08d0a67f87b 100755
--- a/tests/ci/push_to_artifactory.py
+++ b/tests/ci/push_to_artifactory.py
@@ -9,7 +9,7 @@ from typing import Dict, List, Tuple
 
 from artifactory import ArtifactorySaaSPath  # type: ignore
 from build_download_helper import dowload_build_with_progress
-from env_helper import RUNNER_TEMP, S3_BUILDS_BUCKET
+from env_helper import RUNNER_TEMP, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from git_helper import TAG_REGEXP, commit, removeprefix, removesuffix
 
 
@@ -98,7 +98,7 @@ class Packages:
 
 class S3:
     template = (
-        "https://s3.amazonaws.com/"
+        f"{S3_DOWNLOAD}"
         # "clickhouse-builds/"
         f"{S3_BUILDS_BUCKET}/"
         # "33333/" or "21.11/" from --release, if pull request is omitted
diff --git a/tests/ci/report.py b/tests/ci/report.py
index d924be5885b..7d84185b863 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -34,6 +34,7 @@ th {{ cursor: pointer; }}
 <a href="{commit_url}">Commit</a>
 {additional_urls}
 <a href="{task_url}">Task (github actions)</a>
+<a href="{job_url}">Job (github actions)</a>
 </p>
 {test_part}
 </body>
@@ -150,6 +151,7 @@ def create_test_html_report(
     test_result,
     raw_log_url,
     task_url,
+    job_url,
     branch_url,
     branch_name,
     commit_url,
@@ -236,12 +238,17 @@ def create_test_html_report(
         [_get_html_url(url) for url in sorted(additional_urls, key=_get_html_url_name)]
     )
 
+    raw_log_name = os.path.basename(raw_log_url)
+    if "?" in raw_log_name:
+        raw_log_name = raw_log_name.split("?")[0]
+
     result = HTML_BASE_TEST_TEMPLATE.format(
         title=_format_header(header, branch_name),
         header=_format_header(header, branch_name, branch_url),
-        raw_log_name=os.path.basename(raw_log_url),
+        raw_log_name=raw_log_name,
         raw_log_url=raw_log_url,
         task_url=task_url,
+        job_url=job_url,
         test_part=test_part,
         branch_name=branch_name,
         commit_url=commit_url,
@@ -255,20 +262,7 @@ HTML_BASE_BUILD_TEMPLATE = """
 <html>
 <head>
   <style>
-@font-face {{
-    font-family:'Yandex Sans Display Web';
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot);
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot?#iefix) format('embedded-opentype'),
-            url(https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2) format('woff2'),
-            url(https://yastatic.net/adv-www/_/v2Sve_obH3rKm6rKrtSQpf-eB7U.woff) format('woff'),
-            url(https://yastatic.net/adv-www/_/PzD8hWLMunow5i3RfJ6WQJAL7aI.ttf) format('truetype'),
-            url(https://yastatic.net/adv-www/_/lF_KG5g4tpQNlYIgA0e77fBSZ5s.svg#YandexSansDisplayWeb-Regular) format('svg');
-    font-weight:400;
-    font-style:normal;
-    font-stretch:normal
-}}
-
-body {{ font-family: "Yandex Sans Display Web", Arial, sans-serif; background: #EEE; }}
+body {{ font-family: "DejaVu Sans", "Noto Sans", Arial, sans-serif; background: #EEE; }}
 h1 {{ margin-left: 10px; }}
 th, td {{ border: 0; padding: 5px 10px 5px 10px; text-align: left; vertical-align: top; line-height: 1.5; background-color: #FFF;
 border: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0, 0, 0.1); }}
diff --git a/tests/ci/s3_helper.py b/tests/ci/s3_helper.py
index 91e67135f6f..24ff013d69a 100644
--- a/tests/ci/s3_helper.py
+++ b/tests/ci/s3_helper.py
@@ -9,7 +9,14 @@ from multiprocessing.dummy import Pool
 
 import boto3  # type: ignore
 
-from env_helper import S3_TEST_REPORTS_BUCKET, S3_BUILDS_BUCKET, RUNNER_TEMP, CI
+from env_helper import (
+    S3_TEST_REPORTS_BUCKET,
+    S3_BUILDS_BUCKET,
+    RUNNER_TEMP,
+    CI,
+    S3_URL,
+    S3_DOWNLOAD,
+)
 from compress_files import compress_file_fast
 
 
@@ -33,9 +40,11 @@ def _flatten_list(lst):
 
 
 class S3Helper:
-    def __init__(self, host):
+    def __init__(self, host=S3_URL, download_host=S3_DOWNLOAD):
         self.session = boto3.session.Session(region_name="us-east-1")
         self.client = self.session.client("s3", endpoint_url=host)
+        self.host = host
+        self.download_host = download_host
 
     def _upload_file_to_s3(self, bucket_name, file_path, s3_path):
         logging.debug(
@@ -98,13 +107,8 @@ class S3Helper:
         logging.info("Upload %s to %s. Meta: %s", file_path, s3_path, metadata)
         # last two replacements are specifics of AWS urls:
         # https://jamesd3142.wordpress.com/2018/02/28/amazon-s3-and-the-plus-symbol/
-        return (
-            "https://s3.amazonaws.com/{bucket}/{path}".format(
-                bucket=bucket_name, path=s3_path
-            )
-            .replace("+", "%2B")
-            .replace(" ", "%20")
-        )
+        url = f"{self.download_host}/{bucket_name}/{s3_path}"
+        return url.replace("+", "%2B").replace(" ", "%20")
 
     def upload_test_report_to_s3(self, file_path, s3_path):
         if CI:
@@ -175,9 +179,7 @@ class S3Helper:
                     t = time.time()
             except Exception as ex:
                 logging.critical("Failed to upload file, expcetion %s", ex)
-            return "https://s3.amazonaws.com/{bucket}/{path}".format(
-                bucket=bucket_name, path=s3_path
-            )
+            return f"{self.download_host}/{bucket_name}/{s3_path}"
 
         p = Pool(256)
 
@@ -286,6 +288,13 @@ class S3Helper:
 
         return result
 
+    def exists(self, key, bucket=S3_BUILDS_BUCKET):
+        try:
+            self.client.head_object(Bucket=bucket, Key=key)
+            return True
+        except Exception:
+            return False
+
     @staticmethod
     def copy_file_to_local(bucket_name, file_path, s3_path):
         local_path = os.path.abspath(
diff --git a/tests/ci/split_build_smoke_check.py b/tests/ci/split_build_smoke_check.py
index 87a528d2761..c6bf1051c87 100644
--- a/tests/ci/split_build_smoke_check.py
+++ b/tests/ci/split_build_smoke_check.py
@@ -126,7 +126,7 @@ if __name__ == "__main__":
     )
 
     ch_helper = ClickHouseHelper()
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     report_url = upload_results(
         s3_helper,
         pr_info.number,
diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py
index e63f66e2e50..497df013cf4 100644
--- a/tests/ci/stress_check.py
+++ b/tests/ci/stress_check.py
@@ -31,7 +31,10 @@ def get_run_command(
 ):
     cmd = (
         "docker run --cap-add=SYS_PTRACE "
-        "-e S3_URL='https://clickhouse-datasets.s3.amazonaws.com' "
+        # a static link, don't use S3_URL or S3_DOWNLOAD
+        "-e S3_URL='https://s3.amazonaws.com/clickhouse-datasets' "
+        # For dmesg
+        "--cap-add syslog "
         f"--volume={build_path}:/package_folder "
         f"--volume={result_folder}:/test_output "
         f"--volume={repo_tests_path}:/usr/share/clickhouse-test "
@@ -148,7 +151,7 @@ if __name__ == "__main__":
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_results(
         result_path, server_log_path, run_log_path
     )
diff --git a/tests/ci/style_check.py b/tests/ci/style_check.py
index 66837ccb84e..23a1dd467d7 100644
--- a/tests/ci/style_check.py
+++ b/tests/ci/style_check.py
@@ -166,7 +166,7 @@ if __name__ == "__main__":
         os.makedirs(temp_path)
 
     docker_image = get_image_with_version(temp_path, "clickhouse/style-test")
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     cmd = (
         f"docker run -u $(id -u ${{USER}}):$(id -g ${{USER}}) --cap-add=SYS_PTRACE "
diff --git a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
index cd5b0d26e3f..defa400453f 100644
--- a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
+++ b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
@@ -7,18 +7,20 @@ cd "$WORKDIR"
 PY_EXEC=python3.9
 LAMBDA_NAME=$(basename "$PWD")
 LAMBDA_NAME=${LAMBDA_NAME//_/-}
-VENV=lambda-venv
-rm -rf "$VENV" lambda-package.zip
-"$PY_EXEC" -m venv "$VENV"
-#virtualenv "$VENV"
-# shellcheck disable=SC1091
-source "$VENV/bin/activate"
-pip install -r requirements.txt
 PACKAGE=lambda-package
 rm -rf "$PACKAGE" "$PACKAGE".zip
-cp -r "$VENV/lib/$PY_EXEC/site-packages" "$PACKAGE"
+mkdir "$PACKAGE"
 cp app.py "$PACKAGE"
-rm -r "$PACKAGE"/{pip,pip-*,setuptools,setuptools-*}
-( cd "$PACKAGE" && zip -r ../"$PACKAGE".zip . )
+if [ -f requirements.txt ]; then
+  VENV=lambda-venv
+  rm -rf "$VENV" lambda-package.zip
+  "$PY_EXEC" -m venv "$VENV"
+  # shellcheck disable=SC1091
+  source "$VENV/bin/activate"
+  pip install -r requirements.txt
+  cp -rT "$VENV/lib/$PY_EXEC/site-packages/" "$PACKAGE"
+  rm -r "$PACKAGE"/{pip,pip-*,setuptools,setuptools-*}
+fi
+( cd "$PACKAGE" && zip -9 -r ../"$PACKAGE".zip . )
 
 aws lambda update-function-code --function-name "$LAMBDA_NAME" --zip-file fileb://"$PACKAGE".zip
diff --git a/tests/ci/unit_tests_check.py b/tests/ci/unit_tests_check.py
index 4441709cb7b..c2dfab9dddc 100644
--- a/tests/ci/unit_tests_check.py
+++ b/tests/ci/unit_tests_check.py
@@ -4,6 +4,7 @@ import logging
 import os
 import sys
 import subprocess
+import atexit
 
 from github import Github
 
@@ -14,7 +15,7 @@ from pr_info import PRInfo
 from build_download_helper import download_unit_tests
 from upload_result_helper import upload_results
 from docker_pull_helper import get_image_with_version
-from commit_status_helper import post_commit_status
+from commit_status_helper import post_commit_status, update_mergeable_check
 from clickhouse_helper import (
     ClickHouseHelper,
     mark_flaky_tests,
@@ -116,6 +117,8 @@ if __name__ == "__main__":
 
     gh = Github(get_best_robot_token(), per_page=100)
 
+    atexit.register(update_mergeable_check, gh, pr_info, check_name)
+
     rerun_helper = RerunHelper(gh, pr_info, check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
@@ -147,7 +150,7 @@ if __name__ == "__main__":
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_result(test_output)
 
     ch_helper = ClickHouseHelper()
diff --git a/tests/ci/upload_result_helper.py b/tests/ci/upload_result_helper.py
index 289fc4b3184..0fde4408176 100644
--- a/tests/ci/upload_result_helper.py
+++ b/tests/ci/upload_result_helper.py
@@ -2,7 +2,12 @@ import os
 import logging
 import ast
 
-from env_helper import GITHUB_SERVER_URL, GITHUB_REPOSITORY, GITHUB_RUN_URL
+from env_helper import (
+    GITHUB_JOB_URL,
+    GITHUB_REPOSITORY,
+    GITHUB_RUN_URL,
+    GITHUB_SERVER_URL,
+)
 from report import ReportColorTheme, create_test_html_report
 
 
@@ -66,13 +71,11 @@ def upload_results(
         branch_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/pull/{pr_number}"
     commit_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/commit/{commit_sha}"
 
-    task_url = GITHUB_RUN_URL
-
     if additional_urls:
         raw_log_url = additional_urls[0]
         additional_urls.pop(0)
     else:
-        raw_log_url = task_url
+        raw_log_url = GITHUB_JOB_URL()
 
     statuscolors = (
         ReportColorTheme.bugfixcheck if "bugfix validate check" in check_name else None
@@ -82,7 +85,8 @@ def upload_results(
         check_name,
         test_results,
         raw_log_url,
-        task_url,
+        GITHUB_RUN_URL,
+        GITHUB_JOB_URL(),
         branch_url,
         branch_name,
         commit_url,
diff --git a/tests/ci/workflow_approve_rerun_lambda/app.py b/tests/ci/workflow_approve_rerun_lambda/app.py
index ef0759be6e1..29f3271a34c 100644
--- a/tests/ci/workflow_approve_rerun_lambda/app.py
+++ b/tests/ci/workflow_approve_rerun_lambda/app.py
@@ -3,15 +3,12 @@
 from collections import namedtuple
 import fnmatch
 import json
-import os
 import time
 
 import jwt
 import requests  # type: ignore
 import boto3  # type: ignore
 
-API_URL = os.getenv("API_URL", "https://api.github.com/repos/ClickHouse/ClickHouse")
-
 SUSPICIOUS_CHANGED_FILES_NUMBER = 200
 
 SUSPICIOUS_PATTERNS = [
@@ -27,7 +24,7 @@ SUSPICIOUS_PATTERNS = [
 MAX_RETRY = 5
 
 # Number of times a check can re-run as a whole.
-# It is needed, because we are using AWS "spot" instances, that are terminated very frequently.
+# It is needed, because we are using AWS "spot" instances, that are terminated often
 MAX_WORKFLOW_RERUN = 20
 
 WorkflowDescription = namedtuple(
@@ -46,6 +43,7 @@ WorkflowDescription = namedtuple(
         "rerun_url",
         "jobs_url",
         "attempt",
+        "repo_url",
         "url",
     ],
 )
@@ -189,10 +187,11 @@ def is_trusted_contributor(pr_user_login, pr_user_orgs):
     return False
 
 
-def _exec_get_with_retry(url):
+def _exec_get_with_retry(url, token):
+    headers = {"Authorization": f"token {token}"}
     for i in range(MAX_RETRY):
         try:
-            response = requests.get(url)
+            response = requests.get(url, headers=headers)
             response.raise_for_status()
             return response.json()
         except Exception as ex:
@@ -228,9 +227,9 @@ def _exec_post_with_retry(url, token, data=None):
     raise Exception("Cannot execute POST request with retry")
 
 
-def _get_pull_requests_from(owner, branch):
-    url = f"{API_URL}/pulls?head={owner}:{branch}"
-    return _exec_get_with_retry(url)
+def _get_pull_requests_from(repo_url, owner, branch, token):
+    url = f"{repo_url}/pulls?head={owner}:{branch}"
+    return _exec_get_with_retry(url, token)
 
 
 def get_workflow_description_from_event(event):
@@ -248,6 +247,7 @@ def get_workflow_description_from_event(event):
     rerun_url = event["workflow_run"]["rerun_url"]
     url = event["workflow_run"]["html_url"]
     api_url = event["workflow_run"]["url"]
+    repo_url = event["repository"]["url"]
     return WorkflowDescription(
         name=name,
         action=action,
@@ -262,24 +262,24 @@ def get_workflow_description_from_event(event):
         jobs_url=jobs_url,
         rerun_url=rerun_url,
         url=url,
+        repo_url=repo_url,
         api_url=api_url,
     )
 
 
-def get_pr_author_and_orgs(pull_request):
+def get_pr_author_and_orgs(pull_request, token):
     author = pull_request["user"]["login"]
-    orgs = _exec_get_with_retry(pull_request["user"]["organizations_url"])
+    orgs = _exec_get_with_retry(pull_request["user"]["organizations_url"], token)
     return author, [org["id"] for org in orgs]
 
 
-def get_changed_files_for_pull_request(pull_request):
-    number = pull_request["number"]
+def get_changed_files_for_pull_request(pull_request, token):
+    url = pull_request["url"]
 
     changed_files = set([])
     for i in range(1, 31):
         print("Requesting changed files page", i)
-        url = f"{API_URL}/pulls/{number}/files?page={i}&per_page=100"
-        data = _exec_get_with_retry(url)
+        data = _exec_get_with_retry(f"{url}/files?page={i}&per_page=100", token)
         print(f"Got {len(data)} changed files")
         if len(data) == 0:
             print("No more changed files")
@@ -317,14 +317,13 @@ def check_suspicious_changed_files(changed_files):
     return False
 
 
-def approve_run(run_id, token):
-    url = f"{API_URL}/actions/runs/{run_id}/approve"
+def approve_run(workflow_description: WorkflowDescription, token):
+    url = f"{workflow_description.api_url}/approve"
     _exec_post_with_retry(url, token)
 
 
 def label_manual_approve(pull_request, token):
-    number = pull_request["number"]
-    url = f"{API_URL}/issues/{number}/labels"
+    url = f"{pull_request['url']}/labels"
     data = {"labels": "manual approve"}
 
     _exec_post_with_retry(url, token, data)
@@ -343,14 +342,14 @@ def get_token_from_aws():
     return get_access_token(encoded_jwt, installation_id)
 
 
-def get_workflow_jobs(workflow_description):
+def get_workflow_jobs(workflow_description, token):
     jobs_url = (
         workflow_description.api_url + f"/attempts/{workflow_description.attempt}/jobs"
     )
     jobs = []
     i = 1
     while True:
-        got_jobs = _exec_get_with_retry(jobs_url + f"?page={i}")
+        got_jobs = _exec_get_with_retry(jobs_url + f"?page={i}", token)
         if len(got_jobs["jobs"]) == 0:
             break
 
@@ -360,7 +359,7 @@ def get_workflow_jobs(workflow_description):
     return jobs
 
 
-def check_need_to_rerun(workflow_description):
+def check_need_to_rerun(workflow_description, token):
     if workflow_description.attempt >= MAX_WORKFLOW_RERUN:
         print(
             "Not going to rerun workflow because it's already tried more than two times"
@@ -368,7 +367,7 @@ def check_need_to_rerun(workflow_description):
         return False
     print("Going to check jobs")
 
-    jobs = get_workflow_jobs(workflow_description)
+    jobs = get_workflow_jobs(workflow_description, token)
     print("Got jobs", len(jobs))
     for job in jobs:
         if job["conclusion"] not in ("success", "skipped"):
@@ -395,13 +394,9 @@ def rerun_workflow(workflow_description, token):
         _exec_post_with_retry(workflow_description.rerun_url, token)
 
 
-def main(event):
-    token = get_token_from_aws()
-    event_data = json.loads(event["body"])
-    print("The body received:", event["body"])
-    workflow_description = get_workflow_description_from_event(event_data)
-
-    print("Got workflow description", workflow_description)
+def check_workflow_completed(
+    event_data, workflow_description: WorkflowDescription, token: str
+) -> bool:
     if workflow_description.action == "completed":
         attempt = 0
         # Nice and reliable GH API sends from time to time such events, e.g:
@@ -411,7 +406,7 @@ def main(event):
             progressive_sleep = 3 * sum(i + 1 for i in range(attempt))
             time.sleep(progressive_sleep)
             event_data["workflow_run"] = _exec_get_with_retry(
-                workflow_description.api_url
+                workflow_description.api_url, token
             )
             workflow_description = get_workflow_description_from_event(event_data)
             attempt += 1
@@ -421,7 +416,7 @@ def main(event):
                 "Workflow finished with status "
                 f"{workflow_description.conclusion}, exiting"
             )
-            return
+            return True
 
         print(
             "Workflow",
@@ -435,11 +430,24 @@ def main(event):
                 workflow_description.name,
                 "not in list of rerunable workflows",
             )
-            return
+            return True
 
-        if check_need_to_rerun(workflow_description):
+        if check_need_to_rerun(workflow_description, token):
             rerun_workflow(workflow_description, token)
-            return
+            return True
+
+    return False
+
+
+def main(event):
+    token = get_token_from_aws()
+    event_data = json.loads(event["body"])
+    print("The body received:", event["body"])
+    workflow_description = get_workflow_description_from_event(event_data)
+
+    print("Got workflow description", workflow_description)
+    if check_workflow_completed(event_data, workflow_description, token):
+        return
 
     if workflow_description.action != "requested":
         print("Exiting, event action is", workflow_description.action)
@@ -447,11 +455,14 @@ def main(event):
 
     if workflow_description.workflow_id in TRUSTED_WORKFLOW_IDS:
         print("Workflow in trusted list, approving run")
-        approve_run(workflow_description.run_id, token)
+        approve_run(workflow_description, token)
         return
 
     pull_requests = _get_pull_requests_from(
-        workflow_description.fork_owner_login, workflow_description.fork_branch
+        workflow_description.repo_url,
+        workflow_description.fork_owner_login,
+        workflow_description.fork_branch,
+        token,
     )
 
     print("Got pull requests for workflow", len(pull_requests))
@@ -462,13 +473,13 @@ def main(event):
     pull_request = pull_requests[0]
     print("Pull request for workflow number", pull_request["number"])
 
-    author, author_orgs = get_pr_author_and_orgs(pull_request)
+    author, author_orgs = get_pr_author_and_orgs(pull_request, token)
     if is_trusted_contributor(author, author_orgs):
         print("Contributor is trusted, approving run")
-        approve_run(workflow_description.run_id, token)
+        approve_run(workflow_description, token)
         return
 
-    changed_files = get_changed_files_for_pull_request(pull_request)
+    changed_files = get_changed_files_for_pull_request(pull_request, token)
     print(f"Totally have {len(changed_files)} changed files in PR:", changed_files)
     if check_suspicious_changed_files(changed_files):
         print(
@@ -478,7 +489,7 @@ def main(event):
         label_manual_approve(pull_request, token)
     else:
         print(f"Pull Request {pull_request['number']} has no suspicious changes")
-        approve_run(workflow_description.run_id, token)
+        approve_run(workflow_description, token)
 
 
 def handler(event, _):
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 952fc7fb0a9..3d62746dc48 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -55,8 +55,6 @@ MESSAGES_TO_RETRY = [
     "ConnectionPoolWithFailover: Connection failed at try",
     "DB::Exception: New table appeared in database being dropped or detached. Try again",
     "is already started to be removing by another replica right now",
-    "DB::Exception: Cannot enqueue query",
-    "is executing longer than distributed_ddl_task_timeout",  # FIXME
 ]
 
 MAX_RETRIES = 3
@@ -182,6 +180,15 @@ def get_db_engine(args, database_name):
     return ""  # Will use default engine
 
 
+def get_create_database_settings(args, testcase_args):
+    create_database_settings = dict()
+    if testcase_args:
+        create_database_settings["log_comment"] = testcase_args.testcase_basename
+    if args.db_engine == "Ordinary":
+        create_database_settings["allow_deprecated_database_ordinary"] = 1
+    return create_database_settings
+
+
 def get_zookeeper_session_uptime(args):
     try:
         if args.replicated_database:
@@ -448,6 +455,7 @@ class SettingsRandomizer:
         "compile_sort_description": lambda: random.randint(0, 1),
         "merge_tree_coarse_index_granularity": lambda: random.randint(2, 32),
         "optimize_distinct_in_order": lambda: random.randint(0, 1),
+        "optimize_sorting_by_input_stream_properties": lambda: random.randint(0, 1),
     }
 
     @staticmethod
@@ -537,9 +545,7 @@ class TestCase:
             clickhouse_execute(
                 args,
                 "CREATE DATABASE " + database + get_db_engine(testcase_args, database),
-                settings={
-                    "log_comment": testcase_args.testcase_basename,
-                },
+                settings=get_create_database_settings(args, testcase_args),
             )
 
             os.environ["CLICKHOUSE_DATABASE"] = database
@@ -914,7 +920,7 @@ class TestCase:
         description_full += result.description
         description_full += "\n"
 
-        if result.status == TestStatus.FAIL:
+        if result.status == TestStatus.FAIL and self.testcase_args:
             description_full += "Database: " + self.testcase_args.testcase_database
 
         result.description = description_full
@@ -1179,15 +1185,21 @@ class TestSuite:
         def is_shebang(line: str) -> bool:
             return line.startswith("#!")
 
+        def find_tag_line(file):
+            for line in file:
+                line = line.strip()
+                if line and not is_shebang(line):
+                    return line
+            return ''
+
         def load_tags_from_file(filepath):
+            comment_sign = get_comment_sign(filepath)
             with open(filepath, "r", encoding="utf-8") as file:
                 try:
-                    line = file.readline()
-                    if is_shebang(line):
-                        line = file.readline()
+                    line = find_tag_line(file)
                 except UnicodeDecodeError:
                     return []
-            return parse_tags_from_line(line, get_comment_sign(filepath))
+            return parse_tags_from_line(line, comment_sign)
 
         all_tags = {}
         start_time = datetime.now()
@@ -1559,7 +1571,7 @@ def collect_build_flags(args):
         args,
         "SELECT value FROM system.settings WHERE name = 'allow_deprecated_database_ordinary'",
     )
-    if value == b"1":
+    if value == b"1" or args.db_engine == "Ordinary":
         result.append(BuildFlags.ORDINARY_DATABASE)
 
     value = int(
@@ -1746,10 +1758,7 @@ def main(args):
         stop_time = time() + args.global_time_limit
 
     if args.zookeeper is None:
-        try:
-            args.zookeeper = int(extract_key(" --key zookeeper | grep . | wc -l")) > 0
-        except ValueError:
-            args.zookeeper = False
+        args.zookeeper = True
 
     if args.shard is None:
         args.shard = bool(extract_key(' --key listen_host | grep -E "127.0.0.2|::"'))
@@ -1763,6 +1772,7 @@ def main(args):
                     args,
                     f"CREATE DATABASE IF NOT EXISTS {db_name} "
                     f"{get_db_engine(args, db_name)}",
+                    settings=get_create_database_settings(args, None),
                 )
             except HTTPError as e:
                 total_time = (datetime.now() - start_time).total_seconds()
diff --git a/tests/config/client_config.xml b/tests/config/client_config.xml
index fd5a85d8c4f..a93935ee111 100644
--- a/tests/config/client_config.xml
+++ b/tests/config/client_config.xml
@@ -11,4 +11,7 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
+
+    <!-- Default timeout is 5 sec. Set it to 10 to avoid tests flakiness with slow builds (debug, tsan) -->
+    <sync_request_timeout>10</sync_request_timeout>
 </config>
diff --git a/tests/config/config.d/merge_tree_old_dirs_cleanup.xml b/tests/config/config.d/merge_tree_old_dirs_cleanup.xml
new file mode 100644
index 00000000000..41932cb6d61
--- /dev/null
+++ b/tests/config/config.d/merge_tree_old_dirs_cleanup.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <merge_tree>
+        <!-- Default is 86400 (1 day), but we have protection from removal of tmp dirs that are currently in use -->
+        <temporary_directories_lifetime>1</temporary_directories_lifetime>
+        <!-- Default is 60 seconds, but let's make tests more aggressive -->
+        <merge_tree_clear_old_temporary_directories_interval_seconds>10</merge_tree_clear_old_temporary_directories_interval_seconds>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/config/config.d/prometheus.xml b/tests/config/config.d/prometheus.xml
new file mode 100644
index 00000000000..7f8dbd1601f
--- /dev/null
+++ b/tests/config/config.d/prometheus.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <prometheus>
+        <endpoint>/metrics</endpoint>
+        <port>9988</port>
+    </prometheus>
+</clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 478601620e1..198784fab2c 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -29,12 +29,14 @@ ln -sf $SRC_PATH/config.d/graphite.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/max_concurrent_queries.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/merge_tree_settings.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/merge_tree_old_dirs_cleanup.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/test_cluster_with_incorrect_pw.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/keeper_port.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/logging_no_rotate.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/merge_tree.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/metadata_cache.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/tcp_with_proxy.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/prometheus.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/top_level_domains_lists.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/top_level_domains_path.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/transactions.xml $DEST_SERVER_PATH/config.d/
diff --git a/tests/config/users.d/database_replicated.xml b/tests/config/users.d/database_replicated.xml
index 279591494c1..2b96e7418b6 100644
--- a/tests/config/users.d/database_replicated.xml
+++ b/tests/config/users.d/database_replicated.xml
@@ -6,7 +6,7 @@
             <database_replicated_initial_query_timeout_sec>120</database_replicated_initial_query_timeout_sec>
             <distributed_ddl_task_timeout>120</distributed_ddl_task_timeout>
             <database_replicated_always_detach_permanently>1</database_replicated_always_detach_permanently>
-            <distributed_ddl_entry_format_version>2</distributed_ddl_entry_format_version>
+            <database_replicated_enforce_synchronous_settings>1</database_replicated_enforce_synchronous_settings>
         </default>
     </profiles>
 </clickhouse>
diff --git a/tests/integration/helpers/client.py b/tests/integration/helpers/client.py
index f03a6d2ab23..a4407d5b442 100644
--- a/tests/integration/helpers/client.py
+++ b/tests/integration/helpers/client.py
@@ -4,6 +4,8 @@ import tempfile
 import logging
 from threading import Timer
 
+DEFAULT_QUERY_TIMEOUT = 600
+
 
 class Client:
     def __init__(self, host, port=9000, command="/usr/bin/clickhouse-client"):
@@ -16,6 +18,23 @@ class Client:
 
         self.command += ["--host", self.host, "--port", str(self.port), "--stacktrace"]
 
+    def stacktraces_on_timeout_decorator(func):
+        def wrap(self, *args, **kwargs):
+            try:
+                return func(self, *args, **kwargs)
+            except sp.TimeoutExpired:
+                # I failed to make pytest print stacktraces using print(...) or logging.debug(...), so...
+                self.get_query_request(
+                    "INSERT INTO TABLE FUNCTION file('stacktraces_on_timeout.txt', 'TSVRaw', 'tn String, tid UInt64, qid String, st String') "
+                    "SELECT thread_name, thread_id, query_id, arrayStringConcat(arrayMap(x -> demangle(addressToSymbol(x)), trace), '\n') AS res FROM system.stack_trace "
+                    "SETTINGS allow_introspection_functions=1",
+                    timeout=60,
+                ).get_answer_and_error()
+                raise
+
+        return wrap
+
+    @stacktraces_on_timeout_decorator
     def query(
         self,
         sql,
@@ -80,6 +99,7 @@ class Client:
 
         return CommandRequest(command, stdin, timeout, ignore_error)
 
+    @stacktraces_on_timeout_decorator
     def query_and_get_error(
         self,
         sql,
@@ -100,6 +120,7 @@ class Client:
             database=database,
         ).get_error()
 
+    @stacktraces_on_timeout_decorator
     def query_and_get_answer_with_error(
         self,
         sql,
@@ -170,7 +191,7 @@ class CommandRequest:
             self.timer.start()
 
     def get_answer(self):
-        self.process.wait()
+        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
         self.stdout_file.seek(0)
         self.stderr_file.seek(0)
 
@@ -197,7 +218,7 @@ class CommandRequest:
         return stdout
 
     def get_error(self):
-        self.process.wait()
+        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
         self.stdout_file.seek(0)
         self.stderr_file.seek(0)
 
@@ -221,7 +242,7 @@ class CommandRequest:
         return stderr
 
     def get_answer_and_error(self):
-        self.process.wait()
+        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
         self.stdout_file.seek(0)
         self.stderr_file.seek(0)
 
diff --git a/tests/integration/helpers/ssl_context.py b/tests/integration/helpers/ssl_context.py
new file mode 100644
index 00000000000..fa9024ae3e7
--- /dev/null
+++ b/tests/integration/helpers/ssl_context.py
@@ -0,0 +1,12 @@
+import ssl
+
+
+class WrapSSLContextWithSNI(ssl.SSLContext):
+    def __new__(cls, ssl_host, *args, **kwargs):
+        self = super().__new__(cls, *args, **kwargs)
+        self._server_hostname = ssl_host
+        return self
+
+    def wrap_socket(self, sock, *args, **kwargs):
+        kwargs["server_hostname"] = self._server_hostname
+        return super().wrap_socket(sock, *args, **kwargs)
diff --git a/tests/integration/parallel_skip.json b/tests/integration/parallel_skip.json
index b5de1d67cbc..3b4d1f2f29a 100644
--- a/tests/integration/parallel_skip.json
+++ b/tests/integration/parallel_skip.json
@@ -48,17 +48,6 @@
   "test_system_replicated_fetches/test.py::test_system_replicated_fetches",
   "test_zookeeper_config_load_balancing/test.py::test_round_robin",
 
-  "test_tlsv1_3/test.py::test_https",
-  "test_tlsv1_3/test.py::test_https_wrong_cert",
-  "test_tlsv1_3/test.py::test_https_non_ssl_auth",
-  "test_tlsv1_3/test.py::test_create_user",
   "test_user_ip_restrictions/test.py::test_ipv4",
-  "test_user_ip_restrictions/test.py::test_ipv6",
-  "test_ssl_cert_authentication/test.py::test_https",
-  "test_ssl_cert_authentication/test.py::test_https_wrong_cert",
-  "test_ssl_cert_authentication/test.py::test_https_non_ssl_auth",
-  "test_ssl_cert_authentication/test.py::test_create_user",
-  "test_grpc_protocol_ssl/test.py::test_secure_channel",
-  "test_grpc_protocol_ssl/test.py::test_insecure_channel",
-  "test_grpc_protocol_ssl/test.py::test_wrong_client_certificate"
+  "test_user_ip_restrictions/test.py::test_ipv6"
 ]
diff --git a/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml b/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml
index 4235083f5ca..cb87abcc693 100644
--- a/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml
@@ -43,4 +43,7 @@
         <cluster>test_cluster</cluster>
     </macros>
 
+    <merge_tree>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
+    </merge_tree>
 </clickhouse>
diff --git a/tests/integration/test_backward_compatibility/test_convert_ordinary.py b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
index c509dade0b8..afc44c91fc4 100644
--- a/tests/integration/test_backward_compatibility/test_convert_ordinary.py
+++ b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
@@ -7,6 +7,7 @@ node = cluster.add_instance(
     image="yandex/clickhouse-server",
     tag="19.17.8.54",
     stay_alive=True,
+    with_zookeeper=True,
     with_installed_binary=True,
 )
 
@@ -25,7 +26,7 @@ def q(query):
     return node.query(query, settings={"log_queries": 1})
 
 
-def test_convert_system_db_to_atomic(start_cluster):
+def check_convert_system_db_to_atomic():
     q(
         "CREATE TABLE t(date Date, id UInt32) ENGINE = MergeTree PARTITION BY toYYYYMM(date) ORDER BY id"
     )
@@ -75,3 +76,167 @@ def test_convert_system_db_to_atomic(start_cluster):
         "1\n" == errors_count
         and "1\n" == node.count_in_log("Can't receive Netlink response")
     )
+
+
+def create_some_tables(db):
+    node.query("CREATE TABLE {}.t1 (n int) ENGINE=Memory".format(db))
+    node.query(
+        "CREATE TABLE {}.mt1 (n int) ENGINE=MergeTree order by n".format(db),
+    )
+    node.query(
+        "CREATE TABLE {}.mt2 (n int) ENGINE=MergeTree order by n".format(db),
+    )
+    node.query(
+        "CREATE TABLE {}.rmt1 (n int, m int) ENGINE=ReplicatedMergeTree('/test/rmt1/{}', '1') order by n".format(
+            db, db
+        ),
+    )
+    node.query(
+        "CREATE TABLE {}.rmt2 (n int, m int) ENGINE=ReplicatedMergeTree('/test/{}/rmt2', '1') order by n".format(
+            db, db
+        ),
+    )
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"sed --follow-symlinks -i 's|/test/{db}/rmt2|/test/{{database}}/{{table}}|' /var/lib/clickhouse/metadata/{db}/rmt2.sql",
+        ]
+    )
+    node.query(
+        "CREATE MATERIALIZED VIEW {}.mv1 (n int) ENGINE=ReplicatedMergeTree('/test/{}/mv1/', '1') order by n AS SELECT n FROM {}.rmt1".format(
+            db, db, db
+        ),
+    )
+    node.query(
+        "CREATE MATERIALIZED VIEW {}.mv2 (n int) ENGINE=MergeTree order by n AS SELECT n FROM {}.rmt2".format(
+            db, db
+        ),
+    )
+    node.query(
+        "CREATE DICTIONARY {}.d1 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB '{}')) "
+        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())".format(db, db)
+    )
+    node.query(
+        "CREATE DICTIONARY {}.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt2' PASSWORD '' DB '{}')) "
+        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())".format(db, db)
+    )
+    node.query(
+        "CREATE TABLE {}.merge (n int) ENGINE=Merge('{}', '(mt)|(mv)')".format(db, db)
+    )
+    node.query("CREATE TABLE {}.detached (n int) ENGINE=Log".format(db))
+
+
+def check_convert_all_dbs_to_atomic():
+    node.query(
+        "CREATE DATABASE ordinary ENGINE=Ordinary",
+        settings={"allow_deprecated_database_ordinary": 1},
+    )
+    node.query(
+        "CREATE DATABASE other ENGINE=Ordinary",
+        settings={"allow_deprecated_database_ordinary": 1},
+    )
+    node.query(
+        "CREATE DATABASE `.o r d i n a r y.` ENGINE=Ordinary",
+        settings={"allow_deprecated_database_ordinary": 1},
+    )
+    node.query("CREATE DATABASE atomic ENGINE=Atomic")
+    node.query("CREATE DATABASE mem ENGINE=Memory")
+    node.query("CREATE DATABASE lazy ENGINE=Lazy(1)")
+
+    tables_with_data = ["mt1", "mt2", "rmt1", "rmt2", "mv1", "mv2", "detached"]
+
+    for db in ["ordinary", "other", "atomic"]:
+        create_some_tables(db)
+        for table in tables_with_data:
+            node.query("INSERT INTO {}.{} (n) VALUES ({})".format(db, table, len(db)))
+
+    node.query(
+        "CREATE TABLE `.o r d i n a r y.`.`t. a. b. l. e.` (n int) ENGINE=MergeTree ORDER BY n"
+    )
+    node.query("CREATE TABLE lazy.table (n int) ENGINE=Log")
+
+    # Introduce some cross dependencies
+    node.query(
+        "CREATE TABLE ordinary.l (n DEFAULT dictGet('other.d1', 'm', toUInt64(3))) ENGINE=Log"
+    )
+    node.query(
+        "CREATE TABLE other.l (n DEFAULT dictGet('ordinary.d1', 'm', toUInt64(3))) ENGINE=StripeLog"
+    )
+
+    node.query(
+        "CREATE TABLE atomic.l (n DEFAULT dictGet('ordinary.d1', 'm', toUInt64(3))) ENGINE=TinyLog"
+    )
+
+    tables_without_data = ["t1", "d1", "d2", "merge", "l"]
+
+    # 6 tables + 2 inner tables of MVs, each contains 2 rows
+    for db in ["ordinary", "other"]:
+        assert "12\t{}\n".format(12 * len(db)) == node.query(
+            "SELECT count(), sum(n) FROM {}.merge".format(db)
+        )
+
+    # 6 tables, MVs contain 2 rows (inner tables does not match regexp)
+    assert "8\t{}\n".format(8 * len("atomic")) == node.query(
+        "SELECT count(), sum(n) FROM atomic.merge".format(db)
+    )
+
+    node.query("DETACH TABLE ordinary.detached PERMANENTLY")
+
+    node.exec_in_container(
+        ["bash", "-c", f"touch /var/lib/clickhouse/flags/convert_ordinary_to_atomic"]
+    )
+    node.restart_clickhouse()
+
+    assert "Ordinary\n" == node.query(
+        "SELECT engine FROM system.databases where name='ordinary'"
+    )
+    node.query("ATTACH TABLE ordinary.detached")
+
+    node.exec_in_container(
+        ["bash", "-c", f"touch /var/lib/clickhouse/flags/convert_ordinary_to_atomic"]
+    )
+    node.restart_clickhouse()
+
+    assert (
+        ".o r d i n a r y.\natomic\ndefault\nordinary\nother\nsystem\n"
+        == node.query(
+            "SELECT name FROM system.databases WHERE engine='Atomic' ORDER BY name"
+        )
+    )
+    assert "Lazy\nMemory\n" == node.query(
+        "SELECT engine FROM system.databases WHERE name IN ('mem', 'lazy') ORDER BY name"
+    )
+    assert "t. a. b. l. e.\n" == node.query("SHOW TABLES FROM `.o r d i n a r y.`")
+    assert "table\n" == node.query("SHOW TABLES FROM lazy")
+
+    for db in ["ordinary", "other", "atomic"]:
+        assert "\n".join(
+            sorted(tables_with_data + tables_without_data) + [""]
+        ) == node.query("SHOW TABLES FROM {} NOT LIKE '%inner%'".format(db))
+
+    for db in ["ordinary", "other"]:
+        assert "8\t{}\n".format(8 * len(db)) == node.query(
+            "SELECT count(), sum(n) FROM {}.merge".format(db)
+        )
+
+    for db in ["ordinary", "other", "atomic"]:
+        for table in tables_with_data:
+            node.query(
+                "INSERT INTO {}.{} (n) VALUES ({})".format(db, table, len(db) * 3)
+            )
+
+    for db in ["ordinary", "other", "atomic"]:
+        assert "16\t{}\n".format(16 * len(db) * 2) == node.query(
+            "SELECT count(), sum(n) FROM {}.merge".format(db)
+        )
+        assert "2\t{}\n".format(2 * len(db) * 2) == node.query(
+            "SELECT count(), sum(n) FROM {}.detached".format(db)
+        )
+
+
+def test_convert_ordinary_to_atomic(start_cluster):
+    check_convert_system_db_to_atomic()
+    check_convert_all_dbs_to_atomic()
diff --git a/tests/integration/test_distributed_ddl/test.py b/tests/integration/test_distributed_ddl/test.py
index 85d0a5f0999..065795b55eb 100755
--- a/tests/integration/test_distributed_ddl/test.py
+++ b/tests/integration/test_distributed_ddl/test.py
@@ -49,6 +49,7 @@ def test_default_database(test_cluster):
     test_cluster.ddl_check_query(
         instance,
         "CREATE TABLE null ON CLUSTER 'cluster2' (s String DEFAULT 'escape\t\nme') ENGINE = Null",
+        settings={"distributed_ddl_entry_format_version": 2},
     )
 
     contents = instance.query(
@@ -57,7 +58,9 @@ def test_default_database(test_cluster):
     assert TSV(contents) == TSV("ch1\tdefault\nch2\ttest2\nch3\tdefault\nch4\ttest2\n")
 
     test_cluster.ddl_check_query(
-        instance, "DROP TABLE IF EXISTS null ON CLUSTER cluster2"
+        instance,
+        "DROP TABLE IF EXISTS null ON CLUSTER cluster2",
+        settings={"distributed_ddl_entry_format_version": 2},
     )
     test_cluster.ddl_check_query(
         instance, "DROP DATABASE IF EXISTS test2 ON CLUSTER 'cluster'"
diff --git a/tests/integration/test_distributed_ddl_on_cross_replication/configs/settings.xml b/tests/integration/test_distributed_ddl_on_cross_replication/configs/settings.xml
new file mode 100644
index 00000000000..2387e2661e4
--- /dev/null
+++ b/tests/integration/test_distributed_ddl_on_cross_replication/configs/settings.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <distributed_ddl_entry_format_version>2</distributed_ddl_entry_format_version>
+        </default>
+    </profiles>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl_on_cross_replication/test.py b/tests/integration/test_distributed_ddl_on_cross_replication/test.py
index b89091d4034..2b710b4a3e3 100644
--- a/tests/integration/test_distributed_ddl_on_cross_replication/test.py
+++ b/tests/integration/test_distributed_ddl_on_cross_replication/test.py
@@ -7,18 +7,21 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/settings.xml"],
     with_zookeeper=True,
     macros={"shard": 1, "replica": 1, "shard_bk": 3, "replica_bk": 2},
 )
 node2 = cluster.add_instance(
     "node2",
     main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/settings.xml"],
     with_zookeeper=True,
     macros={"shard": 2, "replica": 1, "shard_bk": 1, "replica_bk": 2},
 )
 node3 = cluster.add_instance(
     "node3",
     main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/settings.xml"],
     with_zookeeper=True,
     macros={"shard": 3, "replica": 1, "shard_bk": 2, "replica_bk": 2},
 )
diff --git a/tests/integration/test_fetch_memory_usage/__init__.py b/tests/integration/test_fetch_memory_usage/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_fetch_memory_usage/configs/config.xml b/tests/integration/test_fetch_memory_usage/configs/config.xml
new file mode 100644
index 00000000000..8cfdcf973f4
--- /dev/null
+++ b/tests/integration/test_fetch_memory_usage/configs/config.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <max_server_memory_usage>1000000000</max_server_memory_usage>
+</clickhouse>
diff --git a/tests/integration/test_fetch_memory_usage/test.py b/tests/integration/test_fetch_memory_usage/test.py
new file mode 100644
index 00000000000..a4371140150
--- /dev/null
+++ b/tests/integration/test_fetch_memory_usage/test.py
@@ -0,0 +1,59 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node", main_configs=["configs/config.xml"], with_zookeeper=True
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_huge_column(started_cluster):
+
+    if (
+        node.is_built_with_thread_sanitizer()
+        or node.is_built_with_memory_sanitizer()
+        or node.is_built_with_address_sanitizer()
+    ):
+        pytest.skip("sanitizer build has higher memory consumption; also it is slow")
+
+    # max_server_memory_usage is set to 1GB
+    # Added column should be 1e6 * 2000 ~= 2GB
+    # ALTER ADD COLUMN + MATRIALIZE COLUMN should not cause big memory consumption
+    node.query(
+        """
+        create table test_fetch (x UInt64) engine = ReplicatedMergeTree('/clickhouse/tables/test_fetch', 'r1') order by x settings index_granularity=1024;
+        insert into test_fetch select number from numbers(1e6);
+
+        set mutations_sync=1;
+        alter table test_fetch add column y String default repeat(' ', 2000) CODEC(NONE);
+        alter table test_fetch materialize column y;
+
+        create table test_fetch2 (x UInt64, y String default repeat(' ', 2000) CODEC(NONE)) engine = ReplicatedMergeTree('/clickhouse/tables/test_fetch', 'r2') order by x settings index_granularity=1024;
+    """
+    )
+
+    # Here we just check that fetch has started.
+    node.query(
+        """
+        set receive_timeout=1;
+        system sync replica test_fetch2;
+    """,
+        ignore_error=True,
+    )
+
+    # Here we check that fetch did not use too much memory.
+    # See https://github.com/ClickHouse/ClickHouse/issues/39915
+    maybe_exception = node.query(
+        "select last_exception from system.replication_queue where last_exception like '%Memory limit%';"
+    )
+    assert maybe_exception == ""
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/ca-cert.pem b/tests/integration/test_grpc_protocol_ssl/configs/ca-cert.pem
index 036e0a3b655..3f9b9661fcb 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/ca-cert.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/ca-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFhTCCA22gAwIBAgIUVM3x4bsymB902aSmqQ3OCNSfqCQwDQYJKoZIhvcNAQEL
+MIIFhTCCA22gAwIBAgIUA29DmsDX5fK0u88nQ43zRJB/X9YwDQYJKoZIhvcNAQEL
 BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjAxMDI4
-MDYzNzExWhcNMzAxMDI2MDYzNzExWjBSMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwODA4
+MTQzMzI3WhcNMzIwODA1MTQzMzI3WjBSMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
 U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQsw
-CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMKSY4+t
-V/E+GFt0eKUjRLYui+0662Gqp3/5U3n2NXUeeZEFf6c85v3uyyVLnr1lyWM8dYFG
-gR7esvZejequG1bA6OPXbet45veiBVWDANeIXw1Mpr5191wmQ/Jb4Eic9c+GSEiE
-UXWP7Ebx0WXZIuh22ESvtUYmrjHI4r1+W2HjbSPQ5ISVA7x5r1LiQzZu0bZ4FfRf
-C5s0IhM3DIvvmwu9P1Zwn10/UTOcbrGfDGYklKUZ/JBrXVffMs3n16xnFLSjp59v
-V6vqoiP9X7mLcMuBBbe1l+YIQZt0iN0lzqXf6+gXYRS9rLjpNKYiA8Ejbivtel25
-fzi3pIF+FFHG7bRCLd78eUh2cNC+Wt7AZKXtlGyG7+hCd0fEBrmEzQWP2pXPyQI2
-7SnOSa/mQzCGfETfDRWcDFN0fYA2RHLZSEp/ImxGPeCiAKMg6wecYKcPj5QVWL8F
-R9RN8B2i37DEs+dtHpuGdRY8mGoVnkQiP6MXKF6RJV8PG5BFBpIWrdUr6XdXPZLs
-fpXQ9iVNxRzj1Qs3x3b2Da38hxSWTSP1zbkBPlMkXRuw+5m8PpkBpiarXF+4i7MM
-RCsg07AIKilTM3p21qFLnKMCgCAZX16zPVfBPBipPbk3EjfFPWQ29v5KHm6zFxn6
-mBk+2nOmaSXhAjGexHjhikl76SZhA0Re17PXAgMBAAGjUzBRMB0GA1UdDgQWBBTZ
-k26nfmjd7o/kNQ7wt+0xnFS3FzAfBgNVHSMEGDAWgBTZk26nfmjd7o/kNQ7wt+0x
-nFS3FzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQA1vfdcnkXt
-8TSDJJl+PBJTvpKjipAyilipXjpq4vjxTBVtivdUekpV7U8O28RoOOSqtLWaN7uX
-rTZyRJK61mWkyJdnS+YPhUG0cvNp7faHXJf9NB74hO57j00kPE5zYvUl35/zRd28
-146omM3s9dMf6yKKoESib5Ixm4zntDkqH5Yi88U6/ODwm8jJuJxkJBdYBUtRA4Ky
-ETML7GL9Vm2A5QTGBue8nTlYpy1avUK8lsP8W4S3zX8lKuTok4fxmd8TsVMgYLKF
-67QKDboPeJNN/Il74Yvd6KhHO5AkcvjLHbwV8NRMi8+0vtQWcpSysrZfoeFS3kcD
-lJL532F8IP2mMPsx3ARKEsYZWGKtEjQIUuI0sSIbN2V01nbKQ7zj1tNBe6xhnzyx
-Uthx05WWl7YLtM75/Wycesz7ZKxkKbGPu9nhvEhRJjrDT0p0Tjx+of2qKkCkdXRw
-QkrGROFvkMcn/YXs95YDZ97pKb355zMiqpBXKqsPHbrgDZbbowmEOgCPiYbxgzce
-TVAr00uofy+uFfrdtUGpKncmmvFtVBuNo4Pj9tdsRkDuO8Y10jFIG+2S2gKeTAsy
-japTT3FjHjGm9KF/QtbK7RZdxzcn1eUuOO3mF4dj30le0E4iOh6XxFlth3ppoOeb
-Z1kFHCU8MtmoINIVYP23aJy8pm1d8D/2Kw==
+CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOaoVw/g
+75YIIgSUqiTQa/AJ9ShPACfv5XCJO2yB2i0FjYXdLzjC5fvYwMLBbi/pVv1UhArK
+OOhpVqsGgv6U+hC5b2jiRw3O13T6aSQMrj0E/OVLIUqR+326r+typvbkRM962oVs
+AIy3NLs40PNF7urBXzzJK7jQhUGAfRta5MlHLhovLrWKPqh01vAe0nyni4k4afj0
+yHkMCkr8SeQk8gI6KAADQWX/ic0MUBOyH1yM0O60hoFM0LCNcsIcGRL7qoiVnCqY
+WzsUZNSYXmpE/w9Ylk+YQIzYdjwcktj/tS1SMD4zMRzqb39tpoxKzFNAO5oKIXdc
++UN87DrOKSdkF3C6w1WDhVrKFz5Ny+cvq2WzhDi+AAj7xBCaLTXyGp6K8CuQ05ft
+t2fXoXBjlclerL9radzuuyvcn/Kl23NNW/AIEBH9ZCxweK7IgYBXkasXVWseD6PO
+M/1rwBD8ODMfe4Ew9YlUTeEhBuDd6no8rx5cqrTc5pVTAkv0cbSkeGdum8BocEpy
+ibdBZ0iqUKpNJVC0BY4VrhQJaS+CjRWo5OqxLTjzgCdys0Rp0IjvrTOB5+2YrGz0
+hP0RmGW57dWevFDgSOwwZkFRGegTbFV0pi3Ryrp68P4c+KMb32zeV2O2HF7aoDMd
+bGosZlI9o3rW9zCz/OYxz3WjfxdIdNWk6woTAgMBAAGjUzBRMB0GA1UdDgQWBBSA
+3YX1WHa5G+5FitZMLBjzpEKSsTAfBgNVHSMEGDAWgBSA3YX1WHa5G+5FitZMLBjz
+pEKSsTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQB151qyDTjO
+bQmswRAq1IGOLGb5TGBq/BwVlPUOhl0lTQihJwBg+YUK1ArLokQm4+ZAN3jCGXkn
+7piNjWkgc3EVp2ft2YVgpfTQNPJQAIqUx/TLB6XJd1K4ODB2Ra8Pcdb6QIxXz8vB
+rDlwHp4+JsHLbEjNX+pPyys/w/YS1yNJz6wJbUtuRWqFxyUtja9hsH8TZFvnXa17
+hx15ZgKGhhxrAw3xAvUzOScIL4SzCDnFA1F1zqFvc4i4xKK4xQPnmkUb7Uqv9bbM
+rNXyt0m3tm29ijb0BT55NVSoz9Ch45U71t2SoQyPEjMqwfm0I1pmtx2SJe7eRXbk
+8sv8yc9T2RUoHz+0vgrAIxQEbOaR66obYS1cGYLAVDtkuEbw2q68porHL1jXBX38
+d77WTTUfKZ9huaQDzdFAbr0FbF+sljjbrjXpLY5l0AT6YAahMJMpxTFo/VYuBqkB
+2M4bPAHWOwN8DcI4zUwIigU/TAv5eB7q9w5rKLBLbFfRb9WDpuQbBSH12Wwn7uj7
+/ClUrANcIFgsCpzDoIt19VxgxmGSIteqefqXCJfV3UuUrjRZvzuL3q89RmPdphM9
+qCnAVX4FWWv8XVxgnR2SJ6mdSfi+Uchvkg5dQOoAF/iq+Hv/xbOwv68voSffbbTj
+awu89VRltD0WvorZgM8ROM8jkUfM3/C6BA==
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/ca-key.pem b/tests/integration/test_grpc_protocol_ssl/configs/ca-key.pem
index cd28012e236..68517fb0178 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/ca-key.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/ca-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-z6BihHf8+GVDIxxQroO9XAdgMPExVeM=
+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
+jDYqa8eTSy3vYm27Vpkn79VwU/GW
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/client-cert.pem b/tests/integration/test_grpc_protocol_ssl/configs/client-cert.pem
index e1f44d5c733..bb120b19459 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/client-cert.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/client-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+AwwGY2xpZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjBiM9glH
+uCLSBpVM5oOjCP3dj4nM1yN++w6oxh4mcUhQlU971JL32KDs6go3VC+6/KkAPAYs
+zcI8gS5OyBXfUyel1cJOJ1nQY3KuEGSEkb0wEEB/eQOBjK93OD9vKw7LMtDwm9gy
+pqnaZUqcet0+xTbBWpTktiJn3Hly7HSAhvogTp/qYqbsR5O8AMzn7et14lRHGT+F
+fgY3Sk+yGwk41Mw8VvM9lNCiXJbdQuKuZPxZLE1OLSMMOoaQGYFbrEqdV8SGva5z
+y6IfoeZk26TMTSJ8W6+iKWqdWgnh4FXE5gshb4xSI5uio8OdfwziPqtzWYVEJ1tp
+Tg3eqP8rYmLEguF+MSrrjX9f6/BQ848CVHXym+18E6bi8cMoOaha9unn0Q1UqqLu
+eAd2jQNBLIWTQ2WAXIg4FmBhKMksYhLuDJhlgOhHKOjjYSPWvev0BNjuzXEipgW6
+U+uh+xN71u5na/2teEUdJYXYqvFo45wvWwL2xUwnr1/6aQAIn2VagubLWtMX5RlN
+kLcYkYJPoySj56a1riCqyv4pjBuk+fEZywDaQUaNukuFNIOrx7+07VDwzxJ6qZA4
+4C8Pq8F80gn8lgAbsKjaDwGktjO2R20smr5JZHkpJIzw2ET79lT+N5y+HJmX0Hw6
+fkorPUYDE6kLu9WYiHRTAzkGFwCEZYipjVkCAwEAATANBgkqhkiG9w0BAQsFAAOC
+AgEAQLBoRJUJB4kUQc3D/TlkuwPvPWYmYjGZhy+fgwQIWRTzdRaldnzVAkxUYWh5
+dyg3aYt3MaHhu996uo0shxgY6M++AJY8Fy01dqrrf/HX1E+GfywRVC5nWxe6ivkN
+aSsUO9tydcopKnMQQqbXpIQ10LjY+Kj8PQDuROLxRrnpwv38yaoeyclTjt2YITCu
+n7LteC6090KrMzjFuFAZeglEB8QD3eLfbNh0rwCj8dDcvy86Zr+/BvhgFRLq7ZLU
+IiawxlzUhs8cycjc3PZfQaNJLOXChqrbI30eVoNNlEtKhwI9fLWiRq3KMoapmCIW
+EDBh4lm1ljrRZXjDHmgWPhmFnu9l5dN/xPQgACa4zqyFfv/iDDLBVahoIiph0/7s
+nlbBAEhbVmhxMUfV8h9boix7y2JhjzUZC1XCsPbKx8niOHtXRBJNehms80aiKkA7
+FyPKcx8Boluv7rFf8xsUPp2q8Pjda+Ll8Nm4316spxCKh5KBZp1vpXbQdfGOv1+S
+6KeL8TNOKXzetCvRMj72wckCtPFt0xA6FInbGn+5e3XSDyPcPrS1zL+mglS9fZGo
+eis0H7zhBHxNOL8PFfsaaUUW82Ad1oxY6NugPr4km7zeTWQ1gkbYpusUxuX8SLj5
+O7DNGUSkQoASbgsLkBt2P+TlXupJZlufedpjcN4PW/2qRKo=
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/client-key.pem b/tests/integration/test_grpc_protocol_ssl/configs/client-key.pem
index 3c53302873f..b15e6dc2cbb 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/client-key.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/client-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDKeQ+X6RaIxbYA
-KRkM3bofMJt+52o8A23okhgV0irexyz+6pZ/uN2yuXLDiPRh4wct7q0v80mSVgGN
-3ktzFxl7V7ueURLvhKG+mVfpbVOUmginY5XBuFBKf3xy28GyPrqDaR2Ipp4GO3zX
-VvHDYVtTpoNcZnJSLY0xY1TWlFbzTOde5nSbBxKxXTl5K2dHaQLH2Dnx9R6YSRQw
-O6YW81B0jZx3EIFCntnSUVX3SMPVwcBLSlz0RCePjeAiWeMp2hTKOBq8s8DTe6FU
-KNDAr+0iye7km0Cf5seGMFJPh0cQRvK6Shhep0AaAws01uV7+8gA0wb32acqeQSh
-RLU3cz9+mmuMnObPUSUarUk4vmalyGjnoB1ji0LM+jxytReQzPsEngdypwZ8qM3+
-Bv7Z6sMrpAZATFTIdcf139WGjY6T3WYjHKnZr6FrIcWbWnKhO2H+2vV/plAwIx2B
-Njza57vqd6EF6O0P9c03fmTvmNuqSMtzaXK2HIvy+c1reeGaX8a6luCCTKniI9T/
-ThNrYkArUZq37RyFxUmk6IWvsrhgU2tWhygvIJFnwrEIB2JoVtgUMByYqvisJVBy
-7irdm8m4LHh5DUzk3Al7O6VTKSsnTaXfHMn+vpo4GjeYzBFHQqrlERijBO5VdtXO
-EfhTZ88G5bXy1B3hmUAuNRF2eupj3wIDAQABAoICACvwJZAjxv4bWamjQYpnO5K1
-K6lYctdfLyS/P3bMyvzZYExZgBtrdMDqOZtxRwdPCynOl8rGEvssqt2sldb99kur
-+E0c7u0HbUo9YLSJQxAGdUZN+Bu38cSY8drDEb+qmTMXRo93COf1VNwuQ/zQTc9T
-XUJaAQkQVYmYMrr2KgBWegdAH6Hc4ROYVXaUEq+OfEn+BGUbem41vanR5/MnDhic
-+o1kCYj5i+92Mx+crNLgXuh31MA1YhhnA3Kw6vkUGFrh3fuBTqEWPSZUTSjjhKR+
-CdeWUWnh3P6j0djsVGGV4+rFVZCE3wZGDtKCp/5F31s+cE6s7vfqlzSgAmtsGSTv
-Vd1cFf/W1qkx0y8EyUN5EdA8HMeJJdNayc8RZsbtYzByMII54ryGxSa9S5M0iKNR
-vjk3ogdz54AmQuMOVZHOoBkmNCuTPeHavNoo5xxtC+Qezrj1IvCfcMUhOFdRDTPd
-bJwJYr9X9HrD8/geSUkQeAXGXMpcOljigk7HZz9u0CdbK85su6jKvCLSmvIUIlYd
-Le77oI2CJmcgawDGHRnr8bt/GQEM3nbPt4HzMrYhKxPyrax1AhIFMfROJjeib1a/
-lGBiHFJGQ8y7qCZmgPqNMxgKZibe8IM3OmdLTqMWqn0fl+rq5TinEqVTfG7Lzd+m
-uEgSHTUDMxiB+6iv+OmRAoIBAQDumfH9dsOwyA9vd6H6V6e59SON5aRixOLZsY1M
-BEG1CdWNOP9iq5uChz2LLUmXg9KZmoBdFzf5RSO2QXDB+fZwbDM2ugq7BtW8RNj2
-piG8Hfm0JA9x6xEq9a4XulA//bs3/LqmSWNVIUqxOItPYVa2VvaIo9mrTRJ6DZCe
-+nTxZyI/QOY0haeh0OoI3bShOsgLPUrr28higD97fuDM1zWHjfRkBPOA83qObG7I
-bDd/t2xYMylBCLuG7hm/2NOPKX0a3Z4Cxwb7UOQwYAqiGPzd8ibCZaGCLVUkPD+9
-LlztaGfZMxWLPt7U+OwgCq1AMeNiGPFCNrqy/2Zo5IFhuuWtAoIBAQDZPLFys1Tx
-yagx97v9sLz/WEYkfN/Gp2DPVyFB8hMT3zj6G+FHEt72XYyQFM3GtD6JlUbwcStv
-GgW4MawA7A7Jtyj9WXAj/YeGbkZfT9cVaxiB4mYXTvLvDvAixHwob4HAJ73i3R47
-lc7E6oJqNoyQvlIRCeOWkMIZYNy7eVRWun5TdmV4w/i6TdswJ1ZcbZGm/VZeUpyT
-pBzVf3XrpFNZpCcLnsi/fHOpu2gOdP8ynoeOJ0y7pigAMrqGS+MVwKVcpVUcOPZr
-bg0HFCQ6L1fdp3UmMBGLD8lMEOcfH7aTqAO3CC0NGu7npQCmsQTeMlW5Zjwr9lwj
-DllUEyIIoek7AoIBABe9t6dpvtUDQw3rUHGxcR3+t1fyJqYxQwU4Nn/+2G7kGJyh
-tD+kJagaPtRvYCg0VKs2BVm96rLh30jOQCL89TmAeqQSZOjxKClAjHoWU7r9HJCB
-GgxSwHWO1pDD2CJV4+ARRJ0xJjIdSupRXwM6Az/HbWZxL0JtO85rNR2sfCBdC7pR
-gdZuChz+xZq2PLfiOm9r3N2VE95BNo/aMxIOw+PGCzA8keId1+79+RP2OJt7q8sm
-5A71iHtHi8ZcE8jl7u3SaVuLZDVzehEaLVStudN3ucWUCTsDuboOSKVRTKvOvK6O
-97DQQ6nbTtttVInTrPVg1/inq3IOGamMOxd3Wk0CggEBAJBF+7+mlEKkX/0Xf5Wj
-vFGFSchP2rpvTR9GyYKnh74J4ShSPdJbGRLb3E+QUX2nFWWAa4WiU2tNCAFlk8tk
-+wlCiImBzbVJWqmQMVJ5jundn4AbYRwXxcW40Qj2H1Mngy+f9T9nBP4jpxgmewiZ
-Q8+ZZp2ESM8lQpNiPhaQJNAYuW8q0Ydb96Obs3eOmI94AWS7GZI5IV34f2HXbfRa
-xTRijb/s63wo5hQSr6/ySc5PdM2XEiIJ3sUK68/nNGCs+eXGs/izaAy/IQ3TdZ/i
-82L1JRuAjxYhHNpU23pTMIlt61Gyr2Dlw0a60ezi4c3D9iTUXiAAVP6/N9pbfp3n
-EiMCggEBALJHpSPkphZT/z8+olAzmpG5hXF2wz5Tf06ripGKXOAjo77xMTqoOv8F
-MrTnNtd08vV0rKiGS3yv7yESp+wWH52h3wIAA2BBXGfWpKaf172faUfWRQNdAF9x
-bKJzHHSLOI/YIkzOuH/nZJVaN9K+8+IFEehUFrItXeqrsTIo7HyO5M7uqZb6OkVa
-cbOPbAZCkSB+5WEZ9ioOtL1qGvqIovMxixyUrBWUSnse5iiheMMym6Af5396owEP
-i4OYkjk+NuXGFCI/q2HZV28+3ENsLcgkAR5VRLRrkc1UYZahWUxoXGqDRKnGkOmc
-V3Xoig0C2fgC/iiuaMKUh9T9dBnFsjw=
+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
+LsDx2wx9jPQV6wuu4ZB+v8JMSbPb
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/client-req.pem b/tests/integration/test_grpc_protocol_ssl/configs/client-req.pem
index 60b819c9709..8892ed1f4d9 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/client-req.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/client-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEmzCCAoMCAQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGY2xp
-ZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAynkPl+kWiMW2ACkZ
-DN26HzCbfudqPANt6JIYFdIq3scs/uqWf7jdsrlyw4j0YeMHLe6tL/NJklYBjd5L
-cxcZe1e7nlES74ShvplX6W1TlJoIp2OVwbhQSn98ctvBsj66g2kdiKaeBjt811bx
-w2FbU6aDXGZyUi2NMWNU1pRW80znXuZ0mwcSsV05eStnR2kCx9g58fUemEkUMDum
-FvNQdI2cdxCBQp7Z0lFV90jD1cHAS0pc9EQnj43gIlnjKdoUyjgavLPA03uhVCjQ
-wK/tIsnu5JtAn+bHhjBST4dHEEbyukoYXqdAGgMLNNble/vIANMG99mnKnkEoUS1
-N3M/fpprjJzmz1ElGq1JOL5mpcho56AdY4tCzPo8crUXkMz7BJ4HcqcGfKjN/gb+
-2erDK6QGQExUyHXH9d/Vho2Ok91mIxyp2a+hayHFm1pyoTth/tr1f6ZQMCMdgTY8
-2ue76nehBejtD/XNN35k75jbqkjLc2lythyL8vnNa3nhml/Gupbggkyp4iPU/04T
-a2JAK1Gat+0chcVJpOiFr7K4YFNrVocoLyCRZ8KxCAdiaFbYFDAcmKr4rCVQcu4q
-3ZvJuCx4eQ1M5NwJezulUykrJ02l3xzJ/r6aOBo3mMwRR0Kq5REYowTuVXbVzhH4
-U2fPBuW18tQd4ZlALjURdnrqY98CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQCS
-2GjAzmqJidkh4qxwztOG1ufnZmPmVX9b2j3O284Kfm3dgqF9wKRCfKP9Te/pn+xO
-zCTqO5yMcNDTVapIawZ07JWdAbRO7Laj9GYNJwnO7xDpjCcuUwfmGXRSgNQpNzL3
-zuYty/sBKmwZ7+LzKG6jjaqSMtw0LglWO94GtdURilpH4VjOCkp9RraDCrKICYn4
-UQhx80ieI4jwxuyZ6I5UJQuabCQ8PdrKQEBOnPGfMYqf+0JRDKIvHWQJvbx43Pyp
-d69hJeY0742zRXVPk/W+2p2BhIE/uQWabLp6bqQhc6ZHINuMq1N60NdLMAu5iRoj
-vhTiOB/uMG/GBOVswAnCNjn0jTlJd0qoY5EFMrXyDZ+cobmbZiQ0hUCrtV2kP7/5
-swOeMTa5dqoLqklvon8RjQlJvzPYMUV6CA5vU4mmeXORNgRmYuVG3xpZkSGB+XtW
-QiK0u+4bPLKGslJjowZJvlE7A/ANzwSuGqiLs/UIAnA6URlg0K6gGyzc6c9kVi2k
-ryH/Yv72cZ0jE4vpHagM1Ka21VfyS6RAuQxH3OveIi6OViKqGexhPBuja1eIjxVy
-yc4i9Y/iZFNXn8AH1bMeXlWoG92Rsm0zhj+Oe082LkF72gwf8p4Khw/otbquGJzX
-V24aeSrQCo+lxen7tooDo6BThGjNVnZQOIQSQJqtqA==
+ZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjBiM9glHuCLSBpVM
+5oOjCP3dj4nM1yN++w6oxh4mcUhQlU971JL32KDs6go3VC+6/KkAPAYszcI8gS5O
+yBXfUyel1cJOJ1nQY3KuEGSEkb0wEEB/eQOBjK93OD9vKw7LMtDwm9gypqnaZUqc
+et0+xTbBWpTktiJn3Hly7HSAhvogTp/qYqbsR5O8AMzn7et14lRHGT+FfgY3Sk+y
+Gwk41Mw8VvM9lNCiXJbdQuKuZPxZLE1OLSMMOoaQGYFbrEqdV8SGva5zy6IfoeZk
+26TMTSJ8W6+iKWqdWgnh4FXE5gshb4xSI5uio8OdfwziPqtzWYVEJ1tpTg3eqP8r
+YmLEguF+MSrrjX9f6/BQ848CVHXym+18E6bi8cMoOaha9unn0Q1UqqLueAd2jQNB
+LIWTQ2WAXIg4FmBhKMksYhLuDJhlgOhHKOjjYSPWvev0BNjuzXEipgW6U+uh+xN7
+1u5na/2teEUdJYXYqvFo45wvWwL2xUwnr1/6aQAIn2VagubLWtMX5RlNkLcYkYJP
+oySj56a1riCqyv4pjBuk+fEZywDaQUaNukuFNIOrx7+07VDwzxJ6qZA44C8Pq8F8
+0gn8lgAbsKjaDwGktjO2R20smr5JZHkpJIzw2ET79lT+N5y+HJmX0Hw6fkorPUYD
+E6kLu9WYiHRTAzkGFwCEZYipjVkCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQCA
+Er/tM9cVjcKdhZlpwlki5hUFhJUTHQ8MQ3W323dY8Twx40VS/Y0vrVGTS8abAfkd
+WwrzpqWyPqARXcu7KKw9bk/YAr5l6+1DFY/nk/F4cf5jyHA2d7GrxGfPQ65YI8lx
+Hl5taFqJNzEIypGnMqbjP0C5k8+6m2JdEgheXBO7TCfXMtZHu9f7nUdM6JCefWYF
+qaEFjOtYCbjCjP47fO0N7K8DD/Lt1rYouQbVc60k+gjigVTAIBCcWdjNLSP6XxX6
+yOEITwPQZ/Li+uFHBhWentAkyqM5EnPViVF/6MxyLGtBadJJYILN6MROXA+5nkzG
+ypcU25YCgxaXctX1iZnXr6A7or+u1CRNc3WYDFLHYWdnnbIuam5SDy/GBLyQ024T
+xHLcpyOka9tPvh0Fzjh4MeNX3ebn5n1xbEEsvt8VEBucWj3W3yPe/nUiAFzk8GyO
+i+IL/DcfQVY48kP8MElEf4enVk8izRTPu4x6+mnMTPnpmfV0Ks5r3OAM0eyhvluR
+9HotGibhFb4P2junEEEvnS/o9/rpte/LUaEWcZ6mNXlCU6HoBkYGEsQ5nD8k4TdY
+bUmiCUfDT7ubAS42E4K0bqISCt/bWr0N0TVCpSkjMlThzJdwv5slblYr7h/aVlOi
+zmBIcF1pawXXy1zxMbBTcnV+or911GfhFfr38ZT9qg==
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/server-cert.pem b/tests/integration/test_grpc_protocol_ssl/configs/server-cert.pem
index 3e2f4e7a16f..628b2cc758a 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/server-cert.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/server-cert.pem
@@ -1,31 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-IZu+bd0qm9vdws6oGw==
+DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDB
+/ur60jGIgANqpSLGpkOYE57GiWQ+P+nPvhvKSdnHnJa2DGDNo6B62uzxDNmOhk1z
+PF/fl8qPyt55H4zKVI12Jh6UGIOBUkCivqY/G6hGHmRnycJVne/zhgB9ELwPJgV0
+H7V5CjbXeGNk8Cy5VN5QyNFrhgUexUyASNXAUgC15Py1DKej03G8Osc/+X35iLuo
+L42Nz3kgcDOVD/jcvdXcfk4UVs3J/cRk0vnnTsxYhmvSOFR1Rvxwmze/zJ5eUtdf
+171y57sBuyx5NETJO3lRqse1tVUdBbHoSG94K7Ssjg25LbvxIjayv/BpWeN4gvEw
+tIUMTidTdJso4KlNmGhiE0f1Lc2rKq5WulcFT7vA58vHzPrY2RanjtfMSMZIrAb6
+ZnXzdhLbojHGfQOAHxkttzJfgqF4czjGUbdG5n1mMUDSs0C8HAHAAWpEwiW2Ae8g
+CmEGym+iYnXXMu8EuBBEPseKAoRIsXsQ6+9b+5aWfNbQz1uBd78deuCbz5LhsAsJ
+hfK0iDD+JkZL/0xxqJR9OBMtjKrTCPDqnAAa4koXgeJXpSB7Ol8kzW+EXh/tsS4w
+5PmDwt95CqRYPLgKn0ReBMchRRQkEFEKvJUSftC9Jc0txCihCsB5+IdZ5LkbjQqO
+vHGDsEz4SqXVo3Kg0zhXpQqmLz9HTOFe0EyuWz1DXQIDAQABo28wbTArBgNVHREE
+JDAigiBpbnRlZ3JhdGlvbi10ZXN0cy5jbGlja2hvdXNlLmNvbTAdBgNVHQ4EFgQU
+kcTqp4uYx046EVRqWpEQWwJMVhcwHwYDVR0jBBgwFoAUgN2F9Vh2uRvuRYrWTCwY
+86RCkrEwDQYJKoZIhvcNAQELBQADggIBAN6REE4Qk4qdi8AqYNIgcmRTI+PN/wC1
+ThJmDT72KO7+KBPAOTF1l64poK1BoBzFJGW5F3FMF13UEz1yzOiSzR63W1MIQQw+
+vaqLiIt8COG8V/EjceSR9jVU3xPVinI8eWLWGzNbNra/+CVICDFFypHSkomDEg/i
+JNS2mbhPaiXOsuBQZ5I4CVuICKqy8EUX0WgG56zNODGlyo4dmL2SYxjhdAZKYxPR
+gYlBRj5hbfgnz4HgVd+WMJMwwGoOTjZXBlc8X+w057vhYnMLYv8LZVVp3MJicJ4K
+8IXw6kFCz27JZqTnNJUIG2ZiQyL7lxEyP9mXC1nXF7g06J4+Uzdw02+cqDCy4COK
+7vTtS6kBpE7OnUEwEy9izXl8gVfYwieUy2cHVDZQxM2MgEerbW5qzdSIJmXIUj/A
+IjDSJWsik7LAoBWtaqOntTSztuKTGh3cbSckNv8S1lITQ3sH6kGws4pMEy6c+YDK
+Njg/w3esZwd+5xdybYbixxRMWHqLqvBygB+ze63jCtHaF2MDrTovh7q9+0Bute+i
+1vbxNIM9L/uilXKlCMI33duP7m/XtqW+OIOxPAU2fZJ/A/C5rpGScXKe7Jx4FVUS
+cwViH49/oeIFseZvO/ujiGdQJGPyjfz7NehJ/hOR6TyxHMl45rjD/8zr2gbdEfE3
+Lk7Br4HITZTr
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/server-ext.cnf b/tests/integration/test_grpc_protocol_ssl/configs/server-ext.cnf
index 83d9b03ccb7..49859873222 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/server-ext.cnf
+++ b/tests/integration/test_grpc_protocol_ssl/configs/server-ext.cnf
@@ -1 +1 @@
-subjectAltName=IP:10.5.172.77
+subjectAltName=DNS:integration-tests.clickhouse.com
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/server-key.pem b/tests/integration/test_grpc_protocol_ssl/configs/server-key.pem
index c3edbb3b244..99b9f1805f6 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/server-key.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/server-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-mBf26auAKORLhL9eFF9XY8tojdEmdA==
+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
+D2Oh5R687eaQzdCtM9lxkUiKuREc+Q==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/server-req.pem b/tests/integration/test_grpc_protocol_ssl/configs/server-req.pem
index 1d2c2053431..08b34a22c97 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/server-req.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/server-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-cert.pem b/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-cert.pem
index 0b2117674d5..297b9d8382e 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-cert.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIUGi5763gLrWzkBKSEOkeo1gyKdlUwDQYJKoZIhvcNAQEL
+MIIFjTCCA3WgAwIBAgIUJB3UA/J9kPvfzCI4o95767VhQMYwDQYJKoZIhvcNAQEL
 BQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGY2xpZW50MB4XDTIw
-MTEwMjIyMzE0NloXDTMwMTAzMTIyMzE0NlowVjELMAkGA1UEBhMCUlUxEzARBgNV
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGY2xpZW50MB4XDTIy
+MDgwODE0MzMzMVoXDTMyMDgwNTE0MzMzMVowVjELMAkGA1UEBhMCUlUxEzARBgNV
 BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
 ZDEPMA0GA1UEAwwGY2xpZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAyJGQ+Vg/8ryZ4dgv5cIRRxQeNVNi7amKf+GGZr8ARVLlh+zcz7sWa/stRpQI
-Q57F8DHuOvy+Q3FsCtwVcXBI8uNkgmTxwHlq8rqaG5usPb97VejiPrShK4U4h3XM
-uZIkLC5pGpo+nHi6BtX8oBXP1BT5++cow/2kQGn0/f+fOjrjpD8jmapnyaUoEloA
-laS8Rw9Qw/CGXzSRuUb+w0glDZ3w0ys7XevjWS/2lXHbDy0OnLwlhvQIJb6v/DJW
-JGWTZD1cZ+JHwaLS5OE9vLlCmIAPdmqo1m2IHDsFgHsZGYcRZ9c6t1Jh0FQewol1
-KFtgbPHDMSYZd2EwrdYbYConrqFleT8AxwOyQNQeZ0tkOCML2cKNtTKLcLPA2E9h
-jZqJ8U1ydr1zSwSi/u6bbIhJM9LnBEAxVwzRAut2lpXdtoPQLfNd7NRfFGafOAvN
-cYbhf8Drw4pBTtqmlkHguHlDHdwYWOhi/HkuvyZso3T/aQKAd/clAwH0bKfhWuTY
-ugyf2yr81WornoPwSDdLis04174g9qc7mGKVjL4JKNl1kyUmGwqEGV7m37hwqy5t
-bSH9SPYMLq+qesB+3Nig2O5WJC2uw9ebMTAdzhC6AKxt6WsF2eTlh8UQdCh4PT8d
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-key.pem b/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-key.pem
index 389f213b5d0..a0e8c04ec45 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-key.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDIkZD5WD/yvJnh
-2C/lwhFHFB41U2LtqYp/4YZmvwBFUuWH7NzPuxZr+y1GlAhDnsXwMe46/L5DcWwK
-3BVxcEjy42SCZPHAeWryupobm6w9v3tV6OI+tKErhTiHdcy5kiQsLmkamj6ceLoG
-1fygFc/UFPn75yjD/aRAafT9/586OuOkPyOZqmfJpSgSWgCVpLxHD1DD8IZfNJG5
-Rv7DSCUNnfDTKztd6+NZL/aVcdsPLQ6cvCWG9Aglvq/8MlYkZZNkPVxn4kfBotLk
-4T28uUKYgA92aqjWbYgcOwWAexkZhxFn1zq3UmHQVB7CiXUoW2Bs8cMxJhl3YTCt
-1htgKieuoWV5PwDHA7JA1B5nS2Q4IwvZwo21Motws8DYT2GNmonxTXJ2vXNLBKL+
-7ptsiEkz0ucEQDFXDNEC63aWld22g9At813s1F8UZp84C81xhuF/wOvDikFO2qaW
-QeC4eUMd3BhY6GL8eS6/JmyjdP9pAoB39yUDAfRsp+Fa5Ni6DJ/bKvzVaiueg/BI
-N0uKzTjXviD2pzuYYpWMvgko2XWTJSYbCoQZXubfuHCrLm1tIf1I9gwur6p6wH7c
-2KDY7lYkLa7D15sxMB3OELoArG3pawXZ5OWHxRB0KHg9Px1zJosFDTL84Z2DsdTV
-p94dNc3QWJO+8FP8GHVeNvPx1+riHwIDAQABAoICADEjOJld/YzCmBC0nkdz3DfF
-vgDihQIk30GlRwA1GyPgw0shxJdABqY9y0HXUo7+fw/xq6PX9+UeDJI8iSRZlgWr
-oBwyDuhQ1trQzKCm6vPVzammfIdQSYwX/1lwis+L9kC8vhM+Zsh+61RxaIrvzRLw
-cK4+W8Zoha0iSFtSHPhvJQZAUcB79yF3zPFyC2KeEWJ3Zhoa+1Cn2GvD8PZ23l0P
-rMiPduPzvqdDEO5cDocRStsrXSZK8xQMO6FV07TnDc0pG1J4JYxTD8fzRuTNnnsu
-JJumVebyvr3r19U6U1Plu2XtXP08uaoIceDHPGS+vkjykhegdezBauOr6NkOetnm
-q7uPeSqCZKlLK7WKPPLLsMaO6ospfcbmChn8OwK7OuFj3PpMz40pyj2rB9iec5HJ
-tWkf9MFKJpmsxudwUzD0YB7u8/75thKObMmCLbBYg0KW0koPxEhl3paGnwz+40mn
-0IsPL07CV9/hvPQcjY269XPkOPPiJHmahuCnLHHXPjeTOv3M5sW2cQBW/riKhXRF
-HOrkkXC4rNKDj6JWtSf05RL+8YbGDvhhyNsi/khtEZBxukQ/OwE2pnhEtcE1WIJS
-eVbxQxArgSeZs+6gwhSwMlVz5IeqKuAncEauVfroEhzkdTX54Kd16p08PcL7s6T8
-p6WptMteyFTXdK2RCScBAoIBAQDppoI696GXJdaKr5BJBW/TAJ1nzy6FQw1X7G5i
-AWo2fGvChQCOyCSwiKIitQo4lf2MVggzHLQuXKfejcz2Oghg2d94tKWRVaTy1KPl
-qldlPbE2C+hAZWdMAA/z5AgG4vNorHtODDOhCdfxJ4Ht06G/RwZUlxyLJUptX7Qt
-el32J/n1juPUKBiVKvSms7WnG0gBhDi789dn8LJGciQ7P17B9N+Z1aV9xAcj3cjx
-HbH4xMr9LajnfpAMqQYvJHywTxFFHl13dGD2RSeEyD/ZtHjwcesmWMjF+NnOMUli
-PCs7iAaZ0PsJ34GL9wFJ4x4YaJT5TEx3dUQvpRxO5jNfUDePAoIBAQDbwPheJAdD
-vpzM/Qz/RO+3btG5f7yRVWRyIrs0mSvWYP7dvGIAFPzaK9iRIys8PsB1pXm7vDjD
-CEG9sHghEHaHtll2qQ5o1vvRK8aMk08YRV4idTUuVXXfaHao+K1rGb9iS0ss/ORe
-m34UB23omGrn2GTaWHQgcxuclmRKvT5PGeQ/Nc2+wgvoiostoGLXUcAJ5AtSBPV/
-Vr1g+osV/ho0z2Z9PLYWG1hggx2+4huqZpQdLcQBEobNOThRQA+IfdTerx4jiB0p
-4YeiFRSNEZ6d7QChTvQUWmdsABATBBVPcaGdUH5ZfGytjOkMjbIMlIsWoJH00Biq
-YXuxDcqgCeRxAoIBAQC1wmgwww6bbD33aRfPFkGlXScV6GACHuU0bqJ37y3W8PdL
-PPfwGtYf1kp6wWcQGe5By3NZf4zTPBUC1kCJkx+NaC+l0LGz23ITzUMqmFagVVuT
-9bNY1QmEX9AJJGzyHn7IANVzI57OOcAYw2kZv7Zl/DR6fYsg24OIjhi2ACk0Imka
-k2u8UOy+rcngHJDFTD25oEgaPlhlbSLiFk0FIgjuzTVckIzKx0HerttwZm9aXIyk
-Y26vlw8sKhi7d6Df7sI6iKKhGJGNQsK5UqYJD5G9SoFpNUwKZcnZ0xGJL9FZ4Dly
-UtXXGl3GqgIAnoN87W5meOpLS5gdkE3zOrTgAqEVAoIBAQDbLwrLIxZX3Iwa7Z8E
-EWcjx5XJdn3HW6u3J6sfWFNgHRi4Y0hAGq7kkO0OPkzGZzShYy4bMS5QYTDpGVWI
-bRo8XIW5E/+6VAuQ4x/DYL54T+AHcG5dy4GpFlGcUYTvGRxJ1x2hPpAtSNwk8BAQ
-+c1PeAeHvMf/AbCdq2dXIJBAZ2vAHFMdnAAyrdUJ6joL1486jkk4Qpf2rbZwPxVx
-FyReXis0aNSZEidBBCYsGOxNNskunVItW6Q2l4bzi3iyxAcJIRNnj0C/YCJfaLU5
-y0Qw8o45Vj2e+1jCYQGnZeA3f/gZp4qOiMsBA1YDXmUjpRlhtUA/NTwU3Ox5eW8L
-1zIRAoIBAHtIeWclcp0q/Owjghk6IWqldfWjHqtWeG9saOf+EjqxnIfLaKxaOtgx
-A7j7nbO7D4coZ/rByLAFubs5hdDkKlZULBMM1mtdprJP0uNdVxFTcGk79a4CvbAs
-kH5Jd8wfR2MnMQp6PAFjyN3VX0zFZx1gYJd4nl7XT3jO1t9oL8xFG8foZ7NMYwek
-MbyysZkSsXlfCHvqTDJKEm4VCttMOYaDd86hJtdqibEfb9lg2jx04Yc7rbRtCHlZ
-jfyA2TczituYZ2ESaSIiAk7QXvMzH6vbCM3yCJwFQ9dMJtz4e07rQOyrzqwvUUBU
-G8i1dUPnAE+ptBu6wVo+RrverCmfe4Q=
+MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQChXxrJ7QGjHN9x
+4UbNYZUrIqpWAOJ7FzTQy8FGb5zuUD8sfcnouM2KaxFes2AAok/MUR64afA+Io6H
+c5XNirzo4gQcuHGlZAf5lbk86Wbf4kxeVH1UtJCYJ0QLDZ2s5Mq8NaM0/oqsByco
+DbEvBsYD4bMbW7RAMpGjJzWT5nhop+x8rVUlhOhmHQboyt3r78Q4kHM/89J4cnAj
+d+KI194cmK6YYGgIOZeijEvlFRzqMTHb3hMZuGGgv30YcBIurtPFRjzYCRTvCtLA
+9hHIoYDI6Rbl0wH+JUnT1Zr3Lp7TSIJUto3CYLfjhNaS9SL8KUDrH7tbwPzxsLjV
+vdVXMunIZmTo27H7a9ymRsMK/M2nzUNYBR6NYzITjgaQ9S65xfbG0qfAhUHq8po8
+WsnH/2BheYpy9Qyf8dC8fB4/rKsXUsPyYnU9B+rGtiPq13bupwqz3X+4e/n7hx7f
+e7Kgm1I4dD9INP7X64TQXpudXfpeVPkUtnkW7ux9VnR71kaJUAoKmVEKSFqHIlav
+Iw0Y91hj4cb+tmpEENiyAo+Dy/MDgiM7/bfxhZad5aecy7+8Qlcmhh+ZrETmnltx
+C0ntS+/QyS2gtQiw3JG+YFAeaCi/MF1lcjaiXoHu9vSoIE/vqW3eMU88P8twH6oK
+lW/JwDt+qoli/k4WKl+nJeXZRhTT4wIDAQABAoICAADbd1IiTbNsTa2WXktssh+t
+X/fz/5Va0rTXQvAZBgg9aeXWceeoGljFZ9gNHjydSszm6MG0Yl/aIXq2Z6cqDlsz
+CYWONKBbJIW0FhdXlWx+uxwh2RvwQk0PTFe+BfFAspOxueu9Ucbx2h3m22LzZ22R
+hI49Jvso/vK9xxWW5bCHT9omYOuW8Ksg4AQFloyQf1uI55aBOO7bNh2iHz8jMnK2
+xvACocWFaiOlbikfOxeYFPqPi/duLiqYnyqtkb3TakbuhW06Yx+VUE2mdlgOr5dM
+UbWn23yvqFw/6BevFONCITB1BdIbXxljf8ZTwhCn4XM+UxRSNVB4DrX9UQWqZ2k0
+egOq7L7pAJxDsS0lxelRc4RsplTBXwTHTpzqKapxM+kBM6hzTPHh8jcbdSxZFyvL
+j2kfkTf9MZYQLnYmPL6P5zEl6xTeiANjSa/h9kugH3jOUs313nk3oyqb7UgIRv7X
+TEUvFLsu+Y4DWV0cU0gJZzPTwJLy3Ygn87g3xKogLCi4QAWmJFhXl0jkYOMNdZTr
+Kt4XnwmnXQSLg1clATjPLOaEHC+QSnPvqZ6CLxfDHk+7FMsmam+Jhy5hHnlsI/pu
+fXjmHOH71mWa6iV5I7U4tfmmWislgA6x4XDW4N5IW24ixuKlCwpYXBIjGyFkxkEt
+IGtywK4xGsRMuVPi0tGRAoIBAQDUP0rku/itv5deva/LxWnVKFJK8xCi+zaqOjxU
+REkZmpLEFhd8VSjWerVO03rZoO9MCQUW+Nrkef2lrUjaR2odgzpiLvlW/gR+wW33
+WMYeD0JvSGk1YRubUl0NyeqOZy9+ptLHzzsTH2oBRw8+YncEm3+Wald4S01WEZtn
+k2l0yNBXCMktN64IA89lqKKaPQ5JBWl+8K4Jm+qI7Ms9yqbfCoOVKFneq5gcM+3a
+y/UbnER19YYWZeISGH9mHQAun+t+hyNN1euGJSzIic3ofuchd9888x+2AaWhJZWg
+l/rmcMWcQKyIbviwrC+LcgBjR+p1/ElRFv+VCZzB9lu/YM2xAoIBAQDCov+t3UFN
+2HsjQSeDldbDaK+Tn/n3piXPiQMOC7IWWVrSZseUVmGfizTvkfS4TLQu0yfJe6Xd
++wOidppl5CFleM62sz34lBglMVgAdjR7bjL1q+NOnHzSZQV8U9jPgHR2T28p2QXW
+wBfiBDG070Ibnf7LNJbx7Qc0j1vYi0CS3Y3HrioxE4qY8ZWaBDD+KCtB57+/prni
+eEggYiU+2HnBlDqq9JDOfQ3KRN4FdzAEuv5zSWakBgWtbwGZw4FvH66JV6bC5riN
+qGnnXhwVZ6X/EOK8MthRGRTO6GZ0K0bTIX9egg7ZicS2IWWCYWrTtnbho5gEnm+W
+eC3QLFCve7vTAoIBADtag8AZTL6R4GuvEfUi/KiOQQ0Skelx5OSPqoVKH0MYtcg+
+AU1UpznrUL59Z1JqreCOeSzmZJgWATeOkNvxspwUMYR5bGLGYE1uHClaWvTXAZYL
+Iti5kjXKP5l2iLBP7Lk3P6R+sB913ngC/iFM+cmBDpnqnRFXxYW3IMVDNO9ipNhh
+7ZhGhNVa82mTUf1d65vB9rF37sNjJaAqz980x5uB3jAc+5zIUZ45a1+PP7j75y0x
+ftDOpvy2exH8NCvVrs5QTjAbDWUTCkX+O2Wz70Ctu/DYcFq+dSnuT7x8I77DdI9w
+io8QsVz+mcEeHTumRcu+xGX3z3tHF94p3ZhUItECggEAfGn8zYJ0z/HlJG/tdis9
+kMNGGDNWcXr/CF4oWb4YJDkR2RRh1uwwku9E8y51I6nEM3o+IIitSeu+MwdlQmRF
+BLvoRtjkcBUaKgwUmJb2jT+vy2IIdqOJFmQE0ag3GsydpVK5WCKlnNRFb/AGZgXa
+WBTyXapMInDE/k/1AcJhkH+WtWEbDyvSmFk0q7KqLow2unYNF9DXWXBRioGyFS4D
+Bj5eEhEqzxMY0Yab9Rpu01dEdyUgOxCuaGJgv409G29A/gHNUyBwL/zLVV3Ozc/n
+R9ffVzWZGJ3Tsz7S3scbCrKK3Dp+i4eI+nL2lBT5WEN2Ul1kOu+bnK9NeZgaK1II
+iQKCAQAuV2dJfttt01vjgDtkM2jb7KYes8SVPiLH9R+iZSQCe6VqXxZm3Fw6Xw7T
+eNdtqQBabWE4ezX6LyrnYItYbS9cC3XcwZeOgUkyK8SSUgzcpKKJ4enjyBW7wGSp
+Et+vrPj+iR3AjGviMadFG7+T7Dv0nn9nwQZ0//g9Yaf+Rs9xKXkdAnNrStus9BMG
+7CST39DILA5PnFCqti5PW5Kl0q+Ny1XROLMNeHFZAXq14IhPuvPUWAMaz2DyAaqg
+9oAL4puftBZy9hUble2xWcYcmUkyA14ODHrKI/bri0m9uVbrh2vPchPCVbaaJiGg
+dE4gQb0CXsqX/+ScWhPHfbEoC2r9
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_grpc_protocol_ssl/test.py b/tests/integration/test_grpc_protocol_ssl/test.py
index 3cd08e3cd6a..80599126dcf 100644
--- a/tests/integration/test_grpc_protocol_ssl/test.py
+++ b/tests/integration/test_grpc_protocol_ssl/test.py
@@ -4,9 +4,10 @@ import sys
 import grpc
 from helpers.cluster import ClickHouseCluster, run_and_check
 
+# The test cluster is configured with certificate for that host name, see 'server-ext.cnf'.
+# The client have to verify server certificate against that name. Client uses SNI
+SSL_HOST = "integration-tests.clickhouse.com"
 GRPC_PORT = 9100
-# It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
-NODE_IP = "10.5.172.77"  # Never copy-paste this line
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 DEFAULT_ENCODING = "utf-8"
 
@@ -31,12 +32,10 @@ import clickhouse_grpc_pb2_grpc
 
 # Utilities
 
-node_ip_with_grpc_port = NODE_IP + ":" + str(GRPC_PORT)
 config_dir = os.path.join(SCRIPT_DIR, "./configs")
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
-    ipv4_address=NODE_IP,
     main_configs=[
         "configs/grpc_config.xml",
         "configs/server-key.pem",
@@ -46,18 +45,26 @@ node = cluster.add_instance(
 )
 
 
+def get_grpc_url(instance=node):
+    return f"{instance.ip_address}:{GRPC_PORT}"
+
+
 def create_secure_channel():
     ca_cert = open(os.path.join(config_dir, "ca-cert.pem"), "rb").read()
     client_key = open(os.path.join(config_dir, "client-key.pem"), "rb").read()
     client_cert = open(os.path.join(config_dir, "client-cert.pem"), "rb").read()
     credentials = grpc.ssl_channel_credentials(ca_cert, client_key, client_cert)
-    channel = grpc.secure_channel(node_ip_with_grpc_port, credentials)
+    channel = grpc.secure_channel(
+        get_grpc_url(),
+        credentials,
+        options=(("grpc.ssl_target_name_override", SSL_HOST),),
+    )
     grpc.channel_ready_future(channel).result(timeout=10)
     return channel
 
 
 def create_insecure_channel():
-    channel = grpc.insecure_channel(node_ip_with_grpc_port)
+    channel = grpc.insecure_channel(get_grpc_url())
     grpc.channel_ready_future(channel).result(timeout=2)
     return channel
 
@@ -67,7 +74,7 @@ def create_secure_channel_with_wrong_client_certificate():
     client_key = open(os.path.join(config_dir, "wrong-client-key.pem"), "rb").read()
     client_cert = open(os.path.join(config_dir, "wrong-client-cert.pem"), "rb").read()
     credentials = grpc.ssl_channel_credentials(ca_cert, client_key, client_cert)
-    channel = grpc.secure_channel(node_ip_with_grpc_port, credentials)
+    channel = grpc.secure_channel(get_grpc_url(), credentials)
     grpc.channel_ready_future(channel).result(timeout=2)
     return channel
 
diff --git a/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py b/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
index d7ea0c13a93..22d4633685e 100644
--- a/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
@@ -2126,9 +2126,9 @@ def materialized_database_mysql_date_type_to_date32(
     mysql_node.query(
         "CREATE TABLE test_database.a (a INT(11) NOT NULL PRIMARY KEY, b date DEFAULT NULL)"
     )
-    # can't support date that less than 1925 year for now
-    mysql_node.query("INSERT INTO test_database.a VALUES(1, '1900-04-16')")
-    # test date that is older than 1925
+    # can't support date that less than 1900 year for now
+    mysql_node.query("INSERT INTO test_database.a VALUES(1, '1899-04-16')")
+    # test date that is older than 1900
     mysql_node.query("INSERT INTO test_database.a VALUES(3, '1971-02-16')")
     mysql_node.query("INSERT INTO test_database.a VALUES(4, '2101-05-16')")
 
diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
index 11ca0d2f962..f716fac8508 100644
--- a/tests/integration/test_replicated_database/test.py
+++ b/tests/integration/test_replicated_database/test.py
@@ -3,6 +3,7 @@ import shutil
 import time
 import re
 import pytest
+import threading
 
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import assert_eq_with_retry, assert_logs_contain
@@ -417,7 +418,7 @@ def test_alters_from_different_replicas(started_cluster):
         "distributed_ddl_task_timeout": 5,
         "distributed_ddl_output_mode": "null_status_on_timeout",
     }
-    assert "shard1|replica2\t\\N\t\\N" in main_node.query(
+    assert "shard1\treplica2\tQUEUED\t" in main_node.query(
         "ALTER TABLE testdb.concurrent_test ADD COLUMN Added2 UInt32;",
         settings=settings,
     )
@@ -425,7 +426,7 @@ def test_alters_from_different_replicas(started_cluster):
         "distributed_ddl_task_timeout": 5,
         "distributed_ddl_output_mode": "never_throw",
     }
-    assert "shard1|replica2\t\\N\t\\N" in competing_node.query(
+    assert "shard1\treplica2\tQUEUED\t" in competing_node.query(
         "ALTER TABLE testdb.concurrent_test ADD COLUMN Added1 UInt32 AFTER Added0;",
         settings=settings,
     )
@@ -495,11 +496,11 @@ def test_alters_from_different_replicas(started_cluster):
     )
     res = main_node.query("ALTER TABLE testdb.concurrent_test DELETE WHERE UserID % 2")
     assert (
-        "shard1|replica1" in res
-        and "shard1|replica2" in res
-        and "shard1|replica3" in res
+        "shard1\treplica1\tOK" in res
+        and "shard1\treplica2\tOK" in res
+        and "shard1\treplica3\tOK" in res
     )
-    assert "shard2|replica1" in res and "shard2|replica2" in res
+    assert "shard2\treplica1\tOK" in res and "shard2\treplica2\tOK" in res
 
     expected = (
         "1\t1\tmain_node\n"
@@ -553,6 +554,62 @@ def test_alters_from_different_replicas(started_cluster):
     snapshot_recovering_node.query("DROP DATABASE testdb SYNC")
 
 
+def create_some_tables(db):
+    settings = {"distributed_ddl_task_timeout": 0}
+    main_node.query(
+        "CREATE TABLE {}.t1 (n int) ENGINE=Memory".format(db), settings=settings
+    )
+    dummy_node.query(
+        "CREATE TABLE {}.t2 (s String) ENGINE=Memory".format(db), settings=settings
+    )
+    main_node.query(
+        "CREATE TABLE {}.mt1 (n int) ENGINE=MergeTree order by n".format(db),
+        settings=settings,
+    )
+    dummy_node.query(
+        "CREATE TABLE {}.mt2 (n int) ENGINE=MergeTree order by n".format(db),
+        settings=settings,
+    )
+    main_node.query(
+        "CREATE TABLE {}.rmt1 (n int) ENGINE=ReplicatedMergeTree order by n".format(db),
+        settings=settings,
+    )
+    dummy_node.query(
+        "CREATE TABLE {}.rmt2 (n int) ENGINE=ReplicatedMergeTree order by n".format(db),
+        settings=settings,
+    )
+    main_node.query(
+        "CREATE TABLE {}.rmt3 (n int) ENGINE=ReplicatedMergeTree order by n".format(db),
+        settings=settings,
+    )
+    dummy_node.query(
+        "CREATE TABLE {}.rmt5 (n int) ENGINE=ReplicatedMergeTree order by n".format(db),
+        settings=settings,
+    )
+    main_node.query(
+        "CREATE MATERIALIZED VIEW {}.mv1 (n int) ENGINE=ReplicatedMergeTree order by n AS SELECT n FROM recover.rmt1".format(
+            db
+        ),
+        settings=settings,
+    )
+    dummy_node.query(
+        "CREATE MATERIALIZED VIEW {}.mv2 (n int) ENGINE=ReplicatedMergeTree order by n  AS SELECT n FROM recover.rmt2".format(
+            db
+        ),
+        settings=settings,
+    )
+    main_node.query(
+        "CREATE DICTIONARY {}.d1 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB 'recover')) "
+        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())".format(db)
+    )
+    dummy_node.query(
+        "CREATE DICTIONARY {}.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt2' PASSWORD '' DB 'recover')) "
+        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())".format(db)
+    )
+
+
 def test_recover_staled_replica(started_cluster):
     main_node.query(
         "CREATE DATABASE recover ENGINE = Replicated('/clickhouse/databases/recover', 'shard1', 'replica1');"
@@ -565,52 +622,7 @@ def test_recover_staled_replica(started_cluster):
     )
 
     settings = {"distributed_ddl_task_timeout": 0}
-    main_node.query("CREATE TABLE recover.t1 (n int) ENGINE=Memory", settings=settings)
-    dummy_node.query(
-        "CREATE TABLE recover.t2 (s String) ENGINE=Memory", settings=settings
-    )
-    main_node.query(
-        "CREATE TABLE recover.mt1 (n int) ENGINE=MergeTree order by n",
-        settings=settings,
-    )
-    dummy_node.query(
-        "CREATE TABLE recover.mt2 (n int) ENGINE=MergeTree order by n",
-        settings=settings,
-    )
-    main_node.query(
-        "CREATE TABLE recover.rmt1 (n int) ENGINE=ReplicatedMergeTree order by n",
-        settings=settings,
-    )
-    dummy_node.query(
-        "CREATE TABLE recover.rmt2 (n int) ENGINE=ReplicatedMergeTree order by n",
-        settings=settings,
-    )
-    main_node.query(
-        "CREATE TABLE recover.rmt3 (n int) ENGINE=ReplicatedMergeTree order by n",
-        settings=settings,
-    )
-    dummy_node.query(
-        "CREATE TABLE recover.rmt5 (n int) ENGINE=ReplicatedMergeTree order by n",
-        settings=settings,
-    )
-    main_node.query(
-        "CREATE MATERIALIZED VIEW recover.mv1 (n int) ENGINE=ReplicatedMergeTree order by n AS SELECT n FROM recover.rmt1",
-        settings=settings,
-    )
-    dummy_node.query(
-        "CREATE MATERIALIZED VIEW recover.mv2 (n int) ENGINE=ReplicatedMergeTree order by n  AS SELECT n FROM recover.rmt2",
-        settings=settings,
-    )
-    main_node.query(
-        "CREATE DICTIONARY recover.d1 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
-        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB 'recover')) "
-        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())"
-    )
-    dummy_node.query(
-        "CREATE DICTIONARY recover.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
-        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt2' PASSWORD '' DB 'recover')) "
-        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())"
-    )
+    create_some_tables("recover")
 
     for table in ["t1", "t2", "mt1", "mt2", "rmt1", "rmt2", "rmt3", "rmt5"]:
         main_node.query("INSERT INTO recover.{} VALUES (42)".format(table))
@@ -867,3 +879,106 @@ def test_sync_replica(started_cluster):
     )
     assert lp1 == max_lp
     assert lp2 == max_lp
+
+
+def test_force_synchronous_settings(started_cluster):
+    main_node.query(
+        "CREATE DATABASE test_force_synchronous_settings ENGINE = Replicated('/clickhouse/databases/test2', 'shard1', 'replica1');"
+    )
+    dummy_node.query(
+        "CREATE DATABASE test_force_synchronous_settings ENGINE = Replicated('/clickhouse/databases/test2', 'shard1', 'replica2');"
+    )
+    snapshotting_node.query(
+        "CREATE DATABASE test_force_synchronous_settings ENGINE = Replicated('/clickhouse/databases/test2', 'shard2', 'replica1');"
+    )
+    main_node.query(
+        "CREATE TABLE test_force_synchronous_settings.t (n int) ENGINE=ReplicatedMergeTree('/test/same/path/{shard}', '{replica}') ORDER BY tuple()"
+    )
+    main_node.query(
+        "INSERT INTO test_force_synchronous_settings.t SELECT * FROM numbers(10)"
+    )
+    snapshotting_node.query(
+        "INSERT INTO test_force_synchronous_settings.t SELECT * FROM numbers(10)"
+    )
+    snapshotting_node.query(
+        "SYSTEM SYNC DATABASE REPLICA test_force_synchronous_settings"
+    )
+    dummy_node.query("SYSTEM SYNC DATABASE REPLICA test_force_synchronous_settings")
+
+    snapshotting_node.query("SYSTEM STOP MERGES test_force_synchronous_settings.t")
+
+    def start_merges_func():
+        time.sleep(5)
+        snapshotting_node.query("SYSTEM START MERGES test_force_synchronous_settings.t")
+
+    start_merges_thread = threading.Thread(target=start_merges_func)
+    start_merges_thread.start()
+
+    settings = {
+        "mutations_sync": 2,
+        "database_replicated_enforce_synchronous_settings": 1,
+    }
+    main_node.query(
+        "ALTER TABLE test_force_synchronous_settings.t UPDATE n = n * 10 WHERE 1",
+        settings=settings,
+    )
+    assert "10\t450\n" == snapshotting_node.query(
+        "SELECT count(), sum(n) FROM test_force_synchronous_settings.t"
+    )
+    start_merges_thread.join()
+
+    def select_func():
+        dummy_node.query(
+            "SELECT sleepEachRow(1) FROM test_force_synchronous_settings.t"
+        )
+
+    select_thread = threading.Thread(target=select_func)
+    select_thread.start()
+
+    settings = {"database_replicated_enforce_synchronous_settings": 1}
+    snapshotting_node.query(
+        "DROP TABLE test_force_synchronous_settings.t SYNC", settings=settings
+    )
+    main_node.query(
+        "CREATE TABLE test_force_synchronous_settings.t (n String) ENGINE=ReplicatedMergeTree('/test/same/path/{shard}', '{replica}') ORDER BY tuple()"
+    )
+    select_thread.join()
+
+
+def test_recover_digest_mismatch(started_cluster):
+    main_node.query(
+        "CREATE DATABASE recover_digest_mismatch ENGINE = Replicated('/clickhouse/databases/recover_digest_mismatch', 'shard1', 'replica1');"
+    )
+    dummy_node.query(
+        "CREATE DATABASE recover_digest_mismatch ENGINE = Replicated('/clickhouse/databases/recover_digest_mismatch', 'shard1', 'replica2');"
+    )
+
+    create_some_tables("recover_digest_mismatch")
+
+    ways_to_corrupt_metadata = [
+        f"mv /var/lib/clickhouse/metadata/recover_digest_mismatch/t1.sql /var/lib/clickhouse/metadata/recover_digest_mismatch/m1.sql",
+        f"sed --follow-symlinks -i 's/Int32/String/' /var/lib/clickhouse/metadata/recover_digest_mismatch/mv1.sql",
+        f"rm -f /var/lib/clickhouse/metadata/recover_digest_mismatch/d1.sql",
+        # f"rm -rf /var/lib/clickhouse/metadata/recover_digest_mismatch/", # Directory already exists
+        f"rm -rf /var/lib/clickhouse/store",
+    ]
+
+    for command in ways_to_corrupt_metadata:
+        need_remove_is_active_node = "rm -rf" in command
+        dummy_node.stop_clickhouse(kill=not need_remove_is_active_node)
+        dummy_node.exec_in_container(["bash", "-c", command])
+        dummy_node.start_clickhouse()
+
+        query = (
+            "SELECT name, uuid, create_table_query FROM system.tables WHERE database='recover_digest_mismatch' AND name NOT LIKE '.inner_id.%' "
+            "ORDER BY name SETTINGS show_table_uuid_in_table_create_query_if_not_nil=1"
+        )
+        expected = main_node.query(query)
+
+        if "rm -rf" in command:
+            # NOTE Otherwise it fails to recreate ReplicatedMergeTree table due to "Replica already exists"
+            main_node.query(
+                "SYSTEM DROP REPLICA '2' FROM DATABASE recover_digest_mismatch"
+            )
+
+        assert_eq_with_retry(dummy_node, query, expected)
diff --git a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
index 55e0988218f..1b1ead2d7cb 100644
--- a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
@@ -59,6 +59,7 @@
     <merge_tree>
         <min_bytes_for_wide_part>1024000</min_bytes_for_wide_part>
         <old_parts_lifetime>1</old_parts_lifetime>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
diff --git a/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
index bfd7366b9dc..f4a34256ef8 100644
--- a/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
@@ -21,6 +21,7 @@
 
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
diff --git a/tests/integration/test_s3_cluster/configs/cluster.xml b/tests/integration/test_s3_cluster/configs/cluster.xml
index 18f15763633..39275e99abd 100644
--- a/tests/integration/test_s3_cluster/configs/cluster.xml
+++ b/tests/integration/test_s3_cluster/configs/cluster.xml
@@ -20,8 +20,23 @@
         </shard>
     </cluster_simple>
 
+
+    <!-- A part of the cluster above, represents only one shard-->
+    <first_shard>
+        <shard>
+            <replica>
+                <host>s0_0_0</host>
+                <port>9000</port>
+            </replica>
+            <replica>
+                <host>s0_0_1</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </first_shard>
+
     </remote_servers>
     <macros>
         <default_cluster_macro>cluster_simple</default_cluster_macro>
     </macros>
-</clickhouse>
\ No newline at end of file
+</clickhouse>
diff --git a/tests/integration/test_s3_cluster/test.py b/tests/integration/test_s3_cluster/test.py
index 2cbb36fcf06..2384aa6e059 100644
--- a/tests/integration/test_s3_cluster/test.py
+++ b/tests/integration/test_s3_cluster/test.py
@@ -34,10 +34,24 @@ def started_cluster():
     try:
         cluster = ClickHouseCluster(__file__)
         cluster.add_instance(
-            "s0_0_0", main_configs=["configs/cluster.xml"], with_minio=True
+            "s0_0_0",
+            main_configs=["configs/cluster.xml"],
+            macros={"replica": "node1", "shard": "shard1"},
+            with_minio=True,
+            with_zookeeper=True,
+        )
+        cluster.add_instance(
+            "s0_0_1",
+            main_configs=["configs/cluster.xml"],
+            macros={"replica": "replica2", "shard": "shard1"},
+            with_zookeeper=True,
+        )
+        cluster.add_instance(
+            "s0_1_0",
+            main_configs=["configs/cluster.xml"],
+            macros={"replica": "replica1", "shard": "shard2"},
+            with_zookeeper=True,
         )
-        cluster.add_instance("s0_0_1", main_configs=["configs/cluster.xml"])
-        cluster.add_instance("s0_1_0", main_configs=["configs/cluster.xml"])
 
         logging.info("Starting cluster...")
         cluster.start()
@@ -55,17 +69,17 @@ def test_select_all(started_cluster):
     pure_s3 = node.query(
         """
     SELECT * from s3(
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 
-        'minio', 'minio123', 'CSV', 
-        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 
+        'http://minio1:9001/root/data/{clickhouse,database}/*',
+        'minio', 'minio123', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     ORDER BY (name, value, polygon)"""
     )
     # print(pure_s3)
     s3_distibuted = node.query(
         """
     SELECT * from s3Cluster(
-        'cluster_simple', 
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+        'cluster_simple',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)"""
     )
     # print(s3_distibuted)
@@ -78,15 +92,15 @@ def test_count(started_cluster):
     pure_s3 = node.query(
         """
     SELECT count(*) from s3(
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 
-        'minio', 'minio123', 'CSV', 
+        'http://minio1:9001/root/data/{clickhouse,database}/*',
+        'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
     )
     # print(pure_s3)
     s3_distibuted = node.query(
         """
     SELECT count(*) from s3Cluster(
-        'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*',
         'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
     )
@@ -125,13 +139,13 @@ def test_union_all(started_cluster):
     SELECT * FROM
     (
         SELECT * from s3(
-            'http://minio1:9001/root/data/{clickhouse,database}/*', 
-            'minio', 'minio123', 'CSV', 
-            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 
+            'http://minio1:9001/root/data/{clickhouse,database}/*',
+            'minio', 'minio123', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
         UNION ALL
         SELECT * from s3(
-            'http://minio1:9001/root/data/{clickhouse,database}/*', 
-            'minio', 'minio123', 'CSV', 
+            'http://minio1:9001/root/data/{clickhouse,database}/*',
+            'minio', 'minio123', 'CSV',
             'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     )
     ORDER BY (name, value, polygon)
@@ -143,13 +157,13 @@ def test_union_all(started_cluster):
     SELECT * FROM
     (
         SELECT * from s3Cluster(
-            'cluster_simple', 
-            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+            'cluster_simple',
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
             'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
         UNION ALL
         SELECT * from s3Cluster(
-            'cluster_simple', 
-            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+            'cluster_simple',
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
             'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     )
     ORDER BY (name, value, polygon)
@@ -166,12 +180,12 @@ def test_wrong_cluster(started_cluster):
         """
     SELECT count(*) from s3Cluster(
         'non_existent_cluster',
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'http://minio1:9001/root/data/{clickhouse,database}/*',
         'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     UNION ALL
     SELECT count(*) from s3Cluster(
         'non_existent_cluster',
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'http://minio1:9001/root/data/{clickhouse,database}/*',
         'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     """
     )
@@ -184,14 +198,137 @@ def test_ambiguous_join(started_cluster):
     result = node.query(
         """
     SELECT l.name, r.value from s3Cluster(
-        'cluster_simple', 
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+        'cluster_simple',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') as l
     JOIN s3Cluster(
-        'cluster_simple', 
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+        'cluster_simple',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') as r
     ON l.name = r.name
     """
     )
     assert "AMBIGUOUS_COLUMN_NAME" not in result
+
+
+def test_distributed_insert_select(started_cluster):
+    first_replica_first_shard = started_cluster.instances["s0_0_0"]
+    second_replica_first_shard = started_cluster.instances["s0_0_1"]
+    first_replica_second_shard = started_cluster.instances["s0_1_0"]
+
+    first_replica_first_shard.query(
+        """
+    CREATE TABLE insert_select_local ON CLUSTER 'cluster_simple' (a String, b UInt64)
+    ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/insert_select', '{replica}')
+    ORDER BY (a, b);
+        """
+    )
+
+    first_replica_first_shard.query(
+        """
+    CREATE TABLE insert_select_distributed ON CLUSTER 'cluster_simple' as insert_select_local
+    ENGINE = Distributed('cluster_simple', default, insert_select_local, b % 2);
+        """
+    )
+
+    for file_number in range(100):
+        first_replica_first_shard.query(
+            """
+        INSERT INTO TABLE FUNCTION s3('http://minio1:9001/root/data/generated/file_{}.csv', 'minio', 'minio123', 'CSV','a String, b UInt64')
+        SELECT repeat('{}', 10), number from numbers(100);
+            """.format(
+                file_number, file_number
+            )
+        )
+
+    first_replica_first_shard.query(
+        """
+    INSERT INTO insert_select_distributed SELECT * FROM s3Cluster(
+        'cluster_simple',
+        'http://minio1:9001/root/data/generated/*.csv', 'minio', 'minio123', 'CSV','a String, b UInt64'
+    ) SETTINGS parallel_distributed_insert_select=1;
+        """
+    )
+
+    for line in (
+        first_replica_first_shard.query("""SELECT * FROM insert_select_local;""")
+        .strip()
+        .split("\n")
+    ):
+        _, b = line.split()
+        assert int(b) % 2 == 0
+
+    for line in (
+        second_replica_first_shard.query("""SELECT * FROM insert_select_local;""")
+        .strip()
+        .split("\n")
+    ):
+        _, b = line.split()
+        assert int(b) % 2 == 0
+
+    for line in (
+        first_replica_second_shard.query("""SELECT * FROM insert_select_local;""")
+        .strip()
+        .split("\n")
+    ):
+        _, b = line.split()
+        assert int(b) % 2 == 1
+
+
+def test_distributed_insert_select_with_replicated(started_cluster):
+    first_replica_first_shard = started_cluster.instances["s0_0_0"]
+    second_replica_first_shard = started_cluster.instances["s0_0_1"]
+
+    first_replica_first_shard.query(
+        """
+    CREATE TABLE insert_select_replicated_local ON CLUSTER 'first_shard' (a String, b UInt64)
+    ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/insert_select_with_replicated', '{replica}')
+    ORDER BY (a, b);
+        """
+    )
+
+    for replica in [first_replica_first_shard, second_replica_first_shard]:
+        replica.query(
+            """
+            SYSTEM STOP FETCHES;
+            """
+        )
+        replica.query(
+            """
+            SYSTEM STOP MERGES;
+            """
+        )
+
+    for file_number in range(100):
+        first_replica_first_shard.query(
+            """
+        INSERT INTO TABLE FUNCTION s3('http://minio1:9001/root/data/generated_replicated/file_{}.csv', 'minio', 'minio123', 'CSV','a String, b UInt64')
+        SELECT repeat('{}', 10), number from numbers(100);
+            """.format(
+                file_number, file_number
+            )
+        )
+
+    first_replica_first_shard.query(
+        """
+    INSERT INTO insert_select_replicated_local SELECT * FROM s3Cluster(
+        'first_shard',
+        'http://minio1:9001/root/data/generated_replicated/*.csv', 'minio', 'minio123', 'CSV','a String, b UInt64'
+    ) SETTINGS parallel_distributed_insert_select=1;
+        """
+    )
+
+    first = int(
+        first_replica_first_shard.query(
+            """SELECT count(*) FROM insert_select_replicated_local"""
+        ).strip()
+    )
+    second = int(
+        second_replica_first_shard.query(
+            """SELECT count(*) FROM insert_select_replicated_local"""
+        ).strip()
+    )
+
+    assert first != 0
+    assert second != 0
+    assert first + second == 100 * 100
diff --git a/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml b/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
index 181144b0473..bc5273036cb 100644
--- a/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
+++ b/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
@@ -69,6 +69,7 @@
     <merge_tree>
         <min_bytes_for_wide_part>1024</min_bytes_for_wide_part>
         <old_parts_lifetime>1</old_parts_lifetime>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
diff --git a/tests/integration/test_s3_zero_copy_ttl/configs/s3.xml b/tests/integration/test_s3_zero_copy_ttl/configs/s3.xml
index c4889186e38..7b426faf66b 100644
--- a/tests/integration/test_s3_zero_copy_ttl/configs/s3.xml
+++ b/tests/integration/test_s3_zero_copy_ttl/configs/s3.xml
@@ -21,6 +21,9 @@
             </volumes>
         </s3_and_default>
     </policies>
-
   </storage_configuration>
+
+  <merge_tree>
+    <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
+  </merge_tree>
 </clickhouse>
diff --git a/tests/integration/test_ssl_cert_authentication/certs/ca-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/ca-cert.pem
index 293e1c7f564..a64cd623750 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/ca-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/ca-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-/QK97G8XPqga6zn471wrYJnuyJli+sP7aw==
+CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALgd5Tta
++M/XAGMhdi44sKEp7f81kTwqUib4mkHj9Nyp0MKMo9KodV+t60Fej/L0D9Fm1N3V
+Q+CC4numWWyaBK6hFdfkU5wvbzZnBx8KozMoeiPLPes6QOl9VWkq3lpBDLAcEZM6
+LMsvNy1jsUdQ06lLy6j1lH9dgIe77qNf9UxZhtCJ4ZslogI8oY3q6D/UI1oCpx5L
+J42OyOoCGbTFwzwtHhMw5WKI0EHXEOWwXubdM7P3ETxTjp2+vYPSXj5Irq5XVyfd
+tkCJ7GWouB9x5vYa9Y6DC0J/cgOsdrLBbvLGMTubbFjO87musc1DCb9Svpu/IQDP
+PawdFTn4ASPny3vt0TMRa/O8nBkrIW84O820ddXZhBb0tNT/q+ftffec2rOas7U4
+kE7YzbQthk9otBqvPX+VeCjFJ5Kx3KTOiPGc/eyWHoJbjvwNrnFuEWIiN/1TqhCc
+Y3Qq8cud601yu3dBtCrNAEDCclfnRO0wdKNgkP3u2/lWY4xvMyJfxhNsb/R4R8Z6
+VVYQ4vJXoON0GGYs9D2KURlo+bMIz9hLtZLshK+voOetmRhUmYKa1gE3UxWLmJQM
+/p8A7Zihr4OMv5ioH/hnXvVcSJj9VcsPMF3Z/RhllvOxN4TBLyZ0hW55oEz3B4Bn
+IbA8LcRJUwfQTKtrVHyt07NLbQm0Kp7YYO8FAgMBAAGjUzBRMB0GA1UdDgQWBBRP
+/aq+8kGTfMRAmPgrNaaEHkdKEzAfBgNVHSMEGDAWgBRP/aq+8kGTfMRAmPgrNaaE
+HkdKEzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCycqlIfQMF
+bxjczVV+ootUWeiD9Qo8w3VosQtR6PYxDkFZGgP2/aD3wIRNSBpmRfnHCdv1sURB
+XkKpqG3E22NRDLHwjmXjI8y5BkUxX1xwL9WX5pe9yZTn3eZu6lPtXrhcPnuMvsxs
+X+aP0Y30iMEpHTxLlvV4yNso7ZucXaunWfQTKV18FuXROPgwwnbcZscCQhTxOA+d
+JrB+8WD3BwwzmJU8Whmojmt4pYhzS7q47OIfkxIGugtZbtSxAWXBMGrV0KJkipr+
+omYUV1qCbYXZgh+h2+JtNdBpIZ3K+i3esXT14N9e72oysmoYFQN4Qol8lMgZ3Jdr
+cTH3m1zg1fOne7KT30XKyfTr4iYoph9WHrcv1XwxwYzPbMI+HdMJX2M30V3HEMRY
+RLoafxUZNkFdpWcx29Dok1AI/aVU4vE4+32YdctSJNVPrT/V+Y3dX8skt8tgrnbg
+JnrFCpEuVhkNiwgTS6ktH2ecdpY2VqesUENJtw+m85cCBjxd8XYhRNoFBPQp8SAv
+hEeGc+hIjXYffy6AUo9p+45uOU+RBPKH4hSleESkrI7duajEXaPPl/wJeQYhqvWp
+imbAJtqwI6aCf78NOlbzWiTWJt3g+4kla6oJTInGAdYHcOwwY1KwMWKtSO2ARHjM
+wCCDUCIbtJgxTrUk1Kgty5ipLgP64m29Pw==
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/ca-key.pem b/tests/integration/test_ssl_cert_authentication/certs/ca-key.pem
index e85dca8553e..26616a084fb 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/ca-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/ca-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-+s184IJCUvyMxH83uKKAiBGaDRC+Lbm7
+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
+7MqACWG/2mFExJnaXtgA2HS8NYPKUcQ=
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client1-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/client1-cert.pem
index bd6eea62094..3a953f1b941 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client1-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client1-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client1-key.pem b/tests/integration/test_ssl_cert_authentication/certs/client1-key.pem
index 8bc1e656566..767afd6e2c9 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client1-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client1-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-zjy/DZmOU/a/EiR7MCGg+jS1x9GBxOE=
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDBh20QUvlucIAd
+Db+ujg8QfJVNcQo/+Ipi2T2XC8z3bS9H0dU0vhvCoxkq8c5xKYeDW5xUe3BOnyrb
+gvzkklDHAXkYl2cY1tfrmIxqehxiWLsmnlSjK4T9luwQ/RrjLtZdJOvuikfIBglv
+tPUTh/FMuq7wiPmhpeqYMGmys2FiLtOBICLHQoI/WkaZMsaE8BXa4gyZ4G07rV6z
+wgvi2qM2CQQ+LZ8Ac0n6TJT/taxD3PzKbeG3g8iwPb6deblWEDWiSqKb7gqH5aix
+NOEIXDHbm7FI0EopLrc+cf3IRJclhvMP+ZIwCmZncCS2v8sYNzbAqD3Zko+GlcEM
+CtLHmOaOslKXQA3NFtgc0PL3rkKEl/61rH/5VkHtlRu2hJ/OE0iaFFsIFyyEULhX
+coxNd8NFXaayaOmdO2LrqN3CfXZ55ofyzmS/OLSwuKOKkrJ2+VI40ux1giA1bbL8
++tbSsgKSWdSL7KxLIY+tNsIayA0wmeozIaQS6WSI/BkcUkSsaQvjaruWabKLwjVm
+6WAJAZ7O7L8BGWkXymNUpum24HGZNVWjClCDx6lI53VZCo2e0nqbVwn9ir9fMRGl
+wy3q4PfSIUc1JTb7/zCqxtWPbpDtsW+1AbxT85Hoi9PTB00dW2XL6MIkjtyJQbwo
+sY7h7q+VLbBl+MLM6Uq4bWgmKmRt+wIDAQABAoICAF9pe5lFNyk+OMNaMGsIKaAo
+s9kyxmlkiSGT1fweesZvo5RGfNVcdsY+b92OyodbAK7/3vJ9yxBQA6qmiTTNeBqs
+/L1lg5Qo89n44x1pp43LDjXLcJHjllUJ78euaW+g+1l/pvv7W8lfRI64yez/pDT+
+gtoexefuq1qt36aVLolf6bGrHMpdXWaLhOvprxsCXNwFf03r6h62ak64d/C3dyjg
+SCG5jz8DF/FZiUoKkOwCSvUoOFSoGazePBhaV0f5hN/G6SV0NefrD4CSP/HFtmT9
+fOmXm0Bzgi88tvBh9JyxTCtPkUWzEuqjTM52f1QogIt6Rsf6LF2ffkYIHgP+u4e5
+dDFw2RAZg1DFZrZOyIKW+fyDqftdSj5LEN/AKofc0os4qzCXktcl+x8KSxlGnhn5
+i9V3ZwvaV4ivMxWQ7EO1Jftqgy2OBwTiFHkeVQ8eC7676pTx18UmN0L2heybA0Rq
+I9mrzYCDYBn0HGYdb0xplPpDuj/g7zLx+Edn6CEoaXGwU1kT7SoNwfVsix8/+k2x
+jYee+f2EjbHmBKA7UeXkLcMa1QpjIipMX5gWBYa6ACV+xdDrvoMDjrRx7A2j4FF/
+T/tv2GjRWeqWB6bySVA7l92Lltm3RLsW82GBr7I9a8xScUYLa0AfNeeBmS5AIgCA
+5FhQ7ivlZ56VWemfiTXpAoIBAQDNp6syo1svZJIBQiZIQRxh1H080wtYDi5Yan2R
+loQbjbEitzXC1+rFNtspHuOc0frv5XBvbxOJwXmEsXcS8sWDQBKadr4RDdPGeMDa
+SA0If8aWN2BjcILfY9VjJzbL4DY2Tfua9OmIrGvx0LMfPpl+6LXgZzCgPv/o+39i
+Kv/ISHEsJITloVeuMq5Py0k6+KXepYWAvdrLkEfxg0gl7Ds2TZDOs58gZRb0lW9+
+u7VOtN9EFd6KZtaU1HfBXUBM57Jlt+aIBOGom8LB/XX7bBi6puIqZOK4VqGR+29j
+wj1lnX7npfy8dZoCEplTvp3AY7pTO1BrkNluOcacmnSTGtfjAoIBAQDw59P0M0/z
+82MwpGCDilXgqXY+SWk8JvRY5raAthqWrjiAkuA9hjh02PXmRLhExs9owsptuP5q
+CckFOyoILZFA4IexlvPgyW2rPZFyrMpI98YYG6Lyw0aMSyDX/rBKJA9cServSjzc
+1eLT9uPP43L3EkWLtgocHnD1lZ0YSkAe2ehTGEiNOnaW5H81csK07LPYdEvV8wup
+aFNZdcUMJt/V8/C2nkAQpLsgGMLRKYgw3KX7JmtkQsldjK0j9rl7eVH65LdjBXuH
+cRMS1qRJgHl5+Yemr7890aGomhD37RMYUKbd0NCQIn2ISxtWF0pWra8+zg0fhPiP
+EGPbeNVVI30JAoIBAQC1B/Vhu/7Wtzb3OJ2uWPJ9A6nC0xxXRRRy7Drg35gnERFu
+t8vxWlPliqZdij1enFDCwDu7PBH833zy260v1tka8lnt8rzZEkzrlvxcqbQfWSsc
+rF6C6lWqA52hjLFlwla2cusauqCgmPbkhIxI4rgHyR3hDbT2Or7W/hxh8+v5CBvn
+ebYq1V3zj9V1lENAUATi+t2MOJPTQYyzApeOGmb9JEZmTiOzRolwf+MHsoClaf5n
+VsDxIBmgJW/NnSKvD/4wIDQkY/eojoRgc5dZ3QvfsmvAWdJh5pCPir/BFwko2/0M
+OUdDNlp9nJWv7Em9Q4yPG9Vs+rMLnnxA+o3HuId1AoIBACSQWzg2TY1ORKDOYiO0
+7GHj9qFvjPxnQTD5G3wfp5t1J/hD0qsj4w/BGllv1rQBpNtWrVjH+j1n7M3RdAi3
+udMqAQ5wReW5TN7vwlKwbSd0C+n+z9We0+dZQ8vkyScHoBk20uSs1N4DzKC1WVBl
+Sj671DhnUdOAv05W/fgA1QiZtExgZCqjU/qFBdW77Fd/kbBpvlTjxcJZpkTuvhCh
+GdokY0WkcT7Vcd1mRLNwZU5dPwgGhcg65ss/HcxWl0JpYIr/CeKKo3wkKmvyjg7l
+5AoiWHdxN0qPtcScVbT7k6leHGWQWwd1ZK46EBUaBdtwEygqKA2/peY4658VEPQS
+JdkCggEAGLjOV5XjLMliu8tWrOYE/nBZT00KOd4er1nojcxrRd5q2MDbqMqSi5xV
+hibl8Egasdx+Sc8+HLazGPFizNrxd6Ahs3tBdUpYClk4dqnV1X9XK9WV1Un6ULD7
+qzhYQ1gJhQLg/rPxg1BLR/Gl3LahlDdaLvDFTEYPz48oVTszC1yQ8A/Do466TuXf
+qF5yPBkt/lxasqMa7ZLCUBMZDF/FGL6x0Z9HDcJc9nv1dLFc5vggoEzts8S8Rmue
+WwNcwQsuXEuhpRv+Uf3pimoNm7qfPx9vKS4qxHswHCoC4yIxM2VaALUSCq4KicII
+3UTpTl6z0FqLEeB20OY2dIyoPhdNoA==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client1-req.pem b/tests/integration/test_ssl_cert_authentication/certs/client1-req.pem
index b821609068b..d60adf1f62d 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client1-req.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client1-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client2-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/client2-cert.pem
index 886cc533fcc..996bcf41d94 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client2-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client2-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client2-key.pem b/tests/integration/test_ssl_cert_authentication/certs/client2-key.pem
index 462916c0670..76f56dd68f0 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client2-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client2-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-X0ueOR40kfa077G7jNfb03qOPUR1mFw=
+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
+PK2zQzz0JkpsDD7mGM+S6apZHiLgHg==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client2-req.pem b/tests/integration/test_ssl_cert_authentication/certs/client2-req.pem
index 846f6db84dc..89cde777a45 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client2-req.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client2-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client3-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/client3-cert.pem
index ce9a472cb9a..848ecd9492d 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client3-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client3-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIFMDCCAxgCFDtXgZV+Jd7/OrySQd+e1dVblQe/MA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client3-key.pem b/tests/integration/test_ssl_cert_authentication/certs/client3-key.pem
index b7464eb2866..9807809578f 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client3-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client3-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-I68TOg71OfCKgfeixNgcOvQoN+xngA==
+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
+7tLJO1z1/eDbntbQC4cvewqNRYhwlnWe
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client3-req.pem b/tests/integration/test_ssl_cert_authentication/certs/client3-req.pem
index 7b4445b3609..a2b19bf835b 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client3-req.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client3-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/server-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/server-cert.pem
index 6f8e5a3c6b1..53ee3185b2a 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/server-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/server-cert.pem
@@ -1,31 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-c+5CZ9SobLdMkVOtQQ==
+DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+
+6f15rjbEl5DanEWi3YsMIPNwQ08waUrqFz3aCKeGcRujKb7uaX/I5LWdh8x9I++E
+E2ccFlnJTd2dZKxjY9jd2pRXVHmVE7XLpl8qtlLtLjlJ889G3tbgwdLZqaClxJxH
+0KQHH5wUwweqlfbteXeYUAIfhDRmoOL2qhUPLYi7E5/vpMeEL+tMn6fswuk7JIR5
+64NLUVC1/VXtjDli0YiIhE025iWL7FukUAifJKa/kYEAPen71bZcpT3uxYnALClf
+rANg8uJ+DTDPeNjZbLjNTPRfqk4W7pwG8w5F6RhrMPwgqvBNrnne7OtCD2lzlFU/
+sQiBM8HA5gN2CJuDjl+F70KTY3nRkAxpmHvSl6RPTEx4egdcb69A85LmDjyV+S01
+8tJQgi8TEmXM+TadQo3Xz/6+MHBIr7MknRRs0l2wCCiNvkE5MxsT+Pv182wxGArF
+aIvCU4dZI6bI2WZbYclR41Ud5O6XhQKYu2AhS7zY1+nhAMAvqyD5OmIIjKWi3GHP
+vdSCljBQzs1tuHgTaKIeTTzFetnRDzyoRDbLbo/OhKEAybvIEqq5iXUmfz4RG+Am
+ZUdxBZ6muueAf44mVQBKx/OB1BIzObaKy5s2gP+c486WR15lqVcu6FkPf8tO15c2
+lfpDXE5IvRBeSgi4vVdL4ceJtrfMavd9pa3YmGk+zwIDAQABo28wbTArBgNVHREE
+JDAigiBpbnRlZ3JhdGlvbi10ZXN0cy5jbGlja2hvdXNlLmNvbTAdBgNVHQ4EFgQU
+eebevYkmCqTDsOG16U3lTCIvqNcwHwYDVR0jBBgwFoAUT/2qvvJBk3zEQJj4KzWm
+hB5HShMwDQYJKoZIhvcNAQELBQADggIBALVfgo+K+SHzNrerNVJI8U/50fi3WPsS
+rsorNxYHaapTJB7/Ngn8Nv05YI1Er4Npl9X/9LjA0uwxYmW6zPGGoSVqGTXJD50o
+2c2MVXrx3ZjkNLNw8OoIROU/JwFZRANYS9ECZVOYY2eHcci4S1D7izZP/7+8V+YV
+l49Do+ht1nkpeOadWXsQDPZO3bVbUvkvuYYeaHGzULKWS4sHbXmFizrL3V4XeuyR
+SAwAo1sRkYcJP5JUk8JCDW+5XFtk/X638RfZJ/9hGxW2gbX9T/Mgqsmi4TMajeNn
+VWkq7+WmU4v9TKZARA0240CIiwmW95KVMYe5rWEB3i9yo0c4kei9H113q0Pp/3Kd
+sNCZf14Wm8BhM8uUQTyOUyXQvDUx1JzJyZtXj3zGR86uqEGPPMJj4tWeP/FIcF3v
+hpH3s0md010BIjpEVoov6q1qPe32WQL9eGappsiEbJKFpJ4YYXwtSgOnUy6vt0kp
+TTuYQWBCUfdhKUmQHvJbFzA6OlIs4RRmWlUcFOFOcS79FzgcWS481LSyMNPNcQNQ
+PGmLtxxcoRADs9++BltF+Q8V4MbH5o+ZQt8314Vg9n1AWV6L2poLNY5CxXMd6tVu
+wDYHIe/VHyCBqsdh9u7XKpv27xfu4TdxDS1nNzyMm69FUlGvRC5IR2k+IEIKmQ2n
+nyRbOKxUBKl6
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/server-ext.cnf b/tests/integration/test_ssl_cert_authentication/certs/server-ext.cnf
index 83d9b03ccb7..49859873222 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/server-ext.cnf
+++ b/tests/integration/test_ssl_cert_authentication/certs/server-ext.cnf
@@ -1 +1 @@
-subjectAltName=IP:10.5.172.77
+subjectAltName=DNS:integration-tests.clickhouse.com
diff --git a/tests/integration/test_ssl_cert_authentication/certs/server-key.pem b/tests/integration/test_ssl_cert_authentication/certs/server-key.pem
index 065a2290749..9d4aa59a125 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/server-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/server-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-BHL/JsJ0Be5xM3V4x4PtihQ3Dw546FY=
+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
+Hg4+vB3JZpIQ4jvvlZ+GdcG5eW61
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/server-req.pem b/tests/integration/test_ssl_cert_authentication/certs/server-req.pem
index be2f756cc7b..714ef19ecf9 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/server-req.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/server-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/wrong-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/wrong-cert.pem
index ef95a73deba..03ebf989764 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/wrong-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/wrong-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIUL2Y/QpwqqHyi43PwPeA6ygdPYK4wDQYJKoZIhvcNAQEL
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/wrong-key.pem b/tests/integration/test_ssl_cert_authentication/certs/wrong-key.pem
index b2213cd2675..834f82fe80d 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/wrong-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/wrong-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-neUhT/t9hHdcMJgoxm2IITf6ip8nTnY=
+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
+aH0VTefFJqNq7ADzlJxogNFALN+F0A==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/test.py b/tests/integration/test_ssl_cert_authentication/test.py
index d210c3e58cc..0246b835fd5 100644
--- a/tests/integration/test_ssl_cert_authentication/test.py
+++ b/tests/integration/test_ssl_cert_authentication/test.py
@@ -1,19 +1,20 @@
 import pytest
 from helpers.cluster import ClickHouseCluster
+from helpers.ssl_context import WrapSSLContextWithSNI
 import urllib.request, urllib.parse
 import ssl
 import os.path
 
+# The test cluster is configured with certificate for that host name, see 'server-ext.cnf'.
+# The client have to verify server certificate against that name. Client uses SNI
+SSL_HOST = "integration-tests.clickhouse.com"
 HTTPS_PORT = 8443
 # It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
-NODE_IP = "10.5.172.77"  # Never copy-paste this line
-NODE_IP_WITH_HTTPS_PORT = NODE_IP + ":" + str(HTTPS_PORT)
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "node",
-    ipv4_address=NODE_IP,
     main_configs=[
         "configs/ssl_config.xml",
         "certs/server-key.pem",
@@ -35,7 +36,7 @@ def started_cluster():
 
 
 def get_ssl_context(cert_name):
-    context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    context = WrapSSLContextWithSNI(SSL_HOST, ssl.PROTOCOL_TLS_CLIENT)
     context.load_verify_locations(cafile=f"{SCRIPT_DIR}/certs/ca-cert.pem")
     if cert_name:
         context.load_cert_chain(
@@ -50,7 +51,9 @@ def get_ssl_context(cert_name):
 def execute_query_https(
     query, user, enable_ssl_auth=True, cert_name=None, password=None
 ):
-    url = f"https://{NODE_IP_WITH_HTTPS_PORT}/?query={urllib.parse.quote(query)}"
+    url = (
+        f"https://{instance.ip_address}:{HTTPS_PORT}/?query={urllib.parse.quote(query)}"
+    )
     request = urllib.request.Request(url)
     request.add_header("X-ClickHouse-User", user)
     if enable_ssl_auth:
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index 0490c0c1f0d..a9e6cbda67c 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -537,7 +537,7 @@ def test_schema_inference_with_globs(started_cluster):
     )
 
     result = node1.query(f"desc hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow')")
-    assert result.strip() == "c1\tNullable(Float64)"
+    assert result.strip() == "c1\tNullable(Int64)"
 
     result = node1.query(
         f"select * from hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow')"
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 7d22cb24a5c..a09821137c4 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -1307,7 +1307,7 @@ def test_schema_inference_from_globs(started_cluster):
     result = instance.query(
         f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}')"
     )
-    assert result.strip() == "c1\tNullable(Float64)"
+    assert result.strip() == "c1\tNullable(Int64)"
 
     result = instance.query(
         f"select * from url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}')"
@@ -1317,7 +1317,7 @@ def test_schema_inference_from_globs(started_cluster):
     result = instance.query(
         f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow')"
     )
-    assert result.strip() == "c1\tNullable(Float64)"
+    assert result.strip() == "c1\tNullable(Int64)"
 
     result = instance.query(
         f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow')"
diff --git a/tests/integration/test_structured_logging_json/__init__.py b/tests/integration/test_structured_logging_json/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_structured_logging_json/configs/config_json.xml b/tests/integration/test_structured_logging_json/configs/config_json.xml
new file mode 100644
index 00000000000..c0bd4e86a01
--- /dev/null
+++ b/tests/integration/test_structured_logging_json/configs/config_json.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <logger>
+        <!-- Structured log formatting:
+        You can specify log format(for now, JSON only). In that case, the console log will be printed
+        in specified format like JSON.
+        For example, as below:
+        {"date_time":"1650918987.180175","thread_name":"#1","thread_id":"254545","level":"Trace","query_id":"","logger_name":"BaseDaemon","message":"Received signal 2","source_file":"../base/daemon/BaseDaemon.cpp; virtual void SignalListener::run()","source_line":"192"}
+        To enable JSON logging support, just uncomment <formatting> tag below.
+        -->
+        <formatting>json</formatting>
+    </logger>
+
+</clickhouse>
diff --git a/tests/integration/test_structured_logging_json/test.py b/tests/integration/test_structured_logging_json/test.py
new file mode 100644
index 00000000000..d56e9a41968
--- /dev/null
+++ b/tests/integration/test_structured_logging_json/test.py
@@ -0,0 +1,32 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+import json
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance("node", main_configs=["configs/config_json.xml"])
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def is_json(log_json):
+    try:
+        json.loads(log_json)
+    except ValueError as e:
+        return False
+    return True
+
+
+def test_structured_logging_json_format(start_cluster):
+    node.query("SELECT 1")
+
+    logs = node.grep_in_log("").split("\n")
+    length = min(10, len(logs))
+    for i in range(0, length):
+        assert is_json(logs[i])
diff --git a/tests/integration/test_timezone_config/test.py b/tests/integration/test_timezone_config/test.py
index e4a9f75abab..180026c5818 100644
--- a/tests/integration/test_timezone_config/test.py
+++ b/tests/integration/test_timezone_config/test.py
@@ -26,9 +26,9 @@ def test_overflow_toDate(start_cluster):
 
 
 def test_overflow_toDate32(start_cluster):
-    assert node.query("SELECT toDate32('2999-12-31','UTC')") == "2283-11-11\n"
+    assert node.query("SELECT toDate32('2999-12-31','UTC')") == "2299-12-31\n"
     assert node.query("SELECT toDate32('2021-12-21','UTC')") == "2021-12-21\n"
-    assert node.query("SELECT toDate32('1000-12-31','UTC')") == "1925-01-01\n"
+    assert node.query("SELECT toDate32('1000-12-31','UTC')") == "1900-01-01\n"
 
 
 def test_overflow_toDateTime(start_cluster):
diff --git a/tests/integration/test_tlsv1_3/certs/ca-cert.pem b/tests/integration/test_tlsv1_3/certs/ca-cert.pem
index 293e1c7f564..fdb29f6285d 100644
--- a/tests/integration/test_tlsv1_3/certs/ca-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/ca-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-/QK97G8XPqga6zn471wrYJnuyJli+sP7aw==
+CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALACbyVD
+dVp8Wu9YSXYoGwXnvwPrl0IEeH5j9PN55QOY+4o5gB4edAvqwu0FF8B7tFQSOM8Y
+6F/alij+AyFiv99kuBx/nSLvcsQgKW0n9dX1n9GMNQFqXzmjvMZUVyGxrQRMqY9W
+oRwTG7N8hxqOSYXKiK/Cs+6EcDkxQS/1zZph8TWxZ2Qd4MVkWFdDFCHHe4Va+FF6
+Qu7BdfjjtFVmoPCCgfqGi7ZmtLaCi518kMzve+7OvzjvRz7qZ4wgOHcIqKYC0Ju6
+6+E0/VmYbXkkaUYAo2NIc4jczUrqZ1uQYhZbURB7LUJSzBo+atkeF+9G2Y0m6qEH
+a6pp7HRvU9UjFogqCPjSwqPo8ngh1j23FcmpaEN5OI+HKQEy5qV2LC3BnB+GgZ64
+BfFQ3MPR2/J5I5rokVumrSxykybOVWzDRSDCBJtIqJheFTdA6/bWkYe7kyX6+3Dl
+DvixQrH95IpBq/KNg7WfVvYzM9I+IK+VukbT3TMffRg1gscYzzjJVyVVXFkl9fXL
+fK4Mub5AInjnfckEvpAB7fYGeii9aSN/rQrsgZAUr/f+r/2gMjr3AaesClvxrLC9
+5hcq5Xz3JCHJt7W0s0xTUPfSpElGyBwdUcxZ3JUoPQQNUILQF2Fu0bIUX+fZTofm
+WcjW1L8/3BK1Os2kX9B99KY1atJSqaPcwGXFAgMBAAGjUzBRMB0GA1UdDgQWBBT2
+eErp2ltpqc2UbooSDg11dakobzAfBgNVHSMEGDAWgBT2eErp2ltpqc2UbooSDg11
+dakobzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAUIAReg8ZQ
+vMnWyWdm2DHo7iDfksB2LPDFWF9OzbQYBWrjePATBmfqmmcVrqlT1wJ3tS7nsBys
+TZohYVUnMz/HtXwH/3RWUWJgUSJgX61i+S4eoXHNaiLWb+xbBiIjsiRLy+fZ3MSa
+nLU5dF4rxlK7wksmYnK3+nM3ASzB2MnPE/A8pg/5m+BQ0Qflgf41usoydZdVxY3C
+nJTcayoOC9LmkgYq4jyfdoKF+p47QUxKd5II5oighuU/kVM/b2LdlaR2JIFN8SgH
+xmXlo40TYw1hcW/VN/HAmgJqjq5QCmFyUijt54n8kXwlzhfX44O6f9nkDENrr44G
+LDXMVHs0EgZsuGEs/y1qiBI5ruqfoHrL1P9yPy7pxQqRsrxuJM+6psSq/SPEhYWW
+s8TK/w9CwzhyexBVOMnBcQyImt+wB8xsYsaGf2oKhpflWggg6Q7QBX97pSaS3Qcd
+KFKAHTUyfa1DvEQkKmm9WyrealFMrnZ/o7BoYH8QqnwmgTuKDX3YTvWOyO3A4r8b
+fIJuHrz+zdzPaF1RdtYnaPwzRmuMggkFM6Yg0H8GAkW1zQP4+uM8CDJRKcJtFTvK
+eU4iMfU/eBtsEbyewmFU25uzTGCGzlpFgS4MyiEZ5t+LU7bycAhe6+SFdXVDxidN
+7q/OABYbuWK1mZ5McM+H7UQWUAi8PYVfrw==
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/ca-cert.srl b/tests/integration/test_tlsv1_3/certs/ca-cert.srl
index c02cd0a4526..a73f2eb97c7 100644
--- a/tests/integration/test_tlsv1_3/certs/ca-cert.srl
+++ b/tests/integration/test_tlsv1_3/certs/ca-cert.srl
@@ -1 +1 @@
-05F10C67567FE30795D77AF2540F6AC8D4CF2461
+05F10C67567FE30795D77AF2540F6AC8D4CF2465
diff --git a/tests/integration/test_tlsv1_3/certs/ca-key.pem b/tests/integration/test_tlsv1_3/certs/ca-key.pem
index e85dca8553e..c8d7e58d044 100644
--- a/tests/integration/test_tlsv1_3/certs/ca-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/ca-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-+s184IJCUvyMxH83uKKAiBGaDRC+Lbm7
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCwAm8lQ3VafFrv
+WEl2KBsF578D65dCBHh+Y/TzeeUDmPuKOYAeHnQL6sLtBRfAe7RUEjjPGOhf2pYo
+/gMhYr/fZLgcf50i73LEICltJ/XV9Z/RjDUBal85o7zGVFchsa0ETKmPVqEcExuz
+fIcajkmFyoivwrPuhHA5MUEv9c2aYfE1sWdkHeDFZFhXQxQhx3uFWvhRekLuwXX4
+47RVZqDwgoH6hou2ZrS2goudfJDM73vuzr8470c+6meMIDh3CKimAtCbuuvhNP1Z
+mG15JGlGAKNjSHOI3M1K6mdbkGIWW1EQey1CUswaPmrZHhfvRtmNJuqhB2uqaex0
+b1PVIxaIKgj40sKj6PJ4IdY9txXJqWhDeTiPhykBMualdiwtwZwfhoGeuAXxUNzD
+0dvyeSOa6JFbpq0scpMmzlVsw0UgwgSbSKiYXhU3QOv21pGHu5Ml+vtw5Q74sUKx
+/eSKQavyjYO1n1b2MzPSPiCvlbpG090zH30YNYLHGM84yVclVVxZJfX1y3yuDLm+
+QCJ4533JBL6QAe32BnoovWkjf60K7IGQFK/3/q/9oDI69wGnrApb8aywveYXKuV8
+9yQhybe1tLNMU1D30qRJRsgcHVHMWdyVKD0EDVCC0BdhbtGyFF/n2U6H5lnI1tS/
+P9wStTrNpF/QffSmNWrSUqmj3MBlxQIDAQABAoICAAnKYN9cRMNfRnmo2hFCAtrN
+vNDdgoDwGbnCGqaOgcA0+s0CDM/gFslw6h3gGiWhW/MPPmy6sHZghNjL5GWvhgfJ
+pPok2RtP4XzqYxOI1QJtUtIHsA0fmyNsKbyIhX5A0WR7VTU9duHGaFSQGT3Pa2SP
+UxIfzP14DXwI8tzVmfW7+/xmHV+yz8V7IvTbrNuCKqtM16JEoEOCrGrHU8kqV8p5
+H/zNDil7xhKe6WA9xRo5OhYbFwT2PmrQBCmFw05Pw33Ui0EWYTeaSHt64KAL9/Um
+ZPBJX+/dhGfl6RDtU591vekiSO63B1ZwYWYpZ+Bt+v0AjK2faYxFrxr89FdXR9H8
+kPCOgWRx0+aM3l+//nfcsd7csFMZzPpxbVm5DBI0+gyyTMXi42wQZjnjLGOUcqku
+ZmbHo982E6MeRUSwJvTnFib8ezRTrp6AE34pwDdfo8BKxK2hSbmU6F2DL6xnhj+J
+dDQo2YT9GyZGHoQjQXZouCI4eaPJwKCnQnFwhpfGfkJT4UFjrRb+LEKd5DxqQtMN
+/cPfVCtLK6XkhgllOqRiWaSzTcfPIWZrjD9hO9wfTsx7sDaxjNm4Z+7K0RQaLbyI
+PTLhMcEp6Jhu5xGaBPkgNa716GHhU08jB9qD+240VuBlJ2Pv3+LKRewQL4P0EjAP
+SkyD4qQxN0n0PT2pHqZxAoIBAQDOuF4mL+FLzDtNb8uolS4HDNWgfMvAtZCh/PSk
+YPPpHKDpMMEQ9oeFnveR7GJHe7qYWWiWsPa3cdnoa3pK3OjbsUeeL+yihdinu27j
+pDIgLFPioIrFD/Mlt6TeN6m8psQaU5u6BqGr6fNWFAjJYElmCq7hh2u9mo69uSLc
+muaT5Qwp6YLC4fyCn94w/7f/N0Lnbn9VrTvFfTDylvgU3jODiHrZploB/uDoSjmC
+b7kQ1KABDUWXADO63nWrNQKPQ1zigcNondzekl1AduGsfpuNeU6UzpyV3R/l3y4j
+T7R5mkP3rwvZX0GXxHlhUhAfRxxXr0CGw6M2Pd81YV8006R5AoIBAQDZ9947qEmI
+cbyMJTwQYhIgAYD6dngHwNgVDZB9HmNPMWTRY4g/2FOCrhmtpAUgrgv89nQPaanr
+YmJJo6gA+1U3CyrAVSazu+DibuhrQ31vFPHetCAG1MqVRdn/UwUFn708QZQvs/0g
+XcCfCBql5acug0YELOvRTsDO4M6damDg2oELquPRRQJHMgMFEartdIiD2hBip9ee
+Wr9AEG2wiY7VpFrKb3fuoee9BVRAD6RwPRZRjXMakhe8dH484VQoqgSf7qx1GdE1
+CzEN+LYQKC+gefIpKK/jOwjdTI/cc/fKzJxmgEOJiFVOZHuDNTSUL7l7bvO9huPB
+3ypF5JfGfECtAoIBAQCBZzZAj15oNXu1+NKzQFdkwGsGILjndIEKdi+qqqpk9a/g
+6c0h0kF5qs5tQV0wRErFTcrD8hkvMoznCkiujmUSCYK8imGGR2Udcp5yz/k03KrS
+Rg84Vsithq0lEhEl7/r4Q/hK1hXkaPoTm0z4ylaIEw3wTfZq5VKPf1JMaIcIc6xO
+nEdnuVF5b5wGbj1+/NfbyfbZ6ixtbvXyFgFMBuCWaRwGHTVg5G1j2/ruJQPjfkZ/
+AhDa+pxnURS1zORCTDfb7sElPxThGxxW21Rfx42WXSaMzl2FDrwGCNR39FAUgzYi
+2SgAtbl4yNv2yQkgm0IpvaIV+mez771HTCHuDsJ5AoIBAQCfX3R37GmvwXHaixMq
+63pTOqZC/EJxcNjOM/fU9FYqvnP4Ai3KePM+1uvhoc86AOi1EsLzzg+3E13IeEhM
+R3kcYSbmMJy2yIX7Kpr4awWZJhhf/RZ5yDdEBCoMXXiLjyv/lfezFYjclJBV98f8
+Szn9cXDNdscKaOnjmk6YnQKvBjVbAZ3IEwxCYFgC6dMwAoga2GQoro6is7mpLxn0
+/e+ZWK4l3HE1494cwHvEx2s1wgTCpolmATIn0onHG/68KOxuwEYK7VCh10gL7jG5
+CJkiXmfpHl3U6QJnRSbfS1AAUbF95QT819mAE0qYOlvyih62GP9RMgLwa6tuJWGw
+eIOVAoIBAH0rt3DhR2ZQdsX06iGGdJiPdTZ6hZm00KsA0ienkxumiJxU75fB7Szb
+l+GXBBIkTuBD2U++Ghf0bQSNjEPeMZBg1mV9icdOxp+mSIlQAs6/n267GIO7KB+p
+1BQdo3QAmopEwmUq2xu++jpKdVSj+vrAJGLbQQkSgkc9i4+S9yFNklL1UdZtr+pW
+16q5N3UjZbF3UHgwO3eZhsXlCmRaIVRViOJSL3SMvJn3sdO0hXJpHPmKeN/45no8
+7fVCInUEB48vfrZksBTaEdBVf1oXnQT4g0RrVA8cmpThBkL6oceWD7aCi6Ifndqc
+2kriXQ6h1JYB0rsaBtGL15+Rysiwxxc=
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/client1-cert.pem b/tests/integration/test_tlsv1_3/certs/client1-cert.pem
index bd6eea62094..9abb92200e2 100644
--- a/tests/integration/test_tlsv1_3/certs/client1-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/client1-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/client1-key.pem b/tests/integration/test_tlsv1_3/certs/client1-key.pem
index 8bc1e656566..bca1ead9916 100644
--- a/tests/integration/test_tlsv1_3/certs/client1-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/client1-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-zjy/DZmOU/a/EiR7MCGg+jS1x9GBxOE=
+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
++KcVWUpH4tsvh1cROnDKYP2jpXLhcw==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/client1-req.pem b/tests/integration/test_tlsv1_3/certs/client1-req.pem
index b821609068b..1479336b3ff 100644
--- a/tests/integration/test_tlsv1_3/certs/client1-req.pem
+++ b/tests/integration/test_tlsv1_3/certs/client1-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_tlsv1_3/certs/client2-cert.pem b/tests/integration/test_tlsv1_3/certs/client2-cert.pem
index 886cc533fcc..dd251e0062e 100644
--- a/tests/integration/test_tlsv1_3/certs/client2-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/client2-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/client2-key.pem b/tests/integration/test_tlsv1_3/certs/client2-key.pem
index 462916c0670..19f3f639e75 100644
--- a/tests/integration/test_tlsv1_3/certs/client2-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/client2-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-X0ueOR40kfa077G7jNfb03qOPUR1mFw=
+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
+uW03sZ0aEPgsS6rSONPNishIM4Pdzg==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/client2-req.pem b/tests/integration/test_tlsv1_3/certs/client2-req.pem
index 846f6db84dc..7c6fb44663b 100644
--- a/tests/integration/test_tlsv1_3/certs/client2-req.pem
+++ b/tests/integration/test_tlsv1_3/certs/client2-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_tlsv1_3/certs/client3-cert.pem b/tests/integration/test_tlsv1_3/certs/client3-cert.pem
index ce9a472cb9a..5a569e19a0a 100644
--- a/tests/integration/test_tlsv1_3/certs/client3-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/client3-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIFMDCCAxgCFCpubUDPOgZwZSDFE6D8wNY5I8yPMA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/client3-key.pem b/tests/integration/test_tlsv1_3/certs/client3-key.pem
index b7464eb2866..6604b72f17e 100644
--- a/tests/integration/test_tlsv1_3/certs/client3-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/client3-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-I68TOg71OfCKgfeixNgcOvQoN+xngA==
+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
+Zj/uF02suGelqY7UyN8+yeXzg0rwXt+F
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/client3-req.pem b/tests/integration/test_tlsv1_3/certs/client3-req.pem
index 7b4445b3609..84eef937584 100644
--- a/tests/integration/test_tlsv1_3/certs/client3-req.pem
+++ b/tests/integration/test_tlsv1_3/certs/client3-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_tlsv1_3/certs/server-cert.pem b/tests/integration/test_tlsv1_3/certs/server-cert.pem
index 6f8e5a3c6b1..ccd0034b506 100644
--- a/tests/integration/test_tlsv1_3/certs/server-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/server-cert.pem
@@ -1,31 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwMjE4
-MDk0MzA2WhcNMzIwMjE2MDk0MzA2WjBWMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
+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
-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
-c+5CZ9SobLdMkVOtQQ==
+DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9
+IAOQsWh4Ursd2Dqdtme8e1Dwc/mpfZozKgZuCsc77CjMhaC+5d5JzTCNZzDVny4p
+GjWZFs2NL0DK42/8oS92BtQGj3Iu3x5B5JDt1jDW/i63zeQzazgTTpcC+BdK5mqc
+5jA83d/Na1gFQX0MZ7qDFA3yKv7cOhm3uEJJyied2fJ9PBBjDGUfhubQKAqmkAGy
+qcPRl0hXof6EbUYqnep2uVn9CNbGPjdVmCKhhBjw4fxxR4RMFelQOjRGgdAZt69Q
+TqHoW93F+kOWkI2XhpEfjrKlh9fzanToU3e71tsIvqkJEHSe3DAufhh5SpB11cIp
+L+e/nX83C1Lji3LLbR87XCWNK6ESP3xkat6X6hYcPH/BhaYjfZYgUBFFRWhNmkD4
++x0u/jL52x6PjFewXwaNijINp4/P5uoaZf2DgWPP0+/RoLdlv1XOuB6NBN80xYjs
+gWtJrOc66FTUqKyRhLWu66pVpDtgK8d1kew9Gb//82E7n733ZkUXMxiRGLeSVsI6
+fTE/cguObLQ/85pu4kfctoaId016MI/er9iLAsC0SQAE4zQiZ2/sHn5THxxbsvGj
+CWiHiyg8AM6V0JaoWxBakAqjBnGi5x67ucmjI36+od72lgbRPMiUinGvlW+a/gJY
+nZNdo0VZ5PECKaNs6UR8I03ozWZnIpN0zoS8Kcm6EQIDAQABo28wbTArBgNVHREE
+JDAigiBpbnRlZ3JhdGlvbi10ZXN0cy5jbGlja2hvdXNlLmNvbTAdBgNVHQ4EFgQU
+ol8EZWSEsbOPH+rRQN30/erjV38wHwYDVR0jBBgwFoAU9nhK6dpbaanNlG6KEg4N
+dXWpKG8wDQYJKoZIhvcNAQELBQADggIBACp/Cg7v0hU/fla/iuhta2x5kKLNjQI3
+USB/NlHOmanlBhrIzMGU7/mPqNY0Ymv6eU0nAMrdLq/P5awQL19QveEWackDo/k0
+bGjko7F4lZmEes7itT1UQgKmTizAcqiYQwa+v53eA906jL3JtQu+J/+z494nj0Ln
+wDjXbOBiLMTaXLmIa9gvmJQ7YdTaIwEnciaTcoPpr563XQ0Y2Uj1dxcmpeSndVd4
+KhXcxa5odzHCTJy2SxWlE3zWml4EsWkVigmLomCZfbT1lXDfyARs4LPQ5cEHsPar
+cUdMbiup/KWJCtFAapVTHtfJXZr9mBl3f6GT+kBH6ejwP3Gehzb4E5anZFrBU0jj
+fka3/wFLQbfXwAOOVrDmMHk6zg0OMPm+Es9tuTb6Pb/0vK/fwUebCpr7m/nDiQHQ
+oEMY6jcBS+YaICNE2cb01PDTvYzYTxefyGLIUJMPafv5Be8Mr0rYnQqZUH2WARYP
+o2kQzNWkP4lGTGGOJIAug9vy3zH8QkBMFR/2sP2QX5k+//6YIecnXMKLmp/iUJgU
+kiEJQ3ZfLRb58WtAvIgwZzRJhdNSzU1FWZ0x4uNuJQ7Fk8SKLVQPT+OyiyVr7JGZ
+/YqNVwtpMTd2qqcJQquemXYoUP24NpkDbeuFeNmY2onPXDf7+btmaj4p32h7Rv8Y
+3+IrL0IkpZDC
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/server-ext.cnf b/tests/integration/test_tlsv1_3/certs/server-ext.cnf
index 83d9b03ccb7..49859873222 100644
--- a/tests/integration/test_tlsv1_3/certs/server-ext.cnf
+++ b/tests/integration/test_tlsv1_3/certs/server-ext.cnf
@@ -1 +1 @@
-subjectAltName=IP:10.5.172.77
+subjectAltName=DNS:integration-tests.clickhouse.com
diff --git a/tests/integration/test_tlsv1_3/certs/server-key.pem b/tests/integration/test_tlsv1_3/certs/server-key.pem
index 065a2290749..8569cdc302f 100644
--- a/tests/integration/test_tlsv1_3/certs/server-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/server-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-BHL/JsJ0Be5xM3V4x4PtihQ3Dw546FY=
+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
+vwcNFb1IX4q4LPiL669Qcm3rUHjkLd0=
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/server-req.pem b/tests/integration/test_tlsv1_3/certs/server-req.pem
index be2f756cc7b..cd3dd397ed6 100644
--- a/tests/integration/test_tlsv1_3/certs/server-req.pem
+++ b/tests/integration/test_tlsv1_3/certs/server-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 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
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_tlsv1_3/certs/wrong-cert.pem b/tests/integration/test_tlsv1_3/certs/wrong-cert.pem
index ef95a73deba..1ce85f9e811 100644
--- a/tests/integration/test_tlsv1_3/certs/wrong-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/wrong-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+MDgwODE2NTA0M1oXDTMyMDgwNTE2NTA0M1owVjELMAkGA1UEBhMCUlUxEzARBgNV
 BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
 ZDEPMA0GA1UEAwwGY2xpZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-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
+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
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/wrong-key.pem b/tests/integration/test_tlsv1_3/certs/wrong-key.pem
index b2213cd2675..0290e173304 100644
--- a/tests/integration/test_tlsv1_3/certs/wrong-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/wrong-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDE7Y9J5qI0UxFG
-IVemczDTu7oQh0RzUnHdw+9mMRSD+l0SYxiStLGvYx6pGSW1YfxNwgiiJYMshwzo
-hTSYXprlQu7ziEVv1vbSpEbfBE1vnI7zoeejLNT3233z75r2JpjVAC3TeTzCriNG
-NTaT96hVKgtPm5U/krGI3N1LYFMcVKzGu3/FzB2CR8mi4c2n4xhR6STqppDLl9Op
-Omp2SA7a/8mhgKLTCEE2PbTl35adLvF97JVIk/U4lYdFnspj4tTqHPrAcieDiz9q
-DtV0CTQ8CtaznQGYfmDbMl++3tV5NB5tolZS1IRjTmh06q0pm15SaaHFb/YzvfAZ
-UXdYAkKdrHKmyNyYxkUKkxenDJMWuqhu8LcA+XpI4/4S/UwvGGEIgO4sW7jo/nko
-oQqNQKxiKB3VWweOO+hqMZyqU+UyxUclz1UKGxAPPpqDMM8Vv8vJhusNNOawjnv+
-zWMBnJ6arZIRg8Ckm9x1n+5yXvjWMjTrvURk+WKn2JRCC3cweVze3nf8a0XZboYX
-kWiByHtz7RzYGEy6kAcBfB8sAG+/lfwYPKOw2XAHp5r2N4IfD7SsSi1nMJch3d1o
-XK0Y2bWMjbXqRctJu/Pq7PXAwZLoeuGTzvCGC9DnxEw2zUpIYMXDVYW/5Bl5M7vC
-pyfxj96oXur1EGE6k8wkxfxLH9Re4QIDAQABAoICAQCjj/CAX/f/X7MsPYtQa8J1
-Sinbio42/pYmrJPNnBw/FhZxrC7/wucGFlyj9IgWZCEr8Go9SsztkeoNwn2RxJoA
-q5xOV7PclX4CLIHUv/0VI8Kz5pi/NgBZMUwm7K8Xna041OI7ECqARCR2LsJ7GasN
-uVMVttK6r7uXQmLnNUUydb3ffmI8xjEIQVnfWI74z60mc2+/GcOP5jXeC+/a+DSm
-fudYpcAXaXbId24ls5SkTxYzEepYEtQNQFzPXXkah49yN8mpR+c74c805scxjmd9
-Kz9yhYiKwQTvaqKNpQVHmxte0gPC3lJrLPejjDtxIGOyLZw4oaqrBSpDzR9D0PTE
-C+BR6VlXpVCTcAoiweuoDIxNTiJ5IbIJme3iMWxsAIJ4n10rSFFl9Cmmqbphp/6/
-XInB0X7Zyr1kBrwf+DH6DJhje5NXgGKVR9oe9jjW5v8V2tg1RrkzNU8iKBSxpvcI
-x4mKhhRLYgoq/iNeYBVQrwJYktIbweVCQ5Spj7/20IrMkn3FAmMsZxGMZmLisJ9t
-B0vvUkUgWxuJTsPJ2j+ytpGT0E2xIDYCpbG2EopDc8WvHcVNhagBvLC6xIjIKm7N
-2zpBU2W3fPNXoToCAmaLDPYeRRpG6XaGFQAfvKUQRLBDGTfQ177qr34UBnmgvxDq
-J2gA9rQm3XziLMuSlJexAQKCAQEA+yz49Ah7FFq0QffsoRb0qOJbfcmMGTRkaafb
-ztto4EFSnjH2EwoSShu4DfqWw+ws1KxHlItNHHko5pVNpS4lj1OpnobW3QD7kEIV
-mYKa3KowYUcCq1Gzq2RNDZqsC2BSXwx1MG0VVKYOahnu5bvzQq2Ft8W7CWBnbTbY
-0Jxjs4KaOza+bH7Vfb5Yre0tlW7U5vI/YO8+YKxpxfOU9kVo8ZLQ/9r/YH8nnLa+
-Fd91+WjcUW8CTKU+Oz3lb/Vwcs6YOoAraq/wtOCqWURunBXkQtzOIn0bgBh3WEk1
-EQ+MVDHshlVVjv/rfnL571ZTT1amCJuEIwQRzLSvbso883srMQKCAQEAyLXaG3Pp
-LYiRKu7Bqr5PPuqdT72UFabPpfgd5EtcFOL0xUpfRya6HyFdM25FWI8haXeg4e8N
-0cIs3gMG+RRgm1xISJIZi92L0Cwj+kLFu2U5SkvAKMqZFh5q350FRi4Bp7ae4YrL
-aguWLZCxhznh4D5xQGM6c8ObRfUUEMT+dnLPcj4zn9KHhoUudXjLKjPNw5v6nkbw
-xtRdwANlHx/LX/d4+iwt2plDWmT+d2OLvqZcPyyghTMqV45L0p9XAXBsLnz4Zipx
-7VJ8iH3jL5oaQ6YAFY+cXIrWBN0q3UYbXdkaA2ve6voioeF3KQNRmU10k7GKNRWl
-pRNn62+rAR8isQKCAQAZnPVqFS9P3QwCqiCEMM4UJrkDs7jInTIcIBTnHDKuo5qk
-LR4VxPImgnsbWdFj+0J7EXJfMHFVlPlZwiHf1TvZSMPEOaXRdZcxl7uSIuJd3DEA
-ynf4NmWm9Zxx5bLjmhfsP1336TfCoQhZQ3m8DZV52C4Jlm1DQIRre6tSYpA8LvZB
-UYzLjYeBwhZS7hu24E1vm4ZhASSQQSSsHfGzx1IzSDBt1swx7+V/MpdhrZ7fJxVI
-bJSEcllNOzuZViL4Yh7d4FINGBHor/xPDA5ndkgHlXKjy7QxNM1+wEBcFATQVSL0
-c+E8qtY918Wq5VergH9/4zPvSivyfv5gwtjCT24RAoIBABP6HbJb0BqrHB/U0cvn
-00Vk3rGAIgwhpUtUrcz6PzkI+enlJCSV0zKkBH3I/Pf6jw3LTWUPgSWemQ6j6H7E
-K3VrMvqeKBLGw1K+Afq3yKyFP7WIYqDswV31Oxf0rgC1NY7220uBoAt3CcSRQUo/
-VZ8XN/h7p+a70mmdIhklMlqhxMoPLN48eybFfMFOe5JAw7szfDdiwjZYDti8vcTi
-SkDMBeuImCvI025c3QMPEmqwbkAPdg6r8Av06tEU8PkAspPR9ntcwCgp7KE9Pm6P
-fQu8qwd6WsrPOswTI2AQyUqHAFLU2sQyj13jbhPT87w5fF/y7NmpxOnwS4igfbnH
-2pECggEBALO0FiJClb0GSqMXYJ+nbtRObD4AynYNVMEqYdZu5DBb6vb4T7uumTD5
-I1fKOa5SSELngUj23p2G6sVBsDyDHotGJYJwDGejHOFnEpY+J0Das0pGS40FsFC7
-qABIUaMoLKcIR9Ofcm9uu2n+koNULV2aaXj7A4OYhRCQi2PqiEx1wimdrLfGqTXn
-O4rSf826ODch87vuPbfFPCaIFG28R3nByp/ZBH5QNiB3NBmc3A0tiHFnZW3cpOfW
-Jm/Vu0PcNVVw32SroS2FCroR7qSWsvt61UzJtliLUiFHoUAxrXXiAxcZW1D2Hmpq
-neUhT/t9hHdcMJgoxm2IITf6ip8nTnY=
+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
+uXiVfFt+/L5YANTAH2FQmaItMYcKAw==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/test.py b/tests/integration/test_tlsv1_3/test.py
index e93774cf11e..e25216c67df 100644
--- a/tests/integration/test_tlsv1_3/test.py
+++ b/tests/integration/test_tlsv1_3/test.py
@@ -1,19 +1,20 @@
 import pytest
 from helpers.cluster import ClickHouseCluster
+from helpers.ssl_context import WrapSSLContextWithSNI
 import urllib.request, urllib.parse
 import ssl
 import os.path
 
+
+# The test cluster is configured with certificate for that host name, see 'server-ext.cnf'.
+# The client has to verify server certificate against that name. Client uses SNI
+SSL_HOST = "integration-tests.clickhouse.com"
 HTTPS_PORT = 8443
-# It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
-NODE_IP = "10.5.172.77"  # Never copy-paste this line
-NODE_IP_WITH_HTTPS_PORT = NODE_IP + ":" + str(HTTPS_PORT)
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "node",
-    ipv4_address=NODE_IP,
     main_configs=[
         "configs/ssl_config.xml",
         "certs/server-key.pem",
@@ -36,7 +37,7 @@ def started_cluster():
 
 
 def get_ssl_context(cert_name):
-    context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    context = WrapSSLContextWithSNI(SSL_HOST, ssl.PROTOCOL_TLS_CLIENT)
     context.load_verify_locations(cafile=f"{SCRIPT_DIR}/certs/ca-cert.pem")
     if cert_name:
         context.load_cert_chain(
@@ -51,7 +52,9 @@ def get_ssl_context(cert_name):
 def execute_query_https(
     query, user, enable_ssl_auth=True, cert_name=None, password=None
 ):
-    url = f"https://{NODE_IP_WITH_HTTPS_PORT}/?query={urllib.parse.quote(query)}"
+    url = (
+        f"https://{instance.ip_address}:{HTTPS_PORT}/?query={urllib.parse.quote(query)}"
+    )
     request = urllib.request.Request(url)
     request.add_header("X-ClickHouse-User", user)
     if enable_ssl_auth:
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj
index f82d3f4c348..60b29bd799a 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj
@@ -9,6 +9,7 @@
    [zookeeper :as zk])
   (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
 
+(def root-path "/counter")
 (defn r   [_ _] {:type :invoke, :f :read})
 (defn add [_ _] {:type :invoke, :f :add, :value (rand-int 5)})
 
@@ -20,17 +21,19 @@
             :conn (zk-connect node 9181 30000))
      :nodename node))
 
-  (setup! [this test])
+  (setup! [this test]
+    (exec-with-retries 30 (fn []
+      (zk-create-if-not-exists conn root-path ""))))
 
   (invoke! [this test op]
     (case (:f op)
       :read (exec-with-retries 30 (fn []
                                     (assoc op
                                            :type :ok
-                                           :value (count (zk-list conn "/")))))
+                                           :value (count (zk-list conn root-path)))))
       :add (try
              (do
-               (zk-multi-create-many-seq-nodes conn "/seq-" (:value op))
+               (zk-multi-create-many-seq-nodes conn (concat-path root-path "seq-") (:value op))
                (assoc op :type :ok))
              (catch Exception _ (assoc op :type :info, :error :connect-error)))))
 
diff --git a/tests/performance/optimize_sorting_for_input_stream.xml b/tests/performance/optimize_sorting_for_input_stream.xml
new file mode 100644
index 00000000000..ca6d4d00d69
--- /dev/null
+++ b/tests/performance/optimize_sorting_for_input_stream.xml
@@ -0,0 +1,17 @@
+<test>
+    <!-- ORDER BY key is prefix of MergeTree sorting key -->
+    <query>SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID SETTINGS optimize_read_in_order=1 FORMAT Null</query>
+    <query>SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID SETTINGS optimize_read_in_order=0 FORMAT Null</query>
+
+    <!-- MergeTree sorting key is prefix of ORDER BY key -->
+    <query>SELECT CounterID, EventTime FROM hits_10m_single ORDER BY CounterID, EventTime SETTINGS optimize_read_in_order=1 format Null</query>
+    <query>SELECT CounterID, EventTime FROM hits_10m_single ORDER BY CounterID, EventTime SETTINGS optimize_read_in_order=0 format Null</query>
+
+    <!-- sorting step getting sort description from subquery -->
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single) ORDER BY CounterID SETTINGS optimize_read_in_order=1 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single) ORDER BY CounterID SETTINGS optimize_read_in_order=0 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID, EventDate) ORDER BY CounterID SETTINGS optimize_duplicate_order_by_and_distinct=1 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID, EventDate) ORDER BY CounterID SETTINGS optimize_duplicate_order_by_and_distinct=0 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID) ORDER BY CounterID, EventDate SETTINGS optimize_duplicate_order_by_and_distinct=1 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID) ORDER BY CounterID, EventDate SETTINGS optimize_duplicate_order_by_and_distinct=0 FORMAT Null</query>
+</test>
diff --git a/tests/queries/0_stateless/00189_time_zones_long.reference b/tests/queries/0_stateless/00189_time_zones_long.reference
index e53ec7ca815..8717a662771 100644
--- a/tests/queries/0_stateless/00189_time_zones_long.reference
+++ b/tests/queries/0_stateless/00189_time_zones_long.reference
@@ -137,7 +137,7 @@ toStartOfInterval
 2015-01-01
 2019-01-01
 2019-01-01
-2018-10-01
+2018-07-01
 2019-02-01
 2019-01-01
 2018-10-01
@@ -164,7 +164,7 @@ toStartOfInterval
 2015-01-01
 2019-01-01
 2019-01-01
-2018-10-01
+2018-07-01
 2019-02-01
 2019-01-01
 2018-10-01
diff --git a/tests/queries/0_stateless/00489_pk_subexpression.sql b/tests/queries/0_stateless/00489_pk_subexpression.sql
index 6f76a13609c..700581a9def 100644
--- a/tests/queries/0_stateless/00489_pk_subexpression.sql
+++ b/tests/queries/0_stateless/00489_pk_subexpression.sql
@@ -1,7 +1,20 @@
 DROP TABLE IF EXISTS pk;
 
 set allow_deprecated_syntax_for_merge_tree=1;
-CREATE TABLE pk (d Date DEFAULT '2000-01-01', x DateTime, y UInt64, z UInt64) ENGINE = MergeTree(d, (toStartOfMinute(x), y, z), 1);
+-- NOTE: here the timezone is pinned to UTC, to avoid issues with "partial
+-- timezones" (timezones that does not starts from 00:00), like
+-- Africa/Monrovia, for which toStartOfMinute(0) and toStartOfMinute(59) can
+-- give different values:
+--
+--     SELECT
+--         toDateTime(0, 'Africa/Monrovia') AS sec0,
+--         toDateTime(59, 'Africa/Monrovia') AS sec59
+--
+--     ┌────────────────sec0─┬───────────────sec59─┐
+--     │ 1969-12-31 23:15:30 │ 1969-12-31 23:16:29 │
+--     └─────────────────────┴─────────────────────┘
+--
+CREATE TABLE pk (d Date DEFAULT '2000-01-01', x DateTime, y UInt64, z UInt64) ENGINE = MergeTree(d, (toStartOfMinute(x, 'UTC'), y, z), 1);
 
 INSERT INTO pk (x, y, z) VALUES (1, 11, 1235), (2, 11, 4395), (3, 22, 3545), (4, 22, 6984), (5, 33, 4596), (61, 11, 4563), (62, 11, 4578), (63, 11, 3572), (64, 22, 5786), (65, 22, 5786), (66, 22, 2791), (67, 22, 2791), (121, 33, 2791), (122, 33, 2791), (123, 33, 1235), (124, 44, 4935), (125, 44, 4578), (126, 55, 5786), (127, 55, 2791), (128, 55, 1235);
 
diff --git a/tests/queries/0_stateless/00700_decimal_arithm.reference b/tests/queries/0_stateless/00700_decimal_arithm.reference
index a41ef5b0557..811946c87e0 100644
--- a/tests/queries/0_stateless/00700_decimal_arithm.reference
+++ b/tests/queries/0_stateless/00700_decimal_arithm.reference
@@ -35,3 +35,14 @@
 0	\N	\N
 0	\N	\N
 0	\N	\N
+-- { echoOn }
+SELECT toDecimal128(1, 38) / toDecimal128(1, 0) SETTINGS decimal_check_overflow=1;
+1
+SELECT toDecimal128(1, 38) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=1; -- { serverError DECIMAL_OVERFLOW }
+SELECT toDecimal128(1, 38) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=0;
+-0.02084710076281539039012382229530463436
+SELECT toDecimal128(1, 37) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=1;
+1
+SELECT toDecimal128(1, 19) / toDecimal128(1, 19) SETTINGS decimal_check_overflow=1;
+1
+SELECT toDecimal128(1, 20) / toDecimal128(1, 19) SETTINGS decimal_check_overflow=1; -- { serverError DECIMAL_OVERFLOW }
diff --git a/tests/queries/0_stateless/00700_decimal_arithm.sql b/tests/queries/0_stateless/00700_decimal_arithm.sql
index c305a850e5b..d24b593dac1 100644
--- a/tests/queries/0_stateless/00700_decimal_arithm.sql
+++ b/tests/queries/0_stateless/00700_decimal_arithm.sql
@@ -82,4 +82,14 @@ SELECT toDecimal32(0, 4) AS x, multiIf(x = 0, NULL, intDivOrZero(1, x)), multiIf
 SELECT toDecimal64(0, 8) AS x, multiIf(x = 0, NULL, intDivOrZero(1, x)), multiIf(x = 0, NULL, intDivOrZero(x, 0));
 SELECT toDecimal64(0, 18) AS x, multiIf(x = 0, NULL, intDivOrZero(1, x)), multiIf(x = 0, NULL, intDivOrZero(x, 0));
 
+-- { echoOn }
+SELECT toDecimal128(1, 38) / toDecimal128(1, 0) SETTINGS decimal_check_overflow=1;
+SELECT toDecimal128(1, 38) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=1; -- { serverError DECIMAL_OVERFLOW }
+SELECT toDecimal128(1, 38) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=0;
+SELECT toDecimal128(1, 37) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=1;
+
+SELECT toDecimal128(1, 19) / toDecimal128(1, 19) SETTINGS decimal_check_overflow=1;
+SELECT toDecimal128(1, 20) / toDecimal128(1, 19) SETTINGS decimal_check_overflow=1; -- { serverError DECIMAL_OVERFLOW }
+-- { echoOff }
+
 DROP TABLE IF EXISTS decimal;
diff --git a/tests/queries/0_stateless/00705_aggregate_states_addition.sql b/tests/queries/0_stateless/00705_aggregate_states_addition.sql
index 661197d15ef..c5b11f9971d 100644
--- a/tests/queries/0_stateless/00705_aggregate_states_addition.sql
+++ b/tests/queries/0_stateless/00705_aggregate_states_addition.sql
@@ -10,11 +10,13 @@ SELECT sumMerge(x + y), sumMerge(x), sumMerge(y) FROM (SELECT sumState(a) as x,
 SELECT sumMerge(x) FROM (SELECT sumState(a) + countState(b) as x FROM add_aggregate); -- { serverError 421 }
 SELECT sumMerge(x) FROM (SELECT sumState(a) + sumState(toInt32(b)) as x FROM add_aggregate); -- { serverError 421 }
 
-SELECT minMerge(x) FROM (SELECT minState(a) + minState(b) as x FROM add_aggregate); 
+SELECT minMerge(x) FROM (SELECT minState(a) + minState(b) as x FROM add_aggregate);
 
 SELECT uniqMerge(x + y) FROM (SELECT uniqState(a) as x, uniqState(b) as y FROM add_aggregate);
 
 SELECT arraySort(groupArrayMerge(x + y)) FROM (SELECT groupArrayState(a) AS x, groupArrayState(b) as y FROM add_aggregate);
 SELECT arraySort(groupUniqArrayMerge(x + y)) FROM (SELECT groupUniqArrayState(a) AS x, groupUniqArrayState(b) as y FROM add_aggregate);
 
+SELECT uniqMerge(x + y) FROM (SELECT uniqState(65536, a) AS x, uniqState(b) AS y FROM add_aggregate); -- { serverError 421 }
+
 DROP TABLE IF EXISTS add_aggregate;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
index ba34cfad299..47e1d3fea0f 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
@@ -4,7 +4,20 @@ SET send_logs_level = 'fatal';
 SELECT '----00489----';
 DROP TABLE IF EXISTS pk;
 
-CREATE TABLE pk (d Date DEFAULT '2000-01-01', x DateTime, y UInt64, z UInt64) ENGINE = MergeTree() PARTITION BY d ORDER BY (toStartOfMinute(x), y, z) SETTINGS index_granularity_bytes=19, min_index_granularity_bytes=9, write_final_mark = 0; -- one row granule
+-- NOTE: here the timezone is pinned to UTC, to avoid issues with "partial
+-- timezones" (timezones that does not starts from 00:00), like
+-- Africa/Monrovia, for which toStartOfMinute(0) and toStartOfMinute(59) can
+-- give different values:
+--
+--     SELECT
+--         toDateTime(0, 'Africa/Monrovia') AS sec0,
+--         toDateTime(59, 'Africa/Monrovia') AS sec59
+--
+--     ┌────────────────sec0─┬───────────────sec59─┐
+--     │ 1969-12-31 23:15:30 │ 1969-12-31 23:16:29 │
+--     └─────────────────────┴─────────────────────┘
+--
+CREATE TABLE pk (d Date DEFAULT '2000-01-01', x DateTime, y UInt64, z UInt64) ENGINE = MergeTree() PARTITION BY d ORDER BY (toStartOfMinute(x, 'UTC'), y, z) SETTINGS index_granularity_bytes=19, min_index_granularity_bytes=9, write_final_mark = 0; -- one row granule
 
 INSERT INTO pk (x, y, z) VALUES (1, 11, 1235), (2, 11, 4395), (3, 22, 3545), (4, 22, 6984), (5, 33, 4596), (61, 11, 4563), (62, 11, 4578), (63, 11, 3572), (64, 22, 5786), (65, 22, 5786), (66, 22, 2791), (67, 22, 2791), (121, 33, 2791), (122, 33, 2791), (123, 33, 1235), (124, 44, 4935), (125, 44, 4578), (126, 55, 5786), (127, 55, 2791), (128, 55, 1235);
 
diff --git a/tests/queries/0_stateless/00955_complex_prepared_statements.reference b/tests/queries/0_stateless/00955_complex_prepared_statements.reference
index 701cc5f8781..257526768a0 100644
--- a/tests/queries/0_stateless/00955_complex_prepared_statements.reference
+++ b/tests/queries/0_stateless/00955_complex_prepared_statements.reference
@@ -4,3 +4,4 @@
 [[10],[10],[10]]
 [10,10,10]	[[10],[10],[10]]	(10,'Test')	(10,('dt',10))	2015-02-15
 Code: 457.
+Code: 457.
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index d5d43d3c293..dc01ce40398 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -58,10 +58,9 @@ function thread6()
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS alter_table_$REPLICA;
             CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
         sleep 0.$RANDOM;
-        done
+    done
 }
 
-
 # https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
 export -f thread1;
 export -f thread2;
diff --git a/tests/queries/0_stateless/01087_table_function_generate.reference b/tests/queries/0_stateless/01087_table_function_generate.reference
index d62ff5618fc..53792bfb579 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.reference
+++ b/tests/queries/0_stateless/01087_table_function_generate.reference
@@ -70,16 +70,16 @@ DateTime64(3, \'UTC\')	DateTime64(6, \'UTC\')	DateTime64(6, \'UTC\')
 1992-12-28 09:26:04.030	1971-07-29 06:20:38.230976	1980-03-26 15:49:55.428516
 2051-12-11 07:09:13.162	1982-01-12 00:25:45.754492	2010-05-17 07:01:28.452864
 Date32
-1934-01-06
-2039-08-16
-2103-11-03
-2064-08-14
-2187-08-21
-2099-04-08
-1947-06-22
-2012-01-19
-2170-07-09
-2263-01-17
+2120-04-24
+1908-10-02
+2105-09-04
+2129-03-23
+1921-04-05
+2020-04-14
+2251-12-25
+2266-03-27
+2161-02-18
+2172-07-24
 -
 Float32	Float64
 -1.3551149e32	1.2262973812461839e235
diff --git a/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.reference b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
new file mode 100755
index 00000000000..addf503e44a
--- /dev/null
+++ b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+# Tags: race, zookeeper, no-backward-compatibility-check
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+function create_db()
+{
+    while true; do
+        SHARD=$(($RANDOM % 2))
+        REPLICA=$(($RANDOM % 2))
+        SUFFIX=$(($RANDOM % 16))
+        # Multiple database replicas on one server are actually not supported (until we have namespaces).
+        # So CREATE TABLE queries will fail on all replicas except one. But it's still makes sense for a stress test.
+        $CLICKHOUSE_CLIENT --allow_experimental_database_replicated=1 --query \
+        "create database if not exists ${CLICKHOUSE_DATABASE}_repl_$SUFFIX engine=Replicated('/test/01111/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX', '$SHARD', '$REPLICA')" \
+         2>&1| grep -Fa "Exception: " | grep -Fv "REPLICA_IS_ALREADY_EXIST" | grep -Fiv "Will not try to start it up" | \
+         grep -Fv "Coordination::Exception" | grep -Fv "already contains some data and it does not look like Replicated database path"
+        sleep 0.$RANDOM
+    done
+}
+
+function drop_db()
+{
+    while true; do
+        database=$($CLICKHOUSE_CLIENT -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [[ "$database" == "$CLICKHOUSE_DATABASE" ]]; then return; fi
+        if [ -z "$database" ]; then return; fi
+        $CLICKHOUSE_CLIENT -n --query \
+        "drop database if exists $database" 2>&1| grep -Fa "Exception: "
+        sleep 0.$RANDOM
+    done
+}
+
+function sync_db()
+{
+    while true; do
+        database=$($CLICKHOUSE_CLIENT -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [ -z "$database" ]; then return; fi
+        $CLICKHOUSE_CLIENT --receive_timeout=1 -q \
+        "system sync database replica $database" 2>&1| grep -Fa "Exception: " | grep -Fv TIMEOUT_EXCEEDED | grep -Fv "only with Replicated engine" | grep -Fv UNKNOWN_DATABASE
+        sleep 0.$RANDOM
+    done
+}
+
+function create_table()
+{
+    while true; do
+        database=$($CLICKHOUSE_CLIENT -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [ -z "$database" ]; then return; fi
+        $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=0 -q \
+        "create table $database.rmt_$RANDOM (n int) engine=ReplicatedMergeTree order by tuple() -- suppress $CLICKHOUSE_TEST_ZOOKEEPER_PREFIX" \
+        2>&1| grep -Fa "Exception: " | grep -Fv "Macro 'uuid' and empty arguments" | grep -Fv "Cannot enqueue query" | grep -Fv "ZooKeeper session expired" | grep -Fv UNKNOWN_DATABASE
+        sleep 0.$RANDOM
+    done
+}
+
+function alter_table()
+{
+    while true; do
+        table=$($CLICKHOUSE_CLIENT -q "select database || '.' || name from system.tables where database like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [ -z "$table" ]; then return; fi
+        $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=0 -q \
+        "alter table $table on cluster $database update n = n + (select max(n) from merge(REGEXP('${CLICKHOUSE_DATABASE}.*'), '.*')) where 1 settings allow_nondeterministic_mutations=1" \
+        2>&1| grep -Fa "Exception: " | grep -Fv "Cannot enqueue query" | grep -Fv "ZooKeeper session expired" | grep -Fv UNKNOWN_DATABASE | grep -Fv UNKNOWN_TABLE | grep -Fv TABLE_IS_READ_ONLY
+        sleep 0.$RANDOM
+    done
+}
+
+function insert()
+{
+    while true; do
+        table=$($CLICKHOUSE_CLIENT -q "select database || '.' || name from system.tables where database like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [ -z "$table" ]; then return; fi
+        $CLICKHOUSE_CLIENT -q \
+        "insert into $table values ($RANDOM)" 2>&1| grep -Fa "Exception: " | grep -Fv UNKNOWN_DATABASE | grep -Fv UNKNOWN_TABLE | grep -Fv TABLE_IS_READ_ONLY
+    done
+}
+
+
+
+export -f create_db
+export -f drop_db
+export -f sync_db
+export -f create_table
+export -f alter_table
+export -f insert
+
+TIMEOUT=30
+
+timeout $TIMEOUT bash -c create_db &
+timeout $TIMEOUT bash -c sync_db &
+timeout $TIMEOUT bash -c create_table &
+timeout $TIMEOUT bash -c alter_table &
+timeout $TIMEOUT bash -c insert &
+
+sleep 1 # give other queries a head start
+timeout $TIMEOUT bash -c drop_db &
+
+wait
+
+readarray -t databases_arr < <(${CLICKHOUSE_CLIENT} -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}_%'")
+for db in "${databases_arr[@]}"
+do
+    $CLICKHOUSE_CLIENT -q "drop database if exists $db"
+done
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.reference b/tests/queries/0_stateless/01115_join_with_dictionary.reference
index 326f0c5e14b..612c3333160 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.reference
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.reference
@@ -16,12 +16,6 @@ flat: any left
 2	2	2	2
 3	3	3	3
 4	0		0
-flat: any left + any_join_distinct_right_table_keys
-0	0	0	0
-1	1	1	1
-2	2	2	2
-3	3	3	3
-4	0		0
 flat: semi left
 0	0	0	0
 1	1	1	1
@@ -37,11 +31,6 @@ flat: inner on
 1	1	1	1	1
 2	2	2	2	2
 3	3	3	3	3
-flat: inner or
-0	0	0	0	0
-1000	1	1	1	1
-2	2	2	2	2
-3000	3	3	3	3
 hashed: left on
 0	0	0	0	0
 1	1	1	1	1
@@ -75,6 +64,17 @@ hashed: inner on
 1	1	1	1	1
 2	2	2	2	2
 3	3	3	3	3
+flat: inner or
+0	0	0	0	0
+1000	1	1	1	1
+2	2	2	2	2
+3000	3	3	3	3
+flat: any left + any_join_distinct_right_table_keys
+0	0	0	0
+1	1	1	1
+2	2	2	2
+3	3	3	3
+4	0		0
 complex_cache (smoke)
 0	\N	\N	\N	\N
 1	\N	\N	\N	\N
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index 5fbfe283fea..cde1385eaae 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -1,4 +1,4 @@
-SET send_logs_level = 'fatal';
+DROP TABLE IF EXISTS t1;
 
 DROP DICTIONARY IF EXISTS dict_flat;
 DROP DICTIONARY IF EXISTS dict_hashed;
@@ -27,14 +27,15 @@ LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 1));
 
 SET join_use_nulls = 0;
 
+SET join_algorithm = 'direct';
+
 SELECT 'flat: left on';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d ON s1.key = d.key ORDER BY s1.key;
 SELECT 'flat: left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: any left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key;
-SELECT 'flat: any left + any_join_distinct_right_table_keys'; -- falls back to regular join
-SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key SETTINGS any_join_distinct_right_table_keys = '1';
+
 SELECT 'flat: semi left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 SEMI JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: anti left';
@@ -43,8 +44,6 @@ SELECT 'flat: inner';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 JOIN dict_flat d USING(key);
 SELECT 'flat: inner on';
 SELECT * FROM (SELECT number AS k FROM numbers(100)) s1 JOIN dict_flat d ON k = key ORDER BY k;
-SELECT 'flat: inner or'; -- it's not a join over dictionary, because it doen't suppoert multiple keys, but of falls back to regular join
-SELECT * FROM (SELECT if(number % 2 = 0, number, number * 1000) AS k FROM numbers(100)) s1 JOIN dict_flat d ON k = key OR k == 1000 * key ORDER BY key;
 
 SET join_use_nulls = 1;
 
@@ -63,6 +62,20 @@ SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 JOIN dict_hashed d USING
 SELECT 'hashed: inner on';
 SELECT * FROM (SELECT number AS k FROM numbers(100)) s1 JOIN dict_hashed d ON k = key ORDER BY k;
 
+SET join_use_nulls = 0;
+
+-- unsupported cases for dictionary join, falls back to regular join
+
+SET join_algorithm = 'default';
+
+SELECT 'flat: inner or';
+SELECT * FROM (SELECT if(number % 2 = 0, number, number * 1000) AS k FROM numbers(100)) s1 JOIN dict_flat d ON k = key OR k == 1000 * key ORDER BY key;
+
+SELECT 'flat: any left + any_join_distinct_right_table_keys';
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key SETTINGS any_join_distinct_right_table_keys = '1';
+
+SET join_use_nulls = 1;
+
 SELECT 'complex_cache (smoke)';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_complex_cache d ON s1.key = d.key ORDER BY s1.key;
 
diff --git a/tests/queries/0_stateless/01152_cross_replication.sql b/tests/queries/0_stateless/01152_cross_replication.sql
index 60b2c34be07..5d013400539 100644
--- a/tests/queries/0_stateless/01152_cross_replication.sql
+++ b/tests/queries/0_stateless/01152_cross_replication.sql
@@ -8,6 +8,8 @@ DROP TABLE IF EXISTS demo_loan_01568_dist;
 CREATE DATABASE shard_0;
 CREATE DATABASE shard_1;
 
+CREATE TABLE demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat); -- { serverError 48 }
+SET distributed_ddl_entry_format_version = 2;
 CREATE TABLE demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat); -- { serverError 371 }
 SET distributed_ddl_output_mode='throw';
 CREATE TABLE shard_0.demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat);
diff --git a/tests/queries/0_stateless/01161_information_schema.sql b/tests/queries/0_stateless/01161_information_schema.sql
index b6b10efb001..ed77ef1c1c2 100644
--- a/tests/queries/0_stateless/01161_information_schema.sql
+++ b/tests/queries/0_stateless/01161_information_schema.sql
@@ -6,6 +6,7 @@ create view v (n Nullable(Int32), f Float64) as select n, f from t;
 create materialized view mv engine=Null as select * from system.one;
 create temporary table tmp (d Date, dt DateTime, dtms DateTime64(3));
 
+
 -- FIXME #28687
 select * from information_schema.schemata where schema_name ilike 'information_schema';
 -- SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE (TABLE_SCHEMA=currentDatabase() OR TABLE_SCHEMA='') AND TABLE_NAME NOT LIKE '%inner%';
diff --git a/tests/queries/0_stateless/01172_transaction_counters.sql b/tests/queries/0_stateless/01172_transaction_counters.sql
index cc6212ae4c1..ee00029501a 100644
--- a/tests/queries/0_stateless/01172_transaction_counters.sql
+++ b/tests/queries/0_stateless/01172_transaction_counters.sql
@@ -1,5 +1,6 @@
 -- Tags: no-s3-storage, no-ordinary-database
 -- FIXME this test fails with S3 due to a bug in DiskCacheWrapper
+
 drop table if exists txn_counters;
 
 create table txn_counters (n Int64, creation_tid DEFAULT transactionID()) engine=MergeTree order by n;
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
index bedf9e9a091..4397810b68d 100644
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
@@ -27,19 +27,19 @@ localhost	9000	57	Code: 57. Error: Table default.never_throw already exists. (TA
 localhost	9000	0		1	0
 localhost	1	\N	\N	1	0
 distributed_ddl_queue
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)	1	1
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.none ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.none ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)	1	1
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.throw ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.throw ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)	1	1
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.null_status ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.null_status ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.never_throw already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.never_throw already exists. (TABLE_ALREADY_EXISTS)	1	1
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.never_throw ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.never_throw ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
index e632841bd01..c18514d0ecc 100755
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -38,7 +38,6 @@ LOG_COMMENT="${CLICKHOUSE_LOG_COMMENT}_$RAND_COMMENT"
 
 CLICKHOUSE_CLIENT_WITH_SETTINGS=${CLICKHOUSE_CLIENT/--log_comment ${CLICKHOUSE_LOG_COMMENT}/--log_comment ${LOG_COMMENT}}
 CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --output_format_parallel_formatting=0 "
-CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --distributed_ddl_entry_format_version=2 "
 
 CLIENT=${CLICKHOUSE_CLIENT_WITH_SETTINGS}
 CLIENT+=" --distributed_ddl_task_timeout=$TIMEOUT "
diff --git a/tests/queries/0_stateless/01277_fromUnixTimestamp64.reference b/tests/queries/0_stateless/01277_fromUnixTimestamp64.reference
index a9ffd259af0..28006c1d168 100644
--- a/tests/queries/0_stateless/01277_fromUnixTimestamp64.reference
+++ b/tests/queries/0_stateless/01277_fromUnixTimestamp64.reference
@@ -4,6 +4,6 @@ Asia/Makassar	1234567891011	2009-02-14 07:31:31.011	1970-01-15 14:56:07.891011	1
 non-const column
 1234567891011	2009-02-13 23:31:31.011	1970-01-15 06:56:07.891011	1970-01-01 00:20:34.567891011
 upper range bound
-9904447342	2283-11-10 19:22:22.123	2283-11-10 19:22:22.123456	1925-01-01 00:00:00.413905173
+10413688942	2299-12-30 19:22:22.123	2299-12-30 19:22:22.123456	1900-01-01 00:00:00.413905173
 lower range bound
--1420066799	1925-01-01 01:00:00.877	1925-01-01 01:00:00.876544	1925-01-01 01:00:00.876543211
+-2208985199	1900-01-01 01:00:00.877	1900-01-01 01:00:00.876544	1900-01-01 01:00:00.876543211
diff --git a/tests/queries/0_stateless/01277_fromUnixTimestamp64.sql b/tests/queries/0_stateless/01277_fromUnixTimestamp64.sql
index e76a4db7a27..846ffa094a5 100644
--- a/tests/queries/0_stateless/01277_fromUnixTimestamp64.sql
+++ b/tests/queries/0_stateless/01277_fromUnixTimestamp64.sql
@@ -46,10 +46,10 @@ SELECT
 
 SELECT 'upper range bound';
 WITH
-    9904447342 AS timestamp,
-    CAST(9904447342123 AS Int64) AS milli,
-    CAST(9904447342123456 AS Int64) AS micro,
-    CAST(9904447342123456789 AS Int64) AS nano,
+    10413688942 AS timestamp,
+    CAST(10413688942123 AS Int64) AS milli,
+    CAST(10413688942123456 AS Int64) AS micro,
+    CAST(10413688942123456789 AS Int64) AS nano,
     'UTC' AS tz
 SELECT
     timestamp,
@@ -59,13 +59,13 @@ SELECT
 
 SELECT 'lower range bound';
 WITH
-    -1420066799 AS timestamp,
-    CAST(-1420066799123 AS Int64) AS milli,
-    CAST(-1420066799123456 AS Int64) AS micro,
-    CAST(-1420066799123456789 AS Int64) AS nano,
+    -2208985199 AS timestamp,
+    CAST(-2208985199123 AS Int64) AS milli,
+    CAST(-2208985199123456 AS Int64) AS micro,
+    CAST(-2208985199123456789 AS Int64) AS nano,
     'UTC' AS tz
 SELECT
     timestamp,
     fromUnixTimestamp64Milli(milli, tz),
     fromUnixTimestamp64Micro(micro, tz),
-    fromUnixTimestamp64Nano(nano, tz);
\ No newline at end of file
+    fromUnixTimestamp64Nano(nano, tz);
diff --git a/tests/queries/0_stateless/01691_DateTime64_clamp.reference b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
index 6272103440c..75435aebd67 100644
--- a/tests/queries/0_stateless/01691_DateTime64_clamp.reference
+++ b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
@@ -18,10 +18,10 @@ SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Asia/Istanbul')
 SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Asia/Istanbul') FORMAT Null;
 -- These are outsize of extended range and hence clamped
 SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1), 35), 2, 'Asia/Istanbul');
-1925-01-01 02:00:00.00
+1900-01-01 01:56:56.00
 SELECT CAST(-1 * bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Asia/Istanbul'));
-1925-01-01 02:00:00.000
+1900-01-01 01:56:56.000
 SELECT CAST(bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Asia/Istanbul'));
-2282-12-31 03:00:00.000
+2299-12-31 23:59:59.000
 SELECT toDateTime64(bitShiftLeft(toUInt64(1), 35), 2, 'Asia/Istanbul');
-2282-12-31 03:00:00.00
+2299-12-31 23:59:59.00
diff --git a/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference b/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
index dcee18b33e0..e491dd9e091 100644
--- a/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
+++ b/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
@@ -12,5 +12,3 @@ blocks
 failed_parts
 last_part
 parallel
-shared
-shared
diff --git a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
index f27bf42c7a5..ecea0a9f69f 100644
--- a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
+++ b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
@@ -1,4 +1,4 @@
 1940-10-09 21:13:17.6
-2283-11-11 23:46:43.6
-2283-11-11 23:46:40.1
-1925-01-01 00:00:00.9
+2284-06-04 23:46:43.6
+2299-12-31 23:40:00.1
+1900-01-01 00:00:00.9
diff --git a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
index b0dbd1dfc84..e84bb35b3a5 100644
--- a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
+++ b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
@@ -1,4 +1,4 @@
 SELECT toString(toDateTime('-922337203.6854775808', 1, 'Asia/Istanbul'));
 SELECT toString(toDateTime('9922337203.6854775808', 1, 'Asia/Istanbul'));
-SELECT toDateTime64(CAST('10000000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
-SELECT toDateTime64(CAST('-10000000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
+SELECT toDateTime64(CAST('10500000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
+SELECT toDateTime64(CAST('-10500000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01710_projection_additional_filters.reference b/tests/queries/0_stateless/01710_projection_additional_filters.reference
new file mode 100644
index 00000000000..06b63ea6c2f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_additional_filters.reference
@@ -0,0 +1 @@
+0	0	0
diff --git a/tests/queries/0_stateless/01710_projection_additional_filters.sql b/tests/queries/0_stateless/01710_projection_additional_filters.sql
new file mode 100644
index 00000000000..1633b48ba7e
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_additional_filters.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS t;
+
+CREATE TABLE t(a UInt32, b UInt32) ENGINE = MergeTree PARTITION BY a ORDER BY a;
+
+INSERT INTO t SELECT number % 10, number FROM numbers(10000);
+
+SELECT count(), min(a), max(a) FROM t SETTINGS additional_table_filters = {'t' : '0'};
+
+DROP TABLE t;
diff --git a/tests/queries/0_stateless/01710_projection_row_policy.reference b/tests/queries/0_stateless/01710_projection_row_policy.reference
new file mode 100644
index 00000000000..06b63ea6c2f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_row_policy.reference
@@ -0,0 +1 @@
+0	0	0
diff --git a/tests/queries/0_stateless/01710_projection_row_policy.sql b/tests/queries/0_stateless/01710_projection_row_policy.sql
new file mode 100644
index 00000000000..a54cc50b9e9
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_row_policy.sql
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS t;
+
+CREATE TABLE t(a UInt32, b UInt32) ENGINE = MergeTree PARTITION BY a ORDER BY a;
+
+INSERT INTO t SELECT number % 10, number FROM numbers(10000);
+
+CREATE ROW POLICY OR REPLACE rp ON t FOR SELECT USING 0 TO ALL;
+
+SELECT count(), min(a), max(a) FROM t;
+
+DROP ROW POLICY rp ON t;
+
+DROP TABLE t;
diff --git a/tests/queries/0_stateless/01716_array_difference_overflow.reference b/tests/queries/0_stateless/01716_array_difference_overflow.reference
index 5297534679e..a4e34800849 100644
--- a/tests/queries/0_stateless/01716_array_difference_overflow.reference
+++ b/tests/queries/0_stateless/01716_array_difference_overflow.reference
@@ -1 +1,5 @@
 [0,9223372036854710272]
+[0,-9]
+[0,-9]
+[0,-9]
+[0,-9]
diff --git a/tests/queries/0_stateless/01716_array_difference_overflow.sql b/tests/queries/0_stateless/01716_array_difference_overflow.sql
index 3d153725294..747e0ad757d 100644
--- a/tests/queries/0_stateless/01716_array_difference_overflow.sql
+++ b/tests/queries/0_stateless/01716_array_difference_overflow.sql
@@ -1,2 +1,8 @@
 -- Overflow is Ok and behaves as the CPU does it.
 SELECT arrayDifference([65536, -9223372036854775808]);
+
+-- Diff of unsigned int -> int
+SELECT arrayDifference( cast([10, 1], 'Array(UInt8)'));
+SELECT arrayDifference( cast([10, 1], 'Array(UInt16)'));
+SELECT arrayDifference( cast([10, 1], 'Array(UInt32)'));
+SELECT arrayDifference( cast([10, 1], 'Array(UInt64)'));
diff --git a/tests/queries/0_stateless/01821_to_date_time_ubsan.reference b/tests/queries/0_stateless/01821_to_date_time_ubsan.reference
index 0a762ec3b77..28c4987125c 100644
--- a/tests/queries/0_stateless/01821_to_date_time_ubsan.reference
+++ b/tests/queries/0_stateless/01821_to_date_time_ubsan.reference
@@ -1,2 +1,2 @@
-2283-11-11 23:48:05.4775806
-2283-11-11 23:52:48.54775806
+2299-12-31 23:48:05.4775806
+2299-12-31 23:52:48.54775806
diff --git a/tests/queries/0_stateless/01825_type_json_schema_inference.reference b/tests/queries/0_stateless/01825_type_json_schema_inference.reference
index a2089ea3366..22dfdee96a7 100644
--- a/tests/queries/0_stateless/01825_type_json_schema_inference.reference
+++ b/tests/queries/0_stateless/01825_type_json_schema_inference.reference
@@ -3,6 +3,6 @@
 Tuple(k1 Nullable(Int8), k2 Tuple(k3 Nullable(String), k4 Nested(k5 Nullable(Int8), k6 Nullable(Int8))), some Nullable(Int8))
 {"id":"1","obj":"aaa","s":"foo"}
 {"id":"2","obj":"bbb","s":"bar"}
-{"map":{"k1":1,"k2":2},"obj":{"k1":1,"k2.k3":2},"map_type":"Map(String, Nullable(Float64))","obj_type":"Object(Nullable('json'))"}
-{"obj":{"k1":1,"k2":2},"map":{"k1":"1","k2":"2"}}
-Tuple(k1 Float64, k2 Float64)
+{"map":{"k1":"1","k2":"2"},"obj":{"k1":1,"k2.k3":2},"map_type":"Map(String, Nullable(Int64))","obj_type":"Object(Nullable('json'))"}
+{"obj":{"k1":"1","k2":"2"},"map":{"k1":"1","k2":"2"}}
+Tuple(k1 Int64, k2 Int64)
diff --git a/tests/queries/0_stateless/01921_datatype_date32.reference b/tests/queries/0_stateless/01921_datatype_date32.reference
index 70eebc76c01..acb0cc4ca59 100644
--- a/tests/queries/0_stateless/01921_datatype_date32.reference
+++ b/tests/queries/0_stateless/01921_datatype_date32.reference
@@ -1,19 +1,19 @@
-1925-01-01
-1925-01-01
-2282-12-31
-2283-11-11
+1900-01-01
+1900-01-01
+2299-12-15
+2299-12-31
 2021-06-22
 -------toYear---------
-1925
-1925
-2282
-2283
+1900
+1900
+2299
+2299
 2021
 -------toMonth---------
 1
 1
 12
-11
+12
 6
 -------toQuarter---------
 1
@@ -24,83 +24,83 @@
 -------toDayOfMonth---------
 1
 1
+15
 31
-11
 22
 -------toDayOfWeek---------
-4
-4
-7
+1
+1
+5
 7
 2
 -------toDayOfYear---------
 1
 1
-365
-315
+349
+364
 173
 -------toHour---------
 -------toMinute---------
 -------toSecond---------
 -------toStartOfDay---------
-2061-02-06 07:28:16
-2061-02-06 07:28:16
-2010-10-17 11:03:28
-2011-08-28 11:03:28
+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---------
-2104-06-04
-2104-06-04
-2103-07-21
-2104-05-31
+2079-06-07
+2079-06-07
+2120-07-06
+2120-07-20
 2021-06-21
 -------toISOWeek---------
 1
 1
+50
 52
-45
 25
 -------toISOYear---------
-1925
-1925
-2282
-2283
+1900
+1900
+2299
+2299
 2021
 -------toWeek---------
 0
 0
+50
 53
-45
 25
 -------toYearWeek---------
-192452
-192452
-228253
-228345
+189953
+189953
+229950
+229953
 202125
 -------toStartOfWeek---------
-2104-06-03
-2104-06-03
-2103-07-27
-2104-06-06
+2079-06-06
+2079-06-06
+2120-07-05
+2120-07-26
 2021-06-20
 -------toStartOfMonth---------
-2104-06-07
-2104-06-07
-2103-06-27
-2104-05-27
+2079-06-07
+2079-06-07
+2120-06-26
+2120-06-26
 2021-06-01
 -------toStartOfQuarter---------
-2104-06-07
-2104-06-07
-2103-04-27
-2104-04-26
+2079-06-07
+2079-06-07
+2120-04-26
+2120-04-26
 2021-04-01
 -------toStartOfYear---------
-2104-06-07
-2104-06-07
-2102-07-28
-2103-07-28
+2079-06-07
+2079-06-07
+2119-07-28
+2119-07-28
 2021-01-01
 -------toStartOfSecond---------
 -------toStartOfMinute---------
@@ -109,183 +109,183 @@
 -------toStartOfFifteenMinutes---------
 -------toStartOfHour---------
 -------toStartOfISOYear---------
-2104-06-04
-2104-06-04
-2102-07-29
-2103-07-28
+2079-06-07
+2079-06-07
+2119-07-29
+2119-07-29
 2021-01-04
 -------toRelativeYearNum---------
-1925
-1925
-2282
-2283
+1900
+1900
+2299
+2299
 2021
 -------toRelativeQuarterNum---------
-7700
-7700
-9131
-9135
+7600
+7600
+9199
+9199
 8085
 -------toRelativeMonthNum---------
-23101
-23101
-27396
-27407
+22801
+22801
+27600
+27600
 24258
 -------toRelativeWeekNum---------
-63189
-63189
-16331
-63188
+61885
+61885
+17216
+17217
 2686
 -------toRelativeDayNum---------
-49100
-49100
-48784
-49099
+39969
+39969
+54977
+54993
 18800
 -------toRelativeHourNum---------
-4294572852
-4294572852
-2743677
-2751237
+4294353708
+4294353708
+2892309
+2892693
 451197
 -------toRelativeMinuteNum---------
-4271299336
-4271299336
-164620620
-165074220
+4258150699
+4258150699
+173538540
+173561580
 27071820
 -------toRelativeSecondNum---------
-2874889696
-2874889696
-1287302608
-1314518608
+2085971480
+2085971480
+1822377808
+1823760208
 1624309200
 -------toTime---------
 -------toYYYYMM---------
-192501
-192501
-228212
-228311
+190001
+190001
+229912
+229912
 202106
 -------toYYYYMMDD---------
-19250101
-19250101
-22821231
-22831111
+19000101
+19000101
+22991215
+22991231
 20210622
 -------toYYYYMMDDhhmmss---------
-19250101000000
-19250101000000
-22821231000000
-22831111000000
+19000101000000
+19000101000000
+22991215000000
+22991231000000
 20210622000000
 -------addSeconds---------
-1925-01-01 01:00:00.000
-1925-01-01 01:00:00.000
-2282-12-31 01:00:00.000
-2283-11-11 01:00:00.000
+1900-01-01 01:00:00.000
+1900-01-01 01:00:00.000
+2299-12-15 01:00:00.000
+2299-12-31 01:00:00.000
 2021-06-22 01:00:00.000
 -------addMinutes---------
-1925-01-01 01:00:00.000
-1925-01-01 01:00:00.000
-2282-12-31 01:00:00.000
-2283-11-11 01:00:00.000
+1900-01-01 01:00:00.000
+1900-01-01 01:00:00.000
+2299-12-15 01:00:00.000
+2299-12-31 01:00:00.000
 2021-06-22 01:00:00.000
 -------addHours---------
-1925-01-01 01:00:00.000
-1925-01-01 01:00:00.000
-2282-12-31 01:00:00.000
-2283-11-11 01:00:00.000
+1900-01-01 01:00:00.000
+1900-01-01 01:00:00.000
+2299-12-15 01:00:00.000
+2299-12-31 01:00:00.000
 2021-06-22 01:00:00.000
 -------addDays---------
-1925-01-08
-1925-01-08
-2283-01-07
-1925-01-07
+1900-01-08
+1900-01-08
+2299-12-22
+2299-12-31
 2021-06-29
 -------addWeeks---------
-1925-01-08
-1925-01-08
-2283-01-07
-1925-01-07
+1900-01-08
+1900-01-08
+2299-12-22
+2299-12-31
 2021-06-29
 -------addMonths---------
-1925-02-01
-1925-02-01
-2283-01-31
-2283-11-11
+1900-02-01
+1900-02-01
+2299-12-31
+2299-12-31
 2021-07-22
 -------addQuarters---------
-1925-04-01
-1925-04-01
-2283-03-31
-2283-11-11
+1900-04-01
+1900-04-01
+2299-12-31
+2299-12-31
 2021-09-22
 -------addYears---------
-1926-01-01
-1926-01-01
-2283-11-11
-2283-11-11
+1901-01-01
+1901-01-01
+2299-12-31
+2299-12-31
 2022-06-22
 -------subtractSeconds---------
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-2282-12-30 23:00:00.000
-2283-11-10 23:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+2299-12-14 23:00:00.000
+2299-12-30 23:00:00.000
 2021-06-21 23:00:00.000
 -------subtractMinutes---------
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-2282-12-30 23:00:00.000
-2283-11-10 23:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+2299-12-14 23:00:00.000
+2299-12-30 23:00:00.000
 2021-06-21 23:00:00.000
 -------subtractHours---------
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-2282-12-30 23:00:00.000
-2283-11-10 23:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+2299-12-14 23:00:00.000
+2299-12-30 23:00:00.000
 2021-06-21 23:00:00.000
 -------subtractDays---------
-2283-11-05
-2283-11-05
-2282-12-24
-2283-11-04
+2299-12-31
+2299-12-31
+2299-12-08
+2299-12-24
 2021-06-15
 -------subtractWeeks---------
-2283-11-05
-2283-11-05
-2282-12-24
-2283-11-04
+2299-12-31
+2299-12-31
+2299-12-08
+2299-12-24
 2021-06-15
 -------subtractMonths---------
-1925-01-01
-1925-01-01
-2282-11-30
-2283-10-11
+1900-01-01
+1900-01-01
+2299-11-15
+2299-11-30
 2021-05-22
 -------subtractQuarters---------
-1925-01-01
-1925-01-01
-2282-09-30
-2283-08-11
+1900-01-01
+1900-01-01
+2299-09-15
+2299-09-30
 2021-03-22
 -------subtractYears---------
-1925-01-01
-1925-01-01
-2281-12-31
-2282-11-11
+1900-01-01
+1900-01-01
+2298-12-15
+2298-12-31
 2020-06-22
 -------toDate32---------
-1925-01-01	2000-01-01
-1925-01-01	1925-01-01
-1925-01-01	\N
-1925-01-01
+1900-01-01	2000-01-01
+1900-01-01	1900-01-01
+1900-01-01	\N
+1900-01-01
 \N
-1925-01-01
+1900-01-01
 1969-12-31
 1970-01-01
 2149-06-06
 2149-06-07
-2283-11-11
+2299-12-31
diff --git a/tests/queries/0_stateless/01921_datatype_date32.sql b/tests/queries/0_stateless/01921_datatype_date32.sql
index ef6e3e5ee89..8b65f82825f 100644
--- a/tests/queries/0_stateless/01921_datatype_date32.sql
+++ b/tests/queries/0_stateless/01921_datatype_date32.sql
@@ -1,7 +1,7 @@
 drop table if exists t1;
 create table t1(x1 Date32) engine Memory;
 
-insert into t1 values ('1925-01-01'),('1924-01-01'),('2282-12-31'),('2283-12-31'),('2021-06-22');
+insert into t1 values ('1900-01-01'),('1899-01-01'),('2299-12-15'),('2300-12-31'),('2021-06-22');
 
 select x1 from t1;
 select '-------toYear---------';
@@ -113,20 +113,19 @@ select subtractQuarters(x1, 1) from t1;
 select '-------subtractYears---------';
 select subtractYears(x1, 1) from t1;
 select '-------toDate32---------';
-select toDate32('1925-01-01'), toDate32(toDate('2000-01-01'));
-select toDate32OrZero('1924-01-01'), toDate32OrNull('1924-01-01');
+select toDate32('1900-01-01'), toDate32(toDate('2000-01-01'));
+select toDate32OrZero('1899-01-01'), toDate32OrNull('1899-01-01');
 select toDate32OrZero(''), toDate32OrNull('');
 select (select toDate32OrZero(''));
 select (select toDate32OrNull(''));
 SELECT toString(T.d) dateStr
 FROM
     (
-    SELECT '1925-01-01'::Date32 d
+    SELECT '1900-01-01'::Date32 d
     UNION ALL SELECT '1969-12-31'::Date32
     UNION ALL SELECT '1970-01-01'::Date32
     UNION ALL SELECT '2149-06-06'::Date32
     UNION ALL SELECT '2149-06-07'::Date32
-    UNION ALL SELECT '2283-11-11'::Date32
+    UNION ALL SELECT '2299-12-31'::Date32
     ) AS T
 ORDER BY T.d
-
diff --git a/tests/queries/0_stateless/02020_exponential_smoothing.reference b/tests/queries/0_stateless/02020_exponential_smoothing.reference
index bc6d0920705..95f5cb0c310 100644
--- a/tests/queries/0_stateless/02020_exponential_smoothing.reference
+++ b/tests/queries/0_stateless/02020_exponential_smoothing.reference
@@ -654,23 +654,23 @@ exponentialTimeDecayedAvg
 0	48	0.201	████████████████████
 0	49	0.196	███████████████████▌
 Check `exponentialTimeDecayed.*` supports sliding windows
-2	1	3.010050167084	2	3.030251507111	0.993333444442
-1	2	7.060905027605	4.080805360107	4.02030134086	1.756312382816
-0	3	12.091654548833	5.101006700134	5.000500014167	2.418089094006
-4	4	11.050650848754	5.050250835421	5.000500014167	2.209909172572
-5	5	9.970249502081	5	5.000500014167	1.993850509716
-1	6	20.07305726224	10.202013400268	5.000500014167	4.014210020072
-0	7	15.991544871125	10.100501670842	3.98029867414	4.017674596889
+2	1	2.950447180363	1.960397346614	2.970248507056	0.993333444442
+1	2	6.921089740404	4	3.940694040604	1.756312382816
+0	3	11.85222374685	5	4.901483479757	2.418089094006
+4	4	10.831833301125	4.950249168746	4.901483479757	2.209909172572
+5	5	9.772825334477	4.900993366534	4.901483479757	1.993850509716
+1	6	19.675584097659	10	4.901483479757	4.014210020072
+0	7	15.832426341049	10	3.940694040604	4.017674596889
 10	8	10.980198673307	10	2.970248507056	3.696727276261
 Check `exponentialTimeDecayedMax` works with negative values
-2	1	-1.010050167084
-1	2	-1
-10	3	-0.990049833749
-4	4	-0.980198673307
-5	5	-1.010050167084
-1	6	-1
-10	7	-0.990049833749
-10	8	-0.980198673307
-10	9	-9.801986733068
-9.81	10	-9.801986733068
+2	1	-0.990049833749
+1	2	-0.980198673307
+10	3	-0.970445533549
+4	4	-0.960789439152
+5	5	-0.990049833749
+1	6	-0.980198673307
+10	7	-0.970445533549
+10	8	-0.960789439152
+10	9	-9.607894391523
+9.81	10	-9.704455335485
 9.9	11	-9.712388869079
diff --git a/tests/queries/0_stateless/02149_schema_inference.reference b/tests/queries/0_stateless/02149_schema_inference.reference
index 2d7dd5caca7..954e1813157 100644
--- a/tests/queries/0_stateless/02149_schema_inference.reference
+++ b/tests/queries/0_stateless/02149_schema_inference.reference
@@ -1,22 +1,22 @@
 TSV
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64))					
+c3	Array(Nullable(Int64))					
+c4	Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64))					
 42	Some string	[1,2,3,4]	(1,2,3)
 42	abcd	[]	(4,5,6)
 TSVWithNames
-number	Nullable(Float64)					
+number	Nullable(Int64)					
 string	Nullable(String)					
-array	Array(Nullable(Float64))					
-tuple	Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64))					
+array	Array(Nullable(Int64))					
+tuple	Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64))					
 42	Some string	[1,2,3,4]	(1,2,3)
 42	abcd	[]	(4,5,6)
 CSV
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
 c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
-c4	Array(Nullable(Float64))					
+c4	Array(Nullable(Int64))					
 \N	Some string	[([1,2.3],'String'),([],NULL)]	[1,NULL,3]
 42	\N	[([1,2.3],'String'),([3],'abcd')]	[4,5,6]
 c1	Nullable(String)					
@@ -28,54 +28,54 @@ c2	Nullable(String)
 \N	[NULL, NULL]
 \N	[]
 CSVWithNames
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
 c	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
-d	Array(Nullable(Float64))					
+d	Array(Nullable(Int64))					
 \N	Some string	[([1,2.3],'String'),([],NULL)]	[1,NULL,3]
 42	\N	[([1,2.3],'String'),([3],'abcd')]	[4,5,6]
 JSONCompactEachRow
 c1	Nullable(Float64)					
-c2	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c3	Map(String, Nullable(Float64))					
+c2	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c3	Map(String, Nullable(Int64))					
 c4	Nullable(Bool)					
 42.42	[(1,'String'),(2,'abcd')]	{'key':42,'key2':24}	true
-c1	Nullable(Float64)					
-c2	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c3	Map(String, Nullable(Float64))					
+c1	Nullable(Int64)					
+c2	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c3	Map(String, Nullable(Int64))					
 c4	Nullable(Bool)					
 \N	[(1,'String'),(2,NULL)]	{'key':NULL,'key2':24}	\N
 32	[(2,'String 2'),(3,'hello')]	{'key3':4242,'key4':2424}	true
 JSONCompactEachRowWithNames
 a	Nullable(Float64)					
-b	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c	Map(String, Nullable(Float64))					
+b	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c	Map(String, Nullable(Int64))					
 d	Nullable(Bool)					
 42.42	[(1,'String'),(2,'abcd')]	{'key':42,'key2':24}	true
 JSONEachRow
 a	Nullable(Float64)					
-b	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c	Map(String, Nullable(Float64))					
+b	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c	Map(String, Nullable(Int64))					
 d	Nullable(Bool)					
 42.42	[(1,'String'),(2,'abcd')]	{'key':42,'key2':24}	true
-a	Nullable(Float64)					
-b	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c	Map(String, Nullable(Float64))					
+a	Nullable(Int64)					
+b	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c	Map(String, Nullable(Int64))					
 d	Nullable(Bool)					
 \N	[(1,'String'),(2,NULL)]	{'key':NULL,'key2':24}	\N
 32	[(2,'String 2'),(3,'hello')]	{'key3':4242,'key4':2424}	true
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	\N	[2]
 \N	\N	[]
 \N	\N	[]
 \N	\N	[3]
 TSKV
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	}	[2]
 \N	\N	[]
@@ -84,77 +84,77 @@ c	Array(Nullable(Float64))
 Values
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Tuple(Nullable(Float64), Nullable(String))					
-c5	Tuple(Array(Nullable(Float64)), Array(Tuple(Nullable(Float64), Nullable(String))))					
+c3	Array(Nullable(Int64))					
+c4	Tuple(Nullable(Int64), Nullable(String))					
+c5	Tuple(Array(Nullable(Int64)), Array(Tuple(Nullable(Int64), Nullable(String))))					
 42.42	Some string	[1,2,3]	(1,'2')	([1,2],[(3,'4'),(5,'6')])
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Tuple(Nullable(Float64), Nullable(Float64))					
-c5	Tuple(Array(Nullable(Float64)), Array(Tuple(Nullable(Float64), Nullable(String))))					
+c3	Array(Nullable(Int64))					
+c4	Tuple(Nullable(Int64), Nullable(Int64))					
+c5	Tuple(Array(Nullable(Int64)), Array(Tuple(Nullable(Int64), Nullable(String))))					
 42.42	\N	[1,NULL,3]	(1,NULL)	([1,2],[(3,'4'),(5,'6')])
 \N	Some string	[10]	(1,2)	([],[])
 Regexp
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
 c3	Nullable(String)					
 42	Some string 1	[([1, 2, 3], String 1), ([], String 1)]
 2	Some string 2	[([4, 5, 6], String 2), ([], String 2)]
 312	Some string 3	[([1, 2, 3], String 2), ([], String 2)]
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42	Some string 1	[([1,2,3],'String 1'),([],'String 1')]
 3	Some string 2	[([3,5,1],'String 2'),([],'String 2')]
 244	Some string 3	[([],'String 3'),([],'String 3')]
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42	Some string 1	[([1,2,3],'String 1'),([],'String 1')]
 2	Some string 2	[([],'String 2'),([],'String 2')]
 43	Some string 3	[([1,5,3],'String 3'),([],'String 3')]
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 52	Some string 2	[([],'String 2'),([1],'String 2')]
 24	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 CustomSeparated
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 Template
 column_1	Nullable(Float64)					
 column_2	Nullable(String)					
-column_3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+column_3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 column_1	Nullable(Float64)					
 column_2	Nullable(String)					
-column_3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+column_3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 column_1	Nullable(Float64)					
 column_2	Nullable(String)					
-column_3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+column_3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
diff --git a/tests/queries/0_stateless/02188_table_function_format.reference b/tests/queries/0_stateless/02188_table_function_format.reference
index 403a4044544..5d7febda187 100644
--- a/tests/queries/0_stateless/02188_table_function_format.reference
+++ b/tests/queries/0_stateless/02188_table_function_format.reference
@@ -39,9 +39,9 @@ World	123
 Hello	111
 World	123
 1	2	[1,2,3]	[['abc'],[],['d','e']]
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Array(Nullable(Float64))					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Array(Nullable(Int64))					
 c4	Array(Array(Nullable(String)))					
 Hello	111
 World	123
@@ -49,4 +49,4 @@ Hello	111
 Hello	131
 World	123
 a	Nullable(String)					
-b	Nullable(Float64)					
+b	Nullable(Int64)					
diff --git a/tests/queries/0_stateless/02210_processors_profile_log.reference b/tests/queries/0_stateless/02210_processors_profile_log.reference
index 1a7dd64d657..181022d2421 100644
--- a/tests/queries/0_stateless/02210_processors_profile_log.reference
+++ b/tests/queries/0_stateless/02210_processors_profile_log.reference
@@ -25,13 +25,17 @@ SELECT
         -- NullSource/LazyOutputFormatLazyOutputFormat are the outputs
         -- so they cannot starts to execute before sleep(1) will be executed.
         input_wait_elapsed_us>1e6)
-    elapsed
+    elapsed,
+    input_rows,
+    input_bytes,
+    output_rows,
+    output_bytes
 FROM system.processors_profile_log
 WHERE query_id = query_id_
 ORDER BY name;
-ExpressionTransform	1
-LazyOutputFormat	1
-LimitsCheckingTransform	1
-NullSource	1
-NullSource	1
-SourceFromSingleChunk	1
+ExpressionTransform	1	1	1	1	1
+LazyOutputFormat	1	1	1	0	0
+LimitsCheckingTransform	1	1	1	1	1
+NullSource	1	0	0	0	0
+NullSource	1	0	0	0	0
+SourceFromSingleChunk	1	0	0	1	1
diff --git a/tests/queries/0_stateless/02210_processors_profile_log.sql b/tests/queries/0_stateless/02210_processors_profile_log.sql
index 160f8009262..44e563ef57b 100644
--- a/tests/queries/0_stateless/02210_processors_profile_log.sql
+++ b/tests/queries/0_stateless/02210_processors_profile_log.sql
@@ -22,7 +22,11 @@ SELECT
         -- NullSource/LazyOutputFormatLazyOutputFormat are the outputs
         -- so they cannot starts to execute before sleep(1) will be executed.
         input_wait_elapsed_us>1e6)
-    elapsed
+    elapsed,
+    input_rows,
+    input_bytes,
+    output_rows,
+    output_bytes
 FROM system.processors_profile_log
 WHERE query_id = query_id_
 ORDER BY name;
diff --git a/tests/queries/0_stateless/02210_processors_profile_log_2.reference b/tests/queries/0_stateless/02210_processors_profile_log_2.reference
new file mode 100644
index 00000000000..5467c7ef2ba
--- /dev/null
+++ b/tests/queries/0_stateless/02210_processors_profile_log_2.reference
@@ -0,0 +1,11 @@
+499999500000
+AggregatingTransform	1000001	8000008	1	8
+ConvertingAggregatedToChunksTransform	0	0	1	8
+ExpressionTransform	1	8	1	8
+ExpressionTransform	1000000	8000000	1000000	8000000
+LazyOutputFormat	1	8	0	0
+LimitsCheckingTransform	1	8	1	8
+NullSource	0	0	0	0
+NumbersMt	0	0	1000000	8000000
+Resize	1	8	1	8
+Resize	1	8	1	8
diff --git a/tests/queries/0_stateless/02210_processors_profile_log_2.sh b/tests/queries/0_stateless/02210_processors_profile_log_2.sh
new file mode 100755
index 00000000000..93eabc2f0fe
--- /dev/null
+++ b/tests/queries/0_stateless/02210_processors_profile_log_2.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+QUERY_ID=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4()))))")
+
+
+${CLICKHOUSE_CLIENT} --query_id "${QUERY_ID}" <<EOF
+SELECT sum(number) FROM numbers_mt(1000000)
+SETTINGS max_threads = 4, log_processors_profiles=true, log_queries=1, log_queries_min_type='QUERY_FINISH';
+EOF
+
+${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
+
+${CLICKHOUSE_CLIENT} -q "select name, sum(input_rows), sum(input_bytes), sum(output_rows), sum(output_bytes) from system.processors_profile_log where query_id = '${QUERY_ID}' group by name, plan_step, plan_group order by name, sum(input_rows), sum(input_bytes), sum(output_rows), sum(output_bytes)"
diff --git a/tests/queries/0_stateless/02211_shcema_inference_from_stdin.reference b/tests/queries/0_stateless/02211_shcema_inference_from_stdin.reference
index 6920aa16198..4a4389f638e 100644
--- a/tests/queries/0_stateless/02211_shcema_inference_from_stdin.reference
+++ b/tests/queries/0_stateless/02211_shcema_inference_from_stdin.reference
@@ -1,4 +1,4 @@
-x	Nullable(Float64)					
+x	Nullable(Int64)					
 0
 1
 2
@@ -9,7 +9,7 @@ x	Nullable(Float64)
 7
 8
 9
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 1	2	3
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
index bd0c9cee464..c53187a963c 100644
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
@@ -60,15 +60,7 @@ quorum
 quorum
 replicas
 replicas
-shared
-shared
-shared
-shared
 table_shared_id
 table_shared_id
 temp
 temp
-zero_copy_hdfs
-zero_copy_hdfs
-zero_copy_s3
-zero_copy_s3
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
index f95d60dc07b..0ac6e838903 100644
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
@@ -29,12 +29,8 @@ pinned_part_uuids
 queue
 quorum
 replicas
-shared
-shared
 table_shared_id
 temp
-zero_copy_hdfs
-zero_copy_s3
 -------------------------
 1
 alter_partition_version
@@ -67,9 +63,5 @@ pinned_part_uuids
 queue
 quorum
 replicas
-shared
-shared
 table_shared_id
 temp
-zero_copy_hdfs
-zero_copy_s3
diff --git a/tests/queries/0_stateless/02222_create_table_without_columns_metadata.reference b/tests/queries/0_stateless/02222_create_table_without_columns_metadata.reference
index f32b0eb8a92..effc3644b41 100644
--- a/tests/queries/0_stateless/02222_create_table_without_columns_metadata.reference
+++ b/tests/queries/0_stateless/02222_create_table_without_columns_metadata.reference
@@ -1,3 +1,3 @@
-CREATE TABLE default.test\n(\n    `x` Nullable(Float64),\n    `y` Nullable(String)\n)\nENGINE = File(\'JSONEachRow\', \'data.jsonl\')
+CREATE TABLE default.test\n(\n    `x` Nullable(Int64),\n    `y` Nullable(String)\n)\nENGINE = File(\'JSONEachRow\', \'data.jsonl\')
 OK
 OK
diff --git a/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh b/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
index c84b1ab0e55..3ff2dabfa43 100755
--- a/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
+++ b/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
@@ -11,8 +11,8 @@ ${CLICKHOUSE_CLIENT} -q "CREATE USER user_${CLICKHOUSE_DATABASE} settings databa
 ${CLICKHOUSE_CLIENT} -q "GRANT CREATE TABLE ON ${CLICKHOUSE_DATABASE}_db.* TO user_${CLICKHOUSE_DATABASE}"
 ${CLICKHOUSE_CLIENT} --allow_experimental_database_replicated=1 --query "CREATE DATABASE ${CLICKHOUSE_DATABASE}_db engine = Replicated('/clickhouse/databases/${CLICKHOUSE_TEST_ZOOKEEPER_PREFIX}/${CLICKHOUSE_DATABASE}_db', '{shard}', '{replica}')"
 ${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_memory (x UInt32) engine = Memory;"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "set distributed_ddl_entry_format_version=2; CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;" 2>&1 | grep -o "Only tables with a Replicated engine"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -n --query "set distributed_ddl_entry_format_version=2; CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "set distributed_ddl_entry_format_version=2; CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt (x UInt32) engine = ReplicatedMergeTree order by x;"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;" 2>&1 | grep -o "Only tables with a Replicated engine"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt (x UInt32) engine = ReplicatedMergeTree order by x;"
 ${CLICKHOUSE_CLIENT} --query "DROP DATABASE ${CLICKHOUSE_DATABASE}_db"
 ${CLICKHOUSE_CLIENT} -q "DROP USER user_${CLICKHOUSE_DATABASE}"
diff --git a/tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference b/tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference
index d0ced74f8f6..0f8ac77ff74 100644
--- a/tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference
+++ b/tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference
@@ -1,6 +1,6 @@
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	}	[2]
 \N	\N	[]
diff --git a/tests/queries/0_stateless/02242_join_rocksdb.reference b/tests/queries/0_stateless/02242_join_rocksdb.reference
index b1f7307ff4f..5f2ac6c11b7 100644
--- a/tests/queries/0_stateless/02242_join_rocksdb.reference
+++ b/tests/queries/0_stateless/02242_join_rocksdb.reference
@@ -14,6 +14,18 @@
 7	[7,8]	val27
 8	[8,9]	val28
 9	[9,10]	val29
+-- left semi
+0
+2
+3
+6
+7
+8
+9
+-- left anti
+1
+4
+5
 -- join_use_nulls left
 0	0	Nullable(String)	val20
 1	\N	Nullable(String)	\N
diff --git a/tests/queries/0_stateless/02242_join_rocksdb.sql b/tests/queries/0_stateless/02242_join_rocksdb.sql
index 34b3d120eae..9d4cdb7af78 100644
--- a/tests/queries/0_stateless/02242_join_rocksdb.sql
+++ b/tests/queries/0_stateless/02242_join_rocksdb.sql
@@ -26,6 +26,12 @@ SELECT * FROM (SELECT k as key FROM t2) as t2 INNER JOIN rdb ON rdb.key == t2.ke
 SELECT '-- using';
 SELECT * FROM (SELECT k as key FROM t2) as t2 INNER JOIN rdb USING key ORDER BY key;
 
+SELECT '-- left semi';
+SELECT k FROM t2 LEFT SEMI JOIN rdb ON rdb.key == t2.k ORDER BY k;
+
+SELECT '-- left anti';
+SELECT k FROM t2 LEFT ANTI JOIN rdb ON rdb.key == t2.k ORDER BY k;
+
 SELECT '-- join_use_nulls left';
 SELECT k, key, toTypeName(value2), value2 FROM t2 LEFT JOIN rdb ON rdb.key == t2.k ORDER BY k SETTINGS join_use_nulls = 1;
 
@@ -59,6 +65,9 @@ SELECT * FROM t1 INNER JOIN rdb ON rdb.key + 1 == t1.k FORMAT Null SETTINGS join
 SELECT * FROM t1 INNER JOIN (SELECT * FROM rdb) AS rdb ON rdb.key == t1.k; -- { serverError NOT_IMPLEMENTED }
 SELECT * FROM t1 INNER JOIN (SELECT * FROM rdb) AS rdb ON rdb.key == t1.k FORMAT Null SETTINGS join_algorithm = 'direct,hash';
 
+SELECT * FROM t1 RIGHT SEMI JOIN (SELECT * FROM rdb) AS rdb ON rdb.key == t1.k; -- { serverError NOT_IMPLEMENTED }
+SELECT * FROM t1 RIGHT ANTI JOIN (SELECT * FROM rdb) AS rdb ON rdb.key == t1.k; -- { serverError NOT_IMPLEMENTED }
+
 DROP TABLE IF EXISTS rdb;
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/02243_make_date32.reference b/tests/queries/0_stateless/02243_make_date32.reference
index ac4b10d371a..b986cd285f4 100644
--- a/tests/queries/0_stateless/02243_make_date32.reference
+++ b/tests/queries/0_stateless/02243_make_date32.reference
@@ -28,10 +28,9 @@ Nullable(Date32)
 1969-01-01
 1969-12-01
 1969-12-31
-2282-01-01
-2283-01-01
-2283-11-11
-1970-01-01
+2298-01-01
+2299-01-01
+2299-12-31
 1970-01-01
 1970-01-01
 1970-01-01
diff --git a/tests/queries/0_stateless/02243_make_date32.sql b/tests/queries/0_stateless/02243_make_date32.sql
index c01855546c5..2cf4ac6b358 100644
--- a/tests/queries/0_stateless/02243_make_date32.sql
+++ b/tests/queries/0_stateless/02243_make_date32.sql
@@ -39,14 +39,13 @@ select makeDate32(2150,1,1);
 select makeDate32(1969,1,1);
 select makeDate32(1969,12,1);
 select makeDate32(1969,12,31);
-select makeDate32(2282,1,1);
-select makeDate32(2283,1,1);
-select makeDate32(2283,11,11);
-select makeDate32(2283,11,12);
-select makeDate32(2284,1,1);
-select makeDate32(1924,1,1);
-select makeDate32(1924,12,1);
-select makeDate32(1924,12,31);
+select makeDate32(2298,1,1);
+select makeDate32(2299,1,1);
+select makeDate32(2299,12,31);
+select makeDate32(2300,1,1);
+select makeDate32(1899,1,1);
+select makeDate32(1899,12,1);
+select makeDate32(1899,12,31);
 select makeDate32(1970,0,0);
 select makeDate32(1970,0,1);
 select makeDate32(1970,1,0);
diff --git a/tests/queries/0_stateless/02244_column_names_in_shcmea_inference.reference b/tests/queries/0_stateless/02244_column_names_in_shcmea_inference.reference
index d237caf630f..7a124346b9f 100644
--- a/tests/queries/0_stateless/02244_column_names_in_shcmea_inference.reference
+++ b/tests/queries/0_stateless/02244_column_names_in_shcmea_inference.reference
@@ -1,8 +1,8 @@
 x	Nullable(String)					
-y	Nullable(Float64)					
+y	Nullable(Int64)					
 x	Nullable(String)					
-y	Nullable(Float64)					
+y	Nullable(Int64)					
 x	Nullable(String)					
-y	Nullable(Float64)					
+y	Nullable(Int64)					
 x	Nullable(String)					
-y	Nullable(Float64)					
+y	Nullable(Int64)					
diff --git a/tests/queries/0_stateless/02244_hdfs_cluster.reference b/tests/queries/0_stateless/02244_hdfs_cluster.reference
index 4bf4799e904..32a9f24388c 100644
--- a/tests/queries/0_stateless/02244_hdfs_cluster.reference
+++ b/tests/queries/0_stateless/02244_hdfs_cluster.reference
@@ -22,24 +22,24 @@
 1	2	3
 4	5	6
 7	8	9
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt32					
 c2	UInt32					
 c3	UInt32					
 c1	UInt32					
 c2	UInt32					
 c3	UInt32					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt32					
 c2	UInt32					
 c3	UInt32					
diff --git a/tests/queries/0_stateless/02245_make_datetime64.reference b/tests/queries/0_stateless/02245_make_datetime64.reference
index eea768f1dc7..0ac672ae54d 100644
--- a/tests/queries/0_stateless/02245_make_datetime64.reference
+++ b/tests/queries/0_stateless/02245_make_datetime64.reference
@@ -8,9 +8,9 @@ DateTime64(3)
 DateTime64(6)
 DateTime64(7, \'CET\')
 DateTime64(7, \'UTC\')
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-2283-11-11 23:59:59.99999999
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+2299-12-31 23:59:59.99999999
 2262-04-11 23:47:16.854775807
 2262-04-11 23:47:16.85477581
 1991-08-24 21:04:00
@@ -23,10 +23,10 @@ DateTime64(7, \'UTC\')
 1991-08-24 21:04:00.0001234
 1991-08-24 21:04:00.00001234
 1991-08-24 21:04:00.000001234
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
 1984-01-02 01:00:00.000000000
 1984-01-01 01:10:00.000000000
 1984-01-01 00:01:10.000000000
@@ -37,22 +37,22 @@ DateTime64(7, \'UTC\')
 1983-03-02 02:03:04.000000005
 1984-03-02 02:03:04.000000005
 1983-03-03 02:03:04.000000005
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
 1984-01-01 02:03:04.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
@@ -61,9 +61,9 @@ DateTime64(7, \'UTC\')
 1984-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
-2283-11-11 23:59:59.999
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
+2299-12-31 23:59:59.999
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
diff --git a/tests/queries/0_stateless/02245_make_datetime64.sql b/tests/queries/0_stateless/02245_make_datetime64.sql
index 2e2d81fa363..054cbd8956d 100644
--- a/tests/queries/0_stateless/02245_make_datetime64.sql
+++ b/tests/queries/0_stateless/02245_make_datetime64.sql
@@ -10,10 +10,10 @@ select toTypeName(makeDateTime64(1991, 8, 24, 21, 4, 0, 1234, 6));
 select toTypeName(makeDateTime64(1991, 8, 24, 21, 4, 0, 1234, 7, 'CET'));
 select toTypeName(cast(makeDateTime64(1991, 8, 24, 21, 4, 0, 1234, 7, 'CET') as DateTime64(7, 'UTC')));
 
-select makeDateTime64(1925, 1, 1, 0, 0, 0, 0, 9, 'UTC');
-select makeDateTime64(1924, 12, 31, 23, 59, 59, 999999999, 9, 'UTC');
-select makeDateTime64(2283, 11, 11, 23, 59, 59, 99999999, 8, 'UTC');
-select makeDateTime64(2283, 11, 11, 23, 59, 59, 999999999, 9, 'UTC'); -- { serverError 407 }
+select makeDateTime64(1900, 1, 1, 0, 0, 0, 0, 9, 'UTC');
+select makeDateTime64(1899, 12, 31, 23, 59, 59, 999999999, 9, 'UTC');
+select makeDateTime64(2299, 12, 31, 23, 59, 59, 99999999, 8, 'UTC');
+select makeDateTime64(2299, 12, 31, 23, 59, 59, 999999999, 9, 'UTC'); -- { serverError 407 }
 select makeDateTime64(2262, 4, 11, 23, 47, 16, 854775807, 9, 'UTC');
 select makeDateTime64(2262, 4, 11, 23, 47, 16, 854775808, 9, 'UTC'); -- { serverError 407 }
 select makeDateTime64(2262, 4, 11, 23, 47, 16, 85477581, 8, 'UTC');
diff --git a/tests/queries/0_stateless/02245_s3_schema_desc.reference b/tests/queries/0_stateless/02245_s3_schema_desc.reference
index e039680d933..d840a365310 100644
--- a/tests/queries/0_stateless/02245_s3_schema_desc.reference
+++ b/tests/queries/0_stateless/02245_s3_schema_desc.reference
@@ -1,21 +1,21 @@
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt64					
 c2	UInt64					
 c3	UInt64					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt64					
 c2	UInt64					
 c3	UInt64					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt64					
 c2	UInt64					
 c3	UInt64					
diff --git a/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference b/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
index c245f13fdbe..1c60e40942c 100644
--- a/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
+++ b/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
@@ -1,8 +1,8 @@
 TSV
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64))					
+c3	Array(Nullable(Int64))					
+c4	Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64))					
 42	Some string	[1,2,3,4]	(1,2,3)
 42	abcd	[]	(4,5,6)
 c1	Nullable(String)					
@@ -70,8 +70,8 @@ c1	Nullable(String)
 CSV
 c1	Nullable(String)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Array(Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64)))					
+c3	Array(Nullable(Int64))					
+c4	Array(Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64)))					
 42	Some string	[1,2,3,4]	[(1,2,3)]
 42\\	abcd	[]	[(4,5,6)]
 c1	Nullable(String)					
@@ -101,7 +101,7 @@ c1	Nullable(String)
 (1, 2, 3)
 c1	Nullable(String)					
 123.123
-c1	Array(Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64)))					
+c1	Array(Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64)))					
 [(1,2,3)]
-c1	Array(Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64)))					
+c1	Array(Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64)))					
 [(1,2,3)]
diff --git a/tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference b/tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference
index 300846c17a0..c7774c8138b 100644
--- a/tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference
+++ b/tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference
@@ -1,32 +1,32 @@
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	}	[2]
 \N	\N	[]
 \N	\N	[]
 \N	\N	[3]
-b	Nullable(Float64)					
-a	Nullable(Float64)					
-c	Nullable(Float64)					
-e	Nullable(Float64)					
+b	Nullable(Int64)					
+a	Nullable(Int64)					
+c	Nullable(Int64)					
+e	Nullable(Int64)					
 1	\N	\N	\N
 \N	2	3	\N
 \N	\N	\N	\N
 \N	\N	\N	3
 3	3	1	\N
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	\N	[2]
 \N	\N	[]
 \N	\N	[]
 \N	\N	[3]
-b	Nullable(Float64)					
-a	Nullable(Float64)					
-c	Nullable(Float64)					
-e	Nullable(Float64)					
+b	Nullable(Int64)					
+a	Nullable(Int64)					
+c	Nullable(Int64)					
+e	Nullable(Int64)					
 1	\N	\N	\N
 \N	2	3	\N
 \N	\N	\N	\N
diff --git a/tests/queries/0_stateless/02247_read_bools_as_numbers_json.reference b/tests/queries/0_stateless/02247_read_bools_as_numbers_json.reference
index a7609bdd86b..840e77cb122 100644
--- a/tests/queries/0_stateless/02247_read_bools_as_numbers_json.reference
+++ b/tests/queries/0_stateless/02247_read_bools_as_numbers_json.reference
@@ -7,6 +7,12 @@ x	Nullable(Float64)
 x	Nullable(Float64)					
 1
 0.42
+x	Array(Nullable(Float64))					
+[1,0]
+[0.42]
+x	Array(Array(Nullable(Int64)))					
+[[1,2,3],[1,0],[1,1,0]]
+[[1,2,3]]
 c1	Nullable(Bool)					
 true
 false
@@ -16,3 +22,9 @@ c1	Nullable(Float64)
 c1	Nullable(Float64)					
 1
 0.42
+c1	Array(Nullable(Float64))					
+[1,0]
+[0.42]
+c1	Array(Array(Nullable(Int64)))					
+[[1,2,3],[1,0],[1,1,0]]
+[[1,2,3]]
diff --git a/tests/queries/0_stateless/02247_read_bools_as_numbers_json.sh b/tests/queries/0_stateless/02247_read_bools_as_numbers_json.sh
index 10f050ea6d1..1b689aaf577 100755
--- a/tests/queries/0_stateless/02247_read_bools_as_numbers_json.sh
+++ b/tests/queries/0_stateless/02247_read_bools_as_numbers_json.sh
@@ -27,6 +27,16 @@ echo -e '{"x" : true}
 $CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONEachRow')"
 $CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONEachRow')"
 
+echo -e '{"x" : [true, false]}
+{"x" : [0.42]}'  > $DATA_FILE
+$CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONEachRow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONEachRow')"
+
+echo -e '{"x" : [[1, 2, 3], [true, false], [1, true, false]]}
+{"x" : [[1, 2, 3]]}'  > $DATA_FILE
+$CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONEachRow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONEachRow')"
+
 
 echo -e '[true]
 [false]'  > $DATA_FILE
@@ -43,5 +53,14 @@ echo -e '[true]
 $CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONCompactEachRow')"
 $CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONCompactEachRow')"
 
+echo -e '[[true, false]]
+[[0.42]]'  > $DATA_FILE
+$CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONCompactEachRow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONCompactEachRow')"
+
+echo -e '[[[1, 2, 3], [true, false], [1, true, false]]]
+[[[1, 2, 3]]]'  > $DATA_FILE
+$CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONCompactEachRow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONCompactEachRow')"
 
 rm $DATA_FILE
diff --git a/tests/queries/0_stateless/02268_json_maps_and_objects.reference b/tests/queries/0_stateless/02268_json_maps_and_objects.reference
index cfdc6e7e55c..87fb8949e01 100644
--- a/tests/queries/0_stateless/02268_json_maps_and_objects.reference
+++ b/tests/queries/0_stateless/02268_json_maps_and_objects.reference
@@ -1,2 +1,5 @@
 x	Object(Nullable(\'json\'))					
 x	Object(Nullable(\'json\'))					
+x	Array(Object(Nullable(\'json\')))					
+x	Array(Object(Nullable(\'json\')))					
+x	Tuple(Map(String, Nullable(String)), Map(String, Array(Nullable(Int64))), Array(Nullable(Int64)))					
diff --git a/tests/queries/0_stateless/02268_json_maps_and_objects.sql b/tests/queries/0_stateless/02268_json_maps_and_objects.sql
index 83d8fbaac2d..8a9ede6876c 100644
--- a/tests/queries/0_stateless/02268_json_maps_and_objects.sql
+++ b/tests/queries/0_stateless/02268_json_maps_and_objects.sql
@@ -1,3 +1,6 @@
 -- Tags: no-fasttest
 desc format(JSONEachRow, '{"x" : {"a" : "Some string"}}, {"x" : {"b" : [1, 2, 3]}}, {"x" : {"c" : {"d" : 10}}}');
 desc format(JSONEachRow, '{"x" : {"a" : "Some string"}}, {"x" : {"b" : [1, 2, 3], "c" : {"42" : 42}}}');
+desc format(JSONEachRow, '{"x" : [{"a" : "Some string"}]}, {"x" : [{"b" : [1, 2, 3]}]}');
+desc format(JSONEachRow, '{"x" : [{"a" : "Some string"}, {"b" : [1, 2, 3]}]}');
+desc format(JSONEachRow, '{"x" : [{"a" : "Some string"}, {"b" : [1, 2, 3]}, [1, 2, 3]]}');
diff --git a/tests/queries/0_stateless/02286_mysql_dump_input_format.reference b/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
index 25be4b727bc..a736358b9b7 100644
--- a/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
+++ b/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
@@ -130,8 +130,8 @@ x	Nullable(Int32)
 x	Nullable(Int32)					
 1
 dump7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -139,8 +139,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -148,15 +148,15 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 1
 2
 3
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 1
 dump8
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -164,8 +164,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -174,8 +174,8 @@ c2	Nullable(Float64)
 5	\N
 6	7
 dump9
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -183,8 +183,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -193,8 +193,8 @@ c2	Nullable(Float64)
 5	\N
 6	7
 dump10
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -202,8 +202,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -212,8 +212,8 @@ c2	Nullable(Float64)
 5	\N
 6	7
 dump11
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -221,8 +221,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -265,8 +265,8 @@ color	Nullable(String)
 price	Nullable(Int32)					
 apple	red	42
 dump14
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -274,8 +274,8 @@ y	Nullable(Float64)
 4	\N
 5	\N
 6	7
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -283,15 +283,15 @@ y	Nullable(Float64)
 4	\N
 5	\N
 6	7
-x	Nullable(Float64)					
+x	Nullable(Int64)					
 1
 2
 3
-x	Nullable(Float64)					
+x	Nullable(Int64)					
 1
 dump15
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -299,8 +299,8 @@ y	Nullable(Float64)
 4	\N
 5	\N
 6	7
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -308,10 +308,10 @@ y	Nullable(Float64)
 4	\N
 5	\N
 6	7
-x	Nullable(Float64)					
+x	Nullable(Int64)					
 1
 2
 3
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	2
diff --git a/tests/queries/0_stateless/02293_formats_json_columns.reference b/tests/queries/0_stateless/02293_formats_json_columns.reference
index da8d080ac05..f59f02ad42b 100644
--- a/tests/queries/0_stateless/02293_formats_json_columns.reference
+++ b/tests/queries/0_stateless/02293_formats_json_columns.reference
@@ -4,9 +4,9 @@ JSONColumns
 	"b": ["String", "String", "String", "String", "String"],
 	"c": [[[[],"String"],[[],"gnirtS"]], [[[0],"String"],[[0],"gnirtS"]], [[[0,1],"String"],[[0,1],"gnirtS"]], [[[],"String"],[[0,1,2],"gnirtS"]], [[[0],"String"],[[],"gnirtS"]]]
 }
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 0	String	[([],'String'),([],'gnirtS')]
 1	String	[([0],'String'),([0],'gnirtS')]
 2	String	[([0,1],'String'),([0,1],'gnirtS')]
@@ -18,9 +18,9 @@ JSONCompactColumns
 	["String", "String", "String", "String", "String"],
 	[[[[],"String"],[[],"gnirtS"]], [[[0],"String"],[[0],"gnirtS"]], [[[0,1],"String"],[[0,1],"gnirtS"]], [[[],"String"],[[0,1,2],"gnirtS"]], [[[0],"String"],[[],"gnirtS"]]]
 ]
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 0	String	[([],'String'),([],'gnirtS')]
 1	String	[([0],'String'),([0],'gnirtS')]
 2	String	[([0,1],'String'),([0,1],'gnirtS')]
@@ -74,9 +74,9 @@ JSONColumnsWithMetadata
 		"bytes_read": 20
 	}
 }
-b	Nullable(Float64)					
-a	Nullable(Float64)					
-c	Nullable(Float64)					
+b	Nullable(Int64)					
+a	Nullable(Int64)					
+c	Nullable(Int64)					
 d	Nullable(String)					
 1	3	\N	\N
 2	2	\N	\N
@@ -89,8 +89,8 @@ OK
 3	
 2	
 1	
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 c3	Nullable(String)					
 1	1	\N
 2	2	\N
diff --git a/tests/queries/0_stateless/02293_hashid.reference b/tests/queries/0_stateless/02293_hashid.reference
index f36b1500288..dfc78349c05 100644
--- a/tests/queries/0_stateless/02293_hashid.reference
+++ b/tests/queries/0_stateless/02293_hashid.reference
@@ -8,5 +8,8 @@
 2	obmgndljgajpkeao
 3	dldokmpjpgjgeanb
 4	nkdlpgajngjnobme
-xkOpDGxQpVB
-jR
+YQrvD5XGvbx
+Bm3zaOq7zbp
+oV
+oV
+6b
diff --git a/tests/queries/0_stateless/02293_hashid.sql b/tests/queries/0_stateless/02293_hashid.sql
index 45aaefe7356..9938154f169 100644
--- a/tests/queries/0_stateless/02293_hashid.sql
+++ b/tests/queries/0_stateless/02293_hashid.sql
@@ -1,7 +1,16 @@
+-- Tags: no-backward-compatibility-check
 SET allow_experimental_hash_functions = 1;
 
 select number, hashid(number) from system.numbers limit 5;
 select number, hashid(number, 's3cr3t', 16, 'abcdefghijklmnop') from system.numbers limit 5;
 select hashid(1234567890123456, 's3cr3t');
+select hashid(1234567890123456, 's3cr3t2');
 
 SELECT  hashid(1, hashid(2));
+SELECT  hashid(1, 'k5');
+SELECT  hashid(1, 'k5_othersalt');
+
+-- https://github.com/ClickHouse/ClickHouse/issues/39672
+SELECT
+    JSONExtractRaw(257, NULL),
+    hashid(1024, if(rand() % 10, 'truetruetruetrue', NULL), 's3\0r3t'); -- {serverError 43}
diff --git a/tests/queries/0_stateless/02293_part_log_has_merge_reason.sql b/tests/queries/0_stateless/02293_part_log_has_merge_reason.sql
index 002bc1f37dd..9d2575314d4 100644
--- a/tests/queries/0_stateless/02293_part_log_has_merge_reason.sql
+++ b/tests/queries/0_stateless/02293_part_log_has_merge_reason.sql
@@ -6,10 +6,10 @@ CREATE TABLE t_part_log_has_merge_type_table
     UserID UInt64,
     Comment String
 )
-ENGINE = MergeTree() 
+ENGINE = MergeTree()
 ORDER BY tuple()
 TTL event_time + INTERVAL 3 MONTH
-SETTINGS min_bytes_for_wide_part = 0, materialize_ttl_recalculate_only = true;
+SETTINGS min_bytes_for_wide_part = 0, materialize_ttl_recalculate_only = true, max_number_of_merges_with_ttl_in_pool = 100;
 
 INSERT INTO t_part_log_has_merge_type_table VALUES (now(), 1, 'username1');
 INSERT INTO t_part_log_has_merge_type_table VALUES (now() - INTERVAL 4 MONTH, 2, 'username2');
@@ -20,7 +20,7 @@ SYSTEM FLUSH LOGS;
 
 SELECT
     event_type,
-    merge_reason 
+    merge_reason
 FROM
     system.part_log
 WHERE
diff --git a/tests/queries/0_stateless/02305_schema_inference_with_globs.reference b/tests/queries/0_stateless/02305_schema_inference_with_globs.reference
index 9df5d2a264c..defa2133823 100644
--- a/tests/queries/0_stateless/02305_schema_inference_with_globs.reference
+++ b/tests/queries/0_stateless/02305_schema_inference_with_globs.reference
@@ -1,5 +1,5 @@
 2
 4
 6
-x	Nullable(String)					
-x	Nullable(String)					
+x	Nullable(Int64)					
+x	Nullable(Int64)					
diff --git a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference
index 7d8e0c662cd..4274f5769ee 100644
--- a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference
+++ b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference
@@ -1,14 +1,14 @@
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 0	1	2
 1	2	3
 2	3	4
 3	4	5
 4	5	6
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 0	1	2
 1	2	3
 2	3	4
diff --git a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
index 3e57d4de586..01e0c397dc7 100644
--- a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
+++ b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
@@ -9,24 +9,27 @@ DistinctSortedChunkTransform
 -- distinct with primary key prefix -> pre-distinct optimization only
 DistinctTransform
 DistinctSortedChunkTransform
--- distinct with primary key prefix and order by on column in distinct -> pre-distinct and final distinct optimization
+-- distinct with primary key prefix and order by column in distinct -> pre-distinct and final distinct optimization
 DistinctSortedTransform
 DistinctSortedChunkTransform
--- distinct with primary key prefix and order by on the same columns -> pre-distinct and final distinct optimization
+-- distinct with primary key prefix and order by the same columns -> pre-distinct and final distinct optimization
 DistinctSortedStreamTransform
 DistinctSortedChunkTransform
 -- distinct with primary key prefix and order by column in distinct but non-primary key prefix -> pre-distinct and final distinct optimization
 DistinctSortedTransform
 DistinctSortedChunkTransform
--- distinct with primary key prefix and order by on column _not_ in distinct -> pre-distinct optimization only
+-- distinct with primary key prefix and order by column _not_ in distinct -> pre-distinct optimization only
 DistinctTransform
 DistinctSortedChunkTransform
 -- distinct with non-primary key prefix -> ordinary distinct
 DistinctTransform
 DistinctTransform
--- distinct with non-primary key prefix and order by on column in distinct -> final distinct optimization only
+-- distinct with non-primary key prefix and order by column in distinct -> final distinct optimization only
 DistinctSortedTransform
 DistinctTransform
--- distinct with non-primary key prefix and order by on column _not_ in distinct -> ordinary distinct
+-- distinct with non-primary key prefix and order by column _not_ in distinct -> ordinary distinct
+DistinctTransform
+DistinctTransform
+-- distinct with non-primary key prefix and order by _const_ column in distinct -> ordinary distinct
 DistinctTransform
 DistinctTransform
diff --git a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
index 903f3bb9e11..fcffb974433 100755
--- a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
+++ b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
@@ -27,25 +27,28 @@ $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct *
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix -> pre-distinct optimization only'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by on column in distinct -> pre-distinct and final distinct optimization'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column in distinct -> pre-distinct and final distinct optimization'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain order by c" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by on the same columns -> pre-distinct and final distinct optimization'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by the same columns -> pre-distinct and final distinct optimization'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain order by a, b" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column in distinct but non-primary key prefix -> pre-distinct and final distinct optimization'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b, c from distinct_in_order_explain order by c" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by on column _not_ in distinct -> pre-distinct optimization only'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column _not_ in distinct -> pre-distinct optimization only'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain order by b" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix -> ordinary distinct'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by on column in distinct -> final distinct optimization only'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by column in distinct -> final distinct optimization only'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain order by b" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by on column _not_ in distinct -> ordinary distinct'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by column _not_ in distinct -> ordinary distinct'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain order by a" | eval $FIND_DISTINCT
 
+$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by _const_ column in distinct -> ordinary distinct'"
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, 1 as x from distinct_in_order_explain order by x" | eval $FIND_DISTINCT
+
 $CLICKHOUSE_CLIENT -q "drop table if exists distinct_in_order_explain sync"
diff --git a/tests/queries/0_stateless/02325_dates_schema_inference.reference b/tests/queries/0_stateless/02325_dates_schema_inference.reference
new file mode 100644
index 00000000000..3ac4ad88f1c
--- /dev/null
+++ b/tests/queries/0_stateless/02325_dates_schema_inference.reference
@@ -0,0 +1,60 @@
+JSONEachRow
+x	Nullable(Date)					
+x	Nullable(DateTime64(9))					
+x	Nullable(DateTime64(9))					
+x	Array(Nullable(Date))					
+x	Array(Nullable(DateTime64(9)))					
+x	Array(Nullable(DateTime64(9)))					
+x	Map(String, Nullable(DateTime64(9)))					
+x	Array(Nullable(DateTime64(9)))					
+x	Array(Nullable(DateTime64(9)))					
+x	Nullable(DateTime64(9))					
+x	Array(Nullable(String))					
+x	Nullable(String)					
+x	Array(Nullable(String))					
+x	Map(String, Array(Array(Nullable(String))))					
+CSV
+c1	Nullable(Date)					
+c1	Nullable(DateTime64(9))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(Date))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(String))					
+c1	Nullable(String)					
+c1	Array(Nullable(String))					
+c1	Map(String, Array(Array(Nullable(String))))					
+TSV
+c1	Nullable(Date)					
+c1	Nullable(DateTime64(9))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(Date))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(String))					
+c1	Nullable(String)					
+c1	Array(Nullable(String))					
+c1	Map(String, Array(Array(Nullable(String))))					
+Values
+c1	Nullable(Date)					
+c1	Nullable(DateTime64(9))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(Date))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(String))					
+c1	Nullable(String)					
+c1	Array(Nullable(String))					
+c1	Map(String, Array(Array(Nullable(String))))					
diff --git a/tests/queries/0_stateless/02325_dates_schema_inference.sql b/tests/queries/0_stateless/02325_dates_schema_inference.sql
new file mode 100644
index 00000000000..3534a0eb48f
--- /dev/null
+++ b/tests/queries/0_stateless/02325_dates_schema_inference.sql
@@ -0,0 +1,70 @@
+-- Tags: no-fasttest
+
+set input_format_try_infer_dates=1;
+set input_format_try_infer_datetimes=1;
+
+select 'JSONEachRow';
+desc format(JSONEachRow, '{"x" : "2020-01-01"}');
+desc format(JSONEachRow, '{"x" : "2020-01-01 00:00:00.00000"}');
+desc format(JSONEachRow, '{"x" : "2020-01-01 00:00:00"}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01", "2020-01-02"]}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01", "2020-01-01 00:00:00"]}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00", "2020-01-01 00:00:00"]}');
+desc format(JSONEachRow, '{"x" : {"date1" : "2020-01-01 00:00:00", "date2" : "2020-01-01"}}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00", "2020-01-01"]}\n{"x" : ["2020-01-01"]}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00"]}\n{"x" : ["2020-01-01"]}');
+desc format(JSONEachRow, '{"x" : "2020-01-01 00:00:00"}\n{"x" : "2020-01-01"}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00", "Some string"]}');
+desc format(JSONEachRow, '{"x" : "2020-01-01 00:00:00"}\n{"x" : "Some string"}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00", "2020-01-01"]}\n{"x" : ["2020-01-01", "Some string"]}');
+desc format(JSONEachRow, '{"x" : {"key1" : [["2020-01-01 00:00:00"]], "key2" : [["2020-01-01"]]}}\n{"x" : {"key1" : [["2020-01-01"]], "key2" : [["Some string"]]}}');
+
+select 'CSV';
+desc format(CSV, '"2020-01-01"');
+desc format(CSV, '"2020-01-01 00:00:00.00000"');
+desc format(CSV, '"2020-01-01 00:00:00"');
+desc format(CSV, '"[\'2020-01-01\', \'2020-01-02\']"');
+desc format(CSV, '"[\'2020-01-01\', \'2020-01-01 00:00:00\']"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\', \'2020-01-01 00:00:00\']"');
+desc format(CSV, '"{\'date1\' : \'2020-01-01 00:00:00\', \'date2\' : \'2020-01-01\'}"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\', \'2020-01-01\']"\n"[\'2020-01-01\']"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\']"\n"[\'2020-01-01\']"');
+desc format(CSV, '"2020-01-01 00:00:00"\n"2020-01-01"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\', \'Some string\']"');
+desc format(CSV, '"2020-01-01 00:00:00"\n"Some string"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\', \'2020-01-01\']"\n"[\'2020-01-01\', \'Some string\']"');
+desc format(CSV, '"{\'key1\' : [[\'2020-01-01 00:00:00\']], \'key2\' : [[\'2020-01-01\']]}"\n"{\'key1\' : [[\'2020-01-01\']], \'key2\' : [[\'Some string\']]}"');
+
+select 'TSV';
+desc format(TSV, '2020-01-01');
+desc format(TSV, '2020-01-01 00:00:00.00000');
+desc format(TSV, '2020-01-01 00:00:00');
+desc format(TSV, '[\'2020-01-01\', \'2020-01-02\']');
+desc format(TSV, '[\'2020-01-01\', \'2020-01-01 00:00:00\']');
+desc format(TSV, '[\'2020-01-01 00:00:00\', \'2020-01-01 00:00:00\']');
+desc format(TSV, '{\'date1\' : \'2020-01-01 00:00:00\', \'date2\' : \'2020-01-01\'}');
+desc format(TSV, '[\'2020-01-01 00:00:00\', \'2020-01-01\']\n[\'2020-01-01\']');
+desc format(TSV, '[\'2020-01-01 00:00:00\']\n[\'2020-01-01\']');
+desc format(TSV, '2020-01-01 00:00:00\n2020-01-01');
+desc format(TSV, '[\'2020-01-01 00:00:00\', \'Some string\']');
+desc format(TSV, '2020-01-01 00:00:00\nSome string');
+desc format(TSV, '[\'2020-01-01 00:00:00\', \'2020-01-01\']\n[\'2020-01-01\', \'Some string\']');
+desc format(TSV, '{\'key1\' : [[\'2020-01-01 00:00:00\']], \'key2\' : [[\'2020-01-01\']]}\n{\'key1\' : [[\'2020-01-01\']], \'key2\' : [[\'Some string\']]}');
+
+select 'Values';
+desc format(Values, '(\'2020-01-01\')');
+desc format(Values, '(\'2020-01-01 00:00:00.00000\')');
+desc format(Values, '(\'2020-01-01 00:00:00\')');
+desc format(Values, '([\'2020-01-01\', \'2020-01-02\'])');
+desc format(Values, '([\'2020-01-01\', \'2020-01-01 00:00:00\'])');
+desc format(Values, '([\'2020-01-01 00:00:00\', \'2020-01-01 00:00:00\'])');
+desc format(Values, '({\'date1\' : \'2020-01-01 00:00:00\', \'date2\' : \'2020-01-01\'})');
+desc format(Values, '([\'2020-01-01 00:00:00\', \'2020-01-01\'])\n([\'2020-01-01\'])');
+desc format(Values, '([\'2020-01-01 00:00:00\']), ([\'2020-01-01\'])');
+desc format(Values, '(\'2020-01-01 00:00:00\')\n(\'2020-01-01\')');
+desc format(Values, '([\'2020-01-01 00:00:00\', \'Some string\'])');
+desc format(Values, '(\'2020-01-01 00:00:00\')\n(\'Some string\')');
+desc format(Values, '([\'2020-01-01 00:00:00\', \'2020-01-01\'])\n([\'2020-01-01\', \'Some string\'])');
+desc format(Values, '({\'key1\' : [[\'2020-01-01 00:00:00\']], \'key2\' : [[\'2020-01-01\']]})\n({\'key1\' : [[\'2020-01-01\']], \'key2\' : [[\'Some string\']]})');
+
+
diff --git a/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.reference b/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.reference
new file mode 100644
index 00000000000..6da939d7839
--- /dev/null
+++ b/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.reference
@@ -0,0 +1,17 @@
+x	Nullable(Int64)					
+x	Array(Nullable(Float64))					
+x	Map(String, Nullable(Int64))					
+x	Map(String, Array(Nullable(Int64)))					
+x	Nullable(Int64)					
+x	Array(Nullable(Int64))					
+x	Map(String, Nullable(Int64))					
+x	Map(String, Array(Nullable(Int64)))					
+x	Array(Nullable(String))					
+x	Map(String, Nullable(String))					
+x	Map(String, Array(Nullable(String)))					
+x	Nullable(String)					
+x	Array(Nullable(String))					
+x	Map(String, Nullable(String))					
+x	Map(String, Array(Nullable(String)))					
+x	Tuple(Nullable(Int64), Nullable(String))					
+x	Object(Nullable(\'json\'))					
diff --git a/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.sql b/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.sql
new file mode 100644
index 00000000000..2012a53c09d
--- /dev/null
+++ b/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.sql
@@ -0,0 +1,21 @@
+-- Tags: no-fasttest
+
+set input_format_json_try_infer_numbers_from_strings=1;
+
+desc format(JSONEachRow, '{"x" : "123"}');
+desc format(JSONEachRow, '{"x" : ["123", 123, 12.3]}');
+desc format(JSONEachRow, '{"x" : {"k1" : "123", "k2" : 123}}');
+desc format(JSONEachRow, '{"x" : {"k1" : ["123", "123"], "k2" : [123, 123]}}');
+desc format(JSONEachRow, '{"x" : "123"}\n{"x" : 123}');
+desc format(JSONEachRow, '{"x" : ["123", "456"]}\n{"x" : [123, 456]}');
+desc format(JSONEachRow, '{"x" : {"k1" : "123"}}\n{"x" : {"k2" : 123}}');
+desc format(JSONEachRow, '{"x" : {"k1" : ["123", "123"]}}\n{"x": {"k2" : [123, 123]}}');
+desc format(JSONEachRow, '{"x" : ["123", "Some string"]}');
+desc format(JSONEachRow, '{"x" : {"k1" : "123", "k2" : "Some string"}}');
+desc format(JSONEachRow, '{"x" : {"k1" : ["123", "123"], "k2" : ["Some string"]}}');
+desc format(JSONEachRow, '{"x" : "123"}\n{"x" : "Some string"}');
+desc format(JSONEachRow, '{"x" : ["123", "456"]}\n{"x" : ["Some string"]}');
+desc format(JSONEachRow, '{"x" : {"k1" : "123"}}\n{"x" : {"k2" : "Some string"}}');
+desc format(JSONEachRow, '{"x" : {"k1" : ["123", "123"]}}\n{"x": {"k2" : ["Some string"]}}');
+desc format(JSONEachRow, '{"x" : [123, "Some string"]}');
+desc format(JSONEachRow, '{"x" : {"a" : 123, "b" : "Some string"}}');
diff --git a/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.reference b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.reference
new file mode 100644
index 00000000000..a1cb9f8e5dc
--- /dev/null
+++ b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.reference
@@ -0,0 +1,36 @@
+JSONEachRow
+x	Nullable(Int64)					
+x	Array(Nullable(Int64))					
+x	Map(String, Array(Nullable(Int64)))					
+x	Map(String, Array(Nullable(Int64)))					
+x	Nullable(Float64)					
+x	Nullable(Float64)					
+x	Array(Nullable(Float64))					
+x	Map(String, Array(Nullable(Float64)))					
+CSV
+c1	Nullable(Int64)					
+c1	Array(Nullable(Int64))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Nullable(Float64)					
+c1	Nullable(Float64)					
+c1	Array(Nullable(Float64))					
+c1	Map(String, Array(Nullable(Float64)))					
+TSV
+c1	Nullable(Int64)					
+c1	Array(Nullable(Int64))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Nullable(Float64)					
+c1	Nullable(Float64)					
+c1	Array(Nullable(Float64))					
+c1	Map(String, Array(Nullable(Float64)))					
+Values
+c1	Nullable(Int64)					
+c1	Array(Nullable(Int64))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Nullable(Float64)					
+c1	Nullable(Float64)					
+c1	Array(Nullable(Float64))					
+c1	Map(String, Array(Nullable(Float64)))					
diff --git a/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql
new file mode 100644
index 00000000000..0ceed178865
--- /dev/null
+++ b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql
@@ -0,0 +1,45 @@
+-- Tags: no-fasttest
+
+set input_format_try_infer_integers=1;
+
+select 'JSONEachRow';
+desc format(JSONEachRow, '{"x" : 123}');
+desc format(JSONEachRow, '{"x" : [123, 123]}');
+desc format(JSONEachRow, '{"x" : {"a" : [123, 123]}}');
+desc format(JSONEachRow, '{"x" : {"a" : [123, 123]}}\n{"x" : {"b" : [321, 321]}}');
+desc format(JSONEachRow, '{"x" : 123}\n{"x" : 123.123}');
+desc format(JSONEachRow, '{"x" : 123}\n{"x" : 1e2}');
+desc format(JSONEachRow, '{"x" : [123, 123]}\n{"x" : [321.321, 312]}');
+desc format(JSONEachRow, '{"x" : {"a" : [123, 123]}}\n{"x" : {"b" : [321.321, 123]}}');
+
+select 'CSV';
+desc format(CSV, '123');
+desc format(CSV, '"[123, 123]"');
+desc format(CSV, '"{\'a\' : [123, 123]}"');
+desc format(CSV, '"{\'a\' : [123, 123]}"\n"{\'b\' : [321, 321]}"');
+desc format(CSV, '123\n123.123');
+desc format(CSV, '122\n1e2');
+desc format(CSV, '"[123, 123]"\n"[321.321, 312]"');
+desc format(CSV, '"{\'a\' : [123, 123]}"\n"{\'b\' : [321.321, 123]}"');
+
+select 'TSV';
+desc format(TSV, '123');
+desc format(TSV, '[123, 123]');
+desc format(TSV, '{\'a\' : [123, 123]}');
+desc format(TSV, '{\'a\' : [123, 123]}\n{\'b\' : [321, 321]}');
+desc format(TSV, '123\n123.123');
+desc format(TSV, '122\n1e2');
+desc format(TSV, '[123, 123]\n[321.321, 312]');
+desc format(TSV, '{\'a\' : [123, 123]}\n{\'b\' : [321.321, 123]}');
+
+select 'Values';
+desc format(Values, '(123)');
+desc format(Values, '([123, 123])');
+desc format(Values, '({\'a\' : [123, 123]})');
+desc format(Values, '({\'a\' : [123, 123]}), ({\'b\' : [321, 321]})');
+desc format(Values, '(123), (123.123)');
+desc format(Values, '(122), (1e2)');
+desc format(Values, '([123, 123])\n([321.321, 312])');
+desc format(Values, '({\'a\' : [123, 123]}), ({\'b\' : [321.321, 123]})');
+
+
diff --git a/tests/queries/0_stateless/02346_non_negative_derivative.reference b/tests/queries/0_stateless/02346_non_negative_derivative.reference
index 51fe2359bd0..b81af45962e 100644
--- a/tests/queries/0_stateless/02346_non_negative_derivative.reference
+++ b/tests/queries/0_stateless/02346_non_negative_derivative.reference
@@ -1,63 +1,63 @@
 1
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	0.20550000000000002
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	6.165000000000001e-10
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	8.22e-7
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	0.0010275000000000002
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	1.233
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	86.31
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	5918.400000000001
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	159796.80000000002
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	1242864
diff --git a/tests/queries/0_stateless/02352_rwlock.sh b/tests/queries/0_stateless/02352_rwlock.sh
index 8054be81781..56b7ab27410 100755
--- a/tests/queries/0_stateless/02352_rwlock.sh
+++ b/tests/queries/0_stateless/02352_rwlock.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+# Tag no-parallel -- to avoid running it in parallel, this will avoid possible issues due to high pressure
 
 # Test that ensures that WRITE lock failure notifies READ.
 # In other words to ensure that after WRITE lock failure (DROP),
@@ -13,31 +15,73 @@ function wait_query_by_id_started()
     local query_id=$1 && shift
     # wait for query to be started
     while [ "$($CLICKHOUSE_CLIENT "$@" -q "select count() from system.processes where query_id = '$query_id'")" -ne 1 ]; do
-        sleep 0.1
+        if [ "$(
+            $CLICKHOUSE_CLIENT -nm -q "
+                system flush logs;
+
+                select count() from system.query_log
+                where
+                    event_date >= yesterday() and
+                    current_database = '$CLICKHOUSE_DATABASE' and
+                    type = 'QueryFinish' and
+                    query_id = '$query_id'
+            "
+        )" -eq 1 ]; then
+            return 1
+        else
+            sleep 0.1
+        fi
     done
+
+    return 0
 }
 
 # to avoid removal via separate thread
 $CLICKHOUSE_CLIENT -q "CREATE DATABASE ${CLICKHOUSE_DATABASE}_ordinary Engine=Ordinary" --allow_deprecated_database_ordinary=1
-$CLICKHOUSE_CLIENT -q "CREATE TABLE ${CLICKHOUSE_DATABASE}_ordinary.data_02352 (key Int) Engine=Null()"
 
-query_id="insert-$(random_str 10)"
-# 20 seconds sleep
-$CLICKHOUSE_CLIENT --query_id "$query_id" -q "INSERT INTO ${CLICKHOUSE_DATABASE}_ordinary.data_02352 SELECT sleepEachRow(1) FROM numbers(20) GROUP BY number" &
-wait_query_by_id_started "$query_id"
+# It is possible that the subsequent after INSERT query will be processed
+# only after INSERT finished, it is unlikely, but it happens few times in
+# debug build on CI, so if this will happen, then DROP query will be
+# finished instantly, and to avoid flakiness we will retry in this case
+while :; do
+    $CLICKHOUSE_CLIENT -nm -q "
+        DROP TABLE IF EXISTS ${CLICKHOUSE_DATABASE}_ordinary.data_02352;
+        CREATE TABLE ${CLICKHOUSE_DATABASE}_ordinary.data_02352 (key Int) Engine=Null();
+    "
 
-query_id="drop-$(random_str 10)"
-# 10 second wait
-$CLICKHOUSE_CLIENT --query_id "$query_id" -q "DROP TABLE ${CLICKHOUSE_DATABASE}_ordinary.data_02352 SYNC" --lock_acquire_timeout 10 > >(grep -m1 -o 'WRITE locking attempt on ".*" has timed out') 2>&1 &
-wait_query_by_id_started "$query_id"
+    insert_query_id="insert-$(random_str 10)"
+    # 20 seconds sleep
+    $CLICKHOUSE_CLIENT --query_id "$insert_query_id" -q "INSERT INTO ${CLICKHOUSE_DATABASE}_ordinary.data_02352 SELECT sleepEachRow(1) FROM numbers(20) GROUP BY number" &
+    if ! wait_query_by_id_started "$insert_query_id"; then
+        wait
+        continue
+    fi
 
-# NOTE: we need to run SELECT after DROP and
-# if the bug is there, then the query will wait 20 seconds (INSERT), instead of 10 (DROP) and will fail
-#
-# 11 seconds wait (DROP + 1 second lag)
-$CLICKHOUSE_CLIENT -q "SELECT * FROM ${CLICKHOUSE_DATABASE}_ordinary.data_02352" --lock_acquire_timeout 11
+    drop_query_id="drop-$(random_str 10)"
+    # 10 second wait
+    $CLICKHOUSE_CLIENT --query_id "$drop_query_id" -q "DROP TABLE ${CLICKHOUSE_DATABASE}_ordinary.data_02352 SYNC" --lock_acquire_timeout 10 > >(
+        grep -m1 -o 'WRITE locking attempt on ".*" has timed out'
+    ) 2>&1 &
+    if ! wait_query_by_id_started "$drop_query_id"; then
+        wait
+        continue
+    fi
+    # Check INSERT query again, and retry if it does not exist.
+    if ! wait_query_by_id_started "$insert_query_id"; then
+        wait
+        continue
+    fi
 
-# wait DROP and INSERT
-wait
+    # NOTE: we need to run SELECT after DROP and
+    # if the bug is there, then the query will wait 20 seconds (INSERT), instead of 10 (DROP) and will fail
+    #
+    # 11 seconds wait (DROP + 1 second lag)
+    $CLICKHOUSE_CLIENT -q "SELECT * FROM ${CLICKHOUSE_DATABASE}_ordinary.data_02352" --lock_acquire_timeout 11
+
+    # wait DROP and INSERT
+    wait
+
+    break
+done | uniq
 
 $CLICKHOUSE_CLIENT -q "DROP DATABASE ${CLICKHOUSE_DATABASE}_ordinary"
diff --git a/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql b/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql
index c1cb2280381..548660e36b1 100644
--- a/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql
+++ b/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql
@@ -1,4 +1,4 @@
--- Tags: long, no-tsan, no-msan, no-asan, no-ubsan, no-debug
+-- Tags: long, no-tsan, no-msan, no-asan, no-ubsan, no-debug, no-s3-storage
 
 create table t_2354_dist_with_external_aggr(a UInt64, b String, c FixedString(100)) engine = MergeTree order by tuple();
 
@@ -19,4 +19,4 @@ select a, b, c, sum(a) as s
 from remote('127.0.0.{1,2}', currentDatabase(), t_2354_dist_with_external_aggr)
 group by a, b, c
 format Null
-settings max_memory_usage = '4G';
+settings max_memory_usage = '4Gi';
diff --git a/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.reference b/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.reference
new file mode 100644
index 00000000000..2b217a21694
--- /dev/null
+++ b/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.reference
@@ -0,0 +1,2 @@
+25
+2018-01-02 02:00:00
diff --git a/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.sql b/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.sql
new file mode 100644
index 00000000000..f7fa762b6b0
--- /dev/null
+++ b/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.sql
@@ -0,0 +1,2 @@
+SELECT dateDiff('h', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'));
+SELECT  toDateTime('2018-01-01 22:00:00') + INTERVAL 4 h
diff --git a/tests/queries/0_stateless/02366_decimal_agg_state_conversion.reference b/tests/queries/0_stateless/02366_decimal_agg_state_conversion.reference
new file mode 100644
index 00000000000..88822fec8d0
--- /dev/null
+++ b/tests/queries/0_stateless/02366_decimal_agg_state_conversion.reference
@@ -0,0 +1,3 @@
+1.100001
+0.000001
+19	0.1
diff --git a/tests/queries/0_stateless/02366_decimal_agg_state_conversion.sql b/tests/queries/0_stateless/02366_decimal_agg_state_conversion.sql
new file mode 100644
index 00000000000..edcab325d91
--- /dev/null
+++ b/tests/queries/0_stateless/02366_decimal_agg_state_conversion.sql
@@ -0,0 +1,62 @@
+select sumMerge(y) from 
+(
+  select cast(x, 'AggregateFunction(sum, Decimal(50, 10))') y from 
+   (
+     select arrayReduce('sumState', [toDecimal256('0.000001', 10), toDecimal256('1.1', 10)]) x
+   )
+);
+
+select minMerge(y) from 
+(
+  select cast(x, 'AggregateFunction(min, Decimal(18, 10))') y from 
+   (
+     select arrayReduce('minState', [toDecimal64('0.000001', 10), toDecimal64('1.1', 10)]) x
+   )
+);
+
+
+drop table if exists consumer_02366;
+drop table if exists producer_02366;
+drop table if exists mv_02366;
+
+CREATE TABLE consumer_02366
+(
+    `id` UInt16,
+    `dec` AggregateFunction(argMin, Decimal(24, 10), UInt16)
+)
+ENGINE = AggregatingMergeTree
+PRIMARY KEY id
+ORDER BY id;
+
+CREATE TABLE producer_02366
+(
+    `id` UInt16,
+    `dec` String
+)
+ENGINE = MergeTree
+PRIMARY KEY id
+ORDER BY id;
+
+CREATE MATERIALIZED VIEW mv_02366 TO consumer_02366 AS
+SELECT
+    id,
+    argMinState(dec, id) AS dec
+FROM
+(
+    SELECT
+        id,
+        toDecimal128(dec, 10) AS dec
+    FROM producer_02366
+)
+GROUP BY id;
+
+INSERT INTO producer_02366 (*) VALUES (19, '.1');
+
+SELECT
+    id,
+    finalizeAggregation(dec)
+FROM consumer_02366;
+
+drop table consumer_02366;
+drop table producer_02366;
+drop table mv_02366;
diff --git a/tests/queries/0_stateless/02371_select_projection_normal_agg.reference b/tests/queries/0_stateless/02371_select_projection_normal_agg.reference
new file mode 100644
index 00000000000..9972842f982
--- /dev/null
+++ b/tests/queries/0_stateless/02371_select_projection_normal_agg.reference
@@ -0,0 +1 @@
+1	1
diff --git a/tests/queries/0_stateless/02371_select_projection_normal_agg.sql b/tests/queries/0_stateless/02371_select_projection_normal_agg.sql
new file mode 100644
index 00000000000..283aec0b122
--- /dev/null
+++ b/tests/queries/0_stateless/02371_select_projection_normal_agg.sql
@@ -0,0 +1,124 @@
+DROP TABLE IF EXISTS video_log;
+
+CREATE TABLE video_log
+(
+    `datetime` DateTime,
+    `user_id` UInt64,
+    `device_id` UInt64,
+    `domain` LowCardinality(String),
+    `bytes` UInt64,
+    `duration` UInt64
+)
+ENGINE = MergeTree
+PARTITION BY toDate(datetime)
+ORDER BY (user_id, device_id);
+
+DROP TABLE IF EXISTS rng;
+
+CREATE TABLE rng
+(
+    `user_id_raw` UInt64,
+    `device_id_raw` UInt64,
+    `domain_raw` UInt64,
+    `bytes_raw` UInt64,
+    `duration_raw` UInt64
+)
+ENGINE = GenerateRandom(1024);
+
+INSERT INTO video_log SELECT
+  toUnixTimestamp('2022-07-22 01:00:00')
+  + (rowNumberInAllBlocks() / 20000),
+  user_id_raw % 100000000 AS user_id,
+  device_id_raw % 200000000 AS device_id,
+  domain_raw % 100,
+  (bytes_raw % 1024) + 128,
+  (duration_raw % 300) + 100
+FROM rng
+LIMIT 1728000;
+
+INSERT INTO video_log SELECT
+  toUnixTimestamp('2022-07-22 01:00:00')
+  + (rowNumberInAllBlocks() / 20000),
+  user_id_raw % 100000000 AS user_id,
+  100 AS device_id,
+  domain_raw % 100,
+  (bytes_raw % 1024) + 128,
+  (duration_raw % 300) + 100
+FROM rng
+LIMIT 10;
+
+DROP TABLE IF EXISTS video_log_result;
+
+CREATE TABLE video_log_result
+(
+    `hour` DateTime,
+    `sum_bytes` UInt64,
+    `avg_duration` Float64
+)
+ENGINE = MergeTree
+PARTITION BY toDate(hour)
+ORDER BY sum_bytes;
+
+INSERT INTO video_log_result SELECT
+    toStartOfHour(datetime) AS hour,
+    sum(bytes),
+    avg(duration)
+FROM video_log
+WHERE (toDate(hour) = '2022-07-22') AND (device_id = '100') --(device_id = '100') Make sure it's not good and doesn't go into prewhere.
+GROUP BY hour;
+
+
+ALTER TABLE video_log ADD PROJECTION p_norm
+(
+    SELECT
+        datetime,
+        device_id,
+        bytes,
+        duration
+    ORDER BY device_id
+);
+
+ALTER TABLE video_log MATERIALIZE PROJECTION p_norm settings mutations_sync=1;
+
+ALTER TABLE video_log ADD PROJECTION p_agg
+(
+    SELECT
+        toStartOfHour(datetime) AS hour,
+        domain,
+        sum(bytes),
+        avg(duration)
+    GROUP BY
+        hour,
+        domain
+);
+
+ALTER TABLE video_log MATERIALIZE PROJECTION p_agg settings mutations_sync=1;
+
+SELECT
+    equals(sum_bytes1, sum_bytes2),
+    equals(avg_duration1, avg_duration2)
+FROM
+(
+    SELECT
+        toStartOfHour(datetime) AS hour,
+        sum(bytes) AS sum_bytes1,
+        avg(duration) AS avg_duration1
+    FROM video_log
+    WHERE (toDate(hour) = '2022-07-22') AND (device_id = '100') --(device_id = '100') Make sure it's not good and doesn't go into prewhere.
+    GROUP BY hour
+)
+LEFT JOIN
+(
+    SELECT
+        `hour`,
+        `sum_bytes` AS sum_bytes2,
+        `avg_duration` AS avg_duration2
+    FROM video_log_result
+)
+USING (hour) settings joined_subquery_requires_alias=0;
+
+DROP TABLE IF EXISTS video_log;
+
+DROP TABLE IF EXISTS rng;
+
+DROP TABLE IF EXISTS video_log_result;
diff --git a/tests/queries/0_stateless/02375_pretty_formats.reference b/tests/queries/0_stateless/02375_pretty_formats.reference
new file mode 100644
index 00000000000..51b18f7eb09
--- /dev/null
+++ b/tests/queries/0_stateless/02375_pretty_formats.reference
@@ -0,0 +1,118 @@
+Pretty
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 0 │ 1 │
+├───┼───┤
+│ 1 │ 2 │
+└───┴───┘
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 2 │ 3 │
+├───┼───┤
+│ 3 │ 4 │
+└───┴───┘
+PrettyNoEscapes
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 0 │ 1 │
+├───┼───┤
+│ 1 │ 2 │
+└───┴───┘
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 2 │ 3 │
+├───┼───┤
+│ 3 │ 4 │
+└───┴───┘
+PrettyMonoBlock
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 0 │ 1 │
+├───┼───┤
+│ 1 │ 2 │
+├───┼───┤
+│ 2 │ 3 │
+├───┼───┤
+│ 3 │ 4 │
+└───┴───┘
+PrettyNoEscapesMonoBlock
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 0 │ 1 │
+├───┼───┤
+│ 1 │ 2 │
+├───┼───┤
+│ 2 │ 3 │
+├───┼───┤
+│ 3 │ 4 │
+└───┴───┘
+PrettyCompact
+┌─x─┬─y─┐
+│ 0 │ 1 │
+│ 1 │ 2 │
+└───┴───┘
+┌─x─┬─y─┐
+│ 2 │ 3 │
+│ 3 │ 4 │
+└───┴───┘
+PrettyCompactNoEscapes
+┌─x─┬─y─┐
+│ 0 │ 1 │
+│ 1 │ 2 │
+└───┴───┘
+┌─x─┬─y─┐
+│ 2 │ 3 │
+│ 3 │ 4 │
+└───┴───┘
+PrettyCompactMonoBlock
+┌─x─┬─y─┐
+│ 0 │ 1 │
+│ 1 │ 2 │
+│ 2 │ 3 │
+│ 3 │ 4 │
+└───┴───┘
+PrettyCompactNoEscapesMonoBlock
+┌─x─┬─y─┐
+│ 0 │ 1 │
+│ 1 │ 2 │
+│ 2 │ 3 │
+│ 3 │ 4 │
+└───┴───┘
+PrettySpace
+ x   y
+
+ 0   1 
+ 1   2 
+ x   y
+
+ 2   3 
+ 3   4 
+PrettySpaceNoEscapes
+ x   y
+
+ 0   1 
+ 1   2 
+ x   y
+
+ 2   3 
+ 3   4 
+PrettySpaceMonoBlock
+ x   y
+
+ 0   1 
+ 1   2 
+ 2   3 
+ 3   4 
+PrettySpaceNoEscapesMonoBlock
+ x   y
+
+ 0   1 
+ 1   2 
+ 2   3 
+ 3   4 
diff --git a/tests/queries/0_stateless/02375_pretty_formats.sql.j2 b/tests/queries/0_stateless/02375_pretty_formats.sql.j2
new file mode 100644
index 00000000000..cc61346d267
--- /dev/null
+++ b/tests/queries/0_stateless/02375_pretty_formats.sql.j2
@@ -0,0 +1,8 @@
+{% for format in ['Pretty', 'PrettyNoEscapes', 'PrettyMonoBlock', 'PrettyNoEscapesMonoBlock', 'PrettyCompact', 'PrettyCompactNoEscapes',
+                  'PrettyCompactMonoBlock', 'PrettyCompactNoEscapesMonoBlock', 'PrettySpace', 'PrettySpaceNoEscapes', 'PrettySpaceMonoBlock',
+                  'PrettySpaceNoEscapesMonoBlock'] -%}
+
+select '{{ format }}';
+select number as x, number + 1 as y from numbers(4) settings max_block_size=2 format {{ format }};
+
+{% endfor -%}
diff --git a/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.reference b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.reference
new file mode 100644
index 00000000000..f46cdb6e5e3
--- /dev/null
+++ b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.reference
@@ -0,0 +1,9 @@
+42	hello	2022-08-04 18:30:53	{'2b95a497-3a5d-49af-bf85-15763318cde7':[1.2,3.4]}
+UInt64	String	DateTime	Map(UUID, Array(Float32))
+42	[1,2,3]	{'abc':22,'def':33}	[[4,5,6],[7],[8,9]]	{10:[11,12],13:[14,15]}	{'ghj':{'klm':[16,17]},'nop':{'rst':[18]}}
+5
+42
+13
+13	str	2022-08-04 18:30:53	{'10':[11,12],'13':[14,15]}
+1
+1
diff --git a/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh
new file mode 100755
index 00000000000..335af1bb6e6
--- /dev/null
+++ b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+
+# shellcheck disable=SC2154
+
+unset CLICKHOUSE_LOG_COMMENT
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT \
+  --param_num="42" \
+  --param_str="hello" \
+  --param_date="2022-08-04 18:30:53" \
+  --param_map="{'2b95a497-3a5d-49af-bf85-15763318cde7': [1.2, 3.4]}" \
+  -q "select {num:UInt64}, {str:String}, {date:DateTime}, {map:Map(UUID, Array(Float32))}"
+
+
+$CLICKHOUSE_CLIENT \
+  --param_num="42" \
+  --param_str="hello" \
+  --param_date="2022-08-04 18:30:53" \
+  --param_map="{'2b95a497-3a5d-49af-bf85-15763318cde7': [1.2, 3.4]}" \
+  -q "select toTypeName({num:UInt64}), toTypeName({str:String}), toTypeName({date:DateTime}), toTypeName({map:Map(UUID, Array(Float32))})"
+
+
+table_name="t_02377_extend_protocol_with_query_parameters_$RANDOM$RANDOM"
+$CLICKHOUSE_CLIENT -n -q "
+  create table $table_name(
+    id Int64,
+    arr Array(UInt8),
+    map Map(String, UInt8),
+    mul_arr Array(Array(UInt8)),
+    map_arr Map(UInt8, Array(UInt8)),
+    map_map_arr Map(String, Map(String, Array(UInt8))))
+  engine = MergeTree
+  order by (id)"
+
+
+$CLICKHOUSE_CLIENT \
+  --param_id="42" \
+  --param_arr="[1, 2, 3]" \
+  --param_map="{'abc': 22, 'def': 33}" \
+  --param_mul_arr="[[4, 5, 6], [7], [8, 9]]" \
+  --param_map_arr="{10: [11, 12], 13: [14, 15]}" \
+  --param_map_map_arr="{'ghj': {'klm': [16, 17]}, 'nop': {'rst': [18]}}" \
+  -q "insert into $table_name values({id: Int64}, {arr: Array(UInt8)}, {map: Map(String, UInt8)}, {mul_arr: Array(Array(UInt8))}, {map_arr: Map(UInt8, Array(UInt8))}, {map_map_arr: Map(String, Map(String, Array(UInt8)))})"
+
+
+$CLICKHOUSE_CLIENT -q "select * from $table_name"
+
+
+$CLICKHOUSE_CLIENT \
+  --param_tbl="numbers" \
+  --param_db="system" \
+  --param_col="number" \
+  -q "select {col:Identifier} from {db:Identifier}.{tbl:Identifier} limit 1 offset 5"
+
+
+# it is possible to set parameter for the current session
+$CLICKHOUSE_CLIENT -n -q "set param_n = 42; select {n: UInt8}"
+# and it will not be visible to other sessions
+$CLICKHOUSE_CLIENT -n -q "select {n: UInt8} -- { serverError 456 }"
+
+
+# the same parameter could be set multiple times within one session (new value overrides the previous one)
+$CLICKHOUSE_CLIENT -n -q "set param_n = 12; set param_n = 13; select {n: UInt8}"
+
+
+# but multiple different parameters could be defined within each session
+$CLICKHOUSE_CLIENT -n -q "
+  set param_a = 13, param_b = 'str';
+  set param_c = '2022-08-04 18:30:53';
+  set param_d = '{\'10\': [11, 12], \'13\': [14, 15]}';
+  select {a: UInt32}, {b: String}, {c: DateTime}, {d: Map(String, Array(UInt8))}"
+
+# empty parameter name is not allowed
+$CLICKHOUSE_CLIENT --param_="" -q "select 1" 2>&1 | grep -c 'Code: 36'
+$CLICKHOUSE_CLIENT -q "set param_ = ''" 2>&1 | grep -c 'Code: 36'
diff --git a/tests/queries/0_stateless/02377_fix_file_virtual_column.reference b/tests/queries/0_stateless/02377_fix_file_virtual_column.reference
new file mode 100644
index 00000000000..c98e1059325
--- /dev/null
+++ b/tests/queries/0_stateless/02377_fix_file_virtual_column.reference
@@ -0,0 +1,3 @@
+1	s
+2	x
+3	y
diff --git a/tests/queries/0_stateless/02377_fix_file_virtual_column.sql b/tests/queries/0_stateless/02377_fix_file_virtual_column.sql
new file mode 100644
index 00000000000..5d79e7f12cd
--- /dev/null
+++ b/tests/queries/0_stateless/02377_fix_file_virtual_column.sql
@@ -0,0 +1,7 @@
+drop table if exists test_02377;
+create table test_02377 (n UInt32, s String) engine=File(CSVWithNames);
+insert into test_02377 values(1, 's') (2, 'x') (3, 'y');
+select * from test_02377 order by n;
+select *, _path, _file from test_02377 format Null;
+select _path, _file from test_02377 format Null;
+drop table test_02377;
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.reference b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.reference
new file mode 100644
index 00000000000..766ba099c84
--- /dev/null
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.reference
@@ -0,0 +1,184 @@
+-- { echoOn }
+-- order by for MergeTree w/o sorting key
+SELECT a, b from optimize_sorting order by a, b;
+0	0
+18446744073709551615	18446744073709551615
+-- { echoOn }
+SELECT a from optimize_sorting order by a;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT c from optimize_sorting order by c;
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+-- queries with unary function in order by
+SELECT a from optimize_sorting order by -a;
+9
+8
+7
+6
+5
+4
+3
+2
+1
+0
+SELECT a from optimize_sorting order by toFloat64(a);
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+-- queries with non-unary function in order by
+SELECT a, a+1 from optimize_sorting order by a+1;
+0	1
+1	2
+2	3
+3	4
+4	5
+5	6
+6	7
+7	8
+8	9
+9	10
+SELECT a, a-1 from optimize_sorting order by a-1;
+0	-1
+1	0
+2	1
+3	2
+4	3
+5	4
+6	5
+7	6
+8	7
+9	8
+SELECT a, sipHash64(a,'a') from optimize_sorting order by sipHash64(a,'a');
+3	1173123105019859883
+8	1721650864755082841
+0	5764203013335897168
+9	7186398762098957933
+5	7941328890117047678
+1	11604135878754760071
+2	14554472274185621678
+6	15415898319530396106
+4	15793726040922926059
+7	18182906236422157798
+-- queries with aliases
+SELECT a as a from optimize_sorting order by a;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT a+1 as a from optimize_sorting order by a;
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+SELECT toFloat64(a) as a from optimize_sorting order by a;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT sipHash64(a) as a from optimize_sorting order by a;
+9140302661501632497
+9199082625845137542
+9224715256000962398
+13180436571133193200
+13251804803629934096
+13686418376000424449
+14247234200463187066
+14454559127837024772
+14848019510572519333
+16738165381834614119
+-- queries with filter
+SELECT a FROM optimize_sorting WHERE a > 0 ORDER BY a;
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT a > 0 FROM optimize_sorting WHERE a > 0;
+1
+1
+1
+1
+1
+1
+1
+1
+1
+SELECT a FROM (SELECT a FROM optimize_sorting) WHERE a != 0 ORDER BY a;
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT a FROM (SELECT sipHash64(a) AS a FROM optimize_sorting) WHERE a != 0 ORDER BY a;
+9140302661501632497
+9199082625845137542
+9224715256000962398
+13180436571133193200
+13251804803629934096
+13686418376000424449
+14247234200463187066
+14454559127837024772
+14848019510572519333
+16738165381834614119
+-- queries with non-trivial action's chain in expression
+SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1;
+9140302661501632497	9140302661501632498
+9199082625845137542	9199082625845137543
+9224715256000962398	9224715256000962399
+13180436571133193200	13180436571133193201
+13251804803629934096	13251804803629934097
+13686418376000424449	13686418376000424450
+14247234200463187066	14247234200463187067
+14454559127837024772	14454559127837024773
+14848019510572519333	14848019510572519334
+16738165381834614119	16738165381834614120
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.sql b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.sql
new file mode 100644
index 00000000000..d3376188159
--- /dev/null
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.sql
@@ -0,0 +1,40 @@
+set optimize_sorting_by_input_stream_properties=1;
+
+DROP TABLE IF EXISTS optimize_sorting;
+CREATE TABLE optimize_sorting (a UInt64, b UInt64) ENGINE MergeTree() ORDER BY tuple();
+INSERT INTO optimize_sorting VALUES(0, 0);
+INSERT INTO optimize_sorting VALUES(0xFFFFffffFFFFffff, 0xFFFFffffFFFFffff);
+-- { echoOn }
+-- order by for MergeTree w/o sorting key
+SELECT a, b from optimize_sorting order by a, b;
+-- { echoOff }
+
+DROP TABLE IF EXISTS optimize_sorting;
+CREATE TABLE optimize_sorting (a UInt64, b UInt64, c UInt64) ENGINE MergeTree() ORDER BY (a, b);
+INSERT INTO optimize_sorting SELECT number, number%5, number%2 from numbers(0, 5);
+INSERT INTO optimize_sorting SELECT number, number%5, number%2 from numbers(5, 5);
+
+-- { echoOn }
+SELECT a from optimize_sorting order by a;
+SELECT c from optimize_sorting order by c;
+-- queries with unary function in order by
+SELECT a from optimize_sorting order by -a;
+SELECT a from optimize_sorting order by toFloat64(a);
+-- queries with non-unary function in order by
+SELECT a, a+1 from optimize_sorting order by a+1;
+SELECT a, a-1 from optimize_sorting order by a-1;
+SELECT a, sipHash64(a,'a') from optimize_sorting order by sipHash64(a,'a');
+-- queries with aliases
+SELECT a as a from optimize_sorting order by a;
+SELECT a+1 as a from optimize_sorting order by a;
+SELECT toFloat64(a) as a from optimize_sorting order by a;
+SELECT sipHash64(a) as a from optimize_sorting order by a;
+-- queries with filter
+SELECT a FROM optimize_sorting WHERE a > 0 ORDER BY a;
+SELECT a > 0 FROM optimize_sorting WHERE a > 0;
+SELECT a FROM (SELECT a FROM optimize_sorting) WHERE a != 0 ORDER BY a;
+SELECT a FROM (SELECT sipHash64(a) AS a FROM optimize_sorting) WHERE a != 0 ORDER BY a;
+-- queries with non-trivial action's chain in expression
+SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1;
+-- { echoOff }
+DROP TABLE IF EXISTS optimize_sorting;
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference
new file mode 100644
index 00000000000..c32f227006c
--- /dev/null
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference
@@ -0,0 +1,89 @@
+-- EXPLAIN PLAN sorting for MergeTree w/o sorting key
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a
+Sorting (Stream): a ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): a ASC
+Sorting (None)
+Sorting (None)
+-- disable optimization -> sorting order is NOT propagated from subquery -> full sort
+-- QUERY: set optimize_sorting_by_input_stream_properties=0;set max_threads=1;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a
+MergeSortingTransform
+LimitsCheckingTransform
+PartialSortingTransform
+-- enable optimization -> sorting order is propagated from subquery -> merge sort
+-- QUERY: set optimize_sorting_by_input_stream_properties=1;set max_threads=1;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a
+MergeSortingTransform
+-- enable optimization -> there is no sorting order to propagate from subquery -> full sort
+-- QUERY: set optimize_sorting_by_input_stream_properties=1;set max_threads=1;EXPLAIN PIPELINE SELECT c FROM (SELECT c FROM optimize_sorting) ORDER BY c
+MergeSortingTransform
+LimitsCheckingTransform
+PartialSortingTransform
+-- ExpressionStep preserves sort mode
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a
+Sorting (Stream): a ASC
+Sorting
+Sorting (Stream): a ASC
+Sorting (Port): a ASC
+Sorting (Port): a ASC
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a+1
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): plus(a, 1) ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+-- ExpressionStep breaks sort mode
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting ORDER BY a+1
+Sorting (Stream): plus(a, 1) ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): plus(a, 1) ASC
+Sorting (None)
+Sorting (Chunk): a ASC
+-- FilterStep preserves sort mode
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a+1 > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, a+1 FROM optimize_sorting WHERE a+1 > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+-- FilterStep breaks sort mode
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a > 0 FROM optimize_sorting WHERE a > 0
+Sorting (None)
+Sorting (None)
+Sorting (Chunk): a ASC
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting WHERE a+1 > 0
+Sorting (None)
+Sorting (None)
+Sorting (Chunk): a ASC
+-- aliases break sorting order
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM (SELECT sipHash64(a) AS a FROM (SELECT a FROM optimize_sorting ORDER BY a)) ORDER BY a
+Sorting (Stream): a ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): a ASC
+Sorting (None)
+Sorting
+Sorting (Stream): a ASC
+Sorting (Port): a ASC
+Sorting (Port): a ASC
+-- aliases DONT break sorting order
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, b FROM (SELECT x AS a, y AS b FROM (SELECT a AS x, b AS y FROM optimize_sorting) ORDER BY x, y)
+Sorting (Stream): x ASC, y ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): x ASC, y ASC
+Sorting (Chunk): a ASC, b ASC
+Sorting (Chunk): a ASC, b ASC
+-- actions chain breaks sorting order: input(column a)->sipHash64(column a)->alias(sipHash64(column a), a)->plus(alias a, 1)
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): plus(a, 1) ASC
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): plus(a, 1) ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh
new file mode 100755
index 00000000000..cea76b7d6ea
--- /dev/null
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+DISABLE_OPTIMIZATION="set optimize_sorting_by_input_stream_properties=0;set max_threads=1"
+ENABLE_OPTIMIZATION="set optimize_sorting_by_input_stream_properties=1;set max_threads=1"
+MAKE_OUTPUT_STABLE="set optimize_read_in_order=1"
+GREP_SORTING="grep 'PartialSortingTransform\|LimitsCheckingTransform\|MergeSortingTransform\|MergingSortedTransform'"
+GREP_SORTMODE="grep 'Sorting'"
+TRIM_LEADING_SPACES="sed -e 's/^[ \t]*//'"
+FIND_SORTING="$GREP_SORTING | $TRIM_LEADING_SPACES"
+FIND_SORTMODE="$GREP_SORTMODE | $TRIM_LEADING_SPACES"
+
+function explain_sorting {
+    echo "-- QUERY: "$1
+    $CLICKHOUSE_CLIENT -nq "$1" | eval $FIND_SORTING
+}
+function explain_sortmode {
+    echo "-- QUERY: "$1
+    $CLICKHOUSE_CLIENT -nq "$1" | eval $FIND_SORTMODE
+}
+
+$CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
+$CLICKHOUSE_CLIENT -q "create table optimize_sorting (a UInt64, b UInt64, c UInt64) engine=MergeTree() order by tuple()"
+$CLICKHOUSE_CLIENT -q "insert into optimize_sorting values (0, 0, 0) (1, 1, 1)"
+echo "-- EXPLAIN PLAN sorting for MergeTree w/o sorting key"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a"
+$CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
+
+$CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
+$CLICKHOUSE_CLIENT -q "create table optimize_sorting (a UInt64, b UInt64, c UInt64) engine=MergeTree() order by (a, b)"
+$CLICKHOUSE_CLIENT -q "insert into optimize_sorting select number, number % 5, number % 2 from numbers(0,10)"
+$CLICKHOUSE_CLIENT -q "insert into optimize_sorting select number, number % 5, number % 2 from numbers(10,10)"
+$CLICKHOUSE_CLIENT -q "insert into optimize_sorting SELECT number, number % 5, number % 2 from numbers(20,10)"
+
+echo "-- disable optimization -> sorting order is NOT propagated from subquery -> full sort"
+explain_sorting "$DISABLE_OPTIMIZATION;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a"
+
+echo "-- enable optimization -> sorting order is propagated from subquery -> merge sort"
+explain_sorting "$ENABLE_OPTIMIZATION;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a"
+echo "-- enable optimization -> there is no sorting order to propagate from subquery -> full sort"
+explain_sorting "$ENABLE_OPTIMIZATION;EXPLAIN PIPELINE SELECT c FROM (SELECT c FROM optimize_sorting) ORDER BY c"
+
+echo "-- ExpressionStep preserves sort mode"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a+1"
+
+echo "-- ExpressionStep breaks sort mode"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting ORDER BY a+1"
+
+echo "-- FilterStep preserves sort mode"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a > 0"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a+1 > 0"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, a+1 FROM optimize_sorting WHERE a+1 > 0"
+
+echo "-- FilterStep breaks sort mode"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a > 0 FROM optimize_sorting WHERE a > 0"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting WHERE a+1 > 0"
+
+echo "-- aliases break sorting order"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM (SELECT sipHash64(a) AS a FROM (SELECT a FROM optimize_sorting ORDER BY a)) ORDER BY a"
+
+# FIXME: we still do full sort here, - it's because, for most inner subqueury, sorting description contains original column names but header contains only aliases on those columns:
+#|     Header: x Int32                                                 │
+#│             y Int32                                                 │
+#│     Sort Mode: Chunk: a ASC, b ASC                                  │
+echo "-- aliases DONT break sorting order"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, b FROM (SELECT x AS a, y AS b FROM (SELECT a AS x, b AS y FROM optimize_sorting) ORDER BY x, y)"
+
+echo "-- actions chain breaks sorting order: input(column a)->sipHash64(column a)->alias(sipHash64(column a), a)->plus(alias a, 1)"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1"
+
+$CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
diff --git a/tests/queries/0_stateless/02377_quota_key.reference b/tests/queries/0_stateless/02377_quota_key.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02377_quota_key.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02377_quota_key.sh b/tests/queries/0_stateless/02377_quota_key.sh
new file mode 100755
index 00000000000..8aa6797dc2c
--- /dev/null
+++ b/tests/queries/0_stateless/02377_quota_key.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u_02377"
+${CLICKHOUSE_CLIENT} -q "drop quota if exists q_02377"
+${CLICKHOUSE_CLIENT} -q "CREATE USER u_02377 IDENTIFIED WITH plaintext_password BY 'password';"
+${CLICKHOUSE_CLIENT} -q "CREATE QUOTA q_02377 KEYED BY client_key FOR INTERVAL 1 month MAX queries = 100 TO u_02377;"
+
+${CLICKHOUSE_CLIENT} --user=u_02377 --password=password --quota_key=q_02377 --query="select 1"
+
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u_02377"
+${CLICKHOUSE_CLIENT} -q "drop quota if exists q_02377"
diff --git a/tests/queries/0_stateless/02377_quota_key_http.reference b/tests/queries/0_stateless/02377_quota_key_http.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02377_quota_key_http.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02377_quota_key_http.sh b/tests/queries/0_stateless/02377_quota_key_http.sh
new file mode 100755
index 00000000000..45e09e1fead
--- /dev/null
+++ b/tests/queries/0_stateless/02377_quota_key_http.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+curl -sS "${CLICKHOUSE_URL}" --data "DROP USER IF EXISTS u_02377"
+curl -sS "${CLICKHOUSE_URL}" --data "drop quota if exists q_02377"
+curl -sS "${CLICKHOUSE_URL}" --data "CREATE USER u_02377 IDENTIFIED WITH plaintext_password BY 'password'"
+curl -sS "${CLICKHOUSE_URL}" --data "CREATE QUOTA q_02377 KEYED BY client_key FOR INTERVAL 1 month MAX queries = 100 TO u_02377"
+
+curl -sS -G "${CLICKHOUSE_URL}&user=u_02377&password=password&quota_key=q_02377&query=SELECT%201"
+
+curl -sS "${CLICKHOUSE_URL}" --data "DROP USER IF EXISTS u_02377"
+curl -sS "${CLICKHOUSE_URL}" --data "drop quota if exists q_02377"
diff --git a/tests/queries/0_stateless/02380_insert_mv_race.sh b/tests/queries/0_stateless/02380_insert_mv_race.sh
index d66e7b62d89..725c7eacce6 100755
--- a/tests/queries/0_stateless/02380_insert_mv_race.sh
+++ b/tests/queries/0_stateless/02380_insert_mv_race.sh
@@ -9,6 +9,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
+$CLICKHOUSE_CLIENT -nm -q "ATTACH TABLE mv" |& {
+    # CANNOT_GET_CREATE_TABLE_QUERY -- ATTACH TABLE IF EXISTS
+    # TABLE_ALREADY_EXISTS          -- ATTACH TABLE IF NOT EXISTS
+    grep -F -m1 Exception | grep -v -e CANNOT_GET_CREATE_TABLE_QUERY -e TABLE_ALREADY_EXISTS
+}
+
 $CLICKHOUSE_CLIENT -nm -q "
     DROP TABLE IF EXISTS null;
     CREATE TABLE null (key Int) ENGINE = Null;
@@ -23,4 +29,8 @@ $CLICKHOUSE_CLIENT -q "INSERT INTO null SELECT * FROM numbers_mt(1000) settings
 } &
 sleep 0.05
 $CLICKHOUSE_CLIENT -q "DETACH TABLE mv"
+
+# avoid leftovers on DROP DATABASE (force_remove_data_recursively_on_drop) for Ordinary database
+$CLICKHOUSE_CLIENT -q "ATTACH TABLE mv"
+
 wait
diff --git a/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.reference b/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.reference
new file mode 100644
index 00000000000..a6c4a5b13a2
--- /dev/null
+++ b/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.reference
@@ -0,0 +1,9 @@
+lc_nullable_string
+LowCardinality(Nullable(String))
+one
+\N
+three
+
+\N
+
+six
diff --git a/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.sh b/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.sh
new file mode 100755
index 00000000000..2d854c956b2
--- /dev/null
+++ b/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# ## reading ArrowStream file from python
+# import pyarrow as pa
+# stream = pa.ipc.open_stream("test.arrows")
+# x = stream.read_all()
+# print(x)
+
+## writing ArrowStream file from python
+# import pyarrow as pa
+# data = [
+#     pa.array(["one", None, "three", "", None, "", "six"]).dictionary_encode(),
+# ]
+# batch = pa.record_batch(data, names=['id', 'lc_nullable', 'lc_int_nullable', 'bool_nullable'])
+# writer = pa.ipc.new_stream("test4.arrows", batch.schema)
+# writer.write_batch(batch)
+# writer.close()
+
+# cat data.arrow | gzip | base64
+
+cat <<EOF | base64 --decode | gunzip | $CLICKHOUSE_LOCAL --query='SELECT * FROM table FORMAT TSVWithNamesAndTypes' --input-format=ArrowStream
+H4sIAAAAAAAAA3VQQQ6CQAychRWIcjCGGA4ePHrwCT7Bgz8waoiSICaoiU/wGR49+Me1XboIJDYp
+3d2ZTjsYY8wLwBgcQ8QIMEBEJwqloal8iMNVUSaWmxIjQEjsMb3UvWrA2IZySalRx4SyOGzLe1Hs
+9kW2vd6qvDyC+iPL4m8MvseUob2z2NyiutGhFcxb5sP2JLJpbPvhaYstBK8d1PrOW0pMLcha3p0+
+h4//4eamUkctTPV02nqRpONfyux2qrLsmj8aX8+Or2nXl6/tzEWj2vWxEh9ha67X2w2yA8esh7k+
+13PueVAtzMPvH/HebPkLlbsntUACAAA=
+EOF
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02381_arrow_dict_to_lc.reference b/tests/queries/0_stateless/02381_arrow_dict_to_lc.reference
new file mode 100644
index 00000000000..7d35a0d4b77
--- /dev/null
+++ b/tests/queries/0_stateless/02381_arrow_dict_to_lc.reference
@@ -0,0 +1,7 @@
+id	lc_nullable	lc_int_nullable	bool_nullable
+Nullable(Int64)	LowCardinality(Nullable(String))	LowCardinality(Nullable(Int64))	Nullable(UInt8)
+1	onee	1	1
+2	twoo	2	0
+3	three	3	1
+4	four	4	1
+5	five	5	1
diff --git a/tests/queries/0_stateless/02381_arrow_dict_to_lc.sh b/tests/queries/0_stateless/02381_arrow_dict_to_lc.sh
new file mode 100755
index 00000000000..9fb0272eeb0
--- /dev/null
+++ b/tests/queries/0_stateless/02381_arrow_dict_to_lc.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# ## reading ArrowStream file from python
+# import pyarrow as pa
+# stream = pa.ipc.open_stream("test.arrows")
+# x = stream.read_all()
+# print(x)
+
+## writing ArrowStream file from python
+# import pyarrow as pa
+#data = [
+#    pa.array([1, 2, 3, 4, 5]),
+#    pa.array(["onee", "twoo", "three", "four", "five"]).dictionary_encode(),
+#    pa.array([1, 2, 3, 4, 5]).dictionary_encode(),
+#    pa.array([True, False, True, True, True])
+#]
+# batch = pa.record_batch(data, names=['id', 'lc_nullable', 'lc_int_nullable', 'bool_nullable'])
+# writer = pa.ipc.new_stream("test4.arrows", batch.schema)
+# writer.write_batch(batch)
+# writer.close()
+
+# cat data.arrow | gzip | base64
+
+cat <<EOF | base64 --decode | gunzip | $CLICKHOUSE_LOCAL --query='SELECT * FROM table FORMAT TSVWithNamesAndTypes' --input-format=ArrowStream
+H4sIAAAAAAAAA5VTsU7DQAz1pZc2giBaFFAGkBgYMjIyMOQD+gHdCqWpiBQlqErhZzowMvIB/Ft4
+d+drrqGFYsny+fzO9rN1TdM0L4JoSEqOKKQ++RTgBBGSJEwEjLL6DOwn7B37IWIA9tX7a75TcgKd
+VVUxLVdF8TgrMvgpsGuD9yL4Y2jivDmFFk/TvKzbVwFFUAk1PQpqZaJzkVB153xONS4Gvk8DsBni
+veEmfFVTxW+cmsemplMv0NGAMV9ODUlmHkPdk8mvPM7vKXvp5Pag+ZyADaEDndP2iLTNh5onY0Oc
+zORDnZU8qWO3HDcbaeegdhUDKTky5nvfmU+P9kvcsedOTHTyWJG6D7PbEb+pyiyr36qqfl5m2aJa
+LRf5a8b83g/gl2z4nW32HJO7522e9zt4er/wTJzzLl62js1hZ2Z3aPGKTyxcPhfbfHpS9/2wp+/1
+jr6DA/pO9tzbPtJOPO3EJ5249d1/JOnnXP7rHzpHi/UYI/+4v2LbmH9I36C0faSwBAAA
+EOF
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02381_client_prints_server_side_time.reference b/tests/queries/0_stateless/02381_client_prints_server_side_time.reference
new file mode 100644
index 00000000000..7326d960397
--- /dev/null
+++ b/tests/queries/0_stateless/02381_client_prints_server_side_time.reference
@@ -0,0 +1 @@
+Ok
diff --git a/tests/queries/0_stateless/02381_client_prints_server_side_time.sh b/tests/queries/0_stateless/02381_client_prints_server_side_time.sh
new file mode 100755
index 00000000000..e6cd63da95d
--- /dev/null
+++ b/tests/queries/0_stateless/02381_client_prints_server_side_time.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-s3-storage
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# We will check that --time option of clickhouse-client will display server-side time, not client-side time.
+# For this purpose, we ask it to output some amount of data that is larger than the buffers in clickhouse-client
+# but smaller than the pipe buffer, and we slow down output of the query result with 'pv' command to get around one second of run time.
+# If everything is works as expected, at least sometimes this command should display time less than 100ms.
+while true
+do
+    $CLICKHOUSE_CLIENT --time --query 'SELECT 1 FROM numbers(1000000) FORMAT RowBinary' 2>"${CLICKHOUSE_TMP}/time" | pv --quiet --rate-limit 1M > /dev/null
+    grep -q -F '0.0' "${CLICKHOUSE_TMP}/time" && break
+done
+
+echo 'Ok'
diff --git a/tests/queries/0_stateless/02381_intersect_except_const_column.reference b/tests/queries/0_stateless/02381_intersect_except_const_column.reference
new file mode 100644
index 00000000000..290835b412e
--- /dev/null
+++ b/tests/queries/0_stateless/02381_intersect_except_const_column.reference
@@ -0,0 +1,61 @@
+fooooo
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
diff --git a/tests/queries/0_stateless/02381_intersect_except_const_column.sql b/tests/queries/0_stateless/02381_intersect_except_const_column.sql
new file mode 100644
index 00000000000..b10f913dd1e
--- /dev/null
+++ b/tests/queries/0_stateless/02381_intersect_except_const_column.sql
@@ -0,0 +1,13 @@
+-- Test: crash the server
+SELECT 'fooooo' INTERSECT SELECT 'fooooo';
+SELECT 'fooooo' EXCEPT SELECT 'fooooo';
+
+-- Test: intersect return incorrect result for const column
+SELECT 1 FROM numbers(10) INTERSECT SELECT 1 FROM numbers(10);
+SELECT toString(1) FROM numbers(10) INTERSECT SELECT toString(1) FROM numbers(10);
+SELECT '1' FROM numbers(10) INTERSECT SELECT '1' FROM numbers(10);
+
+-- Test: except return incorrect result for const column
+SELECT 2 FROM numbers(10) EXCEPT SELECT 1 FROM numbers(5);
+SELECT toString(2) FROM numbers(10) EXCEPT SELECT toString(1) FROM numbers(5);
+SELECT '2' FROM numbers(10) EXCEPT SELECT '1' FROM numbers(5);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference
new file mode 100644
index 00000000000..d2f1b4efdd5
--- /dev/null
+++ b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference
@@ -0,0 +1,58 @@
+Expression
+Header: key String
+        value String
+  Join
+  Header: key String
+          value String
+    Expression
+    Header: key String
+      ReadFromStorage
+      Header: dummy UInt8
+    Expression
+    Header: s2.key String
+            value String
+      Union
+      Header: key String
+              value String
+        Expression
+        Header: key String
+                value String
+          ReadFromStorage
+          Header: dummy UInt8
+        Expression
+        Header: key String
+                value String
+          ReadFromStorage
+          Header: dummy UInt8
+Expression
+Header: key String
+        value String
+  Join
+  Header: key String
+          s2.key String
+          value String
+    Sorting
+    Header: key String
+      Expression
+      Header: key String
+        ReadFromStorage
+        Header: dummy UInt8
+    Sorting
+    Header: s2.key String
+            value String
+      Expression
+      Header: s2.key String
+              value String
+        Union
+        Header: key String
+                value String
+          Expression
+          Header: key String
+                  value String
+            ReadFromStorage
+            Header: dummy UInt8
+          Expression
+          Header: key String
+                  value String
+            ReadFromStorage
+            Header: dummy UInt8
diff --git a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql
new file mode 100644
index 00000000000..a418a06803f
--- /dev/null
+++ b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql
@@ -0,0 +1,13 @@
+SET join_algorithm = 'hash';
+
+EXPLAIN actions=0, description=0, header=1
+SELECT * FROM ( SELECT 'key2' AS key ) AS s1
+JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
+USING (key);
+
+SET join_algorithm = 'full_sorting_merge';
+
+EXPLAIN actions=0, description=0, header=1
+SELECT * FROM ( SELECT 'key2' AS key ) AS s1
+JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
+USING (key);
diff --git a/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference
new file mode 100644
index 00000000000..c9a13c97baf
--- /dev/null
+++ b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference
@@ -0,0 +1,12 @@
+parseDateTime64BestEffortUS
+ s                                           a
+
+ 01-02-1930 12:00:00   1930-01-02 12:00:00.000 
+ 12.02.1930 12:00:00   1930-12-02 12:00:00.000 
+ 13/02/1930 12:00:00   1930-02-13 12:00:00.000 
+ 02/25/1930 12:00:00   1930-02-25 12:00:00.000 
+
+parseDateTime64BestEffortUSOrNull
+\N
+parseDateTime64BestEffortUSOrZero
+1970-01-01 00:00:00.000
diff --git a/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.sql b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.sql
new file mode 100644
index 00000000000..21dc7b1a990
--- /dev/null
+++ b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.sql
@@ -0,0 +1,22 @@
+SELECT 'parseDateTime64BestEffortUS';
+
+SELECT
+    s,
+    parseDateTime64BestEffortUS(s,3,'UTC') AS a
+FROM
+(
+    SELECT arrayJoin([
+'01-02-1930 12:00:00',
+'12.02.1930 12:00:00',
+'13/02/1930 12:00:00',
+'02/25/1930 12:00:00'
+]) AS s)
+FORMAT PrettySpaceNoEscapes;
+
+SELECT '';
+
+SELECT 'parseDateTime64BestEffortUSOrNull';
+SELECT parseDateTime64BestEffortUSOrNull('01/45/1925 16:00:00',3,'UTC');
+
+SELECT 'parseDateTime64BestEffortUSOrZero';
+SELECT parseDateTime64BestEffortUSOrZero('01/45/1925 16:00:00',3,'UTC');
diff --git a/tests/queries/0_stateless/02381_parse_array_of_tuples.reference b/tests/queries/0_stateless/02381_parse_array_of_tuples.reference
new file mode 100644
index 00000000000..fa7137d800d
--- /dev/null
+++ b/tests/queries/0_stateless/02381_parse_array_of_tuples.reference
@@ -0,0 +1,3 @@
+1	[[]]
+2	[[(500,246)]]
+3	[[(500,10)]]
diff --git a/tests/queries/0_stateless/02381_parse_array_of_tuples.sql b/tests/queries/0_stateless/02381_parse_array_of_tuples.sql
new file mode 100644
index 00000000000..51db5a0fe9b
--- /dev/null
+++ b/tests/queries/0_stateless/02381_parse_array_of_tuples.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS t_parse_tuples;
+
+CREATE TABLE t_parse_tuples
+(
+    id UInt32,
+    arr Array(Array(Tuple(c1 Int32, c2 UInt8)))
+)
+ENGINE = Memory;
+
+INSERT INTO t_parse_tuples VALUES (1, [[]]), (2, [[(500, -10)]]), (3, [[(500, '10')]]);
+
+SELECT * FROM t_parse_tuples ORDER BY id;
+
+DROP TABLE IF EXISTS t_parse_tuples;
diff --git a/tests/queries/0_stateless/02381_setting_value_auto.reference b/tests/queries/0_stateless/02381_setting_value_auto.reference
new file mode 100644
index 00000000000..acc5025da5e
--- /dev/null
+++ b/tests/queries/0_stateless/02381_setting_value_auto.reference
@@ -0,0 +1,4 @@
+0	0	UInt64Auto
+auto	1	UInt64Auto
+0	1	UInt64Auto
+1	1	UInt64Auto
diff --git a/tests/queries/0_stateless/02381_setting_value_auto.sql b/tests/queries/0_stateless/02381_setting_value_auto.sql
new file mode 100644
index 00000000000..5b536a9d749
--- /dev/null
+++ b/tests/queries/0_stateless/02381_setting_value_auto.sql
@@ -0,0 +1,10 @@
+SELECT value, changed, type FROM system.settings WHERE name = 'insert_quorum';
+
+SET insert_quorum = 'auto';
+SELECT value, changed, type FROM system.settings WHERE name = 'insert_quorum';
+
+SET insert_quorum = 0;
+SELECT value, changed, type FROM system.settings WHERE name = 'insert_quorum';
+
+SET insert_quorum = 1;
+SELECT value, changed, type FROM system.settings WHERE name = 'insert_quorum';
diff --git a/tests/queries/0_stateless/02382_query_parameters_post.reference b/tests/queries/0_stateless/02382_query_parameters_post.reference
new file mode 100644
index 00000000000..7f8f011eb73
--- /dev/null
+++ b/tests/queries/0_stateless/02382_query_parameters_post.reference
@@ -0,0 +1 @@
+7
diff --git a/tests/queries/0_stateless/02382_query_parameters_post.sh b/tests/queries/0_stateless/02382_query_parameters_post.sh
new file mode 100755
index 00000000000..25db5043292
--- /dev/null
+++ b/tests/queries/0_stateless/02382_query_parameters_post.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_CURL} -X POST -F 'query=select {p1:UInt8} + {p2:UInt8}' -F 'param_p1=3' -F 'param_p2=4' "${CLICKHOUSE_URL}"
diff --git a/tests/queries/0_stateless/02383_array_signed_const_positive_index.reference b/tests/queries/0_stateless/02383_array_signed_const_positive_index.reference
new file mode 100644
index 00000000000..0d236990b8b
--- /dev/null
+++ b/tests/queries/0_stateless/02383_array_signed_const_positive_index.reference
@@ -0,0 +1,58 @@
+-- { echo }
+
+SELECT materialize([[13]])[1::Int8];
+[13]
+SELECT materialize([['Hello']])[1::Int8];
+['Hello']
+SELECT materialize([13])[1::Int8];
+13
+SELECT materialize(['Hello'])[1::Int8];
+Hello
+SELECT materialize([[13], [14]])[2::Int8];
+[14]
+SELECT materialize([['Hello'], ['world']])[2::Int8];
+['world']
+SELECT materialize([13, 14])[2::Int8];
+14
+SELECT materialize(['Hello', 'world'])[2::Int8];
+world
+SELECT materialize([[13], [14]])[3::Int8];
+[]
+SELECT materialize([['Hello'], ['world']])[3::Int8];
+[]
+SELECT materialize([13, 14])[3::Int8];
+0
+SELECT materialize(['Hello', 'world'])[3::Int8];
+
+SELECT materialize([[13], [14]])[0::Int8];
+[]
+SELECT materialize([['Hello'], ['world']])[0::Int8];
+[]
+SELECT materialize([13, 14])[0::Int8];
+0
+SELECT materialize(['Hello', 'world'])[0::Int8];
+
+SELECT materialize([[13], [14]])[-1];
+[14]
+SELECT materialize([['Hello'], ['world']])[-1];
+['world']
+SELECT materialize([13, 14])[-1];
+14
+SELECT materialize(['Hello', 'world'])[-1];
+world
+SELECT materialize([[13], [14]])[-9223372036854775808];
+[]
+SELECT materialize([['Hello'], ['world']])[-9223372036854775808];
+[]
+SELECT materialize([13, 14])[-9223372036854775808];
+0
+SELECT materialize(['Hello', 'world'])[-9223372036854775808];
+
+SELECT materialize([[toNullable(13)], [14]])[-9223372036854775808];
+[]
+SELECT materialize([['Hello'], [toNullable('world')]])[-9223372036854775808];
+[]
+SELECT materialize([13, toNullable(14)])[-9223372036854775808];
+\N
+SELECT materialize(['Hello', toLowCardinality('world')])[-9223372036854775808];
+
diff --git a/tests/queries/0_stateless/02383_array_signed_const_positive_index.sql b/tests/queries/0_stateless/02383_array_signed_const_positive_index.sql
new file mode 100644
index 00000000000..4f92215f4c0
--- /dev/null
+++ b/tests/queries/0_stateless/02383_array_signed_const_positive_index.sql
@@ -0,0 +1,36 @@
+-- { echo }
+
+SELECT materialize([[13]])[1::Int8];
+SELECT materialize([['Hello']])[1::Int8];
+SELECT materialize([13])[1::Int8];
+SELECT materialize(['Hello'])[1::Int8];
+
+SELECT materialize([[13], [14]])[2::Int8];
+SELECT materialize([['Hello'], ['world']])[2::Int8];
+SELECT materialize([13, 14])[2::Int8];
+SELECT materialize(['Hello', 'world'])[2::Int8];
+
+SELECT materialize([[13], [14]])[3::Int8];
+SELECT materialize([['Hello'], ['world']])[3::Int8];
+SELECT materialize([13, 14])[3::Int8];
+SELECT materialize(['Hello', 'world'])[3::Int8];
+
+SELECT materialize([[13], [14]])[0::Int8];
+SELECT materialize([['Hello'], ['world']])[0::Int8];
+SELECT materialize([13, 14])[0::Int8];
+SELECT materialize(['Hello', 'world'])[0::Int8];
+
+SELECT materialize([[13], [14]])[-1];
+SELECT materialize([['Hello'], ['world']])[-1];
+SELECT materialize([13, 14])[-1];
+SELECT materialize(['Hello', 'world'])[-1];
+
+SELECT materialize([[13], [14]])[-9223372036854775808];
+SELECT materialize([['Hello'], ['world']])[-9223372036854775808];
+SELECT materialize([13, 14])[-9223372036854775808];
+SELECT materialize(['Hello', 'world'])[-9223372036854775808];
+
+SELECT materialize([[toNullable(13)], [14]])[-9223372036854775808];
+SELECT materialize([['Hello'], [toNullable('world')]])[-9223372036854775808];
+SELECT materialize([13, toNullable(14)])[-9223372036854775808];
+SELECT materialize(['Hello', toLowCardinality('world')])[-9223372036854775808];
diff --git a/tests/queries/0_stateless/02384_decrypt_bad_arguments.reference b/tests/queries/0_stateless/02384_decrypt_bad_arguments.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02384_decrypt_bad_arguments.sql b/tests/queries/0_stateless/02384_decrypt_bad_arguments.sql
new file mode 100644
index 00000000000..d29768558c4
--- /dev/null
+++ b/tests/queries/0_stateless/02384_decrypt_bad_arguments.sql
@@ -0,0 +1,2 @@
+-- Tags: no-fasttest
+SELECT decrypt('aes-128-gcm', [1024, 65535, NULL, NULL, 9223372036854775807, 1048576, NULL], 'text', 'key', 'IV'); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/02385_profile_events_overflow.reference b/tests/queries/0_stateless/02385_profile_events_overflow.reference
new file mode 100644
index 00000000000..e8183f05f5d
--- /dev/null
+++ b/tests/queries/0_stateless/02385_profile_events_overflow.reference
@@ -0,0 +1,3 @@
+1
+1
+1
diff --git a/tests/queries/0_stateless/02385_profile_events_overflow.sql b/tests/queries/0_stateless/02385_profile_events_overflow.sql
new file mode 100644
index 00000000000..518efab6d48
--- /dev/null
+++ b/tests/queries/0_stateless/02385_profile_events_overflow.sql
@@ -0,0 +1,20 @@
+-- Tags: no-parallel
+SET system_events_show_zero_values = 1;
+
+CREATE TEMPORARY TABLE t (x UInt64);
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowBreak';
+SELECT count() FROM system.numbers FORMAT Null SETTINGS max_rows_to_read = 1, read_overflow_mode = 'break';
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowBreak';
+SELECT max(x) - min(x) FROM t;
+
+TRUNCATE TABLE t;
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowThrow';
+SELECT count() FROM system.numbers SETTINGS max_rows_to_read = 1, read_overflow_mode = 'throw'; -- { serverError 158 }
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowThrow';
+SELECT max(x) - min(x) FROM t;
+
+TRUNCATE TABLE t;
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowAny';
+SELECT number, count() FROM numbers(100000) GROUP BY number FORMAT Null SETTINGS max_rows_to_group_by = 1, group_by_overflow_mode = 'any';
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowAny';
+SELECT max(x) - min(x) FROM t;
diff --git a/tests/queries/0_stateless/02386_set_columns_order.reference b/tests/queries/0_stateless/02386_set_columns_order.reference
new file mode 100644
index 00000000000..6312b4b05a9
--- /dev/null
+++ b/tests/queries/0_stateless/02386_set_columns_order.reference
@@ -0,0 +1,2 @@
+3	Mary
+1
diff --git a/tests/queries/0_stateless/02386_set_columns_order.sql b/tests/queries/0_stateless/02386_set_columns_order.sql
new file mode 100644
index 00000000000..dab5ad30579
--- /dev/null
+++ b/tests/queries/0_stateless/02386_set_columns_order.sql
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS userid_set;
+DROP TABLE IF EXISTS userid_test;
+DROP TABLE IF EXISTS userid_set2;
+
+CREATE TABLE userid_set(userid UInt64, name String) ENGINE = Set;
+INSERT INTO userid_set VALUES (1, 'Mary'),(2, 'Jane'),(3, 'Mary'),(4, 'Jack');
+
+CREATE TABLE userid_test (userid UInt64, name String) ENGINE = MergeTree() PARTITION BY (intDiv(userid, 500)) ORDER BY (userid) SETTINGS index_granularity = 8192;
+INSERT INTO userid_test VALUES (1, 'Jack'),(2, 'Mary'),(3, 'Mary'),(4, 'John'),(5, 'Mary');
+
+SELECT * FROM userid_test WHERE (userid, name) IN (userid_set);
+
+CREATE TABLE userid_set2(userid UInt64, name String, birthdate Date) ENGINE = Set;
+INSERT INTO userid_set2 values (1,'John', '1990-01-01');
+
+WITH  'John' AS name,  toDate('1990-01-01') AS birthdate
+SELECT * FROM numbers(10)
+WHERE (number, name, birthdate) IN (userid_set2);
+
+DROP TABLE userid_set;
+DROP TABLE userid_test;
+DROP TABLE userid_set2;
diff --git a/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.reference b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.reference
new file mode 100644
index 00000000000..50c91c3fa0c
--- /dev/null
+++ b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.reference
@@ -0,0 +1,18 @@
+status before reload
+status after reload
+NOT_LOADED 0
+LOADED 0
+FAILED 1
+LOADING 0
+FAILED_AND_RELOADING 0
+LOADED_AND_RELOADING 0
+NOT_EXIST 0
+status after reload, table exists
+NOT_LOADED 0
+LOADED 1
+FAILED 0
+LOADING 0
+FAILED_AND_RELOADING 0
+LOADED_AND_RELOADING 0
+NOT_EXIST 0
+status after drop
diff --git a/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.sh b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.sh
new file mode 100755
index 00000000000..65025858e20
--- /dev/null
+++ b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Tags: no-ordinary-database
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+function get_dictionary_status()
+{
+    local name=$1 && shift
+    $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL_PROMETHEUS" | {
+        awk -F'[{}=," ]' -vname="$name" '/ClickHouseStatusInfo_DictionaryStatus{/ && $(NF-3) == name { print $4, $NF }'
+    }
+}
+
+$CLICKHOUSE_CLIENT -q "CREATE DICTIONARY dict (key Int, value String) PRIMARY KEY key SOURCE(CLICKHOUSE(TABLE data)) LAYOUT(HASHED()) LIFETIME(0)"
+uuid="$($CLICKHOUSE_CLIENT -q "SELECT uuid FROM system.dictionaries WHERE database = '$CLICKHOUSE_DATABASE' AND name = 'dict'")"
+
+echo 'status before reload'
+get_dictionary_status "$uuid"
+
+# source table does not exists
+# NOTE: when dictionary does not exist it produce BAD_ARGUMENTS error, so using UNKNOWN_TABLE is safe
+$CLICKHOUSE_CLIENT -n -q "SYSTEM RELOAD DICTIONARY dict -- { serverError UNKNOWN_TABLE }"
+echo 'status after reload'
+get_dictionary_status "$uuid"
+
+# create source
+$CLICKHOUSE_CLIENT -q "CREATE TABLE data (key Int, value String) Engine=Null"
+$CLICKHOUSE_CLIENT -q "SYSTEM RELOAD DICTIONARY dict"
+echo 'status after reload, table exists'
+get_dictionary_status "$uuid"
+
+# remove dictionary
+$CLICKHOUSE_CLIENT -q "DROP DICTIONARY dict"
+$CLICKHOUSE_CLIENT -q "DROP TABLE data"
+echo 'status after drop'
+get_dictionary_status "$uuid"
diff --git a/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.reference b/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.reference
new file mode 100644
index 00000000000..c00653f2bb3
--- /dev/null
+++ b/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.reference
@@ -0,0 +1,5 @@
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+1	2	3	4
+5	6	7	8
+CREATE TABLE default.t_l5ydey\n(\n    `c_qv5rv` Int32,\n    `c_rutjs4` Int32,\n    `c_wmj` Int32,\n    `c_m3` String\n)\nENGINE = Distributed(\'test_shard_localhost\', \'default\', \'local_t_l5ydey\', rand())
diff --git a/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.sql b/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.sql
new file mode 100644
index 00000000000..54e4ccf6762
--- /dev/null
+++ b/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.sql
@@ -0,0 +1,27 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: ON CLUSTER is not allowed
+drop table if exists local_t_l5ydey;
+
+create table local_t_l5ydey on cluster test_shard_localhost (
+    c_qv5rv INTEGER ,
+    c_rutjs4 INTEGER ,
+    c_wmj INTEGER ,
+    c_m3 TEXT NOT NULL,
+    primary key(c_qv5rv)
+) engine=ReplicatedMergeTree('/clickhouse/tables/test_' || currentDatabase() || '/{shard}/local_t_l5ydey', '{replica}');
+
+create table t_l5ydey on cluster test_shard_localhost as local_t_l5ydey
+    engine=Distributed('test_shard_localhost', currentDatabase(),'local_t_l5ydey', rand());
+
+insert into local_t_l5ydey values (1, 2, 3, '4');
+insert into t_l5ydey values (5, 6, 7, '8');
+system flush distributed t_l5ydey;
+
+select * from t_l5ydey order by c_qv5rv;
+show create t_l5ydey;
+
+-- Correct error code if creating database with the same path as table has
+set allow_experimental_database_replicated=1;
+create database local_t_l5ydey engine=Replicated('/clickhouse/tables/test_' || currentDatabase() || '/{shard}/local_t_l5ydey', '1', '1'); -- { serverError BAD_ARGUMENTS }
+
+drop table local_t_l5ydey;
diff --git a/tests/queries/0_stateless/02400_memory_accounting_on_error.reference b/tests/queries/0_stateless/02400_memory_accounting_on_error.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02400_memory_accounting_on_error.sql b/tests/queries/0_stateless/02400_memory_accounting_on_error.sql
new file mode 100644
index 00000000000..32046e854dd
--- /dev/null
+++ b/tests/queries/0_stateless/02400_memory_accounting_on_error.sql
@@ -0,0 +1,4 @@
+-- max_block_size to avoid randomization
+-- SELECT * FROM generateRandom('i Array(Int8)', 1, 1, 1048577) LIMIT 65536 SETTINGS max_memory_usage='1Gi', max_block_size=65505, log_queries=1; -- { serverError MEMORY_LIMIT_EXCEEDED }
+-- SYSTEM FLUSH LOGS;
+-- SELECT * FROM system.query_log WHERE event_date >= yesterday() AND current_database = currentDatabase() AND memory_usage > 100e6;
diff --git a/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.reference b/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.reference
new file mode 100644
index 00000000000..57831ddd82e
--- /dev/null
+++ b/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.reference
@@ -0,0 +1 @@
+10	45
diff --git a/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.sql b/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.sql
new file mode 100644
index 00000000000..54579bca30b
--- /dev/null
+++ b/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS test_inserts;
+
+CREATE TABLE test_inserts (`key` Int, `part` Int) ENGINE = MergeTree PARTITION BY part ORDER BY key
+SETTINGS temporary_directories_lifetime = 0, merge_tree_clear_old_temporary_directories_interval_seconds = 0;
+
+INSERT INTO test_inserts SELECT sleep(1), number FROM numbers(10)
+SETTINGS max_insert_delayed_streams_for_parallel_write = 100, max_insert_block_size = 1, min_insert_block_size_rows = 1;
+
+SELECT count(), sum(part) FROM test_inserts;
+
+DROP TABLE test_inserts;
diff --git a/tests/queries/0_stateless/02402_capnp_format_segments_overflow.reference b/tests/queries/0_stateless/02402_capnp_format_segments_overflow.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02402_capnp_format_segments_overflow.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02402_capnp_format_segments_overflow.sh b/tests/queries/0_stateless/02402_capnp_format_segments_overflow.sh
new file mode 100755
index 00000000000..244b94d9189
--- /dev/null
+++ b/tests/queries/0_stateless/02402_capnp_format_segments_overflow.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+mkdir -p $USER_FILES_PATH/test_02402
+cp $CURDIR/data_capnp/overflow.capnp $USER_FILES_PATH/test_02402/
+
+SCHEMADIR=$(clickhouse-client --query "select * from file('test_02402/overflow.capnp', 'CapnProto', 'val1 char') settings format_schema='nonexist:Message'" 2>&1 | grep Exception | grep -oP "file \K.*(?=/nonexist.capnp)")
+
+CLIENT_SCHEMADIR=$CURDIR/format_schemas
+SERVER_SCHEMADIR=test_02402
+
+mkdir -p $SCHEMADIR/$SERVER_SCHEMADIR
+cp -r $CLIENT_SCHEMADIR/02402_* $SCHEMADIR/$SERVER_SCHEMADIR/
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('test_02402/overflow.capnp', 'CapnProto') SETTINGS format_schema='$SERVER_SCHEMADIR/02402_overflow:CapnProto'" 2>&1 | grep -F -q "INCORRECT_DATA" && echo 'OK' || echo 'FAIL';
+
+rm -rf $USER_FILES_PATH/test_02402
+rm -rf ${SCHEMADIR:?}/${SERVER_SCHEMADIR:?}
diff --git a/tests/queries/0_stateless/data_capnp/overflow.capnp b/tests/queries/0_stateless/data_capnp/overflow.capnp
new file mode 100644
index 00000000000..8bf1eb8848c
Binary files /dev/null and b/tests/queries/0_stateless/data_capnp/overflow.capnp differ
diff --git a/tests/queries/0_stateless/format_schemas/02402_overflow.capnp b/tests/queries/0_stateless/format_schemas/02402_overflow.capnp
new file mode 100644
index 00000000000..e9029aca475
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02402_overflow.capnp
@@ -0,0 +1,30 @@
+@0x803231eaa402b968;
+
+struct NestedNestedOne
+{
+    nestednestednumber @0 : UInt64;
+}
+struct NestedNestedTwo
+{
+    nestednestedtext @0 : Text;
+}
+struct NestedOne
+{
+    nestednestedone @0 : NestedNestedOne;
+    nestednestedtwo @1 : NestedNestedTwo;
+    nestednumber @2: UInt64;
+}
+struct NestedTwo
+{
+    nestednestedone @0 : NestedNestedOne;
+    nestednestedtwo @1 : NestedNestedTwo;
+    nestedtext @2 : Text;
+}
+struct CapnProto
+{
+    number @0 : UInt64;
+    string @1 : Text;
+    nestedone @2 : NestedOne;
+    nestedtwo @3 : NestedTwo;
+    nestedthree @4 : NestedNestedTwo;
+}
diff --git a/tests/queries/0_stateless/replication.lib b/tests/queries/0_stateless/replication.lib
index fd32fa28ba0..8da21a3fdbe 100755
--- a/tests/queries/0_stateless/replication.lib
+++ b/tests/queries/0_stateless/replication.lib
@@ -25,13 +25,18 @@ function try_sync_replicas()
         done
     done
 
+    i=0
     for t in "${tables_arr[@]}"
     do
         # The size of log may be big, so increase timeout.
-        $CLICKHOUSE_CLIENT --receive_timeout 400 -q "SYSTEM SYNC REPLICA $t" || $CLICKHOUSE_CLIENT -q \
-            "select 'sync failed, queue:', * from system.replication_queue where database=currentDatabase() and table='$t' order by database, table, node_name" &
+        $CLICKHOUSE_CLIENT --receive_timeout 300 -q "SYSTEM SYNC REPLICA $t" || ($CLICKHOUSE_CLIENT -q \
+            "select 'sync failed, queue:', * from system.replication_queue where database=currentDatabase() and table='$t' order by database, table, node_name" && exit 1) &
+        pids[${i}]=$!
+        i=$((i + 1))
+    done
+    for pid in ${pids[*]}; do
+        wait $pid || (echo "Failed to sync some replicas" && exit 1)
     done
-    wait
     echo "Replication did not hang: synced all replicas of $table_name_prefix"
 }
 
@@ -73,7 +78,7 @@ function check_replication_consistency()
     # SYNC REPLICA is not enough if some MUTATE_PARTs are not assigned yet
     wait_for_all_mutations "$table_name_prefix%"
 
-    try_sync_replicas "$table_name_prefix"
+    try_sync_replicas "$table_name_prefix" || exit 1
 
     res=$($CLICKHOUSE_CLIENT -q \
     "SELECT
diff --git a/tests/queries/1_stateful/00175_counting_resources_in_subqueries.reference b/tests/queries/1_stateful/00175_counting_resources_in_subqueries.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/1_stateful/00175_counting_resources_in_subqueries.sql b/tests/queries/1_stateful/00175_counting_resources_in_subqueries.sql
new file mode 100644
index 00000000000..fe7837d7ff1
--- /dev/null
+++ b/tests/queries/1_stateful/00175_counting_resources_in_subqueries.sql
@@ -0,0 +1,20 @@
+-- the work for scalar subquery is properly accounted:
+SET max_rows_to_read = 1000000;
+SELECT 1 = (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)); -- { serverError 158 }
+
+-- the work for subquery in IN is properly accounted:
+SET max_rows_to_read = 1000000;
+SELECT 1 IN (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)); -- { serverError 158 }
+
+-- this query reads from the table twice:
+SET max_rows_to_read = 15000000;
+SELECT count() IN (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)) FROM test.hits WHERE NOT ignore(AdvEngineID); -- { serverError 158 }
+
+-- the resources are properly accounted even if the subquery is evaluated in advance to facilitate the index analysis.
+-- this query is using index and filter out the second reading pass.
+SET max_rows_to_read = 1000000;
+SELECT count() FROM test.hits WHERE CounterID > (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)); -- { serverError 158 }
+
+-- this query is using index but have to read all the data twice.
+SET max_rows_to_read = 10000000;
+SELECT count() FROM test.hits WHERE CounterID < (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)); -- { serverError 158 }
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index ab5d5ddc1b6..963ac384148 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -66,6 +66,8 @@ export CLICKHOUSE_PORT_TCP_WITH_PROXY=${CLICKHOUSE_PORT_TCP_WITH_PROXY:=$(${CLIC
 export CLICKHOUSE_PORT_TCP_WITH_PROXY=${CLICKHOUSE_PORT_TCP_WITH_PROXY:="9010"}
 export CLICKHOUSE_PORT_HTTP=${CLICKHOUSE_PORT_HTTP:=$(${CLICKHOUSE_EXTRACT_CONFIG} --key=http_port 2>/dev/null)}
 export CLICKHOUSE_PORT_HTTP=${CLICKHOUSE_PORT_HTTP:="8123"}
+export CLICKHOUSE_PORT_PROMTHEUS_PORT=${CLICKHOUSE_PORT_PROMTHEUS_PORT:=$(${CLICKHOUSE_EXTRACT_CONFIG} --key=prometheus.port 2>/dev/null)}
+export CLICKHOUSE_PORT_PROMTHEUS_PORT=${CLICKHOUSE_PORT_PROMTHEUS_PORT:="9988"}
 export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=https_port 2>/dev/null)} 2>/dev/null
 export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:="8443"}
 export CLICKHOUSE_PORT_HTTP_PROTO=${CLICKHOUSE_PORT_HTTP_PROTO:="http"}
@@ -98,6 +100,8 @@ then
   export CLICKHOUSE_URL_HTTPS="${CLICKHOUSE_URL_HTTPS}?${CLICKHOUSE_URL_PARAMS}"
 fi
 
+export CLICKHOUSE_URL_PROMETHEUS=${CLICKHOUSE_URL_PROMETHEUS:="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_PROMTHEUS_PORT}/metrics"}
+
 export CLICKHOUSE_PORT_INTERSERVER=${CLICKHOUSE_PORT_INTERSERVER:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=interserver_http_port 2>/dev/null)} 2>/dev/null
 export CLICKHOUSE_PORT_INTERSERVER=${CLICKHOUSE_PORT_INTERSERVER:="9009"}
 export CLICKHOUSE_URL_INTERSERVER=${CLICKHOUSE_URL_INTERSERVER:="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_INTERSERVER}/"}
diff --git a/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt
index cc22b712c62..b6778fce0f0 100644
--- a/utils/check-style/aspell-ignore/en/aspell-dict.txt
+++ b/utils/check-style/aspell-ignore/en/aspell-dict.txt
@@ -108,6 +108,11 @@ PrettyCompactNoEscapes
 PrettyNoEscapes
 PrettySpace
 PrettySpaceNoEscapes
+PrettyCompactNoEscapesMonoBlock
+PrettyMonoBlock
+PrettyNoEscapesMonoBlock
+PrettySpaceMonoBlock
+PrettySpaceNoEscapesMonoBlock
 Protobuf
 ProtobufSingle
 QTCreator
@@ -374,6 +379,11 @@ prettycompactnoescapes
 prettynoescapes
 prettyspace
 prettyspacenoescapes
+prettycompactnoescapesmonoblock
+prettymonoblock
+prettynoescapesmonoblock
+prettyspacemonoblock
+prettyspacenoescapesmonoblock
 prlimit
 prometheus
 proto
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index e540e0b126c..dac016003d5 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -346,3 +346,8 @@ fi
 
 # Forbid files that differ only by character case
 find $ROOT_PATH | sort -f | uniq -i -c | awk '{ if ($1 > 1) print }'
+
+# Forbid std::filesystem::is_symlink and std::filesystem::read_symlink, because it's easy to use them incorrectly
+find $ROOT_PATH/{src,programs,utils} -name '*.h' -or -name '*.cpp' |
+    grep -vP $EXCLUDE_DIRS |
+    xargs grep -P '::(is|read)_symlink' | grep -v "STYLE_CHECK_ALLOW_STD_FS_SYMLINK" && echo "Use DB::FS::isSymlink and DB::FS::readSymlink instead"
diff --git a/utils/check-style/codespell-ignore-words.list b/utils/check-style/codespell-ignore-words.list
index 7aabaff17c5..062e8a1622b 100644
--- a/utils/check-style/codespell-ignore-words.list
+++ b/utils/check-style/codespell-ignore-words.list
@@ -11,3 +11,8 @@ offsett
 numer
 ue
 alse
+nodel
+ot
+te
+fo
+ba
diff --git a/utils/ci/README.md b/utils/ci/README.md
deleted file mode 100644
index a5245375237..00000000000
--- a/utils/ci/README.md
+++ /dev/null
@@ -1,143 +0,0 @@
-## Build and test ClickHouse on various platforms
-
-Quick and dirty scripts.
-
-Usage example:
-```
-./run-with-docker.sh ubuntu:bionic jobs/quick-build/run.sh
-```
-
-Another example, check build on ARM 64:
-```
-./prepare-docker-image-ubuntu.sh
-./run-with-docker.sh multiarch/ubuntu-core:arm64-bionic jobs/quick-build/run.sh
-```
-
-Another example, check build on FreeBSD:
-```
-./prepare-vagrant-image-freebsd.sh
-./run-with-vagrant.sh freebsd jobs/quick-build/run.sh
-```
-
-Look at `default_config` and `jobs/quick-build/run.sh`
-
-Various possible options. We are not going to automate testing all of them.
-
-#### CPU architectures:
-- x86_64;
-- AArch64;
-- PowerPC64LE.
-
-x86_64 is the main CPU architecture. We also have minimal support for AArch64 and PowerPC64LE.
-
-#### Operating systems:
-- Linux;
-- FreeBSD.
-
-We also target Mac OS X, but it's more difficult to test.
-Linux is the main. FreeBSD is also supported as production OS.
-Mac OS is intended only for development and have minimal support: client should work, server should just start.
-
-#### Linux distributions:
-For build:
-- Ubuntu Bionic;
-- Ubuntu Trusty.
-
-For run:
-- Ubuntu Hardy;
-- CentOS 5
-
-We should support almost any Linux to run ClickHouse. That's why we test also on old distributions.
-
-#### How to obtain sources:
-- use sources from local working copy;
-- clone sources from github;
-- download source tarball.
-
-#### Compilers:
-- gcc-7;
-- gcc-8;
-- clang-6;
-- clang-svn.
-
-#### Compiler installation:
-- from OS packages;
-- build from sources.
-
-#### C++ standard library implementation:
-- libc++;
-- libstdc++ with C++11 ABI;
-- libstdc++ with old ABI.
-
-When building with clang, libc++ is used. When building with gcc, we choose libstdc++ with C++11 ABI.
-
-#### Linkers:
-- ldd;
-- gold;
-
-When building with clang on x86_64, ldd is used. Otherwise we use gold.
-
-#### Build types:
-- RelWithDebInfo;
-- Debug;
-- ASan;
-- TSan.
-
-#### Build types, extra:
-- -g0 for quick build;
-- enable test coverage;
-- debug tcmalloc.
-
-#### What to build:
-- only `clickhouse` target;
-- all targets;
-- debian packages;
-
-We also have intent to build RPM and simple tgz packages.
-
-#### Where to get third-party libraries:
-- from contrib directory (submodules);
-- from OS packages.
-
-The only production option is to use libraries from contrib directory.
-Using libraries from OS packages is discouraged, but we also support this option.
-
-#### Linkage types:
-- static;
-- shared;
-
-Static linking is the only option for production usage.
-We also have support for shared linking, but it is intended only for developers.
-
-#### Make tools:
-- make;
-- ninja.
-
-#### Installation options:
-- run built `clickhouse` binary directly;
-- install from packages.
-
-#### How to obtain packages:
-- build them;
-- download from repository.
-
-#### Sanity checks:
-- check that clickhouse binary has no dependencies on unexpected shared libraries;
-- check that source code have no style violations.
-
-#### Tests:
-- Functional tests;
-- Integration tests;
-- Unit tests;
-- Simple sh/reference tests;
-- Performance tests (note that they require predictable computing power);
-- Tests for external dictionaries (should be moved to integration tests);
-- Jepsen like tests for quorum inserts (not yet available in opensource).
-
-#### Tests extra:
-- Run functional tests with Valgrind.
-
-#### Static analyzers:
-- CppCheck;
-- clang-tidy;
-- Coverity.
diff --git a/utils/ci/build-clang-from-sources.sh b/utils/ci/build-clang-from-sources.sh
deleted file mode 100755
index 59eb966ada9..00000000000
--- a/utils/ci/build-clang-from-sources.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh svn
-./install-os-packages.sh cmake
-
-mkdir "${WORKSPACE}/llvm"
-
-svn co "http://llvm.org/svn/llvm-project/llvm/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm"
-svn co "http://llvm.org/svn/llvm-project/cfe/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/tools/clang"
-svn co "http://llvm.org/svn/llvm-project/lld/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/tools/lld"
-svn co "http://llvm.org/svn/llvm-project/polly/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/tools/polly"
-svn co "http://llvm.org/svn/llvm-project/clang-tools-extra/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/tools/clang/tools/extra"
-svn co "http://llvm.org/svn/llvm-project/compiler-rt/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/projects/compiler-rt"
-svn co "http://llvm.org/svn/llvm-project/libcxx/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/projects/libcxx"
-svn co "http://llvm.org/svn/llvm-project/libcxxabi/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/projects/libcxxabi"
-
-mkdir "${WORKSPACE}/llvm/build"
-cd "${WORKSPACE}/llvm/build"
-
-# NOTE You must build LLVM with the same ABI as ClickHouse.
-# For example, if you compile ClickHouse with libc++, you must add
-#  -DLLVM_ENABLE_LIBCXX=1
-# to the line below.
-
-cmake -DCMAKE_BUILD_TYPE:STRING=Release -DLLVM_ENABLE_LIBCXX=1 -DLLVM_ENABLE_RTTI=1 ../llvm
-
-make -j $THREADS
-$SUDO make install
-hash clang
-
-cd ../../..
-
-export CC=clang
-export CXX=clang++
diff --git a/utils/ci/build-debian-packages.sh b/utils/ci/build-debian-packages.sh
deleted file mode 100755
index 8726b675c4d..00000000000
--- a/utils/ci/build-debian-packages.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-[[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
-
-./sources/release
diff --git a/utils/ci/build-gcc-from-sources.sh b/utils/ci/build-gcc-from-sources.sh
deleted file mode 100755
index 8886bb7afd7..00000000000
--- a/utils/ci/build-gcc-from-sources.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh curl
-
-if [[ "${GCC_SOURCES_VERSION}" == "latest" ]]; then
-    GCC_SOURCES_VERSION=$(curl -sSL https://ftpmirror.gnu.org/gcc/ | grep -oE 'gcc-[0-9]+(\.[0-9]+)+' | sort -Vr | head -n1)
-fi
-
-GCC_VERSION_SHORT=$(echo "$GCC_SOURCES_VERSION" | grep -oE '[0-9]' | head -n1)
-
-echo "Will download ${GCC_SOURCES_VERSION} (short version: $GCC_VERSION_SHORT)."
-
-THREADS=$(grep -c ^processor /proc/cpuinfo)
-
-mkdir "${WORKSPACE}/gcc"
-pushd "${WORKSPACE}/gcc"
-
-wget -nv https://ftpmirror.gnu.org/gcc/${GCC_SOURCES_VERSION}/${GCC_SOURCES_VERSION}.tar.xz
-tar xf ${GCC_SOURCES_VERSION}.tar.xz
-pushd ${GCC_SOURCES_VERSION}
-./contrib/download_prerequisites
-popd
-mkdir gcc-build
-pushd gcc-build
-../${GCC_SOURCES_VERSION}/configure --enable-languages=c,c++ --disable-multilib
-make -j $THREADS
-$SUDO make install
-
-popd
-popd
-
-$SUDO ln -sf /usr/local/bin/gcc /usr/local/bin/gcc-${GCC_VERSION_SHORT}
-$SUDO ln -sf /usr/local/bin/g++ /usr/local/bin/g++-${GCC_VERSION_SHORT}
-$SUDO ln -sf /usr/local/bin/gcc /usr/local/bin/cc
-$SUDO ln -sf /usr/local/bin/g++ /usr/local/bin/c++
-
-echo '/usr/local/lib64' | $SUDO tee /etc/ld.so.conf.d/10_local-lib64.conf
-$SUDO ldconfig
-
-hash gcc g++
-gcc --version
-
-export CC=gcc-${GCC_VERSION_SHORT}
-export CXX=g++-${GCC_VERSION_SHORT}
diff --git a/utils/ci/build-normal.sh b/utils/ci/build-normal.sh
deleted file mode 100755
index 328bd2c9f51..00000000000
--- a/utils/ci/build-normal.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-[[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
-
-mkdir -p "${WORKSPACE}/build"
-pushd "${WORKSPACE}/build"
-
-cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_EMBEDDED_COMPILER=${ENABLE_EMBEDDED_COMPILER} $CMAKE_FLAGS ../sources
-
-[[ "$BUILD_TARGETS" != 'all' ]] && BUILD_TARGETS_STRING="--target $BUILD_TARGETS"
-
-cmake --build . $BUILD_TARGETS_STRING -- -j $THREADS
-
-popd
diff --git a/utils/ci/check-docker.sh b/utils/ci/check-docker.sh
deleted file mode 100755
index e4ffb11f643..00000000000
--- a/utils/ci/check-docker.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-command -v docker > /dev/null || die "You need to install Docker"
-docker ps > /dev/null || die "You need to have access to Docker: run '$SUDO usermod -aG docker $USER' and relogin"
diff --git a/utils/ci/check-syntax.sh b/utils/ci/check-syntax.sh
deleted file mode 100755
index df233965f9e..00000000000
--- a/utils/ci/check-syntax.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh jq
-
-[[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
-
-mkdir -p "${WORKSPACE}/build"
-pushd "${WORKSPACE}/build"
-
-cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_FLAGS ../sources
-
-make -j $THREADS re2_st # Generated headers
-
-jq --raw-output '.[] | .command' compile_commands.json | grep -v -P -- '-c .+/contrib/' | sed -r -e 's/-o\s+\S+/-fsyntax-only/' > syntax-commands
-xargs --arg-file=syntax-commands --max-procs=$THREADS --replace /bin/sh -c "{}"
-
-popd
diff --git a/utils/ci/check-tzdata-updates.sh b/utils/ci/check-tzdata-updates.sh
deleted file mode 100755
index 8686590f87c..00000000000
--- a/utils/ci/check-tzdata-updates.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-[[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
-
-latest_tzdb_version=$(curl -s https://data.iana.org/time-zones/data/version);
-tzdb_version_in_repo=$(cat "${WORKSPACE}/sources/contrib/cctz/testdata/version");
-
-if [ "$tzdb_version_in_repo" = "$latest_tzdb_version" ];
-then
-    echo "No update for TZDB needed";
-    exit 0;
-else
-    echo "TZDB update required! Version in repo is ${tzdb_version_in_repo}, latest version is ${latest_tzdb_version}";
-    exit 1
-fi;
diff --git a/utils/ci/create-sources-tarball.sh b/utils/ci/create-sources-tarball.sh
deleted file mode 100755
index bfbbf61e556..00000000000
--- a/utils/ci/create-sources-tarball.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-if [[ -d "${WORKSPACE}/sources" ]]; then
-    tar -c -z -f "${WORKSPACE}/sources.tar.gz" --directory "${WORKSPACE}/sources" .
-else
-    die "Run get-sources first"
-fi
diff --git a/utils/ci/default-config b/utils/ci/default-config
deleted file mode 100644
index b66121cc757..00000000000
--- a/utils/ci/default-config
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-if [[ -z "$INITIALIZED" ]]; then
-
-INITIALIZED=1
-
-SCRIPTPATH=$(pwd)
-WORKSPACE=${SCRIPTPATH}/workspace
-PROJECT_ROOT=$(cd $SCRIPTPATH/.. && pwd)
-
-# Almost all scripts take no arguments. Arguments should be in config.
-
-# get-sources
-SOURCES_METHOD=local                # clone, local, tarball
-SOURCES_CLONE_URL="https://github.com/ClickHouse/ClickHouse.git"
-SOURCES_BRANCH="master"
-SOURCES_COMMIT=HEAD                 # do checkout of this commit after clone
-
-# prepare-toolchain
-COMPILER=gcc                        # gcc, clang
-COMPILER_INSTALL_METHOD=packages    # packages, sources
-COMPILER_PACKAGE_VERSION=7          # or 6.0 for clang
-
-# install-compiler-from-sources
-CLANG_SOURCES_BRANCH=trunk          # or tags/RELEASE_600/final
-GCC_SOURCES_VERSION=latest          # or gcc-7.1.0
-
-# install-libraries
-ENABLE_EMBEDDED_COMPILER=1
-
-# build
-BUILD_METHOD=normal                 # normal, debian
-BUILD_TARGETS=clickhouse            # tagtet name, all; only for "normal"
-BUILD_TYPE=RelWithDebInfo           # RelWithDebInfo, Debug, ASan, TSan
-CMAKE_FLAGS=""
-
-# prepare-docker-image-ubuntu
-DOCKER_UBUNTU_VERSION=bionic
-DOCKER_UBUNTU_ARCH=arm64            # How the architecture is named in a tarball at https://partner-images.canonical.com/core/
-DOCKER_UBUNTU_QUEMU_ARCH=aarch64    # How the architecture is named in QEMU
-DOCKER_UBUNTU_TAG_ARCH=arm64        # How the architecture is named in Docker
-DOCKER_UBUNTU_QEMU_VER=v2.9.1
-DOCKER_UBUNTU_REPO=multiarch/ubuntu-core
-
-THREADS=$(grep -c ^processor /proc/cpuinfo || nproc || sysctl -a | grep -F 'hw.ncpu' | grep -oE '[0-9]+')
-
-# All scripts should return 0 in case of success, 1 in case of permanent error,
-#  2 in case of temporary error, any other code in case of permanent error.
-function die {
-    echo ${1:-Error}
-    exit ${2:1}
-}
-
-[[ $EUID -ne 0 ]] && SUDO=sudo
-
-./install-os-packages.sh prepare
-
-# Configuration parameters may be overridden with CONFIG environment variable pointing to config file.
-[[ -n "$CONFIG" ]] && source $CONFIG
-
-mkdir -p $WORKSPACE
-
-fi
diff --git a/utils/ci/docker-multiarch/LICENSE b/utils/ci/docker-multiarch/LICENSE
deleted file mode 100644
index 60d0ea8fa82..00000000000
--- a/utils/ci/docker-multiarch/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Multiarch
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/utils/ci/docker-multiarch/README.md b/utils/ci/docker-multiarch/README.md
deleted file mode 100644
index 9cc30c2dca8..00000000000
--- a/utils/ci/docker-multiarch/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Source: https://github.com/multiarch/ubuntu-core
-Commit: 3972a7794b40a965615abd710759d3ed439c9a55
-
-# :earth_africa: ubuntu-core
-
-![](https://raw.githubusercontent.com/multiarch/dockerfile/master/logo.jpg)
-
-Multiarch Ubuntu images for Docker.
-
-Based on https://github.com/tianon/docker-brew-ubuntu-core/
-
-* `multiarch/ubuntu-core` on [Docker Hub](https://hub.docker.com/r/multiarch/ubuntu-core/)
-* [Available tags](https://hub.docker.com/r/multiarch/ubuntu-core/tags/)
-
-## Usage
-
-Once you need to configure binfmt-support on your Docker host.
-This works locally or remotely (i.e using boot2docker or swarm).
-
-```console
-# configure binfmt-support on the Docker host (works locally or remotely, i.e: using boot2docker)
-$ docker run --rm --privileged multiarch/qemu-user-static:register --reset
-```
-
-Then you can run an `armhf` image from your `x86_64` Docker host.
-
-```console
-$ docker run -it --rm multiarch/ubuntu-core:armhf-wily
-root@a0818570f614:/# uname -a
-Linux a0818570f614 4.1.13-boot2docker #1 SMP Fri Nov 20 19:05:50 UTC 2015 armv7l armv7l armv7l GNU/Linux
-root@a0818570f614:/# exit
-```
-
-Or an `x86_64` image from your `x86_64` Docker host, directly, without qemu emulation.
-
-```console
-$ docker run -it --rm multiarch/ubuntu-core:amd64-wily
-root@27fe384370c9:/# uname -a
-Linux 27fe384370c9 4.1.13-boot2docker #1 SMP Fri Nov 20 19:05:50 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux
-root@27fe384370c9:/#
-```
-
-It also works for `arm64`
-
-```console
-$ docker run -it --rm multiarch/ubuntu-core:arm64-wily
-root@723fb9f184fa:/# uname -a
-Linux 723fb9f184fa 4.1.13-boot2docker #1 SMP Fri Nov 20 19:05:50 UTC 2015 aarch64 aarch64 aarch64 GNU/Linux
-```
-
-## License
-
-MIT
diff --git a/utils/ci/docker-multiarch/update.sh b/utils/ci/docker-multiarch/update.sh
deleted file mode 100755
index 1348631bdcf..00000000000
--- a/utils/ci/docker-multiarch/update.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-# A POSIX variable
-OPTIND=1 # Reset in case getopts has been used previously in the shell.
-
-while getopts "a:v:q:u:d:t:" opt; do
-    case "$opt" in
-    a)  ARCH=$OPTARG
-        ;;
-    v)  VERSION=$OPTARG
-        ;;
-    q)  QEMU_ARCH=$OPTARG
-        ;;
-    u)  QEMU_VER=$OPTARG
-        ;;
-    d)  DOCKER_REPO=$OPTARG
-        ;;
-    t)  TAG_ARCH=$OPTARG
-        ;;
-    esac
-done
-
-thisTarBase="ubuntu-$VERSION-core-cloudimg-$ARCH"
-thisTar="$thisTarBase-root.tar.gz"
-baseUrl="https://partner-images.canonical.com/core/$VERSION"
-
-
-# install qemu-user-static
-if [ -n "${QEMU_ARCH}" ]; then
-    if [ ! -f x86_64_qemu-${QEMU_ARCH}-static.tar.gz ]; then
-        wget -nv -N https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VER}/x86_64_qemu-${QEMU_ARCH}-static.tar.gz
-    fi
-    tar -xvf x86_64_qemu-${QEMU_ARCH}-static.tar.gz -C $ROOTFS/usr/bin/
-fi
-
-
-# get the image
-if \
-    wget -nv --spider "$baseUrl/current" \
-    && wget -nv --spider "$baseUrl/current/$thisTar" \
-    ; then
-        baseUrl+='/current'
-fi
-wget -nv -N "$baseUrl/"{{MD5,SHA{1,256}}SUMS{,.gpg},"$thisTarBase.manifest",'unpacked/build-info.txt'} || true
-wget -nv -N "$baseUrl/$thisTar"
-
-# check checksum
-if [ -f SHA256SUMS ]; then
-    sha256sum="$(sha256sum "$thisTar" | cut -d' ' -f1)"
-    if ! grep -q "$sha256sum" SHA256SUMS; then
-        echo >&2 "error: '$thisTar' has invalid SHA256"
-        exit 1
-    fi
-fi
-
-cat > Dockerfile <<-EOF
-    FROM scratch
-    ADD $thisTar /
-    ENV ARCH=${ARCH} UBUNTU_SUITE=${VERSION} DOCKER_REPO=${DOCKER_REPO}
-EOF
-
-# add qemu-user-static binary
-if [ -n "${QEMU_ARCH}" ]; then
-    cat >> Dockerfile <<EOF
-
-# Add qemu-user-static binary for amd64 builders
-ADD x86_64_qemu-${QEMU_ARCH}-static.tar.gz /usr/bin
-EOF
-fi
-
-cat >> Dockerfile <<-EOF
-    # a few minor docker-specific tweaks
-    # see https://github.com/docker/docker/blob/master/contrib/mkimage/debootstrap
-    RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \\
-        && echo 'exit 101' >> /usr/sbin/policy-rc.d \\
-        && chmod +x /usr/sbin/policy-rc.d \\
-        && dpkg-divert --local --rename --add /sbin/initctl \\
-        && cp -a /usr/sbin/policy-rc.d /sbin/initctl \\
-        && sed -i 's/^exit.*/exit 0/' /sbin/initctl \\
-        && echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup \\
-        && echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' > /etc/apt/apt.conf.d/docker-clean \\
-        && echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' >> /etc/apt/apt.conf.d/docker-clean \\
-        && echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' >> /etc/apt/apt.conf.d/docker-clean \\
-        && echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/docker-no-languages \\
-        && echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > /etc/apt/apt.conf.d/docker-gzip-indexes
-
-    # enable the universe
-    RUN sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
-
-    # overwrite this with 'CMD []' in a dependent Dockerfile
-    CMD ["/bin/bash"]
-EOF
-
-docker build -t "${DOCKER_REPO}:${TAG_ARCH}-${VERSION}" .
-docker run --rm "${DOCKER_REPO}:${TAG_ARCH}-${VERSION}" /bin/bash -ec "echo Hello from Ubuntu!"
diff --git a/utils/ci/get-sources.sh b/utils/ci/get-sources.sh
deleted file mode 100755
index ee57b0ec27d..00000000000
--- a/utils/ci/get-sources.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-if [[ "$SOURCES_METHOD" == "clone" ]]; then
-    ./install-os-packages.sh git
-    SOURCES_DIR="${WORKSPACE}/sources"
-    mkdir -p "${SOURCES_DIR}"
-    git clone --recursive --branch "$SOURCES_BRANCH" "$SOURCES_CLONE_URL" "${SOURCES_DIR}"
-    pushd "${SOURCES_DIR}"
-    git checkout --recurse-submodules "$SOURCES_COMMIT"
-    popd
-elif [[ "$SOURCES_METHOD" == "local" ]]; then
-    ln -f -s "${PROJECT_ROOT}" "${WORKSPACE}/sources"
-else
-    die "Unknown SOURCES_METHOD"
-fi
diff --git a/utils/ci/install-compiler-from-packages.sh b/utils/ci/install-compiler-from-packages.sh
deleted file mode 100755
index 53909435a06..00000000000
--- a/utils/ci/install-compiler-from-packages.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-# TODO Install from PPA on older Ubuntu
-
-./install-os-packages.sh ${COMPILER}-${COMPILER_PACKAGE_VERSION}
-
-if [[ "$COMPILER" == "gcc" ]]; then
-    if command -v gcc-${COMPILER_PACKAGE_VERSION}; then export CC=gcc-${COMPILER_PACKAGE_VERSION} CXX=g++-${COMPILER_PACKAGE_VERSION};
-    elif command -v gcc${COMPILER_PACKAGE_VERSION}; then export CC=gcc${COMPILER_PACKAGE_VERSION} CXX=g++${COMPILER_PACKAGE_VERSION};
-    elif command -v gcc; then export CC=gcc CXX=g++;
-    fi
-elif [[ "$COMPILER" == "clang" ]]; then
-    if command -v clang-${COMPILER_PACKAGE_VERSION}; then export CC=clang-${COMPILER_PACKAGE_VERSION} CXX=clang++-${COMPILER_PACKAGE_VERSION};
-    elif command -v clang${COMPILER_PACKAGE_VERSION}; then export CC=clang${COMPILER_PACKAGE_VERSION} CXX=clang++${COMPILER_PACKAGE_VERSION};
-    elif command -v clang; then export CC=clang CXX=clang++;
-    fi
-else
-    die "Unknown compiler specified"
-fi
diff --git a/utils/ci/install-compiler-from-sources.sh b/utils/ci/install-compiler-from-sources.sh
deleted file mode 100755
index 235898ed300..00000000000
--- a/utils/ci/install-compiler-from-sources.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-if [[ "$COMPILER" == "gcc" ]]; then
-    . build-gcc-from-sources.sh
-elif [[ "$COMPILER" == "clang" ]]; then
-    . build-clang-from-sources.sh
-else
-    die "Unknown COMPILER"
-fi
diff --git a/utils/ci/install-libraries.sh b/utils/ci/install-libraries.sh
deleted file mode 100755
index 3c26e3b09b1..00000000000
--- a/utils/ci/install-libraries.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh libicu-dev
diff --git a/utils/ci/install-os-packages.sh b/utils/ci/install-os-packages.sh
deleted file mode 100755
index b4b0c74f30c..00000000000
--- a/utils/ci/install-os-packages.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-# Dispatches package installation on various OS and distributives
-
-WHAT=$1
-
-[[ $EUID -ne 0 ]] && SUDO=sudo
-
-command -v yum && PACKAGE_MANAGER=yum
-command -v pkg && PACKAGE_MANAGER=pkg
-command -v apt-get && PACKAGE_MANAGER=apt
-
-
-case $PACKAGE_MANAGER in
-    apt)
-        case $WHAT in
-            prepare)
-                $SUDO apt-get update
-                ;;
-            svn)
-                $SUDO apt-get install -y subversion
-                ;;
-            gcc*)
-                $SUDO apt-get install -y $WHAT ${WHAT/cc/++}
-                ;;
-            clang*)
-                $SUDO apt-get install -y $WHAT libc++-dev libc++abi-dev
-                [[ $(uname -m) == "x86_64" ]] && $SUDO apt-get install -y ${WHAT/clang/lld} || true
-                ;;
-            git)
-                $SUDO apt-get install -y git
-                ;;
-            cmake)
-                $SUDO apt-get install -y cmake3 || $SUDO apt-get install -y cmake
-                ;;
-            ninja)
-                $SUDO apt-get install -y ninja-build
-                ;;
-            curl)
-                $SUDO apt-get install -y curl
-                ;;
-            jq)
-                $SUDO apt-get install -y jq
-                ;;
-            libicu-dev)
-                $SUDO apt-get install -y libicu-dev
-                ;;
-            llvm-libs*)
-                $SUDO apt-get install -y ${WHAT/llvm-libs/liblld}-dev ${WHAT/llvm-libs/libclang}-dev
-                ;;
-            qemu-user-static)
-                $SUDO apt-get install -y qemu-user-static
-                ;;
-            vagrant-virtualbox)
-                $SUDO apt-get install -y vagrant virtualbox
-                ;;
-            *)
-                echo "Unknown package"; exit 1;
-                ;;
-        esac
-        ;;
-    yum)
-        case $WHAT in
-            prepare)
-                ;;
-            svn)
-                $SUDO yum install -y subversion
-                ;;
-            gcc*)
-                $SUDO yum install -y gcc gcc-c++ libstdc++-static
-                ;;
-            git)
-                $SUDO yum install -y git
-                ;;
-            cmake)
-                $SUDO yum install -y cmake
-                ;;
-            ninja)
-                $SUDO yum install -y ninja-build
-                ;;
-            curl)
-                $SUDO yum install -y curl
-                ;;
-            jq)
-                $SUDO yum install -y jq
-                ;;
-            libicu-dev)
-                $SUDO yum install -y libicu-devel
-                ;;
-            *)
-                echo "Unknown package"; exit 1;
-                ;;
-        esac
-        ;;
-    pkg)
-        case $WHAT in
-            prepare)
-                ;;
-            svn)
-                $SUDO pkg install -y subversion
-                ;;
-            gcc*)
-                $SUDO pkg install -y ${WHAT/-/}
-                ;;
-            clang*)
-                $SUDO pkg install -y clang-devel
-                ;;
-            git)
-                $SUDO pkg install -y git
-                ;;
-            cmake)
-                $SUDO pkg install -y cmake
-                ;;
-            ninja)
-                $SUDO pkg install -y ninja-build
-                ;;
-            curl)
-                $SUDO pkg install -y curl
-                ;;
-            jq)
-                $SUDO pkg install -y jq
-                ;;
-            libicu-dev)
-                $SUDO pkg install -y icu
-                ;;
-            *)
-                echo "Unknown package"; exit 1;
-                ;;
-        esac
-        ;;
-    *)
-        echo "Unknown distributive"; exit 1;
-        ;;
-esac
diff --git a/utils/ci/prepare-docker-image-ubuntu.sh b/utils/ci/prepare-docker-image-ubuntu.sh
deleted file mode 100755
index 2880d7fc1e6..00000000000
--- a/utils/ci/prepare-docker-image-ubuntu.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./check-docker.sh
-
-# http://fl47l1n3.net/2015/12/24/binfmt/
-./install-os-packages.sh qemu-user-static
-
-pushd docker-multiarch
-
-$SUDO ./update.sh \
- -a "$DOCKER_UBUNTU_ARCH" \
- -v "$DOCKER_UBUNTU_VERSION" \
- -q "$DOCKER_UBUNTU_QUEMU_ARCH" \
- -u "$DOCKER_UBUNTU_QEMU_VER" \
- -d "$DOCKER_UBUNTU_REPO" \
- -t "$DOCKER_UBUNTU_TAG_ARCH"
-
-docker run --rm --privileged multiarch/qemu-user-static:register
-
-popd
diff --git a/utils/ci/prepare-toolchain.sh b/utils/ci/prepare-toolchain.sh
deleted file mode 100755
index 5edb19cc430..00000000000
--- a/utils/ci/prepare-toolchain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh cmake
-./install-os-packages.sh ninja
-
-if [[ "$COMPILER_INSTALL_METHOD" == "packages" ]]; then
-    . install-compiler-from-packages.sh
-elif [[ "$COMPILER_INSTALL_METHOD" == "sources" ]]; then
-    . install-compiler-from-sources.sh
-else
-    die "Unknown COMPILER_INSTALL_METHOD"
-fi
diff --git a/utils/ci/prepare-vagrant-image-freebsd.sh b/utils/ci/prepare-vagrant-image-freebsd.sh
deleted file mode 100755
index 16c5e58c7c5..00000000000
--- a/utils/ci/prepare-vagrant-image-freebsd.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh vagrant-virtualbox
-
-pushd "vagrant-freebsd"
-vagrant up
-vagrant ssh-config > vagrant-ssh
-ssh -F vagrant-ssh default 'uname -a'
-popd
diff --git a/utils/ci/run-clickhouse-from-binaries.sh b/utils/ci/run-clickhouse-from-binaries.sh
deleted file mode 100755
index 5e9dc35869a..00000000000
--- a/utils/ci/run-clickhouse-from-binaries.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-# Usage example:
-# ./run-with-docker.sh centos:centos6 ./run-clickhouse-from-binaries.sh
-
-source default-config
-
-SERVER_BIN="${WORKSPACE}/build/src/Server/clickhouse"
-SERVER_CONF="${WORKSPACE}/sources/src/Server/config.xml"
-SERVER_DATADIR="${WORKSPACE}/clickhouse"
-
-[[ -x "$SERVER_BIN" ]] || die "Run build-normal.sh first"
-[[ -r "$SERVER_CONF" ]] || die "Run get-sources.sh first"
-
-mkdir -p "${SERVER_DATADIR}"
-
-$SERVER_BIN server --config-file "$SERVER_CONF" --pid-file="${WORKSPACE}/clickhouse.pid" -- --path "$SERVER_DATADIR"
diff --git a/utils/ci/run-with-docker.sh b/utils/ci/run-with-docker.sh
deleted file mode 100755
index 158961dd5da..00000000000
--- a/utils/ci/run-with-docker.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-mkdir -p /var/cache/ccache
-DOCKER_ENV+=" --mount=type=bind,source=/var/cache/ccache,destination=/ccache -e CCACHE_DIR=/ccache "
-
-PROJECT_ROOT="$(cd "$(dirname "$0")/.."; pwd -P)"
-[[ -n "$CONFIG" ]] && DOCKER_ENV="--env=CONFIG"
-docker run -t --network=host --mount=type=bind,source=${PROJECT_ROOT},destination=/ClickHouse --workdir=/ClickHouse/ci $DOCKER_ENV "$1" "$2"
diff --git a/utils/ci/run-with-vagrant.sh b/utils/ci/run-with-vagrant.sh
deleted file mode 100755
index 620d38071eb..00000000000
--- a/utils/ci/run-with-vagrant.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-[[ -r "vagrant-${1}/vagrant-ssh" ]] || die "Run prepare-vagrant-image-... first."
-
-pushd vagrant-$1
-
-shopt -s extglob
-
-vagrant ssh -c "mkdir -p ClickHouse"
-scp -q -F vagrant-ssh -r ../../!(*build*) default:~/ClickHouse
-vagrant ssh -c "cd ClickHouse/ci; $2"
-
-popd
diff --git a/utils/keeper-bench/Runner.cpp b/utils/keeper-bench/Runner.cpp
index e89670c4ec3..b43ad62bc5b 100644
--- a/utils/keeper-bench/Runner.cpp
+++ b/utils/keeper-bench/Runner.cpp
@@ -167,6 +167,7 @@ void Runner::runBenchmark()
     }
     catch (...)
     {
+        shutdown = true;
         pool.wait();
         throw;
     }
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index 7d18c567d26..0ab5349b97b 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,9 +1,12 @@
+v22.7.3.5-stable	2022-08-10
 v22.7.2.15-stable	2022-08-03
 v22.7.1.2484-stable	2022-07-21
+v22.6.5.22-stable	2022-08-09
 v22.6.4.35-stable	2022-07-25
 v22.6.3.35-stable	2022-07-06
 v22.6.2.12-stable	2022-06-29
 v22.6.1.1985-stable	2022-06-16
+v22.5.4.19-stable	2022-08-10
 v22.5.3.21-stable	2022-07-25
 v22.5.2.53-stable	2022-07-07
 v22.5.1.2079-stable	2022-05-19
@@ -12,6 +15,7 @@ v22.4.5.9-stable	2022-05-06
 v22.4.4.7-stable	2022-04-29
 v22.4.3.3-stable	2022-04-26
 v22.4.2.1-stable	2022-04-22
+v22.3.11.12-lts	2022-08-10
 v22.3.10.22-lts	2022-08-03
 v22.3.9.19-lts	2022-07-25
 v22.3.8.39-lts	2022-07-07
diff --git a/utils/self-extracting-executable/decompressor.cpp b/utils/self-extracting-executable/decompressor.cpp
index 9bdc95d8bcf..c0c97b1d711 100644
--- a/utils/self-extracting-executable/decompressor.cpp
+++ b/utils/self-extracting-executable/decompressor.cpp
@@ -21,11 +21,16 @@
 #endif
 
 #if defined OS_DARWIN
+#   include <mach-o/dyld.h>
 #   include <libkern/OSByteOrder.h>
     // define 64 bit macros
 #   define le64toh(x) OSSwapLittleToHostInt64(x)
 #endif
 
+#if defined(OS_FREEBSD)
+#   include <sys/sysctl.h>
+#endif
+
 #include "types.h"
 
 /// decompress part
@@ -82,7 +87,7 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
         pid = fork();
         if (-1 == pid)
         {
-            perror(nullptr);
+            perror("fork");
             /// If fork failed just decompress data in main process.
             if (0 != doDecompress(input, output, in_pointer, out_pointer, size, decompressed_size, dctx))
             {
@@ -170,7 +175,7 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
     struct stat info_in;
     if (0 != fstat(input_fd, &info_in))
     {
-        perror(nullptr);
+        perror("fstat");
         return 1;
     }
 
@@ -178,7 +183,7 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
     char * input = static_cast<char*>(mmap(nullptr, info_in.st_size, PROT_READ, MAP_PRIVATE, input_fd, 0));
     if (input == MAP_FAILED)
     {
-        perror(nullptr);
+        perror("mmap");
         return 1;
     }
 
@@ -202,9 +207,9 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
     struct statfs fs_info;
     if (0 != fstatfs(input_fd, &fs_info))
     {
-        perror(nullptr);
+        perror("fstatfs");
         if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
         return 1;
     }
     if (fs_info.f_blocks * info_in.st_blksize < decompressed_full_size)
@@ -241,7 +246,7 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
             int fd = mkstemp(file_name);
             if (fd == -1)
             {
-                perror(nullptr);
+                perror("mkstemp");
                 return 1;
             }
             close(fd);
@@ -254,18 +259,18 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
 
         if (output_fd == -1)
         {
-            perror(nullptr);
+            perror("open");
             if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
             return 1;
         }
 
         /// Prepare output file
         if (0 != ftruncate(output_fd, le64toh(file_info.uncompressed_size)))
         {
-            perror(nullptr);
+            perror("ftruncate");
             if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
             return 1;
         }
 
@@ -278,9 +283,9 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
             );
         if (output == MAP_FAILED)
         {
-            perror(nullptr);
+            perror("mmap");
             if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
             return 1;
         }
 
@@ -288,29 +293,70 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
         if (0 != decompress(input, output, le64toh(file_info.start), le64toh(file_info.end)))
         {
             if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
             if (0 != munmap(output, le64toh(file_info.uncompressed_size)))
-                perror(nullptr);
+                perror("munmap");
             return 1;
         }
 
         if (0 != fsync(output_fd))
-            perror(nullptr);
+            perror("fsync");
         if (0 != close(output_fd))
-            perror(nullptr);
+            perror("close");
     }
 
     if (0 != munmap(input, info_in.st_size))
-        perror(nullptr);
+        perror("munmap");
     return 0;
 }
 
+#if defined(OS_DARWIN)
+
+    int read_exe_path(char *exe, size_t buf_sz)
+    {
+        uint32_t size = buf_sz;
+        char apple[size];
+        if (_NSGetExecutablePath(apple, &size) != 0)
+            return 1;
+        if (realpath(apple, exe) == nullptr)
+            return 1;
+        return 0;
+    }
+
+#elif defined(OS_FREEBSD)
+
+    int read_exe_path(char *exe, size_t buf_sz)
+    {
+        int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+        size_t length = buf_sz;
+        int error = sysctl(name, 4, exe, &length, nullptr, 0);
+        if (error < 0 || length <= 1)
+            return 1;
+        return 0;
+    }
+
+#else
+
+    int read_exe_path(char *exe, size_t/* buf_sz*/)
+    {
+        if (realpath("/proc/self/exe", exe) == nullptr)
+            return 1;
+        return 0;
+    }
+
+#endif
 
 int main(int/* argc*/, char* argv[])
 {
-    char file_path[strlen(argv[0]) + 1];
-    memset(file_path, 0, sizeof(file_path));
-    strcpy(file_path, argv[0]);
+    char self[4096] = {0};
+    if (read_exe_path(self, 4096) == -1)
+    {
+        perror("read_exe_path");
+        return 1;
+    }
+
+    char file_path[strlen(self) + 1];
+    strcpy(file_path, self);
 
     char * path = nullptr;
     char * name = strrchr(file_path, '/');
@@ -323,10 +369,10 @@ int main(int/* argc*/, char* argv[])
     else
         name = file_path;
 
-    int input_fd = open(argv[0], O_RDONLY);
+    int input_fd = open(self, O_RDONLY);
     if (input_fd == -1)
     {
-        perror(nullptr);
+        perror("open");
         return 1;
     }
 
@@ -339,16 +385,16 @@ int main(int/* argc*/, char* argv[])
     {
         printf("Error happened during decompression.\n");
         if (0 != close(input_fd))
-            perror(nullptr);
+            perror("close");
         return 1;
     }
 
     if (0 != close(input_fd))
-        perror(nullptr);
+        perror("close");
 
-    if (unlink(argv[0]))
+    if (unlink(self))
     {
-        perror(nullptr);
+        perror("unlink");
         return 1;
     }
 
@@ -357,34 +403,34 @@ int main(int/* argc*/, char* argv[])
     else
     {
         const char * const decompressed_name_fmt = "%s.decompressed.%s";
-        int decompressed_name_len = snprintf(nullptr, 0, decompressed_name_fmt, argv[0], decompressed_suffix);
+        int decompressed_name_len = snprintf(nullptr, 0, decompressed_name_fmt, self, decompressed_suffix);
         char decompressed_name[decompressed_name_len + 1];
-        (void)snprintf(decompressed_name, decompressed_name_len + 1, decompressed_name_fmt, argv[0], decompressed_suffix);
+        (void)snprintf(decompressed_name, decompressed_name_len + 1, decompressed_name_fmt, self, decompressed_suffix);
 
         std::error_code ec;
-        std::filesystem::copy_file(static_cast<char *>(decompressed_name), argv[0], ec);
+        std::filesystem::copy_file(static_cast<char *>(decompressed_name), static_cast<char *>(self), ec);
         if (ec)
         {
             std::cerr << ec.message() << std::endl;
             return 1;
         }
 
-        if (chmod(argv[0], decompressed_umask))
+        if (chmod(self, decompressed_umask))
         {
-            perror(nullptr);
+            perror("chmod");
             return 1;
         }
 
         if (unlink(decompressed_name))
         {
-            perror(nullptr);
+            perror("unlink");
             return 1;
         }
 
-        execv(argv[0], argv);
+        execv(self, argv);
 
         /// This part of code will be reached only if error happened
-        perror(nullptr);
+        perror("execv");
         return 1;
     }
 }
diff --git a/utils/tests-visualizer/index.html b/utils/tests-visualizer/index.html
index 15ee221aa8e..11b2d6504e4 100644
--- a/utils/tests-visualizer/index.html
+++ b/utils/tests-visualizer/index.html
@@ -62,7 +62,7 @@
 <pre id="info" class="hide"></pre>
 <h1 id="fail-message" class="hide">Data not load</h1>
 <div id="loading">
-    <img src="https://clickhouse.com/images/logo.svg">
+    <img src="https://presentations.clickhouse.com/images/logo.svg">
     <h1>Loading (~10 seconds, ~20 MB)</h1>
 </div>
 <canvas id="canvas"></canvas>
diff --git a/utils/trace-visualizer/js/d3-gantt.js b/utils/trace-visualizer/js/d3-gantt.js
index e3a51a33c21..45f7707aa61 100644
--- a/utils/trace-visualizer/js/d3-gantt.js
+++ b/utils/trace-visualizer/js/d3-gantt.js
@@ -307,7 +307,7 @@
         x = d3.scaleLinear()
             .domain([timeDomainStart, timeDomainEnd])
             .range([0, width])
-            //.clamp(true); // dosn't work with zoom/pan
+            //.clamp(true); // doesn't work with zoom/pan
         xZoomed = x;
         y = d3.scaleBand()
             .domain([...data.bands])
diff --git a/utils/trace-visualizer/js/d3-tip-0.8.0-alpha.1.js b/utils/trace-visualizer/js/d3-tip-0.8.0-alpha.1.js
index ad3a6c0d199..19e509309f2 100644
--- a/utils/trace-visualizer/js/d3-tip-0.8.0-alpha.1.js
+++ b/utils/trace-visualizer/js/d3-tip-0.8.0-alpha.1.js
@@ -26,7 +26,7 @@
     root.d3.tip = factory(d3, d3)
   }
 }(this, function(d3Collection, d3Selection) {
-  // Public - contructs a new tooltip
+  // Public - constructs a new tooltip
   //
   // Returns a tip
   return function() {
diff --git a/website/favicon.ico b/website/favicon.ico
deleted file mode 100644
index 82a0c175833..00000000000
Binary files a/website/favicon.ico and /dev/null differ
diff --git a/website/images/clickhouse-209x60.png b/website/images/clickhouse-209x60.png
deleted file mode 100644
index 0ba3ae8893b..00000000000
Binary files a/website/images/clickhouse-209x60.png and /dev/null differ
diff --git a/website/images/clickhouse-3069x1531.png b/website/images/clickhouse-3069x1531.png
deleted file mode 100644
index f143c1d1518..00000000000
Binary files a/website/images/clickhouse-3069x1531.png and /dev/null differ
diff --git a/website/images/clickhouse-black.svg b/website/images/clickhouse-black.svg
deleted file mode 100644
index a0a607dc0b2..00000000000
--- a/website/images/clickhouse-black.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66.12 10.29"><defs><style>.a{fill:#231f20}</style></defs><title>ClickHouse</title><path d="M58.54,74.8a5,5,0,0,1-1.88-.34,4.26,4.26,0,0,1-1.48-1,4.46,4.46,0,0,1-1-1.55,6.32,6.32,0,0,1,0-4.21,4.39,4.39,0,0,1,2.58-2.57,5.36,5.36,0,0,1,1.93-.34,5.84,5.84,0,0,1,1.56.18,6.38,6.38,0,0,1,1.2.46l-0.36,1.13A5.17,5.17,0,0,0,60,66a4.23,4.23,0,0,0-1.43-.22,3.07,3.07,0,0,0-2.35,1.06,3.81,3.81,0,0,0-.72,1.27,5.17,5.17,0,0,0-.27,1.73,5.35,5.35,0,0,0,.25,1.69,3.61,3.61,0,0,0,.69,1.25,2.88,2.88,0,0,0,1.06.77,3.49,3.49,0,0,0,1.38.27,4,4,0,0,0,1.27-.2A5.71,5.71,0,0,0,61,73.09l0.35,0.85a3.86,3.86,0,0,1-1.12.59A5,5,0,0,1,58.54,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M64.07,64.51V74.66H62.88V64.51h1.19Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M66.64,66.55a0.71,0.71,0,0,1-.76-0.74,0.78,0.78,0,0,1,.2-0.55,0.79,0.79,0,0,1,1.1,0,0.77,0.77,0,0,1,.21.55,0.72,0.72,0,0,1-.21.53A0.74,0.74,0,0,1,66.64,66.55Zm0.6,1.06v7H66.06v-7h1.19Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M72.29,74.8a3.78,3.78,0,0,1-1.37-.25,3.08,3.08,0,0,1-1.11-.72,3.45,3.45,0,0,1-.74-1.15,4.48,4.48,0,0,1,0-3.08,3.35,3.35,0,0,1,.76-1.15A3.19,3.19,0,0,1,71,67.72a4,4,0,0,1,1.41-.25,4.68,4.68,0,0,1,1.13.13,2.68,2.68,0,0,1,.84.35L74,69a4,4,0,0,0-.79-0.47,2.32,2.32,0,0,0-.92-0.16,2.28,2.28,0,0,0-.88.17,2,2,0,0,0-.73.52,2.52,2.52,0,0,0-.49.85A3.5,3.5,0,0,0,70,71.11a2.8,2.8,0,0,0,.66,2,2.4,2.4,0,0,0,1.79.67,3,3,0,0,0,1.62-.52l0.27,0.88a2.89,2.89,0,0,1-.89.45A3.88,3.88,0,0,1,72.29,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M77,64.51V74.66H75.79V64.51H77ZM80.1,74.66L77.16,70.9l2.9-3.28H81.3l-2.87,3.14,3.07,3.9H80.1Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M89.17,70.34h-5v4.31H82.88V64.93h1.29v4.44h5V64.93h1.29v9.73H89.17V70.34Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M95.55,74.8a3.49,3.49,0,0,1-1.3-.25,3.11,3.11,0,0,1-1.08-.71,3.44,3.44,0,0,1-.73-1.15,4.6,4.6,0,0,1,0-3.12,3.36,3.36,0,0,1,.73-1.14,3.16,3.16,0,0,1,1.08-.71,3.49,3.49,0,0,1,1.3-.25,3.55,3.55,0,0,1,1.31.25,3.22,3.22,0,0,1,1.09.71,3.39,3.39,0,0,1,.75,1.14,4.49,4.49,0,0,1,0,3.12A3.47,3.47,0,0,1,98,73.84a3.16,3.16,0,0,1-1.09.71A3.55,3.55,0,0,1,95.55,74.8Zm0-.91a2.37,2.37,0,0,0,.82-0.15,1.79,1.79,0,0,0,.71-0.48,2.48,2.48,0,0,0,.5-0.86,3.79,3.79,0,0,0,.19-1.27,3.73,3.73,0,0,0-.19-1.27,2.48,2.48,0,0,0-.5-0.85,1.79,1.79,0,0,0-.71-0.48,2.37,2.37,0,0,0-.82-0.15,2.25,2.25,0,0,0-.8.15,1.82,1.82,0,0,0-.69.48,2.4,2.4,0,0,0-.49.85,3.86,3.86,0,0,0-.18,1.27,3.92,3.92,0,0,0,.18,1.27,2.4,2.4,0,0,0,.49.86,1.81,1.81,0,0,0,.69.48A2.25,2.25,0,0,0,95.55,73.89Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M104.21,74.39a2.69,2.69,0,0,1-1.55.41,2.15,2.15,0,0,1-1.58-.6,2.49,2.49,0,0,1-.6-1.84V67.61h1.2v4.75a2.14,2.14,0,0,0,.1.7,1.08,1.08,0,0,0,.28.45,1,1,0,0,0,.42.24,1.82,1.82,0,0,0,.52.07,2,2,0,0,0,1.27-.38,3,3,0,0,0,.82-1V67.61h1.19v7h-1.05l-0.11-1.26h0A2.5,2.5,0,0,1,104.21,74.39Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M110.11,74.8a7.07,7.07,0,0,1-.9,0,5.45,5.45,0,0,1-.67-0.13,3.23,3.23,0,0,1-.51-0.17,3.55,3.55,0,0,1-.4-0.21l0.39-1a1.88,1.88,0,0,0,.28.19,3.34,3.34,0,0,0,.45.21,3.64,3.64,0,0,0,.61.18,3.74,3.74,0,0,0,.75.07,1.87,1.87,0,0,0,1.15-.3,1,1,0,0,0,.39-0.83,0.87,0.87,0,0,0-.32-0.71,3.35,3.35,0,0,0-1.11-.5l-0.86-.29a3,3,0,0,1-.73-0.38,1.8,1.8,0,0,1-.52-0.58,1.76,1.76,0,0,1-.2-0.88A1.68,1.68,0,0,1,108.6,68a3.23,3.23,0,0,1,1.89-.48,5.65,5.65,0,0,1,1.25.12,4.16,4.16,0,0,1,.84.27l-0.28,1a6.73,6.73,0,0,0-.7-0.3,3.05,3.05,0,0,0-1.06-.16,2.36,2.36,0,0,0-1.09.21,0.79,0.79,0,0,0-.41.77,0.73,0.73,0,0,0,.13.43,1.11,1.11,0,0,0,.34.31,2.48,2.48,0,0,0,.5.23l0.6,0.18,0.81,0.27a2.74,2.74,0,0,1,.72.39,1.74,1.74,0,0,1,.71,1.5,1.91,1.91,0,0,1-.23,1,2,2,0,0,1-.61.66,2.6,2.6,0,0,1-.87.38A4.33,4.33,0,0,1,110.11,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M119.76,74.05a3,3,0,0,1-1,.53,4.15,4.15,0,0,1-1.37.21,3.35,3.35,0,0,1-2.58-1,3.82,3.82,0,0,1-.9-2.71,4.38,4.38,0,0,1,.25-1.53,3.42,3.42,0,0,1,.69-1.15,2.91,2.91,0,0,1,1-.72,3.34,3.34,0,0,1,1.28-.25,3.2,3.2,0,0,1,1.28.25,2.31,2.31,0,0,1,.94.73,2.75,2.75,0,0,1,.5,1.2,5,5,0,0,1,0,1.66h-4.76q0.08,2.51,2.37,2.51a3.11,3.11,0,0,0,1.08-.17,4.26,4.26,0,0,0,.88-0.44Zm-2.59-5.74a1.77,1.77,0,0,0-1.29.54,2.71,2.71,0,0,0-.68,1.62h3.57a2.18,2.18,0,0,0-.37-1.63A1.53,1.53,0,0,0,117.17,68.31Z" class="a" transform="translate(-53.86 -64.51)"/></svg>
\ No newline at end of file
diff --git a/website/images/clickhouse-logomark.png b/website/images/clickhouse-logomark.png
deleted file mode 100644
index d521c8147f7..00000000000
Binary files a/website/images/clickhouse-logomark.png and /dev/null differ
diff --git a/website/images/clickhouse-white.svg b/website/images/clickhouse-white.svg
deleted file mode 100644
index 2d4c795abe8..00000000000
--- a/website/images/clickhouse-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66.12 10.29"><defs><style>.a{fill:#fff}</style></defs><title>ClickHouse white</title><path d="M58.54,74.8a5,5,0,0,1-1.88-.34,4.26,4.26,0,0,1-1.48-1,4.46,4.46,0,0,1-1-1.55,6.32,6.32,0,0,1,0-4.21,4.39,4.39,0,0,1,2.58-2.57,5.36,5.36,0,0,1,1.93-.34,5.84,5.84,0,0,1,1.56.18,6.38,6.38,0,0,1,1.2.46l-0.36,1.13A5.17,5.17,0,0,0,60,66a4.23,4.23,0,0,0-1.43-.22,3.07,3.07,0,0,0-2.35,1.06,3.81,3.81,0,0,0-.72,1.27,5.17,5.17,0,0,0-.27,1.73,5.35,5.35,0,0,0,.25,1.69,3.61,3.61,0,0,0,.69,1.25,2.88,2.88,0,0,0,1.06.77,3.49,3.49,0,0,0,1.38.27,4,4,0,0,0,1.27-.2A5.71,5.71,0,0,0,61,73.09l0.35,0.85a3.86,3.86,0,0,1-1.12.59A5,5,0,0,1,58.54,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M64.07,64.51V74.66H62.88V64.51h1.19Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M66.64,66.55a0.71,0.71,0,0,1-.76-0.74,0.78,0.78,0,0,1,.2-0.55,0.79,0.79,0,0,1,1.1,0,0.77,0.77,0,0,1,.21.55,0.72,0.72,0,0,1-.21.53A0.74,0.74,0,0,1,66.64,66.55Zm0.6,1.06v7H66.06v-7h1.19Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M72.29,74.8a3.78,3.78,0,0,1-1.37-.25,3.08,3.08,0,0,1-1.11-.72,3.45,3.45,0,0,1-.74-1.15,4.48,4.48,0,0,1,0-3.08,3.35,3.35,0,0,1,.76-1.15A3.19,3.19,0,0,1,71,67.72a4,4,0,0,1,1.41-.25,4.68,4.68,0,0,1,1.13.13,2.68,2.68,0,0,1,.84.35L74,69a4,4,0,0,0-.79-0.47,2.32,2.32,0,0,0-.92-0.16,2.28,2.28,0,0,0-.88.17,2,2,0,0,0-.73.52,2.52,2.52,0,0,0-.49.85A3.5,3.5,0,0,0,70,71.11a2.8,2.8,0,0,0,.66,2,2.4,2.4,0,0,0,1.79.67,3,3,0,0,0,1.62-.52l0.27,0.88a2.89,2.89,0,0,1-.89.45A3.88,3.88,0,0,1,72.29,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M77,64.51V74.66H75.79V64.51H77ZM80.1,74.66L77.16,70.9l2.9-3.28H81.3l-2.87,3.14,3.07,3.9H80.1Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M89.17,70.34h-5v4.31H82.88V64.93h1.29v4.44h5V64.93h1.29v9.73H89.17V70.34Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M95.55,74.8a3.49,3.49,0,0,1-1.3-.25,3.11,3.11,0,0,1-1.08-.71,3.44,3.44,0,0,1-.73-1.15,4.6,4.6,0,0,1,0-3.12,3.36,3.36,0,0,1,.73-1.14,3.16,3.16,0,0,1,1.08-.71,3.49,3.49,0,0,1,1.3-.25,3.55,3.55,0,0,1,1.31.25,3.22,3.22,0,0,1,1.09.71,3.39,3.39,0,0,1,.75,1.14,4.49,4.49,0,0,1,0,3.12A3.47,3.47,0,0,1,98,73.84a3.16,3.16,0,0,1-1.09.71A3.55,3.55,0,0,1,95.55,74.8Zm0-.91a2.37,2.37,0,0,0,.82-0.15,1.79,1.79,0,0,0,.71-0.48,2.48,2.48,0,0,0,.5-0.86,3.79,3.79,0,0,0,.19-1.27,3.73,3.73,0,0,0-.19-1.27,2.48,2.48,0,0,0-.5-0.85,1.79,1.79,0,0,0-.71-0.48,2.37,2.37,0,0,0-.82-0.15,2.25,2.25,0,0,0-.8.15,1.82,1.82,0,0,0-.69.48,2.4,2.4,0,0,0-.49.85,3.86,3.86,0,0,0-.18,1.27,3.92,3.92,0,0,0,.18,1.27,2.4,2.4,0,0,0,.49.86,1.81,1.81,0,0,0,.69.48A2.25,2.25,0,0,0,95.55,73.89Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M104.21,74.39a2.69,2.69,0,0,1-1.55.41,2.15,2.15,0,0,1-1.58-.6,2.49,2.49,0,0,1-.6-1.84V67.61h1.2v4.75a2.14,2.14,0,0,0,.1.7,1.08,1.08,0,0,0,.28.45,1,1,0,0,0,.42.24,1.82,1.82,0,0,0,.52.07,2,2,0,0,0,1.27-.38,3,3,0,0,0,.82-1V67.61h1.19v7h-1.05l-0.11-1.26h0A2.5,2.5,0,0,1,104.21,74.39Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M110.11,74.8a7.07,7.07,0,0,1-.9,0,5.45,5.45,0,0,1-.67-0.13,3.23,3.23,0,0,1-.51-0.17,3.55,3.55,0,0,1-.4-0.21l0.39-1a1.88,1.88,0,0,0,.28.19,3.34,3.34,0,0,0,.45.21,3.64,3.64,0,0,0,.61.18,3.74,3.74,0,0,0,.75.07,1.87,1.87,0,0,0,1.15-.3,1,1,0,0,0,.39-0.83,0.87,0.87,0,0,0-.32-0.71,3.35,3.35,0,0,0-1.11-.5l-0.86-.29a3,3,0,0,1-.73-0.38,1.8,1.8,0,0,1-.52-0.58,1.76,1.76,0,0,1-.2-0.88A1.68,1.68,0,0,1,108.6,68a3.23,3.23,0,0,1,1.89-.48,5.65,5.65,0,0,1,1.25.12,4.16,4.16,0,0,1,.84.27l-0.28,1a6.73,6.73,0,0,0-.7-0.3,3.05,3.05,0,0,0-1.06-.16,2.36,2.36,0,0,0-1.09.21,0.79,0.79,0,0,0-.41.77,0.73,0.73,0,0,0,.13.43,1.11,1.11,0,0,0,.34.31,2.48,2.48,0,0,0,.5.23l0.6,0.18,0.81,0.27a2.74,2.74,0,0,1,.72.39,1.74,1.74,0,0,1,.71,1.5,1.91,1.91,0,0,1-.23,1,2,2,0,0,1-.61.66,2.6,2.6,0,0,1-.87.38A4.33,4.33,0,0,1,110.11,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M119.76,74.05a3,3,0,0,1-1,.53,4.15,4.15,0,0,1-1.37.21,3.35,3.35,0,0,1-2.58-1,3.82,3.82,0,0,1-.9-2.71,4.38,4.38,0,0,1,.25-1.53,3.42,3.42,0,0,1,.69-1.15,2.91,2.91,0,0,1,1-.72,3.34,3.34,0,0,1,1.28-.25,3.2,3.2,0,0,1,1.28.25,2.31,2.31,0,0,1,.94.73,2.75,2.75,0,0,1,.5,1.2,5,5,0,0,1,0,1.66h-4.76q0.08,2.51,2.37,2.51a3.11,3.11,0,0,0,1.08-.17,4.26,4.26,0,0,0,.88-0.44Zm-2.59-5.74a1.77,1.77,0,0,0-1.29.54,2.71,2.71,0,0,0-.68,1.62h3.57a2.18,2.18,0,0,0-.37-1.63A1.53,1.53,0,0,0,117.17,68.31Z" class="a" transform="translate(-53.86 -64.51)"/></svg>
\ No newline at end of file
diff --git a/website/images/logo-180x180.png b/website/images/logo-180x180.png
deleted file mode 100644
index d89c259e27c..00000000000
Binary files a/website/images/logo-180x180.png and /dev/null differ
diff --git a/website/images/logo-200x120.png b/website/images/logo-200x120.png
deleted file mode 100644
index 01d205bfdba..00000000000
Binary files a/website/images/logo-200x120.png and /dev/null differ
diff --git a/website/images/logo-400x240.png b/website/images/logo-400x240.png
deleted file mode 100644
index 9c39da97a87..00000000000
Binary files a/website/images/logo-400x240.png and /dev/null differ
diff --git a/website/images/logo-clickhouse.svg b/website/images/logo-clickhouse.svg
deleted file mode 100644
index b6bb0cd2d07..00000000000
--- a/website/images/logo-clickhouse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="180" height="28" version="1.1" viewBox="0 0 180 28"><title>ClickHouse Logo</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="ClickHouse-Logo" fill-rule="nonzero" transform="translate(0.000000, 0.500000)"><g id="logo"><polygon id="Path" fill="red" points="0 23.625 3.376 23.625 3.376 27 0 27"/><polygon id="Path" fill="#FC0" points="0 0 3.376 0 3.376 23.625 0 23.625"/><polygon id="Path" fill="#FC0" points="6.751 0 10.127 0 10.127 27 6.751 27"/><polygon id="Path" fill="#FC0" points="13.502 0 16.878 0 16.878 27 13.502 27"/><polygon id="Path" fill="#FC0" points="20.253 0 23.629 0 23.629 27 20.253 27"/><polygon id="Path" fill="#FC0" points="27.004 10.969 30.38 10.969 30.38 16.031 27.004 16.031"/></g><g id="clickhouse-black" fill="#231F20" transform="translate(43.291139, 3.000000)"><path id="Path" d="M9.76370444,20.9560972 C8.43447886,20.9735251 7.11430823,20.7384252 5.875478,20.2636703 C4.72047444,19.8054437 3.67723122,19.1113387 2.81453379,18.2271205 C1.90927726,17.3283139 1.2048111,16.2531042 0.746328237,15.0704684 C-0.248776079,12.2964995 -0.248776079,9.27056268 0.746328237,6.4965938 C1.67159165,4.07354026 3.61800681,2.16434552 6.08229856,1.26266086 C7.35832383,0.792264319 8.71148185,0.557532775 10.0739353,0.570233938 C11.1612577,0.548839362 12.2465336,0.672146838 13.3003359,0.936812899 C14.1575307,1.16603291 14.9890302,1.47989577 15.7821826,1.8736258 L15.0376286,4.17492705 C14.334754,3.70811103 13.5779913,3.32526638 12.7832845,3.03445917 C11.8308864,2.71897047 10.8304102,2.56740693 9.82575061,2.58641822 C7.96245266,2.56886976 6.1853824,3.35817309 4.96546756,4.74516099 C4.30442786,5.50472232 3.79877758,6.38298172 3.47635956,7.33157921 C3.08814385,8.46618422 2.89929764,9.65767851 2.91794407,10.8548103 C2.90195973,12.0219322 3.07653544,13.184001 3.43499545,14.2965795 C3.73382292,15.2302331 4.21899806,16.0957206 4.86205728,16.8422667 C5.46077204,17.5238868 6.21094713,18.0604846 7.05435517,18.41041 C7.95798877,18.7824827 8.9290709,18.969569 9.90847883,18.9602785 C10.8005951,18.9648543 11.68759,18.827308 12.5350999,18.5529685 C13.3447055,18.2769814 14.1214074,17.9150606 14.8514901,17.4735971 L15.575362,19.2046644 C14.8756447,19.7279796 14.0929921,20.1339593 13.2589718,20.4062288 C12.1346344,20.7859604 10.952228,20.9719742 9.76370444,20.9560972 L9.76370444,20.9560972 Z"/><polygon id="Path" points="21.201 0 21.201 20.671 18.74 20.671 18.74 0 21.201 0"/><path id="Shape" d="M26.5161694,4.15456155 C26.0981094,4.18404053 25.6871808,4.03620327 25.3868859,3.74828616 C25.0865909,3.46036905 24.9255529,3.05981554 24.9443332,2.64751471 C24.9293499,2.23543398 25.0776822,1.83376364 25.3579743,1.52741233 C25.9917593,0.922143971 26.9992154,0.922143971 27.6330004,1.52741233 C27.9227354,1.82938962 28.0789406,2.23223687 28.0673236,2.64751471 C28.0795295,3.0508229 27.9224226,3.44126169 27.6330004,3.7268861 C27.3352303,4.0129939 26.9320049,4.16740365 26.5161694,4.15456155 L26.5161694,4.15456155 Z M27.7570927,6.31330432 L27.7570927,20.5691528 L25.3166102,20.5691528 L25.3166102,6.31330432 L27.7777748,6.31330432 L27.7570927,6.31330432 Z"/><path id="Path" d="M38.2015308,20.9561849 C37.2331788,20.9606473 36.2723959,20.7880054 35.3680892,20.4469598 C34.5040176,20.1277138 33.7207114,19.6274001 33.072381,18.9806439 C32.4086321,18.3083453 31.8882536,17.5120269 31.5419089,16.6386117 C30.789066,14.6134632 30.789066,12.3911868 31.5419089,10.3660384 C31.8953146,9.48650873 32.4305899,8.68894988 33.1137451,8.02400613 C33.8006138,7.36063917 34.6265105,6.85322326 35.5335456,6.53732479 C36.4665869,6.19626518 37.4544707,6.0237894 38.4497154,6.02818735 C39.2367736,6.02254268 40.0215928,6.11144966 40.7867877,6.29293882 C41.402916,6.43127907 41.9904819,6.67235105 42.5240804,7.00573124 L41.7381623,9.14410851 C41.2326995,8.76428196 40.6844527,8.44310218 40.1042799,8.18693012 C39.4990142,7.95244732 38.8516533,7.84158602 38.2015308,7.86108215 C37.5775701,7.85677667 36.958946,7.97445444 36.3815099,8.20729561 C35.8033669,8.44328317 35.2871426,8.80537627 34.8717198,9.2663015 C34.4220004,9.77237252 34.0776687,10.3605404 33.8582991,10.9973688 C33.5836299,11.7832018 33.4506403,12.6102801 33.4653401,13.4412285 C33.3646964,14.9221144 33.8543791,16.3832889 34.8303557,17.5143281 C35.8193073,18.4542588 37.1597853,18.9483223 38.5324437,18.8788165 C39.7296588,18.8515966 40.8932941,18.483801 41.8829366,17.8198106 L42.4413521,19.6119744 C41.8863529,20.0201826 41.2635134,20.3302813 40.6006492,20.5284218 C39.8277327,20.7904738 39.0186907,20.9346965 38.2015308,20.9561849 L38.2015308,20.9561849 Z"/><path id="Shape" d="M47.9427789,0 L47.9427789,20.6709803 L45.4402502,20.6709803 L45.4402502,0 L47.9427789,0 Z M54.3542161,20.6709803 L48.2736918,13.0135531 L54.2714879,6.33366982 L56.8360628,6.33366982 L50.9003129,12.7284361 L57.2497039,20.6709803 L54.3542161,20.6709803 L54.3542161,20.6709803 Z"/><polygon id="Path" points="73.113 11.873 62.772 11.873 62.772 20.651 60.104 20.651 60.104 .855 62.772 .855 62.772 9.898 73.113 9.898 73.113 .855 75.781 .855 75.781 20.671 73.113 20.671"/><path id="Shape" d="M86.3079919,20.9560972 C85.38699,20.956828 84.4743522,20.7840259 83.6193247,20.4469598 C82.7801539,20.1243214 82.0191689,19.6317014 81.3856627,19.0010094 C80.7288968,18.3272298 80.2155719,17.5309446 79.8758726,16.6589772 C79.1241518,14.6056391 79.1241518,12.35828 79.8758726,10.3049419 C80.2139667,9.43820628 80.7276537,8.64828849 81.3856627,7.98327514 C82.0210949,7.3549028 82.7815529,6.86262399 83.6193247,6.53732479 C84.4743522,6.20025867 85.38699,6.0274377 86.3079919,6.02818492 C87.235663,6.02783377 88.154999,6.20059422 89.0173412,6.53732479 C89.8608646,6.86326706 90.6279639,7.35528929 91.2716852,7.98327514 C91.9432058,8.64563226 92.4709473,9.43552137 92.8228394,10.3049419 C93.5941835,12.3548594 93.5941835,14.6090597 92.8228394,16.6589772 C92.5001582,17.5252355 92.0083217,18.3208853 91.3750955,19.0010094 C90.7336187,19.6317283 89.9659063,20.1241438 89.1207514,20.4469598 C88.2261198,20.7965781 87.270406,20.9695718 86.3079919,20.9560972 Z M86.3079919,19.1028369 C86.8871906,19.1004754 87.4613802,18.9970483 88.0039204,18.7973545 C88.5665616,18.5933999 89.0704796,18.2579374 89.4723464,17.8198106 C89.93364,17.3107661 90.2854168,16.714971 90.5064492,16.0683778 C90.7858877,15.2345245 90.9187812,14.3598326 90.8994082,13.4819595 C90.921252,12.6039337 90.7882958,11.7288286 90.5064492,10.8955413 C90.2829062,10.2561715 89.9312542,9.66751308 89.4723464,9.16447401 C89.0704796,8.72634722 88.5665616,8.39088465 88.0039204,8.18693012 C87.4613802,7.98723626 86.8871906,7.88380922 86.3079919,7.88144765 C85.7421967,7.88338153 85.1815027,7.98690253 84.6534274,8.18693012 C84.1067964,8.39867016 83.6180769,8.73344525 83.2263656,9.16447401 C82.771108,9.66662382 82.426093,10.2559587 82.2129449,10.8955413 C81.9432303,11.7312023 81.817401,12.6054092 81.8406679,13.4819595 C81.8197008,14.3583785 81.9454766,15.2322137 82.2129449,16.0683778 C82.4234966,16.7151843 82.7686424,17.3116787 83.2263656,17.8198106 C83.6175627,18.2514112 84.1064306,18.586288 84.6534274,18.7973545 C85.1815027,18.9973821 85.7421967,19.1009031 86.3079919,19.1028369 L86.3079919,19.1028369 Z"/><path id="Path" d="M104.218652,20.1211118 C103.261113,20.713834 102.142858,21.0051032 101.012933,20.9560972 C99.7999523,21.0051122 98.6193584,20.5636475 97.7451686,19.7341674 C96.8353108,18.7009502 96.3878256,17.3496664 96.5042453,15.9869158 L96.5042453,6.31330432 L98.9860919,6.31330432 L98.9860919,15.9869158 C98.9742754,16.4701161 99.0441695,16.9518863 99.1929125,17.4125006 C99.3056456,17.7606047 99.5046708,18.0755709 99.77201,18.328948 C100.016574,18.5594167 100.314849,18.7272509 100.640656,18.81772 C100.990271,18.9161408 101.352523,18.9641592 101.716123,18.9602785 C102.655549,19.0038445 103.582007,18.7308795 104.342744,18.1863895 C105.051689,17.6370184 105.630443,16.9420231 106.038673,16.1498398 L106.038673,6.31330432 L108.499837,6.31330432 L108.499837,20.5691528 L106.328222,20.5691528 L106.100719,18.0031001 L106.100719,18.0031001 C105.687922,18.8692089 105.035644,19.6032598 104.218652,20.1211118 L104.218652,20.1211118 Z"/><path id="Path" d="M116.421065,20.9560972 C115.801233,20.9950241 115.179512,20.9950241 114.55968,20.9560972 C114.092617,20.8964402 113.62981,20.8080164 113.173982,20.6913458 C112.813228,20.605003 112.460411,20.4891975 112.119197,20.3451323 C111.834495,20.2200141 111.558175,20.0771664 111.291915,19.9174568 L112.098515,17.8809071 C112.279343,18.026767 112.473161,18.156273 112.677613,18.2678515 C112.976636,18.4329534 113.287727,18.5759069 113.608305,18.695527 C114.017173,18.8537321 114.439319,18.9763932 114.869911,19.0621059 C115.380772,19.1609067 115.900459,19.2086684 116.421065,19.2046644 C117.260254,19.2611102 118.095255,19.0466179 118.799501,18.5936995 C119.330358,18.1920161 119.630919,17.5621502 119.606101,16.9033632 C119.629117,16.3456326 119.383876,15.8098319 118.944275,15.4574128 C118.248621,14.9827695 117.47054,14.6376468 116.648567,14.4391379 L114.869911,13.8485385 C114.332933,13.6600961 113.82489,13.3996834 113.36012,13.0746496 C112.918371,12.7629353 112.551287,12.3597625 112.284654,11.8934507 C111.990937,11.3416153 111.84837,10.7239217 111.871013,10.1012869 C111.7928,8.92823263 112.331666,7.79778562 113.298074,7.10755873 C114.467654,6.39295223 115.832855,6.05154147 117.206983,6.13001484 C118.07528,6.11663174 118.942387,6.19859987 119.79224,6.37440081 C120.389496,6.49652839 120.971868,6.68085438 121.529532,6.92426925 L120.950435,8.96081903 C120.479952,8.73041885 119.996597,8.52643737 119.502691,8.3498541 C118.797193,8.1146398 118.054965,8.00432014 117.310393,8.02400613 C116.535101,7.9880419 115.762277,8.13465573 115.056049,8.45168159 C114.47936,8.75940804 114.145458,9.37689414 114.208085,10.0198249 C114.202,10.3323024 114.296078,10.6387208 114.476951,10.8955413 C114.663996,11.1520366 114.903538,11.3670997 115.180141,11.5268718 C115.506126,11.720303 115.852962,11.8774057 116.214244,11.9952782 L117.455167,12.3618572 L119.130414,12.9117256 C119.664383,13.1015363 120.166356,13.3692768 120.619522,13.70598 C121.602378,14.4140087 122.154912,15.5634667 122.087948,16.7608047 C122.121004,17.4696719 121.956505,18.1739382 121.612261,18.7973545 C121.300726,19.3338382 120.869299,19.7934828 120.350655,20.1414773 C119.804193,20.5059941 119.194247,20.7683295 118.551316,20.9153662 C117.845409,21.0123699 117.130265,21.0260437 116.421065,20.9560972 Z"/><path id="Shape" d="M136.379248,19.4286849 C135.765636,19.9144267 135.063746,20.2807344 134.311043,20.5080563 C133.397586,20.8060079 132.439751,20.9505822 131.477601,20.9357317 C129.484022,21.0457076 127.539179,20.3034303 126.141631,18.899182 C124.819952,17.3656124 124.152831,15.3875844 124.280246,13.3801321 C124.263071,12.3194805 124.438164,11.2643153 124.797297,10.2642109 C125.111353,9.39844373 125.596363,8.60246478 126.224359,7.92217864 C126.799559,7.29363386 127.504769,6.79365416 128.292565,6.4558628 C129.13245,6.11650376 130.03203,5.94349361 130.939868,5.94672536 C131.84844,5.93569173 132.749586,6.10900306 133.587171,6.4558628 C134.355957,6.77570775 135.026242,7.28828126 135.531284,7.94254414 C136.069381,8.66407624 136.423989,9.5021104 136.565387,10.3864039 C136.756685,11.5054228 136.756685,12.6480576 136.565387,13.7670765 L126.720728,13.7670765 C126.831033,17.1749031 128.464915,18.8788165 131.622376,18.8788165 C132.38185,18.8941966 133.138087,18.7769813 133.856038,18.532603 C134.495821,18.304128 135.106567,18.0034291 135.676058,17.6365211 L136.379248,19.4286849 Z M131.022596,7.73888916 C130.017668,7.7293132 129.052936,8.12697327 128.354611,8.83862604 C127.526752,9.75405949 127.031943,10.9148261 126.948231,12.1378367 L134.331725,12.1378367 C134.534684,10.9751452 134.259342,9.78072052 133.566489,8.81826055 C132.931983,8.09270485 131.993938,7.6946933 131.022596,7.73888916 Z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/logo.png b/website/images/logo.png
deleted file mode 100644
index 552637796d6..00000000000
Binary files a/website/images/logo.png and /dev/null differ
diff --git a/website/images/logo.svg b/website/images/logo.svg
deleted file mode 100644
index 865b96d98c7..00000000000
--- a/website/images/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="54" height="48" viewBox="0 0 9 8"><style>.o{fill:#fc0}.r{fill:red}</style><path d="M0,7 h1 v1 h-1 z" class="r"/><path d="M0,0 h1 v7 h-1 z" class="o"/><path d="M2,0 h1 v8 h-1 z" class="o"/><path d="M4,0 h1 v8 h-1 z" class="o"/><path d="M6,0 h1 v8 h-1 z" class="o"/><path d="M8,3.25 h1 v1.5 h-1 z" class="o"/></svg>
\ No newline at end of file